Commit 081c90ff authored by Luka Blaskovic's avatar Luka Blaskovic Committed by zowoq
Browse files

rustc: 1.68.2 -> 1.69.0

parent 79193f92

pkgs/development/compilers/rust/1_68.nix→pkgs/development/compilers/rust/1_69.nix

+63 −0
Original line number Diff line number Diff line
@@ -17,12 +17,11 @@ 
, makeRustPlatform

, llvmPackages_11

, llvmPackages_15, llvm_15

, fetchpatch

} @ args:



import ./default.nix {

  rustcVersion = "1.68.2";

  rustcSha256 = "sha256-kzOcI/fNTQxF21jhi0xuFtYHD0J3qtnSSS0jKUvzLpY=";

  rustcVersion = "1.69.0";

  rustcSha256 = "sha256-+wWXGGetbMq703ICefWpS5n2ECSSMYe1a7XEVfo89g8=";



  llvmSharedForBuild = pkgsBuildBuild.llvmPackages_15.libllvm.override { enableSharedLibraries = true; };

  llvmSharedForHost = pkgsBuildHost.llvmPackages_15.libllvm.override { enableSharedLibraries = true; };
@@ -38,36 +37,27 @@ import ./default.nix { 


  # Note: the version MUST be one version prior to the version we're

  # building

  bootstrapVersion = "1.67.1";

  bootstrapVersion = "1.68.2";



  # fetch hashes by running `print-hashes.sh ${bootstrapVersion}`

  bootstrapHashes = {

    i686-unknown-linux-gnu = "4fe2128cfc32687e4717da4c6cb21aa563c36802c8e695cd3537a45efc5b8729";

    x86_64-unknown-linux-gnu = "652a8966436c4e97b127721d9130810e1cdc8dfdf526fad68c9c1f6281bd02a3";

    x86_64-unknown-linux-musl = "6fdc9379f662f8e9edd2d23e0a3ebcda502cc9f9a381b7c7d5fa38c326a82ad1";

    arm-unknown-linux-gnueabihf = "eb919ef62a084797c148574abe39f2fb1e52d20b004041090811a6d479eb6503";

    armv7-unknown-linux-gnueabihf = "09614988feb6310f64eaadf609c92dba5da5ebdbb5531b43a2b18d5336296b67";

    aarch64-unknown-linux-gnu = "8edee248eed4b17c09b3d7b0096944b7e5992dd1119a28429c0b6b4d39a9613c";

    aarch64-unknown-linux-musl = "05d03936493c19483eec4dc63d03f9e7a13f356d1147d1b8d7fc5dbfe508b4ed";

    x86_64-apple-darwin = "020702c9564f53e18ac880db77c2f6b660a24ea372e4fda3f0c1ef2f8b9c74b9";

    aarch64-apple-darwin = "8b07560267ec85703a5a9397a1746170fd7013e29fcfb9ffb8daa9bbf1e3211a";

    powerpc64le-unknown-linux-gnu = "1d4d8b75c72362bb6e02bf56b53af9287806c4ef08187b8d166af0557a7c0096";

    riscv64gc-unknown-linux-gnu = "a1a33154aeb5498c0c24a2ba77ec63e31a40df5e0861c0afda8d5867289c5984";

    mips64el-unknown-linux-gnuabi64 = "6d70fe81e4f52ce5d87bcf95b60587f43f68e6730d2def7872646a9c561017ca";

    i686-unknown-linux-gnu = "a85e1aa0831e8bd31dc8ba3e042b6dea69b4d45fd5d1111bf6fd2cc9d58dd619";

    x86_64-unknown-linux-gnu = "df7c7466ef35556e855c0d35af7ff08e133040400452eb3427c53202b6731926";

    x86_64-unknown-linux-musl = "bd02cbdedb4b7f2169a68dc8410e8436fab3734a3a30cab81ab21661d70c6ddd";

    arm-unknown-linux-gnueabihf = "a5847f9bcbb1fb4183656b1b01e191d8e48c7bc8346ec6831318b697a2f305c6";

    armv7-unknown-linux-gnueabihf = "f87e4b063b5f916b4a5057e5f544f819cee9ab5da3fe1a977cddb2170e7ba0d7";

    aarch64-unknown-linux-gnu = "b24d0df852490d80791a228f18c2b75f24b1e6437e6e745f85364edab245f7fa";

    aarch64-unknown-linux-musl = "e6615e72aaa3e3c9c42c35139ab253a9b738a4eab719e3e306e25026c1aa93e5";

    x86_64-apple-darwin = "632540d3d83758cb048dc45fcfbc0b29f6f170161a3051be22b0a2962a566fb9";

    aarch64-apple-darwin = "ab4c6add94686a0392953c588c2b61d4c03f51e855232d161dc492f286e34202";

    powerpc64le-unknown-linux-gnu = "cf95658277d71bb8ae3a0fbc53099cc1397ed40e0953c026f41cde4a9619efca";

    riscv64gc-unknown-linux-gnu = "befcf2d53e35ae3fe0d609d1e056bdc814bd36ce54028b8d6b8b9e38c0afcaa5";

    mips64el-unknown-linux-gnuabi64 = "ee85bbfdc2fb831f067fda19881e6427c8c86571ebff16c1bd219d850969ef0a";

  };



  selectRustPackage = pkgs: pkgs.rust_1_68;

  selectRustPackage = pkgs: pkgs.rust_1_69;



  rustcPatches = [

    # Fixes ICE.

    # https://github.com/rust-lang/rust/pull/107688

    (fetchpatch {

      name = "re-erased-regions-are-local.patch";

      url = "https://github.com/rust-lang/rust/commit/9d110847ab7f6aef56a8cd20cb6cea4fbcc51cd9.patch";

      excludes = [ "*tests/*" ];

      hash = "sha256-EZH5K1BEOOfi97xZr1xEHFP4jjvJ1+xqtRMvxBoL8pU=";

    })

  ];

  rustcPatches = [ ];

}



(builtins.removeAttrs args [ "fetchpatch" "pkgsBuildHost" "llvmPackages_11" "llvmPackages_15" "llvm_15"])
 
(builtins.removeAttrs args [ "pkgsBuildHost" "llvmPackages_11" "llvmPackages_15" "llvm_15"])

pkgs/top-level/all-packages.nix

+4 −4
Original line number Diff line number Diff line
@@ -15997,11 +15997,11 @@ with pkgs; 
    inherit (darwin) apple_sdk;

  };













  rust_1_68 = callPackage ../development/compilers/rust/1_68.nix {













  rust_1_69 = callPackage ../development/compilers/rust/1_69.nix {















    inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration;















    llvm_15 = llvmPackages_15.libllvm;















  };













  rust = rust_1_68;













  rust = rust_1_69;





























  mrustc = callPackage ../development/compilers/mrustc { };















  mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { };









@@ -16010,8 +16010,8 @@ with pkgs;













    openssl = openssl_1_1;















  };



























  rustPackages_1_68 = rust_1_68.packages.stable;













  rustPackages = rustPackages_1_68;













  rustPackages_1_69 = rust_1_69.packages.stable;













  rustPackages = rustPackages_1_69;





























  inherit (rustPackages) cargo cargo-auditable cargo-auditable-cargo-wrapper clippy rustc rustPlatform;