diff --git a/images/linux/scripts/installers/haskell.sh b/images/linux/scripts/installers/haskell.sh index 1e36069a6..159c0cdea 100644 --- a/images/linux/scripts/installers/haskell.sh +++ b/images/linux/scripts/installers/haskell.sh @@ -19,16 +19,9 @@ apt-get install -y \ ghc-8.0.2 \ ghc-8.2.2 \ ghc-8.4.4 \ - ghc-8.6.2 \ - ghc-8.6.3 \ - ghc-8.6.4 \ ghc-8.6.5 \ - ghc-8.8.1 \ - ghc-8.8.2 \ ghc-8.8.3 \ ghc-8.10.1 \ - cabal-install-2.0 \ - cabal-install-2.2 \ cabal-install-2.4 \ cabal-install-3.0 \ cabal-install-3.2 @@ -39,14 +32,14 @@ curl -sSL https://raw.githubusercontent.com/commercialhaskell/stack/v2.1.3/etc/s # Run tests to determine that the software installed as expected echo "Testing to make sure that script performed as expected, and basic scenarios work" # Check all ghc versions -for version in 8.0.2 8.2.2 8.4.4 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.10.1; do +for version in 8.0.2 8.2.2 8.4.4 8.6.5 8.8.3 8.10.1; do if ! command -v /opt/ghc/$version/bin/ghc; then echo "ghc $version was not installed" exit 1 fi done # Check all cabal versions -for version in 2.0 2.2 2.4 3.0 3.2; do +for version in 2.4 3.0 3.2; do if ! command -v /opt/cabal/$version/bin/cabal; then echo "cabal $version was not installed" exit 1 @@ -59,10 +52,10 @@ fi # Document what was added to the image echo "Lastly, documenting what we added to the metadata file" -for version in 2.0 2.2 2.4 3.0 3.2; do +for version in 2.4 3.0 3.2; do DocumentInstalledItem "Haskell Cabal ($(/opt/cabal/$version/bin/cabal --version))" done -for version in 8.0.2 8.2.2 8.4.4 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.10.1; do +for version in 8.0.2 8.2.2 8.4.4 8.6.5 8.8.3 8.10.1; do DocumentInstalledItem "GHC ($(/opt/ghc/$version/bin/ghc --version))" done DocumentInstalledItem "Haskell Stack ($(stack --version))" diff --git a/images/linux/ubuntu2004.json b/images/linux/ubuntu2004.json index eec51cf48..0aa8def97 100644 --- a/images/linux/ubuntu2004.json +++ b/images/linux/ubuntu2004.json @@ -196,6 +196,7 @@ "{{template_dir}}/scripts/installers/git.sh", "{{template_dir}}/scripts/installers/google-chrome.sh", "{{template_dir}}/scripts/installers/google-cloud-sdk.sh", + "{{template_dir}}/scripts/installers/haskell.sh", "{{template_dir}}/scripts/installers/heroku.sh", "{{template_dir}}/scripts/installers/hhvm.sh", "{{template_dir}}/scripts/installers/image-magick.sh",