Skip to content

Commit

Permalink
Use GHC 9.10, only relax bounds
Browse files Browse the repository at this point in the history
No need anymore to use anything from head.hackage
  • Loading branch information
amesgen committed May 13, 2024
1 parent 23d36a0 commit b1299e9
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 19 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ jobs:
./setup.sh
~/.ghc-wasm/add_to_github_path.sh
popd
env:
FLAVOUR: '9.10'

- name: install-sass
run: |
Expand Down
15 changes: 3 additions & 12 deletions cabal.project
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
12 changes: 6 additions & 6 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
];
};
Expand Down

0 comments on commit b1299e9

Please sign in to comment.