Merge branch 'master' into staging

1 files changed, 0 insertions, 141 deletions

diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm
index 6533fb302d..eb5f665fc1 100644
--- a/gnu/packages/ci.scm
+++ b/gnu/packages/ci.scm
@@ -46,147 +46,6 @@
   #:use-module (gnu packages xml)
   #:use-module (guix build-system gnu))
 
-(define-public hydra
-  (let ((commit "1ff48da3d3d4a425063f5b7dd0b89d35270f8932"))
-    (package
-      (name "hydra")
-      (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
-                  "0ni8i8v1nxxfr51rz8m6znwpbm77vr7i05k506hmgmg32r938lap"))))
-      (build-system gnu-build-system)
-      (native-inputs
-       `(("unzip" ,unzip)
-         ("pkg-config" ,pkg-config)
-         ;; For documentation
-         ("dblatex" ,dblatex)
-         ("xsltproc" ,libxslt)
-         ("docbook-xsl" ,docbook-xsl)
-         ;; For bootstrap
-         ("autoconf" ,autoconf)
-         ("automake" ,automake)
-         ("libtool" ,libtool)
-         ;; For tests
-         ("git" ,git)
-         ("subversion" ,subversion)
-         ("mercurial" ,mercurial)
-         ("bazaar" ,bazaar)))
-      (inputs
-       `(("libpqxx" ,libpqxx)
-         ("perl" ,perl)
-         ("guile" ,guile-2.0)
-         ("openssl" ,openssl)
-         ("bzip2" ,bzip2)
-         ("gzip" ,gzip)
-         ("sed" ,sed)
-         ("starman" ,starman)
-         ("git" ,git)
-         ("subversion" ,subversion)
-         ("mercurial" ,mercurial)
-         ("bazaar" ,bazaar)
-         ("nix" ,nix)
-         ;; Lots o' perl modules...
-         ("perl-catalyst-action-rest" ,perl-catalyst-action-rest)
-         ("perl-catalyst-authentication-store-dbix-class"
-          ,perl-catalyst-authentication-store-dbix-class)
-         ("perl-catalyst-devel" ,perl-catalyst-devel)
-         ("perl-catalyst-dispatchtype-regex" ,perl-catalyst-dispatchtype-regex)
-         ("perl-catalyst-plugin-accesslog" ,perl-catalyst-plugin-accesslog)
-         ("perl-catalyst-plugin-authorization-roles"
-          ,perl-catalyst-plugin-authorization-roles)
-         ("perl-catalyst-plugin-captcha" ,perl-catalyst-plugin-captcha)
-         ("perl-catalyst-plugin-session-state-cookie"
-          ,perl-catalyst-plugin-session-state-cookie)
-         ("perl-catalyst-plugin-session-store-fastmmap"
-          ,perl-catalyst-plugin-session-store-fastmmap)
-         ("perl-catalyst-plugin-stacktrace" ,perl-catalyst-plugin-stacktrace)
-         ("perl-catalyst-traitfor-request-proxybase"
-          ,perl-catalyst-traitfor-request-proxybase)
-         ("perl-catalyst-view-download" ,perl-catalyst-view-download)
-         ("perl-catalyst-view-json" ,perl-catalyst-view-json)
-         ("perl-catalyst-view-tt" ,perl-catalyst-view-tt)
-         ("perl-catalystx-roleapplicator" ,perl-catalystx-roleapplicator)
-         ("perl-catalystx-script-server-starman"
-          ,perl-catalystx-script-server-starman)
-         ("perl-crypt-randpasswd" ,perl-crypt-randpasswd)
-         ("perl-data-dump" ,perl-data-dump)
-         ("perl-datetime" ,perl-datetime)
-         ("perl-dbd-pg" ,perl-dbd-pg)
-         ("perl-dbd-sqlite" ,perl-dbd-sqlite)
-         ("perl-digest-sha1" ,perl-digest-sha1)
-         ("perl-email-mime" ,perl-email-mime)
-         ("perl-email-sender" ,perl-email-sender)
-         ("perl-file-slurp" ,perl-file-slurp)
-         ("perl-io-compress" ,perl-io-compress)
-         ("perl-ipc-run" ,perl-ipc-run)
-         ("perl-json-any" ,perl-json-any)
-         ("perl-json-xs" ,perl-json-xs)
-         ("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)
-         ("perl-sql-splitstatement" ,perl-sql-splitstatement)
-         ("perl-sys-hostname-long" ,perl-sys-hostname-long)
-         ("perl-text-diff" ,perl-text-diff)
-         ("perl-text-table" ,perl-text-table)
-         ("perl-xml-simple" ,perl-xml-simple)))
-      (arguments
-       `(#:configure-flags
-         (let ((docbook (assoc-ref %build-inputs "docbook-xsl")))
-           (list (string-append "--with-docbook-xsl="
-                                docbook "/xml/xsl/docbook-xsl-"
-                                ,(package-version docbook-xsl))
-                 (string-append "--docdir=" %output
-                                "/doc/hydra-" ,version)))
-         #:phases (modify-phases %standard-phases
-                    (add-before
-                     'check 'check-setup
-                     (lambda _ (setenv "LOGNAME" "test.log")))
-                    (add-after
-                     'install 'wrap-program
-                     (lambda* (#:key inputs outputs #:allow-other-keys)
-                       (let ((out (assoc-ref outputs "out")))
-                         (for-each
-                          (lambda (file)
-                            (wrap-program file
-                              `("PATH" ":" prefix
-                                (,(string-append out "/bin")
-                                 ,@(map (lambda (i)
-                                          (string-append (assoc-ref inputs i)
-                                                         "/bin"))
-                                        '("subversion" "git" "bazaar"
-                                          "mercurial" "coreutils" "gzip"
-                                          "sed" "unzip" "nix"))))
-                              `("PERL5LIB" ":" prefix
-                                (,(string-append out "/libexec/hydra/lib")
-                                 ,@(search-path-as-string->list
-                                    (getenv "PERL5LIB"))))
-                              `("HYDRA_RELEASE" = (,,version))
-                              `("HYDRA_HOME" =
-                                (,(string-append out "/libexec/hydra")))
-                              `("NIX_RELEASE" = (,,(package-version nix)))))
-                          (find-files (string-append out "/bin")
-                                      ".*"))))))))
-      (home-page "https://nixos.org/hydra")
-      (synopsis "Continuous build system")
-      (description
-       "Hydra is a tool for continuous integration testing and software
-release that uses a purely functional language to describe build jobs and
-their dependencies.")
-      (license l:gpl3+))))
-
 (define-public cuirass
   (let ((commit "0b40dca734468e8b12b3ff58e3e779679f17d38e")
         (revision "21"))