From c69399d4fd83ab0d4e4ecb98e7cb1d00f0dc5b63 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Thu, 30 Mar 2023 12:32:28 +0900 Subject: [PATCH] cachix: remove source override --- .../haskell-modules/configuration-nix.nix | 28 ++----------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index a44417dbbb47..2b15a2ab1fd1 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -885,34 +885,10 @@ self: super: builtins.intersectAttrs super { # won't work (or would need to patch test suite). domaindriven-core = dontCheck super.domaindriven-core; - cachix = overrideCabal (drv: { - version = "1.3.3"; - src = pkgs.fetchFromGitHub { - owner = "cachix"; - repo = "cachix"; - rev = "v1.3.3"; - sha256 = "sha256-xhLCsAkz5c+XIqQ4eGY9bSp3zBgCDCaHXZ2HLk8vqmE="; - }; - buildDepends = [ self.conduit-concurrent-map ]; - postUnpack = "sourceRoot=$sourceRoot/cachix"; - postPatch = '' - sed -i 's/1.3.2/1.3.3/' cachix.cabal - ''; - }) (super.cachix.override { - nix = self.hercules-ci-cnix-store.passthru.nixPackage; + cachix = super.cachix.override { fsnotify = dontCheck super.fsnotify_0_4_1_0; hnix-store-core = super.hnix-store-core_0_6_1_0; - }); - cachix-api = overrideCabal (drv: { - version = "1.3.3"; - src = pkgs.fetchFromGitHub { - owner = "cachix"; - repo = "cachix"; - rev = "v1.3.3"; - sha256 = "sha256-xhLCsAkz5c+XIqQ4eGY9bSp3zBgCDCaHXZ2HLk8vqmE="; - }; - postUnpack = "sourceRoot=$sourceRoot/cachix-api"; - }) super.cachix-api; + }; hercules-ci-agent = super.hercules-ci-agent.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; }; hercules-ci-cnix-expr = addTestToolDepend pkgs.git (super.hercules-ci-cnix-expr.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; });