Skip to content

Commit 7ae8f42

Browse files
committed
top-level: drop x86_64-darwin deprecation warning
It's annoying to see this poping up all over the place in my CI.
1 parent a8e7533 commit 7ae8f42

1 file changed

Lines changed: 3 additions & 29 deletions

File tree

pkgs/top-level/default.nix

Lines changed: 3 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -18,25 +18,6 @@
1818
or dot-files.
1919
*/
2020

21-
let
22-
# We hoist this above the closure so that the same thunk is shared
23-
# between multiple imports of Nixpkgs. This ensures that commands
24-
# like `nix eval nixpkgs#legacyPackages.x86_64-darwin.pkgsStatic.hello`
25-
# print only one warning, which would otherwise be spammy in common
26-
# scenarios that instantiate many copies of Nixpkgs.
27-
#
28-
# Unfortunately, flakes’ handling of transitive dependencies mean
29-
# that it’s still likely users will see multiple warnings, but
30-
# there’s nothing we can do about that within the constraints of the
31-
# Nix language.
32-
x86_64DarwinDeprecationWarning =
33-
pristineLib.warn
34-
"Nixpkgs 26.05 will be the last release to support x86_64-darwin; see https://nixos.org/manual/nixpkgs/unstable/release-notes#x86_64-darwin-26.05"
35-
(x: x);
36-
37-
pristineLib = import ../../lib;
38-
in
39-
4021
{
4122
# The system packages will be built on. See the manual for the
4223
# subtle division of labor between these two `*System`s and the three
@@ -74,6 +55,8 @@ let # Rename the function arguments
7455

7556
in
7657
let
58+
pristineLib = import ../../lib;
59+
7760
lib =
7861
if __allowFileset then
7962
pristineLib
@@ -99,17 +82,8 @@ let
9982
(throwIfNot (lib.isList overlays) "The overlays argument to nixpkgs must be a list.")
10083
(throwIfNot (lib.all lib.isFunction overlays) "All overlays passed to nixpkgs must be functions.")
10184
(throwIfNot (lib.isList crossOverlays) "The crossOverlays argument to nixpkgs must be a list.")
102-
(throwIfNot (lib.all lib.isFunction crossOverlays) "All crossOverlays passed to nixpkgs must be functions.")
10385
(
104-
if
105-
(
106-
((localSystem.isDarwin && localSystem.isx86) || (crossSystem.isDarwin && crossSystem.isx86))
107-
&& config.allowDeprecatedx86_64Darwin == false
108-
)
109-
then
110-
x86_64DarwinDeprecationWarning
111-
else
112-
x: x
86+
throwIfNot (lib.all lib.isFunction crossOverlays) "All crossOverlays passed to nixpkgs must be functions."
11387
);
11488

11589
localSystem = lib.systems.elaborate args.localSystem;

0 commit comments

Comments
 (0)