diff --git a/cabal.ghc8107.project b/cabal.ghc8107.project index 6feb966..d321ca5 100644 --- a/cabal.ghc8107.project +++ b/cabal.ghc8107.project @@ -26,11 +26,6 @@ source-repository-package location: https://github.com/hasufell/uri-bytestring.git tag: 4fb5ed14b500c192e6e7a97f6b2b1eb478806001 -source-repository-package - type: git - location: https://github.com/hasufell/versions.git - tag: 79e18fbc44fae3064d8957c550cc0229465db320 - package libarchive flags: -system-libarchive @@ -49,7 +44,7 @@ package streamly package * test-show-details: direct -allow-newer: cabal-install-parsers:tar +allow-newer: cabal-install-parsers:tar, streamly:Win32 with-compiler: ghc-8.10.7 diff --git a/cabal.ghc8107.project.freeze b/cabal.ghc8107.project.freeze index 5bcf068..f442b3d 100644 --- a/cabal.ghc8107.project.freeze +++ b/cabal.ghc8107.project.freeze @@ -1,6 +1,5 @@ active-repositories: hackage.haskell.org:merge -constraints: any.Cabal ==3.6.3.0, - Cabal -bundled-binary-generic, +constraints: any.Cabal ==3.10.2.1, any.Cabal-syntax ==3.10.2.0, any.HUnit ==1.6.2.0, any.HsOpenSSL ==0.11.7.6, @@ -11,8 +10,8 @@ constraints: any.Cabal ==3.6.3.0, any.StateVar ==1.2.2, any.abstract-deque ==0.3, abstract-deque -usecas, - any.aeson ==2.1.2.1, - aeson -cffi +ordered-keymap, + any.aeson ==2.2.1.0, + aeson +ordered-keymap, any.aeson-pretty ==0.8.10, aeson-pretty +lib-only, any.alex ==3.5.0.0, @@ -26,31 +25,30 @@ constraints: any.Cabal ==3.6.3.0, assoc +tagged, any.async ==2.2.5, async -bench, - any.atomic-primops ==0.8.4, + any.atomic-primops ==0.8.5, atomic-primops -debug, any.attoparsec ==0.14.4, attoparsec -developer, any.base ==4.14.3.0, any.base-compat ==0.13.1, - any.base-compat-batteries ==0.13.1, any.base-orphans ==0.9.1, any.base16-bytestring ==1.0.2.0, any.base64-bytestring ==1.2.1.0, any.bifunctors ==5.6.1, bifunctors +tagged, any.bimap ==0.5.0, - any.binary ==0.8.8.0, + any.binary ==0.8.9.1, any.binary-instances ==1.0.4, any.binary-orphans ==1.0.4.1, any.blaze-builder ==0.4.2.3, any.brick ==2.1.1, brick -demos, - any.bytestring ==0.10.12.0, + any.bytestring ==0.11.5.3, any.bz2 ==1.0.1.0, bz2 -cross +with-bzlib, any.c2hs ==0.28.8, c2hs +base3 -regression, - any.cabal-install-parsers ==0.6.1, + any.cabal-install-parsers ==0.6.1.1, any.cabal-plan ==0.7.3.0, cabal-plan -_ -exe -license-report, any.call-stack ==0.4.0, @@ -78,7 +76,7 @@ constraints: any.Cabal ==3.6.3.0, any.data-clist ==0.2, any.data-fix ==0.3.2, any.deepseq ==1.4.4.0, - any.directory ==1.3.6.0, + any.directory ==1.3.8.1, any.disk-free-space ==0.1.0.1, any.distributive ==0.6.2.1, distributive +semigroups +tagged, @@ -86,7 +84,8 @@ constraints: any.Cabal ==3.6.3.0, dlist -werror, any.exceptions ==0.10.4, any.file-uri ==0.1.0.0, - any.filepath ==1.4.2.1, + any.filepath ==1.4.300.1, + filepath -cpphs, any.foldable1-classes-compat ==0.1, foldable1-classes-compat +tagged, any.free ==5.2, @@ -111,17 +110,18 @@ constraints: any.Cabal ==3.6.3.0, any.hspec-discover ==2.10.10, any.hspec-expectations ==0.8.2, any.hspec-golden-aeson ==0.9.0.0, - any.http-io-streams ==0.1.6.3, + any.http-io-streams ==0.1.7.0, http-io-streams -brotli +fast-xor, any.indexed-profunctors ==0.1.1.1, any.indexed-traversable ==0.1.3, any.indexed-traversable-instances ==0.1.1.2, + any.integer-conversion ==0.1.0.1, any.integer-gmp ==1.0.3.0, any.integer-logarithms ==1.0.3.1, integer-logarithms -check-bounds +integer-gmp, any.io-streams ==1.5.2.2, io-streams +network -nointeractivetests +zlib, - any.language-c ==0.9.2, + any.language-c ==0.9.3, language-c -allwarnings +iecfpextension +usebytestrings, any.libarchive ==3.0.4.2, libarchive -cross -low-memory +no-exe -system-libarchive, @@ -159,11 +159,11 @@ constraints: any.Cabal ==3.6.3.0, any.pretty ==1.1.3.6, any.pretty-terminal ==0.1.0.0, any.primitive ==0.8.0.0, - any.process ==1.6.13.2, + any.process ==1.6.18.0, any.profunctors ==5.6.2, any.quickcheck-arbitrary-adt ==0.3.1.0, any.quickcheck-io ==0.2.0, - any.random ==1.2.1.1, + any.random ==1.2.1.2, any.recursion-schemes ==5.2.2.5, recursion-schemes +template-haskell, any.regex-base ==0.94.0.2, @@ -205,11 +205,12 @@ constraints: any.Cabal ==3.6.3.0, any.text ==2.0.2, text -developer +simdutf, any.text-binary ==0.2.1.1, + any.text-iso8601 ==0.1, any.text-short ==0.1.5, text-short -asserts, any.text-zipper ==0.13, 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, @@ -224,7 +225,8 @@ constraints: any.Cabal ==3.6.3.0, transformers-compat -five +five-three -four +generic-deriving +mtl -three -two, any.unicode-data ==0.3.1, unicode-data -ucd2haskell, - any.unix ==2.7.2.2, + any.unix ==2.8.5.0, + unix -os-string, any.unix-bytestring ==0.3.7.8, any.unix-compat ==0.7.1, unix-compat -old-time, @@ -239,11 +241,11 @@ constraints: any.Cabal ==3.6.3.0, vector +boundschecks -internalchecks -unsafechecks -wall, any.vector-binary-instances ==0.2.5.2, any.vector-stream ==0.1.0.1, - any.versions ==6.0.4, - any.vty ==6.0, - any.vty-crossplatform ==0.2.0.0, + any.versions ==6.0.5, + any.vty ==6.2, + any.vty-crossplatform ==0.4.0.0, vty-crossplatform -demos, - any.vty-unix ==0.1.0.0, + any.vty-unix ==0.2.0.0, any.witherable ==0.4.2, any.word-wrap ==0.5, any.word8 ==0.1.3, @@ -253,4 +255,4 @@ constraints: any.Cabal ==3.6.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 2024-01-19T19:48:54Z +index-state: hackage.haskell.org 2024-02-18T14:07:35Z diff --git a/cabal.ghc902.project b/cabal.ghc902.project index 1c2b4ec..f39a862 100644 --- a/cabal.ghc902.project +++ b/cabal.ghc902.project @@ -26,11 +26,6 @@ source-repository-package location: https://github.com/hasufell/uri-bytestring.git tag: 4fb5ed14b500c192e6e7a97f6b2b1eb478806001 -source-repository-package - type: git - location: https://github.com/hasufell/versions.git - tag: 79e18fbc44fae3064d8957c550cc0229465db320 - package libarchive flags: -system-libarchive @@ -49,7 +44,7 @@ package streamly package * test-show-details: direct -allow-newer: cabal-install-parsers:tar +allow-newer: cabal-install-parsers:tar, streamly:Win32 with-compiler: ghc-9.0.2 diff --git a/cabal.ghc902.project.freeze b/cabal.ghc902.project.freeze index 4aeab76..1438786 100644 --- a/cabal.ghc902.project.freeze +++ b/cabal.ghc902.project.freeze @@ -1,6 +1,5 @@ active-repositories: hackage.haskell.org:merge -constraints: any.Cabal ==3.6.3.0, - Cabal -bundled-binary-generic, +constraints: any.Cabal ==3.10.2.1, any.Cabal-syntax ==3.10.2.0, any.HUnit ==1.6.2.0, any.HsOpenSSL ==0.11.7.6, @@ -11,8 +10,8 @@ constraints: any.Cabal ==3.6.3.0, any.StateVar ==1.2.2, any.abstract-deque ==0.3, abstract-deque -usecas, - any.aeson ==2.1.2.1, - aeson -cffi +ordered-keymap, + any.aeson ==2.2.1.0, + aeson +ordered-keymap, any.aeson-pretty ==0.8.10, aeson-pretty +lib-only, any.alex ==3.5.0.0, @@ -26,20 +25,19 @@ constraints: any.Cabal ==3.6.3.0, assoc +tagged, any.async ==2.2.5, async -bench, - any.atomic-primops ==0.8.4, + any.atomic-primops ==0.8.5, atomic-primops -debug, any.attoparsec ==0.14.4, attoparsec -developer, any.base ==4.15.1.0, any.base-compat ==0.13.1, - any.base-compat-batteries ==0.13.1, any.base-orphans ==0.9.1, any.base16-bytestring ==1.0.2.0, any.base64-bytestring ==1.2.1.0, any.bifunctors ==5.6.1, bifunctors +tagged, any.bimap ==0.5.0, - any.binary ==0.8.8.0, + any.binary ==0.8.9.1, any.binary-instances ==1.0.4, any.binary-orphans ==1.0.4.1, any.bindings-DSL ==1.0.25, @@ -48,13 +46,13 @@ constraints: any.Cabal ==3.6.3.0, any.blaze-builder ==0.4.2.3, any.brick ==2.1.1, brick -demos, - any.bytestring ==0.10.12.1, + any.bytestring ==0.11.5.3, any.bz2 ==1.0.1.0, bz2 -cross +with-bzlib, any.bzlib-conduit ==0.3.0.2, any.c2hs ==0.28.8, c2hs +base3 -regression, - any.cabal-install-parsers ==0.6.1, + any.cabal-install-parsers ==0.6.1.1, any.cabal-plan ==0.7.3.0, cabal-plan -_ -exe -license-report, any.call-stack ==0.4.0, @@ -81,9 +79,9 @@ constraints: any.Cabal ==3.6.3.0, any.data-default-class ==0.1.2.0, any.data-fix ==0.3.2, any.deepseq ==1.4.5.0, - any.digest ==0.0.2.0, + any.digest ==0.0.2.1, digest -have_arm64_crc32c -have_builtin_prefetch -have_mm_prefetch -have_sse42 -have_strong_getauxval -have_weak_getauxval +pkg-config, - any.directory ==1.3.6.2, + any.directory ==1.3.8.1, any.disk-free-space ==0.1.0.1, any.distributive ==0.6.2.1, distributive +semigroups +tagged, @@ -91,7 +89,8 @@ constraints: any.Cabal ==3.6.3.0, dlist -werror, any.exceptions ==0.10.4, any.file-uri ==0.1.0.0, - any.filepath ==1.4.2.1, + any.filepath ==1.4.300.1, + filepath -cpphs, any.foldable1-classes-compat ==0.1, foldable1-classes-compat +tagged, any.free ==5.2, @@ -117,16 +116,17 @@ constraints: any.Cabal ==3.6.3.0, any.hspec-discover ==2.10.10, any.hspec-expectations ==0.8.2, any.hspec-golden-aeson ==0.9.0.0, - any.http-io-streams ==0.1.6.3, + any.http-io-streams ==0.1.7.0, http-io-streams -brotli +fast-xor, any.indexed-profunctors ==0.1.1.1, any.indexed-traversable ==0.1.3, any.indexed-traversable-instances ==0.1.1.2, + any.integer-conversion ==0.1.0.1, any.integer-logarithms ==1.0.3.1, integer-logarithms -check-bounds +integer-gmp, any.io-streams ==1.5.2.2, io-streams +network -nointeractivetests +zlib, - any.language-c ==0.9.2, + any.language-c ==0.9.3, language-c -allwarnings +iecfpextension +usebytestrings, any.libyaml-streamly ==0.2.2, libyaml-streamly -no-unicode -system-libyaml, @@ -163,11 +163,11 @@ constraints: any.Cabal ==3.6.3.0, any.pretty ==1.1.3.6, any.pretty-terminal ==0.1.0.0, any.primitive ==0.8.0.0, - any.process ==1.6.13.2, + any.process ==1.6.18.0, any.profunctors ==5.6.2, any.quickcheck-arbitrary-adt ==0.3.1.0, any.quickcheck-io ==0.2.0, - any.random ==1.2.1.1, + any.random ==1.2.1.2, any.recursion-schemes ==5.2.2.5, recursion-schemes +template-haskell, any.regex-base ==0.94.0.2, @@ -211,11 +211,12 @@ constraints: any.Cabal ==3.6.3.0, any.text ==2.0.2, text -developer +simdutf, any.text-binary ==0.2.1.1, + any.text-iso8601 ==0.1, any.text-short ==0.1.5, text-short -asserts, any.text-zipper ==0.13, 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, @@ -231,7 +232,8 @@ constraints: any.Cabal ==3.6.3.0, any.typed-process ==0.2.11.1, any.unicode-data ==0.3.1, unicode-data -ucd2haskell, - any.unix ==2.7.2.2, + any.unix ==2.8.5.0, + unix -os-string, any.unix-bytestring ==0.3.7.8, any.unix-compat ==0.7.1, unix-compat -old-time, @@ -248,11 +250,11 @@ constraints: any.Cabal ==3.6.3.0, vector-algorithms +bench +boundschecks -internalchecks -llvm +properties -unsafechecks, any.vector-binary-instances ==0.2.5.2, any.vector-stream ==0.1.0.1, - any.versions ==6.0.4, - any.vty ==6.0, - any.vty-crossplatform ==0.2.0.0, + any.versions ==6.0.5, + any.vty ==6.2, + any.vty-crossplatform ==0.4.0.0, vty-crossplatform -demos, - any.vty-unix ==0.1.0.0, + any.vty-unix ==0.2.0.0, any.witherable ==0.4.2, any.word-wrap ==0.5, any.word8 ==0.1.3, @@ -266,4 +268,4 @@ constraints: any.Cabal ==3.6.3.0, any.zlib-bindings ==0.1.1.5, any.zstd ==0.1.3.0, zstd +standalone -index-state: hackage.haskell.org 2024-01-19T19:48:54Z +index-state: hackage.haskell.org 2024-02-18T14:07:35Z diff --git a/cabal.ghc928.project b/cabal.ghc928.project index ad6097a..98875dd 100644 --- a/cabal.ghc928.project +++ b/cabal.ghc928.project @@ -26,11 +26,6 @@ source-repository-package location: https://github.com/hasufell/uri-bytestring.git tag: 4fb5ed14b500c192e6e7a97f6b2b1eb478806001 -source-repository-package - type: git - location: https://github.com/hasufell/versions.git - tag: 79e18fbc44fae3064d8957c550cc0229465db320 - package libarchive flags: -system-libarchive @@ -49,7 +44,7 @@ package streamly package * test-show-details: direct -allow-newer: cabal-install-parsers:tar +allow-newer: cabal-install-parsers:tar, streamly:Win32 with-compiler: ghc-9.2.8 diff --git a/cabal.ghc928.project.freeze b/cabal.ghc928.project.freeze index 5064957..0451994 100644 --- a/cabal.ghc928.project.freeze +++ b/cabal.ghc928.project.freeze @@ -1,6 +1,5 @@ active-repositories: hackage.haskell.org:merge -constraints: any.Cabal ==3.6.3.0, - Cabal -bundled-binary-generic, +constraints: any.Cabal ==3.10.2.1, any.Cabal-syntax ==3.10.2.0, any.HUnit ==1.6.2.0, any.HsOpenSSL ==0.11.7.6, @@ -11,8 +10,8 @@ constraints: any.Cabal ==3.6.3.0, any.StateVar ==1.2.2, any.abstract-deque ==0.3, abstract-deque -usecas, - any.aeson ==2.1.2.1, - aeson -cffi +ordered-keymap, + any.aeson ==2.2.1.0, + aeson +ordered-keymap, any.aeson-pretty ==0.8.10, aeson-pretty +lib-only, any.alex ==3.5.0.0, @@ -26,13 +25,12 @@ constraints: any.Cabal ==3.6.3.0, assoc +tagged, any.async ==2.2.5, async -bench, - any.atomic-primops ==0.8.4, + any.atomic-primops ==0.8.5, atomic-primops -debug, any.attoparsec ==0.14.4, attoparsec -developer, any.base ==4.16.4.0, any.base-compat ==0.13.1, - any.base-compat-batteries ==0.13.1, any.base-orphans ==0.9.1, any.base16-bytestring ==1.0.2.0, any.base64-bytestring ==1.2.1.0, @@ -54,7 +52,7 @@ constraints: any.Cabal ==3.6.3.0, any.bzlib-conduit ==0.3.0.2, any.c2hs ==0.28.8, c2hs +base3 -regression, - any.cabal-install-parsers ==0.6.1, + any.cabal-install-parsers ==0.6.1.1, any.cabal-plan ==0.7.3.0, cabal-plan -_ -exe -license-report, any.call-stack ==0.4.0, @@ -81,9 +79,9 @@ constraints: any.Cabal ==3.6.3.0, any.data-default-class ==0.1.2.0, any.data-fix ==0.3.2, any.deepseq ==1.4.6.1, - any.digest ==0.0.2.0, + any.digest ==0.0.2.1, digest -have_arm64_crc32c -have_builtin_prefetch -have_mm_prefetch -have_sse42 -have_strong_getauxval -have_weak_getauxval +pkg-config, - any.directory ==1.3.6.2, + any.directory ==1.3.7.1, any.disk-free-space ==0.1.0.1, any.distributive ==0.6.2.1, distributive +semigroups +tagged, @@ -91,7 +89,8 @@ constraints: any.Cabal ==3.6.3.0, dlist -werror, any.exceptions ==0.10.4, any.file-uri ==0.1.0.0, - any.filepath ==1.4.2.2, + any.filepath ==1.4.300.1, + filepath -cpphs, any.foldable1-classes-compat ==0.1, foldable1-classes-compat +tagged, any.free ==5.2, @@ -117,16 +116,17 @@ constraints: any.Cabal ==3.6.3.0, any.hspec-discover ==2.10.10, any.hspec-expectations ==0.8.2, any.hspec-golden-aeson ==0.9.0.0, - any.http-io-streams ==0.1.6.3, + any.http-io-streams ==0.1.7.0, http-io-streams -brotli +fast-xor, any.indexed-profunctors ==0.1.1.1, any.indexed-traversable ==0.1.3, any.indexed-traversable-instances ==0.1.1.2, + any.integer-conversion ==0.1.0.1, any.integer-logarithms ==1.0.3.1, integer-logarithms -check-bounds +integer-gmp, any.io-streams ==1.5.2.2, io-streams +network -nointeractivetests +zlib, - any.language-c ==0.9.2, + any.language-c ==0.9.3, language-c -allwarnings +iecfpextension +usebytestrings, any.libyaml-streamly ==0.2.2, libyaml-streamly -no-unicode -system-libyaml, @@ -163,11 +163,11 @@ constraints: any.Cabal ==3.6.3.0, any.pretty ==1.1.3.6, any.pretty-terminal ==0.1.0.0, any.primitive ==0.8.0.0, - any.process ==1.6.16.0, + any.process ==1.6.18.0, any.profunctors ==5.6.2, any.quickcheck-arbitrary-adt ==0.3.1.0, any.quickcheck-io ==0.2.0, - any.random ==1.2.1.1, + any.random ==1.2.1.2, any.recursion-schemes ==5.2.2.5, recursion-schemes +template-haskell, any.regex-base ==0.94.0.2, @@ -211,11 +211,12 @@ constraints: any.Cabal ==3.6.3.0, any.text ==2.0.2, text -developer +simdutf, any.text-binary ==0.2.1.1, + any.text-iso8601 ==0.1, any.text-short ==0.1.5, text-short -asserts, any.text-zipper ==0.13, 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, @@ -248,11 +249,11 @@ constraints: any.Cabal ==3.6.3.0, vector-algorithms +bench +boundschecks -internalchecks -llvm +properties -unsafechecks, any.vector-binary-instances ==0.2.5.2, any.vector-stream ==0.1.0.1, - any.versions ==6.0.4, - any.vty ==6.0, - any.vty-crossplatform ==0.2.0.0, + any.versions ==6.0.5, + any.vty ==6.2, + any.vty-crossplatform ==0.4.0.0, vty-crossplatform -demos, - any.vty-unix ==0.1.0.0, + any.vty-unix ==0.2.0.0, any.witherable ==0.4.2, any.word-wrap ==0.5, any.word8 ==0.1.3, @@ -266,4 +267,4 @@ constraints: any.Cabal ==3.6.3.0, any.zlib-bindings ==0.1.1.5, any.zstd ==0.1.3.0, zstd +standalone -index-state: hackage.haskell.org 2024-01-19T19:48:54Z +index-state: hackage.haskell.org 2024-02-18T14:07:35Z diff --git a/cabal.ghc948.project b/cabal.ghc948.project index e78003b..92fbbd8 100644 --- a/cabal.ghc948.project +++ b/cabal.ghc948.project @@ -26,11 +26,6 @@ source-repository-package location: https://github.com/hasufell/uri-bytestring.git tag: 4fb5ed14b500c192e6e7a97f6b2b1eb478806001 -source-repository-package - type: git - location: https://github.com/hasufell/versions.git - tag: 79e18fbc44fae3064d8957c550cc0229465db320 - package libarchive flags: -system-libarchive @@ -49,7 +44,7 @@ package streamly package * test-show-details: direct -allow-newer: cabal-install-parsers:tar +allow-newer: cabal-install-parsers:tar, streamly:Win32 with-compiler: ghc-9.4.8 diff --git a/cabal.ghc948.project.freeze b/cabal.ghc948.project.freeze index 04d576c..35f856e 100644 --- a/cabal.ghc948.project.freeze +++ b/cabal.ghc948.project.freeze @@ -1,7 +1,6 @@ active-repositories: hackage.haskell.org:merge -constraints: any.Cabal ==3.6.3.0 || ==3.8.1.0, - Cabal -bundled-binary-generic, - any.Cabal-syntax ==3.8.1.0 || ==3.10.2.0, +constraints: any.Cabal ==3.10.2.1, + any.Cabal-syntax ==3.10.2.0, any.HUnit ==1.6.2.0, any.HsOpenSSL ==0.11.7.6, HsOpenSSL -fast-bignum -homebrew-openssl -macports-openssl -use-pkg-config, @@ -11,8 +10,8 @@ constraints: any.Cabal ==3.6.3.0 || ==3.8.1.0, any.StateVar ==1.2.2, any.abstract-deque ==0.3, abstract-deque -usecas, - any.aeson ==2.1.2.1, - aeson -cffi +ordered-keymap, + any.aeson ==2.2.1.0, + aeson +ordered-keymap, any.aeson-pretty ==0.8.10, aeson-pretty +lib-only, any.alex ==3.5.0.0, @@ -26,13 +25,12 @@ constraints: any.Cabal ==3.6.3.0 || ==3.8.1.0, assoc +tagged, any.async ==2.2.5, async -bench, - any.atomic-primops ==0.8.4, + any.atomic-primops ==0.8.5, atomic-primops -debug, any.attoparsec ==0.14.4, attoparsec -developer, any.base ==4.17.2.1, any.base-compat ==0.13.1, - any.base-compat-batteries ==0.13.1, any.base-orphans ==0.9.1, any.base16-bytestring ==1.0.2.0, any.base64-bytestring ==1.2.1.0, @@ -54,7 +52,7 @@ constraints: any.Cabal ==3.6.3.0 || ==3.8.1.0, any.bzlib-conduit ==0.3.0.2, any.c2hs ==0.28.8, c2hs +base3 -regression, - any.cabal-install-parsers ==0.6.1, + any.cabal-install-parsers ==0.6.1.1, any.cabal-plan ==0.7.3.0, cabal-plan -_ -exe -license-report, any.call-stack ==0.4.0, @@ -80,9 +78,9 @@ constraints: any.Cabal ==3.6.3.0 || ==3.8.1.0, any.data-default-class ==0.1.2.0, any.data-fix ==0.3.2, any.deepseq ==1.4.8.0, - any.digest ==0.0.2.0, + any.digest ==0.0.2.1, digest -have_arm64_crc32c -have_builtin_prefetch -have_mm_prefetch -have_sse42 -have_strong_getauxval -have_weak_getauxval +pkg-config, - any.directory ==1.3.7.1, + any.directory ==1.3.8.1, any.disk-free-space ==0.1.0.1, any.distributive ==0.6.2.1, distributive +semigroups +tagged, @@ -90,7 +88,8 @@ constraints: any.Cabal ==3.6.3.0 || ==3.8.1.0, dlist -werror, any.exceptions ==0.10.5, any.file-uri ==0.1.0.0, - any.filepath ==1.4.2.2, + any.filepath ==1.4.300.1, + filepath -cpphs, any.foldable1-classes-compat ==0.1, foldable1-classes-compat +tagged, any.free ==5.2, @@ -116,16 +115,17 @@ constraints: any.Cabal ==3.6.3.0 || ==3.8.1.0, any.hspec-discover ==2.10.10, any.hspec-expectations ==0.8.2, any.hspec-golden-aeson ==0.9.0.0, - any.http-io-streams ==0.1.6.3, + any.http-io-streams ==0.1.7.0, http-io-streams -brotli +fast-xor, any.indexed-profunctors ==0.1.1.1, any.indexed-traversable ==0.1.3, any.indexed-traversable-instances ==0.1.1.2, + any.integer-conversion ==0.1.0.1, any.integer-logarithms ==1.0.3.1, integer-logarithms -check-bounds +integer-gmp, any.io-streams ==1.5.2.2, io-streams +network -nointeractivetests +zlib, - any.language-c ==0.9.2, + any.language-c ==0.9.3, language-c -allwarnings +iecfpextension +usebytestrings, any.libyaml-streamly ==0.2.2, libyaml-streamly -no-unicode -system-libyaml, @@ -166,7 +166,7 @@ constraints: any.Cabal ==3.6.3.0 || ==3.8.1.0, any.profunctors ==5.6.2, any.quickcheck-arbitrary-adt ==0.3.1.0, any.quickcheck-io ==0.2.0, - any.random ==1.2.1.1, + any.random ==1.2.1.2, any.recursion-schemes ==5.2.2.5, recursion-schemes +template-haskell, any.regex-base ==0.94.0.2, @@ -209,16 +209,17 @@ constraints: any.Cabal ==3.6.3.0 || ==3.8.1.0, any.terminfo ==0.4.1.5, any.text ==2.0.2, any.text-binary ==0.2.1.1, + any.text-iso8601 ==0.1, any.text-short ==0.1.5, text-short -asserts, any.text-zipper ==0.13, 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, any.these ==1.2, - any.time ==1.11.1.2 || ==1.12.2, + any.time ==1.11.1.2, any.time-compat ==1.9.6.1, time-compat -old-locale, any.transformers ==0.5.6.2, @@ -229,7 +230,8 @@ constraints: any.Cabal ==3.6.3.0 || ==3.8.1.0, any.typed-process ==0.2.11.1, any.unicode-data ==0.3.1, unicode-data -ucd2haskell, - any.unix ==2.7.3, + any.unix ==2.8.5.0, + unix -os-string, any.unix-bytestring ==0.3.7.8, any.unix-compat ==0.7.1, unix-compat -old-time, @@ -246,11 +248,11 @@ constraints: any.Cabal ==3.6.3.0 || ==3.8.1.0, vector-algorithms +bench +boundschecks -internalchecks -llvm +properties -unsafechecks, any.vector-binary-instances ==0.2.5.2, any.vector-stream ==0.1.0.1, - any.versions ==6.0.4, - any.vty ==6.0, - any.vty-crossplatform ==0.2.0.0, + any.versions ==6.0.5, + any.vty ==6.2, + any.vty-crossplatform ==0.4.0.0, vty-crossplatform -demos, - any.vty-unix ==0.1.0.0, + any.vty-unix ==0.2.0.0, any.witherable ==0.4.2, any.word-wrap ==0.5, any.word8 ==0.1.3, @@ -264,4 +266,4 @@ constraints: any.Cabal ==3.6.3.0 || ==3.8.1.0, any.zlib-bindings ==0.1.1.5, any.zstd ==0.1.3.0, zstd +standalone -index-state: hackage.haskell.org 2024-01-19T19:48:54Z +index-state: hackage.haskell.org 2024-02-18T14:07:35Z diff --git a/cabal.project b/cabal.project index 37aae73..80baa72 100644 --- a/cabal.project +++ b/cabal.project @@ -26,11 +26,6 @@ source-repository-package location: https://github.com/hasufell/uri-bytestring.git tag: 4fb5ed14b500c192e6e7a97f6b2b1eb478806001 -source-repository-package - type: git - location: https://github.com/hasufell/versions.git - tag: 79e18fbc44fae3064d8957c550cc0229465db320 - package libarchive flags: -system-libarchive @@ -49,5 +44,5 @@ package streamly package * test-show-details: direct -allow-newer: cabal-install-parsers:tar +allow-newer: cabal-install-parsers:tar, streamly:Win32 diff --git a/cabal.project.freeze b/cabal.project.freeze deleted file mode 100644 index d80b08b..0000000 --- a/cabal.project.freeze +++ /dev/null @@ -1,2 +0,0 @@ --- windows picks weird version -constraints: any.hsc2hs ==0.68.8 diff --git a/cabal.project.release b/cabal.project.release index 9506038..1e909a3 100644 --- a/cabal.project.release +++ b/cabal.project.release @@ -29,7 +29,9 @@ elif os(freebsd) constraints: http-io-streams -brotli, any.aeson >= 2.0.1.0, - any.hsc2hs ==0.68.8 + any.hsc2hs ==0.68.8, + directory >= 1.3.8.3, + filepath == 1.4.101.0 || == 1.4.300.1 || >= 1.5.2.0 package libarchive flags: -system-libarchive @@ -56,10 +58,5 @@ source-repository-package location: https://github.com/hasufell/uri-bytestring.git tag: 4fb5ed14b500c192e6e7a97f6b2b1eb478806001 -source-repository-package - type: git - location: https://github.com/hasufell/versions.git - tag: 79e18fbc44fae3064d8957c550cc0229465db320 - -allow-newer: cabal-install-parsers:tar +allow-newer: cabal-install-parsers:tar, streamly:Win32 diff --git a/ghcup.cabal b/ghcup.cabal index 3230d56..986f690 100644 --- a/ghcup.cabal +++ b/ghcup.cabal @@ -43,7 +43,7 @@ flag tui description: Build the brick powered tui (ghcup tui). - default: False + default: True manual: True flag internal-downloader @@ -75,7 +75,7 @@ common app-common-depends , containers ^>=0.6 , deepseq ^>=1.4 , directory ^>=1.3.6.0 - , filepath ^>=1.4.2.1 + , filepath >=1.4.101.0 , haskus-utils-types ^>=1.5 , haskus-utils-variant ^>=3.3 , megaparsec >=8.0.0 && <9.3 @@ -96,7 +96,7 @@ common app-common-depends , uri-bytestring ^>=0.3.2.2 , utf8-string ^>=1.0 , vector >=0.12 && <0.14 - , versions >=6.0.3 && <6.1 + , versions >=6.0.5 && <6.1 , yaml-streamly ^>=0.12.0 if flag(tar) @@ -175,7 +175,7 @@ library , base16-bytestring >=0.1.1.6 && <1.1 , binary ^>=0.8.6.0 , bytestring >=0.10 && <0.12 - , Cabal ^>=3.0.0.0 || ^>=3.2.0.0 || ^>=3.4.0.0 || ^>=3.6.0.0 + , Cabal ^>=3.0.0.0 || ^>=3.2.0.0 || ^>=3.4.0.0 || ^>=3.6.0.0 || ^>=3.8.0.0 || ^>= 3.10.0.0 , case-insensitive ^>=1.2.1.0 , casing ^>=0.1.4.1 , containers ^>=0.6 @@ -184,7 +184,7 @@ library , directory ^>=1.3.6.0 , disk-free-space ^>=0.1.0.1 , exceptions ^>=0.10 - , filepath ^>=1.4.2.1 + , filepath >=1.4.101.0 , file-uri ^>=0.1.0.0 , haskus-utils-types ^>=1.5 , haskus-utils-variant ^>=3.3 @@ -212,7 +212,7 @@ library , unordered-containers ^>=0.2.10.0 , uri-bytestring ^>=0.3.2.2 , vector >=0.12 && <0.14 - , versions >=6.0.3 && <6.1 + , versions >=6.0.5 && <6.1 , word8 ^>=0.1.3 , yaml-streamly ^>=0.12.0 , zlib ^>=0.6.2.2 @@ -268,7 +268,7 @@ library if flag(tui) cpp-options: -DBRICK - build-depends: vty ^>=6.0 + build-depends: vty ^>=6.0 || ^>=6.1 || ^>=6.2 library ghcup-optparse import: app-common-depends @@ -356,7 +356,7 @@ executable ghcup build-depends: , brick ^>=2.1 , transformers ^>=0.5 - , vty ^>=6.0 + , vty ^>=6.0 || ^>=6.1 || ^>=6.2 , optics ^>=0.4 if os(windows) @@ -397,7 +397,7 @@ test-suite ghcup-test , bytestring >=0.10 && <0.12 , containers ^>=0.6 , directory ^>=1.3.6.0 - , filepath ^>=1.4.2.1 + , filepath >=1.4.101.0 , generic-arbitrary >=0.1.0 && <0.2.1 || >=0.2.2 && <0.3 , ghcup , hspec >=2.7.10 && <2.11 @@ -408,7 +408,7 @@ test-suite ghcup-test , text ^>=2.0 , time >=1.9.3 && <1.12 , uri-bytestring ^>=0.3.2.2 - , versions >=6.0.3 && <6.1 + , versions >=6.0.5 && <6.1 if os(windows) cpp-options: -DIS_WINDOWS diff --git a/lib/GHCup/Prelude/Process/Posix.hs b/lib/GHCup/Prelude/Process/Posix.hs index 6089be6..d3beff3 100644 --- a/lib/GHCup/Prelude/Process/Posix.hs +++ b/lib/GHCup/Prelude/Process/Posix.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE CPP #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE DataKinds #-} @@ -98,7 +99,12 @@ execLogged exe args chdir lfile env = do Dirs {..} <- getDirs logDebug $ T.pack $ "Running " <> exe <> " with arguments " <> show args let logfile = fromGHCupPath logsDir lfile <> ".log" - liftIO $ bracket (openFd logfile WriteOnly (Just newFilePerms) defaultFileFlags{ append = True }) + liftIO $ bracket +#if MIN_VERSION_unix(2,8,0) + (openFd logfile WriteOnly defaultFileFlags{ append = True, creat = Just newFilePerms }) +#else + (openFd logfile WriteOnly (Just newFilePerms) defaultFileFlags{ append = True }) +#endif closeFd (action verbose noColor) where @@ -339,7 +345,11 @@ cleanup fds = for_ fds $ \fd -> handleIO (\_ -> pure ()) $ closeFd fd -- | Create a new regular file in write-only mode. The file must not exist. createRegularFileFd :: FileMode -> FilePath -> IO Fd createRegularFileFd fm dest = +#if MIN_VERSION_unix(2,8,0) + openFd dest WriteOnly defaultFileFlags{ exclusive = True, creat = Just fm } +#else openFd dest WriteOnly (Just fm) defaultFileFlags{ exclusive = True } +#endif -- | Thin wrapper around `executeFile`. diff --git a/stack.yaml b/stack.yaml index 0f7a7d6..19a35c0 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,38 +1,66 @@ -resolver: lts-20.26 +resolver: lts-21.25 packages: - . extra-deps: - - Cabal-3.6.3.0 - - Cabal-syntax-3.10.1.0 - - aeson-2.1.2.1 - - cabal-install-parsers-0.6.1 - - chs-cabal-0.1.1.1 - - chs-deps-0.1.0.0 + - Cabal-3.8.1.0 + - Cabal-syntax-3.8.1.0 + - Win32-2.14.0.0@sha256:e34af84fec733b5c0c8f052ec39499785e719e2fbbe308983adf26c82ea3704d,5942 + - brick-2.1.1@sha256:ff36d64f1027eac17a14a83de053067413accb58b79e5002dce2a79cb8a3dcb3,17385 + - bzlib-0.5.1.0@sha256:197ea0ba028dd1fe274f7601dae58d23607c4760119bf40bc2087720f6734e6c,2288 + - cabal-install-parsers-0.6 + - cabal-plan-0.7.3.0 + - chs-cabal-0.1.1.1@sha256:e8c8c1bf1dbeec64ad86d67ae6dca1c45afd644d20869546dfdcd03910d3848d,1149 + - chs-deps-0.1.0.0@sha256:0cdada6d2c682c41b20331b8c63c2ecfc7e806928585195fd544c9d41f3074fd,2496 + - directory-1.3.8.3 + - file-uri-0.1.0.0@sha256:d6dcc12bde249362c93e413f87a41558b827333dfe3f97d953e47e1070c0da6f,1857 + - filepath-1.4.101.0 - generic-arbitrary-0.2.2@sha256:202ffbf2032672a51318f2e80d7e75b72f8950e690346b4314f38bc7e39215f7,1189 - - generically-0.1.1 - haskus-utils-data-1.4@sha256:bfa94363b94b14779edd6834fbd59dbb847c3d7b8f48e3844f456ffdc077da4a,1466 - haskus-utils-types-1.5.1@sha256:991c472f4e751e2f0d7aab6ad4220ef151d6160876dcf0511bbf876bbd432020,1298 - - haskus-utils-variant-3.2.1 - - libarchive-3.0.3.2 - - libyaml-streamly-0.2.1 - - lzma-static-5.2.5.5 - - os-release-1.0.2.1 - - parsec-3.1.15.0 - - streamly-0.8.2@sha256:ec521b7c1c4db068501c35804af77f40b7d34232f5e29d9b99e722229040eb80,23500 - - strict-base-0.4.0.0 - - text-2.0.2 - - yaml-streamly-0.12.2 - - github: fosskers/versions - commit: 7bc3355348aac3510771d4622aff09ac38c9924d + - haskus-utils-variant-3.3@sha256:3df3fa0a557d75c0e8f94fe9954f76a692eaf8d368c401e30ab028624d55386b,2198 + - language-c-0.9.3 + - libarchive-3.0.4.2 + - libyaml-streamly-0.2.2@sha256:619b15826a4e221cae4f91cfc040f262cd19a4a81858b75e8270e4b009866969,2206 + - lzma-static-5.2.5.5@sha256:55ed074cda2b82008e020a51e2f8c22f2487a58a4989ab359bf04dd6c903b894,7431 + - megaparsec-9.2.2@sha256:c306a135ec25d91d252032c6128f03598a00e87ea12fcf5fc4878fdffc75c768,3219 + - os-release-1.0.2.1@sha256:2c3e8f7a9a0e17d5042d14d2036d52b42c8d5606e8d004697af462a95c87a9e2,2718 + - process-1.6.18.0@sha256:69fbbca4151e1a6d1a5da41a1e17c254871675a4f2aed5213bbdfb10b5e52742,3148 + - streamly-0.8.3@sha256:c8f1eed7a99d02c902f0338d8c5f53579cf5cf421a5c886405f331bd948214d5,24141 + - strict-base-0.4.0.0@sha256:2ff4e43cb95eedf2995558d7fc34d19362846413dd39e6aa6a5b3ea8228fef9f,1248 + - time-1.11.1.2@sha256:a957467595420495c2dd440d9efa1f58c62277cf9438c7e7a515d7a4c65571ec,6287 + - unicode-data-0.3.1@sha256:ae3a3aca89a32b912ddde7a644c0c04eaf23ee42014c74fe3d6b9aaf36ce7ec9,5481 + - unix-2.8.5.0@sha256:633f15ef0bd50a16a7b5c5e86e6659fee6e4e211e098cc8bd0029f452bfcfddc,9808 + - unix-bytestring-0.3.7.8@sha256:b8070935929a7654ce398fdecc9b5f90b02c455407db8ea7989256e821e33b1f,3053 + - versions-6.0.5 + - vty-6.2@sha256:3536dc83a3fee17d9a114baf58fe47b6f080c24987266f0cd0b7b4b1fcd9cf19,3520 + - vty-crossplatform-0.4.0.0@sha256:50593f91ad16777d921138475a8d2784d538fd206addd30664c620278d6c8544,3172 + - vty-unix-0.2.0.0@sha256:2af3d0bdae3c4b7b7e567ee374efe32c7439fabdf9096465ce011a6c6736e9ae,2932 + - vty-windows-0.2.0.1@sha256:6c75230057a708168dbc420975572511ad3ec09956bf73c3b6f4be03324e8b13,2815 + - yaml-streamly-0.12.4@sha256:b5250c5dc71d668c43c42ed6f86f956d69125136ea960858527a4b2ff712d3d1,5165 + - github: hasufell/uri-bytestring + commit: 4fb5ed14b500c192e6e7a97f6b2b1eb478806001 + - github: haskell/tar + commit: d94a988be4311b830149a9f8fc16739927e5fc1c + +allow-newer: true + +allow-newer-deps: + - Cabal + - Cabal-syntax + - ansi-terminal + - mintty + - process + - streamly + - cabal-install-parsers flags: http-io-streams: brotli: false libarchive: - system-libarchive: true + system-libarchive: false regex-posix: _regex-posix-clib: true diff --git a/test/optparse-test/CompileTest.hs b/test/optparse-test/CompileTest.hs index 0396563..887f05b 100644 --- a/test/optparse-test/CompileTest.hs +++ b/test/optparse-test/CompileTest.hs @@ -98,8 +98,8 @@ compileGhcCheckList = mapSecond CompileGHC , (baseCmd <> "--hadrian", baseOptions{GHC.buildSystem = Just Hadrian}) , (baseCmd <> "--make", baseOptions{GHC.buildSystem = Just Make}) #ifdef IS_WINDOWS - , (baseCmd <> "-i C:\\\\tmp\\out_dir", baseOptions{GHC.isolateDir = Just "C:\\\\tmp\\out_dir"}) - , (baseCmd <> "--isolate C:\\\\tmp\\out_dir", baseOptions{GHC.isolateDir = Just "C:\\\\tmp\\out_dir"}) + , (baseCmd <> "-i C:\\\\tmp\\out_dir", baseOptions{GHC.isolateDir = Just "C:\\tmp\\out_dir"}) + , (baseCmd <> "--isolate C:\\\\tmp\\out_dir", baseOptions{GHC.isolateDir = Just "C:\\tmp\\out_dir"}) #else , (baseCmd <> "-i /tmp/out_dir", baseOptions{GHC.isolateDir = Just "/tmp/out_dir"}) , (baseCmd <> "--isolate /tmp/out_dir", baseOptions{GHC.isolateDir = Just "/tmp/out_dir"}) @@ -164,8 +164,8 @@ compileHlsCheckList = mapSecond CompileHLS = Just [CabalVer, S "-", GitHashShort, S "-", GitHashLong, S "-", GitBranchName, S "-", GitDescribe, S "-coco", S "%", S "l"]}) , (baseCmd <> "--git-describe-version", baseOptions{HLS.overwriteVer = Just [GitDescribe]}) #ifdef IS_WINDOWS - , (baseCmd <> "-i C:\\\\tmp\\out_dir", baseOptions{HLS.isolateDir = Just "C:\\\\tmp\\out_dir"}) - , (baseCmd <> "--isolate C:\\\\tmp\\out_dir", baseOptions{HLS.isolateDir = Just "C:\\\\tmp\\out_dir"}) + , (baseCmd <> "-i C:\\\\tmp\\out_dir", baseOptions{HLS.isolateDir = Just "C:\\tmp\\out_dir"}) + , (baseCmd <> "--isolate C:\\\\tmp\\out_dir", baseOptions{HLS.isolateDir = Just "C:\\tmp\\out_dir"}) #else , (baseCmd <> "-i /tmp/out_dir", baseOptions{HLS.isolateDir = Just "/tmp/out_dir"}) , (baseCmd <> "--isolate /tmp/out_dir", baseOptions{HLS.isolateDir = Just "/tmp/out_dir"}) diff --git a/test/optparse-test/InstallTest.hs b/test/optparse-test/InstallTest.hs index 020f2f1..20961c6 100644 --- a/test/optparse-test/InstallTest.hs +++ b/test/optparse-test/InstallTest.hs @@ -48,7 +48,7 @@ oldStyleCheckList = : ("install --set", Right defaultOptions{instSet = True}) : ("install --force", Right defaultOptions{forceInstall = True}) #ifdef IS_WINDOWS - : ("install -i C:\\\\", Right defaultOptions{Install.isolateDir = Just "C:\\\\"}) + : ("install -i C:\\\\", Right defaultOptions{Install.isolateDir = Just "C:\\"}) #else : ("install -i /", Right defaultOptions{Install.isolateDir = Just "/"}) #endif diff --git a/test/optparse-test/RunTest.hs b/test/optparse-test/RunTest.hs index 9665081..3f28977 100644 --- a/test/optparse-test/RunTest.hs +++ b/test/optparse-test/RunTest.hs @@ -43,8 +43,8 @@ runCheckList = , ("run --hls 2.0", defaultOptions{runHLSVer = Just $ ToolVersion $(versionQ "2.0")}) , ("run --stack 2.9", defaultOptions{runStackVer = Just $ ToolVersion $(versionQ "2.9") }) #ifdef IS_WINDOWS - , ("run -b C:\\\\tmp\\dir", defaultOptions{runBinDir = Just "C:\\\\tmp\\dir"}) - , ("run --bindir C:\\\\tmp\\dir", defaultOptions{runBinDir = Just "C:\\\\tmp\\dir"}) + , ("run -b C:\\\\tmp\\dir", defaultOptions{runBinDir = Just "C:\\tmp\\dir"}) + , ("run --bindir C:\\\\tmp\\dir", defaultOptions{runBinDir = Just "C:\\tmp\\dir"}) #else , ("run -b /tmp/dir", defaultOptions{runBinDir = Just "/tmp/dir"}) , ("run --bindir /tmp/dir", defaultOptions{runBinDir = Just "/tmp/dir"})