From 72a5d2a212630792b673891ad29af4a8d45850e6 Mon Sep 17 00:00:00 2001 From: Volker Diels-Grabsch Date: Sun, 7 Sep 2025 16:09:49 +0200 Subject: [PATCH 1/3] wireguard-go: 0.0.20230223 -> 0.0.20250522 --- pkgs/by-name/wi/wireguard-go/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/wi/wireguard-go/package.nix b/pkgs/by-name/wi/wireguard-go/package.nix index b77c1ea2f827..d686cab9925b 100644 --- a/pkgs/by-name/wi/wireguard-go/package.nix +++ b/pkgs/by-name/wi/wireguard-go/package.nix @@ -9,16 +9,16 @@ buildGoModule ( finalAttrs: let - rev = "12269c2761734b15625017d8565745096325392f"; + rev = "f333402bd9cbe0f3eeb02507bd14e23d7d639280"; shortVer = "${finalAttrs.version} (${lib.substring 0 7 rev})"; in { pname = "wireguard-go"; - version = "0-unstable-2023-12-11"; + version = "0.0.20250522"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-go/snapshot/wireguard-go-${rev}.tar.xz"; - hash = "sha256-br7/dwr/e4HvBGJXh+6lWqxBUezt5iZNy9BFqEA1bLk="; + hash = "sha256-GRr8NKKb4SHd0WxmNL84eiofFHcauDDmSyNNrXermcA="; }; postPatch = '' @@ -29,7 +29,7 @@ buildGoModule ( printf 'package main\n\nconst Version = "${shortVer}"' > version.go ''; - vendorHash = "sha256-RqZ/3+Xus5N1raiUTUpiKVBs/lrJQcSwr1dJib2ytwc="; + vendorHash = "sha256-sCajxTV26jjlmgmbV4GG6hg9NkLGS773ZbFyKucvuBE="; subPackages = [ "." ]; From 0b6811869fec275f59639e0f0351e009fde2b295 Mon Sep 17 00:00:00 2001 From: Volker Diels-Grabsch Date: Sun, 7 Sep 2025 16:21:29 +0200 Subject: [PATCH 2/3] wireguard-go: download by version number instead of commit hash --- pkgs/by-name/wi/wireguard-go/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/wi/wireguard-go/package.nix b/pkgs/by-name/wi/wireguard-go/package.nix index d686cab9925b..cd8c2d331e3f 100644 --- a/pkgs/by-name/wi/wireguard-go/package.nix +++ b/pkgs/by-name/wi/wireguard-go/package.nix @@ -9,15 +9,15 @@ buildGoModule ( finalAttrs: let - rev = "f333402bd9cbe0f3eeb02507bd14e23d7d639280"; - shortVer = "${finalAttrs.version} (${lib.substring 0 7 rev})"; + version = "0.0.20250522"; + shortVer = version; in { pname = "wireguard-go"; - version = "0.0.20250522"; + inherit version; src = fetchzip { - url = "https://git.zx2c4.com/wireguard-go/snapshot/wireguard-go-${rev}.tar.xz"; + url = "https://git.zx2c4.com/wireguard-go/snapshot/wireguard-go-${version}.tar.xz"; hash = "sha256-GRr8NKKb4SHd0WxmNL84eiofFHcauDDmSyNNrXermcA="; }; From e5af3da4df7b29b75633766596ef6369ed0fdfa7 Mon Sep 17 00:00:00 2001 From: Volker Diels-Grabsch Date: Sun, 7 Sep 2025 16:24:07 +0200 Subject: [PATCH 3/3] wireguard-go: remove injections of custom shortVer Due to the previous changes, shortVer is no longer custom at all. It is just equal to the official version number, so the custom injections became essentially no-ops. --- pkgs/by-name/wi/wireguard-go/package.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/by-name/wi/wireguard-go/package.nix b/pkgs/by-name/wi/wireguard-go/package.nix index cd8c2d331e3f..6386c2966000 100644 --- a/pkgs/by-name/wi/wireguard-go/package.nix +++ b/pkgs/by-name/wi/wireguard-go/package.nix @@ -10,7 +10,6 @@ buildGoModule ( finalAttrs: let version = "0.0.20250522"; - shortVer = version; in { pname = "wireguard-go"; @@ -24,9 +23,6 @@ buildGoModule ( postPatch = '' # Skip formatting tests rm -f format_test.go - - # Inject version - printf 'package main\n\nconst Version = "${shortVer}"' > version.go ''; vendorHash = "sha256-sCajxTV26jjlmgmbV4GG6hg9NkLGS773ZbFyKucvuBE="; @@ -56,7 +52,7 @@ buildGoModule ( passthru.tests.version = testers.testVersion { package = wireguard-go; - version = "v${shortVer}"; + version = "v${version}"; }; meta = with lib; {