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

Merge pull request #306575 from Ma27/drop-unmaintained-nix-versions 

nixVersions.nix_2_{10..17}: remove
This commit is contained in:
Maximilian Bosch 2024-04-27 08:05:58 +00:00 committed by GitHub
parent 4e2ac9c9c3 d85b579a84
commit fbb1fd7a6a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
pkgs/tools/package-management/nix/default.nix
View File

@ -109,27 +109,6 @@ let
hash = "sha256-f+F0fUO+bqyPXjt+IXJtISVr589hdc3y+Cdrxznb+Nk=";
};
# https://github.com/NixOS/nix/pull/7473
patch-sqlite-exception = fetchpatch2 {
name = "nix-7473-sqlite-exception-add-message.patch";
url = "https://github.com/hercules-ci/nix/commit/c965f35de71cc9d88f912f6b90fd7213601e6eb8.patch";
hash = "sha256-tI5nKU7SZgsJrxiskJ5nHZyfrWf5aZyKYExM0792N80=";
};
patch-non-existing-output = fetchpatch {
# https://github.com/NixOS/nix/pull/7283
name = "fix-requires-non-existing-output.patch";
url = "https://github.com/NixOS/nix/commit/3ade5f5d6026b825a80bdcc221058c4f14e10a27.patch";
hash = "sha256-s1ybRFCjQaSGj7LKu0Z5g7UiHqdJGeD+iPoQL0vaiS0=";
};
patch-rapidcheck-shared = fetchpatch2 {
# https://github.com/NixOS/nix/pull/9431
name = "fix-missing-librapidcheck.patch";
url = "https://github.com/NixOS/nix/commit/46131567da96ffac298b9ec54016b37114b0dfd5.patch";
hash = "sha256-lShYxYKRDWwBqCysAFmFBudhhAL1eendWcL8sEFLCGg=";
};
# Intentionally does not support overrideAttrs etc
# Use only for tests that are about the package relation to `pkgs` and/or NixOS.
addTestsShallowly = tests: pkg: pkg // {
@ -176,72 +155,6 @@ in lib.makeExtensible (self: ({
enableParallelChecking = false;
};
nix_2_10 = common {
version = "2.10.3";
hash = "sha256-B9EyDUz/9tlcWwf24lwxCFmkxuPTVW7HFYvp0C4xGbc=";
patches = [
./patches/flaky-tests.patch
patch-non-existing-output
patch-monitorfdhup
patch-sqlite-exception
];
};
nix_2_11 = common {
version = "2.11.1";
hash = "sha256-qCV65kw09AG+EkdchDPq7RoeBznX0Q6Qa4yzPqobdOk=";
patches = [
./patches/flaky-tests.patch
patch-non-existing-output
patch-monitorfdhup
patch-sqlite-exception
];
};
nix_2_12 = common {
version = "2.12.1";
hash = "sha256-GmHKhq0uFtdOiJnuBwj2YwlZjvh6YTkfQZgeu4e0dLU=";
patches = [
./patches/flaky-tests.patch
patch-monitorfdhup
patch-sqlite-exception
];
};
nix_2_13 = common {
version = "2.13.6";
hash = "sha256-pd2yGmHWn4njfbrSP6cMJx8qL+yeGieqcbLNICzcRFs=";
};
nix_2_14 = common {
version = "2.14.1";
hash = "sha256-5aCmGZbsFcLIckCDfvnPD4clGPQI7qYAqHYlttN/Wkg=";
patches = [
patch-rapidcheck-shared
];
};
nix_2_15 = common {
version = "2.15.3";
hash = "sha256-sfFXbjC5iIdSAbctZIuFozxX0uux/KFBNr9oh33xINs=";
patches = [
patch-rapidcheck-shared
];
};
nix_2_16 = common {
version = "2.16.3";
hash = "sha256-/tnjRCk+VaWPThzdn3C0zU1AMON+7AFsHgTTzErFxV4=";
};
nix_2_17 = common {
version = "2.17.1";
hash = "sha256-Q5L+rHzjp0bYuR2ogg+YPCn6isjmlQ4CJVT0zpn/hFc=";
patches = [
patch-rapidcheck-shared
];
};
nix_2_18 = common {
version = "2.18.2";
hash = "sha256-8gNJlBlv2bnffRg0CejiBXc6U/S6YeCLAdHrYvTPyoY=";
@ -287,16 +200,12 @@ in lib.makeExtensible (self: ({
stable = addFallbackPathsCheck self.nix_2_18;
unstable = self.nix_2_22;
} // lib.optionalAttrs config.allowAliases {
nix_2_4 = throw "nixVersions.nix_2_4 has been removed";
nix_2_5 = throw "nixVersions.nix_2_5 has been removed";
nix_2_6 = throw "nixVersions.nix_2_6 has been removed";
nix_2_7 = throw "nixVersions.nix_2_7 has been removed";
nix_2_8 = throw "nixVersions.nix_2_8 has been removed";
nix_2_9 = throw "nixVersions.nix_2_9 has been removed";
}))
} // lib.optionalAttrs config.allowAliases (
lib.listToAttrs (map (
minor:
let
attr = "nix_2_${toString minor}";
in
lib.nameValuePair attr (throw "${attr} has been removed")
) (lib.range 4 17))
)))