From 18214137c3f7bf79f7428d1c55aab98e6bb383f8 Mon Sep 17 00:00:00 2001 From: Angel J <78835633+Iamanaws@users.noreply.github.com> Date: Fri, 15 May 2026 20:28:11 -0700 Subject: [PATCH 1/4] dblab: add iamanaws as maintainer --- pkgs/by-name/db/dblab/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/db/dblab/package.nix b/pkgs/by-name/db/dblab/package.nix index 957436713f42..e14c38a5e648 100644 --- a/pkgs/by-name/db/dblab/package.nix +++ b/pkgs/by-name/db/dblab/package.nix @@ -26,6 +26,6 @@ buildGoModule (finalAttrs: { description = "Database client every command line junkie deserves"; homepage = "https://github.com/danvergara/dblab"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = with lib.maintainers; [ iamanaws ]; }; }) From 5366e1400c8c8e572e296ff68adf25d5a6daad14 Mon Sep 17 00:00:00 2001 From: Angel J <78835633+iamanaws@users.noreply.github.com> Date: Fri, 15 May 2026 20:56:39 -0700 Subject: [PATCH 2/4] dblab: cleanup --- pkgs/by-name/db/dblab/package.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/db/dblab/package.nix b/pkgs/by-name/db/dblab/package.nix index e14c38a5e648..b10a9e1df54c 100644 --- a/pkgs/by-name/db/dblab/package.nix +++ b/pkgs/by-name/db/dblab/package.nix @@ -11,21 +11,30 @@ buildGoModule (finalAttrs: { src = fetchFromGitHub { owner = "danvergara"; repo = "dblab"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-0tkIDWAub+wfoJ760m1kU7XYnGNner/zLtCod6UPF60="; }; vendorHash = "sha256-B5wyERNUkJIrKjKET9HX3F43CFW6aBtzAarkAuhxw9o="; - ldflags = [ "-s -w -X main.version=${finalAttrs.version}" ]; + ldflags = [ + "-s" + "-X main.version=${finalAttrs.version}" + ]; # some tests require network access doCheck = false; meta = { description = "Database client every command line junkie deserves"; + longDescription = '' + Fast and lightweight interactive terminal-based UI application + for PostgreSQL, MySQL, SQLite, Oracle, and SQL Server. + ''; homepage = "https://github.com/danvergara/dblab"; + changelog = "https://github.com/danvergara/dblab/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ iamanaws ]; + mainProgram = "dblab"; }; }) From 97ce11ac524c3ae09a64f19c337a259f99b9a25a Mon Sep 17 00:00:00 2001 From: Angel J <78835633+iamanaws@users.noreply.github.com> Date: Fri, 15 May 2026 20:57:18 -0700 Subject: [PATCH 3/4] dblab: enable tests --- pkgs/by-name/db/dblab/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/db/dblab/package.nix b/pkgs/by-name/db/dblab/package.nix index b10a9e1df54c..7cd6cef44f0e 100644 --- a/pkgs/by-name/db/dblab/package.nix +++ b/pkgs/by-name/db/dblab/package.nix @@ -22,8 +22,8 @@ buildGoModule (finalAttrs: { "-X main.version=${finalAttrs.version}" ]; - # some tests require network access - doCheck = false; + doCheck = true; + checkFlags = [ "-short" ]; # Skip Docker-based integration tests meta = { description = "Database client every command line junkie deserves"; From ccf166aa3791dfc3e96606ebda2d0869239f20e5 Mon Sep 17 00:00:00 2001 From: Angel J <78835633+iamanaws@users.noreply.github.com> Date: Fri, 15 May 2026 20:57:56 -0700 Subject: [PATCH 4/4] dblab: fix build error --- pkgs/by-name/db/dblab/package.nix | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/db/dblab/package.nix b/pkgs/by-name/db/dblab/package.nix index 7cd6cef44f0e..0b70234c8c13 100644 --- a/pkgs/by-name/db/dblab/package.nix +++ b/pkgs/by-name/db/dblab/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildGoModule, fetchFromGitHub, }: @@ -15,7 +16,10 @@ buildGoModule (finalAttrs: { hash = "sha256-0tkIDWAub+wfoJ760m1kU7XYnGNner/zLtCod6UPF60="; }; - vendorHash = "sha256-B5wyERNUkJIrKjKET9HX3F43CFW6aBtzAarkAuhxw9o="; + vendorHash = "sha256-UGnbXjXnZ3EVcAk0ZTaV2wWWXv5nsbyNlTv8PMl2rP4="; + # Fix case-insensitive conflicts producing platform-dependent checksums + # https://github.com/microsoft/go-mssqldb/issues/234 + proxyVendor = true; ldflags = [ "-s" @@ -23,7 +27,20 @@ buildGoModule (finalAttrs: { ]; doCheck = true; - checkFlags = [ "-short" ]; # Skip Docker-based integration tests + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' + # modernc reads /etc/protocols during package init, which Darwin sandboxing blocks. + go mod download modernc.org/libc + chmod -R u+w "$GOPATH/pkg/mod/modernc.org/libc@"* + substituteInPlace "$GOPATH"/pkg/mod/modernc.org/libc@*/honnef.co/go/netdb/netdb.go \ + --replace-fail '!os.IsNotExist(err)' '!os.IsNotExist(err) && !os.IsPermission(err)' + ''; + checkFlags = [ + "-short" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # Tries to bind a local TCP listener, which Darwin sandboxing blocks. + "-skip=^TestSSHKeyFileAuthentication$" + ]; meta = { description = "Database client every command line junkie deserves";