Switch to xz

haskell · Nov 15, 2024 · 1995481 · 1995481
1 parent a32a559
commit 1995481
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 13 deletions.
diff --git a/cabal.ghc8107.Unix.project.freeze b/cabal.ghc8107.Unix.project.freeze
@@ -228,4 +228,4 @@ constraints: any.Cabal ==3.10.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-08-25T14:11:43Z
+index-state: hackage.haskell.org 2024-11-15T05:14:10Z
diff --git a/cabal.ghc8107.Win32.project.freeze b/cabal.ghc8107.Win32.project.freeze
@@ -213,4 +213,4 @@ constraints: any.Cabal ==3.10.3.0,
              yaml +no-examples +no-exe,
              any.zlib ==0.6.3.0,
              zlib +bundled-c-zlib -non-blocking-ffi -pkg-config
-index-state: hackage.haskell.org 2024-08-27T01:59:55Z
+index-state: hackage.haskell.org 2024-11-15T05:14:10Z
diff --git a/cabal.ghc902.Unix.project.freeze b/cabal.ghc902.Unix.project.freeze
@@ -233,4 +233,4 @@ constraints: any.Cabal ==3.10.3.0,
              any.zlib-bindings ==0.1.1.5,
              any.zstd ==0.1.3.0,
              zstd +standalone
-index-state: hackage.haskell.org 2024-08-25T14:11:43Z
+index-state: hackage.haskell.org 2024-11-15T05:14:10Z
diff --git a/cabal.ghc902.Win32.project.freeze b/cabal.ghc902.Win32.project.freeze
@@ -219,4 +219,4 @@ constraints: any.Cabal ==3.10.3.0,
              zlib +bundled-c-zlib -non-blocking-ffi -pkg-config,
              any.zstd ==0.1.3.0,
              zstd +standalone
-index-state: hackage.haskell.org 2024-08-27T01:59:55Z
+index-state: hackage.haskell.org 2024-11-15T05:14:10Z
diff --git a/cabal.ghc928.Unix.project.freeze b/cabal.ghc928.Unix.project.freeze
@@ -233,4 +233,4 @@ constraints: any.Cabal ==3.10.3.0,
              any.zlib-bindings ==0.1.1.5,
              any.zstd ==0.1.3.0,
              zstd +standalone
-index-state: hackage.haskell.org 2024-08-25T14:11:43Z
+index-state: hackage.haskell.org 2024-11-15T05:14:10Z
diff --git a/cabal.ghc928.Win32.project.freeze b/cabal.ghc928.Win32.project.freeze
@@ -219,4 +219,4 @@ constraints: any.Cabal ==3.10.3.0,
              zlib +bundled-c-zlib -non-blocking-ffi -pkg-config,
              any.zstd ==0.1.3.0,
              zstd +standalone
-index-state: hackage.haskell.org 2024-08-27T01:59:55Z
+index-state: hackage.haskell.org 2024-11-15T05:14:10Z
diff --git a/cabal.ghc948.Unix.project.freeze b/cabal.ghc948.Unix.project.freeze
@@ -231,4 +231,4 @@ constraints: any.Cabal ==3.10.3.0,
              any.zlib-bindings ==0.1.1.5,
              any.zstd ==0.1.3.0,
              zstd +standalone
-index-state: hackage.haskell.org 2024-08-25T14:11:43Z
+index-state: hackage.haskell.org 2024-11-15T05:14:10Z
diff --git a/cabal.ghc948.Win32.project.freeze b/cabal.ghc948.Win32.project.freeze
@@ -217,4 +217,4 @@ constraints: any.Cabal ==3.10.3.0,
              zlib +bundled-c-zlib -non-blocking-ffi -pkg-config,
              any.zstd ==0.1.3.0,
              zstd +standalone
-index-state: hackage.haskell.org 2024-08-27T01:59:55Z
+index-state: hackage.haskell.org 2024-11-15T05:14:10Z
diff --git a/cabal.ghc966.Unix.project.freeze b/cabal.ghc966.Unix.project.freeze
@@ -228,4 +228,4 @@ constraints: any.Cabal ==3.10.3.0,
              any.zlib-bindings ==0.1.1.5,
              any.zstd ==0.1.3.0,
              zstd +standalone
-index-state: hackage.haskell.org 2024-08-25T14:11:43Z
+index-state: hackage.haskell.org 2024-11-15T05:14:10Z
diff --git a/cabal.ghc966.Win32.project.freeze b/cabal.ghc966.Win32.project.freeze
@@ -214,4 +214,4 @@ constraints: any.Cabal ==3.10.3.0,
              zlib +bundled-c-zlib -non-blocking-ffi -pkg-config,
              any.zstd ==0.1.3.0,
              zstd +standalone
-index-state: hackage.haskell.org 2024-08-27T01:59:55Z
+index-state: hackage.haskell.org 2024-11-15T05:14:10Z
diff --git a/cabal.project b/cabal.project
@@ -23,7 +23,6 @@ constraints: text -simdutf
 
 if os(mingw32)
   constraints: zlib +bundled-c-zlib,
-               lzma +static,
                text -simdutf,
                vty-windows >=0.2.0.2
 

diff --git a/cabal.project.release b/cabal.project.release
@@ -14,7 +14,9 @@ if os(linux)
       ghc-options: -split-sections -optl-static
 elif os(darwin)
   constraints: zlib +bundled-c-zlib,
-               lzma +static
+               xz -system-xz
+elif os(mingw32)
+  constraints: xz -system-xz
 elif os(freebsd)
   constraints: zlib +bundled-c-zlib,
                zip +disable-zstd

diff --git a/ghcup.cabal b/ghcup.cabal
@@ -204,7 +204,7 @@ library
     , filepath              >=1.4.101.0
     , file-uri              ^>=0.1.0.0
     , variant                ^>=1.0
-    , lzma-static           ^>=5.2.5.3
+    , xz                    ^>=5.6.3
     , megaparsec            >=8.0.0      && <9.3
     , mtl                   ^>=2.2 || ^>=2.3
     , optics                ^>=0.4