Merge branch 'hkm/nixpkgs-update' into armv7a

# Conflicts:
#	compiler/ghc/default.nix
#	overlays/bootstrap.nix
#	overlays/linux-cross.nix
#	overlays/mingw_w64.nix

Author: hamishmack

.github/workflows/lints.yml

@@ -23,7 +23,7 @@ jobs:
   deadnix:
     runs-on: [self-hosted, linux]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: |
           nix run github:astro/deadnix -- --edit --no-lambda-pattern-names --exclude materialized
           TMPFILE=$(mktemp)

.github/workflows/pipeline.yml

@@ -21,172 +21,163 @@ jobs:
   nix-build:
     runs-on: [self-hosted, linux]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: "Run tests with ghc8107: Running the nix-build tests..."
         run: "./test/tests.sh ghc8107 nix-build"
 
   unit-tests:
     runs-on: [self-hosted, linux]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: "Run tests with ghc8107: Running the unit tests..."
         run: "./test/tests.sh ghc8107 unit-tests"
 
   runghc:
     runs-on: [self-hosted, linux]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: "Run tests with ghc8107: Checking that a nix-shell works for runghc..."
         run: "./test/tests.sh ghc8107 runghc"
 
   cabal:
     runs-on: [self-hosted, linux]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: "Run tests with ghc8107: Checking that a nix-shell works for cabal..."
         run: "./test/tests.sh ghc8107 cabal"
 
   cabal-doExactConfig:
     runs-on: [self-hosted, linux]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: "Run tests with ghc8107: Checking that a nix-shell works for cabal (doExactConfig component)..."
         run: "./test/tests.sh ghc8107 cabal-doExactConfig"
 
   tests-benchmarks:
     runs-on: [self-hosted, linux]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: "Run tests with ghc8107: Checking that a nix-shell works for a project with test-suite build-tools and benchmarks..."
         run: "./test/tests.sh ghc8107 tests-benchmarks"
 
   multi-target:
     runs-on: [self-hosted, linux]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: "Run tests with ghc8107: Checking that a nix-shell works for a multi-target project..."
         run: "./test/tests.sh ghc8107 multi-target"
 
   shellFor-single-package:
     runs-on: [self-hosted, linux]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: "Run tests with ghc8107: Checking shellFor works for a cabal project, multiple packages..."
         run: "./test/tests.sh ghc8107 shellFor-single-package"
 
   shellFor-multiple-package:
     runs-on: [self-hosted, linux]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: "Run tests with ghc8107: Checking shellFor works for a cabal project, single package...y"
         run: "./test/tests.sh ghc8107 shellFor-multiple-package"
 
   shellFor-hoogle:
     runs-on: [self-hosted, linux]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: "Run tests with ghc8107: Checking shellFor works for a cabal project, single package..."
         run: "./test/tests.sh ghc8107 shellFor-hoogle"
 
   shellFor-not-depends:
     runs-on: [self-hosted, linux]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: "Run tests with ghc8107: Checking shellFor does not depend on given packages...y"
         run: "./test/tests.sh ghc8107 shellFor-not-depends"
 
   maintainer-scripts:
     runs-on: [self-hosted, linux]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: "Run tests with ghc8107: Checking the maintainer scripts...y"
         run: "./test/tests.sh ghc8107 maintainer-scripts"
 
   plan-extra-hackages:
     runs-on: [self-hosted, linux]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: "Run tests with ghc8107: Checking that plan construction works with extra Hackages..."
         run: "./test/tests.sh ghc8107 plan-extra-hackages"
 
   build-extra-hackages:
     runs-on: [self-hosted, linux]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: "Run tests with ghc8107: Checking that package with extra Hackages can be build..."
         run: "./test/tests.sh ghc8107 build-extra-hackages"
 
   hix:
     runs-on: [self-hosted, linux]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: "Run tests with ghc8107: End-2-end test of hix project initialization and flakes development shell ..."
         run: "./test/tests.sh ghc8107 hix"
 
 #  template:
 #    runs-on: [self-hosted, linux]
 #    steps:
-#      - uses: actions/checkout@v3
+#      - uses: actions/checkout@v4
 #      - name: "Run tests with ghc8107: End-2-end test of hix project initialization and flakes development shell ..."
 #        run: "./test/tests.sh ghc8107 template"
 
   docs:
     runs-on: [self-hosted, linux]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: "Test examples in documentation ..."
         run: "./test/tests.sh ghc8107 docs"
 
   hydra-ifdLevel-0-and-1:
     runs-on: [self-hosted, linux]
+    timeout-minutes: 20
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: "Check that jobset will evaluate in Hydra at ifdLevel 0 and 1"
         run: |
           nix-build build.nix -A maintainer-scripts.check-hydra -o check-hydra.sh
-          ./check-hydra.sh --arg ifdLevel 0
-          ./check-hydra.sh --arg ifdLevel 1
+          sed -i 's/runningHydraEvalTest = false;/runningHydraEvalTest = true;/' flake.nix
+          sed -i 's/ifdLevel = 3;/ifdLevel = 0;/' flake.nix
+          ./check-hydra.sh
+          sed -i 's/ifdLevel = 0;/ifdLevel = 1;/' flake.nix
+          ./check-hydra.sh
 
   hydra-ifdLevel-2:
     runs-on: [self-hosted, linux]
+    timeout-minutes: 20
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: "Check that jobset will evaluate in Hydra at ifdLevel 2"
         run: |
           nix-build build.nix -A maintainer-scripts.check-hydra -o check-hydra.sh
-          ./check-hydra.sh --arg ifdLevel 2
+          sed -i 's/runningHydraEvalTest = false;/runningHydraEvalTest = true;/' flake.nix
+          sed -i 's/ifdLevel = 3;/ifdLevel = 2;/' flake.nix
+          ./check-hydra.sh
 
-  hydra-ifdLevel-3-and-ghc-8-10:
+  hydra-ifdLevel-3:
     runs-on: [self-hosted, linux]
+    timeout-minutes: 30
     steps:
-      - uses: actions/checkout@v3
-      - name: "Check that jobset will evaluate in Hydra at ifdLevel 3 and ghc 8.10"
+      - uses: actions/checkout@v4
+      - name: "Check that jobset will evaluate in Hydra at ifdLevel 3"
         run: |
           nix-build build.nix -A maintainer-scripts.check-hydra -o check-hydra.sh
-          ./check-hydra.sh --arg ifdLevel 3 --arg include 'x: __substring 0 6 x == "ghc810"'
-
-  hydra-ifdLevel-3-and-ghc-9-2:
-    runs-on: [self-hosted, linux]
-    steps:
-      - uses: actions/checkout@v3
-      - name: "Check that jobset will evaluate in Hydra at ifdLevel 3 and ghc 9.2"
-        run: |
-          nix-build build.nix -A maintainer-scripts.check-hydra -o check-hydra.sh
-          ./check-hydra.sh --arg ifdLevel 3 --arg include 'x: __substring 0 5 x == "ghc92"'
-
-  hydra-ifdLevel-3-and-not-ghc-8-10-or-9-2:
-    runs-on: [self-hosted, linux]
-    steps:
-      - uses: actions/checkout@v3
-      - name: "Check that jobset will evaluate in Hydra at ifdLevel 3 and not (ghc 8.10 or ghc 9.2)"
-        run: |
-          nix-build build.nix -A maintainer-scripts.check-hydra -o check-hydra.sh
-          ./check-hydra.sh --arg ifdLevel 3 --arg include 'x: !(__substring 0 6 x == "ghc810" || __substring 0 5 x == "ghc92")'
+          sed -i 's/runningHydraEvalTest = false;/runningHydraEvalTest = true;/' flake.nix
+          ./check-hydra.sh
 
   closure-size:
     runs-on: [self-hosted, linux]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: "Check closure size with ghc8107"
         run: |
           nix-build build.nix -A maintainer-scripts.check-closure-size --argstr compiler-nix-name ghc8107 -o check-closure-size.sh
@@ -196,7 +187,7 @@ jobs:
   update-docs:
     runs-on: [self-hosted, linux]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: "Update docs"
         run: |
           nix-build build.nix -A maintainer-scripts.update-docs -o update-docs.sh
@@ -205,7 +196,7 @@ jobs:
   check-materialization-concurrency:
     runs-on: [self-hosted, linux]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: "Make sure materialize function does not limit concurrency"
         run: |
           nix-build build.nix -A maintainer-scripts.check-materialization-concurrency -o check-materialization-concurrency.sh
@@ -214,7 +205,7 @@ jobs:
   check-path-support:
     runs-on: [self-hosted, linux]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: "Make sure non store paths like can be used as src"
         run: |
           nix-build build.nix -A maintainer-scripts.check-path-support --argstr compiler-nix-name ghc8107 -o check-path-support.sh
@@ -223,26 +214,33 @@ jobs:
   haskell-nix-roots-do-not-require-IFDs:
     runs-on: [self-hosted, linux]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: "Check that the haskell.nix roots do not require IFDs"
         run: nix build .#roots.x86_64-linux --accept-flake-config --option allow-import-from-derivation false
 
-  hydra-without-remote-builders:
+  hydra-without-remote-builders-ghc8107:
     runs-on: [self-hosted, linux]
     steps:
-      - uses: actions/checkout@v3
-      - name: "Check that evaluation of hydra jobs works without using remote builders"
+      - uses: actions/checkout@v4
+      - name: "Check that evaluation of hydra jobs works without using remote builders for GHC 8.10.7"
         run: nix path-info --derivation .#requiredJobs.x86_64-darwin.required-unstable-ghc8107-native --show-trace --builders ''
 
+  hydra-without-remote-builders-ghc9101:
+    runs-on: [self-hosted, linux]
+    steps:
+      - uses: actions/checkout@v4
+      - name: "Check that evaluation of hydra jobs works without using remote builders for GHC 9.10.1"
+        run: nix path-info --derivation .#requiredJobs.x86_64-darwin.required-unstable-ghc9101-native --show-trace --builders ''
+
   hix-cabal:
     runs-on: [self-hosted, linux]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: "Check hix -- run github:haskell/cabal/3.10#cabal-install:exe:cabal -- --version"
         run: "HIX_DIR=$(mktemp -d) nix run .#hix --accept-flake-config -- run github:haskell/cabal/3.10#cabal-install:exe:cabal --accept-flake-config --override-input haskellNix . -- --version"
 
   nix-tools:
     runs-on: [self-hosted, linux]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: nix build ./nix-tools#checks.x86_64-linux.truncate-index --accept-flake-config

.github/workflows/publish.yaml

@@ -2,8 +2,9 @@ name: "Publish a flake to flakestry"
 on:
     push:
         tags:
-        - "v?[0-9]+.[0-9]+.[0-9]+"
-        - "v?[0-9]+.[0-9]+"
+          # This pattern matches tags in the format YYYY.MM.DD
+          # It expects a four-digit year, followed by a two-digit month and day
+          - "[0-9]{4}.[0-9]{2}.[0-9]{2}"
     workflow_dispatch:
         inputs:
             tag:

.github/workflows/tag.yml

@@ -0,0 +1,25 @@
+name: "Weekly Date Tag"
+
+on:
+  schedule:
+    - cron: '0 0 * * 0'
+
+jobs:
+  tag-repo:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Create and push tag using current date
+        run: |
+          TAG_DATE=$(date -u "+%Y.%m.%d")
+          if git rev-parse "$TAG_DATE" >/dev/null 2>&1; then
+              echo "Tag $TAG_DATE already exists. Skipping tag creation."
+          else
+              git config user.name "github-actions"
+              git config user.email "[email protected]"
+              git tag $TAG_DATE
+              git push origin $TAG_DATE
+          fi

.github/workflows/updates.yml

@@ -9,7 +9,7 @@ jobs:
   update-pins:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: cachix/install-nix-action@v15
         with:
           nix_path: nixpkgs=channel:nixos-unstable