Merge pull request from NixOS/revert-79581-feature/fetcher-whitespace-clean

Revert "fetchzip, fetchgit: cleanup handling of optional features and whitespace"
This commit is contained in:
Benjamin Hipple 2020-03-26 00:37:18 -04:00 committed by GitHub
commit 33f0805fe0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 43 additions and 41 deletions
pkgs/build-support

View File

@ -1,5 +1,6 @@
#! /usr/bin/env bash
set -eo pipefail
set -e -o pipefail
url=
rev=
@ -39,9 +40,9 @@ usage(){
Options:
--out path Path where the output would be stored.
--url url Any url understood by 'git clone'.
--rev ref Any sha1 or references (such as refs/heads/master).
--rev ref Any sha1 or references (such as refs/heads/master)
--hash h Expected hash.
--branch-name Branch name to check out into.
--branch-name Branch name to check out into
--deepClone Clone the entire repository.
--no-deepClone Make a shallow clone of just the required ref.
--leave-dotGit Keep the .git directories.

View File

@ -5,22 +5,24 @@
# (e.g. due to minor changes in the compression algorithm, or changes
# in timestamps).
{ lib, fetchurl, unzip }:
{ fetchurl, unzip }:
{ name ? "source"
{ # Optionally move the contents of the unpacked tree up one level.
stripRoot ? true
, url
# Optionally move the contents of the unpacked tree up one level.
, stripRoot ? true
, extraPostFetch ? ""
, name ? "source"
, ... } @ args:
(fetchurl ({
inherit name;
recursiveHash = true;
downloadToTemp = true;
postFetch = ''
postFetch =
''
unpackDir="$TMPDIR/unpack"
mkdir "$unpackDir"
cd "$unpackDir"
@ -28,23 +30,22 @@
renamed="$TMPDIR/${baseNameOf url}"
mv "$downloadedFile" "$renamed"
unpackFile "$renamed"
result=$unpackDir
''
# Most src disted tarballs have a parent directory like foo-1.2.3/ to strip
+ lib.optionalString stripRoot ''
+ (if stripRoot then ''
if [ $(ls "$unpackDir" | wc -l) != 1 ]; then
echo "error: zip file must contain a single file or directory."
echo "hint: Pass stripRoot=false; to fetchzip to assume flat list of files."
exit 1
fi
fn=$(cd "$unpackDir" && echo *)
result="$unpackDir/$fn"
'' + ''
if [ -f "$unpackDir/$fn" ]; then
mkdir $out
mv "$result" "$out"
''
fi
mv "$unpackDir/$fn" "$out"
'' else ''
mv "$unpackDir" "$out"
'') #*/
+ extraPostFetch;
} // removeAttrs args [ "stripRoot" "extraPostFetch" ])).overrideAttrs (x: {
# Hackety-hack: we actually need unzip hooks, too
nativeBuildInputs = x.nativeBuildInputs ++ [ unzip ];