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

fetchrepoproject: cleanup extra flags

Browse Source
This commit is contained in:
Daiderd Jordan 2017-03-25 00:35:20 +01:00
parent 2078c34dad
commit 00f472a563
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pkgs/build-support/fetchrepoproject/default.nix
View File

@ -1,25 +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
'';
@ -30,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";