Merge pull request #370 from ethereum/nixpkgs-bump

flake.nix

@@ -3,7 +3,7 @@
 
   inputs = {
     flake-utils.url = "github:numtide/flake-utils";
-    nixpkgs.url = "github:nixos/nixpkgs/haskell-updates";
+    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
     foundry.url = "github:shazow/foundry.nix/monthly";
     flake-compat = {
       url = "github:edolstra/flake-compat";
@@ -49,7 +49,7 @@
             Cabal-syntax = dontCheck (self.callCabal2nix "Cabal-syntax" "${cabal-head}/Cabal-syntax" {});
             Cabal = dontCheck (self.callCabal2nix "Cabal" "${cabal-head}/Cabal" {});
             unix = dontCheck (doJailbreak super.unix_2_8_1_1);
-            filepath = dontCheck (doJailbreak super.filepath_1_4_100_3);
+            filepath = dontCheck (doJailbreak super.filepath_1_4_100_4);
             process = dontCheck (doJailbreak super.process_1_6_17_0);
             directory = dontCheck (doJailbreak (super.directory_1_3_7_1));
             tasty = dontCheck (doJailbreak super.tasty);

src/EVM.hs

@@ -1258,14 +1258,14 @@ query = assign #result . Just . HandleEffect . Query
 choose :: Choose s -> EVM s ()
 choose = assign #result . Just . HandleEffect . Choose
 
-branch :: Expr EWord -> (Bool -> EVM s ()) -> EVM s ()
+branch :: forall s. Expr EWord -> (Bool -> EVM s ()) -> EVM s ()
 branch cond continue = do
   loc <- codeloc
   pathconds <- use #constraints
   query $ PleaseAskSMT cond pathconds (choosePath loc)
   where
     condSimp = Expr.simplify cond
-    -- choosePath :: CodeLocation -> BranchCondition -> EVM s ()
+    choosePath :: CodeLocation -> BranchCondition -> EVM s ()
     choosePath loc (Case v) = do
       assign #result Nothing
       pushTo #constraints $ if v then Expr.evalProp (condSimp ./= Lit 0) else Expr.evalProp (condSimp .== Lit 0)