mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Code Issues Wiki Activity

Merge pull request #24275 from spacekitteh/fetchFromGitRepo

Browse source 
fetchRepoProject: Fix buildCommand
This commit is contained in:
Daiderd Jordan 2017-03-25 09:45:11 +01:00 committed by GitHub
parent 6e0b7273a2 00f472a563
commit 7dc489d95a
1 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
pkgs/build-support/fetchrepoproject/default.nix
View file

@ -1,24 +1,34 @@
{stdenv, git, gitRepo, gnupg ? null, cacert}:
{ stdenv, git, gitRepo, gnupg ? null, cacert }:
{name, manifest, rev ? "HEAD", sha256 ? "", repoRepoURL ? "", repoRepoRev ? "", referenceDir ? "",
localManifests ? [] }:
{ name, manifest, rev ? "HEAD", sha256 ? "", repoRepoURL ? "", repoRepoRev ? "", referenceDir ? ""
, localManifests ? []
}:
assert repoRepoRev != "" -> repoRepoURL != "";
with stdenv.lib;
let
extraRepoInitFlags = [
(optionalString (repoRepoURL != "") "--repo-url=${repoRepoURL}")
(optionalString (repoRepoRev != "") "--repo-branch=${repoRepoRev}")
(optionalString (referenceDir != "") "--reference=${referenceDir}")
];
in
stdenv.mkDerivation {
buildCommand = with stdenv.lib; ''
buildCommand = ''
mkdir ./.repo
mkdir ./.repo/local_manifests
for local_manifest in ${concatMapStringsSep " " (x: "${x}") localManifests}
for local_manifest in ${concatMapStringsSep " " toString localManifests}
do
cp $local_manifest ./.repo/local_manifests/$(stripHash $local_manifest; echo $strippedName)
done
export HOME=.repo
repo init --manifest-url=${manifest} --manifest-branch=${rev} --depth=1 --no-clone-bundle
${optionalString (repoRepoURL != "") " --repo-url=${repoRepoURL}"}
${optionalString (repoRepoRev != "") " --repo-branch=${repoRepoRev}"}
${optionalString (referenceDir != "") " --reference=${referenceDir}"}
repo init --manifest-url=${manifest} --manifest-branch=${rev} --depth=1 --no-clone-bundle \
${concatStringsSep " " extraRepoInitFlags}
repo sync --jobs=$NIX_BUILD_CORES --current-branch
rm -rf $out/.repo
'';
@ -29,7 +39,7 @@ stdenv.mkDerivation {
"GIT_PROXY_COMMAND" "SOCKS_SERVER"
];
buildInputs = [git gitRepo cacert] ++ stdenv.lib.optional (gnupg != null) [gnupg] ;
buildInputs = [git gitRepo cacert] ++ optional (gnupg != null) [gnupg] ;
outputHashAlgo = "sha256";
outputHashMode = "recursive";