From e9c41586ea57d3fa45046f42a8f639224278adfd Mon Sep 17 00:00:00 2001 From: Valentin Robert Date: Tue, 23 Jan 2024 14:11:02 -0800 Subject: [PATCH 1/2] use file-embed to make TH file embedding more robust Haskell Language Server still struggles a bit with opening projects that are subprojects of larger projects (in the git submodule sense). When opening such projects from within their parent project, the overall project path remains the outermost one, which breaks relative paths of subprojects. The file-embed has a utility to help with such path adjustments. Theoretically, HLS will eventually support "multi-home units", where different files will be compiled under different home folders if they belong to subprojects, but in the meantime, this un-breaks HLS for users that open Cryptol as a subproject of, say, SAW. --- cryptol.cabal | 2 +- src/Cryptol/Prelude.hs | 22 ++++++++++------------ 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/cryptol.cabal b/cryptol.cabal index a663d38b4..77861ce7c 100644 --- a/cryptol.cabal +++ b/cryptol.cabal @@ -58,11 +58,11 @@ library deepseq >= 1.3, directory >= 1.2.2.0, exceptions, + file-embed >= 0.0.16, filepath >= 1.3, gitrev >= 1.0, ghc-prim, GraphSCC >= 1.0.4, - heredoc >= 0.2, language-c99, language-c99-simple, libBF >= 0.6 && < 0.7, diff --git a/src/Cryptol/Prelude.hs b/src/Cryptol/Prelude.hs index 7849ad179..0dc4bf67d 100644 --- a/src/Cryptol/Prelude.hs +++ b/src/Cryptol/Prelude.hs @@ -8,10 +8,9 @@ -- -- Compile the prelude into the executable as a last resort -{-# LANGUAGE Safe #-} {-# LANGUAGE CPP #-} -{-# LANGUAGE QuasiQuotes #-} {-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE TemplateHaskell #-} module Cryptol.Prelude ( preludeContents @@ -23,28 +22,27 @@ module Cryptol.Prelude , cryptolTcContents ) where -import Data.ByteString(ByteString) +import Data.ByteString (ByteString) +import Data.FileEmbed (embedFileRelative) import qualified Data.ByteString.Char8 as B -import Text.Heredoc (there) - preludeContents :: ByteString -preludeContents = B.pack [there|lib/Cryptol.cry|] +preludeContents = $(embedFileRelative "lib/Cryptol.cry") preludeReferenceContents :: ByteString -preludeReferenceContents = B.pack [there|lib/Cryptol/Reference.cry|] +preludeReferenceContents = $(embedFileRelative "lib/Cryptol/Reference.cry") floatContents :: ByteString -floatContents = B.pack [there|lib/Float.cry|] +floatContents = $(embedFileRelative "lib/Float.cry") arrayContents :: ByteString -arrayContents = B.pack [there|lib/Array.cry|] +arrayContents = $(embedFileRelative "lib/Array.cry") suiteBContents :: ByteString -suiteBContents = B.pack [there|lib/SuiteB.cry|] +suiteBContents = $(embedFileRelative "lib/SuiteB.cry") primeECContents :: ByteString -primeECContents = B.pack [there|lib/PrimeEC.cry|] +primeECContents = $(embedFileRelative "lib/PrimeEC.cry") cryptolTcContents :: String -cryptolTcContents = [there|lib/CryptolTC.z3|] +cryptolTcContents = B.unpack $(embedFileRelative "lib/CryptolTC.z3") From be953a621866c7ae42d36637f7c24aa94bef7b50 Mon Sep 17 00:00:00 2001 From: Ryan Scott Date: Wed, 7 Feb 2024 18:29:05 -0500 Subject: [PATCH 2/2] CI: Regenerate cabal.GHC-*.config files --- cabal.GHC-9.2.8.config | 99 ++++++++++++++++++++++-------------------- cabal.GHC-9.4.7.config | 99 ++++++++++++++++++++++-------------------- cabal.GHC-9.6.2.config | 99 ++++++++++++++++++++++-------------------- 3 files changed, 153 insertions(+), 144 deletions(-) diff --git a/cabal.GHC-9.2.8.config b/cabal.GHC-9.2.8.config index 804f0bba6..30808c605 100644 --- a/cabal.GHC-9.2.8.config +++ b/cabal.GHC-9.2.8.config @@ -13,10 +13,10 @@ constraints: any.BoundedChan ==1.0.3.0, QuickCheck -old-random +templatehaskell, any.StateVar ==1.2.2, any.adjunctions ==4.4.2, - any.aeson ==2.2.0.0, + any.aeson ==2.2.1.0, aeson +ordered-keymap, - any.alex ==3.4.0.0, - any.ansi-terminal ==1.0, + any.alex ==3.5.0.0, + any.ansi-terminal ==1.0.2, ansi-terminal -example, any.ansi-terminal-types ==0.11.5, any.ansi-wl-pprint ==1.0.2, @@ -29,7 +29,7 @@ constraints: any.BoundedChan ==1.0.3.0, any.asn1-types ==0.3.4, any.assoc ==1.1, assoc +tagged, - any.async ==2.2.4, + any.async ==2.2.5, async -bench, any.attoparsec ==0.14.4, attoparsec -developer, @@ -37,7 +37,7 @@ constraints: any.BoundedChan ==1.0.3.0, any.base ==4.16.4.0, any.base-compat ==0.12.3, any.base-compat-batteries ==0.12.3, - any.base-orphans ==0.9.0, + any.base-orphans ==0.9.1, any.base64-bytestring ==1.2.1.0, any.basement ==0.0.16, any.bifunctors ==5.6.1, @@ -50,7 +50,9 @@ constraints: any.BoundedChan ==1.0.3.0, any.bitwise ==1.0.0.1, any.blaze-builder ==0.4.2.3, any.blaze-html ==0.9.1.2, - any.blaze-markup ==0.8.2.8, + any.blaze-markup ==0.8.3.0, + any.boring ==0.2.1, + boring +tagged, any.bsb-http-chunked ==0.0.0.4, any.bv-sized ==1.0.5, any.byteorder ==1.0.4, @@ -62,7 +64,7 @@ constraints: any.BoundedChan ==1.0.3.0, cassava -bytestring--lt-0_10_4, any.cereal ==0.5.8.3, cereal -bytestring-builder, - any.chimera ==0.3.3.0, + any.chimera ==0.4.0.0, chimera +representable, any.clock ==0.8.4, clock -llvm, @@ -72,7 +74,7 @@ constraints: any.BoundedChan ==1.0.3.0, comonad +containers +distributive +indexed-traversable, any.concurrent-extra ==0.7.0.12, any.config-value ==0.8.3, - any.constraints ==0.13.4, + any.constraints ==0.14, any.containers ==0.6.5.1, any.contravariant ==1.5.5, contravariant +semigroups +statevar +tagged, @@ -86,7 +88,7 @@ constraints: any.BoundedChan ==1.0.3.0, cryptol +ffi +relocatable -static, cryptol-remote-api -notthreaded -static, cryptol-test-runner -static, - any.crypton ==0.33, + any.crypton ==0.34, 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, @@ -111,6 +113,7 @@ constraints: any.BoundedChan ==1.0.3.0, any.extensible-exceptions ==0.1.1.4, any.extra ==1.7.14, any.fast-logger ==3.2.2, + any.file-embed ==0.0.16.0, any.filelock ==0.1.1.7, any.filepath ==1.4.2.2, any.fingertree ==0.1.5.0, @@ -129,21 +132,20 @@ constraints: any.BoundedChan ==1.0.3.0, 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.9, + any.hsc2hs ==0.68.10, hsc2hs -in-ghc-tree, any.http-date ==0.0.11, - any.http-types ==0.12.3, - any.http2 ==4.1.4, + any.http-types ==0.12.4, + any.http2 ==5.0.1, http2 -devel -h2spec, any.ieee754 ==0.8.0, - any.indexed-traversable ==0.1.2.1, + any.indexed-traversable ==0.1.3, any.indexed-traversable-instances ==0.1.1.2, - any.infinite-list ==0.1, - any.integer-conversion ==0.1, + any.infinite-list ==0.1.1, + any.integer-conversion ==0.1.0.1, any.integer-gmp ==1.1, any.integer-logarithms ==1.0.3.1, integer-logarithms -check-bounds +integer-gmp, @@ -155,17 +157,17 @@ constraints: any.BoundedChan ==1.0.3.0, any.js-chart ==2.9.4.1, any.kan-extensions ==5.2.5, any.language-c99 ==0.2.0, - any.language-c99-simple ==0.2.3, + any.language-c99-simple ==0.3.0, any.language-c99-util ==0.2.0, any.lens ==5.2.3, lens -benchmark-uniplate -dump-splices +inlining -j +test-hunit +test-properties +test-templates +trustworthy, - any.libBF ==0.6.6, + any.libBF ==0.6.7, libBF -system-libbf, any.libffi ==0.2.1, libffi +ghc-bundled-libffi, - any.math-functions ==0.3.4.2, + any.math-functions ==0.3.4.3, math-functions +system-erf +system-expm1, - any.megaparsec ==9.5.0, + any.megaparsec ==9.6.1, megaparsec -dev, any.memory ==0.18.0, memory +support_bytestring +support_deepseq, @@ -178,19 +180,20 @@ constraints: any.BoundedChan ==1.0.3.0, any.mwc-random ==0.15.0.2, any.network ==3.1.4.0, network -devel, - any.network-byte-order ==0.1.6, + any.network-byte-order ==0.1.7, + any.network-control ==0.0.2, any.network-info ==0.2.1, any.network-uri ==2.6.4.2, any.newtype-generics ==0.6.2, any.numtype-dk ==0.5.0.3, any.old-locale ==1.0.0.7, - any.old-time ==1.1.0.3, + any.old-time ==1.1.0.4, any.optparse-applicative ==0.18.1.0, optparse-applicative +process, any.ordered-containers ==0.2.3, any.panic ==0.4.0.1, any.parallel ==3.2.2.0, - any.parameterized-utils ==2.1.7.0, + any.parameterized-utils ==2.1.8.0, parameterized-utils +unsafe-operations, any.parsec ==3.1.15.0, any.parser-combinators ==1.3.0, @@ -202,13 +205,13 @@ constraints: any.BoundedChan ==1.0.3.0, prettyprinter -buildreadme +text, any.prettyprinter-ansi-terminal ==1.1.3, any.prettyprinter-compat-ansi-wl-pprint ==1.0.2, - any.primitive ==0.8.0.0, + any.primitive ==0.9.0.0, any.process ==1.6.16.0, any.profunctors ==5.6.2, - any.psqueues ==0.2.7.3, - any.quickcheck-instances ==0.3.29.1, + any.psqueues ==0.2.8.0, + any.quickcheck-instances ==0.3.30, quickcheck-instances -bytestring-builder, - any.random ==1.2.1.1, + any.random ==1.2.1.2, any.recv ==0.1.0, any.reflection ==2.1.7, reflection -slow +template-haskell, @@ -220,7 +223,7 @@ constraints: any.BoundedChan ==1.0.3.0, any.rts ==1.0.2, any.s-cargot ==0.1.6.0, s-cargot -build-example, - any.safe ==0.3.19, + any.safe ==0.3.21, any.safe-exceptions ==0.1.7.4, any.sbv ==10.2, any.scientific ==0.3.7.0, @@ -239,9 +242,9 @@ constraints: any.BoundedChan ==1.0.3.0, any.simple-sendfile ==0.2.32, simple-sendfile +allow-bsd -fallback, any.simple-smt ==0.9.7, - any.splitmix ==0.1.0.4, + any.splitmix ==0.1.0.5, splitmix -optimised-mixer, - any.statistics ==0.16.2.0, + any.statistics ==0.16.2.1, any.stm ==2.5.0.2, any.streaming-commons ==0.2.2.6, streaming-commons -use-bytestring-builder, @@ -249,10 +252,10 @@ constraints: any.BoundedChan ==1.0.3.0, any.syb ==0.7.2.4, any.tagged ==0.8.8, tagged +deepseq +transformers, - any.tasty ==1.4.3, + any.tasty ==1.5, tasty +unix, - any.tasty-hunit ==0.10.0.3, - any.tasty-quickcheck ==0.10.2, + any.tasty-hunit ==0.10.1, + any.tasty-quickcheck ==0.10.3, any.template-haskell ==2.18.0.0, any.temporary ==1.3, any.terminfo ==0.4.1.5, @@ -265,7 +268,7 @@ constraints: any.BoundedChan ==1.0.3.0, any.text-short ==0.1.5, text-short -asserts, any.tf-random ==0.5, - any.th-abstraction ==0.5.0.0, + any.th-abstraction ==0.6.0.0, any.th-compat ==0.1.4, any.th-lift ==0.8.4, any.th-lift-instances ==0.1.20, @@ -274,7 +277,7 @@ constraints: any.BoundedChan ==1.0.3.0, any.time-compat ==1.9.6.1, time-compat -old-locale, any.time-manager ==0.0.1, - any.tls ==1.8.0, + any.tls ==1.9.0, tls +compat -hans +network, any.tls-session-manager ==0.0.4, any.transformers ==0.5.6.2, @@ -286,36 +289,36 @@ 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.7, + any.unix-compat ==0.7.1, unix-compat -old-time, - any.unix-time ==0.4.10, + any.unix-time ==0.4.12, any.unliftio ==0.2.25.0, any.unliftio-core ==0.2.1.0, - any.unordered-containers ==0.2.19.1, + any.unordered-containers ==0.2.20, unordered-containers -debug, any.utf8-string ==1.0.2, any.uuid ==1.3.15, - any.uuid-types ==1.0.5, + any.uuid-types ==1.0.5.1, any.vault ==0.3.1.5, vault +useghc, - any.vector ==0.13.0.0, + any.vector ==0.13.1.0, vector +boundschecks -internalchecks -unsafechecks -wall, any.vector-algorithms ==0.9.0.1, vector-algorithms +bench +boundschecks -internalchecks -llvm +properties -unsafechecks, any.vector-binary-instances ==0.2.5.2, - any.vector-stream ==0.1.0.0, + any.vector-stream ==0.1.0.1, any.vector-th-unbox ==0.2.2, - any.versions ==5.0.5, + any.versions ==6.0.5, any.void ==0.7.3, void -safe, - any.wai ==3.2.3, - any.wai-extra ==3.1.13.0, + any.wai ==3.2.4, + any.wai-extra ==3.1.14, wai-extra -build-example, any.wai-logger ==2.4.0, - any.warp ==3.3.28, + any.warp ==3.3.31, warp +allow-sendfilefd -network-bytestring -warp-debug +x509, - any.warp-tls ==3.4.1, - any.what4 ==1.5, + any.warp-tls ==3.4.4, + any.what4 ==1.5.1, what4 -drealtestdisable -solvertests -stptestdisable, any.witherable ==0.4.2, any.word8 ==0.1.3, @@ -324,4 +327,4 @@ constraints: any.BoundedChan ==1.0.3.0, 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-08-30T21:35:34Z +index-state: hackage.haskell.org 2024-02-06T22:11:38Z diff --git a/cabal.GHC-9.4.7.config b/cabal.GHC-9.4.7.config index 4bf3c01a7..7880b80ff 100644 --- a/cabal.GHC-9.4.7.config +++ b/cabal.GHC-9.4.7.config @@ -14,10 +14,10 @@ constraints: any.BoundedChan ==1.0.3.0, QuickCheck -old-random +templatehaskell, any.StateVar ==1.2.2, any.adjunctions ==4.4.2, - any.aeson ==2.2.0.0, + any.aeson ==2.2.1.0, aeson +ordered-keymap, - any.alex ==3.4.0.0, - any.ansi-terminal ==1.0, + any.alex ==3.5.0.0, + any.ansi-terminal ==1.0.2, ansi-terminal -example, any.ansi-terminal-types ==0.11.5, any.ansi-wl-pprint ==1.0.2, @@ -30,7 +30,7 @@ constraints: any.BoundedChan ==1.0.3.0, any.asn1-types ==0.3.4, any.assoc ==1.1, assoc +tagged, - any.async ==2.2.4, + any.async ==2.2.5, async -bench, any.attoparsec ==0.14.4, attoparsec -developer, @@ -38,7 +38,7 @@ constraints: any.BoundedChan ==1.0.3.0, any.base ==4.17.2.0, any.base-compat ==0.12.3, any.base-compat-batteries ==0.12.3, - any.base-orphans ==0.9.0, + any.base-orphans ==0.9.1, any.base64-bytestring ==1.2.1.0, any.basement ==0.0.16, any.bifunctors ==5.6.1, @@ -51,7 +51,9 @@ constraints: any.BoundedChan ==1.0.3.0, any.bitwise ==1.0.0.1, any.blaze-builder ==0.4.2.3, any.blaze-html ==0.9.1.2, - any.blaze-markup ==0.8.2.8, + any.blaze-markup ==0.8.3.0, + any.boring ==0.2.1, + boring +tagged, any.bsb-http-chunked ==0.0.0.4, any.bv-sized ==1.0.5, any.byteorder ==1.0.4, @@ -63,7 +65,7 @@ constraints: any.BoundedChan ==1.0.3.0, cassava -bytestring--lt-0_10_4, any.cereal ==0.5.8.3, cereal -bytestring-builder, - any.chimera ==0.3.3.0, + any.chimera ==0.4.0.0, chimera +representable, any.clock ==0.8.4, clock -llvm, @@ -73,7 +75,7 @@ constraints: any.BoundedChan ==1.0.3.0, comonad +containers +distributive +indexed-traversable, any.concurrent-extra ==0.7.0.12, any.config-value ==0.8.3, - any.constraints ==0.13.4, + any.constraints ==0.14, any.containers ==0.6.7, any.contravariant ==1.5.5, contravariant +semigroups +statevar +tagged, @@ -87,7 +89,7 @@ constraints: any.BoundedChan ==1.0.3.0, cryptol +ffi +relocatable -static, cryptol-remote-api -notthreaded -static, cryptol-test-runner -static, - any.crypton ==0.33, + any.crypton ==0.34, 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, @@ -111,6 +113,7 @@ constraints: any.BoundedChan ==1.0.3.0, any.extensible-exceptions ==0.1.1.4, any.extra ==1.7.14, any.fast-logger ==3.2.2, + any.file-embed ==0.0.16.0, any.filelock ==0.1.1.7, any.filepath ==1.4.2.2, any.fingertree ==0.1.5.0, @@ -129,21 +132,20 @@ constraints: any.BoundedChan ==1.0.3.0, 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.9, + any.hsc2hs ==0.68.10, hsc2hs -in-ghc-tree, any.http-date ==0.0.11, - any.http-types ==0.12.3, - any.http2 ==4.1.4, + any.http-types ==0.12.4, + any.http2 ==5.0.1, http2 -devel -h2spec, any.ieee754 ==0.8.0, - any.indexed-traversable ==0.1.2.1, + any.indexed-traversable ==0.1.3, any.indexed-traversable-instances ==0.1.1.2, - any.infinite-list ==0.1, - any.integer-conversion ==0.1, + any.infinite-list ==0.1.1, + any.integer-conversion ==0.1.0.1, any.integer-gmp ==1.1, any.integer-logarithms ==1.0.3.1, integer-logarithms -check-bounds +integer-gmp, @@ -155,17 +157,17 @@ constraints: any.BoundedChan ==1.0.3.0, any.js-chart ==2.9.4.1, any.kan-extensions ==5.2.5, any.language-c99 ==0.2.0, - any.language-c99-simple ==0.2.3, + any.language-c99-simple ==0.3.0, any.language-c99-util ==0.2.0, any.lens ==5.2.3, lens -benchmark-uniplate -dump-splices +inlining -j +test-hunit +test-properties +test-templates +trustworthy, - any.libBF ==0.6.6, + any.libBF ==0.6.7, libBF -system-libbf, any.libffi ==0.2.1, libffi +ghc-bundled-libffi, - any.math-functions ==0.3.4.2, + any.math-functions ==0.3.4.3, math-functions +system-erf +system-expm1, - any.megaparsec ==9.5.0, + any.megaparsec ==9.6.1, megaparsec -dev, any.memory ==0.18.0, memory +support_bytestring +support_deepseq, @@ -178,19 +180,20 @@ constraints: any.BoundedChan ==1.0.3.0, any.mwc-random ==0.15.0.2, any.network ==3.1.4.0, network -devel, - any.network-byte-order ==0.1.6, + any.network-byte-order ==0.1.7, + any.network-control ==0.0.2, any.network-info ==0.2.1, any.network-uri ==2.6.4.2, any.newtype-generics ==0.6.2, any.numtype-dk ==0.5.0.3, any.old-locale ==1.0.0.7, - any.old-time ==1.1.0.3, + any.old-time ==1.1.0.4, any.optparse-applicative ==0.18.1.0, optparse-applicative +process, any.ordered-containers ==0.2.3, any.panic ==0.4.0.1, any.parallel ==3.2.2.0, - any.parameterized-utils ==2.1.7.0, + any.parameterized-utils ==2.1.8.0, parameterized-utils +unsafe-operations, any.parsec ==3.1.16.1, any.parser-combinators ==1.3.0, @@ -202,13 +205,13 @@ constraints: any.BoundedChan ==1.0.3.0, prettyprinter -buildreadme +text, any.prettyprinter-ansi-terminal ==1.1.3, any.prettyprinter-compat-ansi-wl-pprint ==1.0.2, - any.primitive ==0.8.0.0, + any.primitive ==0.9.0.0, any.process ==1.6.17.0, any.profunctors ==5.6.2, - any.psqueues ==0.2.7.3, - any.quickcheck-instances ==0.3.29.1, + any.psqueues ==0.2.8.0, + any.quickcheck-instances ==0.3.30, quickcheck-instances -bytestring-builder, - any.random ==1.2.1.1, + any.random ==1.2.1.2, any.recv ==0.1.0, any.reflection ==2.1.7, reflection -slow +template-haskell, @@ -220,7 +223,7 @@ constraints: any.BoundedChan ==1.0.3.0, any.rts ==1.0.2, any.s-cargot ==0.1.6.0, s-cargot -build-example, - any.safe ==0.3.19, + any.safe ==0.3.21, any.safe-exceptions ==0.1.7.4, any.sbv ==10.2, any.scientific ==0.3.7.0, @@ -239,9 +242,9 @@ constraints: any.BoundedChan ==1.0.3.0, any.simple-sendfile ==0.2.32, simple-sendfile +allow-bsd -fallback, any.simple-smt ==0.9.7, - any.splitmix ==0.1.0.4, + any.splitmix ==0.1.0.5, splitmix -optimised-mixer, - any.statistics ==0.16.2.0, + any.statistics ==0.16.2.1, any.stm ==2.5.1.0, any.streaming-commons ==0.2.2.6, streaming-commons -use-bytestring-builder, @@ -249,10 +252,10 @@ constraints: any.BoundedChan ==1.0.3.0, any.syb ==0.7.2.4, any.tagged ==0.8.8, tagged +deepseq +transformers, - any.tasty ==1.4.3, + any.tasty ==1.5, tasty +unix, - any.tasty-hunit ==0.10.0.3, - any.tasty-quickcheck ==0.10.2, + any.tasty-hunit ==0.10.1, + any.tasty-quickcheck ==0.10.3, any.template-haskell ==2.19.0.0, any.temporary ==1.3, any.terminfo ==0.4.1.5, @@ -265,7 +268,7 @@ constraints: any.BoundedChan ==1.0.3.0, any.text-short ==0.1.5, text-short -asserts, any.tf-random ==0.5, - any.th-abstraction ==0.5.0.0, + any.th-abstraction ==0.6.0.0, any.th-compat ==0.1.4, any.th-lift ==0.8.4, any.th-lift-instances ==0.1.20, @@ -274,7 +277,7 @@ constraints: any.BoundedChan ==1.0.3.0, any.time-compat ==1.9.6.1, time-compat -old-locale, any.time-manager ==0.0.1, - any.tls ==1.8.0, + any.tls ==1.9.0, tls +compat -hans +network, any.tls-session-manager ==0.0.4, any.transformers ==0.5.6.2, @@ -286,36 +289,36 @@ 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.7, + any.unix-compat ==0.7.1, unix-compat -old-time, - any.unix-time ==0.4.10, + any.unix-time ==0.4.12, any.unliftio ==0.2.25.0, any.unliftio-core ==0.2.1.0, - any.unordered-containers ==0.2.19.1, + any.unordered-containers ==0.2.20, unordered-containers -debug, any.utf8-string ==1.0.2, any.uuid ==1.3.15, - any.uuid-types ==1.0.5, + any.uuid-types ==1.0.5.1, any.vault ==0.3.1.5, vault +useghc, - any.vector ==0.13.0.0, + any.vector ==0.13.1.0, vector +boundschecks -internalchecks -unsafechecks -wall, any.vector-algorithms ==0.9.0.1, vector-algorithms +bench +boundschecks -internalchecks -llvm +properties -unsafechecks, any.vector-binary-instances ==0.2.5.2, - any.vector-stream ==0.1.0.0, + any.vector-stream ==0.1.0.1, any.vector-th-unbox ==0.2.2, - any.versions ==5.0.5, + any.versions ==6.0.5, any.void ==0.7.3, void -safe, - any.wai ==3.2.3, - any.wai-extra ==3.1.13.0, + any.wai ==3.2.4, + any.wai-extra ==3.1.14, wai-extra -build-example, any.wai-logger ==2.4.0, - any.warp ==3.3.28, + any.warp ==3.3.31, warp +allow-sendfilefd -network-bytestring -warp-debug +x509, - any.warp-tls ==3.4.1, - any.what4 ==1.5, + any.warp-tls ==3.4.4, + any.what4 ==1.5.1, what4 -drealtestdisable -solvertests -stptestdisable, any.witherable ==0.4.2, any.word8 ==0.1.3, @@ -324,4 +327,4 @@ constraints: any.BoundedChan ==1.0.3.0, 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-08-30T21:35:34Z +index-state: hackage.haskell.org 2024-02-06T22:11:38Z diff --git a/cabal.GHC-9.6.2.config b/cabal.GHC-9.6.2.config index c90622408..bdb764c86 100644 --- a/cabal.GHC-9.6.2.config +++ b/cabal.GHC-9.6.2.config @@ -14,10 +14,10 @@ constraints: any.BoundedChan ==1.0.3.0, QuickCheck -old-random +templatehaskell, any.StateVar ==1.2.2, any.adjunctions ==4.4.2, - any.aeson ==2.2.0.0, + any.aeson ==2.2.1.0, aeson +ordered-keymap, - any.alex ==3.4.0.0, - any.ansi-terminal ==1.0, + any.alex ==3.5.0.0, + any.ansi-terminal ==1.0.2, ansi-terminal -example, any.ansi-terminal-types ==0.11.5, any.ansi-wl-pprint ==1.0.2, @@ -30,7 +30,7 @@ constraints: any.BoundedChan ==1.0.3.0, any.asn1-types ==0.3.4, any.assoc ==1.1, assoc +tagged, - any.async ==2.2.4, + any.async ==2.2.5, async -bench, any.attoparsec ==0.14.4, attoparsec -developer, @@ -38,7 +38,7 @@ constraints: any.BoundedChan ==1.0.3.0, any.base ==4.18.0.0, any.base-compat ==0.12.3, any.base-compat-batteries ==0.12.3, - any.base-orphans ==0.9.0, + any.base-orphans ==0.9.1, any.base64-bytestring ==1.2.1.0, any.basement ==0.0.16, any.bifunctors ==5.6.1, @@ -51,7 +51,9 @@ constraints: any.BoundedChan ==1.0.3.0, any.bitwise ==1.0.0.1, any.blaze-builder ==0.4.2.3, any.blaze-html ==0.9.1.2, - any.blaze-markup ==0.8.2.8, + any.blaze-markup ==0.8.3.0, + any.boring ==0.2.1, + boring +tagged, any.bsb-http-chunked ==0.0.0.4, any.bv-sized ==1.0.5, any.byteorder ==1.0.4, @@ -63,7 +65,7 @@ constraints: any.BoundedChan ==1.0.3.0, cassava -bytestring--lt-0_10_4, any.cereal ==0.5.8.3, cereal -bytestring-builder, - any.chimera ==0.3.3.0, + any.chimera ==0.4.0.0, chimera +representable, any.clock ==0.8.4, clock -llvm, @@ -73,7 +75,7 @@ constraints: any.BoundedChan ==1.0.3.0, comonad +containers +distributive +indexed-traversable, any.concurrent-extra ==0.7.0.12, any.config-value ==0.8.3, - any.constraints ==0.13.4, + any.constraints ==0.14, any.containers ==0.6.7, any.contravariant ==1.5.5, contravariant +semigroups +statevar +tagged, @@ -87,7 +89,7 @@ constraints: any.BoundedChan ==1.0.3.0, cryptol +ffi +relocatable -static, cryptol-remote-api -notthreaded -static, cryptol-test-runner -static, - any.crypton ==0.33, + any.crypton ==0.34, 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, @@ -111,6 +113,7 @@ constraints: any.BoundedChan ==1.0.3.0, any.extensible-exceptions ==0.1.1.4, any.extra ==1.7.14, any.fast-logger ==3.2.2, + any.file-embed ==0.0.16.0, any.filelock ==0.1.1.7, any.filepath ==1.4.100.1, any.fingertree ==0.1.5.0, @@ -127,21 +130,20 @@ constraints: any.BoundedChan ==1.0.3.0, hashtables -bounds-checking -debug -detailed-profiling -portable -sse42 +unsafe-tricks, any.haskeline ==0.8.2.1, 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.9, + any.hsc2hs ==0.68.10, hsc2hs -in-ghc-tree, any.http-date ==0.0.11, - any.http-types ==0.12.3, - any.http2 ==4.1.4, + any.http-types ==0.12.4, + any.http2 ==5.0.1, http2 -devel -h2spec, any.ieee754 ==0.8.0, - any.indexed-traversable ==0.1.2.1, + any.indexed-traversable ==0.1.3, any.indexed-traversable-instances ==0.1.1.2, - any.infinite-list ==0.1, - any.integer-conversion ==0.1, + any.infinite-list ==0.1.1, + any.integer-conversion ==0.1.0.1, any.integer-gmp ==1.1, any.integer-logarithms ==1.0.3.1, integer-logarithms -check-bounds +integer-gmp, @@ -153,17 +155,17 @@ constraints: any.BoundedChan ==1.0.3.0, any.js-chart ==2.9.4.1, any.kan-extensions ==5.2.5, any.language-c99 ==0.2.0, - any.language-c99-simple ==0.2.3, + any.language-c99-simple ==0.3.0, any.language-c99-util ==0.2.0, any.lens ==5.2.3, lens -benchmark-uniplate -dump-splices +inlining -j +test-hunit +test-properties +test-templates +trustworthy, - any.libBF ==0.6.6, + any.libBF ==0.6.7, libBF -system-libbf, any.libffi ==0.2.1, libffi +ghc-bundled-libffi, - any.math-functions ==0.3.4.2, + any.math-functions ==0.3.4.3, math-functions +system-erf +system-expm1, - any.megaparsec ==9.5.0, + any.megaparsec ==9.6.1, megaparsec -dev, any.memory ==0.18.0, memory +support_bytestring +support_deepseq, @@ -176,19 +178,20 @@ constraints: any.BoundedChan ==1.0.3.0, any.mwc-random ==0.15.0.2, any.network ==3.1.4.0, network -devel, - any.network-byte-order ==0.1.6, + any.network-byte-order ==0.1.7, + any.network-control ==0.0.2, any.network-info ==0.2.1, any.network-uri ==2.6.4.2, any.newtype-generics ==0.6.2, any.numtype-dk ==0.5.0.3, any.old-locale ==1.0.0.7, - any.old-time ==1.1.0.3, + any.old-time ==1.1.0.4, any.optparse-applicative ==0.18.1.0, optparse-applicative +process, any.ordered-containers ==0.2.3, any.panic ==0.4.0.1, any.parallel ==3.2.2.0, - any.parameterized-utils ==2.1.7.0, + any.parameterized-utils ==2.1.8.0, parameterized-utils +unsafe-operations, any.parsec ==3.1.16.1, any.parser-combinators ==1.3.0, @@ -200,13 +203,13 @@ constraints: any.BoundedChan ==1.0.3.0, prettyprinter -buildreadme +text, any.prettyprinter-ansi-terminal ==1.1.3, any.prettyprinter-compat-ansi-wl-pprint ==1.0.2, - any.primitive ==0.8.0.0, + any.primitive ==0.9.0.0, any.process ==1.6.17.0, any.profunctors ==5.6.2, - any.psqueues ==0.2.7.3, - any.quickcheck-instances ==0.3.29.1, + any.psqueues ==0.2.8.0, + any.quickcheck-instances ==0.3.30, quickcheck-instances -bytestring-builder, - any.random ==1.2.1.1, + any.random ==1.2.1.2, any.recv ==0.1.0, any.reflection ==2.1.7, reflection -slow +template-haskell, @@ -218,7 +221,7 @@ constraints: any.BoundedChan ==1.0.3.0, any.rts ==1.0.2, any.s-cargot ==0.1.6.0, s-cargot -build-example, - any.safe ==0.3.19, + any.safe ==0.3.21, any.safe-exceptions ==0.1.7.4, any.sbv ==10.2, any.scientific ==0.3.7.0, @@ -237,9 +240,9 @@ constraints: any.BoundedChan ==1.0.3.0, any.simple-sendfile ==0.2.32, simple-sendfile +allow-bsd -fallback, any.simple-smt ==0.9.7, - any.splitmix ==0.1.0.4, + any.splitmix ==0.1.0.5, splitmix -optimised-mixer, - any.statistics ==0.16.2.0, + any.statistics ==0.16.2.1, any.stm ==2.5.1.0, any.streaming-commons ==0.2.2.6, streaming-commons -use-bytestring-builder, @@ -247,10 +250,10 @@ constraints: any.BoundedChan ==1.0.3.0, any.syb ==0.7.2.4, any.tagged ==0.8.8, tagged +deepseq +transformers, - any.tasty ==1.4.3, + any.tasty ==1.5, tasty +unix, - any.tasty-hunit ==0.10.0.3, - any.tasty-quickcheck ==0.10.2, + any.tasty-hunit ==0.10.1, + any.tasty-quickcheck ==0.10.3, any.template-haskell ==2.20.0.0, any.temporary ==1.3, any.terminfo ==0.4.1.6, @@ -263,7 +266,7 @@ constraints: any.BoundedChan ==1.0.3.0, any.text-short ==0.1.5, text-short -asserts, any.tf-random ==0.5, - any.th-abstraction ==0.5.0.0, + any.th-abstraction ==0.6.0.0, any.th-compat ==0.1.4, any.th-lift ==0.8.4, any.th-lift-instances ==0.1.20, @@ -272,7 +275,7 @@ constraints: any.BoundedChan ==1.0.3.0, any.time-compat ==1.9.6.1, time-compat -old-locale, any.time-manager ==0.0.1, - any.tls ==1.8.0, + any.tls ==1.9.0, tls +compat -hans +network, any.tls-session-manager ==0.0.4, any.transformers ==0.6.1.0, @@ -284,36 +287,36 @@ constraints: any.BoundedChan ==1.0.3.0, any.unbounded-delays ==0.1.1.1, any.uniplate ==1.6.13, any.unix ==2.8.1.0, - any.unix-compat ==0.7, + any.unix-compat ==0.7.1, unix-compat -old-time, - any.unix-time ==0.4.10, + any.unix-time ==0.4.12, any.unliftio ==0.2.25.0, any.unliftio-core ==0.2.1.0, - any.unordered-containers ==0.2.19.1, + any.unordered-containers ==0.2.20, unordered-containers -debug, any.utf8-string ==1.0.2, any.uuid ==1.3.15, - any.uuid-types ==1.0.5, + any.uuid-types ==1.0.5.1, any.vault ==0.3.1.5, vault +useghc, - any.vector ==0.13.0.0, + any.vector ==0.13.1.0, vector +boundschecks -internalchecks -unsafechecks -wall, any.vector-algorithms ==0.9.0.1, vector-algorithms +bench +boundschecks -internalchecks -llvm +properties -unsafechecks, any.vector-binary-instances ==0.2.5.2, - any.vector-stream ==0.1.0.0, + any.vector-stream ==0.1.0.1, any.vector-th-unbox ==0.2.2, - any.versions ==5.0.5, + any.versions ==6.0.5, any.void ==0.7.3, void -safe, - any.wai ==3.2.3, - any.wai-extra ==3.1.13.0, + any.wai ==3.2.4, + any.wai-extra ==3.1.14, wai-extra -build-example, any.wai-logger ==2.4.0, - any.warp ==3.3.28, + any.warp ==3.3.31, warp +allow-sendfilefd -network-bytestring -warp-debug +x509, - any.warp-tls ==3.4.1, - any.what4 ==1.5, + any.warp-tls ==3.4.4, + any.what4 ==1.5.1, what4 -drealtestdisable -solvertests -stptestdisable, any.witherable ==0.4.2, any.word8 ==0.1.3, @@ -322,4 +325,4 @@ constraints: any.BoundedChan ==1.0.3.0, 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-08-30T21:35:34Z +index-state: hackage.haskell.org 2024-02-06T22:11:38Z