From 178ea964d1b5b72ec37de8913cf0a05c9e9dd649 Mon Sep 17 00:00:00 2001 From: Sergei Winitzki Date: Sun, 12 May 2024 10:10:30 +0200 Subject: [PATCH 01/23] no-op change just to test the build --- dhall/src/Dhall/Eval.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From ada55e1220d28a7d66ec962c00442de33a02ca47 Mon Sep 17 00:00:00 2001 From: Sergei Winitzki Date: Tue, 14 May 2024 10:37:54 +0200 Subject: [PATCH 02/23] wip add explicit homebrew command for libsodium --- .travis.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 632562c81..696a680fc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,13 +22,9 @@ branches: - master - /^\d+\.\d+\.\d+(\.\d+)?$/ -addons: - homebrew: - packages: - - libsodium - update: true - before_install: + - arch -x86_64 /usr/local/bin/brew update + - arch -x86_64 /usr/local/bin/brew install libsodium # Using compiler above sets CC to an invalid value, so unset it - unset CC - CABALARGS="" From 2051af286656b1a7274e5d4629f40d06c0c09c78 Mon Sep 17 00:00:00 2001 From: Sergei Winitzki Date: Tue, 14 May 2024 10:46:18 +0200 Subject: [PATCH 03/23] wip --- .github/workflows/main.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7de224fd6..e23e389cc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -55,6 +55,9 @@ jobs: if [ '${{matrix.os.runner}}' == 'ubuntu-latest' ]; then sudo apt-get install -y libsodium-dev fi + if [ '${{matrix.os.runner}}' == 'macOS-latest' ]; then + arch -x86_64 /usr/local/bin/brew install libsodium + fi - name: "Build" shell: bash run: | From 7a07825ef6bcb885e6c19144f9330862b9b266c7 Mon Sep 17 00:00:00 2001 From: Sergei Winitzki Date: Wed, 22 May 2024 09:30:39 +0200 Subject: [PATCH 04/23] Revert "wip add explicit homebrew command for libsodium" This reverts commit ada55e1220d28a7d66ec962c00442de33a02ca47. --- .travis.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 696a680fc..632562c81 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,9 +22,13 @@ branches: - master - /^\d+\.\d+\.\d+(\.\d+)?$/ +addons: + homebrew: + packages: + - libsodium + update: true + before_install: - - arch -x86_64 /usr/local/bin/brew update - - arch -x86_64 /usr/local/bin/brew install libsodium # Using compiler above sets CC to an invalid value, so unset it - unset CC - CABALARGS="" From 64f5b088b0a70b8438d21ab8b47ca22260cec986 Mon Sep 17 00:00:00 2001 From: Sergei Winitzki Date: Wed, 22 May 2024 17:43:22 +0200 Subject: [PATCH 05/23] wip --- .github/workflows/main.yml | 2 +- dhall/src/Dhall/Eval.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e23e389cc..7d12cd744 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -56,7 +56,7 @@ jobs: sudo apt-get install -y libsodium-dev fi if [ '${{matrix.os.runner}}' == 'macOS-latest' ]; then - arch -x86_64 /usr/local/bin/brew install libsodium + arch -x86_64 brew install libsodium fi - name: "Build" shell: bash diff --git a/dhall/src/Dhall/Eval.hs b/dhall/src/Dhall/Eval.hs index baeeca77a..aac4b0c28 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 b) where +instance Monoid (VChunks a) where mempty = VChunks [] mempty {-| Some information is lost when `eval` converts a `Lam` or a built-in function From f65cd848f97b98e5c07afd28b72d19e9c934c186 Mon Sep 17 00:00:00 2001 From: Sergei Winitzki Date: Wed, 22 May 2024 19:07:08 +0200 Subject: [PATCH 06/23] bump ci From ab714354ea5cae0a14ec28b83610f634de5c394a Mon Sep 17 00:00:00 2001 From: Sergei Winitzki Date: Wed, 22 May 2024 19:08:14 +0200 Subject: [PATCH 07/23] change a to b --- dhall/src/Dhall/Eval.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 81631fc65755573bca6235b43ec12175a9524d10 Mon Sep 17 00:00:00 2001 From: Sergei Winitzki Date: Fri, 24 May 2024 09:55:18 +0200 Subject: [PATCH 08/23] Revert "change a to b" This reverts commit ab714354ea5cae0a14ec28b83610f634de5c394a. --- dhall/src/Dhall/Eval.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dhall/src/Dhall/Eval.hs b/dhall/src/Dhall/Eval.hs index baeeca77a..aac4b0c28 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 b) where +instance Monoid (VChunks a) where mempty = VChunks [] mempty {-| Some information is lost when `eval` converts a `Lam` or a built-in function From 31d208d09302eaacd4fdb10b0821447d96799f54 Mon Sep 17 00:00:00 2001 From: Sergei Winitzki Date: Fri, 24 May 2024 09:55:23 +0200 Subject: [PATCH 09/23] reinstall libsodium --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7d12cd744..d0bd7a3e9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -49,14 +49,14 @@ jobs: ${{ matrix.os.runner }}- path: | ${{ steps.setup-haskell-cabal.outputs.stack-root }} - - name: Install libsodium + - name: Install libsodium x86_64 shell: bash run: | if [ '${{matrix.os.runner}}' == 'ubuntu-latest' ]; then sudo apt-get install -y libsodium-dev fi if [ '${{matrix.os.runner}}' == 'macOS-latest' ]; then - arch -x86_64 brew install libsodium + arch -x86_64 brew reinstall libsodium fi - name: "Build" shell: bash From 403e3b2c28c53b440225ec70aaf65a697f69d74f Mon Sep 17 00:00:00 2001 From: Sergei Winitzki Date: Fri, 24 May 2024 09:57:59 +0200 Subject: [PATCH 10/23] Revert "Revert "change a to b"" This reverts commit 81631fc65755573bca6235b43ec12175a9524d10. --- dhall/src/Dhall/Eval.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From bab232889332c6f2dcc16deafcb0b761f912a616 Mon Sep 17 00:00:00 2001 From: Sergei Winitzki Date: Fri, 24 May 2024 19:39:16 +0200 Subject: [PATCH 11/23] remove libsodium override as it does not work --- .github/workflows/main.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d0bd7a3e9..f15323200 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -55,9 +55,6 @@ jobs: if [ '${{matrix.os.runner}}' == 'ubuntu-latest' ]; then sudo apt-get install -y libsodium-dev fi - if [ '${{matrix.os.runner}}' == 'macOS-latest' ]; then - arch -x86_64 brew reinstall libsodium - fi - name: "Build" shell: bash run: | From c7eeed98ba1247088d5857598578f3e68c5d8b04 Mon Sep 17 00:00:00 2001 From: Sergei Winitzki Date: Fri, 24 May 2024 19:42:34 +0200 Subject: [PATCH 12/23] wip --- dhall-nix/dhall-nix.cabal | 1 + 1 file changed, 1 insertion(+) diff --git a/dhall-nix/dhall-nix.cabal b/dhall-nix/dhall-nix.cabal index 6dca313db..0187bdcd2 100644 --- a/dhall-nix/dhall-nix.cabal +++ b/dhall-nix/dhall-nix.cabal @@ -31,6 +31,7 @@ Library data-fix < 0.4 , dhall >= 1.42 && < 1.43, hnix >= 0.16 && < 0.18, + hnix-store >= 0.7.0.0 && < 0.8.0.0 , lens-family-core >= 1.0.0 && < 2.2 , neat-interpolation < 0.6 , text >= 0.8.0.0 && < 2.1 From f22df5481727bb97212953688face1f02d7fdec1 Mon Sep 17 00:00:00 2001 From: Sergei Winitzki Date: Fri, 24 May 2024 19:43:56 +0200 Subject: [PATCH 13/23] wip --- dhall-nix/dhall-nix.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dhall-nix/dhall-nix.cabal b/dhall-nix/dhall-nix.cabal index 0187bdcd2..dd262d170 100644 --- a/dhall-nix/dhall-nix.cabal +++ b/dhall-nix/dhall-nix.cabal @@ -31,7 +31,7 @@ Library data-fix < 0.4 , dhall >= 1.42 && < 1.43, hnix >= 0.16 && < 0.18, - hnix-store >= 0.7.0.0 && < 0.8.0.0 , + hnix-store-core >= 0.7.0.0 && < 0.8.0.0 , lens-family-core >= 1.0.0 && < 2.2 , neat-interpolation < 0.6 , text >= 0.8.0.0 && < 2.1 From 676cc854e05f3826a96b47cb8ff1a52407eeca58 Mon Sep 17 00:00:00 2001 From: Sergei Winitzki Date: Fri, 24 May 2024 19:50:51 +0200 Subject: [PATCH 14/23] use macos-14-large --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f15323200..e248d7a1a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: os: - - runner: 'macOS-latest' + - runner: 'macos-14-large' archive-command: 'tar --create --bzip2 --file' file-extension: 'tar.bz2' executable-extension: '' From 6af4a2e570d8958a22e1bb3f2731d47bcfd8d5e2 Mon Sep 17 00:00:00 2001 From: Sergei Winitzki Date: Fri, 24 May 2024 19:53:18 +0200 Subject: [PATCH 15/23] remove hnix override --- dhall-nix/dhall-nix.cabal | 1 - 1 file changed, 1 deletion(-) diff --git a/dhall-nix/dhall-nix.cabal b/dhall-nix/dhall-nix.cabal index dd262d170..6dca313db 100644 --- a/dhall-nix/dhall-nix.cabal +++ b/dhall-nix/dhall-nix.cabal @@ -31,7 +31,6 @@ Library data-fix < 0.4 , dhall >= 1.42 && < 1.43, hnix >= 0.16 && < 0.18, - hnix-store-core >= 0.7.0.0 && < 0.8.0.0 , lens-family-core >= 1.0.0 && < 2.2 , neat-interpolation < 0.6 , text >= 0.8.0.0 && < 2.1 From 80c3493c4ffda6abcb7826001213d8aecaf8a207 Mon Sep 17 00:00:00 2001 From: Sergei Winitzki Date: Fri, 24 May 2024 19:56:19 +0200 Subject: [PATCH 16/23] wip --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e248d7a1a..9ecdb6db1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: os: - - runner: 'macos-14-large' + - runner: 'macOS-latest-large' archive-command: 'tar --create --bzip2 --file' file-extension: 'tar.bz2' executable-extension: '' From 3b52b0176eda176dfd51d1b6c97f3745abc7c793 Mon Sep 17 00:00:00 2001 From: Sergei Winitzki Date: Sat, 25 May 2024 20:44:42 +0200 Subject: [PATCH 17/23] wip --- .mergify.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mergify.yml b/.mergify.yml index 3995d681f..756724125 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -4,7 +4,7 @@ queue_rules: - check-success=hydra # Mergify explicitly recommends listing each status check separately: # https://docs.mergify.io/conditions/#validating-all-status-checks - - check-success=macOS-latest - stack.yaml + - check-success=macOS-latest-large - stack.yaml - check-success=ubuntu-latest - stack.yaml - check-success=windows-latest - stack.yaml pull_request_rules: From d92796b7fbb4d11e3a7d9df317d21487b4ab1344 Mon Sep 17 00:00:00 2001 From: Sergei Winitzki Date: Sun, 26 May 2024 19:56:28 +0200 Subject: [PATCH 18/23] use macos-14-latest --- .github/workflows/main.yml | 2 +- .mergify.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9ecdb6db1..e248d7a1a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: os: - - runner: 'macOS-latest-large' + - runner: 'macos-14-large' archive-command: 'tar --create --bzip2 --file' file-extension: 'tar.bz2' executable-extension: '' diff --git a/.mergify.yml b/.mergify.yml index 756724125..0acb8d4ef 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -4,7 +4,7 @@ queue_rules: - check-success=hydra # Mergify explicitly recommends listing each status check separately: # https://docs.mergify.io/conditions/#validating-all-status-checks - - check-success=macOS-latest-large - stack.yaml + - check-success=macos-14-large - stack.yaml - check-success=ubuntu-latest - stack.yaml - check-success=windows-latest - stack.yaml pull_request_rules: From 220841f02f6e40bd7446c692d9e955c87b4bd1cb Mon Sep 17 00:00:00 2001 From: Sergei Winitzki Date: Sun, 26 May 2024 20:02:41 +0200 Subject: [PATCH 19/23] use macos-13 --- .github/workflows/main.yml | 2 +- .mergify.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e248d7a1a..0ca71560d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: os: - - runner: 'macos-14-large' + - runner: 'macos-13' archive-command: 'tar --create --bzip2 --file' file-extension: 'tar.bz2' executable-extension: '' diff --git a/.mergify.yml b/.mergify.yml index 0acb8d4ef..0dac631c6 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -4,7 +4,7 @@ queue_rules: - check-success=hydra # Mergify explicitly recommends listing each status check separately: # https://docs.mergify.io/conditions/#validating-all-status-checks - - check-success=macos-14-large - stack.yaml + - check-success=macos-13 - stack.yaml - check-success=ubuntu-latest - stack.yaml - check-success=windows-latest - stack.yaml pull_request_rules: From 372f259d0a5c2da659afdcd24285fff7346bcb09 Mon Sep 17 00:00:00 2001 From: Sergei Winitzki Date: Fri, 31 May 2024 10:06:02 +0200 Subject: [PATCH 20/23] respond to comments from mmhut --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0ca71560d..40f400557 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -37,7 +37,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" @@ -49,7 +49,7 @@ jobs: ${{ matrix.os.runner }}- path: | ${{ steps.setup-haskell-cabal.outputs.stack-root }} - - name: Install libsodium x86_64 + - name: Install libsodium shell: bash run: | if [ '${{matrix.os.runner}}' == 'ubuntu-latest' ]; then From eea223e089f7c4010fda3c54eb4a8f1839ca134f Mon Sep 17 00:00:00 2001 From: Sergei Winitzki Date: Fri, 31 May 2024 10:58:46 +0200 Subject: [PATCH 21/23] try with macos-latest once again --- .github/workflows/main.yml | 2 +- .mergify.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 40f400557..2243374b4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: os: - - runner: 'macos-13' + - runner: 'macOS-latest' archive-command: 'tar --create --bzip2 --file' file-extension: 'tar.bz2' executable-extension: '' diff --git a/.mergify.yml b/.mergify.yml index 0dac631c6..3995d681f 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -4,7 +4,7 @@ queue_rules: - check-success=hydra # Mergify explicitly recommends listing each status check separately: # https://docs.mergify.io/conditions/#validating-all-status-checks - - check-success=macos-13 - stack.yaml + - check-success=macOS-latest - stack.yaml - check-success=ubuntu-latest - stack.yaml - check-success=windows-latest - stack.yaml pull_request_rules: From f57f72f8eb788958382e7e68ef97f1fb3378252b Mon Sep 17 00:00:00 2001 From: Sergei Winitzki Date: Fri, 31 May 2024 11:33:00 +0200 Subject: [PATCH 22/23] revert dummy change --- dhall/src/Dhall/Eval.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dhall/src/Dhall/Eval.hs b/dhall/src/Dhall/Eval.hs index baeeca77a..aac4b0c28 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 b) where +instance Monoid (VChunks a) where mempty = VChunks [] mempty {-| Some information is lost when `eval` converts a `Lam` or a built-in function From f23ccaf361df01bde574d8bf1faf0e81d2d69361 Mon Sep 17 00:00:00 2001 From: Sergei Winitzki Date: Fri, 31 May 2024 11:35:57 +0200 Subject: [PATCH 23/23] add macos-13 --- .github/workflows/main.yml | 4 ++++ dhall/src/Dhall/Eval.hs | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2243374b4..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' 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