[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/66: hydra: Update Guix job set.
From: |
Manolis Fragkiskos Ragkousis |
Subject: |
07/66: hydra: Update Guix job set. |
Date: |
Thu, 21 May 2015 12:51:48 +0000 |
phant0mas pushed a commit to branch wip-hurd
in repository guix.
commit 3845e49f7b5dc970e2c833fd84b368bede025ec2
Author: Ludovic Courtès <address@hidden>
Date: Fri May 1 22:09:00 2015 +0200
hydra: Update Guix job set.
* build-aux/hydra/guix.scm (tarball-package): Remove 'nix-checkout'
parameter. Remove 'arguments', 'native-inputs', and 'location'
fields. Adjust caller accordingly.
(hydra-jobs): Remove 'nix-checkout'.
---
build-aux/hydra/guix.scm | 33 +++++++--------------------------
1 files changed, 7 insertions(+), 26 deletions(-)
diff --git a/build-aux/hydra/guix.scm b/build-aux/hydra/guix.scm
index 3996a0b..1035f81 100644
--- a/build-aux/hydra/guix.scm
+++ b/build-aux/hydra/guix.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014 Ludovic Courtès <address@hidden>
+;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -68,25 +68,10 @@
(home-page . ,(package-home-page package))
(maintainers . ("address@hidden"))))
-(define (tarball-package checkout nix-checkout)
+(define (tarball-package checkout)
"Return a package that does `make distcheck' from CHECKOUT, a directory
containing a Git checkout of Guix."
- (let ((dist (dist-package guix checkout)))
- (package (inherit dist)
- (location (source-properties->location (current-source-location)))
- (arguments (substitute-keyword-arguments (package-arguments dist)
- ((#:phases p)
- `(alist-cons-before
- 'autoreconf 'set-nix-submodule
- (lambda _
- ;; Tell Git to use the Nix checkout that Hydra gave us.
- (zero?
- (system* "git" "config" "submodule.nix-upstream.url"
- ,nix-checkout)))
- ,p))))
- (native-inputs `(("git" ,git)
- ("graphviz" ,graphviz)
- ,@(package-native-inputs dist))))))
+ (dist-package guix checkout))
(define (hydra-jobs store arguments)
"Return Hydra jobs."
@@ -104,13 +89,9 @@ containing a Git checkout of Guix."
(define guix-checkout
(assq-ref arguments 'guix))
- (define nix-checkout
- (assq-ref arguments 'nix))
-
- (format (current-error-port) "using checkout ~s (Nix: ~s)~%"
- guix-checkout nix-checkout)
- (let ((guix (assq-ref guix-checkout 'file-name))
- (nix (assq-ref nix-checkout 'file-name)))
+ (let ((guix (assq-ref guix-checkout 'file-name)))
+ (format (current-error-port) "using checkout ~s (~s)~%"
+ guix-checkout guix)
`((tarball . ,(cute package->alist store
- (tarball-package guix nix)
+ (tarball-package guix)
(%current-system))))))
- 02/66: gnu: ebook: Drop circular inclusion of the module into itself., (continued)
- 02/66: gnu: ebook: Drop circular inclusion of the module into itself., Manolis Fragkiskos Ragkousis, 2015/05/21
- 12/66: gnu: cppunit: Explicitly link with libdl., Manolis Fragkiskos Ragkousis, 2015/05/21
- 10/66: guix: packages: Add package-direct-sources and package-transitive-sources., Manolis Fragkiskos Ragkousis, 2015/05/21
- 13/66: gnu: Add librevenge., Manolis Fragkiskos Ragkousis, 2015/05/21
- 15/66: gnu: dejagnu: Update to 1.5.3., Manolis Fragkiskos Ragkousis, 2015/05/21
- 08/66: profiles: Store search paths in manifests., Manolis Fragkiskos Ragkousis, 2015/05/21
- 16/66: gnu: help2man: Update to 1.46.6., Manolis Fragkiskos Ragkousis, 2015/05/21
- 01/66: services: Add console-keymap service., Manolis Fragkiskos Ragkousis, 2015/05/21
- 14/66: gnu: Add libwpd., Manolis Fragkiskos Ragkousis, 2015/05/21
- 18/66: gnu: wpa-supplicant: Update to 2.4., Manolis Fragkiskos Ragkousis, 2015/05/21
- 07/66: hydra: Update Guix job set.,
Manolis Fragkiskos Ragkousis <=
- 11/66: guix: build: Add transitive source building., Manolis Fragkiskos Ragkousis, 2015/05/21
- 17/66: gnu: parallel: Update to 20150422., Manolis Fragkiskos Ragkousis, 2015/05/21
- 21/66: gnu: gnupg: Update to 2.1.3., Manolis Fragkiskos Ragkousis, 2015/05/21
- 20/66: gnu: Add dovecot., Manolis Fragkiskos Ragkousis, 2015/05/21
- 22/66: gnu: subversion: Update to 1.8.13., Manolis Fragkiskos Ragkousis, 2015/05/21
- 03/66: gnu: linux-libre: Update to 4.0.1., Manolis Fragkiskos Ragkousis, 2015/05/21
- 19/66: gnu: acpica: Update to 20150410., Manolis Fragkiskos Ragkousis, 2015/05/21
- 25/66: gnu: Add libe-book., Manolis Fragkiskos Ragkousis, 2015/05/21
- 23/66: gnu: rename (gnu packages socat) to (gnu packages networking)., Manolis Fragkiskos Ragkousis, 2015/05/21
- 26/66: doc: Replace reference to profile.sh with sh-symlink, Manolis Fragkiskos Ragkousis, 2015/05/21