Skip to content

Commit 1723477

Browse files
committed
nixVersion.nix_{2_6,2_7,2_8,2_9}: remove
the comment from 2_6 does not apply anymore because the fix has been merged nix#7283 and the fix has been applied to 2_9+
1 parent 8df1ea3 commit 1723477

1 file changed

Lines changed: 4 additions & 38 deletions

File tree

pkgs/tools/package-management/nix/default.nix

Lines changed: 4 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -59,47 +59,13 @@ in lib.makeExtensible (self: {
5959

6060
nix_2_5 = throw "nixVersions.nix_2_5 has been removed";
6161

62-
# This is the last version of nix where https://github.com/NixOS/nix/issues/6572
63-
# is not an unsolved breaking bug. Please keep it until the issue is fixed
64-
# and in latest stable nix.
65-
nix_2_6 = common {
66-
version = "2.6.1";
67-
sha256 = "sha256-E9iQ7f+9Z6xFcUvvfksTEfn8LsDfzmwrcRBC//5B3V0=";
68-
};
62+
nix_2_6 = throw "nixVersions.nix_2_6 has been removed";
6963

70-
nix_2_7 = common {
71-
version = "2.7.0";
72-
sha256 = "sha256-m8tqCS6uHveDon5GSro5yZor9H+sHeh+v/veF1IGw24=";
73-
patches = [
74-
# remove when there's a 2.7.1 release
75-
# https://github.com/NixOS/nix/pull/6297
76-
# https://github.com/NixOS/nix/issues/6243
77-
# https://github.com/NixOS/nixpkgs/issues/163374
78-
(fetchpatch {
79-
url = "https://github.com/NixOS/nix/commit/c9afca59e87afe7d716101e6a75565b4f4b631f7.patch";
80-
sha256 = "sha256-xz7QnWVCI12lX1+K/Zr9UpB93b10t1HS9y/5n5FYf8Q=";
81-
})
82-
];
83-
};
64+
nix_2_7 = throw "nixVersions.nix_2_7 has been removed";
8465

85-
nix_2_8 = common {
86-
version = "2.8.1";
87-
sha256 = "sha256-zldZ4SiwkISFXxrbY/UdwooIZ3Z/I6qKxtpc3zD0T/o=";
88-
};
66+
nix_2_8 = throw "nixVersions.nix_2_8 has been removed";
8967

90-
nix_2_9 = common {
91-
version = "2.9.2";
92-
sha256 = "sha256-uZCaBo9rdWRO/AlQMvVVjpAwzYijB2H5KKQqde6eHkg=";
93-
patches = [
94-
(fetchpatch {
95-
# https://github.com/NixOS/nix/pull/7283
96-
name = "fix-requires-non-existing-output.patch";
97-
url = "https://github.com/NixOS/nix/commit/3ade5f5d6026b825a80bdcc221058c4f14e10a27.patch";
98-
sha256 = "sha256-s1ybRFCjQaSGj7LKu0Z5g7UiHqdJGeD+iPoQL0vaiS0=";
99-
})
100-
patch-sqlite-exception
101-
];
102-
};
68+
nix_2_9 = throw "nixVersions.nix_2_9 has been removed";
10369

10470
nix_2_10 = common {
10571
version = "2.10.3";

0 commit comments

Comments
 (0)