mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-07 15:36:20 -05:00
gnu: hydra: Update to 20151030.1ff48da.
* gnu/packages/ci.scm (hydra): Update to 20151030.1ff48da (fixes building with nix-1.11.x). [source]: Remove 'hydra-automake-1.15.patch'. [inputs]: Add libpqxx and perl-net-statsd. * gnu/packages/patches/hydra-automake-1.15.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. Signed-off-by: Leo Famulari <leo@famulari.name>
This commit is contained in:
Jan Nieuwenhuizen
Leo Famulari
parent
fe71eee076
commit
253745d756
3 changed files with 9 additions and 72 deletions
|
|
@ -565,7 +565,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/higan-remove-march-native-flag.patch \
|
||||
%D%/packages/patches/hop-bigloo-4.0b.patch \
|
||||
%D%/packages/patches/hop-linker-flags.patch \
|
||||
%D%/packages/patches/hydra-automake-1.15.patch \
|
||||
%D%/packages/patches/hydra-disable-darcs-test.patch \
|
||||
%D%/packages/patches/hypre-doc-tables.patch \
|
||||
%D%/packages/patches/hypre-ldflags.patch \
|
||||
|
|
|
|||
|
|
@ -39,23 +39,22 @@ (define-module (gnu packages ci)
|
|||
#:use-module (guix build-system gnu))
|
||||
|
||||
(define-public hydra
|
||||
(let ((commit "4c0e3e47034545ad3e9e86dd069138bcebb8ccee"))
|
||||
(let ((commit "1ff48da3d3d4a425063f5b7dd0b89d35270f8932"))
|
||||
(package
|
||||
(name "hydra")
|
||||
(version (string-append "20150407." (string-take commit 7)))
|
||||
(version (string-append "20151030." (string-take commit 7)))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/NixOS/hydra")
|
||||
(commit commit)))
|
||||
(file-name (string-append name "-" version))
|
||||
(patches (search-patches
|
||||
;; TODO: Remove once we have a darcs input
|
||||
"hydra-disable-darcs-test.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"08vc76xb7f42hh65j7qvjf58hw36aki5ml343170pq94vk75b1nh"))
|
||||
(patches (search-patches
|
||||
"hydra-automake-1.15.patch"
|
||||
;; TODO: Remove once we have a darcs input
|
||||
"hydra-disable-darcs-test.patch"))))
|
||||
"0ni8i8v1nxxfr51rz8m6znwpbm77vr7i05k506hmgmg32r938lap"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("unzip" ,unzip)
|
||||
|
|
@ -74,7 +73,8 @@ (define-public hydra
|
|||
("mercurial" ,mercurial)
|
||||
("bazaar" ,bazaar)))
|
||||
(inputs
|
||||
`(("perl" ,perl)
|
||||
`(("libpqxx" ,libpqxx)
|
||||
("perl" ,perl)
|
||||
("guile" ,guile-2.0)
|
||||
("openssl" ,openssl)
|
||||
("bzip2" ,bzip2)
|
||||
|
|
@ -125,6 +125,7 @@ (define-public hydra
|
|||
("perl-libwww" ,perl-libwww)
|
||||
("perl-lwp-protocol-https" ,perl-lwp-protocol-https)
|
||||
("perl-net-amazon-s3" ,perl-net-amazon-s3)
|
||||
("perl-net-statsd" ,perl-net-statsd)
|
||||
("perl-padwalker" ,perl-padwalker)
|
||||
("perl-readonly" ,perl-readonly)
|
||||
("perl-set-scalar" ,perl-set-scalar)
|
||||
|
|
|
|||
|
|
@ -1,63 +0,0 @@
|
|||
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= \
|
||||
- GUIX_CONFIGURATION_DIRECTORY="$(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; \
|
||||
+ GUIX_CONFIGURATION_DIRECTORY="$(abs_builddir)/nix/etc/nix"; export GUIX_CONFIGURATION_DIRECTORY; \
|
||||
+ 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
|
||||
|
||||
Loading…
Reference in a new issue