From 36d20b52473d7ec9b90784f25b026e47dc5f0d80 Mon Sep 17 00:00:00 2001 From: Harinn Date: Mon, 6 Apr 2026 00:02:02 +0700 Subject: [PATCH 1/4] chroma: modernize --- pkgs/by-name/ch/chroma/package.nix | 23 +++++++---------------- pkgs/by-name/ch/chroma/src.json | 14 -------------- 2 files changed, 7 insertions(+), 30 deletions(-) delete mode 100644 pkgs/by-name/ch/chroma/src.json diff --git a/pkgs/by-name/ch/chroma/package.nix b/pkgs/by-name/ch/chroma/package.nix index 42a9a9943b18..400139e25a2c 100644 --- a/pkgs/by-name/ch/chroma/package.nix +++ b/pkgs/by-name/ch/chroma/package.nix @@ -4,21 +4,15 @@ fetchFromGitHub, }: -let - srcInfo = lib.importJSON ./src.json; -in - -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "chroma"; version = "2.22.0"; - # To update: - # nix-prefetch-git --rev v${version} https://github.com/alecthomas/chroma.git > src.json src = fetchFromGitHub { owner = "alecthomas"; repo = "chroma"; - rev = "v${version}"; - inherit (srcInfo) sha256; + tag = "v${finalAttrs.version}"; + hash = "sha256-9T7PBmv8cEPcb09gFhOp5yiODevcpTzzMAkrvmjvm/I="; }; vendorHash = "sha256-kzlXrIMSa5C4UFt+BiMh6NedelQG49OxYbreeWhCb80="; @@ -27,12 +21,9 @@ buildGoModule rec { # substitute version info as done in goreleaser builds ldflags = [ - "-X" - "main.version=${version}" - "-X" - "main.commit=${srcInfo.rev}" - "-X" - "main.date=${srcInfo.date}" + "-X=main.version=${finalAttrs.version}" + "-X=main.commit=${finalAttrs.src.tag}" + "-X=main.date=1970-01-01T00:00:00Z" ]; meta = { @@ -42,4 +33,4 @@ buildGoModule rec { maintainers = [ lib.maintainers.sternenseemann ]; mainProgram = "chroma"; }; -} +}) diff --git a/pkgs/by-name/ch/chroma/src.json b/pkgs/by-name/ch/chroma/src.json deleted file mode 100644 index 2ae37368251d..000000000000 --- a/pkgs/by-name/ch/chroma/src.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "url": "https://github.com/alecthomas/chroma.git", - "rev": "467c878aa553cdb4b0d486a534ea744f6ac7ef5e", - "date": "2026-01-10T09:37:30+11:00", - "path": "/nix/store/qkfgjvpw8j5rkfgh687kxzkv8ac9apba-chroma", - "sha256": "1wlvxxlbwaq963rkr9fwxc6qwa77m49icq2gdzf46w7wdc3cygpm", - "hash": "sha256-9T7PBmv8cEPcb09gFhOp5yiODevcpTzzMAkrvmjvm/I=", - "fetchLFS": false, - "fetchSubmodules": false, - "deepClone": false, - "fetchTags": false, - "leaveDotGit": false, - "rootDir": "" -} From eb8497e22fde903dc15360514e5bedea3a65563e Mon Sep 17 00:00:00 2001 From: Harinn Date: Mon, 6 Apr 2026 00:11:02 +0700 Subject: [PATCH 2/4] chroma: 2.22.0 -> 2.23.1 --- pkgs/by-name/ch/chroma/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ch/chroma/package.nix b/pkgs/by-name/ch/chroma/package.nix index 400139e25a2c..bf53e418ff5b 100644 --- a/pkgs/by-name/ch/chroma/package.nix +++ b/pkgs/by-name/ch/chroma/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "chroma"; - version = "2.22.0"; + version = "2.23.1"; src = fetchFromGitHub { owner = "alecthomas"; repo = "chroma"; tag = "v${finalAttrs.version}"; - hash = "sha256-9T7PBmv8cEPcb09gFhOp5yiODevcpTzzMAkrvmjvm/I="; + hash = "sha256-Znmcds0ru9VyH/0qE7KnW7l0QeRDoh9PnUPHTYPAA6w="; }; - vendorHash = "sha256-kzlXrIMSa5C4UFt+BiMh6NedelQG49OxYbreeWhCb80="; + vendorHash = "sha256-3mmO5hjjIqVqKiSOrFFQH8OaQTviJVHrznMYsgHP82A="; modRoot = "./cmd/chroma"; From 806f1018e257fd02b55d70b5b798387015058480 Mon Sep 17 00:00:00 2001 From: Harinn Date: Mon, 6 Apr 2026 00:11:46 +0700 Subject: [PATCH 3/4] chroma: add miniharinn as a maintainer --- pkgs/by-name/ch/chroma/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ch/chroma/package.nix b/pkgs/by-name/ch/chroma/package.nix index bf53e418ff5b..1d0f269ac805 100644 --- a/pkgs/by-name/ch/chroma/package.nix +++ b/pkgs/by-name/ch/chroma/package.nix @@ -30,7 +30,10 @@ buildGoModule (finalAttrs: { homepage = "https://github.com/alecthomas/chroma"; description = "General purpose syntax highlighter in pure Go"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.sternenseemann ]; + maintainers = with lib.maintainers; [ + sternenseemann + miniharinn + ]; mainProgram = "chroma"; }; }) From 5742d83342aecffb70b65a9a949e5a5c476e6316 Mon Sep 17 00:00:00 2001 From: Harinn Date: Mon, 6 Apr 2026 22:01:17 +0700 Subject: [PATCH 4/4] chroma: remove sternenseemann from maintainers As requested in #507001 --- pkgs/by-name/ch/chroma/package.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/by-name/ch/chroma/package.nix b/pkgs/by-name/ch/chroma/package.nix index 1d0f269ac805..04b828b673ef 100644 --- a/pkgs/by-name/ch/chroma/package.nix +++ b/pkgs/by-name/ch/chroma/package.nix @@ -30,10 +30,7 @@ buildGoModule (finalAttrs: { homepage = "https://github.com/alecthomas/chroma"; description = "General purpose syntax highlighter in pure Go"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ - sternenseemann - miniharinn - ]; + maintainers = with lib.maintainers; [ miniharinn ]; mainProgram = "chroma"; }; })