Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[staging] rust: 1.45 -> 1.46.0 #96890

Merged
merged 2 commits into from
Sep 23, 2020
Merged

[staging] rust: 1.45 -> 1.46.0 #96890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b837bd4
rust: 1.45.2 -> 1.46.0
basvandijk Sep 1, 2020
c011333
rust: remove 1.44.1 since firefox and thunderbird build with 1.46
basvandijk Sep 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 0 additions & 42 deletions pkgs/development/compilers/rust/1_44.nix
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion pkgs/development/compilers/rust/1_45.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
, buildPackages
, newScope, callPackage
, CoreFoundation, Security
, llvmPackages_5
, llvmPackages
, pkgsBuildTarget, pkgsBuildBuild
} @ args:

Expand Down
44 changes: 44 additions & 0 deletions pkgs/development/compilers/rust/1_46.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# 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.
# Check the version number in the src/llvm-project git submodule in:
# https://github.com/rust-lang/rust/blob/<version-tag>/.gitmodules
# 3. Firefox and Thunderbird should still build on x86_64-linux.

{ stdenv, lib
, buildPackages
, newScope, callPackage
, CoreFoundation, Security
, llvmPackages
, pkgsBuildTarget, pkgsBuildBuild
} @ args:

import ./default.nix {
rustcVersion = "1.46.0";
rustcSha256 = "0a17jby2pd050s24cy4dfc0gzvgcl585v3vvyfilniyvjrqknsid";

# Note: the version MUST be one version prior to the version we're
# building
bootstrapVersion = "1.45.2";

# fetch hashes by running `print-hashes.sh 1.45.2`
bootstrapHashes = {
i686-unknown-linux-gnu = "5b2050dde23152750de89f7e59acaab6bf088d0beb5854c69c9a545fd254b936";
x86_64-unknown-linux-gnu = "860feed955726a4d96ffe40758a110053326b9ae11c9e1ee059e9c6222f25643";
arm-unknown-linux-gnueabihf = "ddb5f59bbdef84e0b7c83049461e003ed031dd881a4622365c3d475102535c60";
armv7-unknown-linux-gnueabihf = "7a556581f87602705f9c89b04cce621cfbba9050b6fbe478166e91d164567531";
aarch64-unknown-linux-gnu = "151fad66442d28a4e4786753d1afb559c4a3d359081c64769273a31c2f0f4d30";
x86_64-apple-darwin = "6e8067624ede10aa23081d62e0086c6f42f7228cc0d00fb5ff24d4dac65249d6";
};

selectRustPackage = pkgs: pkgs.rust_1_46;

rustcPatches = [
];
}

(builtins.removeAttrs args [ "fetchpatch" ])
10 changes: 5 additions & 5 deletions pkgs/development/compilers/rust/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
, buildPackages
, newScope, callPackage
, CoreFoundation, Security
, llvmPackages_5
, llvmPackages
, pkgsBuildTarget, pkgsBuildBuild
}: rec {
toRustTarget = platform: with platform.parsed; let
Expand Down Expand Up @@ -80,10 +80,10 @@
# Use boot package set to break cycle
rustPlatform = bootRustPlatform;
} // lib.optionalAttrs (stdenv.cc.isClang && stdenv.hostPlatform == stdenv.buildPlatform) {
stdenv = llvmPackages_5.stdenv;
pkgsBuildBuild = pkgsBuildBuild // { targetPackages.stdenv = llvmPackages_5.stdenv; };
pkgsBuildHost = pkgsBuildBuild // { targetPackages.stdenv = llvmPackages_5.stdenv; };
pkgsBuildTarget = pkgsBuildTarget // { targetPackages.stdenv = llvmPackages_5.stdenv; };
stdenv = llvmPackages.stdenv;
pkgsBuildBuild = pkgsBuildBuild // { targetPackages.stdenv = llvmPackages.stdenv; };
pkgsBuildHost = pkgsBuildBuild // { targetPackages.stdenv = llvmPackages.stdenv; };
pkgsBuildTarget = pkgsBuildTarget // { targetPackages.stdenv = llvmPackages.stdenv; };
});
rustfmt = self.callPackage ./rustfmt.nix { inherit Security; };
cargo = self.callPackage ./cargo.nix {
Expand Down
24 changes: 16 additions & 8 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9633,17 +9633,25 @@ in
inherit (darwin) apple_sdk;
};

rust_1_44 = callPackage ../development/compilers/rust/1_44.nix {
# Because rustc-1.46.0 enables static PIE by default for
# `x86_64-unknown-linux-musl` this release will suffer from:
#
# https://github.com/NixOS/nixpkgs/issues/94228
#
# So this commit doesn't remove the 1.45.2 release.
rust_1_45 = callPackage ../development/compilers/rust/1_45.nix {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It might be nice to leave a comment explaining why the older versions are left available.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
llvmPackages = llvmPackages_10;
};
rust_1_45 = callPackage ../development/compilers/rust/1_45.nix {
rust_1_46 = callPackage ../development/compilers/rust/1_46.nix {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
llvmPackages = llvmPackages_10;
};
rust = rust_1_45;
rust = rust_1_46;

rustPackages_1_44 = rust_1_44.packages.stable;
rustPackages_1_45 = rust_1_45.packages.stable;
rustPackages = rustPackages_1_45;
rustPackages_1_46 = rust_1_46.packages.stable;
rustPackages = rustPackages_1_46;

inherit (rustPackages) cargo clippy rustc rustPlatform;
inherit (rust) makeRustPlatform;
Expand Down Expand Up @@ -20696,7 +20704,7 @@ in

firefoxPackages = recurseIntoAttrs (callPackage ../applications/networking/browsers/firefox/packages.nix {
callPackage = pkgs.newScope {
inherit (rustPackages_1_44) cargo rustc;
inherit (rustPackages) cargo rustc;
libpng = libpng_apng;
python = python2;
gnused = gnused_422;
Expand Down Expand Up @@ -23571,15 +23579,15 @@ in
thonny = callPackage ../applications/editors/thonny { };

thunderbird-78 = callPackage ../applications/networking/mailreaders/thunderbird {
inherit (rustPackages_1_44) cargo rustc;
inherit (rustPackages) cargo rustc;
libpng = libpng_apng;
icu = icu67;
libvpx = libvpx_1_8;
gtk3Support = true;
};

thunderbird = callPackage ../applications/networking/mailreaders/thunderbird/68.nix {
inherit (rustPackages_1_44) cargo rustc;
inherit (rustPackages) cargo rustc;
libpng = libpng_apng;
nss = nss_3_44;
gtk3Support = true;
Expand Down