aboutsummaryrefslogtreecommitdiff
path: root/tests/packages.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-04-15 22:44:51 +0200
committerLudovic Courtès <ludo@gnu.org>2015-04-15 22:44:51 +0200
commitaa46a028c4ff46e3f2e6866921866d2ed6373ba3 (patch)
treee2de8788bc0a7e9a4b0b2fb7983769650ab160c5 /tests/packages.scm
parente46d517f6d0be939cca74ee9fdd181db04cbe1a1 (diff)
downloadguix-aa46a028c4ff46e3f2e6866921866d2ed6373ba3.tar
guix-aa46a028c4ff46e3f2e6866921866d2ed6373ba3.tar.gz
profiles: Generalize "hooks" for 'profile-derivation'.
* guix/profiles.scm (info-dir-file): Remove (null? (manifest-entries manifest)) test. (ca-certificate-bundle): Likewise. (ghc-package-cache-file): Turn 'if' into 'and', and remove second arm. (%default-profile-hooks): New variable. (profile-derivation): Remove #:info-dir?, #:ghc-package-cache?, and #:ca-certificate-bundle?. Add #:hooks. Iterate over HOOKS. Adjust 'inputs' accordingly. * guix/scripts/package.scm (guix-package): Adjust 'profile-derivation' call accordingly. * tests/packages.scm ("--search-paths with pattern"): Likewise. * tests/profiles.scm ("profile-derivation", "profile-derivation, inputs"): Likewise.
Diffstat (limited to 'tests/packages.scm')
-rw-r--r--tests/packages.scm4
1 files changed, 1 insertions, 3 deletions
diff --git a/tests/packages.scm b/tests/packages.scm
index 4e3a116cb8..d7c169a585 100644
--- a/tests/packages.scm
+++ b/tests/packages.scm
@@ -599,9 +599,7 @@
(profile-derivation
(manifest (map package->manifest-entry
(list p1 p2)))
- #:info-dir? #f
- #:ghc-package-cache? #f
- #:ca-certificate-bundle? #f)
+ #:hooks '())
#:guile-for-build (%guile-for-build))))
(build-derivations %store (list prof))
(string-match (format #f "^export XML_CATALOG_FILES=\"~a/xml/+bar/baz/catalog\\.xml\"\n"