nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Ludovic Courtès 2013-10-30 17:31:05 +01:00
parent f067fc3e77
commit d595e456c1
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
guix/scripts/package.scm
View File

@ -51,10 +51,10 @@
;;; ;;;
;;; User environment. ;;; User profile.
;;; ;;;
(define %user-environment-directory (define %user-profile-directory
(and=> (getenv "HOME") (and=> (getenv "HOME")
(cut string-append <> "/.guix-profile"))) (cut string-append <> "/.guix-profile")))
@ -246,8 +246,8 @@ case when generations have been deleted (there are \"holes\")."
(generation-numbers profile))) (generation-numbers profile)))
(define (profile-derivation store manifest) (define (profile-derivation store manifest)
"Return a derivation that builds a profile (a user environment) with the "Return a derivation that builds a profile (aka. 'user environment') with
given MANIFEST." the given MANIFEST."
(define builder (define builder
`(begin `(begin
(use-modules (ice-9 pretty-print) (use-modules (ice-9 pretty-print)
@ -258,7 +258,7 @@ given MANIFEST."
(let ((output (assoc-ref %outputs "out")) (let ((output (assoc-ref %outputs "out"))
(inputs (map cdr %build-inputs))) (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)) output (length inputs))
(union-build output inputs) (union-build output inputs)
(call-with-output-file (string-append output "/manifest") (call-with-output-file (string-append output "/manifest")
@ -274,7 +274,7 @@ given MANIFEST."
(input (input
input))) input)))
(build-expression->derivation store "user-environment" (build-expression->derivation store "profile"
(%current-system) (%current-system)
builder builder
(append-map (match-lambda (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." current settings and report only settings not already effective."
;; Prefer ~/.guix-profile to the real profile directory name. ;; 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 (false-if-exception
(string=? (readlink %user-environment-directory) (string=? (readlink %user-profile-directory)
profile))) profile)))
%user-environment-directory %user-profile-directory
profile))) profile)))
;; The search path info is not stored in the manifest. Thus, we infer the ;; The search path info is not stored in the manifest. Thus, we infer the
@ -936,11 +936,11 @@ more information.~%"))
(exit 1)) (exit 1))
;; Create ~/.guix-profile if it doesn't exist yet. ;; Create ~/.guix-profile if it doesn't exist yet.
(when (and %user-environment-directory (when (and %user-profile-directory
%current-profile %current-profile
(not (false-if-exception (not (false-if-exception
(lstat %user-environment-directory)))) (lstat %user-profile-directory))))
(symlink %current-profile %user-environment-directory)) (symlink %current-profile %user-profile-directory))
(let ((s (stat %profile-directory #f))) (let ((s (stat %profile-directory #f)))
;; Attempt to create /…/profiles/per-user/$USER if needed. ;; Attempt to create /…/profiles/per-user/$USER if needed.