From 6e42fdac614ee44239198f6dbf7457d8b919600a Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Tue, 17 Feb 2026 10:04:45 -0500 Subject: [PATCH] =?UTF-8?q?nixVersions.git:=202.34pre20251217=20=E2=86=92?= =?UTF-8?q?=202.34pre20260217?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/package-management/nix/default.nix | 6 +-- .../nix/modular/packaging/components.nix | 1 + .../nix/modular/packaging/everything.nix | 5 +++ .../src/libstore-test-support/package.nix | 5 ++- .../modular/src/libstore-tests/package.nix | 7 ++- .../nix/modular/src/libstore/package.nix | 5 ++- .../nix/modular/src/nswrapper/package.nix | 43 +++++++++++++++++++ 7 files changed, 66 insertions(+), 6 deletions(-) create mode 100644 pkgs/tools/package-management/nix/modular/src/nswrapper/package.nix diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index b235f0a37d7c..7db5e87ceff6 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -222,14 +222,14 @@ lib.makeExtensible ( nixComponents_git = (nixDependencies.callPackage ./modular/packages.nix rec { - version = "2.34pre20251217_${lib.substring 0 8 src.rev}"; + version = "2.34pre20260217_${lib.substring 0 8 src.rev}"; inherit teams; otherSplices = generateSplicesForNixComponents "nixComponents_git"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "b6add8dcc6f4f6feb1ce83aaffe4d7e660e6f616"; - hash = "sha256-2au7PdQ4HXSuktTPCtOJoD/LNjqMwbHIJmuzEYW1b7I="; + rev = "6e725093e6d4dda4f6bdbab20ea3e9e9687225ec"; + hash = "sha256-dhPINhGyN3N+3zMSdM51DRTEKCPGCNO3+QsbhD0/nFc="; }; }).appendPatches patches_common; diff --git a/pkgs/tools/package-management/nix/modular/packaging/components.nix b/pkgs/tools/package-management/nix/modular/packaging/components.nix index 02b927df5a23..2282ff3d07ff 100644 --- a/pkgs/tools/package-management/nix/modular/packaging/components.nix +++ b/pkgs/tools/package-management/nix/modular/packaging/components.nix @@ -370,6 +370,7 @@ in nix-cmd = callPackage ../src/libcmd/package.nix { }; nix-cli = callPackage ../src/nix/package.nix { }; + ${whenAtLeast "2.34pre" "nix-nswrapper"} = callPackage ../src/nswrapper/package.nix { }; nix-functional-tests = callPackage ../tests/functional/package.nix { }; diff --git a/pkgs/tools/package-management/nix/modular/packaging/everything.nix b/pkgs/tools/package-management/nix/modular/packaging/everything.nix index 8f40b8e4250f..79cce347cc88 100644 --- a/pkgs/tools/package-management/nix/modular/packaging/everything.nix +++ b/pkgs/tools/package-management/nix/modular/packaging/everything.nix @@ -35,6 +35,8 @@ nix-cli, + nix-nswrapper ? null, + nix-functional-tests, nix-manual, @@ -177,6 +179,9 @@ stdenv.mkDerivation (finalAttrs: { # Forwarded outputs ln -sT ${nix-manual} $doc ln -sT ${nix-manual.man} $man + '' + + lib.optionalString (stdenv.isLinux && lib.versionAtLeast version "2.34pre") '' + lndir ${nix-nswrapper} $out ''; passthru = { diff --git a/pkgs/tools/package-management/nix/modular/src/libstore-test-support/package.nix b/pkgs/tools/package-management/nix/modular/src/libstore-test-support/package.nix index 1211ef6b33e9..ba6498582e73 100644 --- a/pkgs/tools/package-management/nix/modular/src/libstore-test-support/package.nix +++ b/pkgs/tools/package-management/nix/modular/src/libstore-test-support/package.nix @@ -8,6 +8,8 @@ rapidcheck, + gtest, + # Configuration Options version, @@ -24,7 +26,8 @@ mkMesonLibrary (finalAttrs: { nix-store nix-store-c rapidcheck - ]; + ] + ++ lib.optional (lib.versionAtLeast version "2.34pre") gtest; mesonFlags = [ ]; diff --git a/pkgs/tools/package-management/nix/modular/src/libstore-tests/package.nix b/pkgs/tools/package-management/nix/modular/src/libstore-tests/package.nix index cc0f55790f13..e31044270a76 100644 --- a/pkgs/tools/package-management/nix/modular/src/libstore-tests/package.nix +++ b/pkgs/tools/package-management/nix/modular/src/libstore-tests/package.nix @@ -10,6 +10,8 @@ nix-store-test-support, sqlite, + openssl, + rapidcheck, gtest, runCommand, @@ -60,7 +62,10 @@ mkMesonExecutable (finalAttrs: { runCommand "${finalAttrs.pname}-run" { meta.broken = !stdenv.hostPlatform.emulatorAvailable buildPackages; - buildInputs = [ writableTmpDirAsHomeHook ]; + buildInputs = [ + writableTmpDirAsHomeHook + ] + ++ lib.optional (lib.versionAtLeast version "2.34pre") openssl; } '' export _NIX_TEST_UNIT_DATA=${data + "/src/libstore-tests/data"} diff --git a/pkgs/tools/package-management/nix/modular/src/libstore/package.nix b/pkgs/tools/package-management/nix/modular/src/libstore/package.nix index 3039120e37dc..70cd4ef68356 100644 --- a/pkgs/tools/package-management/nix/modular/src/libstore/package.nix +++ b/pkgs/tools/package-management/nix/modular/src/libstore/package.nix @@ -8,6 +8,7 @@ nix-util, boost, curl, + cmake, aws-c-common, aws-sdk-cpp, aws-crt-cpp, @@ -35,7 +36,9 @@ mkMesonLibrary (finalAttrs: { workDir = ./.; - nativeBuildInputs = lib.optional embeddedSandboxShell unixtools.hexdump; + nativeBuildInputs = + lib.optional embeddedSandboxShell unixtools.hexdump + ++ lib.optional (withAWS && lib.versionAtLeast version "2.34pre") cmake; buildInputs = [ boost diff --git a/pkgs/tools/package-management/nix/modular/src/nswrapper/package.nix b/pkgs/tools/package-management/nix/modular/src/nswrapper/package.nix new file mode 100644 index 000000000000..50e25aa54110 --- /dev/null +++ b/pkgs/tools/package-management/nix/modular/src/nswrapper/package.nix @@ -0,0 +1,43 @@ +{ + lib, + mkMesonExecutable, + + nix-util, + # Configuration Options + + version, +}: + +let + inherit (lib) fileset; +in + +mkMesonExecutable (finalAttrs: { + pname = "nix-nswrapper"; + inherit version; + + workDir = ./.; + fileset = fileset.unions [ + ../../nix-meson-build-support + ./nix-meson-build-support + ../../.version + ./.version + ./meson.build + + (fileset.fileFilter (file: file.hasExt "cc") ./.) + (fileset.fileFilter (file: file.hasExt "hh") ./.) + ]; + + buildInputs = [ + nix-util + ]; + + mesonFlags = [ + ]; + + meta = { + mainProgram = "nix-nswrapper"; + platforms = lib.platforms.linux; + }; + +})