haskell/generic-buidler: make installPhase handle Cabal 2.5's lax fields
This commit is contained in:
parent
d8260d6af0
commit
e505891a5c
|
@ -377,6 +377,10 @@ stdenv.mkDerivation ({
|
||||||
runHook postHaddock
|
runHook postHaddock
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
# The scary sed expression handles two cases in v2.5 Cabal's package configs:
|
||||||
|
# 1. 'id: short-name-0.0.1-9yvw8HF06tiAXuxm5U8KjO'
|
||||||
|
# 2. 'id:\n
|
||||||
|
# very-long-descriptive-useful-name-0.0.1-9yvw8HF06tiAXuxm5U8KjO'
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
runHook preInstall
|
runHook preInstall
|
||||||
|
|
||||||
|
@ -391,7 +395,7 @@ stdenv.mkDerivation ({
|
||||||
rmdir "$packageConfFile"
|
rmdir "$packageConfFile"
|
||||||
fi
|
fi
|
||||||
for packageConfFile in "$packageConfDir/"*; do
|
for packageConfFile in "$packageConfDir/"*; do
|
||||||
local pkgId=$( ${gnused}/bin/sed -n -e 's|^id:[ ]\+||p' $packageConfFile )
|
local pkgId=$( ${gnused}/bin/sed -n -e ':a' -e '/^id:$/N; s/id:\n[ ]*\([^\n]*\).*$/\1/p; s/id:[ ]*\([^\n]*\)$/\1/p; ta' $packageConfFile )
|
||||||
mv $packageConfFile $packageConfDir/$pkgId.conf
|
mv $packageConfFile $packageConfDir/$pkgId.conf
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue