diff --git a/.github/workflows/artifacts.yml b/.github/workflows/artifacts.yml
index 431b0eba9db..27a4d58b81a 100644
--- a/.github/workflows/artifacts.yml
+++ b/.github/workflows/artifacts.yml
@@ -27,8 +27,8 @@ jobs:
       - uses: actions/checkout@v2
       - name: Package project
         run: |
-          cabal v2-sdist --builddir=sdist Cabal cabal-install
-          python3.8 release.py --tarlib=sdist/sdist/Cabal-*.tar.gz --tarexe=sdist/sdist/cabal-install-*.tar.gz
+          cabal v2-sdist --builddir=sdist Cabal cabal-install-solver cabal-install
+          python3.8 release.py --tarlib=sdist/sdist/Cabal-*.tar.gz --tarsolver=sdist/sdist/cabal-install-solver-3.*.tar.gz --tarexe=sdist/sdist/cabal-install-3.*.tar.gz
       - uses: actions/upload-artifact@v2
         with:
           name: cabal-linux
@@ -62,8 +62,8 @@ jobs:
       - uses: actions/checkout@v2
       - name: Package project
         run: |
-          cabal v2-sdist --builddir=sdist Cabal cabal-install
-          python3 release.py --tarlib=sdist/sdist/Cabal-*.tar.gz --tarexe=sdist/sdist/cabal-install-*.tar.gz
+          cabal v2-sdist --builddir=sdist Cabal cabal-install-solver cabal-install
+          python3 release.py --tarlib=sdist/sdist/Cabal-*.tar.gz --tarsolver=sdist/sdist/cabal-install-solver-3.*.tar.gz --tarexe=sdist/sdist/cabal-install-3.*.tar.gz
       - uses: actions/upload-artifact@v2
         with:
           name: cabal-macos
@@ -93,9 +93,9 @@ jobs:
       - name: Package project
         # We hardcode version 3 here to make first glob not overlap with cabal-install
         run: |
-          cabal v2-sdist --builddir=sdist Cabal cabal-install
+          cabal v2-sdist --builddir=sdist Cabal cabal-install-solver cabal-install
           New-Item -Path "_build" -ItemType "directory"
-          python release.py --tarlib=$(Resolve-Path -Path sdist/sdist/Cabal-3.*.tar.gz) --tarexe=$(Resolve-Path -Path sdist/sdist/cabal-install-3.*.tar.gz)
+          python release.py --tarlib=$(Resolve-Path -Path sdist/sdist/Cabal-3.*.tar.gz) --tarsolver=$(Resolve-Path -Path sdist/sdist/cabal-install-solver-3.*.tar.gz) --tarexe=$(Resolve-Path -Path sdist/sdist/cabal-install-3.*.tar.gz)
       - uses: actions/upload-artifact@v2
         with:
           name: cabal-windows
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 238c4755a3a..544011da33a 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -319,19 +319,15 @@ jobs:
           git fetch origin $GITHUB_SHA:temporary-ci-branch
           git checkout $GITHUB_SHA || (git fetch && git checkout $GITHUB_SHA)
       - name: Validate print-config
-        run: sh validate.sh -j 2 -w ghc-8.0.2 -v  -s print-config
+        run: sh validate.sh -j 2 -w ghc-8.0.2 -v --lib-only -s print-config
       - name: Validate print-tool-versions
-        run: sh validate.sh -j 2 -w ghc-8.0.2 -v  -s print-tool-versions
+        run: sh validate.sh -j 2 -w ghc-8.0.2 -v --lib-only -s print-tool-versions
       - name: Validate build
-        run: sh validate.sh -j 2 -w ghc-8.0.2 -v  -s build
+        run: sh validate.sh -j 2 -w ghc-8.0.2 -v --lib-only -s build
       - name: Validate lib-tests
-        run: sh validate.sh -j 2 -w ghc-8.0.2 -v  -s lib-tests
+        run: sh validate.sh -j 2 -w ghc-8.0.2 -v --lib-only -s lib-tests
       - name: Validate lib-suite
-        run: sh validate.sh -j 2 -w ghc-8.0.2 -v  -s lib-suite
-      - name: Validate cli-tests
-        run: sh validate.sh -j 2 -w ghc-8.0.2 -v  -s cli-tests
-      - name: Validate cli-suite
-        run: sh validate.sh -j 2 -w ghc-8.0.2 -v  -s cli-suite
+        run: sh validate.sh -j 2 -w ghc-8.0.2 -v --lib-only -s lib-suite
   validate-7_10_3:
     name: validate.sh ghc-7.10.3
     runs-on: ubuntu-18.04
@@ -365,19 +361,15 @@ jobs:
           git fetch origin $GITHUB_SHA:temporary-ci-branch
           git checkout $GITHUB_SHA || (git fetch && git checkout $GITHUB_SHA)
       - name: Validate print-config
-        run: sh validate.sh -j 2 -w ghc-7.10.3 -v  -s print-config
+        run: sh validate.sh -j 2 -w ghc-7.10.3 -v --lib-only -s print-config
       - name: Validate print-tool-versions
-        run: sh validate.sh -j 2 -w ghc-7.10.3 -v  -s print-tool-versions
+        run: sh validate.sh -j 2 -w ghc-7.10.3 -v --lib-only -s print-tool-versions
       - name: Validate build
-        run: sh validate.sh -j 2 -w ghc-7.10.3 -v  -s build
+        run: sh validate.sh -j 2 -w ghc-7.10.3 -v --lib-only -s build
       - name: Validate lib-tests
-        run: sh validate.sh -j 2 -w ghc-7.10.3 -v  -s lib-tests
+        run: sh validate.sh -j 2 -w ghc-7.10.3 -v --lib-only -s lib-tests
       - name: Validate lib-suite
-        run: sh validate.sh -j 2 -w ghc-7.10.3 -v  -s lib-suite
-      - name: Validate cli-tests
-        run: sh validate.sh -j 2 -w ghc-7.10.3 -v  -s cli-tests
-      - name: Validate cli-suite
-        run: sh validate.sh -j 2 -w ghc-7.10.3 -v  -s cli-suite
+        run: sh validate.sh -j 2 -w ghc-7.10.3 -v --lib-only -s lib-suite
   validate-7_8_4:
     name: validate.sh ghc-7.8.4
     runs-on: ubuntu-18.04
diff --git a/.github/workflows/quick-jobs.yml b/.github/workflows/quick-jobs.yml
index 3ca215a9876..d408045eaf6 100644
--- a/.github/workflows/quick-jobs.yml
+++ b/.github/workflows/quick-jobs.yml
@@ -41,7 +41,6 @@ jobs:
           make -B spdx
           make -B templates
           make -B github-actions
-          make -B cabal-install-cabal
       - name: Check that diff is clean
         run: |
           git status > /dev/null
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 5bc427fb423..b11e3a945e3 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -37,8 +37,6 @@ jobs:
       - name: Update Hackage index
         run: cabal v2-update
       - uses: actions/checkout@v2
-      - name: make cabal-install-dev
-        run: cp cabal-install/cabal-install.cabal.dev cabal-install/cabal-install.cabal
       # We cannot ask for all dependencies, but we can for Cabal.
       - name: cabal v2-build Cabal --only-dependencies
         run: cabal v2-build Cabal --only-dependencies
@@ -51,10 +49,10 @@ jobs:
         run: |
           cd cabal-install
           cabal v2-run cabal-install:memory-usage-tests
-      - name: cabal-install solver-quickcheck
+      - name: cabal-install long-tests
         run: |
           cd cabal-install
-          cabal v2-run cabal-install:solver-quickcheck
+          cabal v2-run cabal-install:long-tests -- --pattern "! (/FileMonitor/ || /VCS/ || /Get/)"
       - name: cabal-install integration-tests2
         run: |
           cd cabal-install
@@ -87,8 +85,6 @@ jobs:
       - name: Update Hackage index
         run: cabal v2-update
       - uses: actions/checkout@v2
-      - name: make cabal-install-dev
-        run: cp cabal-install/cabal-install.cabal.dev cabal-install/cabal-install.cabal
       # We cannot ask for all dependencies, but we can for Cabal.
       - name: cabal v2-build Cabal --only-dependencies
         run: cabal v2-build Cabal --only-dependencies
@@ -101,10 +97,10 @@ jobs:
         run: |
           cd cabal-install
           cabal v2-run cabal-install:memory-usage-tests
-      - name: cabal-install solver-quickcheck
+      - name: cabal-install long-tests
         run: |
           cd cabal-install
-          cabal v2-run cabal-install:solver-quickcheck
+          cabal v2-run cabal-install:long-tests -- --pattern "! (/FileMonitor/ || /VCS/ || /Get/)"
       - name: cabal-install integration-tests2
         run: |
           cd cabal-install
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ba2fea4fab4..ddb57f1087c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -137,9 +137,9 @@ There are also other test suites:
   on some utility functions in cabal-install you should run this test
   suite.
 
-* `cabal-install:solver-quickcheck` are QuickCheck tests on
-  cabal-install's dependency solver.  If you are working
-  on the solver you should run this test suite.
+* `cabal-install:long-tests` are QuickCheck tests on
+  cabal-install's dependency solver, VCS, and file monitoring code.
+  If you are working on the solver you should run this test suite.
 
 * `cabal-install:integration-tests2` are integration tests on some
   top-level API functions inside the `cabal-install` source code.
diff --git a/Makefile b/Makefile
index d502bf3ccb1..4076b12e335 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,4 @@
 .PHONY : all lexer sdpx lib exe doctest
-.PHONY : cabal-install-dev cabal-install-prod
 .PHONY : phony
 
 CABALBUILD := cabal v2-build
@@ -97,7 +96,7 @@ doctest :
 
 # This is not run as part of validate.sh (we need hackage-security, which is tricky to get).
 doctest-cli :
-	doctest -D__DOCTEST__ --fast cabal-install/src cabal-install/cabal-install-solver/src cabal-install/cabal-install-solver/src-assertion
+	doctest -D__DOCTEST__ --fast cabal-install/src cabal-install-solver/src cabal-install-solver/src-assertion
 
 # tests
 
diff --git a/appveyor.yml b/appveyor.yml
index 86b93d5e423..f034bdeec74 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -47,7 +47,6 @@ cache:
   - "C:\\sr"
 
 build_script:
-  - cp cabal-install/cabal-install.cabal.dev cabal-install/cabal-install.cabal
   - cabal %CABOPTS% v2-configure --enable-tests
   - appveyor-retry cabal %CABOPTS% v2-build lib:Cabal --only-dependencies
   - cabal %CABOPTS% v2-build lib:Cabal
@@ -59,6 +58,6 @@ build_script:
   - appveyor-retry cabal %CABOPTS% v2-build cabal-install:tests --only-dependencies
   - cd cabal-install
   - cabal %CABOPTS% v2-run cabal-install:memory-usage-tests
-  - cabal %CABOPTS% v2-run cabal-install:solver-quickcheck
+  - cabal %CABOPTS% v2-run cabal-install:long-tests -- --pattern "! (/FileMonitor/ || /VCS/ || /Get/)"
   - cabal %CABOPTS% v2-run cabal-install:integration-tests2
   - cabal %CABOPTS% v2-run cabal-install:unit-tests -- --pattern "! (/FileMonitor/ || /VCS/ || /Get/)"
diff --git a/bootstrap/linux-8.10.1.json b/bootstrap/linux-8.10.1.json
index a51badba2f3..e69de29bb2d 100644
--- a/bootstrap/linux-8.10.1.json
+++ b/bootstrap/linux-8.10.1.json
@@ -1,340 +0,0 @@
-{
-    "builtin": [
-        {
-            "package": "rts",
-            "version": "1.0"
-        },
-        {
-            "package": "ghc-prim",
-            "version": "0.6.1"
-        },
-        {
-            "package": "integer-gmp",
-            "version": "1.0.3.0"
-        },
-        {
-            "package": "base",
-            "version": "4.14.0.0"
-        },
-        {
-            "package": "array",
-            "version": "0.5.4.0"
-        },
-        {
-            "package": "deepseq",
-            "version": "1.4.4.0"
-        },
-        {
-            "package": "bytestring",
-            "version": "0.10.10.0"
-        },
-        {
-            "package": "containers",
-            "version": "0.6.2.1"
-        },
-        {
-            "package": "binary",
-            "version": "0.8.8.0"
-        },
-        {
-            "package": "filepath",
-            "version": "1.4.2.1"
-        },
-        {
-            "package": "time",
-            "version": "1.9.3"
-        },
-        {
-            "package": "unix",
-            "version": "2.7.2.2"
-        },
-        {
-            "package": "directory",
-            "version": "1.3.6.0"
-        },
-        {
-            "package": "transformers",
-            "version": "0.5.6.2"
-        },
-        {
-            "package": "mtl",
-            "version": "2.2.2"
-        },
-        {
-            "package": "text",
-            "version": "1.2.3.2"
-        },
-        {
-            "package": "parsec",
-            "version": "3.1.14.0"
-        },
-        {
-            "package": "pretty",
-            "version": "1.1.3.6"
-        },
-        {
-            "package": "process",
-            "version": "1.6.8.2"
-        },
-        {
-            "package": "ghc-boot-th",
-            "version": "8.10.1"
-        },
-        {
-            "package": "template-haskell",
-            "version": "2.16.0.0"
-        },
-        {
-            "package": "stm",
-            "version": "2.5.0.0"
-        }
-    ],
-    "dependencies": [
-        {
-            "cabal_sha256": null,
-            "flags": [
-                "-bundled-binary-generic"
-            ],
-            "package": "Cabal",
-            "revision": null,
-            "source": "local",
-            "src_sha256": null,
-            "version": "3.5.0.0"
-        },
-        {
-            "cabal_sha256": "b704cb6676c03e98267190df797497587576a2e96094550ea143415239bbe66e",
-            "flags": [],
-            "package": "network",
-            "revision": 0,
-            "source": "hackage",
-            "src_sha256": "d7ef590173fff2ab522fbc167f3fafb867e4ecfca279eb3ef0d137b51f142c9a",
-            "version": "3.1.1.1"
-        },
-        {
-            "cabal_sha256": "d2d9ff3a80d9b2d1ff317a354bc0c56cc109c69a4c2449e5fc712d3ddce83ede",
-            "flags": [],
-            "package": "network-uri",
-            "revision": 0,
-            "source": "hackage",
-            "src_sha256": "a01c1389f15d2cc2e847914737f706133bb11f0c5f8ee89711a36a25b7afa723",
-            "version": "2.6.3.0"
-        },
-        {
-            "cabal_sha256": "3c19975fdfd8d057eae58847bda6a79514ad882fd6f8ead72ac0247af34bdfc6",
-            "flags": [
-                "-conduit10",
-                "-mtl1",
-                "+network-uri",
-                "-warn-as-error",
-                "-warp-tests"
-            ],
-            "package": "HTTP",
-            "revision": 1,
-            "source": "hackage",
-            "src_sha256": "a602d7f30e917164c6a634f8cb1f5df4849048858db01380a0875e16e5aa687b",
-            "version": "4000.3.14"
-        },
-        {
-            "cabal_sha256": "4c70f1407881059e93550d3742191254296b2737b793a742bd901348fb3e1fb1",
-            "flags": [
-                "-examples",
-                "+integer-gmp",
-                "+sse2",
-                "-sse41"
-            ],
-            "package": "hashable",
-            "revision": 1,
-            "source": "hackage",
-            "src_sha256": "822e5413fbccca6ae884d3aba4066422c8b5d58d23d18b9ecb5c03273bb19ab4",
-            "version": "1.3.0.0"
-        },
-        {
-            "cabal_sha256": "a178c166856da7ff22fe4500337b54812e94fd2059409452187d72e057ede9cd",
-            "flags": [
-                "-bench"
-            ],
-            "package": "async",
-            "revision": 1,
-            "source": "hackage",
-            "src_sha256": "4b4ab1ac82c45144d82c6daf6cb6ba45eab9957dad44787fa5e869e23d73bbff",
-            "version": "2.2.2"
-        },
-        {
-            "cabal_sha256": "8cbba2505d4da4f6cfc90cd36c8e8ad0c09c056538481ea00e8b10b78f70cb10",
-            "flags": [],
-            "package": "base16-bytestring",
-            "revision": 0,
-            "source": "hackage",
-            "src_sha256": "525689679d5cc80fa532c1d5cfeace0f62bbb54134fad514f1ba00d0e7fe69ba",
-            "version": "0.1.1.7"
-        },
-        {
-            "cabal_sha256": "190264fef9e65d9085f00ccda419137096d1dc94777c58272bc96821dc7f37c3",
-            "flags": [],
-            "package": "base64-bytestring",
-            "revision": 0,
-            "source": "hackage",
-            "src_sha256": "210d6c9042241ca52ee5d89cf221dbeb4d0e64b37391345369035ad2d9b4aca9",
-            "version": "1.1.0.0"
-        },
-        {
-            "cabal_sha256": "b963d6308db096362d73d9c603b331cf188aa69310195f479dfedf6045d7e602",
-            "flags": [
-                "-exe"
-            ],
-            "package": "cryptohash-sha256",
-            "revision": 4,
-            "source": "hackage",
-            "src_sha256": "52756435dbea248e344fbcbcc5df5307f60dfacf337dfd11ae30f1c7a4da05dd",
-            "version": "0.11.101.0"
-        },
-        {
-            "cabal_sha256": "5490be9cfbea95e14a7a68b7d055ae8d295822e0b146d2ac8285b3e5a3e3282f",
-            "flags": [
-                "-example"
-            ],
-            "package": "echo",
-            "revision": 1,
-            "source": "hackage",
-            "src_sha256": "704f07310f8272d170f8ab7fb2a2c13f15d8501ef8310801e36964c8eff485ef",
-            "version": "0.1.3"
-        },
-        {
-            "cabal_sha256": "d50c4d0801a35be7875a040470c09863342514930c82a7d25780a6c2efc4fda9",
-            "flags": [
-                "-optimised-mixer"
-            ],
-            "package": "splitmix",
-            "revision": 0,
-            "source": "hackage",
-            "src_sha256": "1c11c87352ddbb13365380fe163f99bb8f8845ebc96ca1d572e5d3a9bf810bfa",
-            "version": "0.1"
-        },
-        {
-            "cabal_sha256": "5ca8674e95c46c7eb90f520c26aea22d403625c97697275434afba66ebd32b05",
-            "flags": [],
-            "package": "random",
-            "revision": 0,
-            "source": "hackage",
-            "src_sha256": "e4519cf7c058bfd5bdbe4acc782284acc9e25e74487208619ca83cbcd63fb9de",
-            "version": "1.2.0"
-        },
-        {
-            "cabal_sha256": "4d33a49cd383d50af090f1b888642d10116e43809f9da6023d9fc6f67d2656ee",
-            "flags": [],
-            "package": "edit-distance",
-            "revision": 1,
-            "source": "hackage",
-            "src_sha256": "3e8885ee2f56ad4da940f043ae8f981ee2fe336b5e8e4ba3f7436cff4f526c4a",
-            "version": "0.2.2.1"
-        },
-        {
-            "cabal_sha256": "fb98b08de467d51f788f8bd9391f0e9ab9bd4d8dfc264296b895ffea0d822dfa",
-            "flags": [
-                "+no-donna",
-                "+test-doctests",
-                "+test-hlint",
-                "+test-properties"
-            ],
-            "package": "ed25519",
-            "revision": 3,
-            "source": "hackage",
-            "src_sha256": "d8a5958ebfa9309790efade64275dc5c441b568645c45ceed1b0c6ff36d6156d",
-            "version": "0.0.5.0"
-        },
-        {
-            "cabal_sha256": "c9d3fa30fb6ab2ba16e037586ca79be6e57ec5f00381b6ee5f293400dbdf5515",
-            "flags": [
-                "+ofd-locking"
-            ],
-            "package": "lukko",
-            "revision": 0,
-            "source": "hackage",
-            "src_sha256": "8a79d113dc0ccef16c24d83379cc457485943027e777529c46362fecc06607d2",
-            "version": "0.1.1.2"
-        },
-        {
-            "cabal_sha256": "7a715414c4d494c9048cfb6d7634e07e7732ca154cb8938dc85f6ea192192e8c",
-            "flags": [
-                "-old-bytestring",
-                "-old-time"
-            ],
-            "package": "tar",
-            "revision": 2,
-            "source": "hackage",
-            "src_sha256": "b384449f62b2b0aa3e6d2cb1004b8060b01f21ec93e7b63e7af6d8fad8a9f1de",
-            "version": "0.5.1.1"
-        },
-        {
-            "cabal_sha256": "d34ddf5fece4d1e9d471b5298f36335bb3cfe12cb5a1b8525c42f0b665382f45",
-            "flags": [
-                "-non-blocking-ffi",
-                "-pkg-config"
-            ],
-            "package": "zlib",
-            "revision": 1,
-            "source": "hackage",
-            "src_sha256": "f0f810ff173560b60392db448455c0513b3239f48e43cb494b3733aa559621d0",
-            "version": "0.6.2.1"
-        },
-        {
-            "cabal_sha256": "692c385c085baa2813046ae58e31df21c250346b81c882431b5ffef76451a18a",
-            "flags": [
-                "+base48",
-                "+lukko",
-                "-mtl21",
-                "-old-directory",
-                "+use-network-uri"
-            ],
-            "package": "hackage-security",
-            "revision": 2,
-            "source": "hackage",
-            "src_sha256": "9162b473af5a21c1ff32a50b972b9acf51f4c901604a22cf08a2dccac2f82f17",
-            "version": "0.6.0.1"
-        },
-        {
-            "cabal_sha256": "44aa95ca762294ffbb28cf0af9c567d93b5d2c56e4f38ce5385a257d899f968e",
-            "flags": [],
-            "package": "regex-base",
-            "revision": 1,
-            "source": "hackage",
-            "src_sha256": "c41f82f5fc1157c961a4cbdc0cd5561e5aa44f339ce6e706d978d97e0ca6b914",
-            "version": "0.94.0.0"
-        },
-        {
-            "cabal_sha256": "690d1366e9ea6df71ded3daf49ca3d53c63eda3f95937962299b2391824dc3b3",
-            "flags": [
-                "-_regex-posix-clib"
-            ],
-            "package": "regex-posix",
-            "revision": 1,
-            "source": "hackage",
-            "src_sha256": "251300f1a6bb2e91abb8bf513a21981f8fab79c98a65acea2bb6d6a524414521",
-            "version": "0.96.0.0"
-        },
-        {
-            "cabal_sha256": "0a9a6dd29706258ae60a5c22aecc140a40743b8f08fc324fd9984e7dfbf3a80d",
-            "flags": [],
-            "package": "resolv",
-            "revision": 0,
-            "source": "hackage",
-            "src_sha256": "81a2bafad484db123cf8d17a02d98bb388a127fd0f822fa022589468a0e64671",
-            "version": "0.1.2.0"
-        },
-        {
-            "cabal_sha256": null,
-            "flags": [
-                "-debug-conflict-sets",
-                "-debug-expensive-assertions",
-                "-debug-tracetree",
-                "+lukko",
-                "+native-dns"
-            ],
-            "package": "cabal-install",
-            "revision": null,
-            "source": "local",
-            "src_sha256": null,
-            "version": "3.5.0.0"
-        }
-    ]
-}
diff --git a/bootstrap/linux-8.6.5.json b/bootstrap/linux-8.6.5.json
index 06cac115fb0..e69de29bb2d 100644
--- a/bootstrap/linux-8.6.5.json
+++ b/bootstrap/linux-8.6.5.json
@@ -1,340 +0,0 @@
-{
-    "builtin": [
-        {
-            "package": "rts",
-            "version": "1.0"
-        },
-        {
-            "package": "ghc-prim",
-            "version": "0.5.3"
-        },
-        {
-            "package": "integer-gmp",
-            "version": "1.0.2.0"
-        },
-        {
-            "package": "base",
-            "version": "4.12.0.0"
-        },
-        {
-            "package": "array",
-            "version": "0.5.3.0"
-        },
-        {
-            "package": "deepseq",
-            "version": "1.4.4.0"
-        },
-        {
-            "package": "bytestring",
-            "version": "0.10.8.2"
-        },
-        {
-            "package": "containers",
-            "version": "0.6.0.1"
-        },
-        {
-            "package": "binary",
-            "version": "0.8.6.0"
-        },
-        {
-            "package": "filepath",
-            "version": "1.4.2.1"
-        },
-        {
-            "package": "time",
-            "version": "1.8.0.2"
-        },
-        {
-            "package": "unix",
-            "version": "2.7.2.2"
-        },
-        {
-            "package": "directory",
-            "version": "1.3.3.0"
-        },
-        {
-            "package": "transformers",
-            "version": "0.5.6.2"
-        },
-        {
-            "package": "mtl",
-            "version": "2.2.2"
-        },
-        {
-            "package": "text",
-            "version": "1.2.3.1"
-        },
-        {
-            "package": "parsec",
-            "version": "3.1.13.0"
-        },
-        {
-            "package": "pretty",
-            "version": "1.1.3.6"
-        },
-        {
-            "package": "process",
-            "version": "1.6.5.0"
-        },
-        {
-            "package": "ghc-boot-th",
-            "version": "8.6.5"
-        },
-        {
-            "package": "template-haskell",
-            "version": "2.14.0.0"
-        },
-        {
-            "package": "stm",
-            "version": "2.5.0.0"
-        }
-    ],
-    "dependencies": [
-        {
-            "cabal_sha256": null,
-            "flags": [
-                "-bundled-binary-generic"
-            ],
-            "package": "Cabal",
-            "revision": null,
-            "source": "local",
-            "src_sha256": null,
-            "version": "3.5.0.0"
-        },
-        {
-            "cabal_sha256": "b704cb6676c03e98267190df797497587576a2e96094550ea143415239bbe66e",
-            "flags": [],
-            "package": "network",
-            "revision": 0,
-            "source": "hackage",
-            "src_sha256": "d7ef590173fff2ab522fbc167f3fafb867e4ecfca279eb3ef0d137b51f142c9a",
-            "version": "3.1.1.1"
-        },
-        {
-            "cabal_sha256": "d2d9ff3a80d9b2d1ff317a354bc0c56cc109c69a4c2449e5fc712d3ddce83ede",
-            "flags": [],
-            "package": "network-uri",
-            "revision": 0,
-            "source": "hackage",
-            "src_sha256": "a01c1389f15d2cc2e847914737f706133bb11f0c5f8ee89711a36a25b7afa723",
-            "version": "2.6.3.0"
-        },
-        {
-            "cabal_sha256": "3c19975fdfd8d057eae58847bda6a79514ad882fd6f8ead72ac0247af34bdfc6",
-            "flags": [
-                "-conduit10",
-                "-mtl1",
-                "+network-uri",
-                "-warn-as-error",
-                "-warp-tests"
-            ],
-            "package": "HTTP",
-            "revision": 1,
-            "source": "hackage",
-            "src_sha256": "a602d7f30e917164c6a634f8cb1f5df4849048858db01380a0875e16e5aa687b",
-            "version": "4000.3.14"
-        },
-        {
-            "cabal_sha256": "4c70f1407881059e93550d3742191254296b2737b793a742bd901348fb3e1fb1",
-            "flags": [
-                "-examples",
-                "+integer-gmp",
-                "+sse2",
-                "-sse41"
-            ],
-            "package": "hashable",
-            "revision": 1,
-            "source": "hackage",
-            "src_sha256": "822e5413fbccca6ae884d3aba4066422c8b5d58d23d18b9ecb5c03273bb19ab4",
-            "version": "1.3.0.0"
-        },
-        {
-            "cabal_sha256": "a178c166856da7ff22fe4500337b54812e94fd2059409452187d72e057ede9cd",
-            "flags": [
-                "-bench"
-            ],
-            "package": "async",
-            "revision": 1,
-            "source": "hackage",
-            "src_sha256": "4b4ab1ac82c45144d82c6daf6cb6ba45eab9957dad44787fa5e869e23d73bbff",
-            "version": "2.2.2"
-        },
-        {
-            "cabal_sha256": "8cbba2505d4da4f6cfc90cd36c8e8ad0c09c056538481ea00e8b10b78f70cb10",
-            "flags": [],
-            "package": "base16-bytestring",
-            "revision": 0,
-            "source": "hackage",
-            "src_sha256": "525689679d5cc80fa532c1d5cfeace0f62bbb54134fad514f1ba00d0e7fe69ba",
-            "version": "0.1.1.7"
-        },
-        {
-            "cabal_sha256": "190264fef9e65d9085f00ccda419137096d1dc94777c58272bc96821dc7f37c3",
-            "flags": [],
-            "package": "base64-bytestring",
-            "revision": 0,
-            "source": "hackage",
-            "src_sha256": "210d6c9042241ca52ee5d89cf221dbeb4d0e64b37391345369035ad2d9b4aca9",
-            "version": "1.1.0.0"
-        },
-        {
-            "cabal_sha256": "b963d6308db096362d73d9c603b331cf188aa69310195f479dfedf6045d7e602",
-            "flags": [
-                "-exe"
-            ],
-            "package": "cryptohash-sha256",
-            "revision": 4,
-            "source": "hackage",
-            "src_sha256": "52756435dbea248e344fbcbcc5df5307f60dfacf337dfd11ae30f1c7a4da05dd",
-            "version": "0.11.101.0"
-        },
-        {
-            "cabal_sha256": "5490be9cfbea95e14a7a68b7d055ae8d295822e0b146d2ac8285b3e5a3e3282f",
-            "flags": [
-                "-example"
-            ],
-            "package": "echo",
-            "revision": 1,
-            "source": "hackage",
-            "src_sha256": "704f07310f8272d170f8ab7fb2a2c13f15d8501ef8310801e36964c8eff485ef",
-            "version": "0.1.3"
-        },
-        {
-            "cabal_sha256": "d50c4d0801a35be7875a040470c09863342514930c82a7d25780a6c2efc4fda9",
-            "flags": [
-                "-optimised-mixer"
-            ],
-            "package": "splitmix",
-            "revision": 0,
-            "source": "hackage",
-            "src_sha256": "1c11c87352ddbb13365380fe163f99bb8f8845ebc96ca1d572e5d3a9bf810bfa",
-            "version": "0.1"
-        },
-        {
-            "cabal_sha256": "5ca8674e95c46c7eb90f520c26aea22d403625c97697275434afba66ebd32b05",
-            "flags": [],
-            "package": "random",
-            "revision": 0,
-            "source": "hackage",
-            "src_sha256": "e4519cf7c058bfd5bdbe4acc782284acc9e25e74487208619ca83cbcd63fb9de",
-            "version": "1.2.0"
-        },
-        {
-            "cabal_sha256": "4d33a49cd383d50af090f1b888642d10116e43809f9da6023d9fc6f67d2656ee",
-            "flags": [],
-            "package": "edit-distance",
-            "revision": 1,
-            "source": "hackage",
-            "src_sha256": "3e8885ee2f56ad4da940f043ae8f981ee2fe336b5e8e4ba3f7436cff4f526c4a",
-            "version": "0.2.2.1"
-        },
-        {
-            "cabal_sha256": "fb98b08de467d51f788f8bd9391f0e9ab9bd4d8dfc264296b895ffea0d822dfa",
-            "flags": [
-                "+no-donna",
-                "+test-doctests",
-                "+test-hlint",
-                "+test-properties"
-            ],
-            "package": "ed25519",
-            "revision": 3,
-            "source": "hackage",
-            "src_sha256": "d8a5958ebfa9309790efade64275dc5c441b568645c45ceed1b0c6ff36d6156d",
-            "version": "0.0.5.0"
-        },
-        {
-            "cabal_sha256": "c9d3fa30fb6ab2ba16e037586ca79be6e57ec5f00381b6ee5f293400dbdf5515",
-            "flags": [
-                "+ofd-locking"
-            ],
-            "package": "lukko",
-            "revision": 0,
-            "source": "hackage",
-            "src_sha256": "8a79d113dc0ccef16c24d83379cc457485943027e777529c46362fecc06607d2",
-            "version": "0.1.1.2"
-        },
-        {
-            "cabal_sha256": "7a715414c4d494c9048cfb6d7634e07e7732ca154cb8938dc85f6ea192192e8c",
-            "flags": [
-                "-old-bytestring",
-                "-old-time"
-            ],
-            "package": "tar",
-            "revision": 2,
-            "source": "hackage",
-            "src_sha256": "b384449f62b2b0aa3e6d2cb1004b8060b01f21ec93e7b63e7af6d8fad8a9f1de",
-            "version": "0.5.1.1"
-        },
-        {
-            "cabal_sha256": "d34ddf5fece4d1e9d471b5298f36335bb3cfe12cb5a1b8525c42f0b665382f45",
-            "flags": [
-                "-non-blocking-ffi",
-                "-pkg-config"
-            ],
-            "package": "zlib",
-            "revision": 1,
-            "source": "hackage",
-            "src_sha256": "f0f810ff173560b60392db448455c0513b3239f48e43cb494b3733aa559621d0",
-            "version": "0.6.2.1"
-        },
-        {
-            "cabal_sha256": "692c385c085baa2813046ae58e31df21c250346b81c882431b5ffef76451a18a",
-            "flags": [
-                "+base48",
-                "+lukko",
-                "-mtl21",
-                "-old-directory",
-                "+use-network-uri"
-            ],
-            "package": "hackage-security",
-            "revision": 2,
-            "source": "hackage",
-            "src_sha256": "9162b473af5a21c1ff32a50b972b9acf51f4c901604a22cf08a2dccac2f82f17",
-            "version": "0.6.0.1"
-        },
-        {
-            "cabal_sha256": "44aa95ca762294ffbb28cf0af9c567d93b5d2c56e4f38ce5385a257d899f968e",
-            "flags": [],
-            "package": "regex-base",
-            "revision": 1,
-            "source": "hackage",
-            "src_sha256": "c41f82f5fc1157c961a4cbdc0cd5561e5aa44f339ce6e706d978d97e0ca6b914",
-            "version": "0.94.0.0"
-        },
-        {
-            "cabal_sha256": "690d1366e9ea6df71ded3daf49ca3d53c63eda3f95937962299b2391824dc3b3",
-            "flags": [
-                "-_regex-posix-clib"
-            ],
-            "package": "regex-posix",
-            "revision": 1,
-            "source": "hackage",
-            "src_sha256": "251300f1a6bb2e91abb8bf513a21981f8fab79c98a65acea2bb6d6a524414521",
-            "version": "0.96.0.0"
-        },
-        {
-            "cabal_sha256": "0a9a6dd29706258ae60a5c22aecc140a40743b8f08fc324fd9984e7dfbf3a80d",
-            "flags": [],
-            "package": "resolv",
-            "revision": 0,
-            "source": "hackage",
-            "src_sha256": "81a2bafad484db123cf8d17a02d98bb388a127fd0f822fa022589468a0e64671",
-            "version": "0.1.2.0"
-        },
-        {
-            "cabal_sha256": null,
-            "flags": [
-                "-debug-conflict-sets",
-                "-debug-expensive-assertions",
-                "-debug-tracetree",
-                "+lukko",
-                "+native-dns"
-            ],
-            "package": "cabal-install",
-            "revision": null,
-            "source": "local",
-            "src_sha256": null,
-            "version": "3.5.0.0"
-        }
-    ]
-}
diff --git a/bootstrap/linux-8.6.5.plan.json b/bootstrap/linux-8.6.5.plan.json
index 2ed045b1e2b..bb36e9a3784 100644
--- a/bootstrap/linux-8.6.5.plan.json
+++ b/bootstrap/linux-8.6.5.plan.json
@@ -1 +1 @@
-{"cabal-version":"3.4.0.0","cabal-lib-version":"3.4.0.0","compiler-id":"ghc-8.6.5","os":"linux","arch":"x86_64","install-plan":[{"type":"configured","id":"Cabal-3.5.0.0-inplace","pkg-name":"Cabal","pkg-version":"3.5.0.0","flags":{"bundled-binary-generic":false},"style":"local","pkg-src":{"type":"local","path":"/code/shared-haskell/cabal/Cabal"},"dist-dir":"/code/shared-haskell/cabal/dist-newstyle/build/x86_64-linux/ghc-8.6.5/Cabal-3.5.0.0","depends":["array-0.5.3.0","base-4.12.0.0","binary-0.8.6.0","bytestring-0.10.8.2","containers-0.6.0.1","deepseq-1.4.4.0","directory-1.3.3.0","filepath-1.4.2.1","mtl-2.2.2","parsec-3.1.13.0","pretty-1.1.3.6","process-1.6.5.0","text-1.2.3.1","time-1.8.0.2","transformers-0.5.6.2","unix-2.7.2.2"],"exe-depends":[],"component-name":"lib"},{"type":"configured","id":"HTTP-4000.3.14-790a9652afacb3426e95805c4d31658a3fecd2a83abd9352c3aa3f054d0d0e2f","pkg-name":"HTTP","pkg-version":"4000.3.14","flags":{"conduit10":false,"mtl1":false,"network-uri":true,"warn-as-error":false,"warp-tests":false},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"3c19975fdfd8d057eae58847bda6a79514ad882fd6f8ead72ac0247af34bdfc6","pkg-src-sha256":"a602d7f30e917164c6a634f8cb1f5df4849048858db01380a0875e16e5aa687b","depends":["array-0.5.3.0","base-4.12.0.0","bytestring-0.10.8.2","mtl-2.2.2","network-3.1.1.1-4939b3cef5a9e8a050f13943c66c49d8199f5edb4c8acb469a21cd7f8aae1a00","network-uri-2.6.3.0-512f05dc0374923712941f8950e12cc2a1707e8a87357d7e286ccde1953144e5","parsec-3.1.13.0","time-1.8.0.2"],"exe-depends":[],"component-name":"lib"},{"type":"pre-existing","id":"array-0.5.3.0","pkg-name":"array","pkg-version":"0.5.3.0","depends":["base-4.12.0.0"]},{"type":"configured","id":"async-2.2.2-d821efe0c7dce18409389aa2f56f54967d3cf730dcc0b01f8f2a56acf0049649","pkg-name":"async","pkg-version":"2.2.2","flags":{"bench":false},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"a178c166856da7ff22fe4500337b54812e94fd2059409452187d72e057ede9cd","pkg-src-sha256":"4b4ab1ac82c45144d82c6daf6cb6ba45eab9957dad44787fa5e869e23d73bbff","depends":["base-4.12.0.0","hashable-1.3.0.0-f0497ed6dc3b89a4ddc96ef33aef5f64eaa584fcb9d5bf6da06e0dacb177c8f6","stm-2.5.0.0"],"exe-depends":[],"component-name":"lib"},{"type":"pre-existing","id":"base-4.12.0.0","pkg-name":"base","pkg-version":"4.12.0.0","depends":["ghc-prim-0.5.3","integer-gmp-1.0.2.0","rts"]},{"type":"configured","id":"base16-bytestring-0.1.1.7-1c6dcde90355116a6bd3d6d942680d6e5781af1b18a2b0c3a7731813fafec43d","pkg-name":"base16-bytestring","pkg-version":"0.1.1.7","flags":{},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"8cbba2505d4da4f6cfc90cd36c8e8ad0c09c056538481ea00e8b10b78f70cb10","pkg-src-sha256":"525689679d5cc80fa532c1d5cfeace0f62bbb54134fad514f1ba00d0e7fe69ba","depends":["base-4.12.0.0","bytestring-0.10.8.2","ghc-prim-0.5.3"],"exe-depends":[],"component-name":"lib"},{"type":"configured","id":"base64-bytestring-1.1.0.0-cd0fbc582434f7abba096a3124f8a90979ca8fa48b9730de02a035de19e50b0f","pkg-name":"base64-bytestring","pkg-version":"1.1.0.0","flags":{},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"190264fef9e65d9085f00ccda419137096d1dc94777c58272bc96821dc7f37c3","pkg-src-sha256":"210d6c9042241ca52ee5d89cf221dbeb4d0e64b37391345369035ad2d9b4aca9","depends":["base-4.12.0.0","bytestring-0.10.8.2"],"exe-depends":[],"component-name":"lib"},{"type":"pre-existing","id":"binary-0.8.6.0","pkg-name":"binary","pkg-version":"0.8.6.0","depends":["array-0.5.3.0","base-4.12.0.0","bytestring-0.10.8.2","containers-0.6.0.1"]},{"type":"pre-existing","id":"bytestring-0.10.8.2","pkg-name":"bytestring","pkg-version":"0.10.8.2","depends":["base-4.12.0.0","deepseq-1.4.4.0","ghc-prim-0.5.3","integer-gmp-1.0.2.0"]},{"type":"configured","id":"cabal-install-3.5.0.0-inplace-cabal","pkg-name":"cabal-install","pkg-version":"3.5.0.0","flags":{"debug-conflict-sets":false,"debug-expensive-assertions":false,"debug-tracetree":false,"lukko":true,"native-dns":true},"style":"local","pkg-src":{"type":"local","path":"/code/shared-haskell/cabal/cabal-install"},"dist-dir":"/code/shared-haskell/cabal/dist-newstyle/build/x86_64-linux/ghc-8.6.5/cabal-install-3.5.0.0/x/cabal","depends":["Cabal-3.5.0.0-inplace","HTTP-4000.3.14-790a9652afacb3426e95805c4d31658a3fecd2a83abd9352c3aa3f054d0d0e2f","array-0.5.3.0","async-2.2.2-d821efe0c7dce18409389aa2f56f54967d3cf730dcc0b01f8f2a56acf0049649","base-4.12.0.0","base16-bytestring-0.1.1.7-1c6dcde90355116a6bd3d6d942680d6e5781af1b18a2b0c3a7731813fafec43d","binary-0.8.6.0","bytestring-0.10.8.2","containers-0.6.0.1","cryptohash-sha256-0.11.101.0-672df49aeb8f00e269bc8f003b8bf84a83fe557f0ac7c977f6776a97491a955e","deepseq-1.4.4.0","directory-1.3.3.0","echo-0.1.3-0aa444d1be9406439b2acf2158866a15b09805c8788d9945aead993e2d97d6ad","edit-distance-0.2.2.1-3ee9066a02ddd83fb02b975c6cbe4e48cfa58432df9a58e28f4d3117cc114e94","filepath-1.4.2.1","hackage-security-0.6.0.1-inplace","hashable-1.3.0.0-f0497ed6dc3b89a4ddc96ef33aef5f64eaa584fcb9d5bf6da06e0dacb177c8f6","lukko-0.1.1.2-15fdd1a837b209eef09d6df1acec1d26c8a95712fa902c19b288dceede1e623a","mtl-2.2.2","network-uri-2.6.3.0-512f05dc0374923712941f8950e12cc2a1707e8a87357d7e286ccde1953144e5","parsec-3.1.13.0","pretty-1.1.3.6","process-1.6.5.0","random-1.2.0-f0994fc834469fbb09d3fb78fa43c9173070bd28fae87d2ccb1f145d8b044188","regex-base-0.94.0.0-83cf4d8eac97e9aa145a3d27ac67bed98c4e85b4079681c563b9474b72d6c8c0","regex-posix-0.96.0.0-dc0bdb2738aaeebb56a1c073495ba842a9dd4d5dad088e0e0eeb5e2292c1e0b8","resolv-0.1.2.0-9223654e337d641bc8cfe29ee10796f5e3821f9d84e0e63d4c16d74a309e0622","stm-2.5.0.0","tar-0.5.1.1-2bac801a527e5793b7752115b282082cf46ce8f20e48fb17bd96599f96366b21","text-1.2.3.1","time-1.8.0.2","transformers-0.5.6.2","unix-2.7.2.2","zlib-0.6.2.1-3d450e620fbe0e654eb7e97cd33cb6273bfb8229af0302c8890c078792ee1342"],"exe-depends":[],"component-name":"exe:cabal","bin-file":"/code/shared-haskell/cabal/dist-newstyle/build/x86_64-linux/ghc-8.6.5/cabal-install-3.5.0.0/x/cabal/build/cabal/cabal"},{"type":"pre-existing","id":"containers-0.6.0.1","pkg-name":"containers","pkg-version":"0.6.0.1","depends":["array-0.5.3.0","base-4.12.0.0","deepseq-1.4.4.0","ghc-prim-0.5.3"]},{"type":"configured","id":"cryptohash-sha256-0.11.101.0-672df49aeb8f00e269bc8f003b8bf84a83fe557f0ac7c977f6776a97491a955e","pkg-name":"cryptohash-sha256","pkg-version":"0.11.101.0","flags":{"exe":false},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"b963d6308db096362d73d9c603b331cf188aa69310195f479dfedf6045d7e602","pkg-src-sha256":"52756435dbea248e344fbcbcc5df5307f60dfacf337dfd11ae30f1c7a4da05dd","depends":["base-4.12.0.0","bytestring-0.10.8.2"],"exe-depends":[],"component-name":"lib"},{"type":"pre-existing","id":"deepseq-1.4.4.0","pkg-name":"deepseq","pkg-version":"1.4.4.0","depends":["array-0.5.3.0","base-4.12.0.0"]},{"type":"pre-existing","id":"directory-1.3.3.0","pkg-name":"directory","pkg-version":"1.3.3.0","depends":["base-4.12.0.0","filepath-1.4.2.1","time-1.8.0.2","unix-2.7.2.2"]},{"type":"configured","id":"echo-0.1.3-0aa444d1be9406439b2acf2158866a15b09805c8788d9945aead993e2d97d6ad","pkg-name":"echo","pkg-version":"0.1.3","flags":{"example":false},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"5490be9cfbea95e14a7a68b7d055ae8d295822e0b146d2ac8285b3e5a3e3282f","pkg-src-sha256":"704f07310f8272d170f8ab7fb2a2c13f15d8501ef8310801e36964c8eff485ef","depends":["base-4.12.0.0","process-1.6.5.0"],"exe-depends":[],"component-name":"lib"},{"type":"configured","id":"ed25519-0.0.5.0-751e5a5744fdd2d7ce2245bc124b15133d0dff1db6b0441d93ced591450d9edb","pkg-name":"ed25519","pkg-version":"0.0.5.0","flags":{"no-donna":true,"test-doctests":true,"test-hlint":true,"test-properties":true},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"fb98b08de467d51f788f8bd9391f0e9ab9bd4d8dfc264296b895ffea0d822dfa","pkg-src-sha256":"d8a5958ebfa9309790efade64275dc5c441b568645c45ceed1b0c6ff36d6156d","depends":["base-4.12.0.0","bytestring-0.10.8.2","ghc-prim-0.5.3"],"exe-depends":[],"component-name":"lib"},{"type":"configured","id":"edit-distance-0.2.2.1-3ee9066a02ddd83fb02b975c6cbe4e48cfa58432df9a58e28f4d3117cc114e94","pkg-name":"edit-distance","pkg-version":"0.2.2.1","flags":{},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"4d33a49cd383d50af090f1b888642d10116e43809f9da6023d9fc6f67d2656ee","pkg-src-sha256":"3e8885ee2f56ad4da940f043ae8f981ee2fe336b5e8e4ba3f7436cff4f526c4a","depends":["array-0.5.3.0","base-4.12.0.0","containers-0.6.0.1","random-1.2.0-f0994fc834469fbb09d3fb78fa43c9173070bd28fae87d2ccb1f145d8b044188"],"exe-depends":[],"component-name":"lib"},{"type":"pre-existing","id":"filepath-1.4.2.1","pkg-name":"filepath","pkg-version":"1.4.2.1","depends":["base-4.12.0.0"]},{"type":"pre-existing","id":"ghc-boot-th-8.6.5","pkg-name":"ghc-boot-th","pkg-version":"8.6.5","depends":["base-4.12.0.0"]},{"type":"pre-existing","id":"ghc-prim-0.5.3","pkg-name":"ghc-prim","pkg-version":"0.5.3","depends":["rts"]},{"type":"configured","id":"hackage-security-0.6.0.1-inplace","pkg-name":"hackage-security","pkg-version":"0.6.0.1","flags":{"base48":true,"lukko":true,"mtl21":false,"old-directory":false,"use-network-uri":true},"style":"inplace","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"692c385c085baa2813046ae58e31df21c250346b81c882431b5ffef76451a18a","pkg-src-sha256":"9162b473af5a21c1ff32a50b972b9acf51f4c901604a22cf08a2dccac2f82f17","dist-dir":"/code/shared-haskell/cabal/dist-newstyle/build/x86_64-linux/ghc-8.6.5/hackage-security-0.6.0.1","depends":["Cabal-3.5.0.0-inplace","base-4.12.0.0","base16-bytestring-0.1.1.7-1c6dcde90355116a6bd3d6d942680d6e5781af1b18a2b0c3a7731813fafec43d","base64-bytestring-1.1.0.0-cd0fbc582434f7abba096a3124f8a90979ca8fa48b9730de02a035de19e50b0f","bytestring-0.10.8.2","containers-0.6.0.1","cryptohash-sha256-0.11.101.0-672df49aeb8f00e269bc8f003b8bf84a83fe557f0ac7c977f6776a97491a955e","directory-1.3.3.0","ed25519-0.0.5.0-751e5a5744fdd2d7ce2245bc124b15133d0dff1db6b0441d93ced591450d9edb","filepath-1.4.2.1","ghc-prim-0.5.3","lukko-0.1.1.2-15fdd1a837b209eef09d6df1acec1d26c8a95712fa902c19b288dceede1e623a","mtl-2.2.2","network-3.1.1.1-4939b3cef5a9e8a050f13943c66c49d8199f5edb4c8acb469a21cd7f8aae1a00","network-uri-2.6.3.0-512f05dc0374923712941f8950e12cc2a1707e8a87357d7e286ccde1953144e5","parsec-3.1.13.0","pretty-1.1.3.6","tar-0.5.1.1-2bac801a527e5793b7752115b282082cf46ce8f20e48fb17bd96599f96366b21","template-haskell-2.14.0.0","time-1.8.0.2","transformers-0.5.6.2","zlib-0.6.2.1-3d450e620fbe0e654eb7e97cd33cb6273bfb8229af0302c8890c078792ee1342"],"exe-depends":[],"component-name":"lib"},{"type":"configured","id":"hashable-1.3.0.0-f0497ed6dc3b89a4ddc96ef33aef5f64eaa584fcb9d5bf6da06e0dacb177c8f6","pkg-name":"hashable","pkg-version":"1.3.0.0","flags":{"examples":false,"integer-gmp":true,"sse2":true,"sse41":false},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"4c70f1407881059e93550d3742191254296b2737b793a742bd901348fb3e1fb1","pkg-src-sha256":"822e5413fbccca6ae884d3aba4066422c8b5d58d23d18b9ecb5c03273bb19ab4","depends":["base-4.12.0.0","bytestring-0.10.8.2","deepseq-1.4.4.0","ghc-prim-0.5.3","integer-gmp-1.0.2.0","text-1.2.3.1"],"exe-depends":[],"component-name":"lib"},{"type":"configured","id":"hsc2hs-0.68.7-e-hsc2hs-0c4585ed41291b35ebc895b38398cb967e27e28d827b43b63adf9034d1517144","pkg-name":"hsc2hs","pkg-version":"0.68.7","flags":{"in-ghc-tree":false},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"6a9419c04ca31a5931c77bd129789d4ceafcd8c9275551da237df341b8944540","pkg-src-sha256":"fd7915e41e3ed3bc7750fee0e8add2b4f32dcac8b7c544cfdf5542293223894a","depends":["base-4.12.0.0","containers-0.6.0.1","directory-1.3.3.0","filepath-1.4.2.1","process-1.6.5.0"],"exe-depends":[],"component-name":"exe:hsc2hs","bin-file":"/cabal/store/ghc-8.6.5/hsc2hs-0.68.7-e-hsc2hs-0c4585ed41291b35ebc895b38398cb967e27e28d827b43b63adf9034d1517144/bin/hsc2hs"},{"type":"pre-existing","id":"integer-gmp-1.0.2.0","pkg-name":"integer-gmp","pkg-version":"1.0.2.0","depends":["ghc-prim-0.5.3"]},{"type":"configured","id":"lukko-0.1.1.2-15fdd1a837b209eef09d6df1acec1d26c8a95712fa902c19b288dceede1e623a","pkg-name":"lukko","pkg-version":"0.1.1.2","flags":{"ofd-locking":true},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"c9d3fa30fb6ab2ba16e037586ca79be6e57ec5f00381b6ee5f293400dbdf5515","pkg-src-sha256":"8a79d113dc0ccef16c24d83379cc457485943027e777529c46362fecc06607d2","depends":["base-4.12.0.0"],"exe-depends":["hsc2hs-0.68.7-e-hsc2hs-0c4585ed41291b35ebc895b38398cb967e27e28d827b43b63adf9034d1517144"],"component-name":"lib"},{"type":"pre-existing","id":"mtl-2.2.2","pkg-name":"mtl","pkg-version":"2.2.2","depends":["base-4.12.0.0","transformers-0.5.6.2"]},{"type":"configured","id":"network-3.1.1.1-4939b3cef5a9e8a050f13943c66c49d8199f5edb4c8acb469a21cd7f8aae1a00","pkg-name":"network","pkg-version":"3.1.1.1","flags":{},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"b704cb6676c03e98267190df797497587576a2e96094550ea143415239bbe66e","pkg-src-sha256":"d7ef590173fff2ab522fbc167f3fafb867e4ecfca279eb3ef0d137b51f142c9a","components":{"lib":{"depends":["base-4.12.0.0","bytestring-0.10.8.2","deepseq-1.4.4.0"],"exe-depends":["hsc2hs-0.68.7-e-hsc2hs-0c4585ed41291b35ebc895b38398cb967e27e28d827b43b63adf9034d1517144"]}}},{"type":"configured","id":"network-uri-2.6.3.0-512f05dc0374923712941f8950e12cc2a1707e8a87357d7e286ccde1953144e5","pkg-name":"network-uri","pkg-version":"2.6.3.0","flags":{},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"d2d9ff3a80d9b2d1ff317a354bc0c56cc109c69a4c2449e5fc712d3ddce83ede","pkg-src-sha256":"a01c1389f15d2cc2e847914737f706133bb11f0c5f8ee89711a36a25b7afa723","depends":["base-4.12.0.0","deepseq-1.4.4.0","parsec-3.1.13.0","template-haskell-2.14.0.0"],"exe-depends":[],"component-name":"lib"},{"type":"pre-existing","id":"parsec-3.1.13.0","pkg-name":"parsec","pkg-version":"3.1.13.0","depends":["base-4.12.0.0","bytestring-0.10.8.2","mtl-2.2.2","text-1.2.3.1"]},{"type":"pre-existing","id":"pretty-1.1.3.6","pkg-name":"pretty","pkg-version":"1.1.3.6","depends":["base-4.12.0.0","deepseq-1.4.4.0","ghc-prim-0.5.3"]},{"type":"pre-existing","id":"process-1.6.5.0","pkg-name":"process","pkg-version":"1.6.5.0","depends":["base-4.12.0.0","deepseq-1.4.4.0","directory-1.3.3.0","filepath-1.4.2.1","unix-2.7.2.2"]},{"type":"configured","id":"random-1.2.0-f0994fc834469fbb09d3fb78fa43c9173070bd28fae87d2ccb1f145d8b044188","pkg-name":"random","pkg-version":"1.2.0","flags":{},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"5ca8674e95c46c7eb90f520c26aea22d403625c97697275434afba66ebd32b05","pkg-src-sha256":"e4519cf7c058bfd5bdbe4acc782284acc9e25e74487208619ca83cbcd63fb9de","depends":["base-4.12.0.0","bytestring-0.10.8.2","deepseq-1.4.4.0","mtl-2.2.2","splitmix-0.1-3e60b38b41c8bde822762030b4373375791f98915e3d10eaf33ceadaeeb94a21"],"exe-depends":[],"component-name":"lib"},{"type":"configured","id":"regex-base-0.94.0.0-83cf4d8eac97e9aa145a3d27ac67bed98c4e85b4079681c563b9474b72d6c8c0","pkg-name":"regex-base","pkg-version":"0.94.0.0","flags":{},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"44aa95ca762294ffbb28cf0af9c567d93b5d2c56e4f38ce5385a257d899f968e","pkg-src-sha256":"c41f82f5fc1157c961a4cbdc0cd5561e5aa44f339ce6e706d978d97e0ca6b914","depends":["array-0.5.3.0","base-4.12.0.0","bytestring-0.10.8.2","containers-0.6.0.1","mtl-2.2.2","text-1.2.3.1"],"exe-depends":[],"component-name":"lib"},{"type":"configured","id":"regex-posix-0.96.0.0-dc0bdb2738aaeebb56a1c073495ba842a9dd4d5dad088e0e0eeb5e2292c1e0b8","pkg-name":"regex-posix","pkg-version":"0.96.0.0","flags":{"_regex-posix-clib":false},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"690d1366e9ea6df71ded3daf49ca3d53c63eda3f95937962299b2391824dc3b3","pkg-src-sha256":"251300f1a6bb2e91abb8bf513a21981f8fab79c98a65acea2bb6d6a524414521","depends":["array-0.5.3.0","base-4.12.0.0","bytestring-0.10.8.2","containers-0.6.0.1","regex-base-0.94.0.0-83cf4d8eac97e9aa145a3d27ac67bed98c4e85b4079681c563b9474b72d6c8c0"],"exe-depends":[],"component-name":"lib"},{"type":"configured","id":"resolv-0.1.2.0-9223654e337d641bc8cfe29ee10796f5e3821f9d84e0e63d4c16d74a309e0622","pkg-name":"resolv","pkg-version":"0.1.2.0","flags":{},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"0a9a6dd29706258ae60a5c22aecc140a40743b8f08fc324fd9984e7dfbf3a80d","pkg-src-sha256":"81a2bafad484db123cf8d17a02d98bb388a127fd0f822fa022589468a0e64671","components":{"lib":{"depends":["base-4.12.0.0","base16-bytestring-0.1.1.7-1c6dcde90355116a6bd3d6d942680d6e5781af1b18a2b0c3a7731813fafec43d","binary-0.8.6.0","bytestring-0.10.8.2","containers-0.6.0.1"],"exe-depends":[]}}},{"type":"pre-existing","id":"rts","pkg-name":"rts","pkg-version":"1.0","depends":[]},{"type":"configured","id":"splitmix-0.1-3e60b38b41c8bde822762030b4373375791f98915e3d10eaf33ceadaeeb94a21","pkg-name":"splitmix","pkg-version":"0.1","flags":{"optimised-mixer":false},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"d50c4d0801a35be7875a040470c09863342514930c82a7d25780a6c2efc4fda9","pkg-src-sha256":"1c11c87352ddbb13365380fe163f99bb8f8845ebc96ca1d572e5d3a9bf810bfa","depends":["base-4.12.0.0","deepseq-1.4.4.0","time-1.8.0.2"],"exe-depends":[],"component-name":"lib"},{"type":"pre-existing","id":"stm-2.5.0.0","pkg-name":"stm","pkg-version":"2.5.0.0","depends":["array-0.5.3.0","base-4.12.0.0"]},{"type":"configured","id":"tar-0.5.1.1-2bac801a527e5793b7752115b282082cf46ce8f20e48fb17bd96599f96366b21","pkg-name":"tar","pkg-version":"0.5.1.1","flags":{"old-bytestring":false,"old-time":false},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"7a715414c4d494c9048cfb6d7634e07e7732ca154cb8938dc85f6ea192192e8c","pkg-src-sha256":"b384449f62b2b0aa3e6d2cb1004b8060b01f21ec93e7b63e7af6d8fad8a9f1de","depends":["array-0.5.3.0","base-4.12.0.0","bytestring-0.10.8.2","containers-0.6.0.1","deepseq-1.4.4.0","directory-1.3.3.0","filepath-1.4.2.1","time-1.8.0.2"],"exe-depends":[],"component-name":"lib"},{"type":"pre-existing","id":"template-haskell-2.14.0.0","pkg-name":"template-haskell","pkg-version":"2.14.0.0","depends":["base-4.12.0.0","ghc-boot-th-8.6.5","pretty-1.1.3.6"]},{"type":"pre-existing","id":"text-1.2.3.1","pkg-name":"text","pkg-version":"1.2.3.1","depends":["array-0.5.3.0","base-4.12.0.0","binary-0.8.6.0","bytestring-0.10.8.2","deepseq-1.4.4.0","ghc-prim-0.5.3","integer-gmp-1.0.2.0"]},{"type":"pre-existing","id":"time-1.8.0.2","pkg-name":"time","pkg-version":"1.8.0.2","depends":["base-4.12.0.0","deepseq-1.4.4.0"]},{"type":"pre-existing","id":"transformers-0.5.6.2","pkg-name":"transformers","pkg-version":"0.5.6.2","depends":["base-4.12.0.0"]},{"type":"pre-existing","id":"unix-2.7.2.2","pkg-name":"unix","pkg-version":"2.7.2.2","depends":["base-4.12.0.0","bytestring-0.10.8.2","time-1.8.0.2"]},{"type":"configured","id":"zlib-0.6.2.1-3d450e620fbe0e654eb7e97cd33cb6273bfb8229af0302c8890c078792ee1342","pkg-name":"zlib","pkg-version":"0.6.2.1","flags":{"non-blocking-ffi":false,"pkg-config":false},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"d34ddf5fece4d1e9d471b5298f36335bb3cfe12cb5a1b8525c42f0b665382f45","pkg-src-sha256":"f0f810ff173560b60392db448455c0513b3239f48e43cb494b3733aa559621d0","depends":["base-4.12.0.0","bytestring-0.10.8.2"],"exe-depends":[],"component-name":"lib"}]}
\ No newline at end of file
+{"cabal-version":"3.4.0.0","cabal-lib-version":"3.4.0.0","compiler-id":"ghc-8.6.5","os":"linux","arch":"x86_64","install-plan":[{"type":"configured","id":"Cabal-3.5.0.0-inplace","pkg-name":"Cabal","pkg-version":"3.5.0.0","flags":{"bundled-binary-generic":false},"style":"local","pkg-src":{"type":"local","path":"/code/shared-haskell/cabal/Cabal"},"dist-dir":"/code/shared-haskell/cabal/dist-newstyle/build/x86_64-linux/ghc-8.6.5/Cabal-3.5.0.0","depends":["array-0.5.3.0","base-4.12.0.0","binary-0.8.6.0","bytestring-0.10.8.2","containers-0.6.0.1","deepseq-1.4.4.0","directory-1.3.3.0","filepath-1.4.2.1","mtl-2.2.2","parsec-3.1.13.0","pretty-1.1.3.6","process-1.6.5.0","text-1.2.3.1","time-1.8.0.2","transformers-0.5.6.2","unix-2.7.2.2"],"exe-depends":[],"component-name":"lib"},{"type":"configured","id":"HTTP-4000.3.16-9e93b1cf15075b1e6bf2f6190b6efcd330e3657aab4b66f02a7b221739a774d5","pkg-name":"HTTP","pkg-version":"4000.3.16","flags":{"conduit10":false,"mtl1":false,"network-uri":true,"warn-as-error":false,"warp-tests":false},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"4265b1966b2bbb302a8a80d7b485197694785ec1496d5d9314b4b5931ffbd093","pkg-src-sha256":"d6091c037871ac3d08d021c906206174567499d5a26a6cb804cf530cd590fe2d","depends":["array-0.5.3.0","base-4.12.0.0","bytestring-0.10.8.2","mtl-2.2.2","network-3.1.2.1-1abbc9eff55f1c6dd01110ab4a2f2d35ee159edcdb00756e73a95bbdd6a69b08","network-uri-2.6.4.1-2e14423f89f3ac3c2ee00e429745a82fc831c9aab0062dbfb95d83e883cb22b3","parsec-3.1.13.0","time-1.8.0.2"],"exe-depends":[],"component-name":"lib"},{"type":"pre-existing","id":"array-0.5.3.0","pkg-name":"array","pkg-version":"0.5.3.0","depends":["base-4.12.0.0"]},{"type":"configured","id":"async-2.2.3-903f3fc43c1227509593e6795fc6f18b1ae8f6e1f67b49b77d70bfd6d1783dfa","pkg-name":"async","pkg-version":"2.2.3","flags":{"bench":false},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"0cbefb8247308b38e397e675f832b9bd5317ff1872001d5358f213654423c55b","pkg-src-sha256":"467af3a0037947a5232ecf5f4efbd4cf2118aaa2310566d7f40ac82b0e32935c","depends":["base-4.12.0.0","hashable-1.3.1.0-992f1f6406c978642dd1247abb4eb327d6ae7cc49c6a80dd5f2f28abbd2e28bb","stm-2.5.0.0"],"exe-depends":[],"component-name":"lib"},{"type":"pre-existing","id":"base-4.12.0.0","pkg-name":"base","pkg-version":"4.12.0.0","depends":["ghc-prim-0.5.3","integer-gmp-1.0.2.0","rts"]},{"type":"configured","id":"base16-bytestring-1.0.1.0-1746bcc67bba177c17e33a8fba687adf44ffb730cb52632e82c956e36819a4f9","pkg-name":"base16-bytestring","pkg-version":"1.0.1.0","flags":{},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"33b9d57afa334d06485033e930c6b13fc760baf88fd8f715ae2f9a4b46e19a54","pkg-src-sha256":"c0c70a4b58be53d36971bd7361ba300f82a5d5ebf7f50e1a2d7bfc8838bdd6fa","depends":["base-4.12.0.0","bytestring-0.10.8.2"],"exe-depends":[],"component-name":"lib"},{"type":"configured","id":"base64-bytestring-1.2.0.1-c074ebbf1a80dfba689ab2ea03281f23e448dbc0e03f9e8ae4f9cfeb7f50fde5","pkg-name":"base64-bytestring","pkg-version":"1.2.0.1","flags":{},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"f4f998235fc0825ab636ca9241b827de5805b336625eb1c7822f1798a238b6ac","pkg-src-sha256":"af09b17d072eb1391d91e30b4186dd1797330647ef79268ecd7fcce8f5afc638","depends":["base-4.12.0.0","bytestring-0.10.8.2"],"exe-depends":[],"component-name":"lib"},{"type":"pre-existing","id":"binary-0.8.6.0","pkg-name":"binary","pkg-version":"0.8.6.0","depends":["array-0.5.3.0","base-4.12.0.0","bytestring-0.10.8.2","containers-0.6.0.1"]},{"type":"pre-existing","id":"bytestring-0.10.8.2","pkg-name":"bytestring","pkg-version":"0.10.8.2","depends":["base-4.12.0.0","deepseq-1.4.4.0","ghc-prim-0.5.3","integer-gmp-1.0.2.0"]},{"type":"configured","id":"cabal-install-3.5.0.0-inplace","pkg-name":"cabal-install","pkg-version":"3.5.0.0","flags":{"lukko":true,"native-dns":true},"style":"local","pkg-src":{"type":"local","path":"/code/shared-haskell/cabal/cabal-install"},"dist-dir":"/code/shared-haskell/cabal/dist-newstyle/build/x86_64-linux/ghc-8.6.5/cabal-install-3.5.0.0","depends":["Cabal-3.5.0.0-inplace","HTTP-4000.3.16-9e93b1cf15075b1e6bf2f6190b6efcd330e3657aab4b66f02a7b221739a774d5","array-0.5.3.0","async-2.2.3-903f3fc43c1227509593e6795fc6f18b1ae8f6e1f67b49b77d70bfd6d1783dfa","base-4.12.0.0","base16-bytestring-1.0.1.0-1746bcc67bba177c17e33a8fba687adf44ffb730cb52632e82c956e36819a4f9","binary-0.8.6.0","bytestring-0.10.8.2","cabal-install-solver-3.5.0.0-inplace","containers-0.6.0.1","cryptohash-sha256-0.11.102.0-1788be3651f34f47baf624f708f86ea7d6db2d13268558e536d0a1bd2b97e074","deepseq-1.4.4.0","directory-1.3.3.0","echo-0.1.4-f2f39bb54e76ea77d5753fd796c4b4126a9c4a7d8b34fbeb350261c52821e0f3","edit-distance-0.2.2.1-7bd6af1f732ef2a1f2b04b4f27ad793f3ed3fa5623ddc8e07a4e489f60cbcee8","exceptions-0.10.4-2e686fdff7a6bdbd62e24641169087c094e991de8ab3f6381a859306fd258e32","filepath-1.4.2.1","hackage-security-0.6.0.1-inplace","hashable-1.3.1.0-992f1f6406c978642dd1247abb4eb327d6ae7cc49c6a80dd5f2f28abbd2e28bb","lukko-0.1.1.3-4c76677eee1fcca961ba3794c92e0a1f4e9c3ced333a9c3f048e6f3f312cb890","mtl-2.2.2","network-uri-2.6.4.1-2e14423f89f3ac3c2ee00e429745a82fc831c9aab0062dbfb95d83e883cb22b3","parsec-3.1.13.0","pretty-1.1.3.6","process-1.6.5.0","random-1.2.0-f975454f78491c8b834a9026806b59ad4e6cbebac633684d977c1bf1bb394421","regex-base-0.94.0.1-8daf12dc69a5224d3cb7813e6280b915706276fe3b3671583aa6b7ad031b7344","regex-posix-0.96.0.0-e300590bbb553870ac4ae4c071ad74621feee4e42bed538ff4b943482fab5952","resolv-0.1.2.0-839f45c81c7fff34820bc93f39bf071c78acc518c5fdaa3e3cfdbf27d1f5e16d","stm-2.5.0.0","tar-0.5.1.1-2bac801a527e5793b7752115b282082cf46ce8f20e48fb17bd96599f96366b21","text-1.2.3.1","time-1.8.0.2","transformers-0.5.6.2","unix-2.7.2.2","zlib-0.6.2.3-ed437c4dad11e2d9e8074a8f3cc6b184779db7ddfdf413b593887e96726d7450"],"exe-depends":[],"component-name":"lib"},{"type":"configured","id":"cabal-install-3.5.0.0-inplace-cabal","pkg-name":"cabal-install","pkg-version":"3.5.0.0","flags":{"lukko":true,"native-dns":true},"style":"local","pkg-src":{"type":"local","path":"/code/shared-haskell/cabal/cabal-install"},"dist-dir":"/code/shared-haskell/cabal/dist-newstyle/build/x86_64-linux/ghc-8.6.5/cabal-install-3.5.0.0/x/cabal","depends":["Cabal-3.5.0.0-inplace","base-4.12.0.0","cabal-install-3.5.0.0-inplace","directory-1.3.3.0","filepath-1.4.2.1"],"exe-depends":[],"component-name":"exe:cabal","bin-file":"/code/shared-haskell/cabal/dist-newstyle/build/x86_64-linux/ghc-8.6.5/cabal-install-3.5.0.0/x/cabal/build/cabal/cabal"},{"type":"configured","id":"cabal-install-solver-3.5.0.0-inplace","pkg-name":"cabal-install-solver","pkg-version":"3.5.0.0","flags":{"debug-conflict-sets":false,"debug-expensive-assertions":false,"debug-tracetree":false},"style":"local","pkg-src":{"type":"local","path":"/code/shared-haskell/cabal/cabal-install-solver"},"dist-dir":"/code/shared-haskell/cabal/dist-newstyle/build/x86_64-linux/ghc-8.6.5/cabal-install-solver-3.5.0.0","depends":["Cabal-3.5.0.0-inplace","array-0.5.3.0","base-4.12.0.0","binary-0.8.6.0","bytestring-0.10.8.2","containers-0.6.0.1","filepath-1.4.2.1","mtl-2.2.2","pretty-1.1.3.6","transformers-0.5.6.2"],"exe-depends":[],"component-name":"lib"},{"type":"pre-existing","id":"containers-0.6.0.1","pkg-name":"containers","pkg-version":"0.6.0.1","depends":["array-0.5.3.0","base-4.12.0.0","deepseq-1.4.4.0","ghc-prim-0.5.3"]},{"type":"configured","id":"cryptohash-sha256-0.11.102.0-1788be3651f34f47baf624f708f86ea7d6db2d13268558e536d0a1bd2b97e074","pkg-name":"cryptohash-sha256","pkg-version":"0.11.102.0","flags":{"exe":false,"use-cbits":true},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"daa34001f8221bf550a3afb278ee9ac3a7257dba187cd7ec4bd5436264b26424","pkg-src-sha256":"8ad6e9875a9128f6cd66d65d80f9f85dd0559c73ac00bb37f71fbee820d10519","depends":["base-4.12.0.0","bytestring-0.10.8.2"],"exe-depends":[],"component-name":"lib"},{"type":"pre-existing","id":"deepseq-1.4.4.0","pkg-name":"deepseq","pkg-version":"1.4.4.0","depends":["array-0.5.3.0","base-4.12.0.0"]},{"type":"pre-existing","id":"directory-1.3.3.0","pkg-name":"directory","pkg-version":"1.3.3.0","depends":["base-4.12.0.0","filepath-1.4.2.1","time-1.8.0.2","unix-2.7.2.2"]},{"type":"configured","id":"echo-0.1.4-f2f39bb54e76ea77d5753fd796c4b4126a9c4a7d8b34fbeb350261c52821e0f3","pkg-name":"echo","pkg-version":"0.1.4","flags":{"example":false},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"ccce771562c49a2b29a52046ca68c62179e97e8fbeacdae32ca84a85445e8f42","pkg-src-sha256":"c9fe1bf2904825a65b667251ec644f197b71dc5c209d2d254be5de3d496b0e43","depends":["base-4.12.0.0","process-1.6.5.0"],"exe-depends":[],"component-name":"lib"},{"type":"configured","id":"ed25519-0.0.5.0-751e5a5744fdd2d7ce2245bc124b15133d0dff1db6b0441d93ced591450d9edb","pkg-name":"ed25519","pkg-version":"0.0.5.0","flags":{"no-donna":true,"test-doctests":true,"test-hlint":true,"test-properties":true},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"fb98b08de467d51f788f8bd9391f0e9ab9bd4d8dfc264296b895ffea0d822dfa","pkg-src-sha256":"d8a5958ebfa9309790efade64275dc5c441b568645c45ceed1b0c6ff36d6156d","depends":["base-4.12.0.0","bytestring-0.10.8.2","ghc-prim-0.5.3"],"exe-depends":[],"component-name":"lib"},{"type":"configured","id":"edit-distance-0.2.2.1-7bd6af1f732ef2a1f2b04b4f27ad793f3ed3fa5623ddc8e07a4e489f60cbcee8","pkg-name":"edit-distance","pkg-version":"0.2.2.1","flags":{},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"4d33a49cd383d50af090f1b888642d10116e43809f9da6023d9fc6f67d2656ee","pkg-src-sha256":"3e8885ee2f56ad4da940f043ae8f981ee2fe336b5e8e4ba3f7436cff4f526c4a","depends":["array-0.5.3.0","base-4.12.0.0","containers-0.6.0.1","random-1.2.0-f975454f78491c8b834a9026806b59ad4e6cbebac633684d977c1bf1bb394421"],"exe-depends":[],"component-name":"lib"},{"type":"configured","id":"exceptions-0.10.4-2e686fdff7a6bdbd62e24641169087c094e991de8ab3f6381a859306fd258e32","pkg-name":"exceptions","pkg-version":"0.10.4","flags":{"transformers-0-4":true},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"d2546046d7ba4b460d3bc7fd269cd2c52d0b7fb3cfecc038715dd0881b78a484","pkg-src-sha256":"4d0bfb4355cffcd67d300811df9d5fe44ea3594ed63750795bfc1f797abd84cf","depends":["base-4.12.0.0","mtl-2.2.2","stm-2.5.0.0","template-haskell-2.14.0.0","transformers-0.5.6.2"],"exe-depends":[],"component-name":"lib"},{"type":"pre-existing","id":"filepath-1.4.2.1","pkg-name":"filepath","pkg-version":"1.4.2.1","depends":["base-4.12.0.0"]},{"type":"pre-existing","id":"ghc-boot-th-8.6.5","pkg-name":"ghc-boot-th","pkg-version":"8.6.5","depends":["base-4.12.0.0"]},{"type":"pre-existing","id":"ghc-prim-0.5.3","pkg-name":"ghc-prim","pkg-version":"0.5.3","depends":["rts"]},{"type":"configured","id":"hackage-security-0.6.0.1-inplace","pkg-name":"hackage-security","pkg-version":"0.6.0.1","flags":{"base48":true,"lukko":true,"mtl21":false,"old-directory":false,"use-network-uri":true},"style":"inplace","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"e7243dc32731692f2f384e184e5509422488975abb1eafc1b552de711f73226f","pkg-src-sha256":"9162b473af5a21c1ff32a50b972b9acf51f4c901604a22cf08a2dccac2f82f17","dist-dir":"/code/shared-haskell/cabal/dist-newstyle/build/x86_64-linux/ghc-8.6.5/hackage-security-0.6.0.1","depends":["Cabal-3.5.0.0-inplace","base-4.12.0.0","base16-bytestring-1.0.1.0-1746bcc67bba177c17e33a8fba687adf44ffb730cb52632e82c956e36819a4f9","base64-bytestring-1.2.0.1-c074ebbf1a80dfba689ab2ea03281f23e448dbc0e03f9e8ae4f9cfeb7f50fde5","bytestring-0.10.8.2","containers-0.6.0.1","cryptohash-sha256-0.11.102.0-1788be3651f34f47baf624f708f86ea7d6db2d13268558e536d0a1bd2b97e074","directory-1.3.3.0","ed25519-0.0.5.0-751e5a5744fdd2d7ce2245bc124b15133d0dff1db6b0441d93ced591450d9edb","filepath-1.4.2.1","ghc-prim-0.5.3","lukko-0.1.1.3-4c76677eee1fcca961ba3794c92e0a1f4e9c3ced333a9c3f048e6f3f312cb890","mtl-2.2.2","network-3.1.2.1-1abbc9eff55f1c6dd01110ab4a2f2d35ee159edcdb00756e73a95bbdd6a69b08","network-uri-2.6.4.1-2e14423f89f3ac3c2ee00e429745a82fc831c9aab0062dbfb95d83e883cb22b3","parsec-3.1.13.0","pretty-1.1.3.6","tar-0.5.1.1-2bac801a527e5793b7752115b282082cf46ce8f20e48fb17bd96599f96366b21","template-haskell-2.14.0.0","time-1.8.0.2","transformers-0.5.6.2","zlib-0.6.2.3-ed437c4dad11e2d9e8074a8f3cc6b184779db7ddfdf413b593887e96726d7450"],"exe-depends":[],"component-name":"lib"},{"type":"configured","id":"hashable-1.3.1.0-992f1f6406c978642dd1247abb4eb327d6ae7cc49c6a80dd5f2f28abbd2e28bb","pkg-name":"hashable","pkg-version":"1.3.1.0","flags":{"integer-gmp":true},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"d965e098e06cc585b201da6137dcb31c40f35eb7a937b833903969447985c076","pkg-src-sha256":"8061823a4ac521b53912edcba36b956f3159cb885b07ec119af295a6568ca7c4","depends":["base-4.12.0.0","bytestring-0.10.8.2","deepseq-1.4.4.0","ghc-prim-0.5.3","integer-gmp-1.0.2.0","text-1.2.3.1"],"exe-depends":[],"component-name":"lib"},{"type":"configured","id":"hsc2hs-0.68.7-e-hsc2hs-0c4585ed41291b35ebc895b38398cb967e27e28d827b43b63adf9034d1517144","pkg-name":"hsc2hs","pkg-version":"0.68.7","flags":{"in-ghc-tree":false},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"4a0f6860a17e7c245646975e3c2981416afdcb6a7b3553c31005eb3641a7f55b","pkg-src-sha256":"fd7915e41e3ed3bc7750fee0e8add2b4f32dcac8b7c544cfdf5542293223894a","depends":["base-4.12.0.0","containers-0.6.0.1","directory-1.3.3.0","filepath-1.4.2.1","process-1.6.5.0"],"exe-depends":[],"component-name":"exe:hsc2hs","bin-file":"/home/tapas/.cabal/store/ghc-8.6.5/hsc2hs-0.68.7-e-hsc2hs-0c4585ed41291b35ebc895b38398cb967e27e28d827b43b63adf9034d1517144/bin/hsc2hs"},{"type":"pre-existing","id":"integer-gmp-1.0.2.0","pkg-name":"integer-gmp","pkg-version":"1.0.2.0","depends":["ghc-prim-0.5.3"]},{"type":"configured","id":"lukko-0.1.1.3-4c76677eee1fcca961ba3794c92e0a1f4e9c3ced333a9c3f048e6f3f312cb890","pkg-name":"lukko","pkg-version":"0.1.1.3","flags":{"ofd-locking":true},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"2db49b6cb6632a46ec446fc51870cd0d49e0a66d1c5d2063f46ae52a100eb856","pkg-src-sha256":"a80efb60cfa3dae18682c01980d76d5f7e413e191cd186992e1bf7388d48ab1f","depends":["base-4.12.0.0"],"exe-depends":["hsc2hs-0.68.7-e-hsc2hs-0c4585ed41291b35ebc895b38398cb967e27e28d827b43b63adf9034d1517144"],"component-name":"lib"},{"type":"pre-existing","id":"mtl-2.2.2","pkg-name":"mtl","pkg-version":"2.2.2","depends":["base-4.12.0.0","transformers-0.5.6.2"]},{"type":"configured","id":"network-3.1.2.1-1abbc9eff55f1c6dd01110ab4a2f2d35ee159edcdb00756e73a95bbdd6a69b08","pkg-name":"network","pkg-version":"3.1.2.1","flags":{"devel":false},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"188d6daea8cd91bc3553efd5a90a1e7c6d0425fa66a53baa74db5b6d9fd75c8b","pkg-src-sha256":"fcaa954445cb575ff04d088e719452e356324b6acb98c5aefd2541a069439d4a","components":{"lib":{"depends":["base-4.12.0.0","bytestring-0.10.8.2","deepseq-1.4.4.0","directory-1.3.3.0"],"exe-depends":["hsc2hs-0.68.7-e-hsc2hs-0c4585ed41291b35ebc895b38398cb967e27e28d827b43b63adf9034d1517144"]}}},{"type":"configured","id":"network-uri-2.6.4.1-2e14423f89f3ac3c2ee00e429745a82fc831c9aab0062dbfb95d83e883cb22b3","pkg-name":"network-uri","pkg-version":"2.6.4.1","flags":{},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"a4765164ed0a2d1668446eb2e03460ce98645fbf083598c690846af79b7de10d","pkg-src-sha256":"57856db93608a4d419f681b881c9b8d4448800d5a687587dc37e8a9e0b223584","depends":["base-4.12.0.0","deepseq-1.4.4.0","parsec-3.1.13.0","template-haskell-2.14.0.0","th-compat-0.1.2-0e7d070c7da2da668dde8b1c69a1d534b3ebfc35538ee0ce437bd5a824475140"],"exe-depends":[],"component-name":"lib"},{"type":"pre-existing","id":"parsec-3.1.13.0","pkg-name":"parsec","pkg-version":"3.1.13.0","depends":["base-4.12.0.0","bytestring-0.10.8.2","mtl-2.2.2","text-1.2.3.1"]},{"type":"pre-existing","id":"pretty-1.1.3.6","pkg-name":"pretty","pkg-version":"1.1.3.6","depends":["base-4.12.0.0","deepseq-1.4.4.0","ghc-prim-0.5.3"]},{"type":"pre-existing","id":"process-1.6.5.0","pkg-name":"process","pkg-version":"1.6.5.0","depends":["base-4.12.0.0","deepseq-1.4.4.0","directory-1.3.3.0","filepath-1.4.2.1","unix-2.7.2.2"]},{"type":"configured","id":"random-1.2.0-f975454f78491c8b834a9026806b59ad4e6cbebac633684d977c1bf1bb394421","pkg-name":"random","pkg-version":"1.2.0","flags":{},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"30d72df4cc1d2fe2d445c88f0ee9d21965af7ce86660c43a6c32a6a1d90d51c9","pkg-src-sha256":"e4519cf7c058bfd5bdbe4acc782284acc9e25e74487208619ca83cbcd63fb9de","depends":["base-4.12.0.0","bytestring-0.10.8.2","deepseq-1.4.4.0","mtl-2.2.2","splitmix-0.1.0.3-495ff5a958a036b388c5fb1ec95d09b6e221914366e7c53f4e181bd8dbef71f9"],"exe-depends":[],"component-name":"lib"},{"type":"configured","id":"regex-base-0.94.0.1-8daf12dc69a5224d3cb7813e6280b915706276fe3b3671583aa6b7ad031b7344","pkg-name":"regex-base","pkg-version":"0.94.0.1","flags":{},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"6e3546b73cd5489201d481aa645a531f2c61aa317984e31c5f379ac0bcbfbfad","pkg-src-sha256":"71b1d96fff201f31fe8cd4532f056aca03a21cd486890256dc3007dd73adedd9","depends":["array-0.5.3.0","base-4.12.0.0","bytestring-0.10.8.2","containers-0.6.0.1","mtl-2.2.2","text-1.2.3.1"],"exe-depends":[],"component-name":"lib"},{"type":"configured","id":"regex-posix-0.96.0.0-e300590bbb553870ac4ae4c071ad74621feee4e42bed538ff4b943482fab5952","pkg-name":"regex-posix","pkg-version":"0.96.0.0","flags":{"_regex-posix-clib":false},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"bd870f983a21bb474bd96449736f011c599981ce70da808a21ec1a28292e5481","pkg-src-sha256":"251300f1a6bb2e91abb8bf513a21981f8fab79c98a65acea2bb6d6a524414521","depends":["array-0.5.3.0","base-4.12.0.0","bytestring-0.10.8.2","containers-0.6.0.1","regex-base-0.94.0.1-8daf12dc69a5224d3cb7813e6280b915706276fe3b3671583aa6b7ad031b7344"],"exe-depends":[],"component-name":"lib"},{"type":"configured","id":"resolv-0.1.2.0-839f45c81c7fff34820bc93f39bf071c78acc518c5fdaa3e3cfdbf27d1f5e16d","pkg-name":"resolv","pkg-version":"0.1.2.0","flags":{},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"10a469977777937bb747a541c237669ba10dd2d25c917d67535927aaa96ac55a","pkg-src-sha256":"81a2bafad484db123cf8d17a02d98bb388a127fd0f822fa022589468a0e64671","components":{"lib":{"depends":["base-4.12.0.0","base16-bytestring-1.0.1.0-1746bcc67bba177c17e33a8fba687adf44ffb730cb52632e82c956e36819a4f9","binary-0.8.6.0","bytestring-0.10.8.2","containers-0.6.0.1"],"exe-depends":[]}}},{"type":"pre-existing","id":"rts","pkg-name":"rts","pkg-version":"1.0","depends":[]},{"type":"configured","id":"splitmix-0.1.0.3-495ff5a958a036b388c5fb1ec95d09b6e221914366e7c53f4e181bd8dbef71f9","pkg-name":"splitmix","pkg-version":"0.1.0.3","flags":{"optimised-mixer":false},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"fc3aae74c467f4b608050bef53aec17904a618731df9407e655d8f3bf8c32d5c","pkg-src-sha256":"46009f4b000c9e6613377767b8718bf38476469f2a8e2162d98cc246882d5a35","depends":["base-4.12.0.0","deepseq-1.4.4.0"],"exe-depends":[],"component-name":"lib"},{"type":"pre-existing","id":"stm-2.5.0.0","pkg-name":"stm","pkg-version":"2.5.0.0","depends":["array-0.5.3.0","base-4.12.0.0"]},{"type":"configured","id":"tar-0.5.1.1-2bac801a527e5793b7752115b282082cf46ce8f20e48fb17bd96599f96366b21","pkg-name":"tar","pkg-version":"0.5.1.1","flags":{"old-bytestring":false,"old-time":false},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"94ded05718fe75b88c98e7113feeb9fca50688a7e59b6aefd80a6f48438c5062","pkg-src-sha256":"b384449f62b2b0aa3e6d2cb1004b8060b01f21ec93e7b63e7af6d8fad8a9f1de","depends":["array-0.5.3.0","base-4.12.0.0","bytestring-0.10.8.2","containers-0.6.0.1","deepseq-1.4.4.0","directory-1.3.3.0","filepath-1.4.2.1","time-1.8.0.2"],"exe-depends":[],"component-name":"lib"},{"type":"pre-existing","id":"template-haskell-2.14.0.0","pkg-name":"template-haskell","pkg-version":"2.14.0.0","depends":["base-4.12.0.0","ghc-boot-th-8.6.5","pretty-1.1.3.6"]},{"type":"pre-existing","id":"text-1.2.3.1","pkg-name":"text","pkg-version":"1.2.3.1","depends":["array-0.5.3.0","base-4.12.0.0","binary-0.8.6.0","bytestring-0.10.8.2","deepseq-1.4.4.0","ghc-prim-0.5.3","integer-gmp-1.0.2.0"]},{"type":"configured","id":"th-compat-0.1.2-0e7d070c7da2da668dde8b1c69a1d534b3ebfc35538ee0ce437bd5a824475140","pkg-name":"th-compat","pkg-version":"0.1.2","flags":{},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"3d55de1adc542c1a870c9ada90da2fbbe5f4e8bcd3eed545a55c3df9311b32a8","pkg-src-sha256":"2bc45d0199de3dc65ebc9b71251799f5238869dbc6a66bdf0c06c7e23d603801","depends":["base-4.12.0.0","template-haskell-2.14.0.0"],"exe-depends":[],"component-name":"lib"},{"type":"pre-existing","id":"time-1.8.0.2","pkg-name":"time","pkg-version":"1.8.0.2","depends":["base-4.12.0.0","deepseq-1.4.4.0"]},{"type":"pre-existing","id":"transformers-0.5.6.2","pkg-name":"transformers","pkg-version":"0.5.6.2","depends":["base-4.12.0.0"]},{"type":"pre-existing","id":"unix-2.7.2.2","pkg-name":"unix","pkg-version":"2.7.2.2","depends":["base-4.12.0.0","bytestring-0.10.8.2","time-1.8.0.2"]},{"type":"configured","id":"zlib-0.6.2.3-ed437c4dad11e2d9e8074a8f3cc6b184779db7ddfdf413b593887e96726d7450","pkg-name":"zlib","pkg-version":"0.6.2.3","flags":{"bundled-c-zlib":false,"non-blocking-ffi":false,"pkg-config":false},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"28f4d460c260e074cab833625454564b9783a3389b7bb91fd54da2790b39592c","pkg-src-sha256":"807f6bddf9cb3c517ce5757d991dde3c7e319953a22c86ee03d74534bd5abc88","depends":["base-4.12.0.0","bytestring-0.10.8.2"],"exe-depends":[],"component-name":"lib"}]}
diff --git a/bootstrap/linux-8.8.3.json b/bootstrap/linux-8.8.3.json
index a1ab06c9bcd..e69de29bb2d 100644
--- a/bootstrap/linux-8.8.3.json
+++ b/bootstrap/linux-8.8.3.json
@@ -1,340 +0,0 @@
-{
-    "builtin": [
-        {
-            "package": "rts",
-            "version": "1.0"
-        },
-        {
-            "package": "ghc-prim",
-            "version": "0.5.3"
-        },
-        {
-            "package": "integer-gmp",
-            "version": "1.0.2.0"
-        },
-        {
-            "package": "base",
-            "version": "4.13.0.0"
-        },
-        {
-            "package": "array",
-            "version": "0.5.4.0"
-        },
-        {
-            "package": "deepseq",
-            "version": "1.4.4.0"
-        },
-        {
-            "package": "bytestring",
-            "version": "0.10.10.0"
-        },
-        {
-            "package": "containers",
-            "version": "0.6.2.1"
-        },
-        {
-            "package": "binary",
-            "version": "0.8.7.0"
-        },
-        {
-            "package": "filepath",
-            "version": "1.4.2.1"
-        },
-        {
-            "package": "time",
-            "version": "1.9.3"
-        },
-        {
-            "package": "unix",
-            "version": "2.7.2.2"
-        },
-        {
-            "package": "directory",
-            "version": "1.3.6.0"
-        },
-        {
-            "package": "transformers",
-            "version": "0.5.6.2"
-        },
-        {
-            "package": "mtl",
-            "version": "2.2.2"
-        },
-        {
-            "package": "ghc-boot-th",
-            "version": "8.8.3"
-        },
-        {
-            "package": "pretty",
-            "version": "1.1.3.6"
-        },
-        {
-            "package": "template-haskell",
-            "version": "2.15.0.0"
-        },
-        {
-            "package": "text",
-            "version": "1.2.4.0"
-        },
-        {
-            "package": "parsec",
-            "version": "3.1.14.0"
-        },
-        {
-            "package": "process",
-            "version": "1.6.8.0"
-        },
-        {
-            "package": "stm",
-            "version": "2.5.0.0"
-        }
-    ],
-    "dependencies": [
-        {
-            "cabal_sha256": null,
-            "flags": [
-                "-bundled-binary-generic"
-            ],
-            "package": "Cabal",
-            "revision": null,
-            "source": "local",
-            "src_sha256": null,
-            "version": "3.5.0.0"
-        },
-        {
-            "cabal_sha256": "b704cb6676c03e98267190df797497587576a2e96094550ea143415239bbe66e",
-            "flags": [],
-            "package": "network",
-            "revision": 0,
-            "source": "hackage",
-            "src_sha256": "d7ef590173fff2ab522fbc167f3fafb867e4ecfca279eb3ef0d137b51f142c9a",
-            "version": "3.1.1.1"
-        },
-        {
-            "cabal_sha256": "d2d9ff3a80d9b2d1ff317a354bc0c56cc109c69a4c2449e5fc712d3ddce83ede",
-            "flags": [],
-            "package": "network-uri",
-            "revision": 0,
-            "source": "hackage",
-            "src_sha256": "a01c1389f15d2cc2e847914737f706133bb11f0c5f8ee89711a36a25b7afa723",
-            "version": "2.6.3.0"
-        },
-        {
-            "cabal_sha256": "3c19975fdfd8d057eae58847bda6a79514ad882fd6f8ead72ac0247af34bdfc6",
-            "flags": [
-                "-conduit10",
-                "-mtl1",
-                "+network-uri",
-                "-warn-as-error",
-                "-warp-tests"
-            ],
-            "package": "HTTP",
-            "revision": 1,
-            "source": "hackage",
-            "src_sha256": "a602d7f30e917164c6a634f8cb1f5df4849048858db01380a0875e16e5aa687b",
-            "version": "4000.3.14"
-        },
-        {
-            "cabal_sha256": "4c70f1407881059e93550d3742191254296b2737b793a742bd901348fb3e1fb1",
-            "flags": [
-                "-examples",
-                "+integer-gmp",
-                "+sse2",
-                "-sse41"
-            ],
-            "package": "hashable",
-            "revision": 1,
-            "source": "hackage",
-            "src_sha256": "822e5413fbccca6ae884d3aba4066422c8b5d58d23d18b9ecb5c03273bb19ab4",
-            "version": "1.3.0.0"
-        },
-        {
-            "cabal_sha256": "a178c166856da7ff22fe4500337b54812e94fd2059409452187d72e057ede9cd",
-            "flags": [
-                "-bench"
-            ],
-            "package": "async",
-            "revision": 1,
-            "source": "hackage",
-            "src_sha256": "4b4ab1ac82c45144d82c6daf6cb6ba45eab9957dad44787fa5e869e23d73bbff",
-            "version": "2.2.2"
-        },
-        {
-            "cabal_sha256": "8cbba2505d4da4f6cfc90cd36c8e8ad0c09c056538481ea00e8b10b78f70cb10",
-            "flags": [],
-            "package": "base16-bytestring",
-            "revision": 0,
-            "source": "hackage",
-            "src_sha256": "525689679d5cc80fa532c1d5cfeace0f62bbb54134fad514f1ba00d0e7fe69ba",
-            "version": "0.1.1.7"
-        },
-        {
-            "cabal_sha256": "190264fef9e65d9085f00ccda419137096d1dc94777c58272bc96821dc7f37c3",
-            "flags": [],
-            "package": "base64-bytestring",
-            "revision": 0,
-            "source": "hackage",
-            "src_sha256": "210d6c9042241ca52ee5d89cf221dbeb4d0e64b37391345369035ad2d9b4aca9",
-            "version": "1.1.0.0"
-        },
-        {
-            "cabal_sha256": "b963d6308db096362d73d9c603b331cf188aa69310195f479dfedf6045d7e602",
-            "flags": [
-                "-exe"
-            ],
-            "package": "cryptohash-sha256",
-            "revision": 4,
-            "source": "hackage",
-            "src_sha256": "52756435dbea248e344fbcbcc5df5307f60dfacf337dfd11ae30f1c7a4da05dd",
-            "version": "0.11.101.0"
-        },
-        {
-            "cabal_sha256": "5490be9cfbea95e14a7a68b7d055ae8d295822e0b146d2ac8285b3e5a3e3282f",
-            "flags": [
-                "-example"
-            ],
-            "package": "echo",
-            "revision": 1,
-            "source": "hackage",
-            "src_sha256": "704f07310f8272d170f8ab7fb2a2c13f15d8501ef8310801e36964c8eff485ef",
-            "version": "0.1.3"
-        },
-        {
-            "cabal_sha256": "d50c4d0801a35be7875a040470c09863342514930c82a7d25780a6c2efc4fda9",
-            "flags": [
-                "-optimised-mixer"
-            ],
-            "package": "splitmix",
-            "revision": 0,
-            "source": "hackage",
-            "src_sha256": "1c11c87352ddbb13365380fe163f99bb8f8845ebc96ca1d572e5d3a9bf810bfa",
-            "version": "0.1"
-        },
-        {
-            "cabal_sha256": "5ca8674e95c46c7eb90f520c26aea22d403625c97697275434afba66ebd32b05",
-            "flags": [],
-            "package": "random",
-            "revision": 0,
-            "source": "hackage",
-            "src_sha256": "e4519cf7c058bfd5bdbe4acc782284acc9e25e74487208619ca83cbcd63fb9de",
-            "version": "1.2.0"
-        },
-        {
-            "cabal_sha256": "4d33a49cd383d50af090f1b888642d10116e43809f9da6023d9fc6f67d2656ee",
-            "flags": [],
-            "package": "edit-distance",
-            "revision": 1,
-            "source": "hackage",
-            "src_sha256": "3e8885ee2f56ad4da940f043ae8f981ee2fe336b5e8e4ba3f7436cff4f526c4a",
-            "version": "0.2.2.1"
-        },
-        {
-            "cabal_sha256": "fb98b08de467d51f788f8bd9391f0e9ab9bd4d8dfc264296b895ffea0d822dfa",
-            "flags": [
-                "+no-donna",
-                "+test-doctests",
-                "+test-hlint",
-                "+test-properties"
-            ],
-            "package": "ed25519",
-            "revision": 3,
-            "source": "hackage",
-            "src_sha256": "d8a5958ebfa9309790efade64275dc5c441b568645c45ceed1b0c6ff36d6156d",
-            "version": "0.0.5.0"
-        },
-        {
-            "cabal_sha256": "c9d3fa30fb6ab2ba16e037586ca79be6e57ec5f00381b6ee5f293400dbdf5515",
-            "flags": [
-                "+ofd-locking"
-            ],
-            "package": "lukko",
-            "revision": 0,
-            "source": "hackage",
-            "src_sha256": "8a79d113dc0ccef16c24d83379cc457485943027e777529c46362fecc06607d2",
-            "version": "0.1.1.2"
-        },
-        {
-            "cabal_sha256": "7a715414c4d494c9048cfb6d7634e07e7732ca154cb8938dc85f6ea192192e8c",
-            "flags": [
-                "-old-bytestring",
-                "-old-time"
-            ],
-            "package": "tar",
-            "revision": 2,
-            "source": "hackage",
-            "src_sha256": "b384449f62b2b0aa3e6d2cb1004b8060b01f21ec93e7b63e7af6d8fad8a9f1de",
-            "version": "0.5.1.1"
-        },
-        {
-            "cabal_sha256": "d34ddf5fece4d1e9d471b5298f36335bb3cfe12cb5a1b8525c42f0b665382f45",
-            "flags": [
-                "-non-blocking-ffi",
-                "-pkg-config"
-            ],
-            "package": "zlib",
-            "revision": 1,
-            "source": "hackage",
-            "src_sha256": "f0f810ff173560b60392db448455c0513b3239f48e43cb494b3733aa559621d0",
-            "version": "0.6.2.1"
-        },
-        {
-            "cabal_sha256": "692c385c085baa2813046ae58e31df21c250346b81c882431b5ffef76451a18a",
-            "flags": [
-                "+base48",
-                "+lukko",
-                "-mtl21",
-                "-old-directory",
-                "+use-network-uri"
-            ],
-            "package": "hackage-security",
-            "revision": 2,
-            "source": "hackage",
-            "src_sha256": "9162b473af5a21c1ff32a50b972b9acf51f4c901604a22cf08a2dccac2f82f17",
-            "version": "0.6.0.1"
-        },
-        {
-            "cabal_sha256": "44aa95ca762294ffbb28cf0af9c567d93b5d2c56e4f38ce5385a257d899f968e",
-            "flags": [],
-            "package": "regex-base",
-            "revision": 1,
-            "source": "hackage",
-            "src_sha256": "c41f82f5fc1157c961a4cbdc0cd5561e5aa44f339ce6e706d978d97e0ca6b914",
-            "version": "0.94.0.0"
-        },
-        {
-            "cabal_sha256": "690d1366e9ea6df71ded3daf49ca3d53c63eda3f95937962299b2391824dc3b3",
-            "flags": [
-                "-_regex-posix-clib"
-            ],
-            "package": "regex-posix",
-            "revision": 1,
-            "source": "hackage",
-            "src_sha256": "251300f1a6bb2e91abb8bf513a21981f8fab79c98a65acea2bb6d6a524414521",
-            "version": "0.96.0.0"
-        },
-        {
-            "cabal_sha256": "0a9a6dd29706258ae60a5c22aecc140a40743b8f08fc324fd9984e7dfbf3a80d",
-            "flags": [],
-            "package": "resolv",
-            "revision": 0,
-            "source": "hackage",
-            "src_sha256": "81a2bafad484db123cf8d17a02d98bb388a127fd0f822fa022589468a0e64671",
-            "version": "0.1.2.0"
-        },
-        {
-            "cabal_sha256": null,
-            "flags": [
-                "-debug-conflict-sets",
-                "-debug-expensive-assertions",
-                "-debug-tracetree",
-                "+lukko",
-                "+native-dns"
-            ],
-            "package": "cabal-install",
-            "revision": null,
-            "source": "local",
-            "src_sha256": null,
-            "version": "3.5.0.0"
-        }
-    ]
-}
diff --git a/cabal-dev-scripts/cabal-dev-scripts.cabal b/cabal-dev-scripts/cabal-dev-scripts.cabal
index dc9e08f0506..e5d502efbf3 100644
--- a/cabal-dev-scripts/cabal-dev-scripts.cabal
+++ b/cabal-dev-scripts/cabal-dev-scripts.cabal
@@ -18,7 +18,7 @@ executable gen-spdx
   ghc-options:      -Wall
   build-depends:
     , aeson                 ^>=1.4.1.0 || ^>=1.5.2.0
-    , base                  >=4.10     && <4.15
+    , base                  >=4.10     && <4.16
     , bytestring
     , containers
     , Diff                  ^>=0.4
@@ -35,7 +35,7 @@ executable gen-spdx-exc
   ghc-options:      -Wall
   build-depends:
     , aeson                 ^>=1.4.1.0 || ^>=1.5.2.0
-    , base                  >=4.10     && <4.15
+    , base                  >=4.10     && <4.16
     , bytestring
     , containers
     , Diff                  ^>=0.4
diff --git a/cabal-dev-scripts/src/GenValidate.hs b/cabal-dev-scripts/src/GenValidate.hs
index 9956c42fff5..d1178003d1f 100644
--- a/cabal-dev-scripts/src/GenValidate.hs
+++ b/cabal-dev-scripts/src/GenValidate.hs
@@ -28,8 +28,8 @@ main = do
                     , GhcJob "8.6.5"  False "--complete-hackage-tests"  False ["8.8.3"] defSteps
                     , GhcJob "8.4.4"  False ""                          False ["8.8.3"] defSteps
                     , GhcJob "8.2.2"  False ""                          False ["8.8.3"] defSteps
-                    , GhcJob "8.0.2"  False ""                          False ["8.8.3"] defSteps
-                    , GhcJob "7.10.3" False ""                          False ["8.8.3"] defSteps
+                    , GhcJob "8.0.2"  False "--lib-only"                False ["8.8.3"] libSteps
+                    , GhcJob "7.10.3" False "--lib-only"                False ["8.8.3"] libSteps
                     , GhcJob "7.8.4"  False "--lib-only"                False ["8.8.3"] libSteps
                     , GhcJob "7.6.3"  True  "--lib-only"                False ["8.8.3"] libSteps
                     , GhcJob "8.8.3"  True  "--lib-only"                True  ["8.8.3"] $
@@ -72,7 +72,6 @@ defSteps :: [String]
 defSteps =
     [ "print-config"
     , "print-tool-versions"
-    , "make-cabal-install-dev"
     , "build"
     , "lib-tests"
     , "lib-suite"
diff --git a/cabal-install-solver/cabal-install-solver.cabal b/cabal-install-solver/cabal-install-solver.cabal
index 1cb1eaa9539..bbb616ab5e2 100644
--- a/cabal-install-solver/cabal-install-solver.cabal
+++ b/cabal-install-solver/cabal-install-solver.cabal
@@ -18,7 +18,7 @@ build-type:    Simple
 source-repository head
   type:     git
   location: https://github.com/haskell/cabal/
-  subdir:   cabal-install/cabal-install-solver
+  subdir:   cabal-install-solver
 
 flag debug-expensive-assertions
   description: Enable expensive assertions for testing or debugging
diff --git a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal
index b1e41066134..b51a9f2ec04 100644
--- a/cabal-install/cabal-install.cabal
+++ b/cabal-install/cabal-install.cabal
@@ -45,8 +45,11 @@ common warnings
       if impl(ghc >=8.10)
         ghc-options: -Wunused-packages
 
+common base-dependency
+    build-depends: base >=4.10 && <4.16
+
 library
-    import: warnings
+    import: warnings, base-dependency
     default-language: Haskell2010
 
     hs-source-dirs:   src
@@ -185,7 +188,6 @@ library
     build-depends:
         async      >= 2.0      && < 2.3,
         array      >= 0.4      && < 0.6,
-        base       >= 4.10     && < 4.15,
         base16-bytestring >= 0.1.1 && < 1.1.0.0,
         binary     >= 0.7.3    && < 0.9,
         bytestring >= 0.10.6.0 && < 0.12,
@@ -236,7 +238,7 @@ library
 
 
 executable cabal
-    import: warnings
+    import: warnings, base-dependency
     main-is: Main.hs
     hs-source-dirs: main
     default-language: Haskell2010
@@ -250,14 +252,13 @@ executable cabal
     build-depends:
         cabal-install,
         Cabal,
-        base,
         directory,
         filepath
 
 -- Small, fast running tests.
 --
 Test-Suite unit-tests
-    import: warnings
+    import: warnings, base-dependency
     default-language: Haskell2010
     ghc-options: -rtsopts -threaded
 
@@ -292,7 +293,6 @@ Test-Suite unit-tests
 
     build-depends:
           array,
-          base,
           bytestring,
           cabal-install,
           cabal-install-solver,
@@ -319,7 +319,7 @@ Test-Suite unit-tests
 -- Tests to run with a limited stack and heap size
 --
 Test-Suite memory-usage-tests
-  import: warnings
+  import: warnings, base-dependency
   type: exitcode-stdio-1.0
   main-is: MemoryUsageTests.hs
   hs-source-dirs: tests
@@ -334,7 +334,6 @@ Test-Suite memory-usage-tests
     UnitTests.Options
 
   build-depends:
-        base,
         Cabal,
         cabal-install-solver,
         cabal-install,
@@ -346,7 +345,7 @@ Test-Suite memory-usage-tests
 -- Integration tests that use the cabal-install code directly
 -- but still build whole projects
 test-suite integration-tests2
-  import: warnings
+  import: warnings, base-dependency
   ghc-options: -rtsopts -threaded
   type: exitcode-stdio-1.0
   main-is: IntegrationTests2.hs
@@ -354,7 +353,6 @@ test-suite integration-tests2
   default-language: Haskell2010
 
   build-depends:
-        base,
         bytestring,
         Cabal,
         cabal-install-solver,
@@ -367,7 +365,7 @@ test-suite integration-tests2
         tagged
 
 test-suite long-tests
-  import: warnings
+  import: warnings, base-dependency
   ghc-options: -rtsopts -threaded
   type: exitcode-stdio-1.0
   hs-source-dirs: tests
@@ -387,7 +385,6 @@ test-suite long-tests
     UnitTests.TempTestDir
 
   build-depends:
-        base,
         Cabal,
         Cabal-QuickCheck,
         Cabal-described,
diff --git a/cabal.project.release b/cabal.project.release
index 7b7ef0368ea..d9528c2082f 100644
--- a/cabal.project.release
+++ b/cabal.project.release
@@ -1,4 +1,5 @@
 packages: Cabal/
+packages: cabal-install-solver/
 packages: cabal-install/
 tests: False
 benchmarks: False
diff --git a/cabal.project.validate b/cabal.project.validate
index 25f29243d44..0fcbe2cede7 100644
--- a/cabal.project.validate
+++ b/cabal.project.validate
@@ -3,7 +3,7 @@ packages: cabal-testsuite/
 packages: cabal-install/
 packages: solver-benchmarks/
 
-packages: cabal-install/cabal-install-solver/
+packages: cabal-install-solver/
 packages: Cabal-QuickCheck/
 packages: Cabal-tree-diff
 packages: Cabal-described
diff --git a/release.py b/release.py
index 46954deefb9..888d9e6ffa0 100755
--- a/release.py
+++ b/release.py
@@ -39,6 +39,7 @@
     ('static', bool),
     ('ofdlocking', bool),
     ('tarlib', Path),
+    ('tarsolver', Path),
     ('tarexe', Path),
 ])
 
@@ -159,6 +160,7 @@ def step_config(args: Args):
     cabal_project = dedent(f"""
         packages: {args.tarlib}
         packages: {args.tarexe}
+        packages: {args.tarsolver}
         tests: False
         benchmarks: False
         optimization: True
@@ -283,6 +285,7 @@ def __call__(self, parser, namespace, values, option_string=None):
     parser.add_argument('--enable-static-executable', '--disable-static-executable', dest='static', nargs=0, default=False, action=EnableDisable, help='Statically link cabal executable')
     parser.add_argument('--enable-ofd-locking', '--disable-ofd-locking', dest='ofd_locking', nargs=0, default=True, action=EnableDisable, help='OFD locking (lukko)')
     parser.add_argument('--tarlib', dest='tarlib', required=True, metavar='LIBTAR', help='path to Cabal-version.tar.gz')
+    parser.add_argument('--tarsolver', dest='tarsolver', required=True, metavar='SOLVERTAR', help='path to cabal-install-solver-version.tar.gz')
     parser.add_argument('--tarexe', dest='tarexe', required=True, metavar='EXETAR', help='path to cabal-install-version.tar.gz')
     parser.add_argument('--builddir', dest='builddir', type=str, default='_build', help='build directory')
 
@@ -296,7 +299,8 @@ def __call__(self, parser, namespace, values, option_string=None):
         static     = args.static,
         ofdlocking = args.ofd_locking,
         tarlib     = Path(args.tarlib).resolve(),
-        tarexe     = Path(args.tarexe).resolve()
+        tarexe     = Path(args.tarexe).resolve(),
+        tarsolver  = Path(args.tarsolver).resolve()
     )
 
     print(dedent(f"""
@@ -307,6 +311,7 @@ def __call__(self, parser, namespace, values, option_string=None):
         static:      {args.static}
         ofd-locking: {args.ofdlocking}
         lib-tarball: {args.tarlib}
+        solver-tarball: {args.tarsolver}
         exe-tarball: {args.tarexe}
     """))
 
diff --git a/templates/ci-artifacts.template.yml b/templates/ci-artifacts.template.yml
index 431b0eba9db..27a4d58b81a 100644
--- a/templates/ci-artifacts.template.yml
+++ b/templates/ci-artifacts.template.yml
@@ -27,8 +27,8 @@ jobs:
       - uses: actions/checkout@v2
       - name: Package project
         run: |
-          cabal v2-sdist --builddir=sdist Cabal cabal-install
-          python3.8 release.py --tarlib=sdist/sdist/Cabal-*.tar.gz --tarexe=sdist/sdist/cabal-install-*.tar.gz
+          cabal v2-sdist --builddir=sdist Cabal cabal-install-solver cabal-install
+          python3.8 release.py --tarlib=sdist/sdist/Cabal-*.tar.gz --tarsolver=sdist/sdist/cabal-install-solver-3.*.tar.gz --tarexe=sdist/sdist/cabal-install-3.*.tar.gz
       - uses: actions/upload-artifact@v2
         with:
           name: cabal-linux
@@ -62,8 +62,8 @@ jobs:
       - uses: actions/checkout@v2
       - name: Package project
         run: |
-          cabal v2-sdist --builddir=sdist Cabal cabal-install
-          python3 release.py --tarlib=sdist/sdist/Cabal-*.tar.gz --tarexe=sdist/sdist/cabal-install-*.tar.gz
+          cabal v2-sdist --builddir=sdist Cabal cabal-install-solver cabal-install
+          python3 release.py --tarlib=sdist/sdist/Cabal-*.tar.gz --tarsolver=sdist/sdist/cabal-install-solver-3.*.tar.gz --tarexe=sdist/sdist/cabal-install-3.*.tar.gz
       - uses: actions/upload-artifact@v2
         with:
           name: cabal-macos
@@ -93,9 +93,9 @@ jobs:
       - name: Package project
         # We hardcode version 3 here to make first glob not overlap with cabal-install
         run: |
-          cabal v2-sdist --builddir=sdist Cabal cabal-install
+          cabal v2-sdist --builddir=sdist Cabal cabal-install-solver cabal-install
           New-Item -Path "_build" -ItemType "directory"
-          python release.py --tarlib=$(Resolve-Path -Path sdist/sdist/Cabal-3.*.tar.gz) --tarexe=$(Resolve-Path -Path sdist/sdist/cabal-install-3.*.tar.gz)
+          python release.py --tarlib=$(Resolve-Path -Path sdist/sdist/Cabal-3.*.tar.gz) --tarsolver=$(Resolve-Path -Path sdist/sdist/cabal-install-solver-3.*.tar.gz) --tarexe=$(Resolve-Path -Path sdist/sdist/cabal-install-3.*.tar.gz)
       - uses: actions/upload-artifact@v2
         with:
           name: cabal-windows
diff --git a/templates/ci-quick-jobs.template.yml b/templates/ci-quick-jobs.template.yml
index 3ca215a9876..d408045eaf6 100644
--- a/templates/ci-quick-jobs.template.yml
+++ b/templates/ci-quick-jobs.template.yml
@@ -41,7 +41,6 @@ jobs:
           make -B spdx
           make -B templates
           make -B github-actions
-          make -B cabal-install-cabal
       - name: Check that diff is clean
         run: |
           git status > /dev/null
diff --git a/templates/ci-windows.template.yml b/templates/ci-windows.template.yml
index de93fa93629..9e87f065233 100644
--- a/templates/ci-windows.template.yml
+++ b/templates/ci-windows.template.yml
@@ -44,8 +44,6 @@ jobs:
       - name: Update Hackage index
         run: cabal v2-update
       - uses: actions/checkout@v2
-      - name: make cabal-install-dev
-        run: cp cabal-install/cabal-install.cabal.dev cabal-install/cabal-install.cabal
       # We cannot ask for all dependencies, but we can for Cabal.
       - name: cabal v2-build Cabal --only-dependencies
         run: cabal v2-build Cabal --only-dependencies
@@ -58,10 +56,10 @@ jobs:
         run: |
           cd cabal-install
           cabal v2-run cabal-install:memory-usage-tests
-      - name: cabal-install solver-quickcheck
+      - name: cabal-install long-tests
         run: |
           cd cabal-install
-          cabal v2-run cabal-install:solver-quickcheck
+          cabal v2-run cabal-install:long-tests -- --pattern "! (/FileMonitor/ || /VCS/ || /Get/)"
       - name: cabal-install integration-tests2
         run: |
           cd cabal-install
diff --git a/validate.sh b/validate.sh
index 59158c51dc4..ec08aef9657 100755
--- a/validate.sh
+++ b/validate.sh
@@ -430,7 +430,7 @@ step_cli_tests() {
 print_header "cabal-install: tests"
 
 # this are sorted in asc time used, quicker tests first.
-CMD="$($CABALPLANLISTBIN cabal-install:test:solver-quickcheck) $TESTSUITEJOBS --hide-successes"
+CMD="$($CABALPLANLISTBIN cabal-install:test:long-tests) $TESTSUITEJOBS --hide-successes"
 (cd cabal-install && timed $CMD) || exit 1
 
 # This doesn't work in parallel either