From d82274f7d77a9cca2e6af015259d64c01067dfbc Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Fri, 30 Oct 2020 17:58:08 +0100
Subject: [PATCH] mastus: remove custom wstunnel

---
 mastus/wstunnel.nix |  4 +---
 pkgs/wstunnel.nix   | 47 ---------------------------------------------
 2 files changed, 1 insertion(+), 50 deletions(-)
 delete mode 100644 pkgs/wstunnel.nix

diff --git a/mastus/wstunnel.nix b/mastus/wstunnel.nix
index 4cd1aee..430b708 100644
--- a/mastus/wstunnel.nix
+++ b/mastus/wstunnel.nix
@@ -1,15 +1,13 @@
 { config, pkgs, ... }:
 
 let
-  wstunnel = with pkgs; haskell.lib.justStaticExecutables
-    (haskellPackages.callPackage ../pkgs/wstunnel.nix {});
   port = 58613;
 in
 
 {
 
   systemd.services.wstunnel = rec {
-    path = [ wstunnel ];
+    path = [ pkgs.wstunnel ];
     wantedBy = [ "nginx.service" ];
     after = [ "network.target" ];
     script = ''
diff --git a/pkgs/wstunnel.nix b/pkgs/wstunnel.nix
deleted file mode 100644
index 7d0b1ef..0000000
--- a/pkgs/wstunnel.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ mkDerivation, async, base, base64-bytestring, binary, bytestring
-, classy-prelude, cmdargs, connection, hslogger, mtl, network
-, network-conduit-tls, stdenv, streaming-commons, text
-, unordered-containers, websockets
-, lib, fetchFromGitHub, fetchpatch
-}:
-
-mkDerivation rec {
-  pname = "wstunnel";
-  version = "unstable-2019-01-28";
-
-  src = fetchFromGitHub {
-    owner = "erebe";
-    repo = pname;
-    rev = "78cc5a5f1aa4dbcb25fa9b0efc9cfef3640672e4";
-    sha256 = "17y3yn7qg1h7jx9xs041sw63g51vyns236f60d2m2mghi49lm9i2";
-  };
-
-  patches = [
-    # Support GHC 8.6   https://github.com/erebe/wstunnel/pull/18
-    (fetchpatch {
-      url = "https://github.com/erebe/wstunnel/commit/8f348fea4dbf75874d5d930334377843763335ab.patch";
-      sha256 = "0a66jx7k97j3iyr7j5npbyq1lkhzz74r81mkas4nig7z3hny1gn9";
-    })
-  ];
-
-  isLibrary = false;
-  isExecutable = true;
-
-  libraryHaskellDepends = [
-    async base base64-bytestring binary bytestring classy-prelude
-    connection hslogger mtl network network-conduit-tls
-    streaming-commons text unordered-containers websockets
-  ];
-
-  executableHaskellDepends = [
-    base bytestring classy-prelude cmdargs hslogger text
-  ];
-
-  testHaskellDepends = [ base text ];
-
-  homepage = "https://github.com/githubuser/wstunnel";
-  description = "UDP and TCP tunnelling over WebSocket";
-  maintainers = with lib.maintainers; [ gebner ];
-  license = lib.licenses.bsd3;
-
-}