Unverified Commit 37f4d841 authored by Philip Taron's avatar Philip Taron Committed by GitHub
Browse files

nixVersions.stable: 2.31.4 -> 2.34.6 (#505121)

parents 0a686310 0ca69b06

nixos/modules/installer/tools/nix-fallback-paths.nix

+6 −6
Original line number Diff line number Diff line 
{

  x86_64-linux = "/nix/store/vals1fs2rl6yn5f8gbqj9mvly4r27shs-nix-2.31.4";

  i686-linux = "/nix/store/fyrlz8cdzvf5csdh5885wifpxc8ywdii-nix-2.31.4";

  aarch64-linux = "/nix/store/19p3nc892m7idfg2ngd1614660xqbhnm-nix-2.31.4";

  riscv64-linux = "/nix/store/x1isvq0xnyrg0l29qk2xlp929cgjsmqy-nix-riscv64-unknown-linux-gnu-2.31.4";

  x86_64-darwin = "/nix/store/4gqxzd5zkxcq271wi5saml4zd92rdkws-nix-2.31.4";

  aarch64-darwin = "/nix/store/r3gz609kdqchxcmil7dhbravbq8kwm93-nix-2.31.4";

  x86_64-linux = "/nix/store/q7f0d4m54yj98fcjmbkscw83j82fypnd-nix-2.34.6";

  i686-linux = "/nix/store/mlv349bmjjx34p50idp54rg0wsm44hws-nix-2.34.6";

  aarch64-linux = "/nix/store/wlcv2ymswfgwv1cj1q29p26rh26xj3nd-nix-2.34.6";

  riscv64-linux = "/nix/store/000b0vjlhw359rl82p8pld00g6363c78-nix-riscv64-unknown-linux-gnu-2.34.6";

  x86_64-darwin = "/nix/store/mqvv503c5l9kgjvc7vyxj3rdx5a71c11-nix-2.34.6";

  aarch64-darwin = "/nix/store/hcgga2smfm8lqirshrbfpk5j1my1wh4j-nix-2.34.6";

}

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

+1 −1
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ lib.makeExtensible ( 
      latest = self.nix_2_34;



      # Read ./README.md before bumping a major release

      stable = addFallbackPathsCheck self.nix_2_31;

      stable = addFallbackPathsCheck self.nix_2_34;

    }

    // lib.optionalAttrs config.allowAliases (

      lib.listToAttrs (

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

+2 −2
Original line number Diff line number Diff line
@@ -62,10 +62,10 @@ mkMesonExecutable (finalAttrs: { 
        runCommand "${finalAttrs.pname}-run"

          {

            meta.broken = !stdenv.hostPlatform.emulatorAvailable buildPackages;

            buildInputs = [

            nativeBuildInputs = [

              writableTmpDirAsHomeHook

            ]

            ++ lib.optional (lib.versionAtLeast version "2.34pre") openssl;

            ++ lib.optional (lib.versionAtLeast version "2.34pre") (lib.getBin openssl);

          }

          ''

            export _NIX_TEST_UNIT_DATA=${data + "/src/libstore-tests/data"}