diff options
| author | Justin Humm <justin.humm@posteo.de> | 2019-09-15 20:00:33 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2019-09-22 13:43:08 +0200 |
| commit | d383a4cd9154f5952919feac86bb7fc0e566a245 (patch) | |
| tree | 0c7f7020ef6a0f684f09ca67cfddf1c3db874122 /pkgs/development/haskell-modules/configuration-common.nix | |
| parent | 348656cea85d8e1f4df6429091ffb92cd05e92a3 (diff) | |
| download | nixpkgs-d383a4cd9154f5952919feac86bb7fc0e566a245.tar nixpkgs-d383a4cd9154f5952919feac86bb7fc0e566a245.tar.gz nixpkgs-d383a4cd9154f5952919feac86bb7fc0e566a245.tar.bz2 nixpkgs-d383a4cd9154f5952919feac86bb7fc0e566a245.tar.lz nixpkgs-d383a4cd9154f5952919feac86bb7fc0e566a245.tar.xz nixpkgs-d383a4cd9154f5952919feac86bb7fc0e566a245.tar.zst nixpkgs-d383a4cd9154f5952919feac86bb7fc0e566a245.zip | |
Revert "haskell-hakyll: patch Cabal file from upstream"
This reverts commit fe366d43e85df82739756ec16fcb5a0d3b77f681.
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 294fd3949ad..fd8bfef030a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -146,16 +146,11 @@ self: super: { else super.halive; # Hakyll's tests are broken on Darwin (3 failures); and they require util-linux - hakyll = appendPatch - (if pkgs.stdenv.isDarwin + hakyll = if pkgs.stdenv.isDarwin then dontCheck (overrideCabal super.hakyll (drv: { testToolDepends = []; })) - else super.hakyll) - (pkgs.fetchpatch { - url = https://github.com/jaspervdj/hakyll/commit/25a4460b75b3c9f3ce339b3311b084d92994f5f1.patch; - sha256 = "sha256-F59WHt52LOKGsGoaD3LAIZFEMe9s9WHfGxQgSh9Q8uQ="; - }); + else super.hakyll; double-conversion = if !pkgs.stdenv.isDarwin then super.double-conversion |