diff options
| author | Malte Brandy <malte.brandy@maralorn.de> | 2020-11-19 13:01:36 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2020-11-20 20:57:40 +0100 |
| commit | bea4d0dc4964074a47afbf4833d9eb1b168bc7d7 (patch) | |
| tree | 45baa9233f3ac6dd710e00fdf938da6985a2e7b5 /pkgs/development/haskell-modules/configuration-common.nix | |
| parent | 4e5914ee258330f93c3461bb2c5d229ef30b205b (diff) | |
| download | nixpkgs-bea4d0dc4964074a47afbf4833d9eb1b168bc7d7.tar nixpkgs-bea4d0dc4964074a47afbf4833d9eb1b168bc7d7.tar.gz nixpkgs-bea4d0dc4964074a47afbf4833d9eb1b168bc7d7.tar.bz2 nixpkgs-bea4d0dc4964074a47afbf4833d9eb1b168bc7d7.tar.lz nixpkgs-bea4d0dc4964074a47afbf4833d9eb1b168bc7d7.tar.xz nixpkgs-bea4d0dc4964074a47afbf4833d9eb1b168bc7d7.tar.zst nixpkgs-bea4d0dc4964074a47afbf4833d9eb1b168bc7d7.zip | |
haskellPackages.snap: Fix build
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d2fcb4adc09..4ee53960788 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1111,21 +1111,6 @@ self: super: { # https://github.com/kazu-yamamoto/dns/issues/150 dns = dontCheck super.dns; - # apply patches from https://github.com/snapframework/snap-server/pull/126 - # manually until they are accepted upstream - snap-server = overrideCabal super.snap-server (drv: { - patches = [(pkgs.fetchpatch { - # allow compilation with network >= 3 - url = "https://github.com/snapframework/snap-server/pull/126/commits/4338fe15d68e11e3c7fd0f9862f818864adc1d45.patch"; - sha256 = "1nlw9lckm3flzkmhkzwc7zxhdh9ns33w8p8ds8nf574nqr5cr8bv"; - }) - (pkgs.fetchpatch { - # prefer fdSocket over unsafeFdSocket - url = "https://github.com/snapframework/snap-server/pull/126/commits/410de2df123b1d56b3093720e9c6a1ad79fe9de6.patch"; - sha256 = "08psvw0xny64q4bw1nwg01pkzh01ak542lw6k1ps7cdcwaxk0n94"; - })]; - }); - # https://github.com/haskell-servant/servant-blaze/issues/17 servant-blaze = doJailbreak super.servant-blaze; @@ -1496,4 +1481,10 @@ self: super: { sha256 = "0g2m0y46zr3xs9fswkm4h9adhsg6gzl5zwgidshsjh3k3rq4h7b1"; }); + # 2020-11-19: Jailbreaking until: https://github.com/snapframework/heist/pull/124 + heist = doJailbreak super.heist; + + # 2020-11-19: Jailbreaking until: https://github.com/snapframework/snap/pull/219 + snap = doJailbreak super.snap; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super |