summary refs log tree commit diff
diff options
context:
space:
mode:
authorRobin Gloster <robin@loc-com.de>2015-09-23 16:58:38 +0000
committerRobin Gloster <robin@loc-com.de>2015-09-23 21:16:16 +0000
commitfeda2925f7d0856ec03faeda619cc08d0381d8f1 (patch)
treed7b58d428c4490ca1280249e2f0fdcbd5c884c26
parent73438e3d8d006324ec4c2b185523b3bbe47abace (diff)
downloadnixpkgs-feda2925f7d0856ec03faeda619cc08d0381d8f1.tar
nixpkgs-feda2925f7d0856ec03faeda619cc08d0381d8f1.tar.gz
nixpkgs-feda2925f7d0856ec03faeda619cc08d0381d8f1.tar.bz2
nixpkgs-feda2925f7d0856ec03faeda619cc08d0381d8f1.tar.lz
nixpkgs-feda2925f7d0856ec03faeda619cc08d0381d8f1.tar.xz
nixpkgs-feda2925f7d0856ec03faeda619cc08d0381d8f1.tar.zst
nixpkgs-feda2925f7d0856ec03faeda619cc08d0381d8f1.zip
cargo: 0.3.0 -> 0.5.0
-rw-r--r--pkgs/development/tools/build-managers/cargo/default.nix11
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/development/tools/build-managers/cargo/default.nix b/pkgs/development/tools/build-managers/cargo/default.nix
index 9ffc9b0cbb9..6d16cbf7405 100644
--- a/pkgs/development/tools/build-managers/cargo/default.nix
+++ b/pkgs/development/tools/build-managers/cargo/default.nix
@@ -1,20 +1,21 @@
 { stdenv, fetchgit, rustPlatform, file, curl, python, pkgconfig, openssl
 , cmake, zlib }:
 
-with ((import ./common.nix) { inherit stdenv; version = "0.3.0"; });
+with ((import ./common.nix) { inherit stdenv; version = "0.5.0"; });
 
 with rustPlatform;
 
 buildRustPackage rec {
   inherit name version meta;
 
+  # Needs to use fetchgit instead of fetchFromGitHub to fetch submodules
   src = fetchgit {
-    url = "https://github.com/rust-lang/cargo.git";
-    rev = "refs/tags/0.3.0";
-    sha256 = "0p7p7yivydjkpqb53a8i7pjl719z3gxa6czi0255ccwsh6n9z793";
+    url = "git://github.com/rust-lang/cargo";
+    rev = "refs/tags/${version}";
+    sha256 = "1wg7vr6fpk9n76ly65lf2z9w1dj5nhykffbwrv46lybd8m3r8x3w";
   };
 
-  depsSha256 = "1sgdr2akd9xrfmf5g0lbf842b2pdj1ymxk37my0cf2x349rjsf0w";
+  depsSha256 = "1q92q63g9pz7fy9fhx8y0kqarsshmzv1dq18ki3hdd7d5pcbczna";
 
   buildInputs = [ file curl pkgconfig python openssl cmake zlib ];