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

Merge pull request #79581 from bhipple/feature/fetcher-whitespace-clean

Browse Source 
fetchzip, fetchgit: cleanup handling of optional features and whitespace
This commit is contained in:
Benjamin Hipple
2020-03-26 00:15:24 -04:00
committed by GitHub
parent 3150fc9ba6 caff183402
commit 368ea2eb5e
3 changed files with 41 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/build-support/fetchgit/default.nix
View File

@@ -1,4 +1,4 @@
{stdenvNoCC, git, cacert}: let
{ stdenvNoCC, git, cacert }: let
urlToName = url: rev: let
inherit (stdenvNoCC.lib) removeSuffix splitString last;
base = last (splitString ":" (baseNameOf (removeSuffix "/" url)));

25
pkgs/build-support/fetchgit/nix-prefetch-git
View File

@@ -1,6 +1,5 @@
#! /usr/bin/env bash
set -e -o pipefail
#!/usr/bin/env bash
set -eo pipefail
url=
rev=
@@ -38,17 +37,17 @@ usage(){
echo >&2 "syntax: nix-prefetch-git [options] [URL [REVISION [EXPECTED-HASH]]]
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)
--hash h Expected hash.
--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.
--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).
--hash h Expected hash.
--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.
--fetch-submodules Fetch submodules.
--builder Clone as fetchgit does, but url, rev, and out option are mandatory.
--quiet Only print the final json summary.
--builder Clone as fetchgit does, but url, rev, and out option are mandatory.
--quiet Only print the final json summary.
"
exit 1
}