From 2d23979ef55e96bbdbb926752c16e36105bc4e31 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Fri, 11 Apr 2025 12:57:22 +0200 Subject: [PATCH 01/11] gobusybox: use finalAttrs Signed-off-by: Paul Meyer --- pkgs/by-name/go/gobusybox/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/gobusybox/package.nix b/pkgs/by-name/go/gobusybox/package.nix index 8ec543c1f593..12794e148502 100644 --- a/pkgs/by-name/go/gobusybox/package.nix +++ b/pkgs/by-name/go/gobusybox/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "gobusybox"; version = "0.2.0-unstable-2024-03-05"; @@ -15,7 +15,7 @@ buildGoModule rec { hash = "sha256-hS6YwN6eekyDjp7E6sisW+8HO5WHTEC68XyKZFPihK4="; }; - sourceRoot = "${src.name}/src"; + sourceRoot = "${finalAttrs.src.name}/src"; subPackages = [ "cmd/gencmddeps" @@ -39,4 +39,4 @@ buildGoModule rec { maintainers = with lib.maintainers; [ katexochen ]; mainProgram = "makebb"; }; -} +}) From cfe0dd5b45e77895707c9ef643bbcd729c51f566 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Fri, 11 Apr 2025 12:59:18 +0200 Subject: [PATCH 02/11] keep-sorted: use finalAttrs Signed-off-by: Paul Meyer --- pkgs/by-name/ke/keep-sorted/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ke/keep-sorted/package.nix b/pkgs/by-name/ke/keep-sorted/package.nix index 8faed30348e2..c389a524e0a8 100644 --- a/pkgs/by-name/ke/keep-sorted/package.nix +++ b/pkgs/by-name/ke/keep-sorted/package.nix @@ -6,14 +6,14 @@ versionCheckHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "keep-sorted"; version = "0.6.1"; src = fetchFromGitHub { owner = "google"; repo = "keep-sorted"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-N/fJ0qj7/kQ9Q7ULpQpyhWAWFlnLkTjyNNKg8VhLvi0="; }; @@ -22,7 +22,7 @@ buildGoModule rec { # Inject version string instead of reading version from buildinfo. postPatch = '' substituteInPlace main.go \ - --replace-fail 'readVersion())' '"v${version}")' + --replace-fail 'readVersion())' '"v${finalAttrs.version}")' ''; env.CGO_ENABLED = "0"; @@ -41,11 +41,11 @@ buildGoModule rec { passthru.updateScript = nix-update-script { }; meta = { - changelog = "https://github.com/google/keep-sorted/releases/tag/v${version}"; + changelog = "https://github.com/google/keep-sorted/releases/tag/v${finalAttrs.version}"; description = "Language-agnostic formatter that sorts lines between two markers in a larger file"; homepage = "https://github.com/google/keep-sorted"; license = lib.licenses.asl20; mainProgram = "keep-sorted"; maintainers = with lib.maintainers; [ katexochen ]; }; -} +}) From 34274ebbd8713eadd3c929855620d997d3afee4d Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Fri, 11 Apr 2025 12:59:49 +0200 Subject: [PATCH 03/11] capslock: use finalAttrs Signed-off-by: Paul Meyer --- pkgs/by-name/ca/capslock/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/capslock/package.nix b/pkgs/by-name/ca/capslock/package.nix index 5deac4688fef..cf3bba068a44 100644 --- a/pkgs/by-name/ca/capslock/package.nix +++ b/pkgs/by-name/ca/capslock/package.nix @@ -5,14 +5,14 @@ nix-update-script, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "capslock"; version = "0.2.7"; src = fetchFromGitHub { owner = "google"; repo = "capslock"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-kRuEcrx9LBzCpXFWlc9bSsgZt84T8R8VFdbAWAseSPQ="; }; @@ -33,4 +33,4 @@ buildGoModule rec { mainProgram = "capslock"; maintainers = with lib.maintainers; [ katexochen ]; }; -} +}) From b14fa65751112b7514542f5dc9e58bb4b22078cd Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Fri, 11 Apr 2025 13:00:19 +0200 Subject: [PATCH 04/11] grmon: use finalAttrs Signed-off-by: Paul Meyer --- pkgs/by-name/gr/grmon/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gr/grmon/package.nix b/pkgs/by-name/gr/grmon/package.nix index df610dec3ecb..48f9741970cf 100644 --- a/pkgs/by-name/gr/grmon/package.nix +++ b/pkgs/by-name/gr/grmon/package.nix @@ -5,14 +5,14 @@ nix-update-script, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "grmon"; version = "0.1"; src = fetchFromGitHub { owner = "bcicen"; repo = "grmon"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-0J7f4DMADUut3Da0F1eTDsT1Hlk0rfInwzbcVcQNzg8="; }; @@ -35,4 +35,4 @@ buildGoModule rec { mainProgram = "grmon"; maintainers = with maintainers; [ katexochen ]; }; -} +}) From 99a227638d1116b574b9370e3de60fddc71f1964 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Fri, 11 Apr 2025 13:01:01 +0200 Subject: [PATCH 05/11] uplosi: use finalAttrs Signed-off-by: Paul Meyer --- pkgs/by-name/up/uplosi/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/up/uplosi/package.nix b/pkgs/by-name/up/uplosi/package.nix index 14da37539a1f..11f3d8d52e3c 100644 --- a/pkgs/by-name/up/uplosi/package.nix +++ b/pkgs/by-name/up/uplosi/package.nix @@ -6,14 +6,14 @@ nix-update-script, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "uplosi"; version = "0.4.0"; src = fetchFromGitHub { owner = "edgelesssys"; - repo = pname; - rev = "v${version}"; + repo = "uplosi"; + tag = "v${finalAttrs.version}"; hash = "sha256-5I916T70sH4UAq5EGRjR7lnRBbPqMJIxaXwUCJQ4DcM="; }; @@ -22,7 +22,7 @@ buildGoModule rec { env.CGO_ENABLED = "0"; ldflags = [ "-s" - "-X main.version=${version}" + "-X main.version=${finalAttrs.version}" ]; nativeBuildInputs = [ installShellFiles ]; @@ -39,7 +39,7 @@ buildGoModule rec { meta = { description = "Upload OS images to cloud provider"; homepage = "https://github.com/edgelesssys/uplosi"; - changelog = "https://github.com/edgelesssys/uplosi/releases/tag/v${version}"; + changelog = "https://github.com/edgelesssys/uplosi/releases/tag/v${finalAttrs.version}"; license = lib.licenses.asl20; mainProgram = "uplosi"; maintainers = with lib.maintainers; [ @@ -48,4 +48,4 @@ buildGoModule rec { ]; platforms = lib.platforms.unix; }; -} +}) From 51af7d609d523cd13fac12fb80a528e2fda5f10b Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Fri, 11 Apr 2025 13:01:53 +0200 Subject: [PATCH 06/11] jj: use finalAttrs Signed-off-by: Paul Meyer --- pkgs/by-name/jj/jj/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/jj/jj/package.nix b/pkgs/by-name/jj/jj/package.nix index a9def5cf35d5..045338e45112 100644 --- a/pkgs/by-name/jj/jj/package.nix +++ b/pkgs/by-name/jj/jj/package.nix @@ -8,14 +8,14 @@ runCommand, jj, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "jj"; version = "1.9.2"; src = fetchFromGitHub { owner = "tidwall"; repo = "jj"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-Yijap5ZghTBe1ahkQgjjxuo++SriJWXgRqrNXIVQ0os="; }; @@ -28,7 +28,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X main.version=${version}" + "-X main.version=${finalAttrs.version}" ]; passthru = { @@ -71,4 +71,4 @@ buildGoModule rec { mainProgram = "jj"; maintainers = with maintainers; [ katexochen ]; }; -} +}) From 7f20d5e29a88d24d89bb532b95e75dab47ebd640 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Fri, 11 Apr 2025 13:02:33 +0200 Subject: [PATCH 07/11] go-critic: use finalAttrs Signed-off-by: Paul Meyer --- pkgs/by-name/go/go-critic/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/go/go-critic/package.nix b/pkgs/by-name/go/go-critic/package.nix index 767e4e85b136..051978678183 100644 --- a/pkgs/by-name/go/go-critic/package.nix +++ b/pkgs/by-name/go/go-critic/package.nix @@ -7,14 +7,14 @@ go-critic, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "go-critic"; version = "0.13.0"; src = fetchFromGitHub { owner = "go-critic"; repo = "go-critic"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-0AOhq7OhSHub4I6XXL018hg6i2ERkIbZCrO9osNjvHw="; }; @@ -27,7 +27,7 @@ buildGoModule rec { allowGoReference = true; ldflags = [ - "-X main.Version=${version}" + "-X main.Version=${finalAttrs.version}" ]; passthru = { @@ -41,9 +41,9 @@ buildGoModule rec { meta = { description = "Most opinionated Go source code linter for code audit"; homepage = "https://go-critic.com/"; - changelog = "https://github.com/go-critic/go-critic/releases/tag/${src.rev}"; + changelog = "https://github.com/go-critic/go-critic/releases/tag/${finalAttrs.src.rev}"; license = lib.licenses.mit; mainProgram = "gocritic"; maintainers = with lib.maintainers; [ katexochen ]; }; -} +}) From b84bfe699a264ed543a1d8ce44466930b57d96a3 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Fri, 11 Apr 2025 13:03:30 +0200 Subject: [PATCH 08/11] bluetuith: use finalAttrs Signed-off-by: Paul Meyer --- pkgs/by-name/bl/bluetuith/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/bl/bluetuith/package.nix b/pkgs/by-name/bl/bluetuith/package.nix index 3d6e2cc30e1a..46d9f0f64ece 100644 --- a/pkgs/by-name/bl/bluetuith/package.nix +++ b/pkgs/by-name/bl/bluetuith/package.nix @@ -5,14 +5,14 @@ nix-update-script, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "bluetuith"; version = "0.2.3"; src = fetchFromGitHub { owner = "darkhz"; - repo = pname; - rev = "v${version}"; + repo = "bluetuith"; + tag = "v${finalAttrs.version}"; hash = "sha256-yXH/koNT4ec/SOZhSU01iPNAfD1MdMjM2+wNmjXWsrk="; }; @@ -23,7 +23,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/darkhz/bluetuith/cmd.Version=${version}@nixpkgs" + "-X github.com/darkhz/bluetuith/cmd.Version=${finalAttrs.version}@nixpkgs" ]; passthru.updateScript = nix-update-script { }; @@ -47,4 +47,4 @@ buildGoModule rec { katexochen ]; }; -} +}) From 1a31e44df9431d5852e8753ac61fef3a9abd5319 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Fri, 11 Apr 2025 13:04:01 +0200 Subject: [PATCH 09/11] distribution: use finalAttrs Signed-off-by: Paul Meyer --- pkgs/by-name/di/distribution/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/di/distribution/package.nix b/pkgs/by-name/di/distribution/package.nix index d82f377ccc4f..0acf92585bf5 100644 --- a/pkgs/by-name/di/distribution/package.nix +++ b/pkgs/by-name/di/distribution/package.nix @@ -7,14 +7,14 @@ distribution, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "distribution"; version = "3.0.0"; src = fetchFromGitHub { owner = "distribution"; repo = "distribution"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-myezQTEdH7kkpCoAeZMf5OBxT4Bz8Qx6vCnwim230RY="; }; @@ -30,7 +30,7 @@ buildGoModule rec { passthru = { tests.version = testers.testVersion { package = distribution; - version = "v${version}"; + version = "v${finalAttrs.version}"; }; updateScript = nix-update-script { }; }; @@ -50,4 +50,4 @@ buildGoModule rec { mainProgram = "registry"; platforms = platforms.unix; }; -} +}) From 270d44021715335a0d88ab2f4d1fceade5164c77 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Fri, 11 Apr 2025 13:04:32 +0200 Subject: [PATCH 10/11] athens: use finalAttrs Signed-off-by: Paul Meyer --- pkgs/by-name/at/athens/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/at/athens/package.nix b/pkgs/by-name/at/athens/package.nix index f4aa1ef22121..236a7527f754 100644 --- a/pkgs/by-name/at/athens/package.nix +++ b/pkgs/by-name/at/athens/package.nix @@ -6,14 +6,14 @@ athens, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "athens"; version = "0.15.4"; src = fetchFromGitHub { owner = "gomods"; repo = "athens"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-6NBdif8rQ1aj4nTYXhrWyErzRv0q8WpIheRnb2FCnkU="; }; @@ -22,7 +22,7 @@ buildGoModule rec { env.CGO_ENABLED = "0"; ldflags = [ "-s" - "-X github.com/gomods/athens/pkg/build.version=${version}" + "-X github.com/gomods/athens/pkg/build.version=${finalAttrs.version}" ]; subPackages = [ "cmd/proxy" ]; @@ -47,4 +47,4 @@ buildGoModule rec { ]; platforms = platforms.unix; }; -} +}) From 978d35f30069b26b82389a3a565506dae9ce9240 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Fri, 11 Apr 2025 13:05:38 +0200 Subject: [PATCH 11/11] u-root: use finalAttrs Signed-off-by: Paul Meyer --- pkgs/by-name/u-/u-root/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/u-/u-root/package.nix b/pkgs/by-name/u-/u-root/package.nix index 4275bc704f5c..df55883dd276 100644 --- a/pkgs/by-name/u-/u-root/package.nix +++ b/pkgs/by-name/u-/u-root/package.nix @@ -10,7 +10,7 @@ linux_latest, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "u-root"; version = "0.14.0-unstable-2024-09-26"; @@ -63,10 +63,10 @@ buildGoModule rec { ''; homepage = "https://u-root.org/"; downloadPage = "https://github.com/u-root/u-root"; - changelog = "https://github.com/u-root/u-root/blob/${src.rev}/RELEASES"; + changelog = "https://github.com/u-root/u-root/blob/${finalAttrs.src.rev}/RELEASES"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ katexochen ]; mainProgram = "u-root"; platforms = lib.platforms.linux; }; -} +})