diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 6235b6d90860..2eef41de5fe8 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,40 @@ self: super:
       setAmazonkaSourceRoot "lib/amazonka" (doJailbreak super.amazonka);
   }
 )
+
+# Cachix packages
+# Manually maintained
+// (
+  let
+    version = "1.9.1";
+
+    src = pkgs.fetchFromGitHub {
+      owner = "cachix";
+      repo = "cachix";
+      tag = "v${version}";
+      hash = "sha256-IwnNtbNVrlZIHh7h4Wz6VP0Furxg9Hh0ycighvL5cZc=";
+    };
+  in
+  {
+    cachix-api = overrideSrc {
+      inherit version;
+      src = src + "/cachix-api";
+    } super.cachix-api;
+
+    cachix = lib.pipe super.cachix [
+      (overrideSrc {
+        inherit version;
+        src = src + "/cachix";
+      })
+      (addBuildDepends [
+        self.pqueue
+      ])
+      (
+        drv:
+        drv.override {
+          nix = self.hercules-ci-cnix-store.nixPackage;
+        }
+      )
+    ];
+  }
+)