From 2cb5b0480c800dc07b02a939832eced00cc68fee Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Mon, 28 Oct 2024 02:16:30 +0000
Subject: [PATCH 1/4] sqlc: move to by-name

---
 .../database/sqlc/default.nix => by-name/sq/sqlc/package.nix}   | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{development/tools/database/sqlc/default.nix => by-name/sq/sqlc/package.nix} (100%)

diff --git a/pkgs/development/tools/database/sqlc/default.nix b/pkgs/by-name/sq/sqlc/package.nix
similarity index 100%
rename from pkgs/development/tools/database/sqlc/default.nix
rename to pkgs/by-name/sq/sqlc/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3c39a5cd60f6..3664b3f40ba4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18383,8 +18383,6 @@ with pkgs;
 
   sqlboiler-crdb = callPackage ../development/tools/database/sqlboiler-crdb { };
 
-  sqlc = callPackage ../development/tools/database/sqlc { };
-
   sqlcheck = callPackage ../development/tools/database/sqlcheck { };
 
   sqlcmd = callPackage ../development/tools/database/sqlcmd { };

From 2bdec131b2bb2c8563f4556d741d34ccb77409e2 Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Mon, 28 Oct 2024 02:16:58 +0000
Subject: [PATCH 2/4] sqlc: format with nixfmt

---
 pkgs/by-name/sq/sqlc/package.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/sq/sqlc/package.nix b/pkgs/by-name/sq/sqlc/package.nix
index 4ec22b7dfc84..81c88cc152c4 100644
--- a/pkgs/by-name/sq/sqlc/package.nix
+++ b/pkgs/by-name/sq/sqlc/package.nix
@@ -1,4 +1,8 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
 
 let
   version = "1.27.0";

From 62ceaa97b254728326902fab167bc5b3a90a7d24 Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Mon, 28 Oct 2024 02:27:24 +0000
Subject: [PATCH 3/4] .git-blame-ignore-revs: add 'sqlc: format with nixfmt'

---
 .git-blame-ignore-revs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 776f5596fea8..7778595da407 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -200,3 +200,6 @@ ce21e97a1f20dee15da85c084f9d1148d84f853b
 4cec81a9959ce612b653860dcca53101a36f328a
 # Final commit that does the formatting
 88b285c01d84de82c0b2b052fd28eaf6709c2d26
+
+# sqlc: format with nixfmt
+2bdec131b2bb2c8563f4556d741d34ccb77409e2

From cbb4c8889147518dc78b060e467fff0d1bb9630a Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Mon, 28 Oct 2024 02:18:14 +0000
Subject: [PATCH 4/4] sqlc: rewrite

---
 pkgs/by-name/sq/sqlc/package.nix | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sq/sqlc/package.nix b/pkgs/by-name/sq/sqlc/package.nix
index 81c88cc152c4..c605faf4335a 100644
--- a/pkgs/by-name/sq/sqlc/package.nix
+++ b/pkgs/by-name/sq/sqlc/package.nix
@@ -1,7 +1,11 @@
 {
   lib,
+  stdenv,
   buildGoModule,
   fetchFromGitHub,
+  installShellFiles,
+  testers,
+  sqlc,
 }:
 
 let
@@ -23,11 +27,31 @@ buildGoModule {
 
   subPackages = [ "cmd/sqlc" ];
 
+  nativeBuildInputs = [ installShellFiles ];
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd sqlc \
+      --bash <($out/bin/sqlc completion bash) \
+      --fish <($out/bin/sqlc completion fish) \
+      --zsh <($out/bin/sqlc completion zsh)
+  '';
+
+  passthru.tests.version = testers.testVersion {
+    package = sqlc;
+    command = "sqlc version";
+    version = "v${version}";
+  };
+
   meta = {
     description = "Generate type-safe code from SQL";
-    mainProgram = "sqlc";
     homepage = "https://sqlc.dev/";
     license = lib.licenses.mit;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ aaronjheng ];
+    mainProgram = "sqlc";
   };
 }