From 1088e3c1fe02cf06fda353da9154fe5a574ac31c Mon Sep 17 00:00:00 2001
From: Sergei Winitzki <winitzki@users.noreply.github.com>
Date: Fri, 31 May 2024 14:45:29 +0200
Subject: [PATCH] fixing the MacOS build (#2586)

* no-op change just to test the build

* wip add explicit homebrew command for libsodium

* wip

* Revert "wip add explicit homebrew command for libsodium"

This reverts commit ada55e1220d28a7d66ec962c00442de33a02ca47.

* wip

* bump ci

* change a to b

* Revert "change a to b"

This reverts commit ab714354ea5cae0a14ec28b83610f634de5c394a.

* reinstall libsodium

* Revert "Revert "change a to b""

This reverts commit 81631fc65755573bca6235b43ec12175a9524d10.

* remove libsodium override as it does not work

* wip

* wip

* use macos-14-large

* remove hnix override

* wip

* wip

* use macos-14-latest

* use macos-13

* respond to comments from mmhut

* try with macos-latest once again

* revert dummy change

* add macos-13
---
 .github/workflows/main.yml | 6 +++++-
 dhall/src/Dhall/Eval.hs    | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 7de224fd6..be74463b9 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -13,6 +13,10 @@ jobs:
             archive-command: 'tar --create --bzip2 --file'
             file-extension: 'tar.bz2'
             executable-extension: ''
+          - runner: 'macos-13'
+            archive-command: 'tar --create --bzip2 --file'
+            file-extension: 'tar.bz2'
+            executable-extension: ''
           - runner: 'ubuntu-latest'
             archive-command: 'tar --create --bzip2 --file'
             file-extension: 'tar.bz2'
@@ -37,7 +41,7 @@ jobs:
           submodules: true
       - id: setup-haskell-cabal
         name: "Setup Haskell environment"
-        uses: haskell-actions/setup@v2.5
+        uses: haskell-actions/setup@v2.7
         with:
           enable-stack: true
           stack-version: "latest"
diff --git a/dhall/src/Dhall/Eval.hs b/dhall/src/Dhall/Eval.hs
index aac4b0c28..baeeca77a 100644
--- a/dhall/src/Dhall/Eval.hs
+++ b/dhall/src/Dhall/Eval.hs
@@ -122,7 +122,7 @@ instance Semigroup (VChunks a) where
   VChunks xys z <> VChunks [] z' = VChunks xys (z <> z')
   VChunks xys z <> VChunks ((x', y'):xys') z' = VChunks (xys ++ (z <> x', y'):xys') z'
 
-instance Monoid (VChunks a) where
+instance Monoid (VChunks b) where
   mempty = VChunks [] mempty
 
 {-| Some information is lost when `eval` converts a `Lam` or a built-in function