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') 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 v1.2.3 From 9e7b87ddc51c640c529d445e350c3d6ef43e301d Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 13 May 2018 16:07:12 +0200 Subject: build: 'test-env' does not 'guix download' non-existent files. Reported by uniq10. * build-aux/test-env.in: Check whether FILE exists before invoking 'guix download'. --- build-aux/test-env.in | 1 + 1 file changed, 1 insertion(+) (limited to 'build-aux') diff --git a/build-aux/test-env.in b/build-aux/test-env.in index 52082c650f..aaadcf205b 100644 --- a/build-aux/test-env.in +++ b/build-aux/test-env.in @@ -132,6 +132,7 @@ then for file in "$bootstrap_directory"/guile-* do + [ -f "$file" ] && \ "@abs_top_builddir@/pre-inst-env" \ guix download "file://$file" > /dev/null done -- cgit v1.2.3