[arch-commits] Commit in cryptol/trunk (PKGBUILD ghc9.patch)

[Felix Yan]

    Date: Monday, January 17, 2022 @ 08:18:32
  Author: felixonmars
Revision: 1107489

upgpkg: cryptol 2.12.0-1

Modified:
  cryptol/trunk/PKGBUILD
  cryptol/trunk/ghc9.patch

------------+
 PKGBUILD   |   13 ++++++-------
 ghc9.patch |   32 --------------------------------
 2 files changed, 6 insertions(+), 39 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-01-17 08:14:13 UTC (rev 1107488)
+++ PKGBUILD	2022-01-17 08:18:32 UTC (rev 1107489)
@@ -1,8 +1,8 @@
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
 
 pkgname=cryptol
-pkgver=2.11.0
-pkgrel=122
+pkgver=2.12.0
+pkgrel=1
 pkgdesc="The Language of Cryptography"
 url="https://www.cryptol.net"
 license=("BSD")
@@ -11,19 +11,18 @@
          'haskell-cryptohash-sha1' 'haskell-exceptions' 'haskell-extra' 'haskell-gitrev'
          'haskell-graphscc' 'haskell-heredoc' 'haskell-libbf' 'haskell-memotrie'
          'haskell-monad-control' 'haskell-monadlib' 'haskell-optparse-applicative'
-         'haskell-parameterized-utils' 'haskell-panic' 'haskell-random' 'haskell-sbv'
+         'haskell-parameterized-utils' 'haskell-panic' 'haskell-prettyprinter' 'haskell-sbv'
          'haskell-simple-smt' 'haskell-strict' 'haskell-temporary' 'haskell-tf-random'
          'haskell-transformers-base' 'haskell-what4' 'haskell-ansi-terminal' 'haskell-blaze-html')
-makedepends=('ghc' 'alex' 'happy' 'uusi')
+makedepends=('ghc' 'alex' 'happy')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/GaloisInc/cryptol/archive/$pkgver.tar.gz"
         ghc9.patch)
-sha512sums=('4e8e9dec727c02e76043ee390b91d0a740df747a8f49b2551686ac7db3cc0c94c36e20316b59e7e50e28b838f3f9bf7202095cf6ce683d83fd47826702381649'
-            'cf201d5d633101343399bb43e264e482e9f7e4615512ff658455772add3055d14571954f20ddf2cb2e35704c5638e7d2a3dab494bbb981229c519dcf88867e17')
+sha512sums=('3e7a58de47e5ae1fdc5067b2bcca66c04ee06c71e84f890104b64c59d1cd125667a23f537c3afd0503c059c97f5d168e6afa0df4fdc6c1e9448aae434e616bc8'
+            'f41afa8f65b01aaa5fc92a6433ed09ae85e86f58cb86e64b72de7e6765b32835974cb998305235d5c1ed8ff1112595f61400e16bd2ffd16c578c0c499d02486b')
 
 prepare() {
     cd $pkgname-$pkgver
     patch -p1 -i ../ghc9.patch
-    uusi -u sbv -u what4 $pkgname.cabal
 }
 
 build() {

Modified: ghc9.patch
===================================================================
--- ghc9.patch	2022-01-17 08:14:13 UTC (rev 1107488)
+++ ghc9.patch	2022-01-17 08:18:32 UTC (rev 1107489)
@@ -24,38 +24,6 @@
  src/Cryptol/TypeCheck/Solver/Numeric.hs     |   8 +-
  11 files changed, 138 insertions(+), 191 deletions(-)
 
-diff --git a/cryptol-remote-api/cryptol-remote-api.cabal b/cryptol-remote-api/cryptol-remote-api.cabal
-index f0f75d18e..4cd02c5e6 100644
---- a/cryptol-remote-api/cryptol-remote-api.cabal
-+++ b/cryptol-remote-api/cryptol-remote-api.cabal
-@@ -49,7 +49,7 @@ common deps
-     cryptol              >= 2.9.0,
-     directory,
-     filepath             ^>= 1.4,
--    lens                 >= 4.17 && < 4.20,
-+    lens                 >= 4.17 && < 5.1,
-     mtl                  ^>= 2.2,
-     scientific           ^>= 0.3,
-     text                 ^>= 1.2.3,
-@@ -90,8 +90,7 @@ executable cryptol-remote-api
-     ghc-options: -threaded -rtsopts -with-rtsopts=-xb0x200000000
- 
-   build-depends:
--    cryptol-remote-api,
--    sbv < 8.10
-+    cryptol-remote-api, sbv
- 
-   if os(linux) && flag(static)
-       ld-options:      -static -pthread
-@@ -108,7 +107,7 @@ executable cryptol-eval-server
-   build-depends:
-     cryptol-remote-api,
-     optparse-applicative,
--    sbv < 8.10
-+    sbv
- 
-   if os(linux) && flag(static)
-       ld-options:      -static -pthread
 diff --git a/cryptol.cabal b/cryptol.cabal
 index c140f87dd..b6e31f471 100644
 --- a/cryptol.cabal