aboutsummaryrefslogtreecommitdiff
path: root/nixpkgs/pkgs/tools/networking/wstunnel/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/tools/networking/wstunnel/default.nix')
-rw-r--r--nixpkgs/pkgs/tools/networking/wstunnel/default.nix18
1 files changed, 6 insertions, 12 deletions
diff --git a/nixpkgs/pkgs/tools/networking/wstunnel/default.nix b/nixpkgs/pkgs/tools/networking/wstunnel/default.nix
index 2488d874e6d..161b08a7d39 100644
--- a/nixpkgs/pkgs/tools/networking/wstunnel/default.nix
+++ b/nixpkgs/pkgs/tools/networking/wstunnel/default.nix
@@ -2,28 +2,21 @@
, classy-prelude, cmdargs, connection, hslogger, mtl, network
, network-conduit-tls, stdenv, streaming-commons, text
, unordered-containers, websockets
+, hspec, iproute
, lib, fetchFromGitHub, fetchpatch
}:
mkDerivation rec {
pname = "wstunnel";
- version = "unstable-2019-01-28";
+ version = "unstable-2020-07-12";
src = fetchFromGitHub {
owner = "erebe";
repo = pname;
- rev = "78cc5a5f1aa4dbcb25fa9b0efc9cfef3640672e4";
- sha256 = "17y3yn7qg1h7jx9xs041sw63g51vyns236f60d2m2mghi49lm9i2";
+ rev = "093a01fa3a34eee5efd8f827900e64eab9d16c05";
+ sha256 = "17p9kq0ssz05qzl6fyi5a5fjbpn4bxkkwibb9si3fhzrxc508b59";
};
- 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;
@@ -31,13 +24,14 @@ mkDerivation rec {
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 ];
+ testHaskellDepends = [ base text hspec ];
homepage = "https://github.com/erebe/wstunnel";
description = "UDP and TCP tunnelling over WebSocket";