Andreas make-build changes

.envrc

@@ -0,0 +1,7 @@
+# Check if nix-direnv is already loaded; if not, source it
+if ! has nix_direnv_reload; then
+  source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.2.0/direnvrc" "sha256-+IuxtJIDzJIlHDAxyzr7M2S3FD +zSd/BNfZe+ntXje0="
+fi
+
+# Use the specified flake to enter the Nix development environment
+use flake github:input-output-hk/devx#ghc98-minimal-ghc

.github/workflows/ci-cabal-install.yml

@@ -0,0 +1,120 @@
+name: CI mostly cabal-install
+
+# Trigger the workflow on push or pull request, but only for the master branch
+on:
+  pull_request:
+    types:
+      - opened
+      - synchronize
+  push:
+    branches:
+      - master
+
+jobs:
+  cabal:
+    name: ${{ matrix.os }} / ghc ${{ matrix.ghc }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-latest
+        ghc:
+          - '9.8.4' # bootstrapping compiler
+
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: "recursive"
+
+    - id: ghc-path
+      name: Set GHC install directory
+      run: |
+        DIR=${{ github.workspace }}/ghc-${{ matrix.ghc }}
+        echo "path=$DIR" >> $GITHUB_OUTPUT
+        echo "$DIR/bin" >> $GITHUB_PATH
+
+    - id: cache-ghc
+      name: Restore bootstrap compiler
+      uses: actions/cache/restore@v4
+      with:
+        key: ${{ matrix.os }}-ghc-${{ matrix.ghc }}
+        path: ${{ steps.ghc-path.outputs.path }}
+
+    - if: steps.cache-ghc.outputs.cache-hit != 'true'
+      name: Install ghcup
+      uses: haskell/ghcup-setup@v1
+
+    - if: steps.cache-ghc.outputs.cache-hit != 'true'
+      name: Install bootstrap compiler
+      run: |
+        ghcup install ghc ${{ matrix.ghc }} --isolate ${{ steps.ghc-path.output.path }}
+        ghcup install cabal latest --isolate ${{ steps.ghc-path.outputs.path }}/bin
+
+    - id: cabal-paths
+      run: |
+        cabal user-config init
+        echo "store=$(cabal path --store-dir)" >> $GITHUB_OUTPUT
+        echo "remote-repo-cache=$(cabal path --remote-repo-cache)" >> $GITHUB_OUTPUT
+
+    - name: Restore Hackage index and source packages
+      uses: actions/cache/restore@v4
+      with:
+        key: hackage-${{ github.run_id }}
+        restore-keys: hackage-
+        path: ${{ steps.cabal-paths.outputs.remote-repo-cache }}
+
+    - name: Restore cabal store
+      uses: actions/cache/restore@v4
+      with:
+        key: store-${{ matrix.os }}-${{ matrix.ghc }}-${{ github.run_id }}
+        restore-keys: store-${{ matrix.os }}-${{ matrix.ghc }}-
+        path: ${{ steps.cabal-paths.outputs.store }}
+
+    - name: Restore build artifacts
+      uses: actions/cache/restore@v4
+      with:
+        key: build-${{ matrix.os }}-${{ matrix.ghc }}-${{ github.run_id }}
+        restore-keys: build-${{ matrix.os }}-${{ matrix.ghc }}-
+        path: _build _stage0 _stage1 _stage1-rts _stage1-boot
+
+    - name: Update Hackage index
+      run: cabal update
+
+    - name: Build
+      run: make
+
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v4
+      with:
+        name: stage1
+        path: _stage1
+
+    - name: Save build artifacts
+      uses: actions/cache/save@v4
+      if: always()
+      with:
+        key: build-${{ matrix.os }}-${{ matrix.ghc }}-${{ github.run_id }}
+        path: _build _stage0 _stage1 _stage1-rts _stage1-boot
+
+    - name: Save cabal store
+      uses: actions/cache/save@v4
+      if: always()
+      with:
+        key: store-${{ matrix.os }}-${{ matrix.ghc }}-${{ github.run_id }}
+        path: ${{ steps.cabal-paths.outputs.store }}
+
+    - name: Save Hackage index and source packages
+      uses: actions/cache/save@v4
+      if: always()
+      with:
+        key: hackage-${{ github.run_id }}
+        path: ${{ steps.cabal-paths.outputs.remote-repo-cache }}
+
+    - name: Save bootstrap compiler
+      uses: actions/cache/save@v4
+      if: steps.cache-ghc.outputs.cache-hit != 'true'
+      with:
+        key: ${{ matrix.os }}-ghc-${{ matrix.ghc }}
+        path: ${{ steps.ghc-path.outputs.path }}
+

.github/workflows/nix-based.yml

@@ -0,0 +1,48 @@
+name: CI (with nix)
+
+# Trigger the workflow on push or pull request, but only for the master branch
+on:
+  pull_request:
+    types:
+      - opened
+      - synchronize
+  push:
+    branches: [master]
+
+defaults:
+  run:
+    shell: devx {0}
+
+jobs:
+  cabal:
+    name: ${{ matrix.os }} / ghc ${{ matrix.ghc }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-latest
+          - macos-latest
+        ghc:
+          - ghc98 # bootstrapping compiler
+
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: "recursive"
+
+    - name: Build
+      uses: input-output-hk/actions/devx@latest
+      with:
+        platform: ${{ matrix.os == 'ubuntu-latest' && 'x86_64-linux' || 'aarch64-darwin' }}
+        compiler-nix-name: ${{ matrix.ghc }}
+        minimal: true
+        ghc: true
+
+    - run: cabal update
+
+    - name: Build stage1
+      run: make stage1
+
+    - name: Build stage1-rts
+      run: make stage1-rts

.gitignore

@@ -116,8 +116,6 @@ _darcs/
 /compiler/MachRegs.h
 /compiler/MachRegs
 /compiler/GHC/CmmToLlvm/Version/Bounds.hs
-/compiler/ghc.cabal
-/compiler/ghc.cabal.old
 /distrib/configure.ac
 /distrib/ghc.iss
 /docs/index.html
@@ -138,7 +136,6 @@ _darcs/
 /docs/users_guide/utils.pyc
 /driver/ghci/ghc-pkg-inplace
 /driver/ghci/ghci-inplace
-/driver/ghci/ghci-wrapper.cabal
 /driver/ghci/ghci.res
 /driver/ghci/cwrapper.c
 /driver/ghci/cwrapper.h
@@ -150,7 +147,6 @@ _darcs/
 /driver/package.conf.inplace.old
 /settings
 /ghc.spec
-/ghc/ghc-bin.cabal
 /index.html
 /inplace/
 /libffi/build/
@@ -165,29 +161,19 @@ _darcs/
 /libraries/doc-index*.html
 /libraries/frames.html
 /libraries/ghc-boot/GNUmakefile
-/libraries/ghc-boot/ghc-boot.cabal
 /libraries/ghc-boot-th/GNUmakefile
-/libraries/ghc-boot-th/ghc-boot-th.cabal
-/libraries/ghc-boot-th-next/ghc-boot-th-next.cabal
 /libraries/ghc-boot-th/ghc.mk
-/libraries/ghc-heap/ghc-heap.cabal
-/libraries/ghc-internal/ghc-internal.cabal
-/libraries/ghc-experimental/ghc-experimental.cabal
-/libraries/base/base.cabal
 /libraries/ghci/GNUmakefile
-/libraries/ghci/ghci.cabal
 /libraries/ghci/ghc.mk
 /libraries/haddock-util.js
 /libraries/hslogo-16.png
 /libraries/index-frames.html
 /libraries/index.html
-/libraries/libiserv/libiserv.cabal
 /libraries/minus.gif
 /libraries/ocean.css
 /libraries/plus.gif
 /libraries/synopsis.png
 /libraries/stamp/
-/libraries/template-haskell/template-haskell.cabal
 /linter.log
 /mk/are-validating.mk
 /mk/build.mk
@@ -202,13 +188,6 @@ _darcs/
 /testsuite_summary*.txt
 /testsuite*.xml
 /testlog*
-/utils/iserv/iserv.cabal
-/utils/iserv-proxy/iserv-proxy.cabal
-/utils/remote-iserv/remote-iserv.cabal
-/utils/mkUserGuidePart/mkUserGuidePart.cabal
-/utils/runghc/runghc.cabal
-/utils/gen-dll/gen-dll.cabal
-/utils/ghc-pkg/ghc-pkg.cabal
 utils/unlit/fs.*
 libraries/ghc-internal/include/fs.h
 libraries/ghc-internal/cbits/fs.c

.gitmodules

@@ -103,15 +103,20 @@
 [submodule "gmp-tarballs"]
 	path = libraries/ghc-internal/gmp/gmp-tarballs
 	url = https://gitlab.haskell.org/ghc/gmp-tarballs.git
+	ignore = untracked
 [submodule "libraries/exceptions"]
 	path = libraries/exceptions
 	url = https://gitlab.haskell.org/ghc/packages/exceptions.git
+	ignore = untracked
 [submodule "utils/hpc"]
 	path = utils/hpc
 	url = https://gitlab.haskell.org/hpc/hpc-bin.git
+	ignore = untracked
 [submodule "libraries/os-string"]
 	path = libraries/os-string
-	url = https://gitlab.haskell.org/ghc/packages/os-string
+	url = https://gitlab.haskell.org/ghc/packages/os-string.git
+	ignore = untracked
 [submodule "libraries/file-io"]
 	path = libraries/file-io
 	url = https://gitlab.haskell.org/ghc/packages/file-io.git
+	ignore = untracked