nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-29 02:13:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

rust: 1.44.1 -> 1.45.0

Browse Source 
Thunderbird and Firefox don't build with 1.45.
This commit is contained in:
Alyssa Ross 2020-07-16 20:26:02 +00:00
parent 7dff6d6681
commit e33bed77ce
2 changed files with 50 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
pkgs/development/compilers/rust/1_45.nix Normal file
View File

@ -0,0 +1,42 @@
# 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
, llvmPackages_5
, pkgsBuildTarget, pkgsBuildBuild
} @ args:
import ./default.nix {
rustcVersion = "1.45.0";
rustcSha256 = "0z6dh0yd3fcm3qh960wi4s6fa6pxz9mh77psycsqfkkx5kqra15s";
# 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 1.45.0`
bootstrapHashes = {
i686-unknown-linux-gnu = "e69689b0a1b66599cf83e7dd54f839419007e44376195e93e301a3175da3d854";
x86_64-unknown-linux-gnu = "a41df89a461a580536aeb42755e43037556fba2e527dd13a1e1bb0749de28202";
arm-unknown-linux-gnueabihf = "ea18ccdfb62a153c2d43d013fdec56993cc9267f1cdc6f3834df8a2b9b468f08";
armv7-unknown-linux-gnueabihf = "d44294732cf268ea84908f1135f574ab9489132a332eaa9d5bda547374b15d54";
aarch64-unknown-linux-gnu = "a2d74ebeec0b6778026b6c37814cdc91d14db3b0d8b6d69d036216f4d9cf7e49";
x86_64-apple-darwin = "a5464e7bcbce9647607904a4afa8362382f1fc55d39e7bbaf4483ac00eb5d56a";
};
selectRustPackage = pkgs: pkgs.rust_1_45;
rustcPatches = [
];
}
(builtins.removeAttrs args [ "fetchpatch" ])

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

@ -9293,10 +9293,14 @@ in
rust_1_44 = callPackage ../development/compilers/rust/1_44.nix { rust_1_44 = callPackage ../development/compilers/rust/1_44.nix {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
}; };
rust = rust_1_44; rust_1_45 = callPackage ../development/compilers/rust/1_45.nix {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
};
rust = rust_1_45;
rustPackages_1_44 = rust_1_44.packages.stable; rustPackages_1_44 = rust_1_44.packages.stable;
rustPackages = rustPackages_1_44; rustPackages_1_45 = rust_1_45.packages.stable;
rustPackages = rustPackages_1_45;
inherit (rustPackages) cargo clippy rustc rustPlatform; inherit (rustPackages) cargo clippy rustc rustPlatform;
inherit (rust) makeRustPlatform; inherit (rust) makeRustPlatform;
@ -19948,6 +19952,7 @@ in
firefoxPackages = recurseIntoAttrs (callPackage ../applications/networking/browsers/firefox/packages.nix { firefoxPackages = recurseIntoAttrs (callPackage ../applications/networking/browsers/firefox/packages.nix {
callPackage = pkgs.newScope { callPackage = pkgs.newScope {
inherit (rustPackages_1_44) cargo rustc;
libpng = libpng_apng; libpng = libpng_apng;
python = python2; python = python2;
gnused = gnused_422; gnused = gnused_422;
@ -22671,6 +22676,7 @@ in
thonny = callPackage ../applications/editors/thonny { }; thonny = callPackage ../applications/editors/thonny { };
thunderbird = callPackage ../applications/networking/mailreaders/thunderbird { thunderbird = callPackage ../applications/networking/mailreaders/thunderbird {
inherit (rustPackages_1_44) cargo rustc;
libpng = libpng_apng; libpng = libpng_apng;
gtk3Support = true; gtk3Support = true;
}; };