From a7e9abd515b092539dc2ee6f36f530e2f67a9cd3 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 26 Jan 2022 00:42:06 +0100 Subject: [PATCH] Revert "fix hercules-ci-agent build" The fix is not needed anymore. This reverts commit ef5324801ff835708615ac940c8d65c3e5089252. --- pkgs/development/haskell-modules/configuration-common.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 371217aa753e..4fc26f4403b7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1524,10 +1524,7 @@ self: super: { # Upstream issue: https://github.com/haskell-servant/servant-swagger/issues/129 servant-swagger = dontCheck super.servant-swagger; - # substituteInPlace: https://github.com/hercules-ci/hercules-ci-agent/issues/363 - hercules-ci-agent = overrideCabal { preConfigure = '' - substituteInPlace hercules-ci-agent/Hercules/Agent/Cachix/Init.hs --replace "Cachix.Client.Env" "Cachix.Client.Version" - ''; } (generateOptparseApplicativeCompletion "hercules-ci-agent" super.hercules-ci-agent); + hercules-ci-agent = generateOptparseApplicativeCompletion "hercules-ci-agent" super.hercules-ci-agent; hercules-ci-cli = pkgs.lib.pipe super.hercules-ci-cli [ unmarkBroken