From 90384031363e768617c8f864bababe776cd02d01 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 10 Aug 2019 11:22:44 +0200
Subject: [PATCH] cachix: fix infinite recursion during evaluation

---
 pkgs/development/tools/cachix/default.nix | 6 ------
 pkgs/top-level/all-packages.nix           | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)
 delete mode 100644 pkgs/development/tools/cachix/default.nix

diff --git a/pkgs/development/tools/cachix/default.nix b/pkgs/development/tools/cachix/default.nix
deleted file mode 100644
index b6098ca98bf..00000000000
--- a/pkgs/development/tools/cachix/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ haskellPackages, haskell }:
-
-haskell.lib.justStaticExecutables (haskellPackages.extend (self: super: {
-    cachix = haskell.lib.doDistribute (self.cachix_0_2_1 or self.cachix);
-    cachix-api = self.cachix-api_0_2_1 or self.cachix-api;
-})).cachix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 23baad01cba..cdb0470b1df 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10247,7 +10247,7 @@ in
 
   c-blosc = callPackage ../development/libraries/c-blosc { };
 
-  cachix = callPackage ../development/tools/cachix { };
+  cachix = haskell.lib.justStaticExecutables haskellPackages.cachix;
 
   capnproto = callPackage ../development/libraries/capnproto { };