diff options
| author | zimbatm <zimbatm@zimbatm.com> | 2017-10-08 19:26:40 +0100 |
|---|---|---|
| committer | zimbatm <zimbatm@zimbatm.com> | 2017-10-23 00:30:46 +0100 |
| commit | d170c2ceadde34a1ee4844fe59d876351331b707 (patch) | |
| tree | fd581dcf091cfbe0885644ba7f9ed99f1bcb2edd /pkgs/development | |
| parent | 7bd191df6a861e02d5bf2b36a03f6dc70e3e6bfd (diff) | |
| download | nixlib-d170c2ceadde34a1ee4844fe59d876351331b707.tar nixlib-d170c2ceadde34a1ee4844fe59d876351331b707.tar.gz nixlib-d170c2ceadde34a1ee4844fe59d876351331b707.tar.bz2 nixlib-d170c2ceadde34a1ee4844fe59d876351331b707.tar.lz nixlib-d170c2ceadde34a1ee4844fe59d876351331b707.tar.xz nixlib-d170c2ceadde34a1ee4844fe59d876351331b707.tar.zst nixlib-d170c2ceadde34a1ee4844fe59d876351331b707.zip | |
cargo: use fetchFromGitHub
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/compilers/rust/cargo.nix | 9 | ||||
| -rw-r--r-- | pkgs/development/compilers/rust/default.nix | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 2df843faf934..2f1cf07c3b8b 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, file, curl, pkgconfig, python, openssl, cmake, zlib +{ stdenv, fetchFromGitHub, file, curl, pkgconfig, python, openssl, cmake, zlib , makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2 , version, srcSha, depsSha256 , patches ? []}: @@ -7,9 +7,10 @@ rustPlatform.buildRustPackage rec { name = "cargo-${version}"; inherit version; - src = fetchgit { - url = "https://github.com/rust-lang/cargo"; - rev = version; + src = fetchFromGitHub { + owner = "rust-lang"; + repo = "cargo"; + rev = version; sha256 = srcSha; }; diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 2544cca43366..122bda0f70b5 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -29,8 +29,8 @@ rec { cargo = callPackage ./cargo.nix rec { version = "0.21.1"; - srcSha = "a64iywv1l3v87b0pznf5kkzxigd6w19myv9d7ka4c65zgrk9n9px"; - depsSha256 = "amrgd8ib48vxxbhkvsqqq4p19sc6b74x3cd8p6lhhlm6plrajrvm"; + srcSha = "1nz7sz7rzc6i1c0nzf6kmnmaq1l3hgrg19s589q7k309r6m7p7f7"; + depsSha256 = "0pzfn1zjgklr0fw9zi9sxrwr08q3wcvdl9ybxrk3ld7ps5h9wmsi"; inherit rustc; # the rustc that will be wrapped by cargo inherit rustPlatform; # used to build cargo |