aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPjotr Prins2015-12-26 17:55:43 +0300
committerPjotr Prins2015-12-26 17:55:43 +0300
commita1fe2ca61e15738220aee34618fa75792d802554 (patch)
tree85d525e4394817d9e98af6ed042b644c9f7980cd
parent2d293f25d7b5bd906d6937020d1f294da1c8c65f (diff)
downloadguix-bioinformatics-a1fe2ca61e15738220aee34618fa75792d802554.tar.gz
ldc: disable zoninfo in patch
-rw-r--r--gn/packages/dlanguage.scm2
-rw-r--r--ldc-disable-tests.patch17
2 files changed, 17 insertions, 2 deletions
diff --git a/gn/packages/dlanguage.scm b/gn/packages/dlanguage.scm
index d2604dd..38ac8b0 100644
--- a/gn/packages/dlanguage.scm
+++ b/gn/packages/dlanguage.scm
@@ -81,8 +81,6 @@
(substitute* "runtime/phobos/std/process.d"
(("/bin/sh") (which "sh"))
(("echo") (which "echo")))
- (substitute* "runtime/phobos/std/process.d"
- (("/usr/share/zoneinfo/") ("")))
#t))
(add-after
'unpack-dmd-testsuite-source 'patch-dmd-testsuite
diff --git a/ldc-disable-tests.patch b/ldc-disable-tests.patch
index 871089e..d88aa21 100644
--- a/ldc-disable-tests.patch
+++ b/ldc-disable-tests.patch
@@ -1,3 +1,20 @@
+diff --git a/std/datetime.d b/std/datetime.d
+index 8e4ed3b..d904a49 100644
+--- a/std/datetime.d
++++ b/std/datetime.d
+@@ -28018,7 +28018,11 @@ public:
+ The default directory where the TZ Database files are. It's empty
+ for Windows, since Windows doesn't have them.
+ +/
+- enum defaultTZDatabaseDir = "/usr/share/zoneinfo/";
++
++ pragma(msg, "test disabled on GNU Guix");
++
++ // enum defaultTZDatabaseDir = "/usr/share/zoneinfo/";
++ enum defaultTZDatabaseDir = "";
+ }
+ else version(Windows)
+ {
diff --git a/std/path.d b/std/path.d
index 254d8f0..b0fc04d 100644
--- a/std/path.d