gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixVersions.nix_2_31: Add patch for SRI hash formatting fix (#468208)

Browse Source
This commit is contained in:
John Ericson
2025-12-05 20:22:46 +00:00
committed by GitHub
parent a0bb3f3677 4f6df2ad2f
commit 2d6767d993
1 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/package-management/nix/default.nix
+20 -11
View File
@@ -5,6 +5,7 @@
nixDependencies,
generateSplicesForMkScope,
fetchFromGitHub,
fetchpatch2,
runCommand,
pkgs,
pkgsi686Linux,
@@ -165,17 +166,25 @@ lib.makeExtensible (
nix_2_30 = addTests "nix_2_30" self.nixComponents_2_30.nix-everything;
nixComponents_2_31 = nixDependencies.callPackage ./modular/packages.nix rec {
version = "2.31.2";
inherit (self.nix_2_30.meta) maintainers teams;
otherSplices = generateSplicesForNixComponents "nixComponents_2_31";
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
tag = version;
hash = "sha256-NLGXPLjENLeKVOg3OZgHXZ+1x6sPIKq9FHH8pxbCrDI=";
};
};
nixComponents_2_31 =
(nixDependencies.callPackage ./modular/packages.nix rec {
version = "2.31.2";
inherit (self.nix_2_30.meta) maintainers teams;
otherSplices = generateSplicesForNixComponents "nixComponents_2_31";
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
tag = version;
hash = "sha256-NLGXPLjENLeKVOg3OZgHXZ+1x6sPIKq9FHH8pxbCrDI=";
};
}).appendPatches
[
(fetchpatch2 {
name = "nix-2.31-14240-sri-error-message.patch";
url = "https://github.com/NixOS/nix/commit/56751b1cd2c4700c71c545f2246adf602c97fdf5.patch";
hash = "sha256-CerSBAI+H2RqPp9jsCP0QIM2rZYx3yBZHVVUAztgc18=";
})
];
nix_2_31 = addTests "nix_2_31" self.nixComponents_2_31.nix-everything;