From ea23a1ed4ed30724f7d3a3665abbaf7215c60509 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux <guillaume.maudoux@uclouvain.be> Date: Mon, 25 Jun 2018 17:08:29 +0200 Subject: [PATCH] fetchgit: adapt regex to git 2.18.0 --- pkgs/build-support/fetchgit/nix-prefetch-git | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 3cf4ecc280f..34dfe67df4b 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")