From 50ce8abccff884fd61ddbc1aff68ee36c89bc77c Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 16 Sep 2017 17:21:26 +0200 Subject: [PATCH] fetchRepoProject: Refactor the code Should hopefully make it a bit more readable and less redundant. --- .../fetchrepoproject/default.nix | 77 +++++++++---------- 1 file changed, 35 insertions(+), 42 deletions(-) diff --git a/pkgs/build-support/fetchrepoproject/default.nix b/pkgs/build-support/fetchrepoproject/default.nix index 8c55db5372d..81f7b3d3f56 100644 --- a/pkgs/build-support/fetchrepoproject/default.nix +++ b/pkgs/build-support/fetchrepoproject/default.nix @@ -1,6 +1,7 @@ { stdenv, git, gitRepo, gnupg ? null, cacert, copyPathsToStore }: -{ name, manifest, rev ? "HEAD", sha256, repoRepoURL ? "", repoRepoRev ? "", referenceDir ? "" +{ name, manifest, rev ? "HEAD", sha256 +, repoRepoURL ? "", repoRepoRev ? "", referenceDir ? "" , localManifests ? [], createMirror ? false, useArchive ? !createMirror }: @@ -10,6 +11,12 @@ assert createMirror -> !useArchive; with stdenv.lib; let + extraRepoInitFlags = [ + (optionalString (repoRepoURL != "") "--repo-url=${repoRepoURL}") + (optionalString (repoRepoRev != "") "--repo-branch=${repoRepoRev}") + (optionalString (referenceDir != "") "--reference=${referenceDir}") + ]; + repoInitFlags = [ "--manifest-url=${manifest}" "--manifest-branch=${rev}" @@ -18,56 +25,42 @@ let "--no-clone-bundle" (optionalString createMirror "--mirror") (optionalString useArchive "--archive") - (optionalString (repoRepoURL != "") "--repo-url=${repoRepoURL}") - (optionalString (repoRepoRev != "") "--repo-branch=${repoRepoRev}") - (optionalString (referenceDir != "") "--reference=${referenceDir}") - ]; + ] ++ extraRepoInitFlags; local_manifests = copyPathsToStore localManifests; -in +in stdenv.mkDerivation { + inherit name; -with stdenv.lib; + inherit cacert manifest rev repoRepoURL repoRepoRev referenceDir; # TODO -let - extraRepoInitFlags = [ - (optionalString (repoRepoURL != "") "--repo-url=${repoRepoURL}") - (optionalString (repoRepoRev != "") "--repo-branch=${repoRepoRev}") - (optionalString (referenceDir != "") "--reference=${referenceDir}") - ]; -in - -stdenv.mkDerivation { - buildCommand = '' - mkdir .repo - ${optionalString (local_manifests != []) '' - mkdir ./.repo/local_manifests - 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 ${concatStringsSep " " repoInitFlags} - - repo sync --jobs=$NIX_BUILD_CORES --current-branch - ${optionalString (!createMirror) "rm -rf $out/.repo"} - ''; - - GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; - - impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars ++ [ - "GIT_PROXY_COMMAND" "SOCKS_SERVER" - ]; - - buildInputs = [git gitRepo cacert] ++ optional (gnupg != null) [gnupg] ; outputHashAlgo = "sha256"; outputHashMode = "recursive"; outputHash = sha256; preferLocalBuild = true; enableParallelBuilding = true; - inherit name cacert manifest rev repoRepoURL repoRepoRev referenceDir; + + impureEnvVars = fetchers.proxyImpureEnvVars ++ [ + "GIT_PROXY_COMMAND" "SOCKS_SERVER" + ]; + + buildInputs = [ git gitRepo cacert ] ++ optional (gnupg != null) [ gnupg ]; + + GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + + buildCommand = '' + mkdir .repo + ${optionalString (local_manifests != []) '' + mkdir .repo/local_manifests + 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 ${concatStringsSep " " repoInitFlags} + repo sync --jobs=$NIX_BUILD_CORES --current-branch + ${optionalString (!createMirror) "rm -rf $out/.repo"} + ''; }