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

rust: Refactoring of rust and cargo packages

Browse Source
This commit is contained in:
David Craven
2016-06-15 12:47:13 +02:00
parent d8a7aaf179
commit 54f80775cb
27 changed files with 181 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/build-support/rust/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, cacert, git, cargo, rustRegistry }:
{ stdenv, cacert, git, rust, rustRegistry }:
{ name, depsSha256
, src ? null
, srcs ? null
@@ -10,7 +10,7 @@
let
fetchDeps = import ./fetchcargo.nix {
inherit stdenv cacert git cargo rustRegistry;
inherit stdenv cacert git rust rustRegistry;
};
cargoDeps = fetchDeps {
@@ -23,7 +23,7 @@ in stdenv.mkDerivation (args // {
patchRegistryDeps = ./patch-registry-deps;
buildInputs = [ git cargo cargo.rustc ] ++ buildInputs;
buildInputs = [ git rust.cargo rust.rustc ] ++ buildInputs;
configurePhase = args.configurePhase or "true";
pkgs/build-support/rust/fetchcargo.nix
+2 -2
View File
@@ -1,9 +1,9 @@
{ stdenv, cacert, git, cargo, rustRegistry }:
{ stdenv, cacert, git, rust, rustRegistry }:
{ name ? "cargo-deps", src, srcs, sourceRoot, sha256, cargoUpdateHook ? "" }:
stdenv.mkDerivation {
name = "${name}-fetch";
buildInputs = [ cargo git ];
buildInputs = [ rust.cargo rust.rustc git ];
inherit src srcs sourceRoot rustRegistry cargoUpdateHook;
phases = "unpackPhase installPhase";