JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #82511 from alyssais/rust

Browse Source 
rust_1_38, rust_1_42: drop patch version from attr
This commit is contained in:
Jörg Thalheim 2020-03-15 18:43:45 +00:00 committed by GitHub
commit f6e3f896c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/rust/1_38_0.nix → pkgs/development/compilers/rust/1_38.nix
View File

@ -18,5 +18,5 @@ import ./default.nix {
x86_64-apple-darwin = "b2310c97ffb964f253c4088c8d29865f876a49da2a45305493af5b5c7a3ca73d";
};
selectRustPackage = pkgs: pkgs.rust_1_38_0;
selectRustPackage = pkgs: pkgs.rust_1_38;
}

2
pkgs/development/compilers/rust/1_42_0.nix → pkgs/development/compilers/rust/1_42.nix
View File

@ -34,7 +34,7 @@ import ./default.nix {
x86_64-apple-darwin = "b6504003ab70b11f278e0243a43ba9d6bf75e8ad6819b4058a2b6e3991cc8d7a";
};
selectRustPackage = pkgs: pkgs.rust_1_42_0;
selectRustPackage = pkgs: pkgs.rust_1_42;
rustcPatches = [
./0001-Allow-getting-no_std-from-the-config-file.patch

2
pkgs/top-level/aliases.nix
View File

@ -385,6 +385,8 @@ mapAliases ({
ruby_2_5_0 = throw "deprecated 2018-0213: use a newer version of ruby";
rubyPackages_2_4 = throw "deprecated 2019-12: use a newer version of rubyPackages instead";
rubygems = throw "deprecated 2016-03-02: rubygems is now bundled with ruby";
rust_1_38_0 = rust_1_38; # added 2020-03-13
rust_1_42_0 = rust_1_42; # added 2020-03-13
rxvt_unicode-with-plugins = rxvt-unicode; # added 2020-02-02
rxvt_unicode = rxvt-unicode-unwrapped; # added 2020-02-02
urxvt_autocomplete_all_the_things = rxvt-unicode-plugins.autocomplete-all-the-things; # added 2020-02-02

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

@ -8832,17 +8832,17 @@ in
inherit (darwin) apple_sdk;
};
rust_1_42_0 = callPackage ../development/compilers/rust/1_42_0.nix {
rust_1_42 = callPackage ../development/compilers/rust/1_42.nix {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
};
rust_1_38_0 = callPackage ../development/compilers/rust/1_38_0.nix {
rust_1_38 = callPackage ../development/compilers/rust/1_38.nix {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
};
rust = rust_1_42_0;
rust = rust_1_42;
rustPackages_1_42_0 = rust_1_42_0.packages.stable;
rustPackages_1_38_0 = rust_1_38_0.packages.stable;
rustPackages = rustPackages_1_42_0;
rustPackages_1_42 = rust_1_42.packages.stable;
rustPackages_1_38 = rust_1_38.packages.stable;
rustPackages = rustPackages_1_42;
inherit (rustPackages) cargo clippy rustc rustPlatform;
inherit (rust) makeRustPlatform;
@ -8925,7 +8925,7 @@ in
inherit (darwin.apple_sdk.frameworks) Security;
};
rustracerd = callPackage ../development/tools/rust/racerd {
inherit (rustPackages_1_38_0) rustPlatform;
inherit (rustPackages_1_38) rustPlatform;
inherit (darwin.apple_sdk.frameworks) Security;
};
rust-bindgen = callPackage ../development/tools/rust/bindgen { };
@ -21910,7 +21910,7 @@ in
thunderbird = callPackage ../applications/networking/mailreaders/thunderbird {
inherit (gnome2) libIDL;
inherit (rustPackages_1_38_0) cargo rustc;
inherit (rustPackages_1_38) cargo rustc;
libpng = libpng_apng;
gtk3Support = true;
};