From bf492548a27aca1068fe75d162cad77000134704 Mon Sep 17 00:00:00 2001 From: Robert Irelan Date: Sun, 5 Jul 2015 23:21:00 -0700 Subject: [PATCH 1/5] rustc: 1.0.0 -> 1.1.0 --- pkgs/development/compilers/rustc/1.0.0.nix | 16 ---------- pkgs/development/compilers/rustc/default.nix | 33 ++++++++++++++++++++ pkgs/development/compilers/rustc/generic.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 35 insertions(+), 18 deletions(-) delete mode 100644 pkgs/development/compilers/rustc/1.0.0.nix create mode 100644 pkgs/development/compilers/rustc/default.nix 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 5bb03b592b942..0000000000000 --- 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 0000000000000..b61a407223c75 --- /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 d1091643f7799..b8d232b82a332 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 e6ad360785464..022be12ab0e55 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; From cf2f3f60cac7cd83efb4ffac019e41d83d678d5a Mon Sep 17 00:00:00 2001 From: Robert Irelan Date: Mon, 6 Jul 2015 23:14:38 -0700 Subject: [PATCH 2/5] rustCargoPlatform: run on stable Rust Use stable Rust now that Cargo builds on stable Rust. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 022be12ab0e55..74b49c60a7b51 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4661,7 +4661,7 @@ let rustUnstable = recurseIntoAttrs (makeRustPlatform rustcMaster cargo rustUnstable); # rust platform to build cargo itself (with cargoSnapshot) - rustCargoPlatform = makeRustPlatform rustcMaster cargoSnapshot rustCargoPlatform; + rustCargoPlatform = makeRustPlatform rustc cargoSnapshot rustCargoPlatform; makeRustPlatform = rustc: cargo: self: let From e6ee86b9410dd5e3e081c7ce6ba316bd216bc240 Mon Sep 17 00:00:00 2001 From: Robert Irelan Date: Tue, 7 Jul 2015 08:29:08 -0700 Subject: [PATCH 3/5] cargoSnapshot: 2015-04-02 -> 2015-06-17, hide from nix-env Update snapshot to avoid rust-lang/cargo#976, which otherwise breaks the build. Also move the `cargoSnapshot` derivation inside a set in pkgs/top-level/all-packages.nix in order to hide the `cargo-snapshot` packages from `nix-env -qa`, since it's only used to build the `cargo` package. --- .../tools/build-managers/cargo/snapshot.nix | 10 +++++----- pkgs/top-level/all-packages.nix | 6 ++++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/build-managers/cargo/snapshot.nix b/pkgs/development/tools/build-managers/cargo/snapshot.nix index a76fb4601e8be..f24bcc2d9ab83 100644 --- a/pkgs/development/tools/build-managers/cargo/snapshot.nix +++ b/pkgs/development/tools/build-managers/cargo/snapshot.nix @@ -2,19 +2,19 @@ /* Cargo binary snapshot */ -let snapshotDate = "2015-04-02"; +let snapshotDate = "2015-06-17"; in with ((import ./common.nix) { inherit stdenv; version = "snapshot-${snapshotDate}"; }); let snapshotHash = if stdenv.system == "i686-linux" - then "ba6c162680d5509d89ba2363d7cae2047f40c034" + then "g2h9l35123r72hqdwayd9h79kspfb4y9" else if stdenv.system == "x86_64-linux" - then "94f715c9a52809a639f2ce6f8b1d5215a0c272b5" + then "fnx2rf1j8zvrplcc7xzf89czn0hf3397" else if stdenv.system == "i686-darwin" - then "cf333f16f89bfd50e8ce461c6f81ca30d33f7f73" + then "3viz3fi2jx18qjwrc90nfhm9cik59my6" else if stdenv.system == "x86_64-darwin" - then "1f7008a6ec860e2bc7580e71bdf320ac518ddeb8" + then "h2bf3db4vwz5cjjkn98lxayivdc6dflp" else throw "no snapshot for platform ${stdenv.system}"; snapshotName = "cargo-nightly-${platform}.tar.gz"; in diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74b49c60a7b51..b8ee263f169cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4661,7 +4661,7 @@ let rustUnstable = recurseIntoAttrs (makeRustPlatform rustcMaster cargo rustUnstable); # rust platform to build cargo itself (with cargoSnapshot) - rustCargoPlatform = makeRustPlatform rustc cargoSnapshot rustCargoPlatform; + rustCargoPlatform = makeRustPlatform rustc cargoSnapshot.cargo rustCargoPlatform; makeRustPlatform = rustc: cargo: self: let @@ -5316,7 +5316,9 @@ let rustPlatform = rustCargoPlatform; }; - cargoSnapshot = callPackage ../development/tools/build-managers/cargo/snapshot.nix { }; + cargoSnapshot = { + cargo = callPackage ../development/tools/build-managers/cargo/snapshot.nix { }; + }; casperjs = callPackage ../development/tools/casperjs { }; From 322edf09e0727b51f0b7f2bfced9fed716eb1163 Mon Sep 17 00:00:00 2001 From: Robert Irelan Date: Mon, 6 Jul 2015 23:12:14 -0700 Subject: [PATCH 4/5] rustRegistry: 2015-06-12-020d1f3 -> 2015-07-07-fd9e3e4 --- pkgs/top-level/rust-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index fe723a038e271..9d74ab88fc013 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -7,15 +7,15 @@ { runCommand, fetchFromGitHub, git }: let - version = "2015-06-12"; - rev = "020d1f3344ed8e7bd8fa740372bb7f03675fa708"; + version = "2015-07-07"; + rev = "fd9e3e4a350f5df0d975913bcc29d2051a509199"; src = fetchFromGitHub { inherit rev; owner = "rust-lang"; repo = "crates.io-index"; - sha256 = "0vkr0k1ga0jskvl8ss7m5m66b4wwi7ibjj5qw0x0khcg1b5skkq6"; + sha256 = "1vm28gfq4fmialz5ab8cxk5q1kdf6hlg3ni41qpy9k61pp9bqdwr"; }; in From 51972d427e332b92b928183fc9a25624dfd18075 Mon Sep 17 00:00:00 2001 From: Robert Irelan Date: Mon, 6 Jul 2015 21:17:05 -0700 Subject: [PATCH 5/5] cargo: 2015-05-13 -> 0.3.0 Rename cargo to use a version number rather than a date because Cargo has started releasing packages using version numbers. --- pkgs/development/tools/build-managers/cargo/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/build-managers/cargo/default.nix b/pkgs/development/tools/build-managers/cargo/default.nix index e7a45f1c3484c..d849ad5de9443 100644 --- a/pkgs/development/tools/build-managers/cargo/default.nix +++ b/pkgs/development/tools/build-managers/cargo/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, rustPlatform, file, curl, python, pkgconfig, openssl , cmake, zlib }: -with ((import ./common.nix) { inherit stdenv; version = "2015-05-13"; }); +with ((import ./common.nix) { inherit stdenv; version = "0.3.0"; }); with rustPlatform; @@ -10,12 +10,12 @@ buildRustPackage rec { src = fetchgit { url = "https://github.com/rust-lang/cargo.git"; - rev = "d814fcbf8efda3027d54c09e11aa7eaf0006a83c"; - sha256 = "0sppd3x2cacmbnypcjip44amnh66lrrbwwzsbz8rqf3nq2ah496x"; + rev = "refs/tags/0.3.0"; + sha256 = "1ckb2xd7nm8357imw6b1ci2ar8grnihzan94kvmjrijq6sz8yv9i"; leaveDotGit = true; }; - depsSha256 = "1b0mpdxmp7inkg59n2phjwzpz5gx22wqg9rfd1s01a5ylara37jw"; + depsSha256 = "1sgdr2akd9xrfmf5g0lbf842b2pdj1ymxk37my0cf2x349rjsf0w"; buildInputs = [ file curl pkgconfig python openssl cmake zlib ];