Bump pandoc and GHC

lierdakil · Feb 3, 2024 · a428e2d · a428e2d
1 parent 82dc52f
commit a428e2d
Show file tree

Hide file tree

Showing 6 changed files with 258 additions and 189 deletions.
diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
@@ -3,18 +3,18 @@ name: Haskell CI
 on: [push]
 
 env:
-  PANDOC_VERSION: "3.1.11"
+  PANDOC_VERSION: "3.1.11.1"
 
 jobs:
   build:
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest]
-        ghcver: ['9.6.3']
+        ghcver: ['9.6.4']
         include:
         - os: windows-latest
-          ghcver: '9.0.2'
+          ghcver: '9.6.4'
     runs-on: ${{ matrix.os }}
     container: ${{ matrix.container }}
     steps:

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -30,7 +30,7 @@
         mkdir -p $out/lib/
         ln -s ${windows.mingw_w64}/lib/libcrypt32.a $out/lib/libCrypt32.a
       '';
-      hixProject = {ghc ? "ghc963"}: pkgs.haskell-nix.cabalProject' {
+      hixProject = {ghc ? "ghc964"}: pkgs.haskell-nix.cabalProject' {
         compiler-nix-name = ghc;
         src = nix-filter.lib {
           root = ./.;
@@ -69,8 +69,7 @@
       packages = {
         default = flake.packages."pandoc-crossref:exe:pandoc-crossref";
         static = flake.packages."x86_64-unknown-linux-musl:pandoc-crossref:exe:pandoc-crossref";
-        win = (flake_ { ghc = "ghc928"; })
-          .packages."x86_64-w64-mingw32:pandoc-crossref:exe:pandoc-crossref";
+        win = flake.packages."x86_64-w64-mingw32:pandoc-crossref:exe:pandoc-crossref";
         pandoc = (hixProject {}).hsPkgs.pandoc-cli.components.exes.pandoc;
         pandoc-with-crossref = pkgs.symlinkJoin {
           name = "pandoc-with-crossref";

diff --git a/stack.template.yaml b/stack.template.yaml
@@ -1,4 +1,4 @@
-resolver: ghc-9.6.3
+resolver: ghc-9.6.4
 allow-newer: false
 flags:
   pandoc-crossref: