Merge branch 'aa-ghc865' of github.com:obsidiansystems/obelisk into aa-ghc865
* 'aa-ghc865' of github.com:obsidiansystems/obelisk:
Add MonadFail constraints in obelisk-cliapp
Fix hnix
commit6ce2fbc505e5e70228eaf854568a2711ef12485a
authorAli Abrar <aliabrar@gmail.com>
dateMon 26 Aug 2019, 05:18 (7 years ago)
parent0ca6f711969d4b
default.nix+6−1
@@ -32,8 +32,13 @@ let
3232 # Fix misc upstream packages
3333 (self: super: let
3434 pkgs = self.callPackage ({ pkgs }: pkgs) {};
35+ haskellLib = pkgs.haskell.lib;
3536 in {
36− hnix = pkgs.haskell.lib.dontCheck (self.callPackage (pkgs.hackGet ./dep/hnix) {});
37+ hnix = haskellLib.overrideCabal (self.callHackage "hnix" "0.6.1" { these = self.these_0_8; }) (_: {
38+ jailbreak = true;
39+ doCheck = false;
40+ });
41+ hnix-store-core = self.callHackage "hnix-store-core" "0.1.0.0" {};
3742 })
3843
3944 pkgs.obeliskExecutableConfig.haskellOverlay
lib/cliapp/src/Obelisk/CliApp/Demo.hs+1−1
@@ -4,7 +4,7 @@
44module Obelisk.CliApp.Demo where
55
66import Control.Concurrent (threadDelay)
7−import Control.Monad.Fail (MonadFail)
7+import Control.Monad.Fail
88import Control.Monad.IO.Class
99import Data.Semigroup ((<>))
1010import qualified Data.Text as T
lib/cliapp/src/Obelisk/CliApp/Process.hs+1−1
@@ -24,7 +24,7 @@ module Obelisk.CliApp.Process
2424
2525import Control.Monad ((<=<), join, void)
2626import Control.Monad.Except (throwError)
27−import Control.Monad.Fail (MonadFail)
27+import Control.Monad.Fail
2828import Control.Monad.IO.Class (MonadIO, liftIO)
2929import Control.Lens (Prism', review)
3030import qualified Data.ByteString as BS