From e79e4c2c22f8d0765966be80470d839eaa808e14 Mon Sep 17 00:00:00 2001
From: JackKelly-Bellroy <64521034+JackKelly-Bellroy@users.noreply.github.com>
Date: Sat, 1 Jun 2024 03:18:28 +1000
Subject: [PATCH 1/2] dhall: raise upper bound on Diff (#2588)

Co-authored-by: Sergei Winitzki <winitzki@users.noreply.github.com>
---
 dhall/dhall.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dhall/dhall.cabal b/dhall/dhall.cabal
index 496b8a83e..bb05ffe02 100644
--- a/dhall/dhall.cabal
+++ b/dhall/dhall.cabal
@@ -218,7 +218,7 @@ Common common
         contravariant                              < 1.6 ,
         data-fix                                   < 0.4 ,
         deepseq                                    < 1.6 ,
-        Diff                        >= 0.2      && < 0.5 ,
+        Diff                        >= 0.2      && < 0.6 ,
         directory                   >= 1.3.0.0  && < 1.4 ,
         dotgen                      >= 0.4.2    && < 0.5 ,
         either                      >= 5        && < 5.1,

From 3b4738185fe0720591cf2fc6a7e0e8b4812ef83b Mon Sep 17 00:00:00 2001
From: Sergei Winitzki <winitzki@users.noreply.github.com>
Date: Fri, 31 May 2024 21:43:22 +0200
Subject: [PATCH 2/2] enable macos 86/arm release (#2590)

* responding to comments from mmhat to enable macos 86/arm release

* wip

* wip

* disable build

* Update .github/workflows/main.yml

Co-authored-by: Mann mit Hut <mmhat@users.noreply.github.com>

* Update .github/workflows/main.yml

Co-authored-by: Mann mit Hut <mmhat@users.noreply.github.com>

* Update .github/workflows/main.yml

Co-authored-by: Mann mit Hut <mmhat@users.noreply.github.com>

* Update .github/workflows/main.yml

Co-authored-by: Mann mit Hut <mmhat@users.noreply.github.com>

* Update .github/workflows/main.yml

Co-authored-by: Mann mit Hut <mmhat@users.noreply.github.com>

* Update .mergify.yml

Co-authored-by: Mann mit Hut <mmhat@users.noreply.github.com>

* enable build

---------

Co-authored-by: Mann mit Hut <mmhat@users.noreply.github.com>
---
 .github/workflows/main.yml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index be74463b9..4316dbadf 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -48,9 +48,9 @@ jobs:
       - name: "Cache"
         uses: actions/cache@v3
         with:
-          key: ${{ matrix.os.runner }}-${{ hashFiles(matrix.stack-yaml) }}-${{ env.cache_generation }}
+          key: ${{ matrix.os.runner }}-${{ runner.arch }}-${{ hashFiles(matrix.stack-yaml) }}-${{ env.cache_generation }}
           restore-keys: |
-            ${{ matrix.os.runner }}-
+            ${{ matrix.os.runner }}-${{ runner.arch }}-
           path: |
             ${{ steps.setup-haskell-cabal.outputs.stack-root }}
       - name: Install libsodium
@@ -131,14 +131,12 @@ jobs:
             dhall-yaml
           )
 
-          architecture="$(uname -m)"
-
           function package() (
             local package="${1}"
             local version="$(stack query locals "${package}" version)"
             shift
             local assets=("${@}")
-            local package_file="${package}-${version}-${architecture}-${{runner.os}}.${{ matrix.os.file-extension }}"
+            local package_file="${package}-${version}-${{ runner.os }}-${{ runner.arch }}.${{ matrix.os.file-extension }}"
             ${{matrix.os.archive-command}} "${package_file}" "${assets[@]}"
           )
 
@@ -159,5 +157,5 @@ jobs:
         if: ${{ matrix.stack-yaml == 'stack.yaml' }}
         uses: actions/upload-artifact@v3
         with:
-          name: 'dhall-${{runner.os}}.${{matrix.os.file-extension}}'
-          path: 'dhall-*${{runner.os}}.${{matrix.os.file-extension}}'
+          name: 'dhall-${{ runner.os }}-${{ runner.arch }}.${{ matrix.os.file-extension }}'
+          path: 'dhall-*${{ runner.os }}-${{ runner.arch }}.${{ matrix.os.file-extension }}'