From ff856b134267ffc33d4f7fa5c55bb69da945a84e Mon Sep 17 00:00:00 2001
From: Henri Menke <henri@henrimenke.de>
Date: Thu, 22 Apr 2021 18:18:01 +0200
Subject: [PATCH] wstunnel: deduplicate by using haskellPackages
wstunnel is packaged twice in nixpkgs, once standalone and once in
haskellPackages. The standalone version is outdated while the version in
haskellPackages is updated automatically from Hackage, so we are
removing the standalone Nix expression but still keep the static
executable.
---
.../configuration-hackage2nix.yaml | 1 -
pkgs/tools/networking/wstunnel/default.nix | 41 -------------------
pkgs/top-level/all-packages.nix | 3 +-
3 files changed, 1 insertion(+), 44 deletions(-)
delete mode 100644 pkgs/tools/networking/wstunnel/default.nix
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 9485cc0cc3d..0e4c0bd361a 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -11633,7 +11633,6 @@ broken-packages:
- wshterm
- wsjtx-udp
- wss-client
- - wstunnel
- wtk
- wtk-gtk
- wu-wei
diff --git a/pkgs/tools/networking/wstunnel/default.nix b/pkgs/tools/networking/wstunnel/default.nix
deleted file mode 100644
index a851dcd4ead..00000000000
--- a/pkgs/tools/networking/wstunnel/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ mkDerivation, async, base, base64-bytestring, binary, bytestring
-, classy-prelude, cmdargs, connection, hslogger, mtl, network
-, network-conduit-tls, streaming-commons, text
-, unordered-containers, websockets
-, hspec, iproute
-, lib, fetchFromGitHub, fetchpatch
-}:
-
-mkDerivation rec {
- pname = "wstunnel";
- version = "unstable-2020-07-12";
-
- src = fetchFromGitHub {
- owner = "erebe";
- repo = pname;
- rev = "093a01fa3a34eee5efd8f827900e64eab9d16c05";
- sha256 = "17p9kq0ssz05qzl6fyi5a5fjbpn4bxkkwibb9si3fhzrxc508b59";
- };
-
- 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
- iproute
- ];
-
- executableHaskellDepends = [
- base bytestring classy-prelude cmdargs hslogger text
- ];
-
- testHaskellDepends = [ base text hspec ];
-
- homepage = "https://github.com/erebe/wstunnel";
- description = "UDP and TCP tunnelling over WebSocket";
- maintainers = with lib.maintainers; [ gebner ];
- license = lib.licenses.bsd3;
-
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d0a49403b0f..1e1617764f7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9237,8 +9237,7 @@ in
wsmancli = callPackage ../tools/system/wsmancli {};
- wstunnel = haskell.lib.justStaticExecutables
- (haskellPackages.callPackage ../tools/networking/wstunnel {});
+ wstunnel = haskell.lib.justStaticExecutables haskellPackages.wstunnel;
wolfebin = callPackage ../tools/networking/wolfebin {
python = python2;