From dbda7976256d6f89c5522bf4e297862f59336c17 Mon Sep 17 00:00:00 2001 From: r-vdp Date: Wed, 18 Jun 2025 17:45:13 +0200 Subject: [PATCH 1/2] wstunnel: use finalAttrs --- pkgs/by-name/ws/wstunnel/package.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/ws/wstunnel/package.nix b/pkgs/by-name/ws/wstunnel/package.nix index d09990d1a2d4..cc0e7a327b0a 100644 --- a/pkgs/by-name/ws/wstunnel/package.nix +++ b/pkgs/by-name/ws/wstunnel/package.nix @@ -7,18 +7,14 @@ versionCheckHook, }: -let - version = "10.4.2"; -in - -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage (finalAttrs: { pname = "wstunnel"; - inherit version; + version = "10.4.2"; src = fetchFromGitHub { owner = "erebe"; repo = "wstunnel"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-T4FciAusu1NHxMcHhhu7+WSubGohjpfN4sS5FnQBAZo="; }; @@ -47,7 +43,7 @@ rustPlatform.buildRustPackage { meta = { description = "Tunnel all your traffic over Websocket or HTTP2 - Bypass firewalls/DPI"; homepage = "https://github.com/erebe/wstunnel"; - changelog = "https://github.com/erebe/wstunnel/releases/tag/v${version}"; + changelog = "https://github.com/erebe/wstunnel/releases/tag/v${finalAttrs.version}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ raylas @@ -56,4 +52,4 @@ rustPlatform.buildRustPackage { ]; mainProgram = "wstunnel"; }; -} +}) From 15f2a1c24546b938d928b727234c2ab1742dc8f3 Mon Sep 17 00:00:00 2001 From: r-vdp Date: Wed, 18 Jun 2025 17:45:27 +0200 Subject: [PATCH 2/2] wstunnel: 10.4.2 -> 10.4.3 --- pkgs/by-name/ws/wstunnel/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ws/wstunnel/package.nix b/pkgs/by-name/ws/wstunnel/package.nix index cc0e7a327b0a..338b5d3d6115 100644 --- a/pkgs/by-name/ws/wstunnel/package.nix +++ b/pkgs/by-name/ws/wstunnel/package.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "wstunnel"; - version = "10.4.2"; + version = "10.4.3"; src = fetchFromGitHub { owner = "erebe"; repo = "wstunnel"; tag = "v${finalAttrs.version}"; - hash = "sha256-T4FciAusu1NHxMcHhhu7+WSubGohjpfN4sS5FnQBAZo="; + hash = "sha256-Qg+9ClYbb1+g3BPioCwDdJYyPrl2g+44LD5OCDjMBzI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-EOTEk3B49rfTri/CpJwKlvXuSErPoaRwwtpeaCZMfw4="; + cargoHash = "sha256-LZkiSu9KRI7QYZrCakwR+VVvR6ZpwEGB7Z9jM1C8qvk="; cargoBuildFlags = [ "--package wstunnel-cli" ];