diff options
author | Sophie Taylor <sophie@spacekitteh.moe> | 2017-03-26 19:59:08 +1000 |
---|---|---|
committer | Sophie Taylor <sophie@spacekitteh.moe> | 2017-03-26 20:05:59 +1000 |
commit | 1f545f01bb96d885b33e9ff18ce291b85d3a69fb (patch) | |
tree | dc2912e2e69bf82feceef107793161157a9a3283 | |
parent | 76e095c6c5718d1266e485d07b6d7363cf06492d (diff) | |
download | nixpkgs-1f545f01bb96d885b33e9ff18ce291b85d3a69fb.tar nixpkgs-1f545f01bb96d885b33e9ff18ce291b85d3a69fb.tar.gz nixpkgs-1f545f01bb96d885b33e9ff18ce291b85d3a69fb.tar.bz2 nixpkgs-1f545f01bb96d885b33e9ff18ce291b85d3a69fb.tar.lz nixpkgs-1f545f01bb96d885b33e9ff18ce291b85d3a69fb.tar.xz nixpkgs-1f545f01bb96d885b33e9ff18ce291b85d3a69fb.tar.zst nixpkgs-1f545f01bb96d885b33e9ff18ce291b85d3a69fb.zip |
fetchRepoProject: fixes; more options
-rw-r--r-- | pkgs/build-support/fetchrepoproject/default.nix | 49 |
1 files changed, 35 insertions, 14 deletions
diff --git a/pkgs/build-support/fetchrepoproject/default.nix b/pkgs/build-support/fetchrepoproject/default.nix index f0bc02cf66d..8d5259908d7 100644 --- a/pkgs/build-support/fetchrepoproject/default.nix +++ b/pkgs/build-support/fetchrepoproject/default.nix @@ -1,27 +1,49 @@ -{stdenv, git, gitRepo, gnupg ? null, cacert}: +{ stdenv, git, gitRepo, gnupg ? null, cacert, copyPathsToStore }: -{name, manifest, rev ? "HEAD", sha256 ? "", repoRepoURL ? "", repoRepoRev ? "", referenceDir ? "", -localManifests ? [] }: +{ name, manifest, rev ? "HEAD", sha256, repoRepoURL ? "", repoRepoRev ? "", referenceDir ? "" +, localManifests ? [], createMirror ? false, useArchive ? !createMirror +}: assert repoRepoRev != "" -> repoRepoURL != ""; +assert createMirror -> !useArchive; + +with stdenv.lib; + +let + repoInitFlags = [ + "--manifest-url=${manifest}" + "--manifest-branch=${rev}" + "--depth=1" + #TODO: fetching clone.bundle seems to fail spectacularly inside a sandbox. + "--no-clone-bundle" + (optionalString (createMirror != "") "--mirror") + (optionalString useArchive "--archive") + (optionalString (repoRepoURL != "") "--repo-url=${repoRepoURL}") + (optionalString (repoRepoRev != "") "--repo-branch=${repoRepoRev}") + (optionalString (referenceDir != "") "--reference=${referenceDir}") + ]; + + local_manifests = copyPathsToStore localManifests; + +in stdenv.mkDerivation { - buildCommand = with stdenv.lib; '' - mkdir ./.repo + + buildCommand = '' + mkdir .repo + ${optionalString (local_manifests != []) '' mkdir ./.repo/local_manifests - for local_manifest in ${concatMapStringsSep " " (x: "${x}") localManifests} + for local_manifest in ${concatMapStringsSep " " toString local_manifests} 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 ${concatStringsSep " " repoInitFlags} + repo sync --jobs=$NIX_BUILD_CORES --current-branch - rm -rf $out/.repo + ${optionalString createMirror "rm -rf $out/.repo"} ''; GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; @@ -30,8 +52,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"; outputHash = sha256; |