aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2013-10-30 17:31:05 +0100
committerLudovic Courtès <ludo@gnu.org>2013-10-30 22:09:32 +0100
commitd595e456c1555de5a4ffdbcd7cf99e07b06e2a4f (patch)
tree28a5578d251ab8774d845c3abdb8a1bbbcdfe901
parentf067fc3e77a9e39aec137d02e3c4154bfbecaf70 (diff)
downloadguix-d595e456c1555de5a4ffdbcd7cf99e07b06e2a4f.tar
guix-d595e456c1555de5a4ffdbcd7cf99e07b06e2a4f.tar.gz
guix package: Always use the term "profile", not "user environment".
* guix/scripts/package.scm (%user-environment-directory): Rename to... (%user-profile-directory): ... this. Update users accordingly. (profile-derivation): Use the term "profile" instead of "user environment", and use "profile" as the derivation name.
-rw-r--r--guix/scripts/package.scm24
1 files changed, 12 insertions, 12 deletions
diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm
index c67c682108..750b69beba 100644
--- a/guix/scripts/package.scm
+++ b/guix/scripts/package.scm
@@ -51,10 +51,10 @@
;;;
-;;; User environment.
+;;; User profile.
;;;
-(define %user-environment-directory
+(define %user-profile-directory
(and=> (getenv "HOME")
(cut string-append <> "/.guix-profile")))
@@ -246,8 +246,8 @@ case when generations have been deleted (there are \"holes\")."
(generation-numbers profile)))
(define (profile-derivation store manifest)
- "Return a derivation that builds a profile (a user environment) with the
-given MANIFEST."
+ "Return a derivation that builds a profile (aka. 'user environment') with
+the given MANIFEST."
(define builder
`(begin
(use-modules (ice-9 pretty-print)
@@ -258,7 +258,7 @@ given MANIFEST."
(let ((output (assoc-ref %outputs "out"))
(inputs (map cdr %build-inputs)))
- (format #t "building user environment `~a' with ~a packages...~%"
+ (format #t "building profile `~a' with ~a packages...~%"
output (length inputs))
(union-build output inputs)
(call-with-output-file (string-append output "/manifest")
@@ -274,7 +274,7 @@ given MANIFEST."
(input
input)))
- (build-expression->derivation store "user-environment"
+ (build-expression->derivation store "profile"
(%current-system)
builder
(append-map (match-lambda
@@ -599,11 +599,11 @@ ENTRIES, a list of manifest entries, in PROFILE. Use GETENV to determine the
current settings and report only settings not already effective."
;; Prefer ~/.guix-profile to the real profile directory name.
- (let ((profile (if (and %user-environment-directory
+ (let ((profile (if (and %user-profile-directory
(false-if-exception
- (string=? (readlink %user-environment-directory)
+ (string=? (readlink %user-profile-directory)
profile)))
- %user-environment-directory
+ %user-profile-directory
profile)))
;; The search path info is not stored in the manifest. Thus, we infer the
@@ -936,11 +936,11 @@ more information.~%"))
(exit 1))
;; Create ~/.guix-profile if it doesn't exist yet.
- (when (and %user-environment-directory
+ (when (and %user-profile-directory
%current-profile
(not (false-if-exception
- (lstat %user-environment-directory))))
- (symlink %current-profile %user-environment-directory))
+ (lstat %user-profile-directory))))
+ (symlink %current-profile %user-profile-directory))
(let ((s (stat %profile-directory #f)))
;; Attempt to create /…/profiles/per-user/$USER if needed.