diff --git a/flake.lock b/flake.lock index 24aca43..726651e 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1710806803, - "narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=", + "lastModified": 1712963716, + "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b06025f1533a1e07b6db3e75151caa155d1c7eb3", + "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 01bdc1f..d3c2178 100644 --- a/flake.nix +++ b/flake.nix @@ -6,16 +6,13 @@ nixpkgs, }: let inherit (nixpkgs) lib; - genSystems = lib.genAttrs [ + forSystems = f: lib.genAttrs [ "x86_64-linux" "aarch64-linux" - ]; - pkgsFor = system: import nixpkgs {inherit system;}; + ] (system: f nixpkgs.legacyPackages.${system}); in { - packages = genSystems ( - system: let - pkgs = pkgsFor system; - in { + packages = forSystems ( + pkgs: { default = pkgs.callPackage ./. {}; static = pkgs.pkgsStatic.callPackage ./. { strip = true; @@ -23,13 +20,11 @@ } ); - devShells = genSystems ( - system: let - pkgs = pkgsFor system; - in { + devShells = forSystems ( + pkgs: { default = pkgs.mkShell { nativeBuildInputs = with pkgs; [clang-tools]; - inputsFrom = [self.packages.${system}.default]; + inputsFrom = [self.packages.${pkgs.system}.default]; }; pyShell = pkgs.mkShell { nativeBuildInputs = [(pkgs.python3.withPackages (ps: with ps; [geopandas]))]; @@ -37,6 +32,6 @@ } ); - formatter = genSystems (system: (pkgsFor system).alejandra); + formatter = forSystems (pkgs: pkgs.alejandra); }; }