JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rustc: 1.39 -> 1.40

Browse Source
This commit is contained in:
Eelco Dolstra 2019-12-20 14:09:09 +01:00 committed by Jörg Thalheim
parent 11245fc87e
commit e82fae1a39
No known key found for this signature in database
GPG Key ID: B3F5D81B0C6967C4
3 changed files with 33 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/development/compilers/rust/1_39_0.nix
View File

@ -1,21 +0,0 @@
import ./default.nix {
rustcVersion = "1.39.0";
rustcSha256 = "0mwkc1bnil2cfyf6nglpvbn2y0zfbv44zfhsd5qg4c9rm6vgd8dl";
# Note: the version MUST be one version prior to the version we're
# building
bootstrapVersion = "1.38.0";
# fetch hashes by running `print-hashes.sh 1.38.0`
bootstrapHashes = {
i686-unknown-linux-gnu = "41aed8a350e24a0cac1444ed99b3dd24a90bc581dd88cb420c6e547d6b5f57af";
x86_64-unknown-linux-gnu = "adda26b3f0609dbfbdc2019da4a20101879b9db2134fae322a4e863a069ec221";
arm-unknown-linux-gnueabihf = "0603a3d3d16ae8f3b3b117eb699e8f3ef7532a6f6d3c29d13e7d4614fc3c9e7a";
armv7-unknown-linux-gnueabihf = "8b1bf1680a61a643d6b5c7a3b1a1ce88448652756395e20ba5846739cbd085c4";
aarch64-unknown-linux-gnu = "06afd6d525326cea95c3aa658aaa8542eab26f44235565bb16913ac9d12b7bda";
i686-apple-darwin = "cdbf2807774bed350a3af6f41d7f7dd7ceff28777cde310c3ba90033188eb2f8";
x86_64-apple-darwin = "bd301b78ddcd5d4553962b115e1dca5436dd3755ed323f86f4485769286a8a5a";
};
selectRustPackage = pkgs: pkgs.rust_1_39_0;
}

29
pkgs/development/compilers/rust/1_40_0.nix Normal file
View File

@ -0,0 +1,29 @@
# New rust versions should first go to staging.
# Things to check after updating:
# 1. Rustc should produce rust binaries on x86_64-linux, aarch64-linux and x86_64-darwin:
# i.e. nix-shell -p fd or @GrahamcOfBorg build fd on github
# This testing can be also done by other volunteers as part of the pull
# request review, in case platforms cannot be covered.
# 2. The LLVM version used for building should match with rust upstream.
# 3. Firefox and Thunderbird should still build on x86_64-linux.
import ./default.nix {
rustcVersion = "1.40.0";
rustcSha256 = "1ba9llwhqm49w7sz3z0gqscj039m53ky9wxzhaj11z6yg1ah15yx";
# Note: the version MUST be one version prior to the version we're
# building
bootstrapVersion = "1.39.0";
# fetch hashes by running `print-hashes.sh 1.39.0`
bootstrapHashes = {
i686-unknown-linux-gnu = "36e31b3069c5be4b1fe3c8f7588ca787f13f91ab7170d2b24c6b07285816d0e5";
x86_64-unknown-linux-gnu = "b10a73e5ba90034fe51f0f02cb78f297ed3880deb7d3738aa09dc5a4d9704a25";
arm-unknown-linux-gnueabihf = "ea08d78a718cd34e67733526c70f3be460605dec8284bdeda36e0c6dd6222eca";
armv7-unknown-linux-gnueabihf = "41186745a97e6b76fb7a3a049882fb4869b526e98a66c05a133518515037f0d7";
aarch64-unknown-linux-gnu = "e27dc8112fe577012bd88f30e7c92dffd8c796478ce386c49465c03b6db8209f";
i686-apple-darwin = "0ada2ed87cc449ed470dce3b57b15bfd5c8c52b01d6116e6b1edc9a3e97836aa";
x86_64-apple-darwin = "3736d49c5e9592844e1a5d5452883aeaf8f1e25d671c1bc8f01e81c1766603b5";
};
selectRustPackage = pkgs: pkgs.rust_1_40_0;
}

8
pkgs/top-level/all-packages.nix
View File

@ -8637,17 +8637,17 @@ in
inherit (darwin) apple_sdk; inherit (darwin) apple_sdk;
}; };
rust_1_39_0 = callPackage ../development/compilers/rust/1_39_0.nix { rust_1_40_0 = callPackage ../development/compilers/rust/1_40_0.nix {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
}; };
rust_1_38_0 = callPackage ../development/compilers/rust/1_38_0.nix { rust_1_38_0 = callPackage ../development/compilers/rust/1_38_0.nix {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
}; };
rust = rust_1_39_0; rust = rust_1_40_0;
rustPackages_1_39_0 = rust_1_39_0.packages.stable; rustPackages_1_40_0 = rust_1_40_0.packages.stable;
rustPackages_1_38_0 = rust_1_38_0.packages.stable; rustPackages_1_38_0 = rust_1_38_0.packages.stable;
rustPackages = rustPackages_1_39_0; rustPackages = rustPackages_1_40_0;
inherit (rustPackages) cargo rustc rustPlatform; inherit (rustPackages) cargo rustc rustPlatform;
inherit (rust) makeRustPlatform; inherit (rust) makeRustPlatform;