From 708ed8b6f6cb73f66a8c589c57549ffae9a423d7 Mon Sep 17 00:00:00 2001
From: Sander <hey@sandydoo.me>
Date: Tue, 21 Oct 2025 13:17:25 +0200
Subject: [PATCH 1/2] cachix: refactor overrides

Removed `hnix-store-core_0_8_0_0` from the backport as this version is the default on 25.05.

(cherry picked from commit 1d1668a995abb6ea578c8f3c70f8e5d3618fc94d)
---
 .../haskell-modules/configuration-common.nix  | 75 ++++++++++---------
 1 file changed, 39 insertions(+), 36 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 6235b6d90860..dd2dd1594553 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -565,42 +565,6 @@ self: super:
   # https://github.com/illia-shkroba/pfile/issues/2
   pfile = doJailbreak super.pfile;
 
-  # Manually maintained
-  cachix-api = overrideCabal (drv: {
-    version = "1.7.9";
-    src = pkgs.fetchFromGitHub {
-      owner = "cachix";
-      repo = "cachix";
-      tag = "v1.7.9";
-      hash = "sha256-R0W7uAg+BLoHjMRMQ8+oiSbTq8nkGz5RDpQ+ZfxxP3A=";
-    };
-    postUnpack = "sourceRoot=$sourceRoot/cachix-api";
-  }) super.cachix-api;
-  cachix = (
-    overrideCabal
-      (drv: {
-        version = "1.7.9";
-        src = pkgs.fetchFromGitHub {
-          owner = "cachix";
-          repo = "cachix";
-          tag = "v1.7.9";
-          hash = "sha256-R0W7uAg+BLoHjMRMQ8+oiSbTq8nkGz5RDpQ+ZfxxP3A=";
-        };
-        postUnpack = "sourceRoot=$sourceRoot/cachix";
-      })
-      (
-        lib.pipe
-          (super.cachix.override {
-            nix = self.hercules-ci-cnix-store.nixPackage;
-          })
-          [
-            (addBuildTool self.hercules-ci-cnix-store.nixPackage)
-            (addBuildTool pkgs.buildPackages.pkg-config)
-            (addBuildDepend self.hnix-store-nar)
-          ]
-      )
-  );
-
   # https://github.com/froozen/kademlia/issues/2
   kademlia = dontCheck super.kademlia;
 
@@ -3370,3 +3334,42 @@ self: super:
       setAmazonkaSourceRoot "lib/amazonka" (doJailbreak super.amazonka);
   }
 )
+
+# cachix: manually maintained
+// (
+  let
+    version = "1.7.9";
+
+    src = pkgs.fetchFromGitHub {
+      owner = "cachix";
+      repo = "cachix";
+      tag = "v${version}";
+      hash = "sha256-R0W7uAg+BLoHjMRMQ8+oiSbTq8nkGz5RDpQ+ZfxxP3A=";
+    };
+  in
+  {
+    cachix-api = overrideSrc {
+      inherit version;
+      src = src + "/cachix-api";
+    } super.cachix-api;
+
+    cachix = lib.pipe super.cachix [
+      (overrideSrc {
+        inherit version;
+        src = src + "/cachix";
+      })
+      # Fix ambiguous 'show' reference: https://github.com/cachix/cachix/pull/704
+      (overrideCabal (_: {
+        postPatch = ''
+          sed -i 's/<> show i/<> Protolude.show i/' src/Cachix/Client/NixVersion.hs
+        '';
+      }))
+      (
+        drv:
+        drv.override {
+          nix = self.hercules-ci-cnix-store.nixPackage;
+        }
+      )
+    ];
+  }
+)

From f1d47ca7fa89e0bb198f9c7e6cdcb84fb134b280 Mon Sep 17 00:00:00 2001
From: Sander <hey@sandydoo.me>
Date: Tue, 21 Oct 2025 13:25:33 +0200
Subject: [PATCH 2/2] cachix: 1.7.9 -> 1.9.1

(cherry picked from commit dd7d99efa9cbc19260910a288708f683385c9f86)
---
 .../haskell-modules/configuration-common.nix     | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index dd2dd1594553..2eef41de5fe8 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -3335,16 +3335,17 @@ self: super:
   }
 )
 
-# cachix: manually maintained
+# Cachix packages
+# Manually maintained
 // (
   let
-    version = "1.7.9";
+    version = "1.9.1";
 
     src = pkgs.fetchFromGitHub {
       owner = "cachix";
       repo = "cachix";
       tag = "v${version}";
-      hash = "sha256-R0W7uAg+BLoHjMRMQ8+oiSbTq8nkGz5RDpQ+ZfxxP3A=";
+      hash = "sha256-IwnNtbNVrlZIHh7h4Wz6VP0Furxg9Hh0ycighvL5cZc=";
     };
   in
   {
@@ -3358,12 +3359,9 @@ self: super:
         inherit version;
         src = src + "/cachix";
       })
-      # Fix ambiguous 'show' reference: https://github.com/cachix/cachix/pull/704
-      (overrideCabal (_: {
-        postPatch = ''
-          sed -i 's/<> show i/<> Protolude.show i/' src/Cachix/Client/NixVersion.hs
-        '';
-      }))
+      (addBuildDepends [
+        self.pqueue
+      ])
       (
         drv:
         drv.override {