Merge pull request #64343 from mkaito/mkaito/haskell-fix-servant-014
haskellPackages.servant-client-core: apply patch only to 0.15
This commit is contained in:
@@ -492,7 +492,11 @@ self: super: builtins.intersectAttrs super {
|
|||||||
servant-streaming-server = dontCheck super.servant-streaming-server;
|
servant-streaming-server = dontCheck super.servant-streaming-server;
|
||||||
|
|
||||||
# https://github.com/haskell-servant/servant/pull/1128
|
# 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
|
# tests run executable, relying on PATH
|
||||||
# without this, tests fail with "Couldn't launch intero process"
|
# without this, tests fail with "Couldn't launch intero process"
|
||||||
|
|||||||
Reference in New Issue
Block a user