summary refs log tree commit diff
path: root/pkgs/development/haskell-modules
diff options
context:
space:
mode:
authorRobert Hensing <robert@roberthensing.nl>2021-06-22 09:47:32 +0200
committerRobert Hensing <robert@roberthensing.nl>2021-06-22 09:47:32 +0200
commit877c07f55699898c4c0e861bf2a7bb7a1d3bb804 (patch)
tree4e93dff9ecc3d814d1d9529bd7c9b0a8420655c7 /pkgs/development/haskell-modules
parent101c5857709a4483572a573475614eaf7739737a (diff)
downloadnixpkgs-877c07f55699898c4c0e861bf2a7bb7a1d3bb804.tar
nixpkgs-877c07f55699898c4c0e861bf2a7bb7a1d3bb804.tar.gz
nixpkgs-877c07f55699898c4c0e861bf2a7bb7a1d3bb804.tar.bz2
nixpkgs-877c07f55699898c4c0e861bf2a7bb7a1d3bb804.tar.lz
nixpkgs-877c07f55699898c4c0e861bf2a7bb7a1d3bb804.tar.xz
nixpkgs-877c07f55699898c4c0e861bf2a7bb7a1d3bb804.tar.zst
nixpkgs-877c07f55699898c4c0e861bf2a7bb7a1d3bb804.zip
haskellPackages.hercules-ci-agent: Remove obsolete override
Diffstat (limited to 'pkgs/development/haskell-modules')
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix15
1 files changed, 1 insertions, 14 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 0f4b58dbb85..49d5f995808 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1487,20 +1487,7 @@ self: super: {
   # Upstream issue: https://github.com/haskell-servant/servant-swagger/issues/129
   servant-swagger = dontCheck super.servant-swagger;
 
-  hercules-ci-agent = super.hercules-ci-agent.override {
-    cachix =
-      # https://github.com/cachix/cachix/pull/361
-      (appendPatch
-        (addBuildDepend super.cachix super.hercules-ci-cnix-store)
-        (pkgs.fetchpatch {
-          name = "cachix-361.patch";
-          url = "https://patch-diff.githubusercontent.com/raw/cachix/cachix/pull/361.patch";
-          sha256 = "0wwlcpmnqmvk1css5f723dzgjvg4jr7i58ifhni5zg9h5iwycdfr";
-          stripLen = 1;
-          includes = ["*.cabal" "*.hs"];
-        })
-        );
-  };
+  hercules-ci-agent = generateOptparseApplicativeCompletion "hercules-ci-agent" super.hercules-ci-agent;
 
   hercules-ci-cli = generateOptparseApplicativeCompletion "hci" (
     # See hercules-ci-optparse-applicative in non-hackage-packages.nix.