diff --git a/src/haskell/devcontainer-feature.json b/src/haskell/devcontainer-feature.json index aa7246f99..da5eb3e31 100644 --- a/src/haskell/devcontainer-feature.json +++ b/src/haskell/devcontainer-feature.json @@ -1,7 +1,7 @@ { "name": "Haskell (via ghcup)", "id": "haskell", - "version": "2.2.1", + "version": "2.2.2", "description": "Installs Haskell. An advanced, purely functional programming language", "documentationURL": "https://github.com/devcontainers-contrib/features/tree/main/src/haskell", "options": { @@ -31,11 +31,20 @@ "proposals": [ "", "hlint", - "hlint hspec pandoc" + "hlint pandoc-cli" ], "default": "", "description": "Packages to install via `cabal install`, such as `hlint` for linting. Separate with spaces. This will add significant initial build time." }, + "globalLibraries": { + "type": "string", + "proposals": [ + "", + "hspec hspec-contrib QuickCheck HUnit" + ], + "default": "", + "description": "Libraries to install via `cabal install --lib`, such as `hspec` for testing. Separate with spaces. This will add significant initial build time." + }, "installHLS": { "type": "boolean", "default": true, diff --git a/src/haskell/install.sh b/src/haskell/install.sh index ff23529ca..6390b0aec 100755 --- a/src/haskell/install.sh +++ b/src/haskell/install.sh @@ -9,6 +9,7 @@ ADJUST_BASHRC="${ADJUSTBASH:-"true"}" INSTALL_STACK_GHCUP_HOOK="${INSTALLSTACKGHCUPHOOK:-"true"}" CABAL_INSTALLS=`echo "${GLOBALPACKAGES:-""}" | tr ',' ' '` +CABAL_INSTALLS_LIBS=`echo "${GLOBALLIBRARIES:-""}" | tr ',' ' '` # Clean up rm -rf /var/lib/apt/lists/* @@ -85,8 +86,15 @@ sudo -iu "$_REMOTE_USER" <