public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #48015 from rnhmjoj/shell-conduit 

haskellPackages.shell-conduit: fix build
This commit is contained in:
Silvan Mosberger 2018-10-14 21:17:23 +02:00 committed by GitHub
parent 878c6c090d 096be6d941
commit 1d512468aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 7 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

@ -103,18 +103,12 @@ self: super: {
}; };
# Fix test trying to access /home directory # Fix test trying to access /home directory
shell-conduit = (overrideCabal super.shell-conduit (drv: { shell-conduit = overrideCabal super.shell-conduit (drv: {
postPatch = "sed -i s/home/tmp/ test/Spec.hs"; postPatch = "sed -i s/home/tmp/ test/Spec.hs";
# the tests for shell-conduit on Darwin illegitimatey assume non-GNU echo # the tests for shell-conduit on Darwin illegitimatey assume non-GNU echo
# see: https://github.com/psibi/shell-conduit/issues/12 # see: https://github.com/psibi/shell-conduit/issues/12
doCheck = !pkgs.stdenv.isDarwin; 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 # https://github.com/froozen/kademlia/issues/2