Skip to content

Add th-orphans to th-dlls test #2245

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

Merged
merged 5 commits into from
Oct 18, 2024
Merged

Add th-orphans to th-dlls test #2245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8666492
Add th-orphans to th-dlls test
hamishmack Aug 19, 2024
e5f82a3
Merge remote-tracking branch 'origin/master' into hkm/th-orphans-issue
hamishmack Oct 17, 2024
86f3721
Disable broken test
hamishmack Oct 17, 2024
dc3b1f2
Bump head.hackage
hamishmack Oct 17, 2024
0f336ab
Disable broken test
hamishmack Oct 17, 2024
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
2 changes: 1 addition & 1 deletion test/cabal.project.local
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ repository head.hackage.ghc.haskell.org
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
--sha256: sha256-Z6cqRAlbV1WNbK4fKdcWHQcLA8CGpzfnTOd8QxcOy+c=
--sha256: sha256-IAYzsKIkZOgcNFuRkmwziLdwgU8tEe6vnhx+bugTSTw=

repository ghcjs-overlay
url: https://raw.githubusercontent.com/input-output-hk/hackage-overlay-ghcjs/56cd424e8529e7a1fc29c6126abdc66f09467306
Expand Down
5 changes: 5 additions & 0 deletions test/th-dlls/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ in recurseIntoAttrs {
|| (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isMusl)
# Failed to lookup symbol: __aarch64_swp8_acq_rel
|| (builtins.elem compiler-nix-name ["ghc947" "ghc948"] && haskellLib.isCrossHost && stdenv.hostPlatform.isAarch64)
# We have been unable to get windows cross compilation of th-orphans to work for GHC 8.10 using the latest nixpkgs
|| (compiler-nix-name == "ghc8107" && stdenv.hostPlatform.isWindows)
# We need to update GHC HEAD to get a version of ghc-internal compatible
# with th-lift from head.hackage.
|| compiler-nix-name == "ghc91120240918"
;

ifdInputs = {
Expand Down
1 change: 1 addition & 0 deletions test/th-dlls/th-dlls.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ library
, text
, double-conversion
, unix-time
, th-orphans
exposed-modules: Lib
hs-source-dirs: src
default-language: Haskell2010
Expand Down