From fcc9d524668b11124bee9512b0bccb254db20a4e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 3 Sep 2025 16:56:35 +0000 Subject: [PATCH 1/5] spicedb: 1.45.2 -> 1.45.3 --- pkgs/servers/spicedb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/spicedb/default.nix b/pkgs/servers/spicedb/default.nix index 57584d390e71..d7ac54e7cde0 100644 --- a/pkgs/servers/spicedb/default.nix +++ b/pkgs/servers/spicedb/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "spicedb"; - version = "1.45.2"; + version = "1.45.3"; src = fetchFromGitHub { owner = "authzed"; repo = "spicedb"; rev = "v${version}"; - hash = "sha256-LDAZdcUfrCWtld6V4GDpAbK+BeT/aeVOQ7G++sMoXU4="; + hash = "sha256-V+JYWoZclA4agfqXl3oUhxdTlJXeuO3JQIPfqu2idy0="; }; vendorHash = "sha256-hr+xIfPjlrH9igRsYeqNOPgx/jWhDfu73gA+/NoWWxI="; From f587bb437690779060eb55614433180994d32075 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 3 Sep 2025 12:11:22 -0700 Subject: [PATCH 2/5] spicedb: move to pkgs/by-name --- .../spicedb/default.nix => by-name/sp/spicedb/package.nix} | 0 pkgs/top-level/all-packages.nix | 1 - 2 files changed, 1 deletion(-) rename pkgs/{servers/spicedb/default.nix => by-name/sp/spicedb/package.nix} (100%) diff --git a/pkgs/servers/spicedb/default.nix b/pkgs/by-name/sp/spicedb/package.nix similarity index 100% rename from pkgs/servers/spicedb/default.nix rename to pkgs/by-name/sp/spicedb/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8e6905f92645..07bd6b3735c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5239,7 +5239,6 @@ with pkgs; callPackage ../development/tools/misc/coreboot-toolchain { } ); - spicedb = callPackage ../servers/spicedb { }; spicedb-zed = callPackage ../servers/spicedb/zed.nix { }; tamarin-prover = ( From fb03576605b4721cb3911821b5755852ad894741 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 3 Sep 2025 12:15:10 -0700 Subject: [PATCH 3/5] spicedb-zed: move to pkgs/by-name --- .../spicedb/zed.nix => by-name/sp/spicedb-zed/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{servers/spicedb/zed.nix => by-name/sp/spicedb-zed/package.nix} (100%) diff --git a/pkgs/servers/spicedb/zed.nix b/pkgs/by-name/sp/spicedb-zed/package.nix similarity index 100% rename from pkgs/servers/spicedb/zed.nix rename to pkgs/by-name/sp/spicedb-zed/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 07bd6b3735c6..5431fe4da66a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5239,8 +5239,6 @@ with pkgs; callPackage ../development/tools/misc/coreboot-toolchain { } ); - spicedb-zed = callPackage ../servers/spicedb/zed.nix { }; - tamarin-prover = ( callPackage ../applications/science/logic/tamarin-prover { # 2025-03-07: dependency fclabels doesn't compile with GHC >= 9.8 From dfbd645ac23df43a2c1449f5707c82d79b4cafcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 3 Sep 2025 12:16:49 -0700 Subject: [PATCH 4/5] spicedb: add meta.changelog --- pkgs/by-name/sp/spicedb/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sp/spicedb/package.nix b/pkgs/by-name/sp/spicedb/package.nix index d7ac54e7cde0..b5d0a70eb1cb 100644 --- a/pkgs/by-name/sp/spicedb/package.nix +++ b/pkgs/by-name/sp/spicedb/package.nix @@ -12,14 +12,14 @@ buildGoModule rec { src = fetchFromGitHub { owner = "authzed"; repo = "spicedb"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-V+JYWoZclA4agfqXl3oUhxdTlJXeuO3JQIPfqu2idy0="; }; vendorHash = "sha256-hr+xIfPjlrH9igRsYeqNOPgx/jWhDfu73gA+/NoWWxI="; ldflags = [ - "-X 'github.com/jzelinskie/cobrautil/v2.Version=${src.rev}'" + "-X 'github.com/jzelinskie/cobrautil/v2.Version=${src.tag}'" ]; subPackages = [ "cmd/spicedb" ]; @@ -34,6 +34,7 @@ buildGoModule rec { ''; meta = with lib; { + changelog = "https://github.com/authzed/spicedb/releases/tag/${src.tag}"; description = "Open source permission database"; longDescription = '' SpiceDB is an open-source permissions database inspired by From 90ff63efefbd9d0d6c87085d6e5555e3901c0d7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 3 Sep 2025 12:18:00 -0700 Subject: [PATCH 5/5] spicedb-zed: add meta.changelog --- pkgs/by-name/sp/spicedb-zed/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sp/spicedb-zed/package.nix b/pkgs/by-name/sp/spicedb-zed/package.nix index a0ab08a1200b..cc3774c8f858 100644 --- a/pkgs/by-name/sp/spicedb-zed/package.nix +++ b/pkgs/by-name/sp/spicedb-zed/package.nix @@ -12,13 +12,13 @@ buildGoModule rec { src = fetchFromGitHub { owner = "authzed"; repo = "zed"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-ftSgp0zxUmSTJ7lFHxFdebKrCKbsRocDkfabVpyQ5Kg="; }; vendorHash = "sha256-2AkknaufRhv79c9WQtcW5oSwMptkR+FB+1/OJazyGSM="; - ldflags = [ "-X 'github.com/jzelinskie/cobrautil/v2.Version=${src.rev}'" ]; + ldflags = [ "-X 'github.com/jzelinskie/cobrautil/v2.Version=${src.tag}'" ]; preCheck = '' export NO_COLOR=true @@ -34,6 +34,7 @@ buildGoModule rec { ''; meta = with lib; { + changelog = "https://github.com/authzed/zed/releases/tag/${src.tag}"; description = "Command line for managing SpiceDB"; mainProgram = "zed"; longDescription = ''