diff options
author | Leo Famulari <leo@famulari.name> | 2016-03-21 12:22:31 -0400 |
---|---|---|
committer | Leo Famulari <leo@famulari.name> | 2016-03-21 12:22:31 -0400 |
commit | 09ec508a4c14d1bc09622d98f796548d79ab0552 (patch) | |
tree | 86cc5a2a67d35ad796bfa33d67869d670d65822e /gnu/services.scm | |
parent | 2dbed47f5c09347c9af42c5f5bacfccbc1ab4aff (diff) | |
parent | 71cafa0472a15f2234e24d3c6d8019ebb38685b0 (diff) |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/services.scm')
-rw-r--r-- | gnu/services.scm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gnu/services.scm b/gnu/services.scm index ffba418e88..9268c51dd8 100644 --- a/gnu/services.scm +++ b/gnu/services.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2016 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -153,8 +154,8 @@ (define-syntax modify-services (syntax-rules () - "Modify the services listed in SERVICES according to CLAUSES. Each clause -must have the form: + "Modify the services listed in SERVICES according to CLAUSES and return +the resulting list of services. Each clause must have the form: (TYPE VARIABLE => BODY) @@ -458,8 +459,8 @@ FILES must be a list of name/file-like object pairs." (define (packages->profile-entry packages) "Return a system entry for the profile containing PACKAGES." (mlet %store-monad ((profile (profile-derivation - (manifest (map package->manifest-entry - (delete-duplicates packages eq?)))))) + (packages->manifest + (delete-duplicates packages eq?))))) (return `(("profile" ,profile))))) (define profile-service-type |