Merge branch 'master' into core-updates

Conflicts:
	gnu/packages/commencement.scm
	gnu/packages/xml.scm

4 files changed, 123 insertions, 0 deletions

diff --git a/gnu/packages/patches/hydra-automake-1.15.patch b/gnu/packages/patches/hydra-automake-1.15.patch
new file mode 100644
index 0000000000..0d8fa98519
--- /dev/null
+++ b/gnu/packages/patches/hydra-automake-1.15.patch
@@ -0,0 +1,63 @@
+This patch takes a slightly different approach to solving the issue reported
+at https://github.com/NixOS/hydra/issues/200.  This fix allows us to use
+Automake's parallel test harness.
+
+--- source/configure.ac.orig	1969-12-31 18:00:01.000000000 -0600
++++ source/configure.ac	2015-04-15 10:58:15.974679278 -0500
+@@ -33,7 +33,7 @@
+ fi
+ ])
+ 
+-NEED_PROG(perl, perl)
++NEED_PROG([PERL], perl)
+ 
+ NEED_PROG([NIX_STORE_PROGRAM], [nix-store])
+ 
+--- source/tests/Makefile.am.orig	1969-12-31 18:00:01.000000000 -0600
++++ source/tests/Makefile.am	2015-04-15 11:00:35.846682904 -0500
+@@ -1,19 +1,20 @@
+-TESTS_ENVIRONMENT = \
+-  BZR_HOME="$(abs_builddir)/data"			\
+-  HYDRA_DBI="dbi:SQLite:db.sqlite"			\
+-  HYDRA_DATA="$(abs_builddir)/data"			\
+-  HYDRA_HOME="$(top_srcdir)/src"			\
+-  HYDRA_CONFIG=						\
+-  NIX_REMOTE=						\
+-  NIX_CONF_DIR="$(abs_builddir)/nix/etc/nix"		\
+-  NIX_STATE_DIR="$(abs_builddir)/nix/var/nix"		\
+-  NIX_MANIFESTS_DIR="$(abs_builddir)/nix/var/nix/manifests"	\
+-  NIX_STORE_DIR="$(abs_builddir)/nix/store"			\
+-  NIX_LOG_DIR="$(abs_builddir)/nix/var/log/nix"		\
+-  NIX_BUILD_HOOK=					\
+-  PERL5LIB="$(srcdir):$(top_srcdir)/src/lib:$$PERL5LIB"	\
+-  PATH=$(abs_top_srcdir)/src/script:$(abs_top_srcdir)/src/c:$$PATH \
+-  perl -w
++AM_TESTS_ENVIRONMENT = \
++  BZR_HOME="$(abs_builddir)/data"; export BZR_HOME;	\
++  HYDRA_DBI="dbi:SQLite:db.sqlite"; export HYDRA_DBI;	\
++  HYDRA_DATA="$(abs_builddir)/data"; export HYDRA_DATA;	\
++  HYDRA_HOME="$(top_srcdir)/src"; export HYDRA_HOME;	\
++  HYDRA_CONFIG=; export HYDRA_CONFIG;			\
++  NIX_REMOTE=; export NIX_REMOTE;			\
++  NIX_CONF_DIR="$(abs_builddir)/nix/etc/nix"; export NIX_CONF_DIR; \
++  NIX_STATE_DIR="$(abs_builddir)/nix/var/nix"; export NIX_STATE_DIR; \
++  NIX_MANIFESTS_DIR="$(abs_builddir)/nix/var/nix/manifests"; export NIX_MANIFESTS_DIR; \
++  NIX_STORE_DIR="$(abs_builddir)/nix/store"; export NIX_STORE_DIR; \
++  NIX_LOG_DIR="$(abs_builddir)/nix/var/log/nix"; export NIX_LOG_DIR; \
++  NIX_BUILD_HOOK=; export NIX_BUILD_HOOK;		\
++  PERL5LIB="$(srcdir):$(top_srcdir)/src/lib:$$PERL5LIB"; export PERL5LIB; \
++  PATH=$(abs_top_srcdir)/src/script:$(abs_top_srcdir)/src/c:$$PATH; export PATH;
++LOG_COMPILER = $(PERL)
++AM_LOG_FLAGS = -w
+ 
+ EXTRA_DIST = \
+   $(wildcard *.pm) \
+@@ -33,7 +34,7 @@
+ check_SCRIPTS = db.sqlite repos
+ 
+ db.sqlite: $(top_srcdir)/src/sql/hydra-sqlite.sql
+-	$(TESTS_ENVIRONMENT) $(top_srcdir)/src/script/hydra-init
++	$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) $(top_srcdir)/src/script/hydra-init
+ 
+ repos: dirs
+ 
diff --git a/gnu/packages/patches/hydra-disable-darcs-test.patch b/gnu/packages/patches/hydra-disable-darcs-test.patch
new file mode 100644
index 0000000000..5d8e015b08
--- /dev/null
+++ b/gnu/packages/patches/hydra-disable-darcs-test.patch
@@ -0,0 +1,25 @@
+--- hydra-20150407.4c0e3e4/tests/evaluation-tests.pl	2015-04-15 12:00:19.000000000 -0500
++++ hydra-20150407.4c0e3e4/tests/evaluation-tests.pl	2015-04-17 08:53:04.940301471 -0500
+@@ -7,7 +7,7 @@
+ 
+ my $db = Hydra::Model::DB->new;
+ 
+-use Test::Simple tests => 72;
++use Test::Simple tests => 68;
+ 
+ hydra_setup($db);
+ 
+@@ -103,13 +103,6 @@
+         uri => "$jobsBaseUri/hg-repo",
+         update => getcwd . "/jobs/hg-update.sh"
+     },
+-    {
+-        name => "darcs",
+-        nixexpr => "darcs-input.nix",
+-        type => "darcs",
+-        uri => "$jobsBaseUri/darcs-repo",
+-        update => getcwd . "/jobs/darcs-update.sh"
+-    }
+ );
+ 
+ foreach my $scm ( @scminputs ) {
diff --git a/gnu/packages/patches/perl-net-ssleay-disable-ede-test.patch b/gnu/packages/patches/perl-net-ssleay-disable-ede-test.patch
new file mode 100644
index 0000000000..16f136fb54
--- /dev/null
+++ b/gnu/packages/patches/perl-net-ssleay-disable-ede-test.patch
@@ -0,0 +1,23 @@
+Disable a test that fails with openssl-1.0.2b.
+
+--- Net-SSLeay-1.68/t/local/33_x509_create_cert.t.orig	2014-06-07 02:01:39.000000000 -0400
++++ Net-SSLeay-1.68/t/local/33_x509_create_cert.t	2015-06-12 03:38:57.620286888 -0400
+@@ -2,7 +2,7 @@
+ 
+ use strict;
+ use warnings;
+-use Test::More tests => 123;
++use Test::More tests => 122;
+ use Net::SSLeay qw/MBSTRING_ASC MBSTRING_UTF8 EVP_PK_RSA EVP_PKT_SIGN EVP_PKT_ENC/;
+ use File::Spec;
+ use utf8;
+@@ -101,7 +101,8 @@
+   like(my $key_pem3 = Net::SSLeay::PEM_get_string_PrivateKey($pk,"password",$alg1), qr/-----BEGIN (ENCRYPTED|RSA) PRIVATE KEY-----/, "PEM_get_string_PrivateKey+passwd+enc_alg");
+   
+   ok(my $alg2 = Net::SSLeay::EVP_get_cipherbyname("DES-EDE3-OFB"), "EVP_get_cipherbyname");
+-  like(my $key_pem4 = Net::SSLeay::PEM_get_string_PrivateKey($pk,"password",$alg2), qr/-----BEGIN (ENCRYPTED|RSA) PRIVATE KEY-----/, "PEM_get_string_PrivateKey+passwd+enc_alg");
++  # This test fails with openssl-1.0.2b
++  #like(my $key_pem4 = Net::SSLeay::PEM_get_string_PrivateKey($pk,"password",$alg2), qr/-----BEGIN (ENCRYPTED|RSA) PRIVATE KEY-----/, "PEM_get_string_PrivateKey+passwd+enc_alg");
+   
+   is(Net::SSLeay::X509_NAME_print_ex($name), "O=Company Name,C=UK,CN=Common name text X509", "X509_NAME_print_ex");  
+ 
diff --git a/gnu/packages/patches/python-disable-ssl-test.patch b/gnu/packages/patches/python-disable-ssl-test.patch
new file mode 100644
index 0000000000..e351c77505
--- /dev/null
+++ b/gnu/packages/patches/python-disable-ssl-test.patch
@@ -0,0 +1,12 @@
+Disable a test that fails with openssl-1.0.2b.
+
+--- Lib/test/test_ssl.py.orig	2015-02-25 06:27:45.000000000 -0500
++++ Lib/test/test_ssl.py	2015-06-12 03:14:09.395212502 -0400
+@@ -2718,6 +2718,7 @@
+                                        chatty=True, connectionchatty=True)
+             self.assertIs(stats['compression'], None)
+ 
++        @unittest.skipIf(True, "openssl 1.0.2b complains: dh key too small")
+         def test_dh_params(self):
+             # Check we can get a connection with ephemeral Diffie-Hellman
+             context = ssl.SSLContext(ssl.PROTOCOL_TLSv1)