From 1995481fd05399aad3ed92724e1e9108fa5ae7b5 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Fri, 15 Nov 2024 13:26:22 +0800 Subject: [PATCH] Switch to xz --- cabal.ghc8107.Unix.project.freeze | 2 +- cabal.ghc8107.Win32.project.freeze | 2 +- cabal.ghc902.Unix.project.freeze | 2 +- cabal.ghc902.Win32.project.freeze | 2 +- cabal.ghc928.Unix.project.freeze | 2 +- cabal.ghc928.Win32.project.freeze | 2 +- cabal.ghc948.Unix.project.freeze | 2 +- cabal.ghc948.Win32.project.freeze | 2 +- cabal.ghc966.Unix.project.freeze | 2 +- cabal.ghc966.Win32.project.freeze | 2 +- cabal.project | 1 - cabal.project.release | 4 +++- ghcup.cabal | 2 +- 13 files changed, 14 insertions(+), 13 deletions(-) diff --git a/cabal.ghc8107.Unix.project.freeze b/cabal.ghc8107.Unix.project.freeze index a00c319c..b1ca2e78 100644 --- 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 index 7359f7b5..f2256c91 100644 --- 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 index ad4cdd30..261570ee 100644 --- 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 index 61a75d27..dd95b2fd 100644 --- 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 index b388c1d4..c6f53f31 100644 --- 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 index d70ffbbe..09b8a363 100644 --- 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 index 942f7efc..c68ee2cd 100644 --- 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 index 0de4392c..1c85cf74 100644 --- 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 index 03065839..bf459de7 100644 --- 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 index 4089446d..dbd8f70e 100644 --- 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 index d65a3fc0..95ef0359 100644 --- 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 index 5adf9cae..ffbd95b5 100644 --- 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 index b0708ab8..6e97f168 100644 --- 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