Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Switch to xz #1154

Merged
merged 6 commits into from
Nov 19, 2024
Merged

Switch to xz #1154

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b887bde
Switch to xz
hasufell Nov 15, 2024
4058056
Bump alpine images
hasufell Nov 15, 2024
8f5604a
Use tar on arm
hasufell Nov 17, 2024
d4a3f83
Fix the release
hasufell Nov 17, 2024
8ed0192
Fix build
hasufell Nov 18, 2024
782b83c
Use macOS-13
hasufell Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cabal.ghc8107.Unix.project.freeze
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion cabal.ghc8107.Win32.project.freeze
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion cabal.ghc902.Unix.project.freeze
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion cabal.ghc902.Win32.project.freeze
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion cabal.ghc928.Unix.project.freeze
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion cabal.ghc928.Win32.project.freeze
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion cabal.ghc948.Unix.project.freeze
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion cabal.ghc948.Win32.project.freeze
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion cabal.ghc966.Unix.project.freeze
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion cabal.ghc966.Win32.project.freeze
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ constraints: text -simdutf

if os(mingw32)
constraints: zlib +bundled-c-zlib,
lzma +static,
text -simdutf,
dfordivam marked this conversation as resolved.
Show resolved Hide resolved
vty-windows >=0.2.0.2

Expand Down
4 changes: 3 additions & 1 deletion cabal.project.release
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions docker/alpine32/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ RUN apk add --no-cache \
openssl-libs-static \
xz \
xz-dev \
xz-static \
ncurses-static

ARG GHCUP_VERSION=0.1.20.0
Expand Down
1 change: 1 addition & 0 deletions docker/alpine64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ RUN apk add --no-cache \
openssl-libs-static \
xz \
xz-dev \
xz-static \
ncurses-static

ARG GHCUP_VERSION=0.1.20.0
Expand Down
2 changes: 1 addition & 1 deletion ghcup.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions stack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ extra-deps:
- vty-crossplatform-0.4.0.0@sha256:50593f91ad16777d921138475a8d2784d538fd206addd30664c620278d6c8544,3172
- vty-unix-0.2.0.0@sha256:2af3d0bdae3c4b7b7e567ee374efe32c7439fabdf9096465ce011a6c6736e9ae,2932
- vty-windows-0.2.0.2
- xz-5.6.3
- xz-clib-5.6.3
- github: hasufell/uri-bytestring
commit: 4fb5ed14b500c192e6e7a97f6b2b1eb478806001

Expand All @@ -55,6 +57,9 @@ flags:
libarchive:
system-libarchive: false

xz:
system-xz: false

regex-posix:
_regex-posix-clib: true

Expand Down
Loading