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

nixpkgs-bootstrap: get rid of "override"

Browse Source 
this reduces the number of times we have to 'import' different nixpkgs during bootstrap
This commit is contained in:
Colin
2025-05-09 06:19:41 +00:00
parent 86528b5fcc
commit 17cdca36ca
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
impure.nix
View File

@@ -9,9 +9,11 @@
}: }:
let let
mkNixpkgs = import ./pkgs/by-name/nixpkgs-bootstrap/mkNixpkgs.nix {}; mkNixpkgs = import ./pkgs/by-name/nixpkgs-bootstrap/mkNixpkgs.nix {};
mkPkgs = branch: args: ( mkPkgs = branch: config: (
(mkNixpkgs (args // { inherit branch; })).pkgs import ./pkgs/by-name/nixpkgs-bootstrap/${branch}.nix {
).extend (import ./overlays/all.nix); mkNixpkgs = args: mkNixpkgs (config // args);
}
).pkgs.extend (import ./overlays/all.nix);
pkgs = mkPkgs "master" { inherit localSystem; }; pkgs = mkPkgs "master" { inherit localSystem; };
inherit (pkgs) lib; inherit (pkgs) lib;

4
pkgs/by-name/nixpkgs-bootstrap/mkNixpkgs.nix
View File

@@ -141,10 +141,6 @@ let
inherit version; inherit version;
pname = "nixpkgs"; pname = "nixpkgs";
passthru = (base.passthru or {}) // { passthru = (base.passthru or {}) // {
# override is used to configure hostPlatform higher up.
# TODO: refactor to avoid overriding.
override = overrideArgs: mkNixpkgs (args // overrideArgs);
pkgs = nixpkgs; pkgs = nixpkgs;
src = { src = {