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

nixVersions.nix_2_24: 2.24.12 -> 2.24.13 (#393707)

parents bb0e0d9a 49a708c3

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

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

  x86_64-linux = "/nix/store/kwck2vdfdp2v4jr9c4daryyk9mlbx406-nix-2.24.12";

  i686-linux = "/nix/store/s9qqyxzcgjl7xrfhnnjiiy9v876pcphi-nix-2.24.12";

  aarch64-linux = "/nix/store/pmj4g05d4nlr3gcr8nyadgwir3svbkmx-nix-2.24.12";

  riscv64-linux = "/nix/store/nzr3m4x3mcnfpnmyap31f9pviwv29vyc-nix-riscv64-unknown-linux-gnu-2.24.12";

  x86_64-darwin = "/nix/store/pf6msb0yzccznd75yil32mzk284h90z4-nix-2.24.12";

  aarch64-darwin = "/nix/store/vaaakw66qnbw4g007rf2nggy0rmhf8fh-nix-2.24.12";

  x86_64-linux = "/nix/store/00a7rdfwhm6avqkgj68grddbzyz3h6ql-nix-2.24.13";

  i686-linux = "/nix/store/s6c620v60hfishzi1lbfpryk65lbvg8g-nix-2.24.13";

  aarch64-linux = "/nix/store/7yg9is1shh3383iwi6qynz3vh91l1f9d-nix-2.24.13";

  riscv64-linux = "/nix/store/fagjkrx5r6p52xp8qb5581bmnlgp01sn-nix-riscv64-unknown-linux-gnu-2.24.13";

  x86_64-darwin = "/nix/store/ifby7rrgkkly5pzjnyac90lzvrak3i9y-nix-2.24.13";

  aarch64-darwin = "/nix/store/b0rbdp6ba2fprprpgsw1a8pplzg0j324-nix-2.24.13";

}

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

+2 −2
Original line number Diff line number Diff line
@@ -238,8 +238,8 @@ lib.makeExtensible ( 
          };



      nix_2_24 = common {

        version = "2.24.12";

        hash = "sha256-lPiheE0D146tstoUInOUf1451stezrd8j6H6w7+RCv8=";

        version = "2.24.13";

        hash = "sha256-lUsK8lAwaaTEM+KFML/6sYwaVAiSf70g1EfSDJNNrU0=";

        self_attribute_name = "nix_2_24";

      };

pkgs/tools/package-management/nix/update-all.sh

+12 −2
Original line number Diff line number Diff line
@@ -8,6 +8,16 @@ NIXPKGS_DIR=$(readlink -f "$SCRIPT_DIR/../../../..") 
cd "$NIXPKGS_DIR"



nix_versions=$(nix eval --impure --json --expr "with import ./. { config.allowAliases = false; }; builtins.filter (name: builtins.match \"nix_.*\" name != null) (builtins.attrNames nixVersions)" | jq -r '.[]')



for name in $nix_versions; do

    minor_version=${name#nix_*_}

    if [[ "$name" = "nix_2_3" ]]; then # not maintained by the nix team

        continue

    fi



    nix-update --override-filename "$SCRIPT_DIR/default.nix" --version-regex "(2\\.${minor_version}\..+)" --build --commit "nixVersions.$name"

done



stable_version_full=$(nix eval --impure --json --expr "with import ./. { config.allowAliases = false; }; nixVersions.stable.version" | jq -r)



# strip patch version
@@ -22,7 +32,7 @@ for name in $nix_versions; do 
        curl https://releases.nixos.org/nix/nix-$stable_version_full/fallback-paths.nix > "$NIXPKGS_DIR/nixos/modules/installer/tools/nix-fallback-paths.nix"

        # nix-update will commit the file if it has changed

        git add "$NIXPKGS_DIR/nixos/modules/installer/tools/nix-fallback-paths.nix"

        git commit -m "nix: update nix-fallback-paths to $stable_version_full"

        break

    fi



    nix-update --override-filename "$SCRIPT_DIR/default.nix" --version-regex "(2\\.${minor_version}\..+)" --build --commit "nixVersions.$name"

done