diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-11-03 07:33:32 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-11-03 07:34:33 +0000 |
commit | 703ffa2f5d1d7b4d1dc60511be8badc0f52e0b26 (patch) | |
tree | 269407794cb33dbfbce1c140e8a22e0f84573741 /pkgs/development/compilers/rust | |
parent | 8f5da907b03a79a7c1b77a4c553a2283f4db9a45 (diff) | |
parent | a24ac8728e64cefbdbcf413f684ee0a5c7eddc1d (diff) |
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Diffstat (limited to 'pkgs/development/compilers/rust')
-rw-r--r-- | pkgs/development/compilers/rust/1_45.nix | 54 | ||||
-rw-r--r-- | pkgs/development/compilers/rust/1_56.nix | 3 | ||||
-rw-r--r-- | pkgs/development/compilers/rust/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/compilers/rust/rustc.nix | 7 |
4 files changed, 10 insertions, 57 deletions
diff --git a/pkgs/development/compilers/rust/1_45.nix b/pkgs/development/compilers/rust/1_45.nix deleted file mode 100644 index 2c695f1844dc6..0000000000000 --- a/pkgs/development/compilers/rust/1_45.nix +++ /dev/null @@ -1,54 +0,0 @@ -# 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. - -{ stdenv, lib -, buildPackages -, newScope, callPackage -, CoreFoundation, Security, SystemConfiguration -, pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost -, makeRustPlatform -, llvmPackages_5, llvm_10 -} @ args: - -import ./default.nix { - rustcVersion = "1.45.2"; - rustcSha256 = "0273a1g3f59plyi1n0azf21qjzwml1yqdnj5z472crz37qggr8xp"; - - llvmSharedForBuild = pkgsBuildBuild.llvmPackages_10.libllvm.override { enableSharedLibraries = true; }; - llvmSharedForHost = pkgsBuildHost.llvmPackages_10.libllvm.override { enableSharedLibraries = true; }; - llvmSharedForTarget = pkgsBuildTarget.llvmPackages_10.libllvm.override { enableSharedLibraries = true; }; - - llvmBootstrapForDarwin = llvmPackages_5; - - # For use at runtime - llvmShared = llvm_10.override { enableSharedLibraries = true; }; - - # Note: the version MUST be one version prior to the version we're - # building - bootstrapVersion = "1.44.1"; - - # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` - bootstrapHashes = { - i686-unknown-linux-gnu = "e69689b0a1b66599cf83e7dd54f839419007e44376195e93e301a3175da3d854"; - x86_64-unknown-linux-gnu = "a41df89a461a580536aeb42755e43037556fba2e527dd13a1e1bb0749de28202"; - x86_64-unknown-linux-musl = "7eeef2b7488ee96015db10bc52c43f6e023debc9a955ccb8efb382522bf35be9"; - arm-unknown-linux-gnueabihf = "ea18ccdfb62a153c2d43d013fdec56993cc9267f1cdc6f3834df8a2b9b468f08"; - armv7-unknown-linux-gnueabihf = "d44294732cf268ea84908f1135f574ab9489132a332eaa9d5bda547374b15d54"; - aarch64-unknown-linux-gnu = "a2d74ebeec0b6778026b6c37814cdc91d14db3b0d8b6d69d036216f4d9cf7e49"; - x86_64-apple-darwin = "a5464e7bcbce9647607904a4afa8362382f1fc55d39e7bbaf4483ac00eb5d56a"; - powerpc64le-unknown-linux-gnu = "22deeca259459db31065af7c862fcab7fbfb623200520c65002ed2ba93d87ad2"; - }; - - selectRustPackage = pkgs: pkgs.rust_1_45; - - rustcPatches = [ - ]; -} - -(builtins.removeAttrs args [ "fetchpatch" "pkgsBuildHost" "llvmPackages_5" "llvm_10" ]) diff --git a/pkgs/development/compilers/rust/1_56.nix b/pkgs/development/compilers/rust/1_56.nix index b1d8167b9a051..49df8bcd5ecdc 100644 --- a/pkgs/development/compilers/rust/1_56.nix +++ b/pkgs/development/compilers/rust/1_56.nix @@ -32,6 +32,9 @@ import ./default.nix { # For use at runtime llvmShared = llvm_13.override { enableSharedLibraries = true; }; + # Expose llvmPackages used for rustc from rustc via passthru for LTO in Firefox + llvmPackagesForBuild = pkgsBuildBuild.llvmPackages_13; + # Note: the version MUST be one version prior to the version we're # building bootstrapVersion = "1.55.0"; diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 7912055db6247..59420477119c6 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -10,6 +10,7 @@ , llvmSharedForBuild , llvmSharedForHost , llvmSharedForTarget +, llvmPackagesForBuild # Exposed through rustc for LTO in Firefox }: { stdenv, lib , buildPackages @@ -85,7 +86,7 @@ version = rustcVersion; sha256 = rustcSha256; inherit enableRustcDev; - inherit llvmShared llvmSharedForBuild llvmSharedForHost llvmSharedForTarget; + inherit llvmShared llvmSharedForBuild llvmSharedForHost llvmSharedForTarget llvmPackagesForBuild; patches = rustcPatches; diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index dae9440924094..187127cfbfb39 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -1,5 +1,5 @@ { lib, stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget -, llvmShared, llvmSharedForBuild, llvmSharedForHost, llvmSharedForTarget +, llvmShared, llvmSharedForBuild, llvmSharedForHost, llvmSharedForTarget, llvmPackagesForBuild , fetchurl, file, python3 , darwin, cmake, rust, rustPlatform , pkg-config, openssl @@ -174,7 +174,10 @@ in stdenv.mkDerivation rec { requiredSystemFeatures = [ "big-parallel" ]; - passthru.llvm = llvmShared; + passthru = { + llvm = llvmShared; + llvmPackages = llvmPackagesForBuild; + }; meta = with lib; { homepage = "https://www.rust-lang.org/"; |