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

rustc: 1.37.0 -> 1.38.0

Browse Source
This commit is contained in:
Eelco Dolstra 2019-09-26 14:51:12 +02:00
parent adb15c3a63
commit 9c0968fd81
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/compilers/rust/bootstrap.nix
View File

@ -3,16 +3,16 @@
let let
# Note: the version MUST be one version prior to the version we're # Note: the version MUST be one version prior to the version we're
# building # building
version = "1.36.0"; version = "1.37.0";
# fetch hashes by running `print-hashes.sh 1.36.0` # fetch hashes by running `print-hashes.sh 1.37.0`
hashes = { hashes = {
i686-unknown-linux-gnu = "9f95c3e96622a792858c8a1c9274fa63e6992370493b27c1ac7299a3bec5156d"; i686-unknown-linux-gnu = "74510e0e52a55e65a9f716673c2cda4d2bd427e2453541c6993c77c3ec04acf9";
x86_64-unknown-linux-gnu = "15e592ec52f14a0586dcebc87a957e472c4544e07359314f6354e2b8bd284c55"; x86_64-unknown-linux-gnu = "cb573229bfd32928177c3835fdeb62d52da64806b844bc1095c6225b0665a1cb";
armv7-unknown-linux-gnueabihf = "798181a728017068f9eddfa665771805d97846cd87bddcd67e0fe27c8d082ceb"; armv7-unknown-linux-gnueabihf = "5b87b877f0ed20c6a09ce26e7a15d8c61b26b62484b97e78a51099d0efefec98";
aarch64-unknown-linux-gnu = "db78c24d93756f9fe232f081dbc4a46d38f8eec98353a9e78b9b164f9628042d"; aarch64-unknown-linux-gnu = "263ef98fa3a6b2911b56f89c06615cdebf6ef676eb9b2493ad1539602f79b6ba";
i686-apple-darwin = "3dbc34fdea8bc030badf9c8b2572c09fd3f5369b59ac099fc521064b390b9e60"; i686-apple-darwin = "e45d0c4d882fc6c404ffa6fe790294f4ea96384a2b48804adbf723f3635477a8";
x86_64-apple-darwin = "91f151ec7e24f5b0645948d439fc25172ec4012f0584dd16c3fb1acb709aa325"; x86_64-apple-darwin = "b2310c97ffb964f253c4088c8d29865f876a49da2a45305493af5b5c7a3ca73d";
}; };
platform = platform =

9
pkgs/development/compilers/rust/rustc.nix
View File

@ -1,6 +1,7 @@
{ stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget { stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget
, fetchurl, file, python2, tzdata, ps , fetchurl, file, python2, tzdata, ps
, llvm_7, darwin, git, cmake, rustPlatform , llvm_7, darwin, git, cmake, rustPlatform
, pkgconfig, openssl
, which, libffi, gdb , which, libffi, gdb
, withBundledLLVM ? false , withBundledLLVM ? false
}: }:
@ -17,11 +18,11 @@ let
llvmShared = llvm_7.override { enableSharedLibraries = true; }; llvmShared = llvm_7.override { enableSharedLibraries = true; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "rustc"; pname = "rustc";
version = "1.37.0"; version = "1.38.0";
src = fetchurl { src = fetchurl {
url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"; url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz";
sha256 = "1hrqprybhkhs6d9b5pjskfnc5z9v2l2gync7nb39qjb5s0h703hj"; sha256 = "101dlpsfkq67p0hbwx4acqq6n90dj4bbprndizpgh1kigk566hk4";
}; };
__darwinAllowLocalNetworking = true; __darwinAllowLocalNetworking = true;
@ -157,10 +158,12 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
file python2 ps rustPlatform.rust.rustc git cmake file python2 ps rustPlatform.rust.rustc git cmake
which libffi removeReferencesTo which libffi removeReferencesTo
pkgconfig
] # Only needed for the debuginfo tests ] # Only needed for the debuginfo tests
++ optional (!stdenv.isDarwin) gdb; ++ optional (!stdenv.isDarwin) gdb;
buildInputs = optional stdenv.isDarwin Security buildInputs = [ openssl ]
++ optional stdenv.isDarwin Security
++ optional (!withBundledLLVM) llvmShared; ++ optional (!withBundledLLVM) llvmShared;
outputs = [ "out" "man" "doc" ]; outputs = [ "out" "man" "doc" ];