diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3881f4971..b14461814 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -65,22 +65,22 @@ jobs: fail-fast: false matrix: os: [ubuntu-22.04, macos-12, windows-2019] - ghc-version: ["8.10.7", "9.2.4", "9.4.4"] + ghc-version: ["8.10.7", "9.2.8", "9.4.5"] cabal: [ '3.8.1.0' ] run-tests: [true] exclude: - os: windows-2019 - ghc-version: 9.2.4 + ghc-version: 8.10.7 run-tests: true - os: windows-2019 - ghc-version: 9.4.4 + ghc-version: 9.4.5 run-tests: true include: # We include one job from an older Ubuntu LTS release to increase our # coverage of possible Linux configurations. Since we already run the # tests with the newest LTS release, we won't bother testing this one. - os: ubuntu-20.04 - ghc-version: 8.10.7 + ghc-version: 9.2.8 run-tests: false outputs: test-lib-json: ${{ steps.test-lib.outputs.targets-json }} @@ -218,13 +218,13 @@ jobs: if-no-files-found: error retention-days: ${{ needs.config.outputs.retention-days }} - - if: matrix.ghc-version == '8.10.7' && matrix.run-tests + - if: matrix.ghc-version == '9.2.8' && matrix.run-tests uses: actions/upload-artifact@v2 with: path: dist/bin name: ${{ runner.os }}-dist-bin - - if: matrix.ghc-version == '8.10.7' && matrix.run-tests + - if: matrix.ghc-version == '9.2.8' && matrix.run-tests uses: actions/upload-artifact@v2 with: path: bin @@ -268,7 +268,7 @@ jobs: - uses: haskell/actions/setup@v2 with: - ghc-version: '8.10.7' + ghc-version: '9.2.8' - name: Install dependencies (Windows) uses: msys2/setup-msys2@v2 diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index 58a4294ee..b823423d4 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -19,10 +19,10 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -yq \ RUN curl https://i.jpillora.com/chisel! | bash # Install GHC -ARG GHCVER="8.10.7" +ARG GHCVER="9.2.8" ENV GHCUP_INSTALL_BASE_PREFIX=/opt \ PATH=/opt/.ghcup/bin:$PATH -RUN curl -o /usr/local/bin/ghcup "https://downloads.haskell.org/~ghcup/0.1.17.7/x86_64-linux-ghcup-0.1.17.7" && \ +RUN curl -o /usr/local/bin/ghcup "https://downloads.haskell.org/~ghcup/0.1.19.4/x86_64-linux-ghcup-0.1.19.4" && \ chmod +x /usr/local/bin/ghcup RUN ghcup install cabal --set ENV PATH=/root/.cabal/bin:$PATH diff --git a/Dockerfile b/Dockerfile index 2f547d25e..95b037bd2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,15 +24,15 @@ RUN z3 --version ARG CRYPTOLPATH="/cryptol/.cryptol" ENV LANG=C.UTF-8 \ LC_ALL=C.UTF-8 -COPY cabal.GHC-8.10.7.config cabal.project.freeze +COPY cabal.GHC-9.2.8.config cabal.project.freeze RUN mkdir -p /home/cryptol/.local/bin && \ - curl -L https://downloads.haskell.org/~ghcup/0.1.17.7/x86_64-linux-ghcup-0.1.17.7 -o /home/cryptol/.local/bin/ghcup && \ + curl -L https://downloads.haskell.org/~ghcup/0.1.19.4/x86_64-linux-ghcup-0.1.19.4 -o /home/cryptol/.local/bin/ghcup && \ chmod +x /home/cryptol/.local/bin/ghcup RUN mkdir -p /home/cryptol/.ghcup && \ ghcup --version && \ ghcup install cabal 3.6.2.0 && \ - ghcup install ghc 8.10.7 && \ - ghcup set ghc 8.10.7 + ghcup install ghc 9.2.8 && \ + ghcup set ghc 9.2.8 RUN cabal v2-update && \ cabal v2-build -j cryptol:exe:cryptol && \ cp $(cabal v2-exec which cryptol) rootfs/usr/local/bin && \ diff --git a/README.md b/README.md index ecaf569c9..d682581c6 100644 --- a/README.md +++ b/README.md @@ -82,8 +82,8 @@ Windows. We regularly build and test it in the following environments: ## Prerequisites Cryptol is regularly built and tested with the three most recent -versions of GHC, which at the time of this writing are 8.10.7, 9.2.2, and -9.4.4. The easiest way to install an approporiate version of GHC is +versions of GHC, which at the time of this writing are 8.10.7, 9.2.8, and +9.4.5. The easiest way to install an appropriate version of GHC is with [ghcup](https://www.haskell.org/ghcup/). Some supporting non-Haskell libraries are required to build diff --git a/cabal.GHC-8.10.7.config b/cabal.GHC-8.10.7.config index dc6a3adbc..836e54924 100644 --- a/cabal.GHC-8.10.7.config +++ b/cabal.GHC-8.10.7.config @@ -9,24 +9,26 @@ constraints: any.BoundedChan ==1.0.3.0, MemoTrie -examples, any.OneTuple ==0.3.1, any.Only ==0.1, - any.QuickCheck ==2.14.2, + any.QuickCheck ==2.14.3, QuickCheck -old-random +templatehaskell, any.StateVar ==1.2.2, any.adjunctions ==4.4.2, - any.aeson ==2.1.1.0, + any.aeson ==2.1.2.1, aeson -cffi +ordered-keymap, - any.alex ==3.2.7.1, - any.ansi-terminal ==0.11.4, + any.alex ==3.4.0.0, + any.ansi-terminal ==1.0, ansi-terminal -example, + any.ansi-terminal-types ==0.11.5, any.ansi-wl-pprint ==0.6.9, ansi-wl-pprint -example, any.appar ==0.1.8, - any.arithmoi ==0.12.0.2, + any.arithmoi ==0.12.1.0, any.array ==0.5.4.0, any.asn1-encoding ==0.9.6, any.asn1-parse ==0.9.5, any.asn1-types ==0.3.4, - any.assoc ==1.0.2, + any.assoc ==1.1, + assoc +tagged, any.async ==2.2.4, async -bench, any.attoparsec ==0.14.4, @@ -35,15 +37,15 @@ constraints: any.BoundedChan ==1.0.3.0, any.base ==4.14.3.0, any.base-compat ==0.12.2, any.base-compat-batteries ==0.12.2, - any.base-orphans ==0.8.7, + any.base-orphans ==0.8.8.2, any.base64-bytestring ==1.2.1.0, - any.basement ==0.0.15, - any.bifunctors ==5.5.14, - bifunctors +semigroups +tagged, + any.basement ==0.0.16, + any.bifunctors ==5.6.1, + bifunctors +tagged, any.bimap ==0.5.0, any.binary ==0.8.8.0, - any.binary-orphans ==1.0.3, - any.bitvec ==1.1.3.0, + any.binary-orphans ==1.0.4.1, + any.bitvec ==1.1.4.0, bitvec -libgmp, any.bitwise ==1.0.0.1, any.blaze-builder ==0.4.2.2, @@ -75,42 +77,47 @@ constraints: any.BoundedChan ==1.0.3.0, any.contravariant ==1.5.5, contravariant +semigroups +statevar +tagged, any.cookie ==0.4.6, - any.criterion ==1.6.0.0, + any.criterion ==1.6.1.0, criterion -embed-data-files -fast, - any.criterion-measurement ==0.2.0.0, + any.criterion-measurement ==0.2.1.0, criterion-measurement -fast, any.cryptohash-md5 ==0.11.101.0, any.cryptohash-sha1 ==0.11.101.0, cryptol +ffi +relocatable -static, cryptol-remote-api -notthreaded -static, cryptol-test-runner -static, - any.cryptonite ==0.30, - cryptonite -check_alignment +integer-gmp -old_toolchain_inliner +support_aesni +support_deepseq -support_pclmuldq +support_rdrand -support_sse +use_target_attributes, + any.crypton ==0.33, + crypton -check_alignment +integer-gmp -old_toolchain_inliner +support_aesni +support_deepseq +support_pclmuldq +support_rdrand -support_sse +use_target_attributes, + any.crypton-x509 ==1.7.6, + any.crypton-x509-store ==1.6.9, + any.crypton-x509-validation ==1.6.12, any.data-array-byte ==0.1.0.1, any.data-default-class ==0.1.2.0, any.data-fix ==0.3.2, any.deepseq ==1.4.4.0, any.dense-linear-algebra ==0.1.0.0, - any.deriving-compat ==0.6.2, + any.deriving-compat ==0.6.3, deriving-compat +base-4-9 +new-functor-classes +template-haskell-2-11, any.directory ==1.3.6.0, any.distributive ==0.6.2.1, distributive +semigroups +tagged, any.dlist ==1.0, dlist -werror, - any.easy-file ==0.2.2, + any.easy-file ==0.2.5, any.entropy ==0.4.1.10, entropy -donotgetentropy, any.exact-pi ==0.5.0.2, any.exceptions ==0.10.4, any.extensible-exceptions ==0.1.1.4, - any.extra ==1.7.12, - any.fast-logger ==3.2.0, - any.filelock ==0.1.1.5, + any.extra ==1.7.14, + any.fast-logger ==3.2.2, + any.filelock ==0.1.1.6, any.filepath ==1.4.2.1, any.fingertree ==0.1.5.0, - any.free ==5.1.10, - any.generically ==0.1, + any.foldable1-classes-compat ==0.1, + foldable1-classes-compat +tagged, + any.free ==5.2, + any.generically ==0.1.1, any.ghc-boot-th ==8.10.7, any.ghc-prim ==0.6.1, any.gitrev ==1.3.1, @@ -120,24 +127,25 @@ constraints: any.BoundedChan ==1.0.3.0, any.hashtables ==1.3.1, hashtables -bounds-checking -debug -detailed-profiling -portable -sse42 +unsafe-tricks, any.haskeline ==0.8.2, + any.haskell-lexer ==1.1.1, any.heredoc ==0.2.0.0, any.hgmp ==0.1.2.1, any.hostname ==1.0, any.hourglass ==0.2.12, - any.hsc2hs ==0.68.8, + any.hsc2hs ==0.68.9, hsc2hs -in-ghc-tree, any.http-date ==0.0.11, any.http-types ==0.12.3, - any.http2 ==4.0.0, - http2 -devel -doc -h2spec, + any.http2 ==4.1.4, + http2 -devel -h2spec, any.ieee754 ==0.8.0, - any.indexed-traversable ==0.1.2, - any.indexed-traversable-instances ==0.1.1.1, + any.indexed-traversable ==0.1.2.1, + any.indexed-traversable-instances ==0.1.1.2, any.integer-gmp ==1.0.3.0, any.integer-logarithms ==1.0.3.1, integer-logarithms -check-bounds +integer-gmp, any.integer-roots ==1.0.2.0, - any.invariant ==0.6, + any.invariant ==0.6.1, any.io-streams ==1.5.2.2, io-streams +network -nointeractivetests +zlib, any.iproute ==1.7.12, @@ -146,7 +154,7 @@ constraints: any.BoundedChan ==1.0.3.0, any.language-c99 ==0.2.0, any.language-c99-simple ==0.2.2, any.language-c99-util ==0.2.0, - any.lens ==5.2, + any.lens ==5.2.2, lens -benchmark-uniplate -dump-splices +inlining -j +test-hunit +test-properties +test-templates +trustworthy, any.libBF ==0.6.5.1, libBF -system-libbf, @@ -165,7 +173,7 @@ constraints: any.BoundedChan ==1.0.3.0, any.monadLib ==3.10.1, any.mtl ==2.2.2, any.mwc-random ==0.15.0.2, - any.network ==3.1.2.7, + any.network ==3.1.4.0, network -devel, any.network-byte-order ==0.1.6, any.network-info ==0.2.1, @@ -185,17 +193,18 @@ constraints: any.BoundedChan ==1.0.3.0, parser-combinators -dev, any.pem ==0.2.4, any.pretty ==1.1.3.6, + any.pretty-show ==1.10, any.prettyprinter ==1.7.1, prettyprinter -buildreadme +text, - any.primitive ==0.7.4.0, + any.primitive ==0.8.0.0, any.process ==1.6.13.2, any.profunctors ==5.6.2, any.psqueues ==0.2.7.3, - any.quickcheck-instances ==0.3.28, + any.quickcheck-instances ==0.3.29.1, quickcheck-instances -bytestring-builder, any.random ==1.2.1.1, any.recv ==0.1.0, - any.reflection ==2.1.6, + any.reflection ==2.1.7, reflection -slow +template-haskell, any.regex-base ==0.94.0.2, any.regex-compat ==0.95.2.1, @@ -203,17 +212,17 @@ constraints: any.BoundedChan ==1.0.3.0, regex-posix -_regex-posix-clib, any.resourcet ==1.3.0, any.rts ==1.0.1, - any.s-cargot ==0.1.5.0, + any.s-cargot ==0.1.6.0, s-cargot -build-example, any.safe ==0.3.19, - any.safe-exceptions ==0.1.7.3, + any.safe-exceptions ==0.1.7.4, any.sbv ==9.2, any.scientific ==0.3.7.0, scientific -bytestring-builder -integer-simple, any.scotty ==0.12.1, - any.semialign ==1.2.0.1, + any.semialign ==1.3, semialign +semigroupoids, - any.semigroupoids ==5.3.7, + any.semigroupoids ==6.0.0.1, semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers, any.semigroups ==0.20, semigroups +binary +bytestring -bytestring-builder +containers +deepseq +hashable +tagged +template-haskell +text +transformers +unordered-containers, @@ -221,19 +230,18 @@ constraints: any.BoundedChan ==1.0.3.0, semirings +containers +unordered-containers, any.silently ==1.2.5.3, any.simple-get-opt ==0.4, - any.simple-sendfile ==0.2.30, - simple-sendfile +allow-bsd, + any.simple-sendfile ==0.2.32, + simple-sendfile +allow-bsd -fallback, any.simple-smt ==0.9.7, any.splitmix ==0.1.0.4, splitmix -optimised-mixer, - any.statistics ==0.16.1.2, + any.statistics ==0.16.2.0, any.stm ==2.5.0.1, - any.streaming-commons ==0.2.2.5, + any.streaming-commons ==0.2.2.6, streaming-commons -use-bytestring-builder, - any.strict ==0.4.0.1, - strict +assoc, - any.syb ==0.7.2.2, - any.tagged ==0.8.6.1, + any.strict ==0.5, + any.syb ==0.7.2.3, + any.tagged ==0.8.7, tagged +deepseq +transformers, any.tasty ==1.4.3, tasty +unix, @@ -251,15 +259,14 @@ constraints: any.BoundedChan ==1.0.3.0, text-short -asserts, any.tf-random ==0.5, any.th-abstraction ==0.4.5.0, - any.th-lift ==0.8.2, + any.th-lift ==0.8.3, any.th-lift-instances ==0.1.20, - any.these ==1.1.1.1, - these +assoc, + any.these ==1.2, any.time ==1.9.3, any.time-compat ==1.9.6.1, time-compat -old-locale, any.time-manager ==0.0.0, - any.tls ==1.6.0, + any.tls ==1.7.0, tls +compat -hans +network, any.tls-session-manager ==0.0.4, any.transformers ==0.5.6.2, @@ -271,10 +278,10 @@ constraints: any.BoundedChan ==1.0.3.0, any.unbounded-delays ==0.1.1.1, any.uniplate ==1.6.13, any.unix ==2.7.2.2, - any.unix-compat ==0.6, + any.unix-compat ==0.7, unix-compat -old-time, - any.unix-time ==0.4.8, - any.unliftio ==0.2.23.0, + any.unix-time ==0.4.10, + any.unliftio ==0.2.25.0, any.unliftio-core ==0.2.1.0, any.unordered-containers ==0.2.19.1, unordered-containers -debug, @@ -290,26 +297,23 @@ constraints: any.BoundedChan ==1.0.3.0, any.vector-binary-instances ==0.2.5.2, any.vector-stream ==0.1.0.0, any.vector-th-unbox ==0.2.2, - any.versions ==5.0.4, + any.versions ==5.0.5, any.void ==0.7.3, void -safe, any.wai ==3.2.3, any.wai-extra ==3.1.13.0, wai-extra -build-example, any.wai-logger ==2.4.0, - any.warp ==3.3.24, + any.warp ==3.3.28, warp +allow-sendfilefd -network-bytestring -warp-debug +x509, - any.warp-tls ==3.3.5, + any.warp-tls ==3.4.0, any.what4 ==1.4, what4 -drealtestdisable -solvertests -stptestdisable, any.witherable ==0.4.2, any.word8 ==0.1.3, - any.x509 ==1.7.7, - any.x509-store ==1.6.9, - any.x509-validation ==1.6.12, any.xml ==1.3.14, any.zenc ==0.1.2, any.zlib ==0.6.3.0, zlib -bundled-c-zlib -non-blocking-ffi -pkg-config, any.zlib-bindings ==0.1.1.5 -index-state: hackage.haskell.org 2023-02-13T12:20:33Z +index-state: hackage.haskell.org 2023-07-10T01:00:51Z diff --git a/cabal.GHC-9.2.4.config b/cabal.GHC-9.2.8.config similarity index 78% rename from cabal.GHC-9.2.4.config rename to cabal.GHC-9.2.8.config index 95f60406b..53fff935d 100644 --- a/cabal.GHC-9.2.4.config +++ b/cabal.GHC-9.2.8.config @@ -7,43 +7,45 @@ constraints: any.BoundedChan ==1.0.3.0, any.HUnit ==1.6.2.0, any.MemoTrie ==0.6.10, MemoTrie -examples, - any.OneTuple ==0.3.1, + any.OneTuple ==0.4.1.1, any.Only ==0.1, - any.QuickCheck ==2.14.2, + any.QuickCheck ==2.14.3, QuickCheck -old-random +templatehaskell, any.StateVar ==1.2.2, any.adjunctions ==4.4.2, - any.aeson ==2.1.1.0, + any.aeson ==2.1.2.1, aeson -cffi +ordered-keymap, - any.alex ==3.2.7.1, - any.ansi-terminal ==0.11.4, + any.alex ==3.4.0.0, + any.ansi-terminal ==1.0, ansi-terminal -example, + any.ansi-terminal-types ==0.11.5, any.ansi-wl-pprint ==0.6.9, ansi-wl-pprint -example, any.appar ==0.1.8, - any.arithmoi ==0.12.0.2, + any.arithmoi ==0.12.1.0, any.array ==0.5.4.0, any.asn1-encoding ==0.9.6, any.asn1-parse ==0.9.5, any.asn1-types ==0.3.4, - any.assoc ==1.0.2, + any.assoc ==1.1, + assoc +tagged, any.async ==2.2.4, async -bench, any.attoparsec ==0.14.4, attoparsec -developer, any.auto-update ==0.1.6, - any.base ==4.16.3.0, + any.base ==4.16.4.0, any.base-compat ==0.12.2, any.base-compat-batteries ==0.12.2, - any.base-orphans ==0.8.7, + any.base-orphans ==0.8.8.2, any.base64-bytestring ==1.2.1.0, - any.basement ==0.0.15, - any.bifunctors ==5.5.14, - bifunctors +semigroups +tagged, + any.basement ==0.0.16, + any.bifunctors ==5.6.1, + bifunctors +tagged, any.bimap ==0.5.0, any.binary ==0.8.9.0, - any.binary-orphans ==1.0.3, - any.bitvec ==1.1.3.0, + any.binary-orphans ==1.0.4.1, + any.bitvec ==1.1.4.0, bitvec -libgmp, any.bitwise ==1.0.0.1, any.blaze-builder ==0.4.2.2, @@ -52,7 +54,7 @@ constraints: any.BoundedChan ==1.0.3.0, any.bsb-http-chunked ==0.0.0.4, any.bv-sized ==1.0.5, any.byteorder ==1.0.4, - any.bytestring ==0.11.3.1, + any.bytestring ==0.11.4.0, any.cabal-doctest ==1.0.9, any.call-stack ==0.4.0, any.case-insensitive ==1.2.1.0, @@ -75,44 +77,49 @@ constraints: any.BoundedChan ==1.0.3.0, any.contravariant ==1.5.5, contravariant +semigroups +statevar +tagged, any.cookie ==0.4.6, - any.criterion ==1.6.0.0, + any.criterion ==1.6.1.0, criterion -embed-data-files -fast, - any.criterion-measurement ==0.2.0.0, + any.criterion-measurement ==0.2.1.0, criterion-measurement -fast, any.cryptohash-md5 ==0.11.101.0, any.cryptohash-sha1 ==0.11.101.0, cryptol +ffi +relocatable -static, cryptol-remote-api -notthreaded -static, cryptol-test-runner -static, - any.cryptonite ==0.30, - cryptonite -check_alignment +integer-gmp -old_toolchain_inliner +support_aesni +support_deepseq -support_pclmuldq +support_rdrand -support_sse +use_target_attributes, + any.crypton ==0.33, + crypton -check_alignment +integer-gmp -old_toolchain_inliner +support_aesni +support_deepseq +support_pclmuldq +support_rdrand -support_sse +use_target_attributes, + any.crypton-x509 ==1.7.6, + any.crypton-x509-store ==1.6.9, + any.crypton-x509-validation ==1.6.12, any.data-array-byte ==0.1.0.1, any.data-default-class ==0.1.2.0, any.data-fix ==0.3.2, any.deepseq ==1.4.6.1, any.dense-linear-algebra ==0.1.0.0, - any.deriving-compat ==0.6.2, + any.deriving-compat ==0.6.3, deriving-compat +base-4-9 +new-functor-classes +template-haskell-2-11, any.directory ==1.3.6.2, any.distributive ==0.6.2.1, distributive +semigroups +tagged, any.dlist ==1.0, dlist -werror, - any.easy-file ==0.2.2, + any.easy-file ==0.2.5, any.entropy ==0.4.1.10, entropy -donotgetentropy, any.exact-pi ==0.5.0.2, any.exceptions ==0.10.4, any.extensible-exceptions ==0.1.1.4, - any.extra ==1.7.12, - any.fast-logger ==3.2.0, - any.filelock ==0.1.1.5, + any.extra ==1.7.14, + any.fast-logger ==3.2.2, + any.filelock ==0.1.1.6, any.filepath ==1.4.2.2, any.fingertree ==0.1.5.0, - any.free ==5.1.10, - any.generically ==0.1, + any.foldable1-classes-compat ==0.1, + foldable1-classes-compat +tagged, + any.free ==5.2, + any.generically ==0.1.1, any.ghc-bignum ==1.2, - any.ghc-boot-th ==9.2.4, + any.ghc-boot-th ==9.2.8, any.ghc-prim ==0.8.0, any.gitrev ==1.3.1, any.happy ==1.20.1.1, @@ -121,24 +128,25 @@ constraints: any.BoundedChan ==1.0.3.0, any.hashtables ==1.3.1, hashtables -bounds-checking -debug -detailed-profiling -portable -sse42 +unsafe-tricks, any.haskeline ==0.8.2, + any.haskell-lexer ==1.1.1, any.heredoc ==0.2.0.0, any.hgmp ==0.1.2.1, any.hostname ==1.0, any.hourglass ==0.2.12, - any.hsc2hs ==0.68.8, + any.hsc2hs ==0.68.9, hsc2hs -in-ghc-tree, any.http-date ==0.0.11, any.http-types ==0.12.3, - any.http2 ==4.0.0, - http2 -devel -doc -h2spec, + any.http2 ==4.1.4, + http2 -devel -h2spec, any.ieee754 ==0.8.0, - any.indexed-traversable ==0.1.2, - any.indexed-traversable-instances ==0.1.1.1, + any.indexed-traversable ==0.1.2.1, + any.indexed-traversable-instances ==0.1.1.2, any.integer-gmp ==1.1, any.integer-logarithms ==1.0.3.1, integer-logarithms -check-bounds +integer-gmp, any.integer-roots ==1.0.2.0, - any.invariant ==0.6, + any.invariant ==0.6.1, any.io-streams ==1.5.2.2, io-streams +network -nointeractivetests +zlib, any.iproute ==1.7.12, @@ -147,7 +155,7 @@ constraints: any.BoundedChan ==1.0.3.0, any.language-c99 ==0.2.0, any.language-c99-simple ==0.2.2, any.language-c99-util ==0.2.0, - any.lens ==5.2, + any.lens ==5.2.2, lens -benchmark-uniplate -dump-splices +inlining -j +test-hunit +test-properties +test-templates +trustworthy, any.libBF ==0.6.5.1, libBF -system-libbf, @@ -155,18 +163,18 @@ constraints: any.BoundedChan ==1.0.3.0, libffi +ghc-bundled-libffi, any.math-functions ==0.3.4.2, math-functions +system-erf +system-expm1, - any.megaparsec ==9.3.0, + any.megaparsec ==9.4.1, megaparsec -dev, any.memory ==0.18.0, memory +support_bytestring +support_deepseq, any.microstache ==1.0.2.3, - any.mod ==0.2.0.0, + any.mod ==0.2.0.1, mod +semirings +vector, any.monad-control ==1.0.3.1, any.monadLib ==3.10.1, any.mtl ==2.2.2, any.mwc-random ==0.15.0.2, - any.network ==3.1.2.7, + any.network ==3.1.4.0, network -devel, any.network-byte-order ==0.1.6, any.network-info ==0.2.1, @@ -186,17 +194,18 @@ constraints: any.BoundedChan ==1.0.3.0, parser-combinators -dev, any.pem ==0.2.4, any.pretty ==1.1.3.6, + any.pretty-show ==1.10, any.prettyprinter ==1.7.1, prettyprinter -buildreadme +text, - any.primitive ==0.7.4.0, - any.process ==1.6.13.2, + any.primitive ==0.8.0.0, + any.process ==1.6.16.0, any.profunctors ==5.6.2, any.psqueues ==0.2.7.3, - any.quickcheck-instances ==0.3.28, + any.quickcheck-instances ==0.3.29.1, quickcheck-instances -bytestring-builder, any.random ==1.2.1.1, any.recv ==0.1.0, - any.reflection ==2.1.6, + any.reflection ==2.1.7, reflection -slow +template-haskell, any.regex-base ==0.94.0.2, any.regex-compat ==0.95.2.1, @@ -204,17 +213,17 @@ constraints: any.BoundedChan ==1.0.3.0, regex-posix -_regex-posix-clib, any.resourcet ==1.3.0, any.rts ==1.0.2, - any.s-cargot ==0.1.5.0, + any.s-cargot ==0.1.6.0, s-cargot -build-example, any.safe ==0.3.19, - any.safe-exceptions ==0.1.7.3, - any.sbv ==9.2, + any.safe-exceptions ==0.1.7.4, + any.sbv ==10.2, any.scientific ==0.3.7.0, scientific -bytestring-builder -integer-simple, any.scotty ==0.12.1, - any.semialign ==1.2.0.1, + any.semialign ==1.3, semialign +semigroupoids, - any.semigroupoids ==5.3.7, + any.semigroupoids ==6.0.0.1, semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers, any.semigroups ==0.20, semigroups +binary +bytestring -bytestring-builder +containers +deepseq +hashable +tagged +template-haskell +text +transformers +unordered-containers, @@ -222,19 +231,18 @@ constraints: any.BoundedChan ==1.0.3.0, semirings +containers +unordered-containers, any.silently ==1.2.5.3, any.simple-get-opt ==0.4, - any.simple-sendfile ==0.2.30, - simple-sendfile +allow-bsd, + any.simple-sendfile ==0.2.32, + simple-sendfile +allow-bsd -fallback, any.simple-smt ==0.9.7, any.splitmix ==0.1.0.4, splitmix -optimised-mixer, - any.statistics ==0.16.1.2, + any.statistics ==0.16.2.0, any.stm ==2.5.0.2, - any.streaming-commons ==0.2.2.5, + any.streaming-commons ==0.2.2.6, streaming-commons -use-bytestring-builder, - any.strict ==0.4.0.1, - strict +assoc, - any.syb ==0.7.2.2, - any.tagged ==0.8.6.1, + any.strict ==0.5, + any.syb ==0.7.2.3, + any.tagged ==0.8.7, tagged +deepseq +transformers, any.tasty ==1.4.3, tasty +unix, @@ -252,15 +260,14 @@ constraints: any.BoundedChan ==1.0.3.0, text-short -asserts, any.tf-random ==0.5, any.th-abstraction ==0.4.5.0, - any.th-lift ==0.8.2, + any.th-lift ==0.8.3, any.th-lift-instances ==0.1.20, - any.these ==1.1.1.1, - these +assoc, + any.these ==1.2, any.time ==1.11.1.1, any.time-compat ==1.9.6.1, time-compat -old-locale, any.time-manager ==0.0.0, - any.tls ==1.6.0, + any.tls ==1.7.0, tls +compat -hans +network, any.tls-session-manager ==0.0.4, any.transformers ==0.5.6.2, @@ -272,10 +279,10 @@ constraints: any.BoundedChan ==1.0.3.0, any.unbounded-delays ==0.1.1.1, any.uniplate ==1.6.13, any.unix ==2.7.2.2, - any.unix-compat ==0.6, + any.unix-compat ==0.7, unix-compat -old-time, - any.unix-time ==0.4.8, - any.unliftio ==0.2.23.0, + any.unix-time ==0.4.10, + any.unliftio ==0.2.25.0, any.unliftio-core ==0.2.1.0, any.unordered-containers ==0.2.19.1, unordered-containers -debug, @@ -291,26 +298,23 @@ constraints: any.BoundedChan ==1.0.3.0, any.vector-binary-instances ==0.2.5.2, any.vector-stream ==0.1.0.0, any.vector-th-unbox ==0.2.2, - any.versions ==5.0.4, + any.versions ==5.0.5, any.void ==0.7.3, void -safe, any.wai ==3.2.3, any.wai-extra ==3.1.13.0, wai-extra -build-example, any.wai-logger ==2.4.0, - any.warp ==3.3.24, + any.warp ==3.3.28, warp +allow-sendfilefd -network-bytestring -warp-debug +x509, - any.warp-tls ==3.3.5, + any.warp-tls ==3.4.0, any.what4 ==1.4, what4 -drealtestdisable -solvertests -stptestdisable, any.witherable ==0.4.2, any.word8 ==0.1.3, - any.x509 ==1.7.7, - any.x509-store ==1.6.9, - any.x509-validation ==1.6.12, any.xml ==1.3.14, any.zenc ==0.1.2, any.zlib ==0.6.3.0, zlib -bundled-c-zlib -non-blocking-ffi -pkg-config, any.zlib-bindings ==0.1.1.5 -index-state: hackage.haskell.org 2023-02-13T12:20:33Z +index-state: hackage.haskell.org 2023-07-10T01:00:51Z diff --git a/cabal.GHC-9.4.4.config b/cabal.GHC-9.4.5.config similarity index 77% rename from cabal.GHC-9.4.4.config rename to cabal.GHC-9.4.5.config index a8b341b6b..892553ac4 100644 --- a/cabal.GHC-9.4.4.config +++ b/cabal.GHC-9.4.5.config @@ -8,43 +8,45 @@ constraints: any.BoundedChan ==1.0.3.0, any.HUnit ==1.6.2.0, any.MemoTrie ==0.6.10, MemoTrie -examples, - any.OneTuple ==0.3.1, + any.OneTuple ==0.4.1.1, any.Only ==0.1, - any.QuickCheck ==2.14.2, + any.QuickCheck ==2.14.3, QuickCheck -old-random +templatehaskell, any.StateVar ==1.2.2, any.adjunctions ==4.4.2, - any.aeson ==2.1.1.0, + any.aeson ==2.1.2.1, aeson -cffi +ordered-keymap, - any.alex ==3.2.7.1, - any.ansi-terminal ==0.11.4, + any.alex ==3.4.0.0, + any.ansi-terminal ==1.0, ansi-terminal -example, + any.ansi-terminal-types ==0.11.5, any.ansi-wl-pprint ==0.6.9, ansi-wl-pprint -example, any.appar ==0.1.8, - any.arithmoi ==0.12.0.2, + any.arithmoi ==0.12.1.0, any.array ==0.5.4.0, any.asn1-encoding ==0.9.6, any.asn1-parse ==0.9.5, any.asn1-types ==0.3.4, - any.assoc ==1.0.2, + any.assoc ==1.1, + assoc +tagged, any.async ==2.2.4, async -bench, any.attoparsec ==0.14.4, attoparsec -developer, any.auto-update ==0.1.6, - any.base ==4.17.0.0, + any.base ==4.17.1.0, any.base-compat ==0.12.2, any.base-compat-batteries ==0.12.2, - any.base-orphans ==0.8.7, + any.base-orphans ==0.8.8.2, any.base64-bytestring ==1.2.1.0, - any.basement ==0.0.15, - any.bifunctors ==5.5.14, - bifunctors +semigroups +tagged, + any.basement ==0.0.16, + any.bifunctors ==5.6.1, + bifunctors +tagged, any.bimap ==0.5.0, any.binary ==0.8.9.1, - any.binary-orphans ==1.0.3, - any.bitvec ==1.1.3.0, + any.binary-orphans ==1.0.4.1, + any.bitvec ==1.1.4.0, bitvec -libgmp, any.bitwise ==1.0.0.1, any.blaze-builder ==0.4.2.2, @@ -53,7 +55,7 @@ constraints: any.BoundedChan ==1.0.3.0, any.bsb-http-chunked ==0.0.0.4, any.bv-sized ==1.0.5, any.byteorder ==1.0.4, - any.bytestring ==0.11.3.1, + any.bytestring ==0.11.4.0, any.cabal-doctest ==1.0.9, any.call-stack ==0.4.0, any.case-insensitive ==1.2.1.0, @@ -72,47 +74,52 @@ constraints: any.BoundedChan ==1.0.3.0, any.concurrent-extra ==0.7.0.12, any.config-value ==0.8.3, any.constraints ==0.13.4, - any.containers ==0.6.6, + any.containers ==0.6.7, any.contravariant ==1.5.5, contravariant +semigroups +statevar +tagged, any.cookie ==0.4.6, - any.criterion ==1.6.0.0, + any.criterion ==1.6.1.0, criterion -embed-data-files -fast, - any.criterion-measurement ==0.2.0.0, + any.criterion-measurement ==0.2.1.0, criterion-measurement -fast, any.cryptohash-md5 ==0.11.101.0, any.cryptohash-sha1 ==0.11.101.0, cryptol +ffi +relocatable -static, cryptol-remote-api -notthreaded -static, cryptol-test-runner -static, - any.cryptonite ==0.30, - cryptonite -check_alignment +integer-gmp -old_toolchain_inliner +support_aesni +support_deepseq -support_pclmuldq +support_rdrand -support_sse +use_target_attributes, + any.crypton ==0.33, + crypton -check_alignment +integer-gmp -old_toolchain_inliner +support_aesni +support_deepseq +support_pclmuldq +support_rdrand -support_sse +use_target_attributes, + any.crypton-x509 ==1.7.6, + any.crypton-x509-store ==1.6.9, + any.crypton-x509-validation ==1.6.12, any.data-default-class ==0.1.2.0, any.data-fix ==0.3.2, any.deepseq ==1.4.8.0, any.dense-linear-algebra ==0.1.0.0, - any.deriving-compat ==0.6.2, + any.deriving-compat ==0.6.3, deriving-compat +base-4-9 +new-functor-classes +template-haskell-2-11, any.directory ==1.3.7.1, any.distributive ==0.6.2.1, distributive +semigroups +tagged, any.dlist ==1.0, dlist -werror, - any.easy-file ==0.2.2, + any.easy-file ==0.2.5, any.entropy ==0.4.1.10, entropy -donotgetentropy, any.exact-pi ==0.5.0.2, any.exceptions ==0.10.5, any.extensible-exceptions ==0.1.1.4, - any.extra ==1.7.12, - any.fast-logger ==3.2.0, - any.filelock ==0.1.1.5, + any.extra ==1.7.14, + any.fast-logger ==3.2.2, + any.filelock ==0.1.1.6, any.filepath ==1.4.2.2, any.fingertree ==0.1.5.0, - any.free ==5.1.10, - any.generically ==0.1, + any.foldable1-classes-compat ==0.1, + foldable1-classes-compat +tagged, + any.free ==5.2, + any.generically ==0.1.1, any.ghc-bignum ==1.3, - any.ghc-boot-th ==9.4.4, + any.ghc-boot-th ==9.4.5, any.ghc-prim ==0.9.0, any.gitrev ==1.3.1, any.happy ==1.20.1.1, @@ -121,24 +128,25 @@ constraints: any.BoundedChan ==1.0.3.0, any.hashtables ==1.3.1, hashtables -bounds-checking -debug -detailed-profiling -portable -sse42 +unsafe-tricks, any.haskeline ==0.8.2, + any.haskell-lexer ==1.1.1, any.heredoc ==0.2.0.0, any.hgmp ==0.1.2.1, any.hostname ==1.0, any.hourglass ==0.2.12, - any.hsc2hs ==0.68.8, + any.hsc2hs ==0.68.9, hsc2hs -in-ghc-tree, any.http-date ==0.0.11, any.http-types ==0.12.3, - any.http2 ==4.0.0, - http2 -devel -doc -h2spec, + any.http2 ==4.1.4, + http2 -devel -h2spec, any.ieee754 ==0.8.0, - any.indexed-traversable ==0.1.2, - any.indexed-traversable-instances ==0.1.1.1, + any.indexed-traversable ==0.1.2.1, + any.indexed-traversable-instances ==0.1.1.2, any.integer-gmp ==1.1, any.integer-logarithms ==1.0.3.1, integer-logarithms -check-bounds +integer-gmp, - any.integer-roots ==1.0.1.0, - any.invariant ==0.6, + any.integer-roots ==1.0.2.0, + any.invariant ==0.6.1, any.io-streams ==1.5.2.2, io-streams +network -nointeractivetests +zlib, any.iproute ==1.7.12, @@ -147,7 +155,7 @@ constraints: any.BoundedChan ==1.0.3.0, any.language-c99 ==0.2.0, any.language-c99-simple ==0.2.2, any.language-c99-util ==0.2.0, - any.lens ==5.2, + any.lens ==5.2.2, lens -benchmark-uniplate -dump-splices +inlining -j +test-hunit +test-properties +test-templates +trustworthy, any.libBF ==0.6.5.1, libBF -system-libbf, @@ -155,18 +163,18 @@ constraints: any.BoundedChan ==1.0.3.0, libffi +ghc-bundled-libffi, any.math-functions ==0.3.4.2, math-functions +system-erf +system-expm1, - any.megaparsec ==9.3.0, + any.megaparsec ==9.4.1, megaparsec -dev, any.memory ==0.18.0, memory +support_bytestring +support_deepseq, any.microstache ==1.0.2.3, - any.mod ==0.2.0.0, + any.mod ==0.2.0.1, mod +semirings +vector, any.monad-control ==1.0.3.1, any.monadLib ==3.10.1, any.mtl ==2.2.2, any.mwc-random ==0.15.0.2, - any.network ==3.1.2.7, + any.network ==3.1.4.0, network -devel, any.network-byte-order ==0.1.6, any.network-info ==0.2.1, @@ -181,22 +189,23 @@ constraints: any.BoundedChan ==1.0.3.0, any.parallel ==3.2.2.0, any.parameterized-utils ==2.1.6.0, parameterized-utils +unsafe-operations, - any.parsec ==3.1.15.0, + any.parsec ==3.1.16.1, any.parser-combinators ==1.3.0, parser-combinators -dev, any.pem ==0.2.4, any.pretty ==1.1.3.6, + any.pretty-show ==1.10, any.prettyprinter ==1.7.1, prettyprinter -buildreadme +text, - any.primitive ==0.7.4.0, + any.primitive ==0.8.0.0, any.process ==1.6.16.0, any.profunctors ==5.6.2, any.psqueues ==0.2.7.3, - any.quickcheck-instances ==0.3.28, + any.quickcheck-instances ==0.3.29.1, quickcheck-instances -bytestring-builder, any.random ==1.2.1.1, any.recv ==0.1.0, - any.reflection ==2.1.6, + any.reflection ==2.1.7, reflection -slow +template-haskell, any.regex-base ==0.94.0.2, any.regex-compat ==0.95.2.1, @@ -204,17 +213,17 @@ constraints: any.BoundedChan ==1.0.3.0, regex-posix -_regex-posix-clib, any.resourcet ==1.3.0, any.rts ==1.0.2, - any.s-cargot ==0.1.5.0, + any.s-cargot ==0.1.6.0, s-cargot -build-example, any.safe ==0.3.19, - any.safe-exceptions ==0.1.7.3, - any.sbv ==9.2, + any.safe-exceptions ==0.1.7.4, + any.sbv ==10.2, any.scientific ==0.3.7.0, scientific -bytestring-builder -integer-simple, any.scotty ==0.12.1, - any.semialign ==1.2.0.1, + any.semialign ==1.3, semialign +semigroupoids, - any.semigroupoids ==5.3.7, + any.semigroupoids ==6.0.0.1, semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers, any.semigroups ==0.20, semigroups +binary +bytestring -bytestring-builder +containers +deepseq +hashable +tagged +template-haskell +text +transformers +unordered-containers, @@ -222,19 +231,18 @@ constraints: any.BoundedChan ==1.0.3.0, semirings +containers +unordered-containers, any.silently ==1.2.5.3, any.simple-get-opt ==0.4, - any.simple-sendfile ==0.2.30, - simple-sendfile +allow-bsd, + any.simple-sendfile ==0.2.32, + simple-sendfile +allow-bsd -fallback, any.simple-smt ==0.9.7, any.splitmix ==0.1.0.4, splitmix -optimised-mixer, - any.statistics ==0.16.1.2, + any.statistics ==0.16.2.0, any.stm ==2.5.1.0, - any.streaming-commons ==0.2.2.5, + any.streaming-commons ==0.2.2.6, streaming-commons -use-bytestring-builder, - any.strict ==0.4.0.1, - strict +assoc, - any.syb ==0.7.2.2, - any.tagged ==0.8.6.1, + any.strict ==0.5, + any.syb ==0.7.2.3, + any.tagged ==0.8.7, tagged +deepseq +transformers, any.tasty ==1.4.3, tasty +unix, @@ -247,20 +255,19 @@ constraints: any.BoundedChan ==1.0.3.0, any.test-framework-hunit ==0.3.0.2, test-framework-hunit -base3 +base4, any.test-lib ==0.4, - any.text ==2.0.1, + any.text ==2.0.2, any.text-short ==0.1.5, text-short -asserts, any.tf-random ==0.5, any.th-abstraction ==0.4.5.0, - any.th-lift ==0.8.2, + any.th-lift ==0.8.3, any.th-lift-instances ==0.1.20, - any.these ==1.1.1.1, - these +assoc, + any.these ==1.2, any.time ==1.12.2, any.time-compat ==1.9.6.1, time-compat -old-locale, any.time-manager ==0.0.0, - any.tls ==1.6.0, + any.tls ==1.7.0, tls +compat -hans +network, any.tls-session-manager ==0.0.4, any.transformers ==0.5.6.2, @@ -272,10 +279,10 @@ constraints: any.BoundedChan ==1.0.3.0, any.unbounded-delays ==0.1.1.1, any.uniplate ==1.6.13, any.unix ==2.7.3, - any.unix-compat ==0.6, + any.unix-compat ==0.7, unix-compat -old-time, - any.unix-time ==0.4.8, - any.unliftio ==0.2.23.0, + any.unix-time ==0.4.10, + any.unliftio ==0.2.25.0, any.unliftio-core ==0.2.1.0, any.unordered-containers ==0.2.19.1, unordered-containers -debug, @@ -291,26 +298,23 @@ constraints: any.BoundedChan ==1.0.3.0, any.vector-binary-instances ==0.2.5.2, any.vector-stream ==0.1.0.0, any.vector-th-unbox ==0.2.2, - any.versions ==5.0.4, + any.versions ==5.0.5, any.void ==0.7.3, void -safe, any.wai ==3.2.3, any.wai-extra ==3.1.13.0, wai-extra -build-example, any.wai-logger ==2.4.0, - any.warp ==3.3.24, + any.warp ==3.3.28, warp +allow-sendfilefd -network-bytestring -warp-debug +x509, - any.warp-tls ==3.3.5, + any.warp-tls ==3.4.0, any.what4 ==1.4, what4 -drealtestdisable -solvertests -stptestdisable, any.witherable ==0.4.2, any.word8 ==0.1.3, - any.x509 ==1.7.7, - any.x509-store ==1.6.9, - any.x509-validation ==1.6.12, any.xml ==1.3.14, any.zenc ==0.1.2, any.zlib ==0.6.3.0, zlib -bundled-c-zlib -non-blocking-ffi -pkg-config, any.zlib-bindings ==0.1.1.5 -index-state: hackage.haskell.org 2023-02-13T12:20:33Z +index-state: hackage.haskell.org 2023-07-10T01:00:51Z diff --git a/cryptol-remote-api/Dockerfile b/cryptol-remote-api/Dockerfile index d3d72530c..612c0d7c6 100644 --- a/cryptol-remote-api/Dockerfile +++ b/cryptol-remote-api/Dockerfile @@ -1,4 +1,4 @@ -ARG GHCVER="8.10.7" +ARG GHCVER="9.2.8" ARG GHCVER_BOOTSTRAP="8.10.2" FROM ubuntu:22.04 AS toolchain ARG PORTABILITY=false @@ -12,9 +12,11 @@ RUN apt-get update && \ $(if ${PORTABILITY}; then echo git autoconf python3 libnuma-dev; fi) \ # Miscellaneous unzip +ENV LANG=C.UTF-8 \ + LC_ALL=C.UTF-8 ENV GHCUP_INSTALL_BASE_PREFIX=/opt \ PATH=/opt/.ghcup/bin:$PATH -RUN curl -o /usr/local/bin/ghcup "https://downloads.haskell.org/~ghcup/0.1.17.7/x86_64-linux-ghcup-0.1.17.7" && \ +RUN curl -o /usr/local/bin/ghcup "https://downloads.haskell.org/~ghcup/0.1.19.4/x86_64-linux-ghcup-0.1.19.4" && \ chmod +x /usr/local/bin/ghcup RUN ghcup install cabal --set ENV PATH=/root/.cabal/bin:$PATH @@ -25,7 +27,7 @@ RUN if ${PORTABILITY}; then \ ghcup install ghc ${GHCVER_BOOTSTRAP} && \ ghcup set ghc ${GHCVER_BOOTSTRAP} && \ cabal v2-update && \ - cabal v2-install alex happy-1.19.12 && \ + cabal v2-install alex happy-1.20.1.1 && \ git clone --recurse-submodules --depth 1 --branch ghc-${GHCVER}-release https://gitlab.haskell.org/ghc/ghc.git && \ cd ./ghc && \ git apply ../ghc-portability.patch && \ diff --git a/cryptol-remote-api/ghc-portability.patch b/cryptol-remote-api/ghc-portability.patch index 285bf7e71..5b315d57f 100644 --- a/cryptol-remote-api/ghc-portability.patch +++ b/cryptol-remote-api/ghc-portability.patch @@ -1,8 +1,8 @@ diff --git a/configure.ac b/configure.ac -index 6eac557b93..fd87983730 100644 +index 31dd8a89b2..03835037fc 100644 --- a/configure.ac +++ b/configure.ac -@@ -922,7 +922,7 @@ dnl off_t, because it will affect the result of that test. +@@ -943,7 +943,7 @@ dnl off_t, because it will affect the result of that test. AC_SYS_LARGEFILE dnl ** check for specific header (.h) files that we are interested in @@ -11,9 +11,9 @@ index 6eac557b93..fd87983730 100644 dnl sys/cpuset.h needs sys/param.h to be included first on FreeBSD 9.1; #7708 AC_CHECK_HEADERS([sys/cpuset.h], [], [], -@@ -1230,10 +1230,6 @@ AC_LINK_IFELSE([ - AC_MSG_RESULT(no) - ) +@@ -1166,10 +1166,6 @@ AC_LINK_IFELSE([AC_LANG_CALL([], [printf\$LDBLStub])], + + FP_CHECK_PTHREADS -dnl ** check for eventfd which is needed by the I/O manager -AC_CHECK_HEADERS([sys/eventfd.h]) @@ -23,7 +23,7 @@ index 6eac557b93..fd87983730 100644 AC_MSG_CHECKING(for __thread support) AC_COMPILE_IFELSE( diff --git a/libraries/base/configure.ac b/libraries/base/configure.ac -index 716e46cc05..694bf6aa81 100644 +index 68295563af..2d7683c27b 100644 --- a/libraries/base/configure.ac +++ b/libraries/base/configure.ac @@ -23,7 +23,7 @@ AC_MSG_RESULT($WINDOWS) @@ -35,12 +35,12 @@ index 716e46cc05..694bf6aa81 100644 # Enable large file support. Do this before testing the types ino_t, off_t, and # rlim_t, because it will affect the result of that test. -@@ -40,7 +40,7 @@ AC_CHECK_FUNCS([clock_gettime]) - AC_CHECK_FUNCS([getclock getrusage times]) - AC_CHECK_FUNCS([_chsize ftruncate]) - +@@ -46,7 +46,7 @@ AC_CHECK_FUNCS([_chsize ftruncate]) + # to keep kqueue/poll in line with HAVE_EPOLL and possible other additions in the future. You + # should be aware of this peculiarity if you try to simulate not having kqueue or poll by + # moving away header files (see also https://gitlab.haskell.org/ghc/ghc/-/issues/9283) -AC_CHECK_FUNCS([epoll_ctl eventfd kevent kevent64 kqueue poll]) +AC_CHECK_FUNCS([epoll_ctl kevent kevent64 kqueue poll]) - # event-related fun - + if test "$ac_cv_header_sys_epoll_h" = yes && test "$ac_cv_func_epoll_ctl" = yes; then + AC_DEFINE([HAVE_EPOLL], [1], [Define if you have epoll support.]) diff --git a/cryptol.cabal b/cryptol.cabal index 2afb16d20..a67de891b 100644 --- a/cryptol.cabal +++ b/cryptol.cabal @@ -74,7 +74,7 @@ library prettyprinter >= 1.7.0, pretty-show, process >= 1.2, - sbv >= 9.1 && < 10.2, + sbv >= 9.1 && < 10.3, simple-smt >= 0.9.7, stm >= 2.4, strict,