From c7c0c2f4e63af17358e9c496447c8d6d8fa373c5 Mon Sep 17 00:00:00 2001 From: Seth Hubbard Date: Sat, 18 Jan 2025 00:15:26 -0600 Subject: [PATCH 1/4] Make `lukko` flag default to off. --- hackage-security/hackage-security.cabal | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hackage-security/hackage-security.cabal b/hackage-security/hackage-security.cabal index 7195ebc..5cad598 100644 --- a/hackage-security/hackage-security.cabal +++ b/hackage-security/hackage-security.cabal @@ -58,8 +58,8 @@ flag Cabal-syntax flag lukko description: Use @lukko@ for file-locking, otherwise use @GHC.IO.Handle.Lock@ - manual: True - default: True + manual: False + default: False library -- Most functionality is exported through the top-level entry points .Client From cc4fd9fdfdeb219d8fc9573127965e055181d107 Mon Sep 17 00:00:00 2001 From: a-02 Date: Sun, 19 Jan 2025 16:23:41 -0600 Subject: [PATCH 2/4] Undo manual field flip. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Thanks, Bodigrim! Co-authored-by: ˌbodʲɪˈɡrʲim --- hackage-security/hackage-security.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hackage-security/hackage-security.cabal b/hackage-security/hackage-security.cabal index 5cad598..3d7193f 100644 --- a/hackage-security/hackage-security.cabal +++ b/hackage-security/hackage-security.cabal @@ -58,7 +58,7 @@ flag Cabal-syntax flag lukko description: Use @lukko@ for file-locking, otherwise use @GHC.IO.Handle.Lock@ - manual: False + manual: True default: False library From e6a2f1944a35f479d567e408a57d69633aee1f2f Mon Sep 17 00:00:00 2001 From: seth Date: Thu, 17 Apr 2025 18:15:53 +0200 Subject: [PATCH 3/4] Make lukko flag automatic and disabled. --- hackage-security/hackage-security.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hackage-security/hackage-security.cabal b/hackage-security/hackage-security.cabal index 3d7193f..5cad598 100644 --- a/hackage-security/hackage-security.cabal +++ b/hackage-security/hackage-security.cabal @@ -58,7 +58,7 @@ flag Cabal-syntax flag lukko description: Use @lukko@ for file-locking, otherwise use @GHC.IO.Handle.Lock@ - manual: True + manual: False default: False library From 0a76749166aa69c8e7040a602cd8d45b3ced0b9e Mon Sep 17 00:00:00 2001 From: Bodigrim Date: Thu, 1 May 2025 23:31:34 +0100 Subject: [PATCH 4/4] Regenerate CI; Ubuntu 20.04 has been decomissioned --- .github/workflows/haskell-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index f32f9e7..c1ecbaf 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -8,9 +8,9 @@ # # For more information, see https://github.com/haskell-CI/haskell-ci # -# version: 0.19.20241223 +# version: 0.19.20250330 # -# REGENDATA ("0.19.20241223",["github","cabal.project"]) +# REGENDATA ("0.19.20250330",["github","cabal.project"]) # name: Haskell-CI on: @@ -23,7 +23,7 @@ on: jobs: linux: name: Haskell-CI - Linux - ${{ matrix.compiler }} - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 timeout-minutes: 60 container: @@ -96,12 +96,12 @@ jobs: - name: Install GHCup run: | mkdir -p "$HOME/.ghcup/bin" - curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup" + curl -sL https://downloads.haskell.org/ghcup/0.1.50.1/x86_64-linux-ghcup-0.1.50.1 > "$HOME/.ghcup/bin/ghcup" chmod a+x "$HOME/.ghcup/bin/ghcup" - name: Install cabal-install run: | - "$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false) - echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.0 -vnormal+nowrap" >> "$GITHUB_ENV" + "$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.1-p1 || (cat "$HOME"/.ghcup/logs/*.* && false) + echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.1-p1 -vnormal+nowrap" >> "$GITHUB_ENV" - name: Install GHC (GHCup) if: matrix.setup-method == 'ghcup' run: |