diff options
| author | Mark H Weaver <mhw@netris.org> | 2018-05-17 01:00:50 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2018-05-17 01:00:50 -0400 |
| commit | 539bf8f2c071b53834829259bb3fabf0390c5dc6 (patch) | |
| tree | 16672732afbf4c3f933e67ac677aa1877f6a7657 /build-aux | |
| parent | 903874328ed5e5ab766e36cee1b1a0989e8b24a9 (diff) | |
| parent | 2cf8531f360ef390d3ec670cc150b106bab5eff1 (diff) | |
| download | guix-patches-539bf8f2c071b53834829259bb3fabf0390c5dc6.tar guix-patches-539bf8f2c071b53834829259bb3fabf0390c5dc6.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'build-aux')
| -rw-r--r-- | build-aux/hydra/gnu-system.scm | 3 | ||||
| -rw-r--r-- | build-aux/test-env.in | 1 |
2 files changed, 3 insertions, 1 deletions
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 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 |