Skip to content

Commit

Permalink
fixing the MacOS build (#2586)
Browse files Browse the repository at this point in the history
* 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 ada55e1.

* wip

* bump ci

* change a to b

* Revert "change a to b"

This reverts commit ab71435.

* reinstall libsodium

* Revert "Revert "change a to b""

This reverts commit 81631fc.

* 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
  • Loading branch information
winitzki authored May 31, 2024
1 parent e281834 commit 1088e3c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion dhall/src/Dhall/Eval.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 1088e3c

Please sign in to comment.