From 72732dc794bcd98baed9ad0bc2a4091b5d60f667 Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 4 Nov 2025 13:07:00 +0100 Subject: [PATCH 1/6] ulid: remove `with lib;` --- pkgs/by-name/ul/ulid/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ul/ulid/package.nix b/pkgs/by-name/ul/ulid/package.nix index cc333c120aec..975688ddfd93 100644 --- a/pkgs/by-name/ul/ulid/package.nix +++ b/pkgs/by-name/ul/ulid/package.nix @@ -27,11 +27,11 @@ buildGoModule rec { "-skip=TestMonotonicSafe" ]; - meta = with lib; { + meta = { description = "Universally Unique Lexicographically Sortable Identifier (ULID) in Go"; homepage = "https://github.com/oklog/ulid"; changelog = "https://github.com/oklog/ulid/blob/${src.rev}/CHANGELOG.md"; - license = licenses.asl20; + license = lib.licenses.asl20; maintainers = [ ]; mainProgram = "ulid"; }; From c0d3a3a4e0f538b791df0a4f765825c48470ebd3 Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 4 Nov 2025 13:37:58 +0100 Subject: [PATCH 2/6] ulid: use finalAttrs pattern --- pkgs/by-name/ul/ulid/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ul/ulid/package.nix b/pkgs/by-name/ul/ulid/package.nix index 975688ddfd93..db4b0ca24729 100644 --- a/pkgs/by-name/ul/ulid/package.nix +++ b/pkgs/by-name/ul/ulid/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "ulid"; version = "2.1.1"; src = fetchFromGitHub { owner = "oklog"; repo = "ulid"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-kPNLaZMGwGc7ngPCivf/n4Bis219yOkGAaa6mt7+yTY="; }; @@ -30,9 +30,9 @@ buildGoModule rec { meta = { description = "Universally Unique Lexicographically Sortable Identifier (ULID) in Go"; homepage = "https://github.com/oklog/ulid"; - changelog = "https://github.com/oklog/ulid/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/oklog/ulid/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = [ ]; mainProgram = "ulid"; }; -} +}) From fc88a12c962104f49c8d326df888269ddba403ba Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 4 Nov 2025 13:38:15 +0100 Subject: [PATCH 3/6] ulid: use tag in fetchFromGitHub --- pkgs/by-name/ul/ulid/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ul/ulid/package.nix b/pkgs/by-name/ul/ulid/package.nix index db4b0ca24729..858dd99b2a29 100644 --- a/pkgs/by-name/ul/ulid/package.nix +++ b/pkgs/by-name/ul/ulid/package.nix @@ -11,7 +11,7 @@ buildGoModule (finalAttrs: { src = fetchFromGitHub { owner = "oklog"; repo = "ulid"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-kPNLaZMGwGc7ngPCivf/n4Bis219yOkGAaa6mt7+yTY="; }; From 9d1116af2509319ec55fc5a741d0893a86dc6330 Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 4 Nov 2025 13:38:50 +0100 Subject: [PATCH 4/6] ulid: don't use src.rev in meta.changelog --- pkgs/by-name/ul/ulid/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ul/ulid/package.nix b/pkgs/by-name/ul/ulid/package.nix index 858dd99b2a29..c866990eb3f3 100644 --- a/pkgs/by-name/ul/ulid/package.nix +++ b/pkgs/by-name/ul/ulid/package.nix @@ -30,7 +30,7 @@ buildGoModule (finalAttrs: { meta = { description = "Universally Unique Lexicographically Sortable Identifier (ULID) in Go"; homepage = "https://github.com/oklog/ulid"; - changelog = "https://github.com/oklog/ulid/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + changelog = "https://github.com/oklog/ulid/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = [ ]; mainProgram = "ulid"; From f0a8acccb4e74f5f0e088906a1109710f5f2845c Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 4 Nov 2025 13:39:22 +0100 Subject: [PATCH 5/6] ulid: add updateScript --- pkgs/by-name/ul/ulid/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/ul/ulid/package.nix b/pkgs/by-name/ul/ulid/package.nix index c866990eb3f3..7351050329f0 100644 --- a/pkgs/by-name/ul/ulid/package.nix +++ b/pkgs/by-name/ul/ulid/package.nix @@ -2,6 +2,7 @@ lib, buildGoModule, fetchFromGitHub, + nix-update-script, }: buildGoModule (finalAttrs: { @@ -27,6 +28,8 @@ buildGoModule (finalAttrs: { "-skip=TestMonotonicSafe" ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "Universally Unique Lexicographically Sortable Identifier (ULID) in Go"; homepage = "https://github.com/oklog/ulid"; From c282c8728c1477fdcf3535c31c798e6ce45959d8 Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 4 Nov 2025 13:07:00 +0100 Subject: [PATCH 6/6] ulid: add defelo to maintainers --- pkgs/by-name/ul/ulid/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ul/ulid/package.nix b/pkgs/by-name/ul/ulid/package.nix index 7351050329f0..dce41f939ec0 100644 --- a/pkgs/by-name/ul/ulid/package.nix +++ b/pkgs/by-name/ul/ulid/package.nix @@ -35,7 +35,7 @@ buildGoModule (finalAttrs: { homepage = "https://github.com/oklog/ulid"; changelog = "https://github.com/oklog/ulid/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.asl20; - maintainers = [ ]; + maintainers = with lib.maintainers; [ defelo ]; mainProgram = "ulid"; }; })