bump sbv to 8.6

Woodpile37 · Jul 22, 2020 · d98bfef · d98bfef
1 parent 0cdd9a8
commit d98bfef
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/haskell.nix b/haskell.nix
@@ -13,17 +13,17 @@ in self-hs: super-hs:
       pkgs.haskell.lib.dontCheck
         (self-hs.callPackage x {});
     hevmBinPath = lib.makeBinPath (with pkgs; [bash coreutils git]);
-    sbv_8_4_prepatch = self-hs.callCabal2nix "sbv" (builtins.fetchGit {
+    sbv_8_6_prepatch = self-hs.callCabal2nix "sbv" (builtins.fetchGit {
         url = "https://github.com/LeventErkok/sbv/";
-        rev = "b3facdfc959e0779fb8944743c0ec81e0d214ee3";
+        rev = "80883626faaf3f9cf541ba9b98775d0afd00c07a";
     }) {inherit (pkgs) z3;};
 
   in {
     restless-git = dontCheck (import ./src/restless-git);
     wreq = pkgs.haskell.lib.doJailbreak super-hs.wreq;
 
     # we use a pretty bleeding edge sbv version
-    sbv_8_4 = sbv_8_4_prepatch.overrideAttrs (attrs: {
+    sbv_8_6 = sbv_8_6_prepatch.overrideAttrs (attrs: {
       postPatch = ''
       sed -i -e 's|"z3"|"${pkgs.z3}/bin/z3"|' Data/SBV/Provers/Z3.hs
       sed -i -e 's|"cvc4"|"${pkgs.cvc4}/bin/cvc4"|' Data/SBV/Provers/CVC4.hs'';

diff --git a/src/hevm/default.nix b/src/hevm/default.nix
@@ -5,7 +5,7 @@
 , HUnit, lens, lens-aeson, megaparsec, memory, monad-par, mtl
 , multiset, operational, optparse-generic, process, QuickCheck
 , quickcheck-text, regex-tdfa, restless-git, rosezipper, s-cargot
-, sbv_8_4, scientific, secp256k1, semver-range, stdenv, tasty
+, sbv_8_6, scientific, secp256k1, semver-range, stdenv, tasty
 , tasty-hunit, tasty-quickcheck, temporary, text, text-format, time
 , transformers, tree-view, unordered-containers, vector, vty
 , witherable, wreq
@@ -23,7 +23,7 @@ mkDerivation {
     cryptonite data-dword deepseq directory fgl filepath free
     ghci-pretty haskeline lens lens-aeson megaparsec memory monad-par
     mtl multiset operational optparse-generic process QuickCheck
-    quickcheck-text restless-git rosezipper s-cargot sbv_8_4 scientific
+    quickcheck-text restless-git rosezipper s-cargot sbv_8_6 scientific
     semver-range temporary text text-format time transformers tree-view
     unordered-containers vector vty witherable wreq
   ];
@@ -32,12 +32,12 @@ mkDerivation {
     aeson ansi-wl-pprint async base base16-bytestring base64-bytestring
     binary brick bytestring containers cryptonite data-dword deepseq
     directory filepath free ghci-pretty lens lens-aeson memory mtl
-    optparse-generic process QuickCheck quickcheck-text regex-tdfa sbv_8_4
+    optparse-generic process QuickCheck quickcheck-text regex-tdfa sbv_8_6
     temporary text text-format unordered-containers vector vty
   ];
   testHaskellDepends = [
     base base16-bytestring binary bytestring free ghci-pretty here
-    HUnit lens mtl QuickCheck sbv_8_4 tasty tasty-hunit tasty-quickcheck
+    HUnit lens mtl QuickCheck sbv_8_6 tasty tasty-hunit tasty-quickcheck
     text vector
   ];
   testSystemDepends = [ secp256k1 ];

diff --git a/src/hevm/hevm.cabal b/src/hevm/hevm.cabal
@@ -115,7 +115,7 @@ library
     restless-git                      >= 0.7,
     rosezipper                        >= 0.2,
     s-cargot                          >= 0.1,
-    sbv                               >= 8.4,
+    sbv                               >= 8.6,
     scientific                        >= 0.3,
     semver-range                      >= 0.2,
     temporary                         >= 1.2,
@@ -188,7 +188,7 @@ executable hevm
     process                           >= 1.4,
     quickcheck-text                   >= 0.1,
     regex-tdfa                        >= 1.2,
-    sbv                               >= 8.4,
+    sbv                               >= 8.6,
     temporary                         >= 1.2,
     text                              >= 1.2,
     text-format                       >= 0.3,
@@ -227,4 +227,4 @@ test-suite test
     tasty-quickcheck >= 0.9,
     text >= 1.2,
     vector >= 0.12,
-    sbv >= 8.4
+    sbv >= 8.6