diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-05-07 13:49:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-07 13:49:50 +0100 |
| commit | d1ad5bf95d7bd0f0b081435ee404658bdfc7908f (patch) | |
| tree | aeaacacd90991e4a85865f4790e5741e72e9b86d /pkgs/applications/science | |
| parent | 3f96895417a8ae9ad13b69b49fa3bb4da8bdddca (diff) | |
| parent | ee95ed11ca1e0df43caf927adb2287bbd7eeeb3a (diff) | |
| download | nixlib-d1ad5bf95d7bd0f0b081435ee404658bdfc7908f.tar nixlib-d1ad5bf95d7bd0f0b081435ee404658bdfc7908f.tar.gz nixlib-d1ad5bf95d7bd0f0b081435ee404658bdfc7908f.tar.bz2 nixlib-d1ad5bf95d7bd0f0b081435ee404658bdfc7908f.tar.lz nixlib-d1ad5bf95d7bd0f0b081435ee404658bdfc7908f.tar.xz nixlib-d1ad5bf95d7bd0f0b081435ee404658bdfc7908f.tar.zst nixlib-d1ad5bf95d7bd0f0b081435ee404658bdfc7908f.zip | |
Merge pull request #40113 from wchresta/tamarin/fix
tamarin-prover: Fix compile issues
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/logic/tamarin-prover/default.nix | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/applications/science/logic/tamarin-prover/default.nix index 7a9dcc231929..4461fa675e89 100644 --- a/pkgs/applications/science/logic/tamarin-prover/default.nix +++ b/pkgs/applications/science/logic/tamarin-prover/default.nix @@ -8,8 +8,8 @@ let src = fetchFromGitHub { owner = "tamarin-prover"; repo = "tamarin-prover"; - rev = "120c7e706f3e1d4646b233faf2bc9936834ed9d3"; - sha256 = "064blwjjwnkycwgsrdn1xkjya976wndpz9h5pjmgjqqirinc8c5x"; + rev = "ab8a155452e9e9c57ccb4bbe1b94d7677ea5ce21"; + sha256 = "02ycxxkcpc0dzybaq63viciydq1ik8wiv2blk8mvnz3ssxw3sjik"; }; # tamarin has its own dependencies, but they're kept inside the repo, @@ -65,6 +65,15 @@ mkDerivation (common "tamarin-prover" src // { enableSharedExecutables = false; postFixup = "rm -rf $out/lib $out/nix-support $out/share/doc"; + # Fix problem with MonadBaseControl not being found + patchPhase = '' + sed -ie 's,\(import *\)Control\.Monad$,&\ + \1Control.Monad.Trans.Control,' src/Web/Handler.hs + + sed -ie 's~\( *, \)mtl~&\ + \1monad-control~' tamarin-prover.cabal + ''; + # wrap the prover to be sure it can find maude, sapic, etc executableToolDepends = [ makeWrapper which maude graphviz sapic ]; postInstall = '' @@ -79,7 +88,7 @@ mkDerivation (common "tamarin-prover" src // { executableHaskellDepends = (with haskellPackages; [ base binary binary-orphans blaze-builder blaze-html bytestring - cmdargs conduit containers deepseq directory fclabels file-embed + cmdargs conduit containers monad-control deepseq directory fclabels file-embed filepath gitrev http-types HUnit lifted-base mtl parsec process resourcet safe shakespeare tamarin-prover-term template-haskell text threads time wai warp yesod-core yesod-static |