Unverified Commit 742c4332 authored by John Ericson's avatar John Ericson Committed by GitHub
Browse files

nixVersions.git: 2.34pre20251217 → 2.34pre20260217 (#491822)

parents 97d599f4 6e42fdac

pkgs/tools/package-management/nix/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -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;

pkgs/tools/package-management/nix/modular/packaging/components.nix

+1 −0
Original line number Diff line number Diff line
@@ -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 { };

pkgs/tools/package-management/nix/modular/packaging/everything.nix

+5 −0
Original line number Diff line number Diff line
@@ -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 = {

pkgs/tools/package-management/nix/modular/src/libstore-test-support/package.nix

+4 −1
Original line number Diff line number Diff line
@@ -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 = [

  ];

pkgs/tools/package-management/nix/modular/src/libstore-tests/package.nix

+6 −1
Original line number Diff line number Diff line
@@ -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"}