From a64aa8f750d806b7686fe02765fae1ee26f57856 Mon Sep 17 00:00:00 2001
From: Olivier Benz <olivier.benz@b-data.ch>
Date: Wed, 11 Oct 2023 11:24:49 +0200
Subject: [PATCH 1/2] Dev Container: Add 'GHC 9.8.1'

---
 .devcontainer/ghc-9.8.1/devcontainer.json | 63 +++++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 .devcontainer/ghc-9.8.1/devcontainer.json

diff --git a/.devcontainer/ghc-9.8.1/devcontainer.json b/.devcontainer/ghc-9.8.1/devcontainer.json
new file mode 100644
index 0000000000..c5022f0949
--- /dev/null
+++ b/.devcontainer/ghc-9.8.1/devcontainer.json
@@ -0,0 +1,63 @@
+{
+  "name": "GHC 9.8.1",
+  "build": {
+    "dockerfile": "../GHC.Dockerfile",
+    "context": "..",
+    "args": {
+      "GHC_VERSION": "9.8.1",
+      "USE_ZSH_FOR_ROOT": "unset-to-use-ash",
+      "SET_LANG": "C.UTF-8",
+      "SET_TZ": ""
+    }
+  },
+
+  "onCreateCommand": "onCreateCommand.sh",
+  "postCreateCommand": "cabal update",
+
+  "features": {
+    "ghcr.io/devcontainers/features/common-utils:2": {
+      "configureZshAsDefaultShell": true,
+      "upgradePackages": false,
+      "username": "vscode",
+      "userUid": "automatic",
+      "userGid": "automatic"
+    }
+  },
+
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "eamodio.gitlens@11.7.0",
+        "exiasr.hadolint",
+        "GitHub.vscode-pull-request-github",
+        "mhutchie.git-graph",
+        "mutantdino.resourcemonitor",
+        "timonwong.shellcheck"
+      ],
+      "settings": {
+        "gitlens.showWelcomeOnInstall": false,
+        "gitlens.showWhatsNewAfterUpgrades": false,
+        "resmon.show.battery": false,
+        "resmon.show.cpufreq": false
+      }
+    }
+  },
+
+  // Set 'remoteUser' to 'root' to connect as root instead.
+  "remoteUser": "vscode",
+  "mounts": [
+    "source=stack-ghc-9.8.1-home-vscode,target=/home/vscode,type=volume"
+    // "source=${localWorkspaceFolder}/.devcontainer/bind-mounts/stack-ghc-9.8.1-home-vscode,target=/home/vscode,type=bind"
+  ],
+
+  // "remoteUser": "root",
+  // "mounts": [
+  //   "source=stack-ghc-9.8.1-root,target=/root,type=volume"
+  //   // "source=${localWorkspaceFolder}/.devcontainer/bind-mounts/stack-ghc-9.8.1-root,target=/root,type=bind"
+  // ],
+
+  // Pip: Install packages to the user site
+  "remoteEnv": {
+    "PIP_USER": "1"
+  }
+}

From 3620451c9269f4bb32154c14c2b517e88b1b99dc Mon Sep 17 00:00:00 2001
From: Olivier Benz <olivier.benz@b-data.ch>
Date: Wed, 11 Oct 2023 11:25:06 +0200
Subject: [PATCH 2/2] Dev Containers: Update HLS to v2.4.0.0

---
 .devcontainer/devcontainer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 2d5f48a939..6161653639 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -4,7 +4,7 @@
     "dockerfile": "GHC.Dockerfile",
     "args": {
       "GHC_VERSION": "9.4.7",
-      "HLS_VERSION": "2.3.0.0",
+      "HLS_VERSION": "2.4.0.0",
       "USE_ZSH_FOR_ROOT": "unset-to-use-ash",
       "SET_LANG": "C.UTF-8",
       "SET_TZ": ""