aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2013-09-18 19:37:50 +0200
committerLudovic Courtès <ludo@gnu.org>2013-09-18 19:37:50 +0200
commit3301f179709d4ef4d5a1f50a634698d9abdb0519 (patch)
tree1b055c6a4f5aafc46c0d1a71010764f550e0098b
parent37c0ce3d279450d5f33f7bc405989c570249f032 (diff)
downloadguix-3301f179709d4ef4d5a1f50a634698d9abdb0519.tar
guix-3301f179709d4ef4d5a1f50a634698d9abdb0519.tar.gz
hydra: Return the .drv file names, not the <derivation> objects.
* build-aux/hydra/gnu-system.scm (package->alist): Call 'derivation-file-name' on the result of 'package-derivation'. * build-aux/hydra/guix.scm (package->alist): Likewise.
-rw-r--r--build-aux/hydra/gnu-system.scm3
-rw-r--r--build-aux/hydra/guix.scm3
2 files changed, 4 insertions, 2 deletions
diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm
index 8206be22ff..abc107cb1c 100644
--- a/build-aux/hydra/gnu-system.scm
+++ b/build-aux/hydra/gnu-system.scm
@@ -58,7 +58,8 @@
(define* (package->alist store package system
#:optional (package-derivation package-derivation))
"Convert PACKAGE to an alist suitable for Hydra."
- `((derivation . ,(package-derivation store package system))
+ `((derivation . ,(derivation-file-name
+ (package-derivation store package system)))
(description . ,(package-synopsis package))
(long-description . ,(package-description package))
(license . ,(package-license package))
diff --git a/build-aux/hydra/guix.scm b/build-aux/hydra/guix.scm
index 59e3172e1f..189b973a69 100644
--- a/build-aux/hydra/guix.scm
+++ b/build-aux/hydra/guix.scm
@@ -56,7 +56,8 @@
(define* (package->alist store package system
#:optional (package-derivation package-derivation))
"Convert PACKAGE to an alist suitable for Hydra."
- `((derivation . ,(package-derivation store package system))
+ `((derivation . ,(derivation-file-name
+ (package-derivation store package system)))
(description . ,(package-synopsis package))
(long-description . ,(package-description package))
(license . ,(package-license package))