Skip to content

Commit 3ee9dc5

Browse files
committed
Fixes for inline-r and H, but then giving up on H for now
1 parent 0a2c210 commit 3ee9dc5

File tree

2 files changed

+20
-5
lines changed

2 files changed

+20
-5
lines changed

survey/default.nix

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -679,10 +679,20 @@ let
679679
curl = old.curl.override { zlib = statify_zlib final.zlib; };
680680
});
681681

682-
# The Haskell package `H` depends on R, which pulls in OpenJDK,
683-
# which is not patched for musl support yet in nixpkgs.
684-
# Disable Java support for now.
685-
R = previous.R.override { javaSupport = false; };
682+
R = (previous.R.override {
683+
# R supports EITHER static or shared libs.
684+
static = true;
685+
# The Haskell package `H` depends on R, which pulls in OpenJDK,
686+
# which is not patched for musl support yet in nixpkgs.
687+
# Disable Java support for now.
688+
javaSupport = false;
689+
}).overrideAttrs (old: {
690+
# Testsuite newly seems to have at least one segfaulting (or otherwise
691+
# crashing without output) test case (didn't have it before #61).
692+
# Disable test suite for now; Alpine also does it:
693+
# https://git.alpinelinux.org/aports/tree/community/R/APKBUILD?id=e2bce14c748aacb867713cb81a91fad6e8e7f7f6#n56
694+
doCheck = false;
695+
});
686696
};
687697

688698

@@ -974,6 +984,10 @@ let
974984
];
975985
}))).override { openblasCompat = final.openblasCompat; };
976986

987+
# Test suite segfaults (perhaps because R's test suite also does?)
988+
# since #61.
989+
inline-r = dontCheck super.inline-r;
990+
977991
# TODO For the below packages, it would be better if we could somehow make all users
978992
# of postgresql-libpq link in openssl via pkgconfig.
979993
pg-harness-server =
@@ -1222,6 +1236,7 @@ in
12221236
"ersatz"
12231237
"gloss-examples" # needs opengl
12241238
"gtk3" # problem compiling `glib` dependency with `Distribution.Simple.UserHooks.UserHooks` type mismatch across Cabal versions; should go away once we no longer have to patch Cabal
1239+
"H" # `zgemm_: symbol not found` when compiling Main; not clear how that can be provided
12251240
"hamilton" # openmp linker error via openblas
12261241
"hquantlib"
12271242
"ihaskell"

0 commit comments

Comments
 (0)