From 0225277291994695b60757b7e20363de4c0c766f Mon Sep 17 00:00:00 2001
From: jared-w <jaredweakly@gmail.com>
Date: Thu, 4 Nov 2021 06:58:18 -0700
Subject: [PATCH 1/7] Update versions

---
 setup/README.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/setup/README.md b/setup/README.md
index 676d0cac..33f114dd 100644
--- a/setup/README.md
+++ b/setup/README.md
@@ -162,7 +162,10 @@ Suggestion: Try to support the three latest major versions of GHC.
 **Cabal:**
 
 - `latest` (default, recommended)
-- `3.4.0.0` `3.4`
+- `3.6.2.0` `3.6`
+- `3.6.0.0`
+- `3.4.1.0` `3.4`
+- `3.4.0.0`
 - `3.2.0.0` `3.2`
 - `3.0.0.0` `3.0`
 - `2.4.1.0` `2.4`

From 7e16df72599a9136c341f0c034442ff4e6ce8097 Mon Sep 17 00:00:00 2001
From: jared-w <jaredweakly@gmail.com>
Date: Thu, 4 Nov 2021 08:51:03 -0700
Subject: [PATCH 2/7] workaround ghc 7.10.3 linking issues with ghcup

---
 .github/workflows/workflow.yml |  2 +-
 setup/dist/index.js            | 22 ++++++++++++++++++----
 setup/lib/setup-haskell.js     | 22 ++++++++++++++++++----
 setup/src/setup-haskell.ts     | 28 ++++++++++++++++++++++++----
 4 files changed, 61 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index 95f4fa10..533a5fd8 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -34,7 +34,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macOS-latest, windows-latest]
-        ghc: ["latest", "8.4.4"]
+        ghc: ["latest", "8.4.4", "7.10.3"]
         cabal: ["latest", "3.2.0.0", "3.4.0.0"]
         include:
           - os: ubuntu-latest
diff --git a/setup/dist/index.js b/setup/dist/index.js
index 81125c03..650f86c0 100644
--- a/setup/dist/index.js
+++ b/setup/dist/index.js
@@ -9645,6 +9645,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const core = __importStar(__webpack_require__(470));
 const fs = __importStar(__webpack_require__(747));
 const path = __importStar(__webpack_require__(622));
+const os_1 = __webpack_require__(87);
 const opts_1 = __webpack_require__(54);
 const installer_1 = __webpack_require__(923);
 const exec_1 = __webpack_require__(986);
@@ -9668,16 +9669,29 @@ async function run(inputs) {
             await core.group('Pre-installing GHC with stack', async () => exec_1.exec('stack', ['setup', opts.ghc.resolved]));
         if (opts.cabal.enable)
             await core.group('Setting up cabal', async () => {
+                // Create config only if it doesn't exist.
+                await exec_1.exec('cabal', ['user-config', 'init'], {
+                    silent: true,
+                    ignoreReturnCode: true
+                });
+                // Blindly appending is fine.
+                // Cabal merges these and picks the last defined option.
+                const configFile = await cabalConfig();
                 if (process.platform === 'win32') {
-                    await exec_1.exec('cabal', ['user-config', 'update'], { silent: true });
-                    const configFile = await cabalConfig();
-                    fs.appendFileSync(configFile, 'store-dir: C:\\sr\n');
+                    fs.appendFileSync(configFile, `store-dir: C:\\sr${os_1.EOL}`);
                     core.setOutput('cabal-store', 'C:\\sr');
-                    await exec_1.exec('cabal user-config update');
                 }
                 else {
                     core.setOutput('cabal-store', `${process.env.HOME}/.cabal/store`);
                 }
+                // Workaround the GHC nopie linking errors for ancient GHC verions
+                // NB: Is this _just_ for GHC 7.10.3?
+                if (opts.ghc.resolved === '7.10.3') {
+                    fs.appendFileSync(configFile, ['program-default-options', '  ghc-options: -optl-no-pie'].join(os_1.EOL) + os_1.EOL);
+                    // We cannot use cabal user-config to normalize the config because of:
+                    // https://github.com/haskell/cabal/issues/6823
+                    // await exec('cabal user-config update');
+                }
                 if (!opts.stack.enable)
                     await exec_1.exec('cabal update');
             });
diff --git a/setup/lib/setup-haskell.js b/setup/lib/setup-haskell.js
index ff4fb074..0144d46a 100644
--- a/setup/lib/setup-haskell.js
+++ b/setup/lib/setup-haskell.js
@@ -22,6 +22,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const core = __importStar(require("@actions/core"));
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
+const os_1 = require("os");
 const opts_1 = require("./opts");
 const installer_1 = require("./installer");
 const exec_1 = require("@actions/exec");
@@ -45,16 +46,29 @@ async function run(inputs) {
             await core.group('Pre-installing GHC with stack', async () => exec_1.exec('stack', ['setup', opts.ghc.resolved]));
         if (opts.cabal.enable)
             await core.group('Setting up cabal', async () => {
+                // Create config only if it doesn't exist.
+                await exec_1.exec('cabal', ['user-config', 'init'], {
+                    silent: true,
+                    ignoreReturnCode: true
+                });
+                // Blindly appending is fine.
+                // Cabal merges these and picks the last defined option.
+                const configFile = await cabalConfig();
                 if (process.platform === 'win32') {
-                    await exec_1.exec('cabal', ['user-config', 'update'], { silent: true });
-                    const configFile = await cabalConfig();
-                    fs.appendFileSync(configFile, 'store-dir: C:\\sr\n');
+                    fs.appendFileSync(configFile, `store-dir: C:\\sr${os_1.EOL}`);
                     core.setOutput('cabal-store', 'C:\\sr');
-                    await exec_1.exec('cabal user-config update');
                 }
                 else {
                     core.setOutput('cabal-store', `${process.env.HOME}/.cabal/store`);
                 }
+                // Workaround the GHC nopie linking errors for ancient GHC verions
+                // NB: Is this _just_ for GHC 7.10.3?
+                if (opts.ghc.resolved === '7.10.3') {
+                    fs.appendFileSync(configFile, ['program-default-options', '  ghc-options: -optl-no-pie'].join(os_1.EOL) + os_1.EOL);
+                    // We cannot use cabal user-config to normalize the config because of:
+                    // https://github.com/haskell/cabal/issues/6823
+                    // await exec('cabal user-config update');
+                }
                 if (!opts.stack.enable)
                     await exec_1.exec('cabal update');
             });
diff --git a/setup/src/setup-haskell.ts b/setup/src/setup-haskell.ts
index 7b0fab46..25f3e13d 100644
--- a/setup/src/setup-haskell.ts
+++ b/setup/src/setup-haskell.ts
@@ -1,6 +1,7 @@
 import * as core from '@actions/core';
 import * as fs from 'fs';
 import * as path from 'path';
+import {EOL} from 'os';
 import {getOpts, getDefaults, Tool} from './opts';
 import {installTool} from './installer';
 import type {OS} from './opts';
@@ -36,16 +37,35 @@ export default async function run(
 
     if (opts.cabal.enable)
       await core.group('Setting up cabal', async () => {
+        // Create config only if it doesn't exist.
+        await exec('cabal', ['user-config', 'init'], {
+          silent: true,
+          ignoreReturnCode: true
+        });
+        // Blindly appending is fine.
+        // Cabal merges these and picks the last defined option.
+        const configFile = await cabalConfig();
         if (process.platform === 'win32') {
-          await exec('cabal', ['user-config', 'update'], {silent: true});
-          const configFile = await cabalConfig();
-          fs.appendFileSync(configFile, 'store-dir: C:\\sr\n');
+          fs.appendFileSync(configFile, `store-dir: C:\\sr${EOL}`);
           core.setOutput('cabal-store', 'C:\\sr');
-          await exec('cabal user-config update');
         } else {
           core.setOutput('cabal-store', `${process.env.HOME}/.cabal/store`);
         }
 
+        // Workaround the GHC nopie linking errors for ancient GHC verions
+        // NB: Is this _just_ for GHC 7.10.3?
+        if (opts.ghc.resolved === '7.10.3') {
+          fs.appendFileSync(
+            configFile,
+            ['program-default-options', '  ghc-options: -optl-no-pie'].join(
+              EOL
+            ) + EOL
+          );
+
+          // We cannot use cabal user-config to normalize the config because of:
+          // https://github.com/haskell/cabal/issues/6823
+          // await exec('cabal user-config update');
+        }
         if (!opts.stack.enable) await exec('cabal update');
       });
 

From 6c00f2c034a2904c36d87e2affb65b58f82e1076 Mon Sep 17 00:00:00 2001
From: jared-w <jaredweakly@gmail.com>
Date: Thu, 11 Nov 2021 12:45:07 -0800
Subject: [PATCH 3/7] Clean environment before installation

---
 setup/dist/index.js        | 29 +++++++++++++++++++++++++++--
 setup/lib/installer.d.ts   |  1 +
 setup/lib/installer.js     | 25 ++++++++++++++++++++++++-
 setup/lib/setup-haskell.js |  4 +++-
 setup/src/installer.ts     | 28 ++++++++++++++++++++++++++++
 setup/src/setup-haskell.ts | 10 ++++++++--
 6 files changed, 91 insertions(+), 6 deletions(-)

diff --git a/setup/dist/index.js b/setup/dist/index.js
index 650f86c0..a24f1cc6 100644
--- a/setup/dist/index.js
+++ b/setup/dist/index.js
@@ -9663,8 +9663,10 @@ async function run(inputs) {
         core.info('Preparing to setup a Haskell environment');
         const os = process.platform;
         const opts = opts_1.getOpts(opts_1.getDefaults(os), os, inputs);
-        for (const [t, { resolved }] of Object.entries(opts).filter(o => o[1].enable))
+        for (const [t, { resolved }] of Object.entries(opts).filter(o => o[1].enable)) {
+            await core.group(`Preparing ${t} environment`, async () => installer_1.resetTool(t, resolved, os));
             await core.group(`Installing ${t} version ${resolved}`, async () => installer_1.installTool(t, resolved, os));
+        }
         if (opts.stack.setup)
             await core.group('Pre-installing GHC with stack', async () => exec_1.exec('stack', ['setup', opts.ghc.resolved]));
         if (opts.cabal.enable)
@@ -11717,7 +11719,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.installTool = void 0;
+exports.resetTool = exports.installTool = void 0;
 const core = __importStar(__webpack_require__(470));
 const exec_1 = __webpack_require__(986);
 const io_1 = __webpack_require__(1);
@@ -11849,6 +11851,29 @@ async function installTool(tool, version, os) {
     return failed(tool, version);
 }
 exports.installTool = installTool;
+async function resetTool(tool, _version, os) {
+    if (tool === 'stack') {
+        // We don't need to do anything here... yet
+        // (Once we switch to utilizing ghcup for stack when possible, we can
+        // remove this early return)
+        return;
+    }
+    let bin = '';
+    switch (os) {
+        case 'linux':
+            bin = await ghcupBin(os);
+            await exec(bin, ['unset', tool]);
+            return;
+        case 'darwin':
+            bin = await ghcupBin(os);
+            await exec(bin, ['unset', tool]);
+            return;
+        case 'win32':
+            // We don't need to do anything here... yet
+            return;
+    }
+}
+exports.resetTool = resetTool;
 async function stack(version, os) {
     core.info(`Attempting to install stack ${version}`);
     const build = {
diff --git a/setup/lib/installer.d.ts b/setup/lib/installer.d.ts
index 5561355c..3e14a2b4 100644
--- a/setup/lib/installer.d.ts
+++ b/setup/lib/installer.d.ts
@@ -1,2 +1,3 @@
 import { OS, Tool } from './opts';
 export declare function installTool(tool: Tool, version: string, os: OS): Promise<void>;
+export declare function resetTool(tool: Tool, _version: string, os: OS): Promise<void>;
diff --git a/setup/lib/installer.js b/setup/lib/installer.js
index 80f49d5b..171c78a0 100644
--- a/setup/lib/installer.js
+++ b/setup/lib/installer.js
@@ -22,7 +22,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.installTool = void 0;
+exports.resetTool = exports.installTool = void 0;
 const core = __importStar(require("@actions/core"));
 const exec_1 = require("@actions/exec");
 const io_1 = require("@actions/io");
@@ -154,6 +154,29 @@ async function installTool(tool, version, os) {
     return failed(tool, version);
 }
 exports.installTool = installTool;
+async function resetTool(tool, _version, os) {
+    if (tool === 'stack') {
+        // We don't need to do anything here... yet
+        // (Once we switch to utilizing ghcup for stack when possible, we can
+        // remove this early return)
+        return;
+    }
+    let bin = '';
+    switch (os) {
+        case 'linux':
+            bin = await ghcupBin(os);
+            await exec(bin, ['unset', tool]);
+            return;
+        case 'darwin':
+            bin = await ghcupBin(os);
+            await exec(bin, ['unset', tool]);
+            return;
+        case 'win32':
+            // We don't need to do anything here... yet
+            return;
+    }
+}
+exports.resetTool = resetTool;
 async function stack(version, os) {
     core.info(`Attempting to install stack ${version}`);
     const build = {
diff --git a/setup/lib/setup-haskell.js b/setup/lib/setup-haskell.js
index 0144d46a..78b1542c 100644
--- a/setup/lib/setup-haskell.js
+++ b/setup/lib/setup-haskell.js
@@ -40,8 +40,10 @@ async function run(inputs) {
         core.info('Preparing to setup a Haskell environment');
         const os = process.platform;
         const opts = opts_1.getOpts(opts_1.getDefaults(os), os, inputs);
-        for (const [t, { resolved }] of Object.entries(opts).filter(o => o[1].enable))
+        for (const [t, { resolved }] of Object.entries(opts).filter(o => o[1].enable)) {
+            await core.group(`Preparing ${t} environment`, async () => installer_1.resetTool(t, resolved, os));
             await core.group(`Installing ${t} version ${resolved}`, async () => installer_1.installTool(t, resolved, os));
+        }
         if (opts.stack.setup)
             await core.group('Pre-installing GHC with stack', async () => exec_1.exec('stack', ['setup', opts.ghc.resolved]));
         if (opts.cabal.enable)
diff --git a/setup/src/installer.ts b/setup/src/installer.ts
index 2fbac048..591470f4 100644
--- a/setup/src/installer.ts
+++ b/setup/src/installer.ts
@@ -169,6 +169,34 @@ export async function installTool(
   return failed(tool, version);
 }
 
+export async function resetTool(
+  tool: Tool,
+  _version: string,
+  os: OS
+): Promise<void> {
+  if (tool === 'stack') {
+    // We don't need to do anything here... yet
+    // (Once we switch to utilizing ghcup for stack when possible, we can
+    // remove this early return)
+    return;
+  }
+
+  let bin = '';
+  switch (os) {
+    case 'linux':
+      bin = await ghcupBin(os);
+      await exec(bin, ['unset', tool]);
+      return;
+    case 'darwin':
+      bin = await ghcupBin(os);
+      await exec(bin, ['unset', tool]);
+      return;
+    case 'win32':
+      // We don't need to do anything here... yet
+      return;
+  }
+}
+
 async function stack(version: string, os: OS): Promise<void> {
   core.info(`Attempting to install stack ${version}`);
   const build = {
diff --git a/setup/src/setup-haskell.ts b/setup/src/setup-haskell.ts
index 25f3e13d..49416c5f 100644
--- a/setup/src/setup-haskell.ts
+++ b/setup/src/setup-haskell.ts
@@ -3,7 +3,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import {EOL} from 'os';
 import {getOpts, getDefaults, Tool} from './opts';
-import {installTool} from './installer';
+import {installTool, resetTool} from './installer';
 import type {OS} from './opts';
 import {exec} from '@actions/exec';
 
@@ -25,10 +25,16 @@ export default async function run(
     const os = process.platform as OS;
     const opts = getOpts(getDefaults(os), os, inputs);
 
-    for (const [t, {resolved}] of Object.entries(opts).filter(o => o[1].enable))
+    for (const [t, {resolved}] of Object.entries(opts).filter(
+      o => o[1].enable
+    )) {
+      await core.group(`Preparing ${t} environment`, async () =>
+        resetTool(t as Tool, resolved, os)
+      );
       await core.group(`Installing ${t} version ${resolved}`, async () =>
         installTool(t as Tool, resolved, os)
       );
+    }
 
     if (opts.stack.setup)
       await core.group('Pre-installing GHC with stack', async () =>

From 2969042130a9faea81cfb323ff7bd46e00167591 Mon Sep 17 00:00:00 2001
From: jared-w <jaredweakly@gmail.com>
Date: Thu, 11 Nov 2021 12:49:56 -0800
Subject: [PATCH 4/7] Add e2e test for fix

---
 .github/workflows/workflow.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index 533a5fd8..8fb07311 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -40,6 +40,9 @@ jobs:
           - os: ubuntu-latest
             ghc: "8.2.2"
             cabal: "2.4.0.1"
+          - os: ubuntu-18.04
+            ghc: "7.4.1"
+            cabal: "3.4"
     steps:
       - uses: actions/checkout@v2
       - uses: ./setup

From 653bb3281f4a2ab45dafe7c1cfbb731a135de32d Mon Sep 17 00:00:00 2001
From: jared-w <jaredweakly@gmail.com>
Date: Thu, 11 Nov 2021 13:17:26 -0800
Subject: [PATCH 5/7] Add GHC 9.2 for Windows

---
 setup/README.md         | 1 +
 setup/dist/index.js     | 2 +-
 setup/lib/versions.json | 1 +
 setup/src/versions.json | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/setup/README.md b/setup/README.md
index 33f114dd..8b471bcf 100644
--- a/setup/README.md
+++ b/setup/README.md
@@ -130,6 +130,7 @@ That is, setting any "boolean" to a value other than the empty string (`""`) wil
 
 - `head`<sup>[[1]](#ghc-head-note-1)</sup>
 - `latest` (default, recommended)
+- `9.2.1` `9.2`
 - `9.0.1` `9.0`
 - `8.10.7` `8.10`
 - `8.10.6`
diff --git a/setup/dist/index.js b/setup/dist/index.js
index a24f1cc6..aa009fe4 100644
--- a/setup/dist/index.js
+++ b/setup/dist/index.js
@@ -6020,7 +6020,7 @@ function escapeProperty(s) {
 /***/ 447:
 /***/ (function(module) {
 
-module.exports = {"ghc":["9.0.1","8.10.7","8.10.6","8.10.5","8.10.4","8.10.3","8.10.2","8.10.1","8.8.4","8.8.3","8.8.2","8.8.1","8.6.5","8.6.4","8.6.3","8.6.2","8.6.1","8.4.4","8.4.3","8.4.2","8.4.1","8.2.2","8.0.2","7.10.3"],"cabal":["3.4.0.0","3.2.0.0","3.0.0.0","2.4.1.0"],"stack":["2.7.3","2.7.1","2.5.1","2.3.3","2.3.1","2.1.3","2.1.1","1.9.3","1.9.1","1.7.1","1.6.5","1.6.3","1.6.1","1.5.1","1.5.0","1.4.0","1.3.2","1.3.0","1.2.0"],"ghcup":["0.1.16.2"]};
+module.exports = {"ghc":["9.2.1","9.0.1","8.10.7","8.10.6","8.10.5","8.10.4","8.10.3","8.10.2","8.10.1","8.8.4","8.8.3","8.8.2","8.8.1","8.6.5","8.6.4","8.6.3","8.6.2","8.6.1","8.4.4","8.4.3","8.4.2","8.4.1","8.2.2","8.0.2","7.10.3"],"cabal":["3.4.0.0","3.2.0.0","3.0.0.0","2.4.1.0"],"stack":["2.7.3","2.7.1","2.5.1","2.3.3","2.3.1","2.1.3","2.1.1","1.9.3","1.9.1","1.7.1","1.6.5","1.6.3","1.6.1","1.5.1","1.5.0","1.4.0","1.3.2","1.3.0","1.2.0"],"ghcup":["0.1.16.2"]};
 
 /***/ }),
 
diff --git a/setup/lib/versions.json b/setup/lib/versions.json
index a0179b9b..11b0ed24 100644
--- a/setup/lib/versions.json
+++ b/setup/lib/versions.json
@@ -1,5 +1,6 @@
 {
     "ghc": [
+        "9.2.1",
         "9.0.1",
         "8.10.7",
         "8.10.6",
diff --git a/setup/src/versions.json b/setup/src/versions.json
index 08ee431f..8ff536a6 100644
--- a/setup/src/versions.json
+++ b/setup/src/versions.json
@@ -1,5 +1,6 @@
 {
   "ghc": [
+    "9.2.1",
     "9.0.1",
     "8.10.7",
     "8.10.6",

From fd8bf4119fcc2079f3140128f870269d57a0d3b6 Mon Sep 17 00:00:00 2001
From: jared-w <jaredweakly@gmail.com>
Date: Thu, 11 Nov 2021 13:24:34 -0800
Subject: [PATCH 6/7] Update ghcup

---
 setup/dist/index.js     | 2 +-
 setup/src/versions.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup/dist/index.js b/setup/dist/index.js
index aa009fe4..01b82e5a 100644
--- a/setup/dist/index.js
+++ b/setup/dist/index.js
@@ -6020,7 +6020,7 @@ function escapeProperty(s) {
 /***/ 447:
 /***/ (function(module) {
 
-module.exports = {"ghc":["9.2.1","9.0.1","8.10.7","8.10.6","8.10.5","8.10.4","8.10.3","8.10.2","8.10.1","8.8.4","8.8.3","8.8.2","8.8.1","8.6.5","8.6.4","8.6.3","8.6.2","8.6.1","8.4.4","8.4.3","8.4.2","8.4.1","8.2.2","8.0.2","7.10.3"],"cabal":["3.4.0.0","3.2.0.0","3.0.0.0","2.4.1.0"],"stack":["2.7.3","2.7.1","2.5.1","2.3.3","2.3.1","2.1.3","2.1.1","1.9.3","1.9.1","1.7.1","1.6.5","1.6.3","1.6.1","1.5.1","1.5.0","1.4.0","1.3.2","1.3.0","1.2.0"],"ghcup":["0.1.16.2"]};
+module.exports = {"ghc":["9.2.1","9.0.1","8.10.7","8.10.6","8.10.5","8.10.4","8.10.3","8.10.2","8.10.1","8.8.4","8.8.3","8.8.2","8.8.1","8.6.5","8.6.4","8.6.3","8.6.2","8.6.1","8.4.4","8.4.3","8.4.2","8.4.1","8.2.2","8.0.2","7.10.3"],"cabal":["3.4.0.0","3.2.0.0","3.0.0.0","2.4.1.0"],"stack":["2.7.3","2.7.1","2.5.1","2.3.3","2.3.1","2.1.3","2.1.1","1.9.3","1.9.1","1.7.1","1.6.5","1.6.3","1.6.1","1.5.1","1.5.0","1.4.0","1.3.2","1.3.0","1.2.0"],"ghcup":["0.1.17.3"]};
 
 /***/ }),
 
diff --git a/setup/src/versions.json b/setup/src/versions.json
index 8ff536a6..82000fcc 100644
--- a/setup/src/versions.json
+++ b/setup/src/versions.json
@@ -48,5 +48,5 @@
     "1.3.0",
     "1.2.0"
   ],
-  "ghcup": ["0.1.16.2"]
+  "ghcup": ["0.1.17.3"]
 }

From 0155baea8c7b2f0143634fd38b445f02ab2a950c Mon Sep 17 00:00:00 2001
From: jared-w <jaredweakly@gmail.com>
Date: Thu, 11 Nov 2021 13:32:40 -0800
Subject: [PATCH 7/7] Actually add the versions instead of just updating the
 README

---
 .github/workflows/workflow.yml |  7 +++++--
 setup/dist/index.js            |  2 +-
 setup/lib/versions.json        | 12 ++++++++++--
 setup/src/versions.json        | 10 +++++++++-
 4 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index 8fb07311..daf1b2d8 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -34,8 +34,8 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macOS-latest, windows-latest]
-        ghc: ["latest", "8.4.4", "7.10.3"]
-        cabal: ["latest", "3.2.0.0", "3.4.0.0"]
+        ghc: ["latest", "8.4.4"]
+        cabal: ["latest", "3.2.0.0"]
         include:
           - os: ubuntu-latest
             ghc: "8.2.2"
@@ -43,6 +43,9 @@ jobs:
           - os: ubuntu-18.04
             ghc: "7.4.1"
             cabal: "3.4"
+          - os: ubuntu-latest
+            ghc: "7.10.3"
+            cabal: "3.6"
     steps:
       - uses: actions/checkout@v2
       - uses: ./setup
diff --git a/setup/dist/index.js b/setup/dist/index.js
index 01b82e5a..c0ed6a8d 100644
--- a/setup/dist/index.js
+++ b/setup/dist/index.js
@@ -6020,7 +6020,7 @@ function escapeProperty(s) {
 /***/ 447:
 /***/ (function(module) {
 
-module.exports = {"ghc":["9.2.1","9.0.1","8.10.7","8.10.6","8.10.5","8.10.4","8.10.3","8.10.2","8.10.1","8.8.4","8.8.3","8.8.2","8.8.1","8.6.5","8.6.4","8.6.3","8.6.2","8.6.1","8.4.4","8.4.3","8.4.2","8.4.1","8.2.2","8.0.2","7.10.3"],"cabal":["3.4.0.0","3.2.0.0","3.0.0.0","2.4.1.0"],"stack":["2.7.3","2.7.1","2.5.1","2.3.3","2.3.1","2.1.3","2.1.1","1.9.3","1.9.1","1.7.1","1.6.5","1.6.3","1.6.1","1.5.1","1.5.0","1.4.0","1.3.2","1.3.0","1.2.0"],"ghcup":["0.1.17.3"]};
+module.exports = {"ghc":["9.2.1","9.0.1","8.10.7","8.10.6","8.10.5","8.10.4","8.10.3","8.10.2","8.10.1","8.8.4","8.8.3","8.8.2","8.8.1","8.6.5","8.6.4","8.6.3","8.6.2","8.6.1","8.4.4","8.4.3","8.4.2","8.4.1","8.2.2","8.0.2","7.10.3"],"cabal":["3.6.2.0","3.6.0.0","3.4.1.0","3.4.0.0","3.2.0.0","3.0.0.0","2.4.1.0"],"stack":["2.7.3","2.7.1","2.5.1","2.3.3","2.3.1","2.1.3","2.1.1","1.9.3","1.9.1","1.7.1","1.6.5","1.6.3","1.6.1","1.5.1","1.5.0","1.4.0","1.3.2","1.3.0","1.2.0"],"ghcup":["0.1.17.3"]};
 
 /***/ }),
 
diff --git a/setup/lib/versions.json b/setup/lib/versions.json
index 11b0ed24..a07db3bc 100644
--- a/setup/lib/versions.json
+++ b/setup/lib/versions.json
@@ -26,7 +26,15 @@
         "8.0.2",
         "7.10.3"
     ],
-    "cabal": ["3.4.0.0", "3.2.0.0", "3.0.0.0", "2.4.1.0"],
+    "cabal": [
+        "3.6.2.0",
+        "3.6.0.0",
+        "3.4.1.0",
+        "3.4.0.0",
+        "3.2.0.0",
+        "3.0.0.0",
+        "2.4.1.0"
+    ],
     "stack": [
         "2.7.3",
         "2.7.1",
@@ -48,5 +56,5 @@
         "1.3.0",
         "1.2.0"
     ],
-    "ghcup": ["0.1.16.2"]
+    "ghcup": ["0.1.17.3"]
 }
diff --git a/setup/src/versions.json b/setup/src/versions.json
index 82000fcc..2b32cc23 100644
--- a/setup/src/versions.json
+++ b/setup/src/versions.json
@@ -26,7 +26,15 @@
     "8.0.2",
     "7.10.3"
   ],
-  "cabal": ["3.4.0.0", "3.2.0.0", "3.0.0.0", "2.4.1.0"],
+  "cabal": [
+    "3.6.2.0",
+    "3.6.0.0",
+    "3.4.1.0",
+    "3.4.0.0",
+    "3.2.0.0",
+    "3.0.0.0",
+    "2.4.1.0"
+  ],
   "stack": [
     "2.7.3",
     "2.7.1",