diff --git a/pkgs/development/node-packages/composition.nix b/pkgs/development/node-packages/composition.nix index 6d49245bff5d4..81fd339264a62 100644 --- a/pkgs/development/node-packages/composition.nix +++ b/pkgs/development/node-packages/composition.nix @@ -18,7 +18,7 @@ let writeShellScript ; inherit pkgs nodejs; - libtool = if pkgs.stdenv.hostPlatform.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null; + libtool = if pkgs.stdenv.hostPlatform.isDarwin then pkgs.cctools else null; }; in import ./node-packages.nix { diff --git a/pkgs/top-level/darwin-aliases.nix b/pkgs/top-level/darwin-aliases.nix index 2d4608cc2201e..94fdb5cbd33d0 100644 --- a/pkgs/top-level/darwin-aliases.nix +++ b/pkgs/top-level/darwin-aliases.nix @@ -2,9 +2,6 @@ lib: self: super: pkgs: ### Deprecated aliases - for backward compatibility -### Please maintain this list in ASCIIbetical ordering. -### Hint: the "sections" are delimited by ### ### - # These aliases should not be used within nixpkgs, but exist to improve # backward compatibility in projects outside of nixpkgs. See the # documentation for the `allowAliases` option for more background. @@ -97,61 +94,26 @@ in stubs // mapAliases { - ### A ### - - apple_sdk_10_12 = throw "darwin.apple_sdk_10_12 was removed as Nixpkgs no longer supports macOS 10.12; see the 25.05 release notes"; # Added 2024-10-27 - - ### B ### - - builder = throw "'darwin.builder' has been changed and renamed to 'darwin.linux-builder'. The default ssh port is now 31022. Please update your configuration or override the port back to 22. See https://nixos.org/manual/nixpkgs/unstable/#sec-darwin-builder"; # added 2023-07-06 - bsdmake = pkgs.bmake; # added 2024-10-03 - - ### C ### - - cctools = pkgs.cctools; # added 2024-07-17 - cctools-apple = pkgs.cctools; # added 2024-07-01 - cctools-llvm = pkgs.cctools; # added 2024-07-01 - cctools-port = pkgs.cctools; # added 2024-07-17 - - ### D ### - - discrete-scroll = pkgs.discrete-scroll; # added 2024-11-27 - ditto = throw "'darwin.ditto' has been removed, because it was impure and unused"; # added 2025-10-18 - - ### I ### - - insert_dylib = throw "'darwin.insert_dylib' has been renamed to 'insert-dylib'"; # added 2024-04-04 - ios-deploy = throw "'darwin.ios-deploy' has been renamed to 'ios-deploy'"; # added 2024-11-28 - iproute2mac = lib.warnOnInstantiate "darwin.iproute2mac has been renamed to iproute2mac" pkgs.iproute2mac; # added 2024-12-08 - - ### L ### - - libauto = throw "'darwin.libauto' has been removed, as it was broken and unmaintained"; # added 2024-05-10 - libresolvHeaders = throw "darwin.libresolvHeaders has been removed; use `lib.getInclude darwin.libresolv`"; # converted to throw 2025-07-29 - libtapi = pkgs.libtapi; # 2024-08-16 - libutilHeaders = throw "darwin.libutilHeaders has been removed; use `lib.getInclude darwin.libutil`"; # converted to throw 2025-07-29 - - ### M ### - - moltenvk = pkgs.moltenvk; # 2024-10-06 - - ### O ### - - opencflite = pkgs.opencflite; # added 2024-05-02 - openwith = pkgs.openwith; # added 2025-11-28 - - ### P ### - postLinkSignHook = throw "'darwin.postLinkSignHook' has been removed because it is obsolete"; # added 2025-02-23 - print-reexports = throw "'darwin.print-reexports' has been removed as it was unused"; # added 2025-04-20 - - ### R ### - - rewrite-tbd = throw "'darwin.rewrite-tbd' has been removed, as it was unused and replaced by `llvm-readtapi(1)`"; # added 2025-04-20 - - ### S ### - - stdenvNoCF = throw "darwin.stdenvNoCF has been removed; use `stdenv` or `stdenvNoCC`"; # converted to throw 2025-07-29 - stubs = throw "'darwin.stubs.*' have been removed as they were unused"; # added 2025-04-20 - sudo = throw "'darwin.sudo' has been removed, because it was impure and unused"; # added 2025-10-18 - swift-corelibs-foundation = throw "'darwin.swift-corelibs-foundation' has been removed, as it was broken and is no longer used"; # added 2025-04-20 + # lib.warnOnInstantiate gives strange warnings during CI eval on aarch64-darwin: + # warning: evaluation warning: `darwin.cctools` has been replaced by `pkgs.cctools` + # even there are seemingly no usages of it + cctools = pkgs.cctools; # Added 2024-07-17 + + # keep-sorted start case=no numeric=yes + bsdmake = lib.warnOnInstantiate "`darwin.bsdmake` has been replaced by `pkgs.bmake`" pkgs.bmake; # Added 2025-11-30 + cctools-apple = lib.warnOnInstantiate "`darwin.cctools-apple` has been replaced by `pkgs.cctools`" pkgs.cctools; # Added 2024-07-01 + cctools-llvm = lib.warnOnInstantiate "`darwin.cctools-llvm` has been replaced by `pkgs.cctools`" pkgs.cctools; # Added 2024-07-01 + cctools-port = lib.warnOnInstantiate "`darwin.cctools-port` has been replaced by `pkgs.cctools`" pkgs.cctools; # Added 2024-07-17 + discrete-scroll = lib.warnOnInstantiate "`darwin.discrete-scroll` has been replaced by `pkgs.discrete-scroll`" pkgs.discrete-scroll; # Added 2024-11-27 + ditto = throw "`darwin.ditto` has been removed, because it was impure and unused"; # Added 2025-10-18 + iproute2mac = lib.warnOnInstantiate "`darwin.iproute2mac` has been replaced by `pkgs.iproute2mac`" pkgs.iproute2mac; # Added 2024-12-08 + libresolvHeaders = throw "`darwin.libresolvHeaders` has been removed; use `lib.getInclude darwin.libresolv`"; # Converted to throw 2025-07-29 + libtapi = lib.warnOnInstantiate "`darwin.libtapi` has been replaced by `pkgs.libtapi`" pkgs.libtapi; # Added 2024-08-16 + libutilHeaders = throw "`darwin.libutilHeaders` has been removed; use `lib.getInclude darwin.libutil`"; # Converted to throw 2025-07-29 + moltenvk = lib.warnOnInstantiate "`darwin.moltenvk` has been replaced by `pkgs.moltenvk`" pkgs.moltenvk; # Added 2024-10-06 + opencflite = lib.warnOnInstantiate "`darwin.opencflite` has been replaced by `pkgs.opencflite`" pkgs.opencflite; # Added 2024-05-02 + openwith = lib.warnOnInstantiate "`darwin.openwith` has been replaced by `pkgs.openwith`" pkgs.openwith; # Added 2025-11-28 + stdenvNoCF = throw "`darwin.stdenvNoCF` has been removed; use `stdenv` or `stdenvNoCC`"; # Converted to throw 2025-07-29 + sudo = throw "`darwin.sudo` has been removed, because it was impure and unused"; # Added 2025-10-18 + # keep-sorted end }