From 945269a48fa8b91024e18a72b485797eeca308ee Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 1 Apr 2015 14:02:46 +0200 Subject: [PATCH] haskell-generic-builder: gratuitous cosmetic change to trigger a complete re-build hydra.nixos.org serves broken binaries because of our favorite non-deterministic package IDs in GHC bug. :-( Re-building everything from scratch seems like the easiest way to recover. --- pkgs/development/haskell-modules/generic-builder.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 11bbe550b2d..baefedf5a74 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -138,14 +138,14 @@ stdenv.mkDerivation ({ echo "Replace Cabal file with edited version from ${newCabalFileUrl}." cp ${newCabalFile} ${pname}.cabal '' + optionalString jailbreak '' - echo "Running jailbreak-cabal to lift version restrictions on build inputs." + echo "Run jailbreak-cabal to lift version restrictions on build inputs." ${jailbreak-cabal}/bin/jailbreak-cabal ${pname}.cabal '' + prePatch; setupCompilerEnvironmentPhase = '' runHook preSetupCompilerEnvironment - echo "Building with ${ghc}." + echo "Build with ${ghc}." export PATH="${ghc}/bin:$PATH" ${optionalString (hasActiveLibrary && hyperlinkSource) "export PATH=${hscolour}/bin:$PATH"}