diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2017-07-05 09:48:12 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2017-07-05 09:48:12 +0200 |
commit | 7205dfadec4363e0846d6c65266d92a9dddfef6a (patch) | |
tree | 0db5545a4a407afdca382f0f2b4e325a0f85cb46 /pkgs/top-level | |
parent | 1db1ba9048483005ea86709cb33f23a946a990b5 (diff) | |
parent | b935b21ffd06284d0c8297651d7d28c0961d3274 (diff) | |
download | nixlib-7205dfadec4363e0846d6c65266d92a9dddfef6a.tar nixlib-7205dfadec4363e0846d6c65266d92a9dddfef6a.tar.gz nixlib-7205dfadec4363e0846d6c65266d92a9dddfef6a.tar.bz2 nixlib-7205dfadec4363e0846d6c65266d92a9dddfef6a.tar.lz nixlib-7205dfadec4363e0846d6c65266d92a9dddfef6a.tar.xz nixlib-7205dfadec4363e0846d6c65266d92a9dddfef6a.tar.zst nixlib-7205dfadec4363e0846d6c65266d92a9dddfef6a.zip |
Merge #26877: fetchFromGitHub: fix fetchSubmodules
... when revision is not hexadecimal. (omitting the last commit in PR)
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5114b46bf396..aa6259c3f840 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -185,8 +185,10 @@ with pkgs; fetchzip = callPackage ../build-support/fetchzip { }; + gitRepoToName = callPackage ../build-support/fetchgit/gitrepotoname.nix { }; + fetchFromGitHub = { - owner, repo, rev, name ? "${repo}-${rev}-src", + owner, repo, rev, name ? gitRepoToName repo rev, fetchSubmodules ? false, private ? false, githubBase ? "github.com", varPrefix ? null, ... # For hash agility @@ -223,7 +225,7 @@ with pkgs; } // passthruAttrs) // { inherit rev; }; fetchFromBitbucket = { - owner, repo, rev, name ? "${repo}-${rev}-src", + owner, repo, rev, name ? gitRepoToName repo rev, ... # For hash agility }@args: fetchzip ({ inherit name; @@ -234,7 +236,7 @@ with pkgs; # cgit example, snapshot support is optional in cgit fetchFromSavannah = { - repo, rev, name ? "${repo}-${rev}-src", + repo, rev, name ? gitRepoToName repo rev, ... # For hash agility }@args: fetchzip ({ inherit name; @@ -244,7 +246,7 @@ with pkgs; # gitlab example fetchFromGitLab = { - owner, repo, rev, name ? "${repo}-${rev}-src", + owner, repo, rev, name ? gitRepoToName repo rev, ... # For hash agility }@args: fetchzip ({ inherit name; @@ -254,7 +256,7 @@ with pkgs; # gitweb example, snapshot support is optional in gitweb fetchFromRepoOrCz = { - repo, rev, name ? "${repo}-${rev}-src", + repo, rev, name ? gitRepoToName repo rev, ... # For hash agility }@args: fetchzip ({ inherit name; |