diff --git a/pkgs/by-name/u-/u-root/package.nix b/pkgs/by-name/u-/u-root/package.nix index c61bf39ef673..3526ae04a38d 100644 --- a/pkgs/by-name/u-/u-root/package.nix +++ b/pkgs/by-name/u-/u-root/package.nix @@ -1,23 +1,27 @@ { lib, - buildGoModule, + # Build fails with Go 1.25, with the following error: + # 'vendor/golang.org/x/tools/internal/tokeninternal/tokeninternal.go:64:9: invalid array length -delta * delta (constant -256 of type int64)' + # Wait for upstream to update their vendored dependencies before unpinning. + buildGo124Module, fetchFromGitHub, coreutils, bash, + nix-update-script, linuxManualConfig, fetchurl, linux_latest, }: -buildGoModule (finalAttrs: { +buildGo124Module (finalAttrs: { pname = "u-root"; - version = "0.14.0-unstable-2024-09-26"; + version = "0.15.0"; src = fetchFromGitHub { owner = "u-root"; repo = "u-root"; - rev = "a620c4fc0eeeaa71ea68c27d6ef96352ed814829"; + tag = "v${finalAttrs.version}"; hash = "sha256-8B2H3AwGo9friveBk4bijOph9bSSNR7PPKJYEuywgm4="; }; @@ -52,6 +56,7 @@ buildGoModule (finalAttrs: { }; allowImportFromDerivation = true; }; + updateScript = nix-update-script { }; }; meta = {