aboutsummaryrefslogtreecommitdiff
path: root/gn/packages
diff options
context:
space:
mode:
authorPjotr Prins2015-12-26 16:04:03 +0300
committerPjotr Prins2015-12-26 16:04:03 +0300
commit1e0843ac892e8a63ee538ac0a5b3fc1485164730 (patch)
tree62eb094bc3b8ad0ba4363f0ace33c875876ccd46 /gn/packages
parentd6b360666f8f04507fbf8b13a5bb9700c4420deb (diff)
downloadguix-bioinformatics-1e0843ac892e8a63ee538ac0a5b3fc1485164730.tar.gz
Patches
Diffstat (limited to 'gn/packages')
-rw-r--r--gn/packages/dlanguage.scm6
-rw-r--r--gn/packages/patches/ldc-disable-tests.patch55
2 files changed, 5 insertions, 56 deletions
diff --git a/gn/packages/dlanguage.scm b/gn/packages/dlanguage.scm
index 52641b3..3d0ea90 100644
--- a/gn/packages/dlanguage.scm
+++ b/gn/packages/dlanguage.scm
@@ -18,6 +18,7 @@
(define-module (gn packages dlanguage)
#:use-module ((guix licenses) #:prefix license:)
+ #:use-module (gnu packages)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system cmake)
@@ -27,6 +28,8 @@
#:use-module (gnu packages zip)
#:use-module (guix git-download))
+
+
(define-public ldc
(package
(name "ldc")
@@ -37,7 +40,8 @@
"https://github.com/ldc-developers/ldc/archive/v" version ".tar.gz"))
(sha256
(base32
- "1jvilxx0rpqmkbja4m69fhd5g09697xq7vyqp2hz4hvxmmmv4j40"))))
+ "1jvilxx0rpqmkbja4m69fhd5g09697xq7vyqp2hz4hvxmmmv4j40"))
+ (patches (list (search-patch "ldc-disable-tests.patch")))))
(build-system cmake-build-system)
(supported-systems '("x86_64-linux" "i686-linux"))
(arguments `(
diff --git a/gn/packages/patches/ldc-disable-tests.patch b/gn/packages/patches/ldc-disable-tests.patch
deleted file mode 100644
index c24ff2a..0000000
--- a/gn/packages/patches/ldc-disable-tests.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-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
-@@ -3080,8 +3080,8 @@ unittest
- }
- else
- {
-- assert(expandTilde("~root") == "/root", expandTilde("~root"));
-- assert(expandTilde("~root/") == "/root/", expandTilde("~root/"));
-+ // assert(expandTilde("~root") == "/root", expandTilde("~root"));
-+ // assert(expandTilde("~root/") == "/root/", expandTilde("~root/"));
- }
- assert(expandTilde("~Idontexist/hey") == "~Idontexist/hey");
- }
-diff --git a/runtime/phobos/std/socket.d b/runtime/phobos/std/socket.d
-index b85d1c9..8d456c8 100644
---- a/runtime/phobos/std/socket.d
-+++ b/runtime/phobos/std/socket.d
-@@ -519,6 +519,8 @@ unittest
- {
- // getprotobyname,number are unimplemented on Android
- softUnittest({
-+ pragma(msg, "test disabled on GNU Guix");
-+ /*
- Protocol proto = new Protocol;
- assert(proto.getProtocolByType(ProtocolType.TCP));
- //writeln("About protocol TCP:");
-@@ -529,6 +531,7 @@ unittest
- // }
- assert(proto.name == "tcp");
- assert(proto.aliases.length == 1 && proto.aliases[0] == "TCP");
-+ */
- });
- }
-
-@@ -859,6 +862,8 @@ class InternetHost
-
- unittest
- {
-+ pragma(msg, "test disabled on GNU Guix");
-+/*
- InternetHost ih = new InternetHost;
-
- ih.getHostByAddr(0x7F_00_00_01);
-@@ -888,6 +893,7 @@ unittest
- // {
- // writefln("aliases[%d] = %s", i, s);
- // }
-+*/
- });
- }
-