From 5dadb0d98b87d903f9c4eecd0b37a34e6c00561e Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 9 Apr 2022 11:18:30 +0200 Subject: [PATCH] wstunnel: fix build --- pkgs/development/haskell-modules/configuration-common.nix | 7 +++++++ .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - .../haskell-modules/configuration-hackage2nix/main.yaml | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6c9f7499ce33..22bfcf0c8517 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2593,4 +2593,11 @@ self: super: { aeson = self.aeson_1_5_6_0; }); + # Support network >= 3.1.2 + # https://github.com/erebe/wstunnel/pull/107 + wstunnel = appendPatch (fetchpatch { + url = "https://github.com/erebe/wstunnel/pull/107/commits/47c1f62bdec1dbe77088d9e3ceb6d872f922ce34.patch"; + sha256 = "sha256-fW5bVbAGQxU/gd9zqgVNclwKraBtUjkKDek7L0c4+O0="; + }) super.wstunnel; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 31a401ac8cc3..7e21b7e07621 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -5595,7 +5595,6 @@ broken-packages: - wsdl - wsedit - wsjtx-udp - - wstunnel - wtk - wumpus-core - wxdirect diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index bdd8a6e71ade..ecdae328277c 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -233,6 +233,8 @@ package-maintainers: - total - turtle - typed-spreadsheet + gebner: + - wstunnel gridaphobe: - located-base jb55: