lix-project/flake-compat
16
0
Fork 0
Code Issues 13 Pull requests Packages Projects Releases Wiki Activity

Merge pull request #9 from Ma27/minor-fixes

Browse source 
Be more consistent with Nix itself when fetching github/gitlab inputs
This commit is contained in:
Eelco Dolstra 2020-09-23 11:30:54 +02:00 committed by GitHub
parent 2f9a141d4b 0d4ab83c96
commit 94cf59784c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
default.nix
View file

@ -16,7 +16,7 @@ let
fetchTree = fetchTree =
info: info:
if info.type == "github" then if info.type == "github" then
{ outPath = fetchTarball "https://api.${info.url or "github.com"}/repos/${info.owner}/${info.repo}/tarball/${info.rev}"; { outPath = fetchTarball "https://api.${info.host or "github.com"}/repos/${info.owner}/${info.repo}/tarball/${info.rev}";
rev = info.rev; rev = info.rev;
shortRev = builtins.substring 0 7 info.rev; shortRev = builtins.substring 0 7 info.rev;
lastModified = info.lastModified; lastModified = info.lastModified;
@ -46,7 +46,7 @@ let
} }
else if info.type == "gitlab" then else if info.type == "gitlab" then
{ inherit (info) rev narHash lastModified; { inherit (info) rev narHash lastModified;
outPath = fetchTarball "https://${info.url or "gitlab.com"}/${info.owner}/${info.repo}/-/archive/${info.rev}/${info.repo}-${info.rev}.tar.gz"; outPath = fetchTarball "https://${info.host or "gitlab.com"}/api/v4/projects/${info.owner}%2F${info.repo}/repository/archive.tar.gz?sha=${info.rev}";
shortRev = builtins.substring 0 7 info.rev; shortRev = builtins.substring 0 7 info.rev;
} }
else else