diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c26f0a3..e222d6a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -77,6 +77,8 @@ jobs: ./setup.sh ~/.ghc-wasm/add_to_github_path.sh popd + env: + FLAVOUR: '9.10' - name: install-sass run: | diff --git a/cabal.project b/cabal.project index 8571d77..283baf4 100644 --- a/cabal.project +++ b/cabal.project @@ -1,6 +1,6 @@ packages: . hs2048 -index-state: 2024-04-22T21:06:15Z +index-state: 2024-05-13T07:56:22Z if arch(wasm32) -- https://github.com/haskellari/splitmix/pull/73 @@ -13,7 +13,7 @@ if arch(wasm32) source-repository-package type: git location: https://github.com/amesgen/miso - tag: bb9ce9a3dd03a7c1ac945943f65955ab10a53011 + tag: 27dd5fc80be9d0a3b80a9ecc81ee3401bc610e01 source-repository-package type: git @@ -23,12 +23,6 @@ if arch(wasm32) package aeson flags: -ordered-keymap -package QuickCheck - flags: -templateHaskell - -package reflection - flags: -template-haskell - if impl(ghc >= 9.10) allow-newer: , base @@ -40,13 +34,10 @@ if impl(ghc >= 9.10) , template-haskell , text , time + , jsaddle:lens constraints: directory installed, process installed, time installed, unix installed - - packages: https://ghc.gitlab.haskell.org/head.hackage/package/text-short-0.1.5.tar.gz - - packages: https://ghc.gitlab.haskell.org/head.hackage/package/lens-5.2.3.tar.gz diff --git a/flake.lock b/flake.lock index 5c8983b..81d5ac5 100644 --- a/flake.lock +++ b/flake.lock @@ -25,11 +25,11 @@ }, "locked": { "host": "gitlab.haskell.org", - "lastModified": 1713766300, - "narHash": "sha256-gNodIIx7UIua3l2WwUrDCQDsbkIPSiQydr+i83CFh8E=", + "lastModified": 1715546788, + "narHash": "sha256-UEABZ98HvrXL0vKvDVc4ljj03/QcjKNBO8kq28OuyJc=", "owner": "ghc", "repo": "ghc-wasm-meta", - "rev": "f9b95689c5bd1c565e270879734d1663ff7ed8b4", + "rev": "00304b294d10eacedbb7c4a9a034ff89fc198a5a", "type": "gitlab" }, "original": { @@ -41,11 +41,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1713537308, - "narHash": "sha256-XtTSSIB2DA6tOv+l0FhvfDMiyCmhoRbNB+0SeInZkbk=", + "lastModified": 1715447595, + "narHash": "sha256-VsVAUQOj/cS1LCOmMjAGeRksXIAdPnFIjCQ0XLkCsT0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5c24cf2f0a12ad855f444c30b2421d044120c66f", + "rev": "062ca2a9370a27a35c524dc82d540e6e9824b652", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index a8b32bc..d5b3077 100644 --- a/flake.nix +++ b/flake.nix @@ -8,7 +8,7 @@ { devShells.default = pkgs.mkShell { packages = [ - inputs.ghc-wasm-meta.packages.${system}.all_gmp + inputs.ghc-wasm-meta.packages.${system}.all_9_10 pkgs.dart-sass ]; };