diff options
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r-- | pkgs/tools/networking/cloudflare-warp/default.nix | 33 | ||||
-rw-r--r-- | pkgs/tools/networking/ghz/default.nix | 1 | ||||
-rw-r--r-- | pkgs/tools/networking/graphqurl/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/networking/hysteria/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/networking/xray/default.nix | 6 |
5 files changed, 34 insertions, 18 deletions
diff --git a/pkgs/tools/networking/cloudflare-warp/default.nix b/pkgs/tools/networking/cloudflare-warp/default.nix index ee7070d06ddad..7f5c9b18438c9 100644 --- a/pkgs/tools/networking/cloudflare-warp/default.nix +++ b/pkgs/tools/networking/cloudflare-warp/default.nix @@ -1,22 +1,32 @@ { stdenv , lib -, fetchurl -, dpkg , autoPatchelfHook -, makeWrapper , copyDesktopItems -, makeDesktopItem , dbus +, dpkg +, fetchurl +, gtk3 +, libpcap +, makeDesktopItem +, makeWrapper , nftables }: stdenv.mkDerivation rec { pname = "cloudflare-warp"; - version = "2023.3.470"; + version = "2024.4.133"; + + suffix = { + aarch64-linux = "arm64"; + x86_64-linux = "amd64"; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); src = fetchurl { - url = "https://pkg.cloudflareclient.com/pool/jammy/main/c/cloudflare-warp/cloudflare-warp_2023.3.470-1_amd64.deb"; - hash = "sha256-AYnmisEQKFiEB2iRJifEqRbdzAyBcfrU0ITeUokKLag="; + url = "https://pkg.cloudflareclient.com/pool/jammy/main/c/cloudflare-warp/cloudflare-warp_${version}-1_${suffix}.deb"; + hash = { + aarch64-linux = "sha256-qua+aL4+yvpTBGCVUS1rzJX1KZ3DeaW9Bce9lYWvWOM="; + x86_64-linux = "sha256-xZhyYDMjcv8SLfYwclvWBqPDETbeaxiA6jFCg3Nv5gc="; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; nativeBuildInputs = [ @@ -28,6 +38,8 @@ stdenv.mkDerivation rec { buildInputs = [ dbus + gtk3 + libpcap stdenv.cc.cc.lib ]; @@ -44,12 +56,17 @@ stdenv.mkDerivation rec { }) ]; + autoPatchelfIgnoreMissingDeps = [ + "libpcap.so.0.8" + ]; + installPhase = '' runHook preInstall mv usr $out mv bin $out mv etc $out + patchelf --replace-needed libpcap.so.0.8 ${libpcap}/lib/libpcap.so $out/bin/warp-dex mv lib/systemd/system $out/lib/systemd/ substituteInPlace $out/lib/systemd/system/warp-svc.service \ --replace "ExecStart=" "ExecStart=$out" @@ -72,6 +89,6 @@ stdenv.mkDerivation rec { wolfangaukang devpikachu ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; }; } diff --git a/pkgs/tools/networking/ghz/default.nix b/pkgs/tools/networking/ghz/default.nix index 89253f3fe4891..eb20a398e419a 100644 --- a/pkgs/tools/networking/ghz/default.nix +++ b/pkgs/tools/networking/ghz/default.nix @@ -35,6 +35,5 @@ buildGoModule rec { description = "Simple gRPC benchmarking and load testing tool"; homepage = "https://ghz.sh"; license = licenses.asl20; - maintainers = [ maintainers.zombiezen ]; }; } diff --git a/pkgs/tools/networking/graphqurl/default.nix b/pkgs/tools/networking/graphqurl/default.nix index e0b6fa9de9c01..3e7d05ce44e1d 100644 --- a/pkgs/tools/networking/graphqurl/default.nix +++ b/pkgs/tools/networking/graphqurl/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "graphqurl"; - version = "1.0.1"; + version = "1.0.3"; src = fetchFromGitHub { owner = "hasura"; repo = "graphqurl"; rev = "v${version}"; - hash = "sha256-0dR8lLD0yatAvE3kA90cNOzVRTFpQmzN1l13hdFr3TM="; + hash = "sha256-w7t3p7TOBA0nxUlfRfQkiZ26SCDCwv03A1r+pTgUCqc="; }; - npmDepsHash = "sha256-2kLmhNFO/ySa6S9rBNYCePmsYXWz006IxiOJ7ZUkgPw="; + npmDepsHash = "sha256-17eRYr0vgnq7eFtlYY2CwvluwhbXWClL3onTNBkDF0c="; dontNpmBuild = true; diff --git a/pkgs/tools/networking/hysteria/default.nix b/pkgs/tools/networking/hysteria/default.nix index 33b0d9d4c1526..5443d2c7f957a 100644 --- a/pkgs/tools/networking/hysteria/default.nix +++ b/pkgs/tools/networking/hysteria/default.nix @@ -4,16 +4,16 @@ }: buildGoModule rec { pname = "hysteria"; - version = "2.4.1"; + version = "2.4.3"; src = fetchFromGitHub { owner = "apernet"; repo = pname; rev = "app/v${version}"; - hash = "sha256-ohqWubYR9Z5KtMEOyqVfxnmNO6SoaSsA3SOMDivVA54="; + hash = "sha256-4i3bXtg7WCSPDE7fUWVJnOOFNGLAo1F/a2wbuUH785o="; }; - vendorHash = "sha256-DuQwg4vJgwC6IBs+8J5OVdO67OgdhmGTF88zlikHaAQ="; + vendorHash = "sha256-dV/bomGPg0Q3OEDuu6vRVsFRveDVzw6Hv0KLla2uZqc="; proxyVendor = true; ldflags = diff --git a/pkgs/tools/networking/xray/default.nix b/pkgs/tools/networking/xray/default.nix index e2ac3e2264b30..e2a07cf2d2625 100644 --- a/pkgs/tools/networking/xray/default.nix +++ b/pkgs/tools/networking/xray/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "xray"; - version = "1.8.10"; + version = "1.8.11"; src = fetchFromGitHub { owner = "XTLS"; repo = "Xray-core"; rev = "v${version}"; - hash = "sha256-Pc3sWVUZTOyCxGHcfKJ3fc0vUKtymPTe5DOEP+dScwg="; + hash = "sha256-uOE+Gp42WsqSA5/kQRjk+BKq9igmZCrq/9v1BJMXwFc="; }; - vendorHash = "sha256-e+SJQBfwIkuzRblOQPt8ZKZgROBAZy2y5dyh6ykdFeg="; + vendorHash = "sha256-7E/H8ctv9BU59wPmywNeDhx1R4mqrjpM9E+Hz+AaPlk="; nativeBuildInputs = [ makeWrapper ]; |