From e4b0e8debf38003624117b84e6aa0d72e3423721 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Fri, 8 Mar 2024 21:46:13 +0800 Subject: [PATCH] Use fixed bzlib --- cabal.ghc8107.project | 5 ++++- cabal.ghc8107.project.freeze | 9 +++++---- cabal.ghc902.project | 5 ++++- cabal.ghc902.project.freeze | 13 +++++++------ cabal.ghc928.project | 5 ++++- cabal.ghc928.project.freeze | 13 +++++++------ cabal.ghc948.project | 5 ++++- cabal.ghc948.project.freeze | 13 +++++++------ cabal.project | 5 ++++- cabal.project.release | 3 +++ ghcup.cabal | 3 +-- 11 files changed, 50 insertions(+), 29 deletions(-) diff --git a/cabal.ghc8107.project b/cabal.ghc8107.project index d321ca5..ba8fd68 100644 --- a/cabal.ghc8107.project +++ b/cabal.ghc8107.project @@ -10,7 +10,10 @@ else flags: +tui +tar constraints: http-io-streams -brotli, - any.aeson >= 2.0.1.0 + any.aeson >= 2.0.1.0, + bzlib-conduit >= 0.3.0.3, + bz2 >= 1.0.1.1, + bzlib >= 0.5.2.0 if os(mingw32) if impl(ghc >= 9.4) diff --git a/cabal.ghc8107.project.freeze b/cabal.ghc8107.project.freeze index f442b3d..b1d6cd9 100644 --- a/cabal.ghc8107.project.freeze +++ b/cabal.ghc8107.project.freeze @@ -14,7 +14,7 @@ constraints: any.Cabal ==3.10.2.1, aeson +ordered-keymap, any.aeson-pretty ==0.8.10, aeson-pretty +lib-only, - any.alex ==3.5.0.0, + any.alex ==3.5.1.0, any.ansi-terminal ==1.0.2, ansi-terminal -example, any.ansi-terminal-types ==0.11.5, @@ -44,8 +44,9 @@ constraints: any.Cabal ==3.10.2.1, any.brick ==2.1.1, brick -demos, any.bytestring ==0.11.5.3, - any.bz2 ==1.0.1.0, + any.bz2 ==1.0.1.1, bz2 -cross +with-bzlib, + any.bzip2-clib ==1.0.8, any.c2hs ==0.28.8, c2hs +base3 -regression, any.cabal-install-parsers ==0.6.1.1, @@ -241,7 +242,7 @@ constraints: any.Cabal ==3.10.2.1, vector +boundschecks -internalchecks -unsafechecks -wall, any.vector-binary-instances ==0.2.5.2, any.vector-stream ==0.1.0.1, - any.versions ==6.0.5, + any.versions ==6.0.6, any.vty ==6.2, any.vty-crossplatform ==0.4.0.0, vty-crossplatform -demos, @@ -255,4 +256,4 @@ constraints: any.Cabal ==3.10.2.1, 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-02-18T14:07:35Z +index-state: hackage.haskell.org 2024-03-10T10:13:56Z diff --git a/cabal.ghc902.project b/cabal.ghc902.project index f39a862..13dfca1 100644 --- a/cabal.ghc902.project +++ b/cabal.ghc902.project @@ -10,7 +10,10 @@ else flags: +tui +tar constraints: http-io-streams -brotli, - any.aeson >= 2.0.1.0 + any.aeson >= 2.0.1.0, + bzlib-conduit >= 0.3.0.3, + bz2 >= 1.0.1.1, + bzlib >= 0.5.2.0 if os(mingw32) if impl(ghc >= 9.4) diff --git a/cabal.ghc902.project.freeze b/cabal.ghc902.project.freeze index 1438786..3e6092a 100644 --- a/cabal.ghc902.project.freeze +++ b/cabal.ghc902.project.freeze @@ -14,7 +14,7 @@ constraints: any.Cabal ==3.10.2.1, aeson +ordered-keymap, any.aeson-pretty ==0.8.10, aeson-pretty +lib-only, - any.alex ==3.5.0.0, + any.alex ==3.5.1.0, any.ansi-terminal ==1.0.2, ansi-terminal -example, any.ansi-terminal-types ==0.11.5, @@ -47,9 +47,10 @@ constraints: any.Cabal ==3.10.2.1, any.brick ==2.1.1, brick -demos, any.bytestring ==0.11.5.3, - any.bz2 ==1.0.1.0, + any.bz2 ==1.0.1.1, bz2 -cross +with-bzlib, - any.bzlib-conduit ==0.3.0.2, + any.bzip2-clib ==1.0.8, + any.bzlib-conduit ==0.3.0.3, any.c2hs ==0.28.8, c2hs +base3 -regression, any.cabal-install-parsers ==0.6.1.1, @@ -140,7 +141,7 @@ constraints: any.Cabal ==3.10.2.1, any.microlens-mtl ==0.2.0.3, any.microlens-th ==0.4.3.14, any.monad-control ==1.0.3.1, - any.mono-traversable ==1.0.15.3, + any.mono-traversable ==1.0.17.0, any.mtl ==2.2.2, any.mtl-compat ==0.2.2, mtl-compat -two-point-one -two-point-two, @@ -250,7 +251,7 @@ constraints: any.Cabal ==3.10.2.1, 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.5, + any.versions ==6.0.6, any.vty ==6.2, any.vty-crossplatform ==0.4.0.0, vty-crossplatform -demos, @@ -268,4 +269,4 @@ constraints: any.Cabal ==3.10.2.1, any.zlib-bindings ==0.1.1.5, any.zstd ==0.1.3.0, zstd +standalone -index-state: hackage.haskell.org 2024-02-18T14:07:35Z +index-state: hackage.haskell.org 2024-03-10T10:13:56Z diff --git a/cabal.ghc928.project b/cabal.ghc928.project index 98875dd..cb748cb 100644 --- a/cabal.ghc928.project +++ b/cabal.ghc928.project @@ -10,7 +10,10 @@ else flags: +tui +tar constraints: http-io-streams -brotli, - any.aeson >= 2.0.1.0 + any.aeson >= 2.0.1.0, + bzlib-conduit >= 0.3.0.3, + bz2 >= 1.0.1.1, + bzlib >= 0.5.2.0 if os(mingw32) if impl(ghc >= 9.4) diff --git a/cabal.ghc928.project.freeze b/cabal.ghc928.project.freeze index 0451994..b1f6ab3 100644 --- a/cabal.ghc928.project.freeze +++ b/cabal.ghc928.project.freeze @@ -14,7 +14,7 @@ constraints: any.Cabal ==3.10.2.1, aeson +ordered-keymap, any.aeson-pretty ==0.8.10, aeson-pretty +lib-only, - any.alex ==3.5.0.0, + any.alex ==3.5.1.0, any.ansi-terminal ==1.0.2, ansi-terminal -example, any.ansi-terminal-types ==0.11.5, @@ -47,9 +47,10 @@ constraints: any.Cabal ==3.10.2.1, any.brick ==2.1.1, brick -demos, any.bytestring ==0.11.4.0, - any.bz2 ==1.0.1.0, + any.bz2 ==1.0.1.1, bz2 -cross +with-bzlib, - any.bzlib-conduit ==0.3.0.2, + any.bzip2-clib ==1.0.8, + any.bzlib-conduit ==0.3.0.3, any.c2hs ==0.28.8, c2hs +base3 -regression, any.cabal-install-parsers ==0.6.1.1, @@ -140,7 +141,7 @@ constraints: any.Cabal ==3.10.2.1, any.microlens-mtl ==0.2.0.3, any.microlens-th ==0.4.3.14, any.monad-control ==1.0.3.1, - any.mono-traversable ==1.0.15.3, + any.mono-traversable ==1.0.17.0, any.mtl ==2.2.2, any.mtl-compat ==0.2.2, mtl-compat -two-point-one -two-point-two, @@ -249,7 +250,7 @@ constraints: any.Cabal ==3.10.2.1, 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.5, + any.versions ==6.0.6, any.vty ==6.2, any.vty-crossplatform ==0.4.0.0, vty-crossplatform -demos, @@ -267,4 +268,4 @@ constraints: any.Cabal ==3.10.2.1, any.zlib-bindings ==0.1.1.5, any.zstd ==0.1.3.0, zstd +standalone -index-state: hackage.haskell.org 2024-02-18T14:07:35Z +index-state: hackage.haskell.org 2024-03-10T10:13:56Z diff --git a/cabal.ghc948.project b/cabal.ghc948.project index 92fbbd8..32324a1 100644 --- a/cabal.ghc948.project +++ b/cabal.ghc948.project @@ -10,7 +10,10 @@ else flags: +tui +tar constraints: http-io-streams -brotli, - any.aeson >= 2.0.1.0 + any.aeson >= 2.0.1.0, + bzlib-conduit >= 0.3.0.3, + bz2 >= 1.0.1.1, + bzlib >= 0.5.2.0 if os(mingw32) if impl(ghc >= 9.4) diff --git a/cabal.ghc948.project.freeze b/cabal.ghc948.project.freeze index 35f856e..5681201 100644 --- a/cabal.ghc948.project.freeze +++ b/cabal.ghc948.project.freeze @@ -14,7 +14,7 @@ constraints: any.Cabal ==3.10.2.1, aeson +ordered-keymap, any.aeson-pretty ==0.8.10, aeson-pretty +lib-only, - any.alex ==3.5.0.0, + any.alex ==3.5.1.0, any.ansi-terminal ==1.0.2, ansi-terminal -example, any.ansi-terminal-types ==0.11.5, @@ -47,9 +47,10 @@ constraints: any.Cabal ==3.10.2.1, any.brick ==2.1.1, brick -demos, any.bytestring ==0.11.5.3, - any.bz2 ==1.0.1.0, + any.bz2 ==1.0.1.1, bz2 -cross +with-bzlib, - any.bzlib-conduit ==0.3.0.2, + any.bzip2-clib ==1.0.8, + any.bzlib-conduit ==0.3.0.3, any.c2hs ==0.28.8, c2hs +base3 -regression, any.cabal-install-parsers ==0.6.1.1, @@ -139,7 +140,7 @@ constraints: any.Cabal ==3.10.2.1, any.microlens-mtl ==0.2.0.3, any.microlens-th ==0.4.3.14, any.monad-control ==1.0.3.1, - any.mono-traversable ==1.0.15.3, + any.mono-traversable ==1.0.17.0, any.mtl ==2.2.2, any.mtl-compat ==0.2.2, mtl-compat -two-point-one -two-point-two, @@ -248,7 +249,7 @@ constraints: any.Cabal ==3.10.2.1, 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.5, + any.versions ==6.0.6, any.vty ==6.2, any.vty-crossplatform ==0.4.0.0, vty-crossplatform -demos, @@ -266,4 +267,4 @@ constraints: any.Cabal ==3.10.2.1, any.zlib-bindings ==0.1.1.5, any.zstd ==0.1.3.0, zstd +standalone -index-state: hackage.haskell.org 2024-02-18T14:07:35Z +index-state: hackage.haskell.org 2024-03-10T10:13:56Z diff --git a/cabal.project b/cabal.project index 80baa72..4fc192e 100644 --- a/cabal.project +++ b/cabal.project @@ -10,7 +10,10 @@ else flags: +tui +tar constraints: http-io-streams -brotli, - any.aeson >= 2.0.1.0 + any.aeson >= 2.0.1.0, + bzlib-conduit >= 0.3.0.3, + bz2 >= 1.0.1.1, + bzlib >= 0.5.2.0 if os(mingw32) if impl(ghc >= 9.4) diff --git a/cabal.project.release b/cabal.project.release index 1e909a3..79c197a 100644 --- a/cabal.project.release +++ b/cabal.project.release @@ -30,6 +30,9 @@ elif os(freebsd) constraints: http-io-streams -brotli, any.aeson >= 2.0.1.0, any.hsc2hs ==0.68.8, + bzlib-conduit >= 0.3.0.3, + bz2 >= 1.0.1.1, + bzlib >= 0.5.2.0 directory >= 1.3.8.3, filepath == 1.4.101.0 || == 1.4.300.1 || >= 1.5.2.0 diff --git a/ghcup.cabal b/ghcup.cabal index 95e8e6c..f27822e 100644 --- a/ghcup.cabal +++ b/ghcup.cabal @@ -175,6 +175,7 @@ library , base16-bytestring >=0.1.1.6 && <1.1 , binary ^>=0.8.6.0 , bytestring >=0.10 && <0.12 + , bz2 ^>=1.0.1.1 , 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 @@ -244,7 +245,6 @@ library -- GHCup.OptParse.Run uses this exposed-modules: GHCup.Prelude.Process.Windows build-depends: - , bzlib , process ^>=1.6.11.0 , Win32 >=2.10 @@ -261,7 +261,6 @@ library install-includes: dirutils.h c-sources: cbits/dirutils.c build-depends: - , bz2 >=0.5.0.5 && <1.1 , terminal-size ^>=0.3.3 , unix ^>=2.7 || ^>=2.8 , unix-bytestring ^>=0.3.7.3