diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5ecf60043856..8c3894235a8c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -3904,25 +3904,21 @@ with haskellLib; 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; - hnix-store-core = self.hnix-store-core_0_8_0_0; - } - ) - ] - # https://github.com/NixOS/nixpkgs/issues/461651 - ++ lib.optional pkgs.stdenv.isDarwin dontCheck - ); + cachix = lib.pipe super.cachix [ + (overrideSrc { + inherit version; + src = src + "/cachix"; + }) + (addBuildDepends [ + self.pqueue + ]) + ( + drv: + drv.override { + nix = self.hercules-ci-cnix-store.nixPackage; + hnix-store-core = self.hnix-store-core_0_8_0_0; + } + ) + ]; } ) diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index d394e8d9c7ec..7a14f3ee3656 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -335,6 +335,9 @@ self: super: + (old.preBuild or ""); }) super.hercules-ci-agent; + # https://github.com/NixOS/nixpkgs/issues/461651 + cachix = dontCheck super.cachix; + # Require /usr/bin/security which breaks sandbox http-reverse-proxy = dontCheck super.http-reverse-proxy; servant-auth-server = dontCheck super.servant-auth-server;