diff options
author | Bas van Dijk <v.dijk.bas@gmail.com> | 2020-09-23 16:29:30 +0200 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-11-27 13:28:36 +0000 |
commit | 0a20101a008aa18729ff3a465d088410535a370d (patch) | |
tree | 368bd28d6375e4538fec2362f53a28fbd968dea3 | |
parent | 7181b4dddc65a171c747fee348a1c4f3fd05c2af (diff) | |
download | nixlib-0a20101a008aa18729ff3a465d088410535a370d.tar nixlib-0a20101a008aa18729ff3a465d088410535a370d.tar.gz nixlib-0a20101a008aa18729ff3a465d088410535a370d.tar.bz2 nixlib-0a20101a008aa18729ff3a465d088410535a370d.tar.lz nixlib-0a20101a008aa18729ff3a465d088410535a370d.tar.xz nixlib-0a20101a008aa18729ff3a465d088410535a370d.tar.zst nixlib-0a20101a008aa18729ff3a465d088410535a370d.zip |
rust: remove 1.44.1 since firefox and thunderbird build with 1.46
(cherry picked from commit c01133316f7bac9d45c8afa2f4778b6cd76d1015)
-rw-r--r-- | nixpkgs/pkgs/development/compilers/rust/1_44.nix | 43 | ||||
-rw-r--r-- | nixpkgs/pkgs/top-level/all-packages.nix | 11 |
2 files changed, 3 insertions, 51 deletions
diff --git a/nixpkgs/pkgs/development/compilers/rust/1_44.nix b/nixpkgs/pkgs/development/compilers/rust/1_44.nix deleted file mode 100644 index 3ca61529d19f..000000000000 --- a/nixpkgs/pkgs/development/compilers/rust/1_44.nix +++ /dev/null @@ -1,43 +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 -, llvmPackages -, pkgsBuildTarget, pkgsBuildBuild -, makeRustPlatform -} @ args: - -import ./default.nix { - rustcVersion = "1.44.1"; - rustcSha256 = "0ww4z2v3gxgn3zddqzwqya1gln04p91ykbrflnpdbmcd575n8bky"; - - # Note: the version MUST be one version prior to the version we're - # building - bootstrapVersion = "1.43.1"; - - # fetch hashes by running `print-hashes.sh 1.44.1` - bootstrapHashes = { - i686-unknown-linux-gnu = "0626fa8a6a2387021413d740543f7496656d81115e2284e4ef73217128398990"; - x86_64-unknown-linux-gnu = "25cd71b95bba0daef56bad8c943a87368c4185b90983f4412f46e3e2418c0505"; - arm-unknown-linux-gnueabihf = "16b9c4861565a195323d144fd0f54c0ae794ee3d2a867682f8aedbdacaad5a6c"; - armv7-unknown-linux-gnueabihf = "0c32a5958a358a031e6ca52074cfd45256688dc334db315199f5dbbf7562e5b1"; - aarch64-unknown-linux-gnu = "fbb612387a64c9da2869725afffc1f66a72d6e7ba6667ba717cd52c33080b7fb"; - x86_64-apple-darwin = "e1c3e1426a9e615079159d6b619319235e3ca7b395e7603330375bfffcbb7003"; - }; - - selectRustPackage = pkgs: pkgs.rust_1_44; - - rustcPatches = [ - ]; -} - -(builtins.removeAttrs args [ "fetchpatch" ]) diff --git a/nixpkgs/pkgs/top-level/all-packages.nix b/nixpkgs/pkgs/top-level/all-packages.nix index f60db1f55289..4f738bca7a47 100644 --- a/nixpkgs/pkgs/top-level/all-packages.nix +++ b/nixpkgs/pkgs/top-level/all-packages.nix @@ -9161,10 +9161,6 @@ in inherit (darwin) apple_sdk; }; - rust_1_44 = callPackage ../development/compilers/rust/1_44.nix { - inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; - llvmPackages = llvmPackages_9; - }; # Because rustc-1.46.0 enables static PIE by default for # `x86_64-unknown-linux-musl` this release will suffer from: # @@ -9181,7 +9177,6 @@ in }; rust = rust_1_46; - rustPackages_1_44 = rust_1_44.packages.stable; rustPackages_1_45 = rust_1_45.packages.stable; rustPackages_1_46 = rust_1_46.packages.stable; rustPackages = rustPackages_1_46; @@ -19779,7 +19774,7 @@ in filezilla = callPackage ../applications/networking/ftp/filezilla { }; firefoxCommon = args: callPackage (import ../applications/networking/browsers/firefox/common.nix args) { - inherit (rustPackages_1_44) cargo rustc; + inherit (rustPackages) cargo rustc; libpng = libpng_apng; gnused = gnused_422; inherit (darwin.apple_sdk.frameworks) CoreMedia ExceptionHandling @@ -22480,7 +22475,7 @@ in thonny = callPackage ../applications/editors/thonny { }; thunderbird = callPackage ../applications/networking/mailreaders/thunderbird { - inherit (rustPackages_1_44) cargo rustc; + inherit (rustPackages) cargo rustc; libpng = libpng_apng; icu = icu67; libvpx = libvpx_1_8; @@ -22488,7 +22483,7 @@ in }; thunderbird-68 = 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; |