Skip to content

Commit

Permalink
rust: remove 1.44.1 since firefox and thunderbird build with 1.46
Browse files Browse the repository at this point in the history
  • Loading branch information
basvandijk committed Sep 23, 2020
1 parent b837bd4 commit c011333
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 50 deletions.
42 changes: 0 additions & 42 deletions pkgs/development/compilers/rust/1_44.nix

This file was deleted.

11 changes: 3 additions & 8 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9633,10 +9633,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:
#
Expand All @@ -9653,7 +9649,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;
Expand Down Expand Up @@ -20709,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 @@ -23584,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

0 comments on commit c011333

Please sign in to comment.