summary refs log tree commit diff
path: root/pkgs/development/haskell-modules
diff options
context:
space:
mode:
authorMatt McHenry <github@matt.mchenryfamily.org>2019-12-17 22:25:16 -0500
committerPeter Simons <simons@cryp.to>2019-12-27 20:37:13 +0100
commit9f053666aeecb071a7fbf774cce0dbba4849ba64 (patch)
tree7d2711536fb0f1f9c6ce6aad200721e1fde169e0 /pkgs/development/haskell-modules
parent0787a562c462d39b4bd6aa4ca3b30fc20db6a2bc (diff)
downloadnixpkgs-9f053666aeecb071a7fbf774cce0dbba4849ba64.tar
nixpkgs-9f053666aeecb071a7fbf774cce0dbba4849ba64.tar.gz
nixpkgs-9f053666aeecb071a7fbf774cce0dbba4849ba64.tar.bz2
nixpkgs-9f053666aeecb071a7fbf774cce0dbba4849ba64.tar.lz
nixpkgs-9f053666aeecb071a7fbf774cce0dbba4849ba64.tar.xz
nixpkgs-9f053666aeecb071a7fbf774cce0dbba4849ba64.tar.zst
nixpkgs-9f053666aeecb071a7fbf774cce0dbba4849ba64.zip
haskellPackages.snap-server: patch for network >= 3.0
Diffstat (limited to 'pkgs/development/haskell-modules')
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix15
1 files changed, 15 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index c424669f989..a525ef16209 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1322,4 +1322,19 @@ self: super: {
   # hoping to make a proper derivation with plugins enabled and more reliable building -- kiwi
   glirc = doJailbreak super.glirc;
 
+  # 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";
+    })];
+  });
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super