summary refs log tree commit diff
path: root/pkgs/build-support
diff options
context:
space:
mode:
authorGuillaume Maudoux <guillaume.maudoux@uclouvain.be>2018-06-25 17:08:29 +0200
committerWill Dietz <w@wdtz.org>2018-06-28 07:01:14 -0500
commitea23a1ed4ed30724f7d3a3665abbaf7215c60509 (patch)
tree2a13bc46b1a9134c5ac5708a96e170fb6938e909 /pkgs/build-support
parent6f9a53c13c9a832aae7af5f80a8330fee06ca6be (diff)
downloadnixlib-ea23a1ed4ed30724f7d3a3665abbaf7215c60509.tar
nixlib-ea23a1ed4ed30724f7d3a3665abbaf7215c60509.tar.gz
nixlib-ea23a1ed4ed30724f7d3a3665abbaf7215c60509.tar.bz2
nixlib-ea23a1ed4ed30724f7d3a3665abbaf7215c60509.tar.lz
nixlib-ea23a1ed4ed30724f7d3a3665abbaf7215c60509.tar.xz
nixlib-ea23a1ed4ed30724f7d3a3665abbaf7215c60509.tar.zst
nixlib-ea23a1ed4ed30724f7d3a3665abbaf7215c60509.zip
fetchgit: adapt regex to git 2.18.0
Diffstat (limited to 'pkgs/build-support')
-rwxr-xr-xpkgs/build-support/fetchgit/nix-prefetch-git2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git
index 3cf4ecc280fe..34dfe67df4bd 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -185,7 +185,7 @@ init_submodules(){
 
         # checkout each submodule
         hash=$(echo "$l" | awk '{print $1}' | tr -d '-')
-        dir=$(echo "$l" | sed -n 's/^ \{0,1\}[^ ]* \(.*\) ([^ ]*)$/\1/p')
+        dir=$(echo "$l" | sed -n 's/^.[0-9a-f]\+ \(.*[^)]*\)\( (.*)\)\?$/\1/p')
         name=$(
             git config -f .gitmodules --get-regexp submodule\..*\.path |
             sed -n "s,^\(.*\)\.path $dir\$,\\1,p")