From 21697be45e47c35e598c56ce05b82429b2cd497a Mon Sep 17 00:00:00 2001 From: Lloyd Date: Fri, 12 Sep 2025 01:46:27 +1000 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=99=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/flake.lock | 34 +++++++++++++++++++++++++ backend/flake.nix | 62 +++++++++++++++++++++++++--------------------- 2 files changed, 68 insertions(+), 28 deletions(-) diff --git a/backend/flake.lock b/backend/flake.lock index fd477dd..e66818b 100644 --- a/backend/flake.lock +++ b/backend/flake.lock @@ -22,6 +22,24 @@ "type": "github" } }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "naersk": { "inputs": { "fenix": "fenix", @@ -75,6 +93,7 @@ }, "root": { "inputs": { + "flake-utils": "flake-utils", "naersk": "naersk", "nixpkgs": "nixpkgs_2" } @@ -95,6 +114,21 @@ "repo": "rust-analyzer", "type": "github" } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/backend/flake.nix b/backend/flake.nix index 998a32d..e9188d0 100644 --- a/backend/flake.nix +++ b/backend/flake.nix @@ -4,41 +4,47 @@ inputs = { naersk.url = "github:nix-community/naersk"; nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; + flake-utils.url = "github:numtide/flake-utils"; }; outputs = { self, naersk, nixpkgs, - }: let - system = "x86_64-linux"; - pkgs = import nixpkgs {inherit system;}; - naerskLib = pkgs.callPackage naersk {}; - buildInputs = [pkgs.openssl]; - nativeBuildInputs = [pkgs.pkg-config]; - in { - packages.${system}.default = naerskLib.buildPackage { - src = ./.; - buildInputs = buildInputs; - nativeBuildInputs = nativeBuildInputs; - }; + flake-utils, + }: + flake-utils.lib.eachDefaultSystem ( + system: let + pkgs = import nixpkgs { + inherit system; + }; + naerskLib = pkgs.callPackage naersk {}; + buildInputs = [pkgs.openssl]; + nativeBuildInputs = [pkgs.pkg-config]; + in { + packages.${system}.default = naerskLib.buildPackage { + src = ./.; + buildInputs = buildInputs; + nativeBuildInputs = nativeBuildInputs; + }; - devShells.${system}.default = pkgs.mkShell { - inputsFrom = [self.packages.${system}.default]; + devShells.${system}.default = pkgs.mkShell { + inputsFrom = [self.packages.${system}.default]; - packages = with pkgs; [ - rustc - cargo - rustfmt - rust-analyzer - zsh - ]; + packages = with pkgs; [ + rustc + cargo + rustfmt + rust-analyzer + zsh + ]; - shellHook = '' - export SHELL=${pkgs.zsh}/bin/zsh - # jump into zsh if we didn't already start in it - [ -z "$ZSH_VERSION" ] && exec ${pkgs.zsh}/bin/zsh -l - ''; - }; - }; + shellHook = '' + export SHELL=${pkgs.zsh}/bin/zsh + # jump into zsh if we didn't already start in it + [ -z "$ZSH_VERSION" ] && exec ${pkgs.zsh}/bin/zsh -l + ''; + }; + } + ); } From bad5e0974647a4a7960b216140cf0a448953eb96 Mon Sep 17 00:00:00 2001 From: Lloyd Date: Fri, 12 Sep 2025 01:50:03 +1000 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=99=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/flake.lock | 6 +++--- backend/flake.nix | 7 ++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/backend/flake.lock b/backend/flake.lock index e66818b..da663de 100644 --- a/backend/flake.lock +++ b/backend/flake.lock @@ -77,11 +77,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1756542300, - "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", + "lastModified": 1757487488, + "narHash": "sha256-zwE/e7CuPJUWKdvvTCB7iunV4E/+G0lKfv4kk/5Izdg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", + "rev": "ab0f3607a6c7486ea22229b92ed2d355f1482ee0", "type": "github" }, "original": { diff --git a/backend/flake.nix b/backend/flake.nix index e9188d0..2a8af0c 100644 --- a/backend/flake.nix +++ b/backend/flake.nix @@ -1,5 +1,5 @@ { - description = "lead-rust"; + description = "lead"; inputs = { naersk.url = "github:nix-community/naersk"; @@ -28,6 +28,11 @@ nativeBuildInputs = nativeBuildInputs; }; + apps.${system}.default = { + type = "app"; + program = "${self.packages.${system}.default}/bin/lead"; + }; + devShells.${system}.default = pkgs.mkShell { inputsFrom = [self.packages.${system}.default]; From a775432e43db7921573a4e2416ddb6696633afca Mon Sep 17 00:00:00 2001 From: Lloyd Date: Fri, 12 Sep 2025 01:57:27 +1000 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=99=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/flake.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/backend/flake.nix b/backend/flake.nix index 2a8af0c..18a6d66 100644 --- a/backend/flake.nix +++ b/backend/flake.nix @@ -12,6 +12,7 @@ naersk, nixpkgs, flake-utils, + ... }: flake-utils.lib.eachDefaultSystem ( system: let @@ -21,20 +22,16 @@ naerskLib = pkgs.callPackage naersk {}; buildInputs = [pkgs.openssl]; nativeBuildInputs = [pkgs.pkg-config]; - in { - packages.${system}.default = naerskLib.buildPackage { + lead = naerskLib.buildPackage { src = ./.; buildInputs = buildInputs; nativeBuildInputs = nativeBuildInputs; }; + in { + packages.default = lead; - apps.${system}.default = { - type = "app"; - program = "${self.packages.${system}.default}/bin/lead"; - }; - - devShells.${system}.default = pkgs.mkShell { - inputsFrom = [self.packages.${system}.default]; + devShells.default = pkgs.mkShell { + inputsFrom = [lead]; packages = with pkgs; [ rustc