diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2021-10-10 14:44:34 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2021-10-12 13:56:49 -0400 |
| commit | 90734f8517c3a102402691f89a990b268ad1dc69 (patch) | |
| tree | be1229f6718636913a892528404d6cc6e04cb403 | |
| parent | 342baf9c09bbb76a306a462072fd2fc54c562bb9 (diff) | |
| download | haskell-90734f8517c3a102402691f89a990b268ad1dc69.tar.gz | |
gitlab-ci: Impose upper bound on happy version
| -rwxr-xr-x | .gitlab/ci.sh | 5 | ||||
| -rw-r--r-- | .gitlab/darwin/toolchain.nix | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh index c68d847135..1cbe71754d 100755 --- a/.gitlab/ci.sh +++ b/.gitlab/ci.sh @@ -8,7 +8,8 @@ set -Eeuo pipefail # Configuration: HACKAGE_INDEX_STATE="2020-12-21T14:48:20Z" # TODO dedup with yaml's def -MIN_HAPPY_VERSION="1.20" +MIN_HAPPY_VERSION="1.19" +MAX_HAPPY_VERSION="1.20" MIN_ALEX_VERSION="3.2.6" TOP="$(pwd)" @@ -333,7 +334,7 @@ function setup_toolchain() { esac info "Building happy..." - $cabal_install happy --constraint="happy>=$MIN_HAPPY_VERSION" + $cabal_install happy --constraint="happy>=$MIN_HAPPY_VERSION && <$MAX_HAPPY_VERSION" info "Building alex..." $cabal_install alex --constraint="alex>=$MIN_ALEX_VERSION" diff --git a/.gitlab/darwin/toolchain.nix b/.gitlab/darwin/toolchain.nix index 1042b76c18..dc5a413684 100644 --- a/.gitlab/darwin/toolchain.nix +++ b/.gitlab/darwin/toolchain.nix @@ -9,7 +9,7 @@ in let hsPkgs = pkgs.haskellPackages; alex = hsPkgs.alex; - happy = hsPkgs.happy; + happy = hsPkgs.callHackage "happy" "1.19.12" {}; targetTriple = pkgs.stdenv.targetPlatform.config; ghc = pkgs.stdenv.mkDerivation rec { |