Commit b39581da authored by zowoq's avatar zowoq
Browse files

nixVersions.git: 2.35pre20260407 -> 2.35pre20260503

parent 788368c3

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

+3 −3
Original line number Diff line number Diff line
@@ -213,14 +213,14 @@ lib.makeExtensible ( 


      nixComponents_git =

        (nixDependencies.callPackage ./modular/packages.nix rec {

          version = "2.35pre20260407_${lib.substring 0 8 src.rev}";

          version = "2.35pre20260503_${lib.substring 0 8 src.rev}";

          inherit teams;

          otherSplices = generateSplicesForNixComponents "nixComponents_git";

          src = fetchFromGitHub {

            owner = "NixOS";

            repo = "nix";

            rev = "a37db9d249afd61a81ae26368696f60e065d6f61";

            hash = "sha256-RpfExg4DcWZ/SanVuwVbdijqPylsjvtMrHTQHemE+t8=";

            rev = "61024d0855f397d80a2c8c554188fd3bd9b171a2";

            hash = "sha256-Bu0+ILJVOfrblVrgQGYSDJTpjPwsciQ80kjm7aPi1lo=";

          };

        }).appendPatches

          patches_common;

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

+2 −1
Original line number Diff line number Diff line
@@ -380,7 +380,8 @@ in 
  nix-internal-api-docs = callPackage ../src/internal-api-docs/package.nix { };

  nix-external-api-docs = callPackage ../src/external-api-docs/package.nix { };



  nix-perl-bindings = callPackage ../src/perl/package.nix { };

  nix-perl-bindings =

    if (lib.versionAtLeast version "2.35pre") then null else callPackage ../src/perl/package.nix { };



  nix-everything = callPackage ../packaging/everything.nix { } // {

    # Note: no `passthru.overrideAllMesonComponents` etc

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

+11 −2
Original line number Diff line number Diff line
@@ -74,7 +74,11 @@ let 
  }

  //

    lib.optionalAttrs

      (!stdenv.hostPlatform.isStatic && stdenv.buildPlatform.canExecute stdenv.hostPlatform)

      (

        (lib.versionOlder version "2.35pre")

        && !stdenv.hostPlatform.isStatic

        && stdenv.buildPlatform.canExecute stdenv.hostPlatform

      )

      {

        # Currently fails in static build

        inherit
@@ -147,7 +151,12 @@ stdenv.mkDerivation (finalAttrs: { 
    nix-functional-tests

  ]

  ++

    lib.optionals (!stdenv.hostPlatform.isStatic && stdenv.buildPlatform.canExecute stdenv.hostPlatform)

    lib.optionals

      (

        (lib.versionOlder version "2.35pre")

        && !stdenv.hostPlatform.isStatic

        && stdenv.buildPlatform.canExecute stdenv.hostPlatform

      )

      [

        # Perl currently fails in static build

        # TODO: Split out tests into a separate derivation?

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

+3 −1
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
  nix-fetchers,

  boost,

  boehmgc,

  libcpuid,

  nlohmann_json,

  toml11,
@@ -45,7 +46,8 @@ mkMesonLibrary (finalAttrs: { 


  buildInputs = [

    toml11

  ];

  ]

  ++ lib.optional ((lib.versionAtLeast version "2.35pre") && stdenv.hostPlatform.isx86_64) libcpuid;



  propagatedBuildInputs = [

    nix-util

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

+18 −2
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
  mkMesonLibrary,



  unixtools,

  freebsd,



  nix-util,

  boost,
@@ -17,6 +18,7 @@ 
  sqlite,



  busybox-sandbox-shell ? null,

  pkgsStatic,



  # Configuration Options
@@ -24,6 +26,17 @@ 


  embeddedSandboxShell ? stdenv.hostPlatform.isStatic,



  withSandboxShell ?

    stdenv.hostPlatform.isLinux

    || (lib.versionAtLeast version "2.35pre" && stdenv.hostPlatform.isFreeBSD),

  sandboxShell ?

    if stdenv.hostPlatform.isLinux then

      "${busybox-sandbox-shell}/bin/busybox"

    else if stdenv.hostPlatform.isFreeBSD then

      "${pkgsStatic.bash}/bin/bash"

    else

      null,



  withAWS ?

    # Default is this way because there have been issues building this dependency

    # TODO: aws-crt-cpp is broken on cygwin, find a good way to check that here
@@ -45,6 +58,9 @@ mkMesonLibrary (finalAttrs: { 
    curl

    sqlite

  ]

  ++ lib.optional (

    lib.versionAtLeast version "2.35pre" && stdenv.hostPlatform.isFreeBSD

  ) freebsd.libjail

  ++ lib.optional stdenv.hostPlatform.isLinux libseccomp

  # There have been issues building these dependencies

  ++
@@ -64,8 +80,8 @@ mkMesonLibrary (finalAttrs: { 
  ++ lib.optional (lib.versionAtLeast (lib.versions.majorMinor version) "2.33") (

    lib.mesonEnable "s3-aws-auth" withAWS

  )

  ++ lib.optionals stdenv.hostPlatform.isLinux [

    (lib.mesonOption "sandbox-shell" "${busybox-sandbox-shell}/bin/busybox")

  ++ lib.optionals withSandboxShell [

    (lib.mesonOption "sandbox-shell" sandboxShell)

  ];



  meta = {