From 78f17205320cb8e508faae1c1dc0ad215fe4d137 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 30 Aug 2015 15:18:15 +0200 Subject: [PATCH] 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. --- pkgs/development/haskell-modules/lib.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index 5b2ba44d86d4..635fc317b284 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -66,7 +66,7 @@ rec { buildPhase = "./Setup sdist"; haddockPhase = ":"; 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 = ":"; }); @@ -74,7 +74,7 @@ rec { unpackPhase = let src = sdistTarball pkg; tarname = "${pkg.pname}-${pkg.version}"; in '' echo "Source tarball is at ${src}/${tarname}.tar.gz" tar xf ${src}/${tarname}.tar.gz - cd ${tarname} + cd ${pkg.pname}-* ''; });