aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPjotr Prins2015-12-26 16:12:41 +0300
committerPjotr Prins2015-12-26 16:12:41 +0300
commit8e903088a7442a047911bee5e4090dce624876fb (patch)
tree7a46c177700e9aa1da0b79cd55f23980579708cb
parent1e0843ac892e8a63ee538ac0a5b3fc1485164730 (diff)
downloadguix-bioinformatics-8e903088a7442a047911bee5e4090dce624876fb.tar.gz
ldc: Patchin tests
-rw-r--r--gn/packages/dlanguage.scm13
-rw-r--r--ldc-disable-tests.patch10
2 files changed, 11 insertions, 12 deletions
diff --git a/gn/packages/dlanguage.scm b/gn/packages/dlanguage.scm
index 3d0ea90..d2604dd 100644
--- a/gn/packages/dlanguage.scm
+++ b/gn/packages/dlanguage.scm
@@ -28,8 +28,6 @@
#:use-module (gnu packages zip)
#:use-module (guix git-download))
-
-
(define-public ldc
(package
(name "ldc")
@@ -40,8 +38,7 @@
"https://github.com/ldc-developers/ldc/archive/v" version ".tar.gz"))
(sha256
(base32
- "1jvilxx0rpqmkbja4m69fhd5g09697xq7vyqp2hz4hvxmmmv4j40"))
- (patches (list (search-patch "ldc-disable-tests.patch")))))
+ "1jvilxx0rpqmkbja4m69fhd5g09697xq7vyqp2hz4hvxmmmv4j40"))))
(build-system cmake-build-system)
(supported-systems '("x86_64-linux" "i686-linux"))
(arguments `(
@@ -58,8 +55,8 @@
(begin
(with-directory-excursion "runtime/phobos"
(copy-file (assoc-ref inputs "phobos-src")
- "phobos-src.tar.gz")
- (zero? (system* "tar" "xvzf" "phobos-src.tar.gz" "--strip-components=1")))
+ "phobos-src.tar")
+ (zero? (system* "tar" "xvf" "phobos-src.tar" "--strip-components=1")))
))) ;; add-after
(add-after 'unpack 'unpack-druntime-source
(lambda* (#:key source inputs #:allow-other-keys)
@@ -110,7 +107,9 @@
(uri (string-append "https://github.com/ldc-developers/phobos/archive/ldc-v" version ".tar.gz"))
(sha256
(base32
- "0sgdj0536c4nb118yiw1f8lqy5d3g3lpg9l99l165lk9xy45l9z4"))))
+ "0sgdj0536c4nb118yiw1f8lqy5d3g3lpg9l99l165lk9xy45l9z4"))
+ (patches (list (search-patch "ldc-disable-tests.patch")))))
+
("druntime-src" ;; runtime/druntime
,(origin
(method url-fetch)
diff --git a/ldc-disable-tests.patch b/ldc-disable-tests.patch
index c24ff2a..7d85f7a 100644
--- a/ldc-disable-tests.patch
+++ b/ldc-disable-tests.patch
@@ -2,8 +2,8 @@ Disable a few ldc tests.
Patch by Pjotr Prins <pjotr.guix@thebird.nl>.
---- a/runtime/phobos/std/path.d
-+++ b/runtime/phobos/std/path.d
+--- a/std/path.d
++++ b/std/path.d
@@ -3080,8 +3080,8 @@ unittest
}
else
@@ -15,10 +15,10 @@ Patch by Pjotr Prins <pjotr.guix@thebird.nl>.
}
assert(expandTilde("~Idontexist/hey") == "~Idontexist/hey");
}
-diff --git a/runtime/phobos/std/socket.d b/runtime/phobos/std/socket.d
+diff --git a/std/socket.d b/std/socket.d
index b85d1c9..8d456c8 100644
---- a/runtime/phobos/std/socket.d
-+++ b/runtime/phobos/std/socket.d
+--- a/std/socket.d
++++ b/std/socket.d
@@ -519,6 +519,8 @@ unittest
{
// getprotobyname,number are unimplemented on Android