diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-01-13 19:43:08 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-01-13 19:45:31 +0100 |
| commit | 77d66ed83474d2be60aced66b427d5b358138782 (patch) | |
| tree | f8437f1acc66fa05c367272e40d794bab85fffbb /pkgs/build-support/fetchgit/default.nix | |
| parent | 7d1d89e532272d426c3441f1cafd21e579323b15 (diff) | |
| download | nixpkgs-77d66ed83474d2be60aced66b427d5b358138782.tar nixpkgs-77d66ed83474d2be60aced66b427d5b358138782.tar.gz nixpkgs-77d66ed83474d2be60aced66b427d5b358138782.tar.bz2 nixpkgs-77d66ed83474d2be60aced66b427d5b358138782.tar.lz nixpkgs-77d66ed83474d2be60aced66b427d5b358138782.tar.xz nixpkgs-77d66ed83474d2be60aced66b427d5b358138782.tar.zst nixpkgs-77d66ed83474d2be60aced66b427d5b358138782.zip | |
fetchgit: improve name detection, discard nix-1.8 check
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.
Diffstat (limited to 'pkgs/build-support/fetchgit/default.nix')
| -rw-r--r-- | pkgs/build-support/fetchgit/default.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index 2ba48189833..7dd179f4c8b 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -1,10 +1,8 @@ {stdenv, git, cacert}: let urlToName = url: rev: let - base = baseNameOf url; + base = baseNameOf (stdenv.lib.removeSuffix "/" url); - matched = (builtins.match or (x: y: - abort "This version of fetchgit requires Nix >= 1.8, please upgrade!" - )) "(.*).git" base; + matched = builtins.match "(.*).git" base; short = builtins.substring 0 7 rev; @@ -12,7 +10,8 @@ then "-${short}" else ""; 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 , name ? urlToName url rev }: |