From 67ed0d116b527ad7c8205bbc677452b2548b3264 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Thu, 29 May 2025 00:39:32 +0800 Subject: [PATCH 1/3] avalanchego: use go 1.23 --- pkgs/by-name/av/avalanchego/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/av/avalanchego/package.nix b/pkgs/by-name/av/avalanchego/package.nix index 0a29341d66f8..2aca48c2cbc5 100644 --- a/pkgs/by-name/av/avalanchego/package.nix +++ b/pkgs/by-name/av/avalanchego/package.nix @@ -1,12 +1,12 @@ { - buildGoModule, + buildGo123Module, fetchFromGitHub, lib, nix-update-script, stdenv, }: -buildGoModule rec { +buildGo123Module rec { pname = "avalanchego"; version = "1.12.1"; From 47a68b5224687236592a1c16e5f391e78e085253 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Thu, 29 May 2025 00:48:32 +0800 Subject: [PATCH 2/3] avalanchego: use finalAttrs --- pkgs/by-name/av/avalanchego/package.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/av/avalanchego/package.nix b/pkgs/by-name/av/avalanchego/package.nix index 2aca48c2cbc5..bce61c8fa9f1 100644 --- a/pkgs/by-name/av/avalanchego/package.nix +++ b/pkgs/by-name/av/avalanchego/package.nix @@ -3,17 +3,16 @@ fetchFromGitHub, lib, nix-update-script, - stdenv, }: -buildGo123Module rec { +buildGo123Module (finalAttrs: { pname = "avalanchego"; version = "1.12.1"; src = fetchFromGitHub { owner = "ava-labs"; repo = "avalanchego"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-elbY0KNsOmKSTX61nps2tjIFTJH5Nnqmwq6mWwd88aE="; }; @@ -27,11 +26,11 @@ buildGo123Module rec { ldflags = [ "-s" "-w" - "-X github.com/ava-labs/avalanchego/version.GitCommit=${version}" + "-X github.com/ava-labs/avalanchego/version.GitCommit=${finalAttrs.version}" ]; postInstall = '' - mv $out/bin/{main,${pname}} + mv $out/bin/{main,avalanchego} ''; passthru.updateScript = nix-update-script { }; @@ -39,7 +38,7 @@ buildGo123Module rec { meta = { description = "Go implementation of an Avalanche node"; homepage = "https://github.com/ava-labs/avalanchego"; - changelog = "https://github.com/ava-labs/avalanchego/releases/tag/v${version}"; + changelog = "https://github.com/ava-labs/avalanchego/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ urandom @@ -47,4 +46,4 @@ buildGo123Module rec { ]; mainProgram = "avalanchego"; }; -} +}) From ef559bc06c36efb5eba617da7037572c5ac2515e Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Thu, 29 May 2025 00:49:57 +0800 Subject: [PATCH 3/3] avalanchego: 1.12.1 -> 1.13.0 --- pkgs/by-name/av/avalanchego/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/av/avalanchego/package.nix b/pkgs/by-name/av/avalanchego/package.nix index bce61c8fa9f1..68c136d666ce 100644 --- a/pkgs/by-name/av/avalanchego/package.nix +++ b/pkgs/by-name/av/avalanchego/package.nix @@ -7,19 +7,19 @@ buildGo123Module (finalAttrs: { pname = "avalanchego"; - version = "1.12.1"; + version = "1.13.0"; src = fetchFromGitHub { owner = "ava-labs"; repo = "avalanchego"; tag = "v${finalAttrs.version}"; - hash = "sha256-elbY0KNsOmKSTX61nps2tjIFTJH5Nnqmwq6mWwd88aE="; + hash = "sha256-t6KruPHt51wJ4aJaCG/8tuwKYtaifHvQ3z9oVknNS4E="; }; # https://github.com/golang/go/issues/57529 proxyVendor = true; - vendorHash = "sha256-HRhgnf6vHBrJTHspH+HwR3g5o63i+dCm7kPuBKdSV8s="; + vendorHash = "sha256-iyx9k8mPPOwpHo9lEdNPf0sQHxbKbNTVLUZrPYY8dWM="; subPackages = [ "main" ];