aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/patches
diff options
context:
space:
mode:
authorEric Bavier <bavier@member.fsf.org>2015-04-19 12:59:37 -0500
committerEric Bavier <bavier@member.fsf.org>2015-06-13 08:05:01 -0500
commit0061079a19c9ac38a2d2a170bcfea17fd362d15e (patch)
tree11f848c532f06b0445a77a5d09276eaf9c099e49 /gnu/packages/patches
parent6e545bbf5565b6273423ac50187e2c50f84399b0 (diff)
downloadguix-0061079a19c9ac38a2d2a170bcfea17fd362d15e.tar
guix-0061079a19c9ac38a2d2a170bcfea17fd362d15e.tar.gz
gnu: Add hydra.
* gnu/packages/ci.scm: New file. * gnu/packages/patches/hydra-automake-1.15.patch, gnu/packages/patches/hydra-disable-darcs-test.patch: New files. * gnu-system.am (GNU_SYSTEM_MODULES): Add file. (dist_patch_DATA): Add patches.
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r--gnu/packages/patches/hydra-automake-1.15.patch63
-rw-r--r--gnu/packages/patches/hydra-disable-darcs-test.patch25
2 files changed, 88 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 ) {