about summary refs log tree commit diff
path: root/pkgs/development/tools
diff options
context:
space:
mode:
authorRicardo M. Correia <rcorreia@wizy.org>2015-05-12 14:18:58 +0200
committerRicardo M. Correia <rcorreia@wizy.org>2015-05-12 17:28:50 +0200
commitcbdedca255e50dfce0e2e345181e718bbd90b46d (patch)
tree5405e4178dd092b532b34f4f723c327f5dfeec5a /pkgs/development/tools
parent548e8db2499f38fe1b06a78fad7c1ddb53e0029d (diff)
downloadnixlib-cbdedca255e50dfce0e2e345181e718bbd90b46d.tar
nixlib-cbdedca255e50dfce0e2e345181e718bbd90b46d.tar.gz
nixlib-cbdedca255e50dfce0e2e345181e718bbd90b46d.tar.bz2
nixlib-cbdedca255e50dfce0e2e345181e718bbd90b46d.tar.lz
nixlib-cbdedca255e50dfce0e2e345181e718bbd90b46d.tar.xz
nixlib-cbdedca255e50dfce0e2e345181e718bbd90b46d.tar.zst
nixlib-cbdedca255e50dfce0e2e345181e718bbd90b46d.zip
cargo: 2015-04-14 -> 2015-05-11
Diffstat (limited to 'pkgs/development/tools')
-rw-r--r--pkgs/development/tools/build-managers/cargo/default.nix16
1 files changed, 4 insertions, 12 deletions
diff --git a/pkgs/development/tools/build-managers/cargo/default.nix b/pkgs/development/tools/build-managers/cargo/default.nix
index 05e07b4afa2b..8e7d8cf8ee83 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-04-14"; });
+with ((import ./common.nix) { inherit stdenv; version = "2015-05-11"; });
 
 with rustPlatform;
 
@@ -10,20 +10,12 @@ buildRustPackage rec {
 
   src = fetchgit {
     url = "https://github.com/rust-lang/cargo.git";
-    rev = "d49b44358ed800351647571144257d35ac0886cf";
-    sha256 = "1kaims28237mvp1qpw2cfgb3684jr54ivkdag0lw8iv9xap4i35y";
+    rev = "a078e01ffab70738eafb7401704d1eaf90b94de2";
+    sha256 = "0vw62kxlmkajyix6n4cdz7w9l26dspjiw2fk4xkj33gzzc8rq9g8";
     leaveDotGit = true;
   };
 
-  cargoUpdateHook = ''
-    # Updating because version 2.1.4 has an invalid Cargo.toml
-    cargo update -p libressl-pnacl-sys --precise 2.1.5
-
-    # Updating because version 0.1.3 has a build failure with recent rustc
-    cargo update -p threadpool --precise 0.1.4
-  '';
-
-  depsSha256 = "1gj3mnjj17h5p0r1jcm3m3pm3p3l1rbfdz3l7v1cykng78dsabnq";
+  depsSha256 = "1sk79w2wxvpgfkxr0nbrqqxdih4abiqvawdd88r2p9cqzrkdg8by";
 
   buildInputs = [ file curl pkgconfig python openssl cmake zlib ];