Unverified Commit e0e6c5c6 authored by Sergei Zimmerman's avatar Sergei Zimmerman
Browse files

nixVersions.git: 2.32pre20250919_07b96c1d -> 2.33pre20251107_479b6b73 

Git version was lagging behind 2.32 a lot. A lot of commits to catch up on.
There are some notable changes like dropping the aws-sdk-cpp in favor of the much
lighter aws-crt-cpp.

Diff: https://github.com/NixOS/nix/compare/07b96c1d14ab8695e5071fb73e19049fce8f3b6b...479b6b73a9576452c14ca66b7f3cd4873969077e
parent d943d108

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

+3 −3
Original line number Diff line number Diff line
@@ -194,14 +194,14 @@ lib.makeExtensible ( 
      nix_2_32 = addTests "nix_2_32" self.nixComponents_2_32.nix-everything;



      nixComponents_git = nixDependencies.callPackage ./modular/packages.nix rec {

        version = "2.32pre20250919_${lib.substring 0 8 src.rev}";

        version = "2.33pre20251107_${lib.substring 0 8 src.rev}";

        inherit maintainers teams;

        otherSplices = generateSplicesForNixComponents "nixComponents_git";

        src = fetchFromGitHub {

          owner = "NixOS";

          repo = "nix";

          rev = "07b96c1d14ab8695e5071fb73e19049fce8f3b6b";

          hash = "sha256-9tR08zFwQ9JNohdfeb40wcLfRnicXpKrHF+FHFva/WA=";

          rev = "479b6b73a9576452c14ca66b7f3cd4873969077e";

          hash = "sha256-eBjgsauQXFz2yeiNoPEzgkf7uyV+S8HYCQgZhPVx/9I=";

        };

      };

pkgs/tools/package-management/nix/modular/doc/manual/package.nix

+4 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
  jq,

  python3,

  rsync,

  json-schema-for-humans,

  nix-cli,



  # Configuration Options
@@ -39,6 +40,9 @@ mkMesonDerivation (finalAttrs: { 
    jq

    python3

    rsync

  ]

  ++ lib.optional (lib.versionAtLeast (lib.versions.majorMinor version) "2.33") [

    json-schema-for-humans

  ];



  nativeBuildInputs = finalAttrs.passthru.externalNativeBuildInputs ++ [

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

+5 −3
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
  boost,

  curl,

  aws-sdk-cpp,

  aws-crt-cpp,

  libseccomp,

  nlohmann_json,

  sqlite,
@@ -37,9 +38,10 @@ mkMesonLibrary (finalAttrs: { 
  ]

  ++ lib.optional stdenv.hostPlatform.isLinux libseccomp

  # There have been issues building these dependencies

  ++ lib.optional (

    stdenv.hostPlatform == stdenv.buildPlatform && (stdenv.isLinux || stdenv.isDarwin)

  ) aws-sdk-cpp;

  ++

    lib.optional (stdenv.hostPlatform == stdenv.buildPlatform && (stdenv.isLinux || stdenv.isDarwin))

      # Nix >=2.33 doesn't depend on aws-sdk-cpp and only requires aws-crt-cpp for authenticated s3:// requests.

      (if lib.versionAtLeast (lib.versions.majorMinor version) "2.33" then aws-crt-cpp else aws-sdk-cpp);



  propagatedBuildInputs = [

    nix-util