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.
This commit is contained in:
Henri Menke 2021-04-22 18:18:01 +02:00 committed by sterni
parent cb97f4a301
commit ff856b1342
3 changed files with 1 additions and 44 deletions

View file

@ -11633,7 +11633,6 @@ broken-packages:
- wshterm
- wsjtx-udp
- wss-client
- wstunnel
- wtk
- wtk-gtk
- wu-wei

View file

@ -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;
}

View file

@ -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;