Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 18d3088ba8c8
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 53ab595095c7
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 25, 2018

  1. haskellPackages.shell-conduit: fix build

    @rnhmjoj
    rnhmjoj committed Mar 25, 2018
    Copy the full SHA
    be34492 View commit details

  2. Merge pull request #37766 from rnhmjoj/shell-conduit 

    haskellPackages.shell-conduit: fix build
    @peti
    peti authored Mar 25, 2018
    Copy the full SHA
    53ab595 View commit details
Showing with 7 additions and 1 deletion.
  1. +7 −1 pkgs/development/haskell-modules/configuration-common.nix
8 changes: 7 additions & 1 deletion pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -112,7 +112,13 @@ self: super: {
# the tests for shell-conduit on Darwin illegitimatey assume non-GNU echo
# see: https://github.com/psibi/shell-conduit/issues/12
doCheck = !pkgs.stdenv.isDarwin;
}));
})).overrideScope (self: super: {
# shell-conduit doesn't build with conduit 1.3
# see https://github.com/psibi/shell-conduit/issues/15
conduit = self.conduit_1_2_13_1;
conduit-extra = self.conduit-extra_1_2_3_2;
resourcet = self.resourcet_1_1_11;
});

# https://github.com/froozen/kademlia/issues/2
kademlia = dontCheck super.kademlia;