From e5f5e4064233e94dd99fc5ef7afc81fda99f7b11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 14 Aug 2025 12:03:04 +0200 Subject: [PATCH] nixForLinking: drop alias --- pkgs/by-name/nu/nurl/package.nix | 4 ++-- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 10 ---------- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/nu/nurl/package.nix b/pkgs/by-name/nu/nurl/package.nix index 7781aa82f5bff..5ce4c166d4fee 100644 --- a/pkgs/by-name/nu/nurl/package.nix +++ b/pkgs/by-name/nu/nurl/package.nix @@ -6,7 +6,7 @@ makeBinaryWrapper, gitMinimal, mercurial, - nixForLinking, + nix, }: rustPlatform.buildRustPackage rec { @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { lib.makeBinPath [ gitMinimal mercurial - nixForLinking + nix ] } installManPage artifacts/nurl.1 diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index eb62ecb326a6d..6c16ca998d68e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1402,6 +1402,7 @@ mapAliases { ''; # Added 2024-06-25 nextcloud27Packages = throw "Nextcloud27 is EOL!"; # Added 2024-06-25 nextcloud-news-updater = throw "nextcloud-news-updater has been removed because the project is unmaintained"; # Added 2025-03-28 + nixForLinking = throw "nixForLinking has been removed, use `nixVersions.nixComponents_` instead"; # Added 2025-08-14 nagiosPluginsOfficial = monitoring-plugins; neochat = makePlasma5Throw "neochat"; # added 2022-05-10 nerdfonts = throw '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 75ccdc890c0cd..9de885bac4e4a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15612,16 +15612,6 @@ with pkgs; nix = nixVersions.stable; - # Overlays for CppNix nightly, Lix, or Tvix want to change the default Nix - # implementation in Nixpkgs by overriding `pkgs.nix`. However, some packages - # link against the internal/unstable CppNix APIs directly, and these packages - # will break if built with different versions or implementations of Nix. - # - # If you want to swap out the Nix implementation in your package set, you - # don't want these packages to break. Therefore, some packages will refer to - # `nixForLinking` explicitly, at least until these dependencies can be sorted out. - nixForLinking = nixVersions.stable; - nixStatic = pkgsStatic.nix; lixPackageSets = recurseIntoAttrs (