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

nixpkgs: get the updateScripts to be populated into me update.pkgs.* attrs

Browse Source
This commit is contained in:
Colin
2024-06-08 22:01:33 +00:00
parent ede68b563e
commit 14a5b8d9f2
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
pkgs/additional/nixpkgs/default.nix
View File

@@ -65,18 +65,24 @@ let
# so avoid specifying hostPlatform.system on non-cross builds, so i can use upstream caches. # so avoid specifying hostPlatform.system on non-cross builds, so i can use upstream caches.
crossSystem = system; crossSystem = system;
} else {}); } else {});
nixpkgs = import "${src}" args;
in in
# N.B.: this is crafted to allow `nixpkgs.FOO` from other nix code # N.B.: this is crafted to allow `nixpkgs.FOO` from other nix code
# AND `nix-build -A nixpkgs` # AND `nix-build -A nixpkgs`
(import "${src}" args) // src // { if src ? overrideAttrs then
# attributes needed for update scripts src.overrideAttrs (base: {
name = "nixpkgs"; # attributes needed for update scripts
version = "24.05-unstable-2024-06-xx"; pname = "nixpkgs";
src = unpatchedSrc // (if builtins.isAttrs unpatchedSrc then { version = "24.05-unstable-2024-06-xx";
inherit (lock') rev; passthru = (base.passthru or {}) // nixpkgs // {
} else {}); src = unpatchedSrc // {
} // (if nix-update-script != null then { inherit (lock') rev;
passthru.updateScript = nix-update-script { };
extraArgs = [ "--version" "branch" ]; updateScript = nix-update-script {
}; extraArgs = [ "--version" "branch" ];
} else {}) };
};
})
else
nixpkgs