diff options
| author | Silvan Mosberger <infinisil@icloud.com> | 2018-10-14 21:17:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-14 21:17:23 +0200 |
| commit | 1d512468aafcdc65ab96adf6a0578a23d6a79646 (patch) | |
| tree | 9a638389260605b0bb614d2971393d1c9f31741c /pkgs/development/haskell-modules/configuration-common.nix | |
| parent | 878c6c090dfd0acc077d4edfc1cca702d3a7fcd8 (diff) | |
| parent | 096be6d9418e6ead24db1a56738d8a3086c298c5 (diff) | |
| download | nixlib-1d512468aafcdc65ab96adf6a0578a23d6a79646.tar nixlib-1d512468aafcdc65ab96adf6a0578a23d6a79646.tar.gz nixlib-1d512468aafcdc65ab96adf6a0578a23d6a79646.tar.bz2 nixlib-1d512468aafcdc65ab96adf6a0578a23d6a79646.tar.lz nixlib-1d512468aafcdc65ab96adf6a0578a23d6a79646.tar.xz nixlib-1d512468aafcdc65ab96adf6a0578a23d6a79646.tar.zst nixlib-1d512468aafcdc65ab96adf6a0578a23d6a79646.zip | |
Merge pull request #48015 from rnhmjoj/shell-conduit
haskellPackages.shell-conduit: fix build
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 733201d8960c..86c0b93917e7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -103,18 +103,12 @@ self: super: { }; # 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"; # 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 |