Added change log for 1.4.0, upgraded stack to LTS 11.7, and extended …

…copyright notice to 2018
yavivanov · May 7, 2018 · ed14a32 · ed14a32
1 parent 90b8677
commit ed14a32
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 2 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,10 @@
+* 1.4.0
+  - Added support for XOR operations in Tamarin as a new built-in, as described in the CSF'2018 paper (https://hal.archives-ouvertes.fr/hal-01780544)
+
+  - Better mirror displays in equivalence mode
+
+  - Numerous bug fixes
+
 * 1.2.3
   - GUI shows warnings on load that previously were only shown on command line
 

diff --git a/src/Main/Console.hs b/src/Main/Console.hs
@@ -78,7 +78,7 @@ versionStr = unlines
     [ programName
     , " "
     , showVersion version
-    , ", (C) David Basin, Cas Cremers, Jannik Dreier, Simon Meier, Ralf Sasse, Benedikt Schmidt, ETH Zurich 2010-2017"
+    , ", (C) David Basin, Cas Cremers, Jannik Dreier, Simon Meier, Ralf Sasse, Benedikt Schmidt, ETH Zurich 2010-2018"
     ]
   , concat
     [ "Git revision: "

diff --git a/src/Web/Handler.hs b/src/Web/Handler.hs
@@ -79,6 +79,7 @@ import           Web.Types
 import           Yesod.Core
 
 import           Control.Monad.Trans.Resource (runResourceT)
+import           Control.Monad.Trans.Unlift
 
 import           Data.Label
 import           Data.Maybe

diff --git a/stack.yaml b/stack.yaml
@@ -5,4 +5,4 @@ packages:
 - lib/term/
 - lib/utils/
 extra-deps: []
-resolver: lts-10.7
+resolver: lts-11.7
diff --git a/tamarin-prover.cabal b/tamarin-prover.cabal
@@ -141,6 +141,7 @@ executable tamarin-prover
       , gitrev
       , http-types
       , lifted-base
+      , monad-unlift
       , mtl
       , parsec
       , process