From fdc83be1a42afec83e90c7a328765be654af66ce 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.project | 7 +++++++ ghcup.cabal | 3 +-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/cabal.project b/cabal.project index 80baa72e..c91ba821 100644 --- a/cabal.project +++ b/cabal.project @@ -26,6 +26,13 @@ source-repository-package location: https://github.com/hasufell/uri-bytestring.git tag: 4fb5ed14b500c192e6e7a97f6b2b1eb478806001 +source-repository-package + type: git + location: https://github.com/hasufell/bzlib.git + tag: 2b8ba62914bf35aa91699bf785600ed34e9cf735 + subdir: bzlib + bzlib-clib + package libarchive flags: -system-libarchive diff --git a/ghcup.cabal b/ghcup.cabal index 95e8e6c1..234c2ef2 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 + , bzlib ^>= 0.5.2.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 @@ -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