fix

.gitlab-ci.yml

@@ -1,6 +1,8 @@
 stages:
-  - checks
-  - test
+  - linting
+  - quick-tests
+  - tests
+  - expensive-tests
   - release
 
 variables:
@@ -230,7 +232,7 @@ variables:
 ######## stack test ########
 
 test:linux:stack:
-  stage: test
+  stage: tests
   before_script:
     - ./.gitlab/before_script/linux/install_deps_minimal.sh
   script:
@@ -242,21 +244,21 @@ test:linux:stack:
 ######## bootstrap test ########
 
 test:linux:bootstrap_script:
-  stage: test
+  stage: quick-tests
   before_script:
     - ./.gitlab/before_script/linux/install_deps_minimal.sh
   script:
     - ./.gitlab/script/ghcup_bootstrap.sh
   variables:
-    GHC_VERSION: "8.10.6"
-    CABAL_VERSION: "3.4.0.0"
+    GHC_VERSION: "8.10.7"
+    CABAL_VERSION: "3.6.2.0"
   extends:
     - .debian
     - .root_cleanup
   needs: []
 
 test:windows:bootstrap_powershell_script:
-  stage: test
+  stage: quick-tests
   script:
     - ./scripts/bootstrap/bootstrap-haskell.ps1 -InstallDir $CI_PROJECT_DIR -BootstrapUrl $CI_PROJECT_DIR/bootstrap-haskell -InBash
   after_script:
@@ -265,8 +267,8 @@ test:windows:bootstrap_powershell_script:
     - "[Environment]::SetEnvironmentVariable('CABAL_DIR', $null, [System.EnvironmentVariableTarget]::User)"
     - bash ./.gitlab/after_script.sh
   variables:
-    GHC_VERSION: "8.10.6"
-    CABAL_VERSION: "3.4.0.0"
+    GHC_VERSION: "8.10.7"
+    CABAL_VERSION: "3.6.2.0"
   extends:
     - .windows
   needs: []
@@ -274,22 +276,22 @@ test:windows:bootstrap_powershell_script:
 ######## linux test ########
 
 test:linux:
-  stage: test
+  stage: tests
   extends: .test_ghcup_version:linux
   variables:
-    GHC_VERSION: "8.10.6"
-    CABAL_VERSION: "3.4.0.0"
+    GHC_VERSION: "8.10.7"
+    CABAL_VERSION: "3.6.2.0"
   needs: []
 
 test:linux:hls:
-  stage: test
+  stage: expensive-tests
   extends:
     - .test_ghcup_version
     - .debian
   variables:
     GHC_VERSION: "8.10.7"
     HLS_TARGET_VERSION: "1.4.0"
-    CABAL_VERSION: "3.6.0.0"
+    CABAL_VERSION: "3.6.2.0"
   needs: []
   when: manual
   allow_failure: true
@@ -299,14 +301,14 @@ test:linux:hls:
     - ./.gitlab/script/ghcup_hls.sh
 
 test:linux:cross-armv7:
-  stage: test
+  stage: expensive-tests
   extends:
     - .test_ghcup_version
     - .debian
   variables:
-    GHC_VERSION: "8.10.5"
-    GHC_TARGET_VERSION: "8.10.6"
-    CABAL_VERSION: "3.4.0.0"
+    GHC_VERSION: "8.10.6"
+    GHC_TARGET_VERSION: "8.10.7"
+    CABAL_VERSION: "3.6.2.0"
     CROSS: "arm-linux-gnueabihf"
   needs: []
   when: manual
@@ -317,21 +319,22 @@ test:linux:cross-armv7:
     - ./.gitlab/script/ghcup_cross.sh
 
 test:linux:git:hadrian:
-  stage: test
+  stage: expensive-tests
   extends:
     - .test_ghcup_version
-    - .debian
+    - .alpine:64bit
   variables:
-    GHC_VERSION: "8.10.6"
-    GHC_GIT_TAG: "ghc-9.0.1-release"
-    GHC_GIT_VERSION: "9.0.1"
-    CABAL_VERSION: "3.4.0.0"
+    GHC_VERSION: "8.8.4"
+    GHC_GIT_TAG: "ghc-8.10.7-release"
+    GHC_GIT_VERSION: "8.10.7"
+    CABAL_VERSION: "3.6.2.0"
     CROSS: ""
   needs: []
   when: manual
   allow_failure: true
   before_script:
-    - ./.gitlab/before_script/linux/install_deps.sh
+    - apk add --no-cache python3 autoconf automake
+    - ./.gitlab/before_script/linux/alpine/install_deps.sh
   script:
     - ./.gitlab/script/ghcup_git.sh
 
@@ -339,31 +342,31 @@ test:linux:git:hadrian:
 ######## linux 32bit test ########
 
 test:linux:32bit:
-  stage: test
+  stage: tests
   extends: .test_ghcup_version:linux32
   variables:
-    GHC_VERSION: "8.10.6"
-    CABAL_VERSION: "3.2.0.0"
+    GHC_VERSION: "8.10.7"
+    CABAL_VERSION: "3.6.2.0"
   needs: []
 
 ######## arm tests ########
 
 test:linux:armv7:
-  stage: test
+  stage: tests
   extends: .test_ghcup_version:armv7
   variables:
-    GHC_VERSION: "8.10.4"
-    CABAL_VERSION: "3.4.0.0"
+    GHC_VERSION: "8.10.7"
+    CABAL_VERSION: "3.6.2.0"
     CROSS: ""
   when: manual
   needs: []
 
 test:linux:aarch64:
-  stage: test
+  stage: tests
   extends: .test_ghcup_version:aarch64
   variables:
-    GHC_VERSION: "8.10.4"
-    CABAL_VERSION: "3.4.0.0"
+    GHC_VERSION: "8.10.7"
+    CABAL_VERSION: "3.6.2.0"
     CROSS: ""
   when: manual
   needs: []
@@ -371,19 +374,19 @@ test:linux:aarch64:
 ######## darwin test ########
 
 test:mac:
-  stage: test
+  stage: tests
   extends: .test_ghcup_version:darwin
   variables:
-    GHC_VERSION: "8.10.4"
-    CABAL_VERSION: "3.4.0.0"
+    GHC_VERSION: "8.10.7"
+    CABAL_VERSION: "3.6.2.0"
   needs: []
 
 test:mac:aarch64:
-  stage: test
+  stage: tests
   extends: .test_ghcup_version:darwin:aarch64
   variables:
-    GHC_VERSION: "8.10.6"
-    CABAL_VERSION: "3.4.0.0"
+    GHC_VERSION: "8.10.7"
+    CABAL_VERSION: "3.6.2.0"
   needs: []
   allow_failure: true
 
@@ -391,21 +394,21 @@ test:mac:aarch64:
 ######## freebsd test ########
 
 test:freebsd12:
-  stage: test
+  stage: tests
   extends: .test_ghcup_version:freebsd12
   variables:
-    GHC_VERSION: "8.10.4"
-    CABAL_VERSION: "3.4.0.0"
+    GHC_VERSION: "8.10.7"
+    CABAL_VERSION: "3.6.2.0"
   allow_failure: true # freebsd runners are unreliable
   when: manual
   needs: []
 
 test:freebsd13:
-  stage: test
+  stage: tests
   extends: .test_ghcup_version:freebsd13
   variables:
-    GHC_VERSION: "8.10.4"
-    CABAL_VERSION: "3.4.0.0"
+    GHC_VERSION: "8.10.7"
+    CABAL_VERSION: "3.6.2.0"
   allow_failure: true # freebsd runners are unreliable
   when: manual
   needs: []
@@ -413,11 +416,11 @@ test:freebsd13:
 ######## windows test ########
 
 test:windows:
-  stage: test
+  stage: tests
   extends: .test_ghcup_version:windows
   variables:
-    GHC_VERSION: "8.10.6"
-    CABAL_VERSION: "3.4.0.0"
+    GHC_VERSION: "8.10.7"
+    CABAL_VERSION: "3.6.2.0"
   needs: []
 
 # test:windows:scoop:
@@ -437,8 +440,8 @@ release:linux:64bit:
     - ./.gitlab/before_script/linux/alpine/install_deps.sh
   variables:
     ARTIFACT: "x86_64-linux-ghcup"
-    GHC_VERSION: "8.10.6"
-    CABAL_VERSION: "3.4.0.0"
+    GHC_VERSION: "8.10.7"
+    CABAL_VERSION: "3.6.2.0"
 
 
 release:linux:32bit:
@@ -451,8 +454,8 @@ release:linux:32bit:
     - ./.gitlab/before_script/linux/alpine/install_deps.sh
   variables:
     ARTIFACT: "i386-linux-ghcup"
-    GHC_VERSION: "8.10.6"
-    CABAL_VERSION: "3.2.0.0"
+    GHC_VERSION: "8.10.7"
+    CABAL_VERSION: "3.6.2.0"
 
 release:linux:armv7:
   stage: release
@@ -464,8 +467,8 @@ release:linux:armv7:
     - ./.gitlab/before_script/linux/install_deps.sh
   variables:
     ARTIFACT: "armv7-linux-ghcup"
-    GHC_VERSION: "8.10.4"
-    CABAL_VERSION: "3.4.0.0"
+    GHC_VERSION: "8.10.7"
+    CABAL_VERSION: "3.6.2.0"
     CROSS: ""
 
 release:linux:aarch64:
@@ -478,8 +481,8 @@ release:linux:aarch64:
     - ./.gitlab/before_script/linux/install_deps.sh
   variables:
     ARTIFACT: "aarch64-linux-ghcup"
-    GHC_VERSION: "8.10.4"
-    CABAL_VERSION: "3.4.0.0"
+    GHC_VERSION: "8.10.7"
+    CABAL_VERSION: "3.6.2.0"
     CROSS: ""
 
 ######## darwin release ########
@@ -495,8 +498,8 @@ release:darwin:
     - ./.gitlab/before_script/darwin/install_deps.sh
   variables:
     ARTIFACT: "x86_64-apple-darwin-ghcup"
-    GHC_VERSION: "8.10.6"
-    CABAL_VERSION: "3.4.0.0"
+    GHC_VERSION: "8.10.7"
+    CABAL_VERSION: "3.6.2.0"
     MACOSX_DEPLOYMENT_TARGET: "10.7"
 
 release:darwin:aarch64:
@@ -528,8 +531,8 @@ release:darwin:aarch64:
     runInNixShell ./.gitlab/script/ghcup_release.sh 2>&1
   variables:
     ARTIFACT: "aarch64-apple-darwin-ghcup"
-    GHC_VERSION: "8.10.6"
-    CABAL_VERSION: "3.4.0.0"
+    GHC_VERSION: "8.10.7"
+    CABAL_VERSION: "3.6.2.0"
     MACOSX_DEPLOYMENT_TARGET: "10.7"
   allow_failure: true
 
@@ -547,8 +550,8 @@ release:freebsd12:
     - ./.gitlab/before_script/freebsd/install_deps.sh
   variables:
     ARTIFACT: "x86_64-portbld-freebsd-ghcup"
-    GHC_VERSION: "8.10.6"
-    CABAL_VERSION: "3.4.0.0"
+    GHC_VERSION: "8.10.7"
+    CABAL_VERSION: "3.6.2.0"
   allow_failure: true
 
 release:freebsd13:
@@ -562,8 +565,8 @@ release:freebsd13:
     - ./.gitlab/before_script/freebsd/install_deps.sh
   variables:
     ARTIFACT: "x86_64-portbld-freebsd-ghcup"
-    GHC_VERSION: "8.10.6"
-    CABAL_VERSION: "3.4.0.0"
+    GHC_VERSION: "8.10.7"
+    CABAL_VERSION: "3.6.2.0"
   allow_failure: true
 
 ######## windows release ########
@@ -579,13 +582,13 @@ release:windows:
     - bash ./.gitlab/before_script/windows/install_deps.sh
   variables:
     ARTIFACT: "x86_64-mingw64-ghcup"
-    GHC_VERSION: "8.10.6"
-    CABAL_VERSION: "3.4.0.0"
+    GHC_VERSION: "8.10.7"
+    CABAL_VERSION: "3.6.2.0"
 
 ######## hlint ########
 
 hlint:
-  stage: checks
+  stage: linting
   extends:
     - .debian
   script:
@@ -600,7 +603,7 @@ hlint:
 ######## mkdocs ########
 
 mkdocs:
-  stage: checks
+  stage: linting
   extends:
     - .debian
   before_script:
@@ -617,7 +620,7 @@ shellcheck:
   image: "koalaman/shellcheck-alpine"
   tags:
     - x86_64-linux
-  stage: checks
+  stage: linting
   script:
     - shellcheck scripts/bootstrap/bootstrap-haskell
   allow_failure: true

.gitlab/script/ghcup_git.sh

@@ -41,7 +41,20 @@ cabal --version
 
 eghcup debug-info
 
-eghcup compile ghc -j $(nproc) -g ${GHC_GIT_TAG} -b ${GHC_VERSION} -- --enable-unregisterised
+(
+	cd /tmp
+	ecabal install --installdir="$CI_PROJECT_DIR/.local/bin" --overwrite-policy=always --install-method=copy --constraint="happy == 1.19.12" happy
+	ecabal install --installdir="$CI_PROJECT_DIR/.local/bin" --overwrite-policy=always --install-method=copy --constraint="alex == 3.2.6" alex
+)
+
+ls -la "$CI_PROJECT_DIR/.local/bin"
+which alex
+which happy
+"$CI_PROJECT_DIR/.local/bin/alex" --version
+"$CI_PROJECT_DIR/.local/bin/happy" --version
+
+
+eghcup compile ghc -j $(nproc) -g ${GHC_GIT_TAG} -b ${GHC_VERSION} --hadrian -- --enable-unregisterised
 eghcup set ghc ${GHC_GIT_VERSION}
 
 [ `$(eghcup whereis ghc ${GHC_GIT_VERSION}) --numeric-version` = "${GHC_GIT_VERSION}" ]

cabal.project

@@ -8,7 +8,9 @@ package ghcup
     tests: True
     flags: +tui
 
-constraints: http-io-streams -brotli
+constraints: http-io-streams -brotli,
+             any.Cabal ==3.4.0.0 || ==3.6.2.0
+
 
 package libarchive
   flags: -system-libarchive

docs/css/extra.css

@@ -52,10 +52,16 @@ div.gh-badge img {
 }
 
 a.donate-badge img {
-	margin-top: 10;
-	margin-bottom: 0;
-	padding: 0;
-	height: 35px;
+    margin-top: 10px;
+    margin-bottom: 0;
+    padding: 0;
+    height: 35px;
+}
+
+@media only screen and (min-width: 1000px) {
+    a.donate-badge img {
+        margin-top: 0;
+    }
 }
 
 /* Definition List styles */
@@ -81,8 +87,8 @@ body.homepage>div.container div.col-md-3 {
 }
 
 body.homepage>div.container div.col-md-9 {
-    margin-left: 0;
-    padding-left: 0;
+    /* margin-left: 0; */
+    /* padding-left: 0; */
     flex: 0 0 100%;
     max-width: 100%;
 }
@@ -146,78 +152,100 @@ a:hover {
     background-color: #453A62;
 }
 
+.ghcup-intro {
+    text-align: center;
+}
+
 .main-buttons {
-	display: flex;
-	align-items: center;
-	flex-wrap: wrap;
-	justify-content: center;
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+    justify-content: center;
 }
 
 .main-buttons a {
-	margin-right: 5px;
-	margin-bottom: 5px;
+    margin-right: 5px;
+    margin-bottom: 5px;
 }
 
 .command-button {
-	display: flex;
-	align-items: center;
+    display: flex;
+    align-items: center;
 }
 
 .command-button > pre {
+    flex: 0 1 80%;
+    margin: 0;
+    padding: 10px;
+    text-align: center;
     background-color: #515151;
     color: white;
-    margin: auto;
-	margin-top: 0px;
-    padding-top: 1rem;
-    padding-bottom: 1rem;
-    padding-right: 1rem;
-    text-align: center;
     border-radius: 3px;
     box-shadow: inset 0px 0px 20px 0px #333333;
     font-size: 1em;
-    width: 55rem;
-	overflow: auto;
-	white-space: nowrap;
+    white-space: nowrap;
+    overflow: auto;
 }
 
 .ghcup-command:before {
     color: #999;
     content: " $ ";
-	margin-left: 15px;
+    margin-left: 15px;
 }
 
 div.command-button {
-	display: flex;
-	align-items: center;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+.command-button pre {
+
 }
 
 div.command-button button {
-	color: #515151;
-	/* border: none; */
-	background: rgb(230, 230, 230);
-	border-width: 2px !important;
-	border-style: solid !important;
-	border-radius: 3px !important;
-	border: grey;
-
-    margin-left: 0.5rem !important;
-    margin-right: auto !important;
-    text-align: center !important;
-
-	padding: 18px;
-	padding-bottom: 16px;
+    color: #515151;
+    background: rgb(230, 230, 230);
+    border: 1px solid grey;
+    margin: 0 0 0 10px;
+    padding: 10px;
+    flex-basis: 0 0 20%;
 }
 
 div.command-button button .fa {
-	font-size: x-large;
+    font-size: x-large;
 }
 
 div.command-button button:hover {
-	background: rgb(220, 220, 220);
-	color: black;
-	border: black;
+    background: rgb(220, 220, 220);
+    color: black;
+    border: 1px solid black;
 }
 
 div.command-button button:focus {
-	color: green;
+    background-color: #04aa6d;
 }
+
+footer > hr {
+    border-top: 0.5px solid #CCC;
+}
+
+.qi-container {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+}
+
+.ghcup-os-container {
+    width: 100%;
+    margin: 10px 0;
+}
+.ghcup-os-container > * {
+    text-align: center;
+}
+
+/* fix list overflows (esp about page) */
+ul > li {
+    overflow-wrap: anywhere;
+}
+

docs/index.md

@@ -10,7 +10,7 @@ hide:
 
 # ![](./haskell_logo.png){: .main-logo style="width:100px"} GHCup
 
-GHCup is an installer for the general purpose language [Haskell](https://www.haskell.org/).
+<p class="ghcup-intro">GHCup is an installer for the general purpose language <a href="https://www.haskell.org">Haskell</a>.</p>
 
 <div class="text-center gh-badge">
 <a href="https://kiwiirc.com/nextclient/irc.libera.chat/?nick=Guest%7C?#haskell,#haskell-ghcup"><img src="https://img.shields.io/badge/chat-on%20libera%20IRC-brightgreen.svg" alt="Join the chat at Libera.chat"></a>
@@ -35,28 +35,32 @@ It follows the unix UNIX philosophy of [do one thing and do it well](https://en.
 
 [![GHCup](./ghcup.gif){: .center style="width:700px"}](install#installation)
 
-<h2 class="text-center" id="quick-install">Quick Install<a class="headerlink" href="#quick-install" title="Permanent link"></a>
-</h2>
+<section class="qi-container">
+    <h2 class="text-center" id="quick-install">Quick Install<a class="headerlink" href="#quick-install" title="Permanent link"></a></h2>
 
-### Linux, macOS, FreeBSD or [WSL2](https://docs.microsoft.com/en-us/windows/wsl/)
-
-Run the following in a terminal (as a non-root user):
-
-<div class="command-button">
-	<pre><span class="ghcup-command" id="ghcup-command-linux">curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh</span></pre>
-<button class="btn" onclick="copyToClipboardNux()" id="ghcup-linux-button"><i class="fa fa-copy"></i></button>
-</div>
-<span>
-
-</span>
-
-### Windows
-
-Run the following in a PowerShell session (as a non-admin user):
-
-<div class="command-button">
-	<pre><span class="ghcup-command" id="ghcup-command-windows">Set-ExecutionPolicy Bypass -Scope Process -Force;[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072;Invoke-Command -ScriptBlock ([ScriptBlock]::Create((Invoke-WebRequest https://www.haskell.org/ghcup/sh/bootstrap-haskell.ps1 -UseBasicParsing))) -ArgumentList $true</span></pre>
-<button class="btn" onclick="copyToClipboardWin()" id="ghcup-windows-button"><i class="fa fa-copy"></i></button>
-</div>
+    <div class="ghcup-os-container">
+      <h3>Linux, macOS, FreeBSD or <a href="https://docs.microsoft.com/en-us/windows/wsl/"> WSL2 </a></h3>
+      <p>Run the following in a terminal (as a non-root user):<p>
+      <div class="command-button">
+	    <pre>
+            <span class="ghcup-command" id="ghcup-command-linux">curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh</span>
+          </pre>
+        <button class="btn" onclick="copyToClipboardNux()" id="ghcup-linux-button"><i class="fa fa-copy"></i></button>
+      </div>
+      <span>
+      </span>
+    </div>
 
+    <div class="ghcup-os-container">
+      <h3>Windows</h3>
+      <p>Run the following in a PowerShell session (as a non-admin user):<p>
 
+      <div class="command-button">
+	    <pre>
+          <span class="ghcup-command" id="ghcup-command-windows">Set-ExecutionPolicy Bypass -Scope Process -Force;[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072;Invoke-Command -ScriptBlock ([ScriptBlock]::Create((Invoke-WebRequest https://www.haskell.org/ghcup/sh/bootstrap-haskell.ps1 -UseBasicParsing))) -ArgumentList $true
+          </span>
+        </pre>
+        <button class="btn" onclick="copyToClipboardWin()" id="ghcup-windows-button"><i class="fa fa-copy"></i></button>
+      </div>
+    </div>
+</section>

ghcup.cabal

@@ -98,7 +98,7 @@ library
     , base16-bytestring     >=0.1.1.6    && <1.1
     , binary                ^>=0.8.6.0
     , bytestring            ^>=0.10
-    , Cabal
+    , Cabal                 ^>=3.6.2.0
     , case-insensitive      ^>=1.2.1.0
     , casing                ^>=0.1.4.1
     , containers            ^>=0.6

stack.yaml

@@ -4,13 +4,14 @@ packages:
   - .
 
 extra-deps:
+  - Cabal-3.6.2.0@sha256:e2266e14758c1f799220fad7f0d4b0b4ec567d81b7ba3faea17ff76d4c31de95,12437
   - IfElse-0.85@sha256:6939b94acc6a55f545f63a168a349dd2fbe4b9a7cca73bf60282db5cc6aa47d2,445
   - ascii-string-1.0.1.4@sha256:fa34f1d9ba57e8e89c0d4c9cef5e01ba32cb2d4373d13f92dcc0b531a6c6749b,2582
   - base16-bytestring-0.1.1.7@sha256:0021256a9628971c08da95cb8f4d0d72192f3bb8a7b30b55c080562d17c43dd3,2231
   - brick-0.64@sha256:f03fa14607c22cf48af99e24c44f79a0fb073f7ec229f15e969fed9ff73c93f6,16530
   - brotli-0.0.0.0@sha256:2bf383a4cd308745740986be0b18381c5a0784393fe69b91456aacb2d603de46,2964
   - brotli-streams-0.0.0.0@sha256:1af1e22f67b8bfd6ad0d05e61825e7a178d738f689ebbb21c1aab5f1bbcae176,2331
-  - chs-cabal-0.1.1.0@sha256:20ec6a9fb5ab6991f1a4adf157c537bd5d3b98d08d3c09c387c954c7c50bd011,1153
+  - chs-cabal-0.1.1.1
   - chs-deps-0.1.0.0@sha256:0cdada6d2c682c41b20331b8c63c2ecfc7e806928585195fd544c9d41f3074fd,2496
   - composition-prelude-3.0.0.2@sha256:1ffed216bd28d810fce0b5be83a661e2a892696d73b3f8de5c0f5edb9b5f0090,1216
   - haskus-utils-data-1.4@sha256:bfa94363b94b14779edd6834fbd59dbb847c3d7b8f48e3844f456ffdc077da4a,1466