From 5dadb0d98b87d903f9c4eecd0b37a34e6c00561e Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sat, 9 Apr 2022 11:18:30 +0200
Subject: [PATCH 1/2] 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 6c9f7499ce33a..22bfcf0c85172 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 31a401ac8cc39..7e21b7e07621d 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 bdd8a6e71adec..ecdae328277c2 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:

From 57422d008345b1fd6e89ccf1e4f8fce2ad952b37 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sat, 9 Apr 2022 11:20:35 +0200
Subject: [PATCH 2/2] haskellPackages: regenerate package set based on current
 config

This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
---
 pkgs/development/haskell-modules/hackage-packages.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 86637a302b074..efca97c5e4555 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -295744,8 +295744,7 @@ self: {
        ];
        description = "Tunneling program over websocket protocol";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
+       maintainers = with lib.maintainers; [ gebner ];
      }) {};
 
   "wtk" = callPackage
@@ -296550,7 +296549,7 @@ self: {
        platforms = [
          "aarch64-darwin" "i686-linux" "x86_64-darwin" "x86_64-linux"
        ];
-     }) {inherit (pkgs) xgboost;};
+     }) {xgboost = null;};
 
   "xhaskell-library" = callPackage
     ({ mkDerivation, base, bytestring, containers, ghc-prim, mtl