diff options
author | Robert Irelan <rirelan@gmail.com> | 2015-07-05 23:21:00 -0700 |
---|---|---|
committer | Robert Irelan <rirelan@gmail.com> | 2015-07-09 21:14:55 -0700 |
commit | bf492548a27aca1068fe75d162cad77000134704 (patch) | |
tree | 0cab75167f5b63a864782085fc34bb7f9204e9d1 /pkgs | |
parent | 9d67699ae37b915cdf4950123b9e196a9820b70f (diff) | |
download | nixpkgs-bf492548a27aca1068fe75d162cad77000134704.tar nixpkgs-bf492548a27aca1068fe75d162cad77000134704.tar.gz nixpkgs-bf492548a27aca1068fe75d162cad77000134704.tar.bz2 nixpkgs-bf492548a27aca1068fe75d162cad77000134704.tar.lz nixpkgs-bf492548a27aca1068fe75d162cad77000134704.tar.xz nixpkgs-bf492548a27aca1068fe75d162cad77000134704.tar.zst nixpkgs-bf492548a27aca1068fe75d162cad77000134704.zip |
rustc: 1.0.0 -> 1.1.0
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/compilers/rustc/1.0.0.nix | 16 | ||||
-rw-r--r-- | pkgs/development/compilers/rustc/default.nix | 33 | ||||
-rw-r--r-- | pkgs/development/compilers/rustc/generic.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
4 files changed, 35 insertions, 18 deletions
diff --git a/pkgs/development/compilers/rustc/1.0.0.nix b/pkgs/development/compilers/rustc/1.0.0.nix deleted file mode 100644 index 5bb03b592b9..00000000000 --- a/pkgs/development/compilers/rustc/1.0.0.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ stdenv, callPackage }: -callPackage ./generic.nix { - shortVersion = "1.0.0"; - isRelease = true; - srcSha = "14brziw91d3r88fa1kvpvhap5ws4z8h2mas7h6k9lpsc2zl9blak"; - snapshotHashLinux686 = "1ef82402ed16f5a6d2f87a9a62eaa83170e249ec"; - snapshotHashLinux64 = "ef2154372e97a3cb687897d027fd51c8f2c5f349"; - snapshotHashDarwin686 = "0310b1a970f2da7e61770fd14dbbbdca3b518234"; - snapshotHashDarwin64 = "5f35d9c920b8083a7420ef8cf5b00d5ef3085dfa"; - snapshotDate = "2015-03-27"; - snapshotRev = "5520801"; - patches = [ - ./patches/beta.patch - ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; - configureFlags = [ "--release-channel=stable" ]; -} diff --git a/pkgs/development/compilers/rustc/default.nix b/pkgs/development/compilers/rustc/default.nix new file mode 100644 index 00000000000..b61a407223c --- /dev/null +++ b/pkgs/development/compilers/rustc/default.nix @@ -0,0 +1,33 @@ +{ stdenv, callPackage }: +callPackage ./generic.nix { + shortVersion = "1.1.0"; + isRelease = true; + srcSha = "0lsfrclj5imxy6129ggya7rb2h04cgqq53f75z2jv40y5xk25sy8"; + + /* Rust is bootstrapped from an earlier built version. We need + to fetch these earlier versions, which vary per platform. + The shapshot info you want can be found at + https://github.com/rust-lang/rust/blob/{$shortVersion}/src/snapshots.txt + with the set you want at the top. + */ + + # linux-i386 + snapshotHashLinux686 = "0bc8cffdce611fb71fd7d3d8e7cdbfaf748a4f16"; + + # linux-x86_64 + snapshotHashLinux64 = "94089740e48167c5975c92c139ae9c286764012f"; + + # macos-i386 + snapshotHashDarwin686 = "54cc35e76497e6e94fddf38d6e40e9d168491ddb"; + + # macos-x86_64 + snapshotHashDarwin64 = "43a1c1fba0d1dfee4c2ca310d506f8f5f51b3f6f"; + + snapshotDate = "2015-04-27"; + snapshotRev = "857ef6e"; + + patches = [ + ./patches/beta.patch + ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; + configureFlags = [ "--release-channel=stable" ]; +} diff --git a/pkgs/development/compilers/rustc/generic.nix b/pkgs/development/compilers/rustc/generic.nix index d1091643f77..b8d232b82a3 100644 --- a/pkgs/development/compilers/rustc/generic.nix +++ b/pkgs/development/compilers/rustc/generic.nix @@ -62,7 +62,7 @@ let version = if isRelease then meta = with stdenv.lib; { homepage = http://www.rust-lang.org/; description = "A safe, concurrent, practical language"; - maintainers = with maintainers; [ madjar cstrahan wizeman globin ]; + maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy ]; license = [ licenses.mit licenses.asl20 ]; platforms = platforms.linux; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e6ad3607854..022be12ab0e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4653,7 +4653,7 @@ let }; rustcMaster = callPackage ../development/compilers/rustc/head.nix {}; - rustc = callPackage ../development/compilers/rustc/1.0.0.nix {}; + rustc = callPackage ../development/compilers/rustc/default.nix {}; rustPlatform = rustStable; |