diff options
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r-- | pkgs/tools/networking/davix/default.nix | 1 | ||||
-rw-r--r-- | pkgs/tools/networking/dcap/default.nix | 1 | ||||
-rw-r--r-- | pkgs/tools/networking/dibbler/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/networking/eternal-terminal/default.nix | 1 | ||||
-rw-r--r-- | pkgs/tools/networking/ghostunnel/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/godspeed/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/gost/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/networking/magic-wormhole-rs/default.nix | 1 | ||||
-rw-r--r-- | pkgs/tools/networking/pathvector/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/networking/quicktun/default.nix | 1 | ||||
-rw-r--r-- | pkgs/tools/networking/slowlorust/default.nix | 1 | ||||
-rw-r--r-- | pkgs/tools/networking/sockperf/default.nix | 1 | ||||
-rw-r--r-- | pkgs/tools/networking/ssh-askpass-fullscreen/default.nix | 1 | ||||
-rw-r--r-- | pkgs/tools/networking/tftp-hpa/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/networking/tinyproxy/default.nix | 1 | ||||
-rw-r--r-- | pkgs/tools/networking/v2ray/default.nix | 6 |
16 files changed, 34 insertions, 10 deletions
diff --git a/pkgs/tools/networking/davix/default.nix b/pkgs/tools/networking/davix/default.nix index 63fc1cffd9a5..7120e76821d6 100644 --- a/pkgs/tools/networking/davix/default.nix +++ b/pkgs/tools/networking/davix/default.nix @@ -64,6 +64,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { + broken = stdenv.isDarwin; description = "Toolkit for Http-based file management"; longDescription = "Davix is a toolkit designed for file diff --git a/pkgs/tools/networking/dcap/default.nix b/pkgs/tools/networking/dcap/default.nix index bad1b9ee1c5a..f606c3f6cd6a 100644 --- a/pkgs/tools/networking/dcap/default.nix +++ b/pkgs/tools/networking/dcap/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" "doc" ]; meta = with lib; { + broken = stdenv.isDarwin; description = "dCache access protocol client library"; homepage = "https://github.com/dCache/dcap"; changelog = "https://github.com/dCache/dcap/blob/master/ChangeLog"; diff --git a/pkgs/tools/networking/dibbler/default.nix b/pkgs/tools/networking/dibbler/default.nix index 4175de2e23cc..b6e5229a2f20 100644 --- a/pkgs/tools/networking/dibbler/default.nix +++ b/pkgs/tools/networking/dibbler/default.nix @@ -13,7 +13,11 @@ stdenv.mkDerivation rec { "--enable-resolvconf" ]; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-D__APPLE_USE_RFC_2292=1"; + # -fcommon: Workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: ./Port-linux/libLowLevel.a(libLowLevel_a-interface.o):(.bss+0x4): multiple definition of `interface_auto_up'; + # ./Port-linux/libLowLevel.a(libLowLevel_a-lowlevel-linux-link-state.o):(.bss+0x74): first defined here + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-D__APPLE_USE_RFC_2292=1" + " -fcommon"; meta = with lib; { description = "Portable DHCPv6 implementation"; diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/tools/networking/eternal-terminal/default.nix index fe922a445097..05e3152bec19 100644 --- a/pkgs/tools/networking/eternal-terminal/default.nix +++ b/pkgs/tools/networking/eternal-terminal/default.nix @@ -50,6 +50,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with lib; { + broken = stdenv.isDarwin; description = "Remote shell that automatically reconnects without interrupting the session"; homepage = "https://eternalterminal.dev/"; license = licenses.asl20; diff --git a/pkgs/tools/networking/ghostunnel/default.nix b/pkgs/tools/networking/ghostunnel/default.nix index 43cfe4812909..f6986a1516b3 100644 --- a/pkgs/tools/networking/ghostunnel/default.nix +++ b/pkgs/tools/networking/ghostunnel/default.nix @@ -1,4 +1,5 @@ -{ buildGoModule +{ stdenv +, buildGoModule , fetchFromGitHub , lib , nixosTests @@ -32,6 +33,7 @@ buildGoModule rec { }; meta = with lib; { + broken = stdenv.isDarwin; description = "A simple TLS proxy with mutual authentication support for securing non-TLS backend applications"; homepage = "https://github.com/ghostunnel/ghostunnel#readme"; license = licenses.asl20; diff --git a/pkgs/tools/networking/godspeed/default.nix b/pkgs/tools/networking/godspeed/default.nix index 44cac245927f..bd60b2adc45d 100644 --- a/pkgs/tools/networking/godspeed/default.nix +++ b/pkgs/tools/networking/godspeed/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , buildGoModule , fetchFromGitHub , libpcap @@ -26,6 +27,7 @@ buildGoModule rec { ''; meta = with lib; { + broken = stdenv.isDarwin; description = "Manager for reverse shells"; homepage = "https://github.com/redcode-labs/GodSpeed"; license = with licenses; [ mit ]; diff --git a/pkgs/tools/networking/gost/default.nix b/pkgs/tools/networking/gost/default.nix index c8f42b3ad4a7..0c12652586be 100644 --- a/pkgs/tools/networking/gost/default.nix +++ b/pkgs/tools/networking/gost/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ stdenv, lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "gost"; @@ -42,6 +42,7 @@ buildGoModule rec { ''; meta = with lib; { + broken = stdenv.isDarwin; description = "A simple tunnel written in golang"; homepage = "https://github.com/ginuerzh/gost"; license = licenses.mit; diff --git a/pkgs/tools/networking/magic-wormhole-rs/default.nix b/pkgs/tools/networking/magic-wormhole-rs/default.nix index 3d9e20d14dce..84479de49eba 100644 --- a/pkgs/tools/networking/magic-wormhole-rs/default.nix +++ b/pkgs/tools/networking/magic-wormhole-rs/default.nix @@ -24,6 +24,7 @@ rustPlatform.buildRustPackage rec { doCheck = false; meta = with lib; { + broken = stdenv.isDarwin; description = "Rust implementation of Magic Wormhole, with new features and enhancements"; homepage = "https://github.com/magic-wormhole/magic-wormhole.rs"; license = licenses.eupl12; diff --git a/pkgs/tools/networking/pathvector/default.nix b/pkgs/tools/networking/pathvector/default.nix index 529e80ebade6..91cb5489f029 100644 --- a/pkgs/tools/networking/pathvector/default.nix +++ b/pkgs/tools/networking/pathvector/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pathvector"; - version = "5.11.1"; + version = "5.12.0"; src = fetchFromGitHub { owner = "natesales"; repo = "pathvector"; rev = "v${version}"; - sha256 = "sha256-OgIDk+05bG2KrBQOyyMPaH0OJXU3gLM9OBab9lI+yXw="; + sha256 = "sha256-RdUZkkALEdyq+YKtgGE/P8eTX2v3fdYHF1wpZEyfkgY="; }; - vendorSha256 = "sha256-R3o1L34FXbtRzJ1I2Xj4iWsiFJJWexGWYv2TmvhINe0="; + vendorSha256 = "sha256-oxLMfmHLaOQwpRYwnHRQY0mIV5/fZ65RDgKVs0Kzd2Q="; CGO_ENABLED = 0; diff --git a/pkgs/tools/networking/quicktun/default.nix b/pkgs/tools/networking/quicktun/default.nix index 8d227e1fbba1..e9fa828af533 100644 --- a/pkgs/tools/networking/quicktun/default.nix +++ b/pkgs/tools/networking/quicktun/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation { ''; meta = with lib; { + broken = stdenv.isDarwin; description = "Very simple, yet secure VPN software"; homepage = "http://wiki.ucis.nl/QuickTun"; maintainers = [ maintainers.fpletz ]; diff --git a/pkgs/tools/networking/slowlorust/default.nix b/pkgs/tools/networking/slowlorust/default.nix index dc98d95828f5..44963b739107 100644 --- a/pkgs/tools/networking/slowlorust/default.nix +++ b/pkgs/tools/networking/slowlorust/default.nix @@ -18,6 +18,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "Wu1mm+yJw2SddddxC5NfnMWLr+dplnRxH3AJ1/mTAKM="; meta = with lib; { + broken = stdenv.isDarwin; description = "Lightweight slowloris (HTTP DoS) tool"; homepage = "https://github.com/MJVL/slowlorust"; license = licenses.mit; diff --git a/pkgs/tools/networking/sockperf/default.nix b/pkgs/tools/networking/sockperf/default.nix index 48eea919b14e..31ded651b89e 100644 --- a/pkgs/tools/networking/sockperf/default.nix +++ b/pkgs/tools/networking/sockperf/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with lib; { + broken = stdenv.isDarwin; description = "Network Benchmarking Utility"; homepage = "https://github.com/Mellanox/sockperf"; license = licenses.bsd3; diff --git a/pkgs/tools/networking/ssh-askpass-fullscreen/default.nix b/pkgs/tools/networking/ssh-askpass-fullscreen/default.nix index 05e518371262..beb61502ec7f 100644 --- a/pkgs/tools/networking/ssh-askpass-fullscreen/default.nix +++ b/pkgs/tools/networking/ssh-askpass-fullscreen/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { + broken = stdenv.isDarwin; description = "A small SSH askpass GUI using GTK+2"; homepage = "https://github.com/atj/ssh-askpass-fullscreen"; license = licenses.gpl2; diff --git a/pkgs/tools/networking/tftp-hpa/default.nix b/pkgs/tools/networking/tftp-hpa/default.nix index f8e028dc616a..987315b8351c 100644 --- a/pkgs/tools/networking/tftp-hpa/default.nix +++ b/pkgs/tools/networking/tftp-hpa/default.nix @@ -8,6 +8,12 @@ stdenv.mkDerivation rec { sha256 = "12vidchglhyc20znq5wdsbhi9mqg90jnl7qr9qs8hbvaz4fkdvmg"; }; + # Workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: main.o:/build/tftp-hpa-5.2/tftp/main.c:98: multiple definition of + # `toplevel'; tftp.o:/build/tftp-hpa-5.2/tftp/tftp.c:51: first defined here + NIX_CFLAGS_COMPILE="-fcommon"; + meta = with lib; { description = "TFTP tools - a lot of fixes on top of BSD TFTP"; maintainers = with maintainers; [ raskin ]; diff --git a/pkgs/tools/networking/tinyproxy/default.nix b/pkgs/tools/networking/tinyproxy/default.nix index 6aa05738498b..b382aeaf7428 100644 --- a/pkgs/tools/networking/tinyproxy/default.nix +++ b/pkgs/tools/networking/tinyproxy/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { configureFlags = lib.optionals withDebug [ "--enable-debug" ]; # Enable debugging support code and methods. meta = with lib; { + broken = stdenv.isDarwin; homepage = "https://tinyproxy.github.io/"; description = "A light-weight HTTP/HTTPS proxy daemon for POSIX operating systems"; license = licenses.gpl2Only; diff --git a/pkgs/tools/networking/v2ray/default.nix b/pkgs/tools/networking/v2ray/default.nix index ba1fcb6d0362..630ea8ada8e6 100644 --- a/pkgs/tools/networking/v2ray/default.nix +++ b/pkgs/tools/networking/v2ray/default.nix @@ -3,16 +3,16 @@ }: let - version = "4.44.0"; + version = "4.45.0"; src = fetchFromGitHub { owner = "v2fly"; repo = "v2ray-core"; rev = "v${version}"; - sha256 = "1yk02n2lllbcwqkz4f3l3d2df1w3m768zxvdawgmafjgmbqf0gjf"; + sha256 = "sha256-vVCWCppGeAc7dwY0fX+G0CU3Vy6OBPpDBUOBK3ykg60="; }; - vendorSha256 = "sha256-kTwISKPIFpb/OPh9rIzLH8a6mqpyDBJo2stSu5bc02Q="; + vendorSha256 = "sha256-TbWMbIT578I8xbNsKgBeSP4MewuEKpfh62ZbJIeHgDs="; assetsDrv = symlinkJoin { name = "v2ray-assets"; |