From d595e456c1555de5a4ffdbcd7cf99e07b06e2a4f Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Wed, 30 Oct 2013 17:31:05 +0100
Subject: 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.
---
 guix/scripts/package.scm | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'guix/scripts/package.scm')

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 @@ (define %store
 
 
 ;;;
-;;; User environment.
+;;; User profile.
 ;;;
 
-(define %user-environment-directory
+(define %user-profile-directory
   (and=> (getenv "HOME")
          (cut string-append <> "/.guix-profile")))
 
@@ -246,8 +246,8 @@ (define (previous-generation-number profile number)
         (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 @@ (define builder
 
        (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 @@ (define ensure-valid-input
      (input
       input)))
 
-  (build-expression->derivation store "user-environment"
+  (build-expression->derivation store "profile"
                                 (%current-system)
                                 builder
                                 (append-map (match-lambda
@@ -599,11 +599,11 @@ (define* (search-path-environment-variables entries profile
 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 @@ (define (rtfm)
       (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.
-- 
cgit v1.2.3