alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

cargoUnstable: init at 2016-01-10

Browse source
This commit is contained in:
Nikolay Amiantov 2016-01-10 20:51:11 +03:00
parent cdb5f269e2
commit d1ed30ac0d
2 changed files with 44 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
pkgs/development/tools/build-managers/cargo/head.nix Normal file
View file

@ -0,0 +1,39 @@
{ stdenv, fetchgit, rustPlatform, file, curl, python, pkgconfig, openssl
, cmake, zlib, makeWrapper }:
with rustPlatform;
with ((import ./common.nix) {
inherit stdenv rustc;
version = "2016-01-10";
});
buildRustPackage rec {
inherit name version meta passthru;
# Needs to use fetchgit instead of fetchFromGitHub to fetch submodules
src = fetchgit {
url = "git://github.com/rust-lang/cargo";
rev = "ca373452de159491354cf38279dbc19308c91e72";
sha256 = "0fx88b3ndvzhfwq159xavs0z5c7jww231kd65cbzyih9g0ab9x65";
};
depsSha256 = "0csagk2dnwg5z0vbxilz1kzcygd4llw7s81ka0xn1g05x30jqrnn";
buildInputs = [ file curl pkgconfig python openssl cmake zlib makeWrapper ];
configurePhase = ''
./configure --enable-optimize --prefix=$out --local-cargo=${cargo}/bin/cargo
'';
buildPhase = "make";
# Disable check phase as there are lots of failures (some probably due to
# trying to access the network).
doCheck = false;
installPhase = ''
make install
${postInstall}
'';
}

7
pkgs/top-level/all-packages.nix
View file

@ -4878,8 +4878,7 @@ let
rustPlatform = rustStable;
rustStable = recurseIntoAttrs (makeRustPlatform cargo rustStable);
rustUnstable = recurseIntoAttrs (makeRustPlatform
(cargo.override { rustPlatform = rustUnstableCargoPlatform; }) rustUnstable);
rustUnstable = recurseIntoAttrs (makeRustPlatform cargoUnstable rustUnstable);
# rust platform to build cargo itself (with cargoSnapshot)
rustCargoPlatform = makeRustPlatform (cargoSnapshot rustc) rustCargoPlatform;
@ -5533,6 +5532,10 @@ let
rustPlatform = rustCargoPlatform;
};
cargoUnstable = callPackage ../development/tools/build-managers/cargo/head.nix {
rustPlatform = rustUnstableCargoPlatform;
};
cargoSnapshot = rustc:
callPackage ../development/tools/build-managers/cargo/snapshot.nix {
inherit rustc;