From e4ec47a462f9477154a56ddc75dd93c2c26126df Mon Sep 17 00:00:00 2001
From: Wael Nasreddine <wael.nasreddine@gmail.com>
Date: Sun, 25 Jan 2026 23:52:16 -0800
Subject: [PATCH 1/2] ncps: organise the derivation attrs a bit

---
 pkgs/by-name/nc/ncps/package.nix | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/nc/ncps/package.nix b/pkgs/by-name/nc/ncps/package.nix
index 0b33e4051a8d..f4ae9e296cb7 100644
--- a/pkgs/by-name/nc/ncps/package.nix
+++ b/pkgs/by-name/nc/ncps/package.nix
@@ -42,17 +42,14 @@ let
       hash = "sha256-qc6h1gnU7dFyb0GiBq++E2yf49K7mO86Vwdf8y3817U=";
     };
 
+    vendorHash = "sha256-nnt4HIG4Fs7RhHjVb7mYJ39UgvFKc46Cu42cURMmr1s=";
+
     ldflags = [
       "-X github.com/kalbasit/ncps/cmd.Version=v${finalAttrs.version}"
     ];
 
-    vendorHash = "sha256-nnt4HIG4Fs7RhHjVb7mYJ39UgvFKc46Cu42cURMmr1s=";
-
     subPackages = [ "." ];
 
-    doCheck = true;
-    checkFlags = [ "-race" ];
-
     nativeBuildInputs = [
       curl # used for checking MinIO health check
       dbmate # used for testing
@@ -66,6 +63,20 @@ let
       makeWrapper # For wrapping dbmate.
     ];
 
+    postInstall = ''
+      mkdir -p $out/share/ncps
+      cp -r db $out/share/ncps/db
+
+      makeWrapper ${dbmate-wrapper}/bin/dbmate-wrapper \
+        $out/bin/dbmate-ncps \
+        --prefix PATH : ${dbmate-real}/bin \
+        --set NCPS_DB_MIGRATIONS_DIR $out/share/ncps/db/migrations
+    '';
+
+    doCheck = true;
+
+    checkFlags = [ "-race" ];
+
     # pre and post checks
     preCheck = ''
       # Set up cleanup trap to ensure background processes are killed even if tests fail
@@ -83,16 +94,6 @@ let
       source $src/nix/packages/ncps/pre-check-redis.sh
     '';
 
-    postInstall = ''
-      mkdir -p $out/share/ncps
-      cp -r db $out/share/ncps/db
-
-      makeWrapper ${dbmate-wrapper}/bin/dbmate-wrapper \
-        $out/bin/dbmate-ncps \
-        --prefix PATH : ${dbmate-real}/bin \
-        --set NCPS_DB_MIGRATIONS_DIR $out/share/ncps/db/migrations
-    '';
-
     meta = {
       description = "Nix binary cache proxy service";
       homepage = "https://github.com/kalbasit/ncps";

From 34ef3497e5bca3fdade3ad043bb2f43316b39e14 Mon Sep 17 00:00:00 2001
From: Wael Nasreddine <wael.nasreddine@gmail.com>
Date: Sun, 25 Jan 2026 23:52:52 -0800
Subject: [PATCH 2/2] ncps: fix ncps --version

---
 pkgs/by-name/nc/ncps/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/nc/ncps/package.nix b/pkgs/by-name/nc/ncps/package.nix
index f4ae9e296cb7..ba228bc5c248 100644
--- a/pkgs/by-name/nc/ncps/package.nix
+++ b/pkgs/by-name/nc/ncps/package.nix
@@ -45,7 +45,7 @@ let
     vendorHash = "sha256-nnt4HIG4Fs7RhHjVb7mYJ39UgvFKc46Cu42cURMmr1s=";
 
     ldflags = [
-      "-X github.com/kalbasit/ncps/cmd.Version=v${finalAttrs.version}"
+      "-X github.com/kalbasit/ncps/pkg/ncps.Version=v${finalAttrs.version}"
     ];
 
     subPackages = [ "." ];