From 1f5eb6fa4ae9a026fc3b599c2b7ec04d8c923b38 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sat, 5 Apr 2025 19:58:22 +0200 Subject: [PATCH 1/8] nixVersions.stable: nix_2_24 -> nix_2_28 --- pkgs/tools/package-management/nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 89f6805752b7..6fd7f3e18dbf 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -228,7 +228,7 @@ lib.makeExtensible ( nix; # Read ./README.md before bumping a major release - stable = addFallbackPathsCheck self.nix_2_24; + stable = addFallbackPathsCheck self.nix_2_28; } // lib.optionalAttrs config.allowAliases ( lib.listToAttrs ( From 58f4fb424823f7b0e5e18b6369423fd5348f361f Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Mon, 7 Apr 2025 02:02:43 +0200 Subject: [PATCH 2/8] nix-du: nixForLinking -> nix_2_24 Upstream needs a patch for 2.28 headers rejiggle --- pkgs/tools/package-management/nix-du/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix-du/default.nix b/pkgs/tools/package-management/nix-du/default.nix index 33ef120c40bc..369eec6c9f88 100644 --- a/pkgs/tools/package-management/nix-du/default.nix +++ b/pkgs/tools/package-management/nix-du/default.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, rustPlatform, - nixForLinking, + nixVersions, nlohmann_json, boost, graphviz, @@ -27,13 +27,13 @@ rustPlatform.buildRustPackage rec { doCheck = true; nativeCheckInputs = [ - nixForLinking + nixVersions.nix_2_24 graphviz ]; buildInputs = [ boost - nixForLinking + nixVersions.nix_2_24 nlohmann_json ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; From d6bd5f2f50a9ca25e310e67e6ce0fd929baf8a20 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Mon, 7 Apr 2025 14:34:17 +0200 Subject: [PATCH 3/8] nickel: Pin nixVersions.nix_2_24 --- pkgs/by-name/ni/nickel/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ni/nickel/package.nix b/pkgs/by-name/ni/nickel/package.nix index 6be15bb7d196..4e929e4d6395 100644 --- a/pkgs/by-name/ni/nickel/package.nix +++ b/pkgs/by-name/ni/nickel/package.nix @@ -6,7 +6,7 @@ python3, versionCheckHook, pkg-config, - nix, + nixVersions, nix-update-script, enableNixImport ? true, }: @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; buildInputs = lib.optionals enableNixImport [ - nix + nixVersions.nix_2_24 boost ]; From c4dddcff9df916afeb659a3caef1272f802fa446 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Mon, 7 Apr 2025 14:37:55 +0200 Subject: [PATCH 4/8] nix-heuristic-gc: Pin nix_2_24 --- pkgs/by-name/ni/nix-heuristic-gc/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ni/nix-heuristic-gc/package.nix b/pkgs/by-name/ni/nix-heuristic-gc/package.nix index 0c0c8e76222a..88cad6addb7a 100644 --- a/pkgs/by-name/ni/nix-heuristic-gc/package.nix +++ b/pkgs/by-name/ni/nix-heuristic-gc/package.nix @@ -3,7 +3,7 @@ { lib, fetchFromGitHub, - nix, + nixVersions, boost, python3Packages, }: @@ -19,12 +19,12 @@ python3Packages.buildPythonPackage rec { # NIX_SYSTEM suggested at # https://github.com/NixOS/nixpkgs/issues/386184#issuecomment-2692433531 - NIX_SYSTEM = nix.stdenv.hostPlatform.system; - NIX_CFLAGS_COMPILE = [ "-I${lib.getDev nix}/include/nix" ]; + NIX_SYSTEM = nixVersions.nix_2_24.stdenv.hostPlatform.system; + NIX_CFLAGS_COMPILE = [ "-I${lib.getDev nixVersions.nix_2_24}/include/nix" ]; buildInputs = [ boost - nix + nixVersions.nix_2_24 python3Packages.pybind11 python3Packages.setuptools ]; From fe06019091e5c369f6a771504827bbc0799899c0 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Mon, 7 Apr 2025 14:39:08 +0200 Subject: [PATCH 5/8] nix-plugins: Pin nix_2_24 --- pkgs/by-name/ni/nix-plugins/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ni/nix-plugins/package.nix b/pkgs/by-name/ni/nix-plugins/package.nix index bb0c86e7cba6..918734291ffd 100644 --- a/pkgs/by-name/ni/nix-plugins/package.nix +++ b/pkgs/by-name/ni/nix-plugins/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - nix, + nixVersions, cmake, pkg-config, boost, @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - nix + nixVersions.nix_2_24 boost ]; From 1be27f982dbfab3b0ce63071559750de9f3c6558 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Mon, 7 Apr 2025 14:40:35 +0200 Subject: [PATCH 6/8] nixd,nixt: Pin nix_2_24 --- .../tools/language-servers/nixd/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/language-servers/nixd/default.nix b/pkgs/development/tools/language-servers/nixd/default.nix index a56c47b59b31..6dc9ff0fb969 100644 --- a/pkgs/development/tools/language-servers/nixd/default.nix +++ b/pkgs/development/tools/language-servers/nixd/default.nix @@ -8,7 +8,7 @@ llvmPackages, meson, ninja, - nixForLinking, + nixVersions, nix-update-script, nixd, nixf, @@ -101,12 +101,12 @@ in ]; buildInputs = [ - nixForLinking + nixVersions.nix_2_24 gtest boost ]; - env.CXXFLAGS = "-include ${nixForLinking.dev}/include/nix/config.h"; + env.CXXFLAGS = "-include ${nixVersions.nix_2_24.dev}/include/nix/config.h"; passthru.tests.pkg-config = testers.hasPkgConfigModules { package = nixt; @@ -127,7 +127,7 @@ in sourceRoot = "${common.src.name}/nixd"; buildInputs = [ - nixForLinking + nixVersions.nix_2_24 nixf nixt llvmPackages.llvm @@ -137,7 +137,7 @@ in nativeBuildInputs = common.nativeBuildInputs ++ [ cmake ]; - env.CXXFLAGS = "-include ${nixForLinking.dev}/include/nix/config.h"; + env.CXXFLAGS = "-include ${nixVersions.nix_2_24.dev}/include/nix/config.h"; # See https://github.com/nix-community/nixd/issues/519 doCheck = false; From a5ff1199c767ba1c2c3845d94799d84d0b4f96ab Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 7 Apr 2025 20:12:38 -0400 Subject: [PATCH 7/8] attic-client: Use Nix 2.24 for now FYI https://github.com/zhaofengli/attic/pull/234 Gets on 2.28 --- pkgs/by-name/at/attic-client/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/at/attic-client/package.nix b/pkgs/by-name/at/attic-client/package.nix index f0ddc302125c..5e8c267dbf2d 100644 --- a/pkgs/by-name/at/attic-client/package.nix +++ b/pkgs/by-name/at/attic-client/package.nix @@ -2,7 +2,7 @@ lib, rustPlatform, fetchFromGitHub, - nixForLinking, + nixVersions, nixosTests, boost, pkg-config, @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage { buildInputs = [ - nixForLinking + nixVersions.nix_2_24 boost ] ++ lib.optionals stdenv.hostPlatform.isDarwin ( @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage { useFetchCargoVendor = true; ATTIC_DISTRIBUTOR = "nixpkgs"; - NIX_INCLUDE_PATH = "${lib.getDev nixForLinking}/include"; + NIX_INCLUDE_PATH = "${lib.getDev nixVersions.nix_2_24}/include"; # Attic interacts with Nix directly and its tests require trusted-user access # to nix-daemon to import NARs, which is not possible in the build sandbox. From f81520f83cdccde21d5da4f9369936a8bc4a30b5 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 7 Apr 2025 20:23:16 -0400 Subject: [PATCH 8/8] libblake3: Don't use TBB by default for now See comment: there are some issues, and since this is all rather new and Nix dependency, I am wary of a conditional dep so close to the Nixpkgs stable release. If we can get a mostly unconditional fix (at least everything but MinGW), I am happy to enable again. --- pkgs/by-name/li/libblake3/package.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/li/libblake3/package.nix b/pkgs/by-name/li/libblake3/package.nix index f8ad9df8f55f..59306559958e 100644 --- a/pkgs/by-name/li/libblake3/package.nix +++ b/pkgs/by-name/li/libblake3/package.nix @@ -4,7 +4,13 @@ cmake, fetchFromGitHub, tbb_2021_11, - useTBB ? true, + + # Until we have a release with + # https://github.com/BLAKE3-team/BLAKE3/pull/461 and similar, or those + # PRs are patched onto this current release. Even then, I think we + # still need to disable for MinGW build because + # https://github.com/BLAKE3-team/BLAKE3/issues/467 + useTBB ? false, }: stdenv.mkDerivation (finalAttrs: {