diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-04-15 22:44:51 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-04-15 22:44:51 +0200 |
| commit | aa46a028c4ff46e3f2e6866921866d2ed6373ba3 (patch) | |
| tree | e2de8788bc0a7e9a4b0b2fb7983769650ab160c5 /guix/scripts/package.scm | |
| parent | e46d517f6d0be939cca74ee9fdd181db04cbe1a1 (diff) | |
| download | gnu-guix-aa46a028c4ff46e3f2e6866921866d2ed6373ba3.tar gnu-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 'guix/scripts/package.scm')
| -rw-r--r-- | guix/scripts/package.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm index 53813c14ab..5ee3a89ba6 100644 --- a/guix/scripts/package.scm +++ b/guix/scripts/package.scm @@ -855,9 +855,9 @@ more information.~%")) (let* ((prof-drv (run-with-store (%store) (profile-derivation new - #:info-dir? (not bootstrap?) - #:ghc-package-cache? (not bootstrap?) - #:ca-certificate-bundle? (not bootstrap?)))) + #:hooks (if bootstrap? + '() + %default-profile-hooks)))) (prof (derivation->output-path prof-drv))) (show-manifest-transaction (%store) manifest transaction #:dry-run? dry-run?) |