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

nixpkgs: 2025-05-19 -> 2025-05-23

Browse Source
This commit is contained in:
Colin
2025-05-29 06:28:26 +00:00
parent c0a788f750
commit e25a8a35e9
2 changed files with 18 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/by-name/nixpkgs-bootstrap/master.nix
View File

@@ -14,8 +14,8 @@
mkNixpkgs ? import ./mkNixpkgs.nix {}, mkNixpkgs ? import ./mkNixpkgs.nix {},
}: }:
mkNixpkgs { mkNixpkgs {
rev = "4b4e56e716bcbc0ec342ae39f3f14d585e6b26fa"; rev = "ff2efdceba9e3574aecd857aefb404e99e321efd";
sha256 = "sha256-SXLZwWpBrhVbykeaeWvUFvwK7COTWl0h9lInGtjdqKQ="; sha256 = "sha256-iKNuRk5XDc49yQh3A87y157z+CCKE9EEAsUIMeEjGvw=";
version = "unstable-2025-05-19"; version = "unstable-2025-05-23";
branch = "master"; branch = "master";
} }

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

@@ -109,7 +109,21 @@ let
# required by unstableGitUpdater # required by unstableGitUpdater
gitRepoUrl = "https://github.com/NixOS/nixpkgs.git"; gitRepoUrl = "https://github.com/NixOS/nixpkgs.git";
inherit rev; inherit rev;
} // src'; } // src' // {
# required so that unstableGitUpdater can know in which file the `rev` variable can be updated in.
meta.position = let
position = builtins.unsafeGetAttrPos "rev" args;
in
"${position.file}:${toString position.line}";
passthru = {
pkgs = nixpkgs;
} // optionalAttrs (nixpkgs-bootstrap-updater != null) {
updateScript = nixpkgs-bootstrap-updater.makeUpdateScript {
inherit branch;
};
};
};
patches = import ./patches.nix { fetchpatch2 = fetchpatch2'; }; patches = import ./patches.nix { fetchpatch2 = fetchpatch2'; };
# skip applied patches # skip applied patches
@@ -119,29 +133,6 @@ let
OUT=$($realpatch "$@") || echo "$OUT" | grep "Skipping patch" -q OUT=$($realpatch "$@") || echo "$OUT" | grep "Skipping patch" -q
} }
''; '';
passthru = {
pkgs = nixpkgs;
# required so that unstableGitUpdater can know in which file the `rev` variable can be updated in.
meta.position = let
position = builtins.unsafeGetAttrPos "rev" args;
in
"${position.file}:${toString position.line}";
# updateScript = nix-update-script {
# extraArgs = [ "--version=branch=${branch}" ];
# };
# updateScript = unstableGitUpdater {
# # else the update script tries to walk 10000's of commits to find a tag
# hardcodeZeroVersion = true;
# inherit branch;
# };
} // optionalAttrs (nixpkgs-bootstrap-updater != null) {
updateScript = nixpkgs-bootstrap-updater.makeUpdateScript {
inherit branch;
};
};
}; };
nixpkgsArgs = commonNixpkgsArgs // { nixpkgsArgs = commonNixpkgsArgs // {