mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 15:11:35 +00:00
Code Issues Wiki Activity

Merge pull request #37766 from rnhmjoj/shell-conduit

Browse source 
haskellPackages.shell-conduit: fix build
This commit is contained in:
Peter Simons 2018-03-25 20:04:43 +02:00 committed by GitHub
parent 18d3088ba8 be3449200d
commit 53ab595095
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -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;