haskell-lib: make sdistTarball and buildStrictly functions fuzzier to cope with Hydra builds

In Hydra CI environments, the version strings we get from Hydra don't
necessarily match those hard-coded into the Cabal files. To make those builds
succeed anyway, we have to apply some pattern matching.
This commit is contained in:
Peter Simons 2015-08-30 15:18:15 +02:00
parent 29ee3ec8c4
commit 78f1720532

View File

@ -66,7 +66,7 @@ rec {
buildPhase = "./Setup sdist"; buildPhase = "./Setup sdist";
haddockPhase = ":"; haddockPhase = ":";
checkPhase = ":"; checkPhase = ":";
installPhase = "install -D dist/${drv.pname}-${drv.version}.tar.gz $out/${drv.pname}-${drv.version}.tar.gz"; installPhase = "install -D dist/${drv.pname}-*.tar.gz $out/${drv.pname}-${drv.version}.tar.gz";
fixupPhase = ":"; fixupPhase = ":";
}); });
@ -74,7 +74,7 @@ rec {
unpackPhase = let src = sdistTarball pkg; tarname = "${pkg.pname}-${pkg.version}"; in '' unpackPhase = let src = sdistTarball pkg; tarname = "${pkg.pname}-${pkg.version}"; in ''
echo "Source tarball is at ${src}/${tarname}.tar.gz" echo "Source tarball is at ${src}/${tarname}.tar.gz"
tar xf ${src}/${tarname}.tar.gz tar xf ${src}/${tarname}.tar.gz
cd ${tarname} cd ${pkg.pname}-*
''; '';
}); });