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 /nixpkgs/pkgs/top-level | |
| 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)
Diffstat (limited to 'nixpkgs/pkgs/top-level')
| -rw-r--r-- | nixpkgs/pkgs/top-level/all-packages.nix | 11 |
1 files changed, 3 insertions, 8 deletions
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; |