Merge branch 'master' of github.com:input-output-hk/haskell.nix into circuithub

Author: ocharles

.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

flake.lock

@@ -571,7 +571,7 @@ pkgs:
     "alure" = [ "alure" ];
     "alure-static" = [ "alure" ];
     "aml" = [ "aml" ];
-    "amtk-5" = [ "amtk" ];
+    "amtk-5" = [ "libgedit-amtk" ];
     "anthy" = [ "anthy" ];
     "apk" = [ "apk-tools" ];
     "libapngasm" = [ "apngasm" ];

lib/pkgconf-nixpkgs-map.nix

@@ -77,6 +77,8 @@ in
     ++ lib.optionals (builtins.compareVersions config.compiler.version "8.11" >= 0) [
       # stm and exceptions are needed by the GHC package since 9.0.1
       "stm" "exceptions"]
+    ++ lib.optionals (builtins.compareVersions config.compiler.version "9.8.1" >= 0) [
+      "semaphore-compat"]
     )
     ++ lib.optionals (!config.reinstallableLibGhc || __elem config.compiler.nix-name ["ghc865"]) [
       "ghc-heap"

modules/component-driver.nix

@@ -183,7 +183,9 @@ in {
   # https://gitlab.haskell.org/ghc/ghc/-/issues/23392
   # Using -j1 works around the issue.
   packages.gi-gtk.components.library.ghcOptions =
-    pkgs.lib.optional (__elem config.compiler.nix-name ["ghc961" "ghc962" "ghc963" "ghc964"]) "-j1";
+    pkgs.lib.optional (
+         builtins.compareVersions config.compiler.version "9.6.1" >= 0
+      && builtins.compareVersions config.compiler.version "9.9" < 0) "-j1";
 
   # With recent versions of nixpkgs fortify causes musl version of the
   # text package to fail with:

modules/configuration-nix.nix

@@ -6,6 +6,9 @@ let
   project = project' {
     inherit compiler-nix-name evalPackages;
     src = testSrc "plugin";
+    modules = [{
+      reinstallableLibGhc = builtins.compareVersions buildPackages.haskell-nix.compiler.${compiler-nix-name}.version "9.8.1" < 0;
+    }];
   };
 
   packages = project.hsPkgs;
@@ -17,8 +20,7 @@ in recurseIntoAttrs {
 
   # Not sure why this breaks for ghc 8.10.7
   meta.disabled = compiler-nix-name == "ghc8107"
-    # TODO remove once polysemy works with ghc 9.8.1
-    || __compareVersions buildPackages.haskell-nix.compiler.${compiler-nix-name}.version "9.8.1" >= 0
+    || compiler-nix-name == "ghc9920231203"
     || stdenv.hostPlatform.isMusl
     || stdenv.hostPlatform.isGhcjs
     || stdenv.hostPlatform.isWindows