haskellPackages.cachix: fix build

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;
 

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