From d7599d8e4043c9b23e8889cdcb95dedbb992cc87 Mon Sep 17 00:00:00 2001 From: Peter Becich Date: Sat, 15 Jan 2022 00:26:38 -0800 Subject: [PATCH 1/6] fix non-GHCJS compilation --- cabal.project | 3 +++ codeworld-auth/codeworld-auth.cabal | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/cabal.project b/cabal.project index 9466eccf8..180c12dda 100644 --- a/cabal.project +++ b/cabal.project @@ -10,3 +10,6 @@ packages: codeworld-server/ codeworld-base/ funblocks-client/ + +constraints: + ghcjs-dom ==0.9.5.0 diff --git a/codeworld-auth/codeworld-auth.cabal b/codeworld-auth/codeworld-auth.cabal index 077e2fe8a..2eab03041 100644 --- a/codeworld-auth/codeworld-auth.cabal +++ b/codeworld-auth/codeworld-auth.cabal @@ -31,7 +31,7 @@ library , directory , filepath , http-conduit - , jwt >= 0.10.0 + , jwt == 0.10.* , snap-core , split , text From 799f1135bb435479b70d846caf0007dd98c72b1f Mon Sep 17 00:00:00 2001 From: Peter Becich Date: Sun, 16 Jan 2022 23:04:55 -0800 Subject: [PATCH 2/6] move constraint to `funblocks-client.cabal` --- cabal.project | 3 --- funblocks-client/funblocks-client.cabal | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/cabal.project b/cabal.project index 180c12dda..9466eccf8 100644 --- a/cabal.project +++ b/cabal.project @@ -10,6 +10,3 @@ packages: codeworld-server/ codeworld-base/ funblocks-client/ - -constraints: - ghcjs-dom ==0.9.5.0 diff --git a/funblocks-client/funblocks-client.cabal b/funblocks-client/funblocks-client.cabal index c5f50adea..9e30c4132 100644 --- a/funblocks-client/funblocks-client.cabal +++ b/funblocks-client/funblocks-client.cabal @@ -38,11 +38,11 @@ Executable funblocks-client Build-depends: ghcjs-base, text, containers, - ghcjs-dom, + ghcjs-dom >= 0.9.5, mtl else Build-depends: ghcjs-base-stub, text, containers, - ghcjs-dom, + ghcjs-dom >= 0.9.5, mtl From 9631a55be0c0d0670932f8a0ed587cd3b4648aaf Mon Sep 17 00:00:00 2001 From: Peter Becich Date: Sun, 16 Jan 2022 23:42:10 -0800 Subject: [PATCH 3/6] fix `haskell-src-meta` error --- cabal.project | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cabal.project b/cabal.project index 9466eccf8..5a92cf8ee 100644 --- a/cabal.project +++ b/cabal.project @@ -10,3 +10,6 @@ packages: codeworld-server/ codeworld-base/ funblocks-client/ + +constraints: + haskell-src-meta ==0.8.7 \ No newline at end of file From c7a3202efdd93b9912c03f2d164f597e42c46a96 Mon Sep 17 00:00:00 2001 From: Peter Becich Date: Tue, 8 Feb 2022 17:25:11 -0800 Subject: [PATCH 4/6] constraint unneeded https://github.com/haskell-party/haskell-src-meta/pull/32 published to Hackage --- cabal.project | 3 --- 1 file changed, 3 deletions(-) diff --git a/cabal.project b/cabal.project index 5a92cf8ee..9466eccf8 100644 --- a/cabal.project +++ b/cabal.project @@ -10,6 +10,3 @@ packages: codeworld-server/ codeworld-base/ funblocks-client/ - -constraints: - haskell-src-meta ==0.8.7 \ No newline at end of file From c23c0802a5a51ec79c5c3dbce99559426aaecbf1 Mon Sep 17 00:00:00 2001 From: Peter Becich Date: Tue, 8 Feb 2022 17:54:27 -0800 Subject: [PATCH 5/6] bump `haskell-src-exts` upper bound needed to build `haskell-src-meta-0.8.8` --- codeworld-server/codeworld-server.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codeworld-server/codeworld-server.cabal b/codeworld-server/codeworld-server.cabal index 035e6a683..d9cb09fd9 100644 --- a/codeworld-server/codeworld-server.cabal +++ b/codeworld-server/codeworld-server.cabal @@ -39,7 +39,7 @@ Executable codeworld-server fast-logger, filelock, filepath, - haskell-src-exts < 1.21, + haskell-src-exts, http-conduit, lifted-base, memory, From 97c27bad087ad1ede7428d4fe3ba0ab85803a4a9 Mon Sep 17 00:00:00 2001 From: Peter Becich Date: Tue, 12 Apr 2022 22:40:10 -0700 Subject: [PATCH 6/6] fix `regex-tdfa` `regex-tdfa-text` included now https://hackage.haskell.org/package/regex-tdfa-1.3.1.0/docs/Text-Regex-TDFA-Text.html --- codeworld-available-pkgs/codeworld-available-pkgs.cabal | 2 +- codeworld-compiler/codeworld-compiler.cabal | 3 +-- codeworld-error-sanitizer/codeworld-error-sanitizer.cabal | 6 ++---- codeworld-requirements/codeworld-requirements.cabal | 3 +-- codeworld-server/codeworld-server.cabal | 2 +- 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/codeworld-available-pkgs/codeworld-available-pkgs.cabal b/codeworld-available-pkgs/codeworld-available-pkgs.cabal index bf9c4fca3..255744230 100644 --- a/codeworld-available-pkgs/codeworld-available-pkgs.cabal +++ b/codeworld-available-pkgs/codeworld-available-pkgs.cabal @@ -253,7 +253,7 @@ Library reflex-dom-core, regex-base, regex-compat-tdfa, - regex-tdfa, + regex-tdfa >= 1.3.1.0, relude, resourcet, rio, diff --git a/codeworld-compiler/codeworld-compiler.cabal b/codeworld-compiler/codeworld-compiler.cabal index 75ed47614..9929bda98 100644 --- a/codeworld-compiler/codeworld-compiler.cabal +++ b/codeworld-compiler/codeworld-compiler.cabal @@ -62,8 +62,7 @@ Library memory, mtl, process, - regex-tdfa, - regex-tdfa-text, + regex-tdfa >= 1.3.1.0, split, syb, temporary, diff --git a/codeworld-error-sanitizer/codeworld-error-sanitizer.cabal b/codeworld-error-sanitizer/codeworld-error-sanitizer.cabal index 95ad875b1..0f5aa7f67 100644 --- a/codeworld-error-sanitizer/codeworld-error-sanitizer.cabal +++ b/codeworld-error-sanitizer/codeworld-error-sanitizer.cabal @@ -25,8 +25,7 @@ Library else Build-depends: array, regex-base, - regex-tdfa, - regex-tdfa-text + regex-tdfa >= 1.3.1.0 Default-language: Haskell2010 Exposed: True @@ -49,7 +48,6 @@ Test-suite unit-tests else Build-depends: array, regex-base, - regex-tdfa, - regex-tdfa-text + regex-tdfa >= 1.3.1.0 Default-language: Haskell2010 diff --git a/codeworld-requirements/codeworld-requirements.cabal b/codeworld-requirements/codeworld-requirements.cabal index 3337ab1ed..93b4a71b7 100644 --- a/codeworld-requirements/codeworld-requirements.cabal +++ b/codeworld-requirements/codeworld-requirements.cabal @@ -36,8 +36,7 @@ library haskell-src-exts >= 1.20, mtl, process, - regex-tdfa, - regex-tdfa-text, + regex-tdfa >= 1.3.1.0, syb, temporary, text, diff --git a/codeworld-server/codeworld-server.cabal b/codeworld-server/codeworld-server.cabal index d9cb09fd9..80c87db52 100644 --- a/codeworld-server/codeworld-server.cabal +++ b/codeworld-server/codeworld-server.cabal @@ -47,7 +47,7 @@ Executable codeworld-server ormolu >= 0.1, process, regex-compat, - regex-tdfa, + regex-tdfa >= 1.3.1.0, SafeSemaphore, snap-core, snap-server,