diff options
author | Benjamin Hipple <bhipple@protonmail.com> | 2020-03-26 00:15:24 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-26 00:15:24 -0400 |
commit | 368ea2eb5ec9aa3eaec78b5e1b39610cbede3a47 (patch) | |
tree | f0611c0a3bbbbe15d03dade6d805fba218b808b5 /pkgs/build-support/fetchgit | |
parent | 3150fc9ba6a7fbecda188ac504a247a899f75b8f (diff) | |
parent | caff18340206c4e5c466c16a534f13505d1098ee (diff) | |
download | nixlib-368ea2eb5ec9aa3eaec78b5e1b39610cbede3a47.tar nixlib-368ea2eb5ec9aa3eaec78b5e1b39610cbede3a47.tar.gz nixlib-368ea2eb5ec9aa3eaec78b5e1b39610cbede3a47.tar.bz2 nixlib-368ea2eb5ec9aa3eaec78b5e1b39610cbede3a47.tar.lz nixlib-368ea2eb5ec9aa3eaec78b5e1b39610cbede3a47.tar.xz nixlib-368ea2eb5ec9aa3eaec78b5e1b39610cbede3a47.tar.zst nixlib-368ea2eb5ec9aa3eaec78b5e1b39610cbede3a47.zip |
Merge pull request #79581 from bhipple/feature/fetcher-whitespace-clean
fetchzip, fetchgit: cleanup handling of optional features and whitespace
Diffstat (limited to 'pkgs/build-support/fetchgit')
-rw-r--r-- | pkgs/build-support/fetchgit/default.nix | 2 | ||||
-rwxr-xr-x | pkgs/build-support/fetchgit/nix-prefetch-git | 25 |
2 files changed, 13 insertions, 14 deletions
diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index 0405951a9e40..ee662154cc7b 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -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))); diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index abba76bd1ac9..4761c978035e 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -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 } |