diff options
author | Volth <volth@webmaster.ms> | 2017-06-26 12:56:00 +0000 |
---|---|---|
committer | Volth <volth@webmaster.ms> | 2017-07-04 20:22:13 +0000 |
commit | 535a6c3520c3e34c5d74008764d12165650ec4d4 (patch) | |
tree | b8fe96e8f88537a7ea3d789e109bddb5b7ca5ce7 /pkgs/top-level | |
parent | c73f0caea5f0822ea044b4f90de4b64706d91362 (diff) | |
download | nixlib-535a6c3520c3e34c5d74008764d12165650ec4d4.tar nixlib-535a6c3520c3e34c5d74008764d12165650ec4d4.tar.gz nixlib-535a6c3520c3e34c5d74008764d12165650ec4d4.tar.bz2 nixlib-535a6c3520c3e34c5d74008764d12165650ec4d4.tar.lz nixlib-535a6c3520c3e34c5d74008764d12165650ec4d4.tar.xz nixlib-535a6c3520c3e34c5d74008764d12165650ec4d4.tar.zst nixlib-535a6c3520c3e34c5d74008764d12165650ec4d4.zip |
fetchFromGitHub: fix fetchSubmodules=true when revision is not hexadecimal
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; |