From ba9342a67b58df0b39aeeea3d014082b5205a9d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 25 Sep 2022 11:09:09 +0100
Subject: [PATCH] haskellPackages.cachix: fix build

---
 .../haskell-modules/configuration-common.nix           |  3 +++
 pkgs/development/haskell-modules/patches/cachix.patch  | 10 ++++++++++
 2 files changed, 13 insertions(+)
 create mode 100755 pkgs/development/haskell-modules/patches/cachix.patch

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index f7041b8222ba..d83d6fd30cc1 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -121,6 +121,9 @@ self: super: {
     postPatch = "sed -i s/home/tmp/ test/Spec.hs";
   }) super.shell-conduit;
 
+  # https://github.com/cachix/cachix/pull/451
+  cachix = appendPatch ./patches/cachix.patch super.cachix;
+
   # https://github.com/froozen/kademlia/issues/2
   kademlia = dontCheck super.kademlia;
 
diff --git a/pkgs/development/haskell-modules/patches/cachix.patch b/pkgs/development/haskell-modules/patches/cachix.patch
new file mode 100755
index 000000000000..21f1496933a7
--- /dev/null
+++ b/pkgs/development/haskell-modules/patches/cachix.patch
@@ -0,0 +1,10 @@
+--- a/src/Cachix/Client/OptionsParser.hs
++++ b/src/Cachix/Client/OptionsParser.hs
+@@ -15,7 +15,7 @@
+ import qualified Cachix.Client.URI as URI
+ import qualified Cachix.Deploy.OptionsParser as DeployOptions
+ import Options.Applicative
+-import Protolude hiding (toS)
++import Protolude hiding (option, toS)
+ import Protolude.Conv
+ import qualified URI.ByteString as URI