Skip to content

Commit

Permalink
Merge pull request #75882 from jerith666/snap-server-network-fix
Browse files Browse the repository at this point in the history
haskellPackages.snap-server: patch for network >= 3.0
  • Loading branch information
cdepillabout authored Dec 20, 2019
2 parents 5d22053 + f8a4352 commit 36b99db
Showing 1 changed file with 15 additions and 0 deletions.
15 changes: 15 additions & 0 deletions pkgs/development/haskell-modules/configuration-common.nix
Original file line number Diff line number Diff line change
Expand Up @@ -1331,4 +1331,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

0 comments on commit 36b99db

Please sign in to comment.