diff options
| author | Gabriel Ebner <gebner@gebner.org> | 2019-10-08 23:08:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-08 23:08:30 +0200 |
| commit | 3171df49b59516a68728f1227c4cec942102f5f9 (patch) | |
| tree | 24acf665e734ab659bb41e13c7cc66512086a694 | |
| parent | ec358abcc3e72132c7419e14c6c593715b199d12 (diff) | |
| parent | b574693e97cbe66f765690fa5c03f94fe8c97b85 (diff) | |
| download | nixpkgs-3171df49b59516a68728f1227c4cec942102f5f9.tar nixpkgs-3171df49b59516a68728f1227c4cec942102f5f9.tar.gz nixpkgs-3171df49b59516a68728f1227c4cec942102f5f9.tar.bz2 nixpkgs-3171df49b59516a68728f1227c4cec942102f5f9.tar.lz nixpkgs-3171df49b59516a68728f1227c4cec942102f5f9.tar.xz nixpkgs-3171df49b59516a68728f1227c4cec942102f5f9.tar.zst nixpkgs-3171df49b59516a68728f1227c4cec942102f5f9.zip | |
wstunnel: init at unstable-2019-01-28 (#70758)
wstunnel: init at unstable-2019-01-28
| -rw-r--r-- | pkgs/tools/networking/wstunnel/default.nix | 47 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 50 insertions, 0 deletions
diff --git a/pkgs/tools/networking/wstunnel/default.nix b/pkgs/tools/networking/wstunnel/default.nix new file mode 100644 index 00000000000..2488d874e6d --- /dev/null +++ b/pkgs/tools/networking/wstunnel/default.nix @@ -0,0 +1,47 @@ +{ 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/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 b92171a5660..4a15a886256 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6870,6 +6870,9 @@ in wsmancli = callPackage ../tools/system/wsmancli {}; + wstunnel = haskell.lib.justStaticExecutables + (haskellPackages.callPackage ../tools/networking/wstunnel {}); + wolfebin = callPackage ../tools/networking/wolfebin { python = python2; }; |