colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

refactor: impure.nix calculates localSystem for itself; avoid duplication since otherwise integrations/nix-update/default.nix would need to add that too

Browse Source
This commit is contained in:
Colin
2024-10-06 21:46:40 +00:00
parent a42afed98f
commit 0e6a94d399
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
default.nix
View File

@@ -2,6 +2,4 @@
let let
sane-nix-files = import ./pkgs/by-name/sane-nix-files/package.nix { }; sane-nix-files = import ./pkgs/by-name/sane-nix-files/package.nix { };
in in
import "${sane-nix-files}/impure.nix" ({ import "${sane-nix-files}/impure.nix" args
localSystem = builtins.currentSystem;
} // args)

4
impure.nix
View File

@@ -4,7 +4,9 @@
# race conditions or eval failures. # race conditions or eval failures.
# #
# see default.nix for a wrapper around this with better purity guarantees. # see default.nix for a wrapper around this with better purity guarantees.
{ localSystem }: {
localSystem ? builtins.currentSystem,
}:
let let
mkPkgs = branch: args: ( mkPkgs = branch: args: (
(import ./pkgs/by-name/nixpkgs-bootstrap/${branch}.nix {}).override args (import ./pkgs/by-name/nixpkgs-bootstrap/${branch}.nix {}).override args