From d7ee2e2f477a6e9c44ce8dca7ba6bf5481f48b62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20H=C3=B6ppner?= Date: Fri, 5 Jul 2019 13:28:58 +0100 Subject: [PATCH] haskellPackages.servant-client-core: apply patch only to 0.15 A patch was added unconditionally that only applies to 0.15, breaking builds of 0.14. Apply patch only if version is 0.15 --- pkgs/development/haskell-modules/configuration-nix.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 8f35799af05..9d40b8d98a2 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -492,7 +492,11 @@ self: super: builtins.intersectAttrs super { servant-streaming-server = dontCheck super.servant-streaming-server; # https://github.com/haskell-servant/servant/pull/1128 - servant-client-core = appendPatch super.servant-client-core ./patches/servant-client-core-streamBody.patch; + servant-client-core = if (pkgs.lib.getVersion super.servant-client-core) == "0.15" then + appendPatch super.servant-client-core ./patches/servant-client-core-streamBody.patch + else + super.servant-client-core; + # tests run executable, relying on PATH # without this, tests fail with "Couldn't launch intero process"