Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4f3bb982c9d3
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 981fdb42074f
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Aug 5, 2019

  1. 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
    @domenkozar
    Christian Höppner authored and domenkozar committed Aug 5, 2019
    Copy the full SHA
    981fdb4 View commit details
Showing with 5 additions and 1 deletion.
  1. +5 −1 pkgs/development/haskell-modules/configuration-nix.nix
6 changes: 5 additions & 1 deletion pkgs/development/haskell-modules/configuration-nix.nix
View file
Original file line number Diff line number Diff line change
@@ -490,7 +490,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"