From cf7a16f0c611a7f76a0a4e8803975fac3ceb02b8 Mon Sep 17 00:00:00 2001 From: Angel J <78835633+iamanaws@users.noreply.github.com> Date: Sat, 30 May 2026 13:54:35 -0700 Subject: [PATCH 1/2] rqlite: add iamanaws as maintainer --- pkgs/by-name/rq/rqlite/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/rq/rqlite/package.nix b/pkgs/by-name/rq/rqlite/package.nix index 41eec3fff74f..e123ab87ce30 100644 --- a/pkgs/by-name/rq/rqlite/package.nix +++ b/pkgs/by-name/rq/rqlite/package.nix @@ -39,6 +39,6 @@ buildGoModule (finalAttrs: { homepage = "https://github.com/rqlite/rqlite"; changelog = "https://github.com/rqlite/rqlite/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = with lib.maintainers; [ iamanaws ]; }; }) From c87d4bcc5070cb9e0c3536835224d16a01b1877a Mon Sep 17 00:00:00 2001 From: Angel J <78835633+iamanaws@users.noreply.github.com> Date: Sat, 30 May 2026 14:07:26 -0700 Subject: [PATCH 2/2] rqlite: 9.4.5 -> 10.2.0 --- pkgs/by-name/rq/rqlite/package.nix | 73 +++++++++++++++++------------- 1 file changed, 41 insertions(+), 32 deletions(-) diff --git a/pkgs/by-name/rq/rqlite/package.nix b/pkgs/by-name/rq/rqlite/package.nix index e123ab87ce30..3da1c70a821e 100644 --- a/pkgs/by-name/rq/rqlite/package.nix +++ b/pkgs/by-name/rq/rqlite/package.nix @@ -2,43 +2,52 @@ lib, buildGoModule, fetchFromGitHub, + stdenv, }: -buildGoModule (finalAttrs: { - pname = "rqlite"; - version = "9.4.5"; +buildGoModule ( + finalAttrs: + let + cmdPackage = "github.com/rqlite/rqlite/v${lib.versions.major finalAttrs.version}/cmd"; + in + { + pname = "rqlite"; + version = "10.2.0"; - src = fetchFromGitHub { - owner = "rqlite"; - repo = "rqlite"; - tag = "v${finalAttrs.version}"; - hash = "sha256-jvqmRmURAvo0bNrwgft95oHupRf8FJaB3XRgnU43wRo="; - }; + src = fetchFromGitHub { + owner = "rqlite"; + repo = "rqlite"; + tag = "v${finalAttrs.version}"; + hash = "sha256-XpdI3OFkMHlnUQ6LXo/NDagRwaRkQMq2UmFg4MOKNJ4="; + }; - vendorHash = "sha256-PPmX/KbNO/LEwGlw8bziek4uDd5sgDo3+wNlBJm/qA4="; + vendorHash = "sha256-7f9A9BnENKF7kRftB/ii1EQeHMsYp9ZSb5T474ngs6E="; - subPackages = [ - "cmd/rqlite" - "cmd/rqlited" - "cmd/rqbench" - ]; + subPackages = [ + "cmd/rqlite" + "cmd/rqlited" + "cmd/rqbench" + ]; - # Leaving other flags from https://github.com/rqlite/rqlite/blob/master/package.sh - # since automatically retrieving those is nontrivial and inessential - ldflags = [ - "-s" - "-w" - "-X github.com/rqlite/rqlite/cmd.Version=${finalAttrs.version}" - ]; + # Mirror the upstream release build metadata + ldflags = [ + "-s" + "-X ${cmdPackage}.CompilerCommand=${stdenv.cc.targetPrefix}cc" + "-X ${cmdPackage}.Version=${finalAttrs.version}" + "-X ${cmdPackage}.Branch=${finalAttrs.src.tag}" + "-X ${cmdPackage}.Commit=${finalAttrs.src.tag}" + "-X ${cmdPackage}.Buildtime=1970-01-01T00:00:00Z" + ]; - # Tests are in a different subPackage which fails trying to access the network - doCheck = false; + doCheck = true; - meta = { - description = "Lightweight, distributed relational database built on SQLite"; - homepage = "https://github.com/rqlite/rqlite"; - changelog = "https://github.com/rqlite/rqlite/blob/${finalAttrs.src.tag}/CHANGELOG.md"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ iamanaws ]; - }; -}) + meta = { + description = "Lightweight, fault-tolerant, distributed relational database built on SQLite"; + homepage = "https://github.com/rqlite/rqlite"; + changelog = "https://github.com/rqlite/rqlite/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + mainProgram = "rqlite"; + maintainers = with lib.maintainers; [ iamanaws ]; + }; + } +)