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

fetchgit: improve name detection, discard nix-1.8 check

Browse Source 
The name detection didn't work for e.g. http://git.suckless.org/sinit/.
I tested the tarball builds now.

@shlevy claimed nixpkgs requires nix-1.8 features anyway,
so the additional check with message were superfluous.
This commit is contained in:
Vladimír Čunát 2015-01-13 19:43:08 +01:00
parent 7d1d89e532
commit 77d66ed834
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,10 +1,8 @@
{stdenv, git, cacert}: let {stdenv, git, cacert}: let
urlToName = url: rev: let urlToName = url: rev: let
base = baseNameOf url; base = baseNameOf (stdenv.lib.removeSuffix "/" url);
matched = (builtins.match or (x: y: matched = builtins.match "(.*).git" base;
abort "This version of fetchgit requires Nix >= 1.8, please upgrade!"
)) "(.*).git" base;
short = builtins.substring 0 7 rev; short = builtins.substring 0 7 rev;
@ -12,7 +10,8 @@
then "-${short}" then "-${short}"
else ""; else "";
in "${if matched == null then base else builtins.head matched}${appendShort}"; in "${if matched == null then base else builtins.head matched}${appendShort}";
in {url, rev ? "HEAD", md5 ? "", sha256 ? "", leaveDotGit ? false in
{ url, rev ? "HEAD", md5 ? "", sha256 ? "", leaveDotGit ? false
, fetchSubmodules ? true , fetchSubmodules ? true
, name ? urlToName url rev , name ? urlToName url rev
}: }: