diff options
| author | pjotrp | 2017-12-10 16:33:01 +0000 |
|---|---|---|
| committer | pjotrp | 2017-12-10 16:33:01 +0000 |
| commit | db6d7d7c74ea3f8d26d01d3c1b9db0592c803686 (patch) | |
| tree | 1e5e90f034fe345c713199e7cdb3d1f3539e3fae | |
| parent | 4637bac48d947f3d0baa03e259a001c1c6495e9d (diff) | |
| download | guix-bioinformatics-db6d7d7c74ea3f8d26d01d3c1b9db0592c803686.tar.gz | |
ldc: patching
| -rw-r--r-- | gn/packages/ldc.scm | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/gn/packages/ldc.scm b/gn/packages/ldc.scm index ed563f3..fffef93 100644 --- a/gn/packages/ldc.scm +++ b/gn/packages/ldc.scm @@ -157,15 +157,27 @@ ;; The 'patch-dmd2 step in ldc causes the build to fail since ;; dmd2/root/port.c no longer exists. Arguments needed to have ;; 'patch-dmd2 step removed, but retain everything else. + + ;; 99% tests passed, 11 tests failed out of 1589 (add-after 'unpack-submodule-sources 'patch-phobos (lambda* (#:key inputs #:allow-other-keys) (substitute* "runtime/phobos/std/process.d" (("/bin/sh") (which "sh")) (("echo") (which "echo"))) + ; disable unittests in these files: + (substitute* '("runtime/phobos/std/net/curl.d" + "runtime/phobos/std/datetime/systime.d" + ) + (("version(unittest)") "version(skipunittest)") + ((" unittest") " version(skipunittest) unittest")) + (substitute* "runtime/phobos/std/datetime/timezone.d" + (("/usr/share/zoneinfo/") + (string-append (assoc-ref inputs "tzdata") "/share/zoneinfo"))) (substitute* "tests/d2/dmd-testsuite/Makefile" (("/bin/bash") (which "bash"))) #t))) - #:tests? #f)) + #:make-flags (list "PHOBOS_TEST_ALLOW_NET=0") + #:tests? #t)) (native-inputs `(("llvm" ,llvm) ("clang" ,clang) @@ -178,13 +190,14 @@ ("phobos-src" ,(origin (method url-fetch) - (uri (string-append + (uri (string-append ; https://github.com/ldc-developers/phobos/releases/tag/ldc-v1.6.0-beta1 "https://github.com/ldc-developers/phobos/archive/ldc-v" beta-version ".tar.gz")) (sha256 (base32 "00xsc00wjqz5xklps7ca696c83gwlkz5wb68q5cnq5axhshg553n")) + (patches (search-patches "ldc-disable-tests2.patch")) ;; This patch deactivates some tests that depend on network access ;; to pass. It also deactivates some tests that have some reliance ;; on timezone. |