From d6680dccb0cbff97946094b967b0b897fe88311a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 12 May 2018 15:57:46 +0200 Subject: hydra: Switch back to "-" instead of "@" in package job names. Fixes a regression introduced in ede121de426f9c56820852888a0b370f0ccbce49. Reported by Mark H Weaver . * build-aux/hydra/gnu-system.scm (job-name): Pass "-" as the second argument to 'package-full-name'. --- build-aux/hydra/gnu-system.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'build-aux/hydra') diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm index 62eb957f83..654f3ecf3e 100644 --- a/build-aux/hydra/gnu-system.scm +++ b/build-aux/hydra/gnu-system.scm @@ -264,7 +264,8 @@ all its dependencies, and ready to be installed on non-GuixSD distributions.") (define job-name ;; Return the name of a package's job. - (compose string->symbol package-full-name)) + (compose string->symbol + (cut package-full-name <> "-"))) (define package->job (let ((base-packages -- cgit 1.4.1 From e740e8b27d8ac255ccc3737a1f66f0951578d845 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 10 Jun 2018 22:20:35 +0200 Subject: hydra: guix-modular: Build the full Guix. * build-aux/hydra/guix-modular.scm (build-job): Pass #:pull-version to BUILD. --- build-aux/hydra/guix-modular.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'build-aux/hydra') diff --git a/build-aux/hydra/guix-modular.scm b/build-aux/hydra/guix-modular.scm index 58e09e1831..9ff9e090fc 100644 --- a/build-aux/hydra/guix-modular.scm +++ b/build-aux/hydra/guix-modular.scm @@ -46,6 +46,7 @@ for SYSTEM. Use VERSION as the version identifier." `((derivation . ,(derivation-file-name (run-with-store store (build source #:version version #:system system + #:pull-version 1 #:guile-version "2.2")))) ;the latest 2.2.x (description . "Modular Guix") (long-description -- cgit 1.4.1