From 77d66ed83474d2be60aced66b427d5b358138782 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 13 Jan 2015 19:43:08 +0100 Subject: [PATCH] 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. --- pkgs/build-support/fetchgit/default.nix | 9 ++++----- 1 file 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 }: