Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build with ghc(js) 9.8.2 + 9.10.1 #1093

Open
wants to merge 22 commits into
base: develop
Choose a base branch
from
Open

Build with ghc(js) 9.8.2 + 9.10.1 #1093

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
42228f9
Build 'obelisk-executable-config-lookup' with ghc(js) 9.8 + 9.10
ymeister Aug 7, 2024
61853b4
Build 'tabulation' with ghc(js) 9.8 + 9.10
ymeister Aug 7, 2024
df0cdc2
Build 'obelisk-route' with ghc(js) 9.8 + 9.10
ymeister Aug 8, 2024
3381a03
Build 'obelisk-frontend' with ghc(js) 9.8 + 9.10
ymeister Aug 8, 2024
730fc64
Mark js incompatible libraries as non-buildable with js
ymeister Aug 8, 2024
9f23d8b
Build 'obelisk-asset-manifest' with ghc 9.8 + 9.10
ymeister Aug 8, 2024
961f157
Build the rest of the libs with ghc 9.8 + 9.10
ymeister Aug 18, 2024
b3fbfdd
Split 'cabal.project'
ymeister Aug 18, 2024
e852cb2
Test with 'nix-build -A selftest'
ymeister Aug 18, 2024
2d46489
Merge branch 'develop' into ghc(js)-9.10
alexfmpe Feb 1, 2025
01308c0
Fix unused import in older GHC
alexfmpe Feb 1, 2025
9e410cb
Handle build failure in HsOpenSSL with recent openssl
alexfmpe Feb 1, 2025
d799ab9
Support nix-thunk >= 0.7.1
alexfmpe Feb 1, 2025
bfc3126
Bump index state
alexfmpe Feb 1, 2025
fcf3a0a
Remove unused git dependency
alexfmpe Feb 1, 2025
4fb1b41
Remove dependency on forked unix-compat
alexfmpe Feb 1, 2025
e7668b0
Remove since-merged override for system-fileio and system-filepath
alexfmpe Feb 1, 2025
7de05e4
Relax process lower bound
alexfmpe Feb 1, 2025
e27dcca
Make allow-newer more explicit
alexfmpe Feb 1, 2025
be031e3
Simplify cabal.project
alexfmpe Feb 1, 2025
508ebb8
Remove old project file
alexfmpe Feb 1, 2025
769dd6f
Add github CI
alexfmpe Feb 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions lib/cabal.dependencies.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,6 @@ if !arch(javascript)
subdir: system-fileio system-filepath
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure why this was added but the upstream PR has been merged fpco/haskell-filesystem#27

--sha256: sha256-VDShV+gkVUooMy1OtxrFfZrTAVVhWN/Ffjd6Qq0kHNM=

source-repository-package
type: git
location: https://github.com/ymeister/unix-compat.git
tag: 339649401c876ca1f76c6f94d6b099c8c47fa9e2
--sha256: 0j85q0mqg929nlz9ks6jaxz54pkvifpmldsvqjcz4bv6wml8m3wd

-- https://github.com/haskell-cryptography/HsOpenSSL/issues/93#issuecomment-2311816896
package HsOpenSSL
ghc-options: -optc=-Wno-incompatible-pointer-types"
1 change: 1 addition & 0 deletions lib/command/obelisk-command.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ library
, text
, time
, transformers
, unix
, unix-compat
, unordered-containers
, utf8-string
Expand Down
2 changes: 1 addition & 1 deletion lib/command/src/Obelisk/Command/Project.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ import System.IO.Temp
import System.IO.Unsafe (unsafePerformIO)
import System.PosixCompat.Files
import System.PosixCompat.Types
import System.PosixCompat.User
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I doubt we want to go out of our way to keep using an old version of unix-compat, for the sake of a single function which simply crashes: https://github.com/jacobstanley/unix-compat/pull/62/files#diff-93ed634b109420481984ea0fecc52a958c1d98c2728f8ec0b4c6ed741a8d4a24L55-L63

If ob survives long enough for windows support to be a concern, a lot of things will need to be revisited anyway.

import System.Posix.User
import qualified System.Process as Proc
import Text.ShellEscape (sh, bash, bytes)

Expand Down