nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-02 13:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

haskellPackages.hakyll: relax upper bound on warp

Browse Source
This commit is contained in:
Vaibhav Sagar
2020-04-22 17:13:38 +08:00
parent b6c7259c4d
commit 3aa001ccaa
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/development/haskell-modules/configuration-common.nix
View File

@@ -153,11 +153,20 @@ self: super: {
barbly = addBuildDepend super.barbly pkgs.darwin.apple_sdk.frameworks.AppKit;
# Hakyll's tests are broken on Darwin (3 failures); and they require util-linux
hakyll = if pkgs.stdenv.isDarwin
then dontCheck (overrideCabal super.hakyll (drv: {
hakyll = let
# Hakyll needs a relaxed upper bound on `warp` so that the preview server will build
patched-hakyll = overrideCabal super.hakyll (drv: {
postPatch = (drv.postPatch or "") + ''
substituteInPlace hakyll.cabal --replace \
"warp >= 3.2 && < 3.3" \
"warp >= 3.2 && < 3.4"
'';
});
in if pkgs.stdenv.isDarwin
then dontCheck (overrideCabal patched-hakyll (drv: {
testToolDepends = [];
}))
else super.hakyll;
else patched-hakyll;
double-conversion = if !pkgs.stdenv.isDarwin
then super.double-conversion