From d651a718d3409d4323116b79303be8ebac98ad00 Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Wed, 23 Apr 2025 23:52:01 +1200 Subject: [PATCH] Update containers upper bound, nix and CI --- .github/workflows/Cabal.yml | 63 ----- .github/workflows/haskell-ci.yml | 19 +- flake.lock | 282 ++++++-------------- jsaddle-clib/jsaddle-clib.cabal | 4 +- jsaddle-warp/jsaddle-warp.cabal | 6 +- jsaddle-webkit2gtk/jsaddle-webkit2gtk.cabal | 4 +- jsaddle-wkwebview/jsaddle-wkwebview.cabal | 4 +- jsaddle/jsaddle.cabal | 6 +- nix/hix.nix | 13 +- 9 files changed, 120 insertions(+), 281 deletions(-) delete mode 100644 .github/workflows/Cabal.yml diff --git a/.github/workflows/Cabal.yml b/.github/workflows/Cabal.yml deleted file mode 100644 index 889f7a7e..00000000 --- a/.github/workflows/Cabal.yml +++ /dev/null @@ -1,63 +0,0 @@ -name: Cabal - -on: - push: - branches: - - 'master' - pull_request: - branches: - - 'master' - -jobs: - linux: - - runs-on: ubuntu-22.04 - strategy: - fail-fast: false - matrix: - versions: - - ghc: '9.10' - cabal: latest - steps: - - uses: actions/checkout@v4 - - - name: Install recent cabal/ghc - id: setup - uses: haskell-actions/setup@v2 - with: - ghc-version: ${{ matrix.versions.ghc }} - cabal-version: ${{ matrix.versions.cabal }} - - - name: Cache cabal global package db - id: cabal-global - uses: actions/cache@v4 - with: - path: | - ~/.cabal - key: ${{ runner.os }}-${{ steps.setup.outputs.ghc-version }}-${{ steps.setup.outputs.cabal-version }}-cabal-global-${{ github.sha }} - restore-keys: ${{ runner.os }}-${{ steps.setup.outputs.ghc-version }}-${{ steps.setup.outputs.cabal-version }}-cabal-global- - - - name: Cache cabal work - id: cabal-local - uses: actions/cache@v4 - with: - path: | - dist-newstyle - key: ${{ runner.os }}-${{ steps.setup.outputs.ghc-version }}-${{ steps.setup.outputs.cabal-version }}-cabal-local-${{ github.sha }} - restore-keys: ${{ runner.os }}-${{ steps.setup.outputs.ghc-version }}-${{ steps.setup.outputs.cabal-version }}-cabal-local- - - - name: Install dependencies (OS) - run: | - sudo apt update - sudo apt install libwebkit2gtk-4.0-dev libgirepository1.0-dev libgtksourceview-3.0-dev - - - name: Install dependencies (Haskell) - run: | - cabal update - cabal build all --dependencies-only --enable-tests --disable-optimization - - name: Build - run: | - cabal build all --enable-tests --disable-optimization 2>&1 | tee build.log - - name: Test - run: | - cabal test all --disable-optimization diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index e1e54252..1fb9e2aa 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -8,9 +8,9 @@ # # For more information, see https://github.com/haskell-CI/haskell-ci # -# version: 0.19.20250216 +# version: 0.19.20250330 # -# REGENDATA ("0.19.20250216",["github","cabal.project","--apt","libwebkit2gtk-4.0-dev","--apt","libgirepository1.0-dev","--apt","nodejs","--jobs-selection","any","--error-missing-methods","none","--no-install-dependencies","--installed","-Cabal"]) +# REGENDATA ("0.19.20250330",["github","cabal.project","--apt","libwebkit2gtk-4.0-dev","--apt","libgirepository1.0-dev","--apt","nodejs","--jobs-selection","any","--error-missing-methods","none","--no-install-dependencies","--installed","-Cabal"]) # name: Haskell-CI on: @@ -32,6 +32,11 @@ jobs: strategy: matrix: include: + - compiler: ghc-9.12.2 + compilerKind: ghc + compilerVersion: 9.12.2 + setup-method: ghcup + allow-failure: false - compiler: ghc-9.10.1 compilerKind: ghc compilerVersion: 9.10.1 @@ -42,9 +47,9 @@ jobs: compilerVersion: 9.8.4 setup-method: ghcup allow-failure: false - - compiler: ghc-9.6.6 + - compiler: ghc-9.6.7 compilerKind: ghc - compilerVersion: 9.6.6 + compilerVersion: 9.6.7 setup-method: ghcup allow-failure: false - compiler: ghc-9.4.8 @@ -92,12 +97,12 @@ jobs: - name: Install GHCup run: | mkdir -p "$HOME/.ghcup/bin" - curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup" + curl -sL https://downloads.haskell.org/ghcup/0.1.50.1/x86_64-linux-ghcup-0.1.50.1 > "$HOME/.ghcup/bin/ghcup" chmod a+x "$HOME/.ghcup/bin/ghcup" - name: Install cabal-install run: | - "$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false) - echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV" + "$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.1-p1 || (cat "$HOME"/.ghcup/logs/*.* && false) + echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.1-p1 -vnormal+nowrap" >> "$GITHUB_ENV" - name: Install GHC (GHCup) if: matrix.setup-method == 'ghcup' run: | diff --git a/flake.lock b/flake.lock index 2a60ffca..eaf62b68 100644 --- a/flake.lock +++ b/flake.lock @@ -105,11 +105,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -138,11 +138,11 @@ "hackage": { "flake": false, "locked": { - "lastModified": 1721004438, - "narHash": "sha256-AgjNhPKCBpFUz5B7dDEPIEqPHTTU23uoJETupN4qfQU=", + "lastModified": 1745367943, + "narHash": "sha256-uNeFIEnFGqmbLZk5UXLdWRKsyBvwLb4At3QrnH2HN4Y=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "ce524ca4f84b8de2685acec0ee1095c234bddc85", + "rev": "f12db0c941e509f8a9334418f0ccb38bfa0efe8c", "type": "github" }, "original": { @@ -151,14 +151,31 @@ "type": "github" } }, + "hackage-for-stackage": { + "flake": false, + "locked": { + "lastModified": 1745367932, + "narHash": "sha256-3wuje6j3cwmfvqkau5Qvg/ffV8c1OeOTDrCpOJWvbe0=", + "owner": "input-output-hk", + "repo": "hackage.nix", + "rev": "b808c8edf5031fcc26a22306eafb2e037d2ec094", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "ref": "for-stackage", + "repo": "hackage.nix", + "type": "github" + } + }, "haskell-ci": { "flake": false, "locked": { - "lastModified": 1720460048, - "narHash": "sha256-k3YCC4RIVxocXYbNHkmGYvlsoFlv5XZmk1DYfVQMaPs=", + "lastModified": 1743351534, + "narHash": "sha256-oowOok6+RLk7n6vHWwYufxyUmUpun/VMo8hXpfm1+d8=", "owner": "haskell-CI", "repo": "haskell-ci", - "rev": "5e5b27d74f90e73905c4f56f4aefe521f97879f0", + "rev": "f0fd898ab14070fa46e9fd542a2b487a8146d88e", "type": "github" }, "original": { @@ -177,8 +194,11 @@ "flake-compat": "flake-compat", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk", "hackage": "hackage", + "hackage-for-stackage": "hackage-for-stackage", + "hls": "hls", "hls-1.10": "hls-1.10", "hls-2.0": "hls-2.0", + "hls-2.10": "hls-2.10", "hls-2.2": "hls-2.2", "hls-2.3": "hls-2.3", "hls-2.4": "hls-2.4", @@ -188,30 +208,25 @@ "hls-2.8": "hls-2.8", "hls-2.9": "hls-2.9", "hpc-coveralls": "hpc-coveralls", - "hydra": "hydra", "iserv-proxy": "iserv-proxy", "nixpkgs": [ "haskellNix", "nixpkgs-unstable" ], - "nixpkgs-2003": "nixpkgs-2003", - "nixpkgs-2105": "nixpkgs-2105", - "nixpkgs-2111": "nixpkgs-2111", - "nixpkgs-2205": "nixpkgs-2205", - "nixpkgs-2211": "nixpkgs-2211", "nixpkgs-2305": "nixpkgs-2305", "nixpkgs-2311": "nixpkgs-2311", "nixpkgs-2405": "nixpkgs-2405", + "nixpkgs-2411": "nixpkgs-2411", "nixpkgs-unstable": "nixpkgs-unstable", "old-ghc-nix": "old-ghc-nix", "stackage": "stackage" }, "locked": { - "lastModified": 1721040263, - "narHash": "sha256-QaZdXLL1eEpzkWB83m0mf390dNI0hpgv85X+4BIZK8I=", + "lastModified": 1745371029, + "narHash": "sha256-tBO1idwmBNceWutYrGCmD1cqdVWlH+Ys9DLZs1QH9dA=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "0e457c604f2ceafc95a9105bc7673af8ed56bee1", + "rev": "ac4d74385d1e2848ca011a4fc905fec1e4600346", "type": "github" }, "original": { @@ -220,6 +235,22 @@ "type": "github" } }, + "hls": { + "flake": false, + "locked": { + "lastModified": 1741604408, + "narHash": "sha256-tuq3+Ip70yu89GswZ7DSINBpwRprnWnl6xDYnS4GOsc=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "682d6894c94087da5e566771f25311c47e145359", + "type": "github" + }, + "original": { + "owner": "haskell", + "repo": "haskell-language-server", + "type": "github" + } + }, "hls-1.10": { "flake": false, "locked": { @@ -254,6 +285,23 @@ "type": "github" } }, + "hls-2.10": { + "flake": false, + "locked": { + "lastModified": 1743069404, + "narHash": "sha256-q4kDFyJDDeoGqfEtrZRx4iqMVEC2MOzCToWsFY+TOzY=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "2318c61db3a01e03700bd4b05665662929b7fe8b", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.10.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, "hls-2.2": { "flake": false, "locked": { @@ -376,16 +424,16 @@ "hls-2.9": { "flake": false, "locked": { - "lastModified": 1718469202, - "narHash": "sha256-THXSz+iwB1yQQsr/PY151+2GvtoJnTIB2pIQ4OzfjD4=", + "lastModified": 1719993701, + "narHash": "sha256-wy348++MiMm/xwtI9M3vVpqj2qfGgnDcZIGXw8sF1sA=", "owner": "haskell", "repo": "haskell-language-server", - "rev": "40891bccb235ebacce020b598b083eab9dda80f1", + "rev": "90319a7e62ab93ab65a95f8f2bcf537e34dae76a", "type": "github" }, "original": { "owner": "haskell", - "ref": "2.9.0.0", + "ref": "2.9.0.1", "repo": "haskell-language-server", "type": "github" } @@ -406,37 +454,14 @@ "type": "github" } }, - "hydra": { - "inputs": { - "nix": "nix", - "nixpkgs": [ - "haskellNix", - "hydra", - "nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1671755331, - "narHash": "sha256-hXsgJj0Cy0ZiCiYdW2OdBz5WmFyOMKuw4zyxKpgUKm4=", - "owner": "NixOS", - "repo": "hydra", - "rev": "f48f00ee6d5727ae3e488cbf9ce157460853fea8", - "type": "github" - }, - "original": { - "id": "hydra", - "type": "indirect" - } - }, "iserv-proxy": { "flake": false, "locked": { - "lastModified": 1717479972, - "narHash": "sha256-7vE3RQycHI1YT9LHJ1/fUaeln2vIpYm6Mmn8FTpYeVo=", + "lastModified": 1742121966, + "narHash": "sha256-x4bg4OoKAPnayom0nWc0BmlxgRMMHk6lEPvbiyFBq1s=", "owner": "stable-haskell", "repo": "iserv-proxy", - "rev": "2ed34002247213fc435d0062350b91bab920626e", + "rev": "e9dc86ed6ad71f0368c16672081c8f26406c3a7e", "type": "github" }, "original": { @@ -446,139 +471,6 @@ "type": "github" } }, - "lowdown-src": { - "flake": false, - "locked": { - "lastModified": 1633514407, - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", - "type": "github" - }, - "original": { - "owner": "kristapsdz", - "repo": "lowdown", - "type": "github" - } - }, - "nix": { - "inputs": { - "lowdown-src": "lowdown-src", - "nixpkgs": "nixpkgs", - "nixpkgs-regression": "nixpkgs-regression" - }, - "locked": { - "lastModified": 1661606874, - "narHash": "sha256-9+rpYzI+SmxJn+EbYxjGv68Ucp22bdFUSy/4LkHkkDQ=", - "owner": "NixOS", - "repo": "nix", - "rev": "11e45768b34fdafdcf019ddbd337afa16127ff0f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "2.11.0", - "repo": "nix", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1657693803, - "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "365e1b3a859281cf11b94f87231adeabbdd878a2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-22.05-small", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-2003": { - "locked": { - "lastModified": 1620055814, - "narHash": "sha256-8LEHoYSJiL901bTMVatq+rf8y7QtWuZhwwpKE2fyaRY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-20.03-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-2105": { - "locked": { - "lastModified": 1659914493, - "narHash": "sha256-lkA5X3VNMKirvA+SUzvEhfA7XquWLci+CGi505YFAIs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "022caabb5f2265ad4006c1fa5b1ebe69fb0c3faf", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-21.05-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-2111": { - "locked": { - "lastModified": 1659446231, - "narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "eabc38219184cc3e04a974fe31857d8e0eac098d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-21.11-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-2205": { - "locked": { - "lastModified": 1685573264, - "narHash": "sha256-Zffu01pONhs/pqH07cjlF10NnMDLok8ix5Uk4rhOnZQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "380be19fbd2d9079f677978361792cb25e8a3635", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-22.05-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-2211": { - "locked": { - "lastModified": 1688392541, - "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-22.11-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-2305": { "locked": { "lastModified": 1705033721, @@ -613,11 +505,11 @@ }, "nixpkgs-2405": { "locked": { - "lastModified": 1720122915, - "narHash": "sha256-Nby8WWxj0elBu1xuRaUcRjPi/rU3xVbkAt2kj4QwX2U=", + "lastModified": 1735564410, + "narHash": "sha256-HB/FA0+1gpSs8+/boEavrGJH+Eq08/R2wWNph1sM1Dg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "835cf2d3f37989c5db6585a28de967a667a75fb1", + "rev": "1e7a8f391f1a490460760065fa0630b5520f9cf8", "type": "github" }, "original": { @@ -627,29 +519,29 @@ "type": "github" } }, - "nixpkgs-regression": { + "nixpkgs-2411": { "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "lastModified": 1739151041, + "narHash": "sha256-uNszcul7y++oBiyYXjHEDw/AHeLNp8B6pyWOB+RLA/4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "rev": "94792ab2a6beaec81424445bf917ca2556fbeade", "type": "github" }, "original": { "owner": "NixOS", + "ref": "nixpkgs-24.11-darwin", "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1720181791, - "narHash": "sha256-i4vJL12/AdyuQuviMMd1Hk2tsGt02hDNhA0Zj1m16N8=", + "lastModified": 1737110817, + "narHash": "sha256-DSenga8XjPaUV5KUFW/i3rNkN7jm9XmguW+qQ1ZJTR4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4284c2b73c8bce4b46a6adf23e16d9e2ec8da4bb", + "rev": "041c867bad68dfe34b78b2813028a2e2ea70a23c", "type": "github" }, "original": { @@ -690,11 +582,11 @@ "stackage": { "flake": false, "locked": { - "lastModified": 1721003073, - "narHash": "sha256-3e+W0CRDAKblrssXM37rWiWIjHBbvOjLp7UNmg1OmDI=", + "lastModified": 1745367162, + "narHash": "sha256-Kt75CsTcck1d38A33LxgY8/n8kiqfs9LINLASXfdHH8=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "dffff1c10dbd0e2dc633c6daa02b3a3b4debff18", + "rev": "b50895aadf07291c8cd806fc246489a492c1f76f", "type": "github" }, "original": { diff --git a/jsaddle-clib/jsaddle-clib.cabal b/jsaddle-clib/jsaddle-clib.cabal index 8a08a814..b1b0d30d 100644 --- a/jsaddle-clib/jsaddle-clib.cabal +++ b/jsaddle-clib/jsaddle-clib.cabal @@ -1,5 +1,5 @@ name: jsaddle-clib -version: 0.9.9.2 +version: 0.9.9.3 cabal-version: >=1.10 build-type: Simple license: MIT @@ -11,7 +11,7 @@ description: can be used both from GHCJS and GHC. category: Web, Javascript author: Hamish Mackenzie -tested-with: GHC==9.10.1, GHC==9.8.4, GHC==9.6.6, GHC==9.4.8, GHC==9.2.8, GHC==9.0.2, GHC==8.10.7, GHC==8.8.4, GHC==8.6.5, GHC==8.4.4 +tested-with: GHC==9.12.2, GHC==9.10.1, GHC==9.8.4, GHC==9.6.7, GHC==9.4.8, GHC==9.2.8, GHC==9.0.2, GHC==8.10.7, GHC==8.8.4, GHC==8.6.5, GHC==8.4.4 source-repository head type: git diff --git a/jsaddle-warp/jsaddle-warp.cabal b/jsaddle-warp/jsaddle-warp.cabal index a085a767..571c48cb 100644 --- a/jsaddle-warp/jsaddle-warp.cabal +++ b/jsaddle-warp/jsaddle-warp.cabal @@ -1,6 +1,6 @@ cabal-version: 2.4 name: jsaddle-warp -version: 0.9.9.2 +version: 0.9.9.3 build-type: Simple license: MIT license-file: LICENSE @@ -13,7 +13,7 @@ description: drive a small JavaScript helper. category: Web, Javascript author: Hamish Mackenzie -tested-with: GHC==9.10.1, GHC==9.8.4, GHC==9.6.6, GHC==9.4.8, GHC==9.2.8, GHC==9.0.2, GHC==8.10.7, GHC==8.8.4, GHC==8.6.5, GHC==8.4.4 +tested-with: GHC==9.12.2, GHC==9.10.1, GHC==9.8.4, GHC==9.6.7, GHC==9.4.8, GHC==9.2.8, GHC==9.0.2, GHC==8.10.7, GHC==8.8.4, GHC==8.6.5, GHC==8.4.4 data-files: node-client/index.js node-client/node_modules @@ -64,7 +64,7 @@ library build-depends: aeson >=0.8.0.2 && <2.3, bytestring >=0.10.6.0 && <0.13, - containers >=0.5.6.2 && <0.8, + containers >=0.5.6.2 && <0.9, foreign-store >=0.2 && <0.3, http-types >=0.8.6 && <0.13, jsaddle >=0.9.9.0 && <0.10, diff --git a/jsaddle-webkit2gtk/jsaddle-webkit2gtk.cabal b/jsaddle-webkit2gtk/jsaddle-webkit2gtk.cabal index 3cdc1359..9624b6e5 100644 --- a/jsaddle-webkit2gtk/jsaddle-webkit2gtk.cabal +++ b/jsaddle-webkit2gtk/jsaddle-webkit2gtk.cabal @@ -1,5 +1,5 @@ name: jsaddle-webkit2gtk -version: 0.9.9.0 +version: 0.9.9.3 cabal-version: >=1.10 build-type: Simple license: MIT @@ -13,7 +13,7 @@ description: drive a small JavaScipt helper. category: Web, Javascript author: Hamish Mackenzie -tested-with: GHC==9.10.1, GHC==9.8.4, GHC==9.6.6, GHC==9.4.8, GHC==9.2.8, GHC==9.0.2, GHC==8.10.7, GHC==8.8.4, GHC==8.6.5, GHC==8.4.4 +tested-with: GHC==9.12.2, GHC==9.10.1, GHC==9.8.4, GHC==9.6.7, GHC==9.4.8, GHC==9.2.8, GHC==9.0.2, GHC==8.10.7, GHC==8.8.4, GHC==8.6.5, GHC==8.4.4 source-repository head type: git diff --git a/jsaddle-wkwebview/jsaddle-wkwebview.cabal b/jsaddle-wkwebview/jsaddle-wkwebview.cabal index d6ed54de..8fe9a1ca 100644 --- a/jsaddle-wkwebview/jsaddle-wkwebview.cabal +++ b/jsaddle-wkwebview/jsaddle-wkwebview.cabal @@ -1,6 +1,6 @@ cabal-version: 3.0 name: jsaddle-wkwebview -version: 0.9.9.0 +version: 0.9.9.3 build-type: Simple license: MIT license-file: LICENSE @@ -13,7 +13,7 @@ description: drive a small JavaScipt helper. category: Web, Javascript author: Hamish Mackenzie -tested-with: GHC==9.10.1, GHC==9.8.4, GHC==9.6.6, GHC==9.4.8, GHC==9.2.8, GHC==9.0.2, GHC==8.10.7, GHC==8.8.4, GHC==8.6.5, GHC==8.4.4 +tested-with: GHC==9.12.2, GHC==9.10.1, GHC==9.8.4, GHC==9.6.7, GHC==9.4.8, GHC==9.2.8, GHC==9.0.2, GHC==8.10.7, GHC==8.8.4, GHC==8.6.5, GHC==8.4.4 flag include-app-delegate description: Include default AppDelegate C sources. diff --git a/jsaddle/jsaddle.cabal b/jsaddle/jsaddle.cabal index 869648d7..166d9f0f 100644 --- a/jsaddle/jsaddle.cabal +++ b/jsaddle/jsaddle.cabal @@ -1,5 +1,5 @@ name: jsaddle -version: 0.9.9.2 +version: 0.9.9.3 cabal-version: >=1.10 build-type: Simple license: MIT @@ -13,7 +13,7 @@ description: drive a small JavaScript helper. category: Web, Javascript author: Hamish Mackenzie -tested-with: GHC==9.10.1, GHC==9.8.4, GHC==9.6.6, GHC==9.4.8, GHC==9.2.8, GHC==9.0.2, GHC==8.10.7, GHC==8.8.4, GHC==8.6.5, GHC==8.4.4 +tested-with: GHC==9.12.2, GHC==9.10.1, GHC==9.8.4, GHC==9.6.7, GHC==9.4.8, GHC==9.2.8, GHC==9.0.2, GHC==8.10.7, GHC==8.8.4, GHC==8.6.5, GHC==8.4.4 source-repository head type: git @@ -40,7 +40,7 @@ library else build-depends: attoparsec >=0.11 && <0.15, - containers >=0.5.6.2 && <0.8, + containers >=0.5.6.2 && <0.9, deepseq >=1.3 && < 1.6, filepath >=1.4.0.0 && <1.6, ghc-prim, diff --git a/nix/hix.nix b/nix/hix.nix index 2457f2fd..2d775b18 100644 --- a/nix/hix.nix +++ b/nix/hix.nix @@ -1,13 +1,18 @@ {config, pkgs, ...}: { - compiler-nix-name = "ghc9101"; - flake.variants.ghc8107.compiler-nix-name = pkgs.lib.mkForce "ghc8107"; + compiler-nix-name = "ghc912"; + flake.variants.ghc96.compiler-nix-name = pkgs.lib.mkForce "ghc96"; modules = [({pkgs, ...}: { + package-keys = ["webkit2gtk3-javascriptcore"]; packages.webkit2gtk3-javascriptcore.components.library.doHaddock = false; + enableStatic = !pkgs.stdenv.hostPlatform.isGhcjs; })]; - shell.buildInputs = [ pkgs.nodejs ]; + shell.buildInputs = [ pkgs.pkgsBuildBuild.nodejs ]; shell.tools.cabal = {}; shell.tools.haskell-ci.src = pkgs.inputs.haskell-ci; - crossPlatforms = p: pkgs.lib.optional (config.compiler-nix-name == "ghc8107" || __compareVersions pkgs.haskell-nix.compiler.${config.compiler-nix-name}.version "9.6.4" >=0) p.ghcjs; + shell.tools.haskell-ci.cabalProjectLocal = '' + allow-newer: *:base + ''; + crossPlatforms = p: [ p.ghcjs ]; # Use this for checking if `aeson` 2 works (tests will not build because `webdriver` still needs aeson <2) cabalProjectLocal = ''