public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cargo: 0.8.0 -> 0.9.0. Enable Darwin

Browse Source
This commit is contained in:
Tadas Barzdzius 2016-04-20 12:42:37 +03:00
parent 94280ecf90
commit 7d661a4ab4
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/build-managers/cargo/common.nix
View File

@ -31,8 +31,8 @@
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://crates.io; homepage = http://crates.io;
description = "Downloads your Rust project's dependencies and builds your project"; description = "Downloads your Rust project's dependencies and builds your project";
maintainers = with maintainers; [ wizeman ]; maintainers = with maintainers; [ wizeman retrry ];
license = [ licenses.mit licenses.asl20 ]; license = [ licenses.mit licenses.asl20 ];
platforms = platforms.linux; platforms = platforms.linux ++ platforms.darwin;
}; };
} }

19
pkgs/development/tools/build-managers/cargo/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchgit, rustPlatform, file, curl, python, pkgconfig, openssl { stdenv, cacert, fetchgit, rustPlatform, file, curl, python, pkgconfig, openssl
, cmake, zlib, makeWrapper }: , cmake, zlib, makeWrapper }:
with rustPlatform; with rustPlatform;
with ((import ./common.nix) { with ((import ./common.nix) {
inherit stdenv rustc; inherit stdenv rustc;
version = "0.8.0"; version = "0.9.0";
}); });
buildRustPackage rec { buildRustPackage rec {
@ -15,10 +15,10 @@ buildRustPackage rec {
src = fetchgit { src = fetchgit {
url = "git://github.com/rust-lang/cargo"; url = "git://github.com/rust-lang/cargo";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
sha256 = "02z0b6hpygjjfbskg22ggrhdv2nasrgf8x1fd8y0qzg4krx2czlh"; sha256 = "0d3n2jdhaz06yhilvmw3m2avxv501da1hdhljc9mwkz3l5bkv2jv";
}; };
depsSha256 = "1gwc5ygs3h8jxs506xmbj1xzaqpb3kmg3pkxg9j9yqy616jw6rcn"; depsSha256 = "1x2m7ww2z8nl5ic2nds85p7ma8x0zp654jg7ay905ia95daiabzg";
buildInputs = [ file curl pkgconfig python openssl cmake zlib makeWrapper ]; buildInputs = [ file curl pkgconfig python openssl cmake zlib makeWrapper ];
@ -28,8 +28,15 @@ buildRustPackage rec {
buildPhase = "make"; buildPhase = "make";
# Disable check phase as there are lots of failures (some probably due to checkPhase = ''
# trying to access the network). # Export SSL_CERT_FILE as without it one test fails with SSL verification error
export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt
# Disable cross compilation tests
export CFG_DISABLE_CROSS_TESTS=1
cargo test
'';
# Disable check phase as there are failures (author_prefers_cargo test fails)
doCheck = false; doCheck = false;
installPhase = '' installPhase = ''