cachix: clean up obsolete overrides

Author: sternenseemann

pkgs/development/haskell-modules/configuration-arm.nix

@@ -53,9 +53,6 @@ self: super:
 // lib.optionalAttrs pkgs.stdenv.hostPlatform.isAarch64 {
   # AARCH64-SPECIFIC OVERRIDES
 
-  # Corrupted store path https://github.com/NixOS/nixpkgs/pull/272097#issuecomment-1848414265
-  cachix = triggerRebuild 1 super.cachix;
-
   # Doctests fail on aarch64 due to a GHCi linking bug
   # https://gitlab.haskell.org/ghc/ghc/-/issues/15275#note_295437
   # TODO: figure out if needed on aarch32 as well

pkgs/development/haskell-modules/configuration-common.nix

@@ -720,6 +720,7 @@ with haskellLib;
 
   # Manually maintained
   cachix-api = overrideCabal (drv: {
+    # FIXME: should use overrideSrc
     version = "1.7.9";
     src = pkgs.fetchFromGitHub {
       owner = "cachix";
@@ -732,6 +733,7 @@ with haskellLib;
   cachix = (
     overrideCabal
       (drv: {
+        # FIXME: should use overrideSrc
         version = "1.7.9";
         src = pkgs.fetchFromGitHub {
           owner = "cachix";
@@ -746,15 +748,9 @@ with haskellLib;
         '';
       })
       (
-        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)
-          ]
+        super.cachix.override {
+          nix = self.hercules-ci-cnix-store.nixPackage;
+        }
       )
   );