diff --git a/VERSION_MATRIX.md b/VERSION_MATRIX.md index 6dfe6ace41b28f788120132d88cb6a75f794082e..3848520d1c9e5fe65f5aa8c24142817f4af4b5e0 100644 --- a/VERSION_MATRIX.md +++ b/VERSION_MATRIX.md @@ -32,3 +32,8 @@ Topmost entry = Tag `latest` [^1]: unsupported build; *statically linked* binary [^2]: w/o Haddock; due to `HADDOCK_DOCS=NO` + +## Bug fixes + +* Images based on Alpine 3.{17,18}: Package pkgconf downgraded to v1.8.1 + * Due to https://github.com/haskell/cabal/issues/8923 diff --git a/latest.Dockerfile b/latest.Dockerfile index 899cf1cad4e97dd8f3312286ec65d6e7255b3575..eebc24f3999cbe796b2b819201e5db9e9e7ea36f 100644 --- a/latest.Dockerfile +++ b/latest.Dockerfile @@ -105,6 +105,13 @@ COPY --from=bootstrap /tmp/ghc-"$GHC_VERSION"/_build/bindist/ghc-"$GHC_VERSION"- COPY --from=bootstrap /root/.cabal/bin/cabal /usr/local/bin/cabal RUN cd /tmp \ + # Fix https://github.com/haskell/cabal/issues/8923 + && PKG_CONFIG_VERSION="$(pkg-config --version)" \ + && if [ "${PKG_CONFIG_VERSION%.*}" = "1.9" ]; then \ + # Downgrade pkgconf from 1.9.x to 1.8.1 + curl -sSLO http://dl-cdn.alpinelinux.org/alpine/v3.16/main/"$(uname -m)"/pkgconf-1.8.1-r0.apk; \ + apk add --no-cache pkgconf-1.8.1-r0.apk; \ + fi \ && tar -xJf ghc-"$GHC_VERSION"-*-alpine-linux.tar.xz \ && cd ghc-"$GHC_VERSION"-*-alpine-linux \ && ./configure --disable-ld-override \ diff --git a/prior/9.4.4.Dockerfile b/prior/9.4.4.Dockerfile index 09ad71ac4833ea0401b3f7eb3f713fc399ac5a86..f49fd9a05852edc50587ca0f56a6d8da7522fd77 100644 --- a/prior/9.4.4.Dockerfile +++ b/prior/9.4.4.Dockerfile @@ -103,6 +103,13 @@ COPY --from=bootstrap /tmp/ghc-$GHC_VERSION/_build/bindist/ghc-$GHC_VERSION-*-al COPY --from=bootstrap /root/.cabal/bin/cabal /usr/local/bin/cabal RUN cd /tmp \ + # Fix https://github.com/haskell/cabal/issues/8923 + && PKG_CONFIG_VERSION="$(pkg-config --version)" \ + && if [ "${PKG_CONFIG_VERSION%.*}" = "1.9" ]; then \ + # Downgrade pkgconf from 1.9.x to 1.8.1 + curl -sSLO http://dl-cdn.alpinelinux.org/alpine/v3.16/main/"$(uname -m)"/pkgconf-1.8.1-r0.apk; \ + apk add --no-cache pkgconf-1.8.1-r0.apk; \ + fi \ && tar -xJf ghc-$GHC_VERSION-*-alpine-linux.tar.xz \ && cd ghc-$GHC_VERSION-*-alpine-linux \ && ./configure --disable-ld-override \ diff --git a/prior/9.4.5.Dockerfile b/prior/9.4.5.Dockerfile index 629f4b9ba62f211719e6c9f696a5d78e01d83290..26229b28f402f0f76ae30cc7b6e6faca061fab8d 100644 --- a/prior/9.4.5.Dockerfile +++ b/prior/9.4.5.Dockerfile @@ -103,6 +103,13 @@ COPY --from=bootstrap /tmp/ghc-$GHC_VERSION/_build/bindist/ghc-$GHC_VERSION-*-al COPY --from=bootstrap /root/.cabal/bin/cabal /usr/local/bin/cabal RUN cd /tmp \ + # Fix https://github.com/haskell/cabal/issues/8923 + && PKG_CONFIG_VERSION="$(pkg-config --version)" \ + && if [ "${PKG_CONFIG_VERSION%.*}" = "1.9" ]; then \ + # Downgrade pkgconf from 1.9.x to 1.8.1 + curl -sSLO http://dl-cdn.alpinelinux.org/alpine/v3.16/main/"$(uname -m)"/pkgconf-1.8.1-r0.apk; \ + apk add --no-cache pkgconf-1.8.1-r0.apk; \ + fi \ && tar -xJf ghc-$GHC_VERSION-*-alpine-linux.tar.xz \ && cd ghc-$GHC_VERSION-*-alpine-linux \ && ./configure --disable-ld-override \ diff --git a/prior/9.4.6.Dockerfile b/prior/9.4.6.Dockerfile index d3f767f80b3d569ee82bf83fdf86558a0db13bb7..19838310cd75f69cad50319b30c05c190ea0b965 100644 --- a/prior/9.4.6.Dockerfile +++ b/prior/9.4.6.Dockerfile @@ -105,6 +105,13 @@ COPY --from=bootstrap /tmp/ghc-"$GHC_VERSION"/_build/bindist/ghc-"$GHC_VERSION"- COPY --from=bootstrap /root/.cabal/bin/cabal /usr/local/bin/cabal RUN cd /tmp \ + # Fix https://github.com/haskell/cabal/issues/8923 + && PKG_CONFIG_VERSION="$(pkg-config --version)" \ + && if [ "${PKG_CONFIG_VERSION%.*}" = "1.9" ]; then \ + # Downgrade pkgconf from 1.9.x to 1.8.1 + curl -sSLO http://dl-cdn.alpinelinux.org/alpine/v3.16/main/"$(uname -m)"/pkgconf-1.8.1-r0.apk; \ + apk add --no-cache pkgconf-1.8.1-r0.apk; \ + fi \ && tar -xJf ghc-"$GHC_VERSION"-*-alpine-linux.tar.xz \ && cd ghc-"$GHC_VERSION"-*-alpine-linux \ && ./configure --disable-ld-override \ diff --git a/prior/9.4.7.Dockerfile b/prior/9.4.7.Dockerfile index 8462a46eb14e26b9233d6315f3c2c473b885e8af..da7675892a1ddbc60c8b23af413ec3ed1fd10c4b 100644 --- a/prior/9.4.7.Dockerfile +++ b/prior/9.4.7.Dockerfile @@ -105,6 +105,13 @@ COPY --from=bootstrap /tmp/ghc-"$GHC_VERSION"/_build/bindist/ghc-"$GHC_VERSION"- COPY --from=bootstrap /root/.cabal/bin/cabal /usr/local/bin/cabal RUN cd /tmp \ + # Fix https://github.com/haskell/cabal/issues/8923 + && PKG_CONFIG_VERSION="$(pkg-config --version)" \ + && if [ "${PKG_CONFIG_VERSION%.*}" = "1.9" ]; then \ + # Downgrade pkgconf from 1.9.x to 1.8.1 + curl -sSLO http://dl-cdn.alpinelinux.org/alpine/v3.16/main/"$(uname -m)"/pkgconf-1.8.1-r0.apk; \ + apk add --no-cache pkgconf-1.8.1-r0.apk; \ + fi \ && tar -xJf ghc-"$GHC_VERSION"-*-alpine-linux.tar.xz \ && cd ghc-"$GHC_VERSION"-*-alpine-linux \ && ./configure --disable-ld-override \ diff --git a/prior/9.6.1.Dockerfile b/prior/9.6.1.Dockerfile index 40c45b45c06022fac7af3de580c09899bac1e9e3..55ad1a5685a641b5e50c888608699e869a2b2af2 100644 --- a/prior/9.6.1.Dockerfile +++ b/prior/9.6.1.Dockerfile @@ -103,6 +103,13 @@ COPY --from=bootstrap /tmp/ghc-"$GHC_VERSION"/_build/bindist/ghc-"$GHC_VERSION"- COPY --from=bootstrap /root/.cabal/bin/cabal /usr/local/bin/cabal RUN cd /tmp \ + # Fix https://github.com/haskell/cabal/issues/8923 + && PKG_CONFIG_VERSION="$(pkg-config --version)" \ + && if [ "${PKG_CONFIG_VERSION%.*}" = "1.9" ]; then \ + # Downgrade pkgconf from 1.9.x to 1.8.1 + curl -sSLO http://dl-cdn.alpinelinux.org/alpine/v3.16/main/"$(uname -m)"/pkgconf-1.8.1-r0.apk; \ + apk add --no-cache pkgconf-1.8.1-r0.apk; \ + fi \ && tar -xJf ghc-"$GHC_VERSION"-*-alpine-linux.tar.xz \ && cd ghc-"$GHC_VERSION"-*-alpine-linux \ && ./configure --disable-ld-override \