* [bug#46291] [PATCH] environment: Allow starting from existing profile
@ 2021-02-04 10:13 Lars-Dominik Braun
2021-02-11 10:01 ` bug#46291: " 宋文武
0 siblings, 1 reply; 2+ messages in thread
From: Lars-Dominik Braun @ 2021-02-04 10:13 UTC (permalink / raw)
To: 46291
[-- Attachment #1: Type: text/plain, Size: 908 bytes --]
Hi everyone,
the attched patch allows starting a `guix environment` from an existing
profile. Our use-case is this: We have profiles, created by
guix package -p /path -i …
because we need to parse desktop files in /path/share/applications. Also
this does the heavy-lifting (substitutes/building/grafting) upfront once
and not when starting an environment. Then we start an application from
this profile using
guix environment -C […] -p /path -- jupyterlab […]
This is much faster (10x) for large profiles (i.e. JupyterLab) than
guix environment -C […] -m manifest.scm -- jupyterlab […]
and makes sure the environment is exactly the same as
source /path/etc/profile
I think there have been many discussions about how `guix environment`
should work and this is certainly not the silver bullet, but it’s a huge
improvement for us with very limited code changes required.
Cheers,
Lars
[-- Attachment #2: 0001-environment-Allow-starting-from-existing-profile.patch --]
[-- Type: text/x-diff, Size: 3846 bytes --]
From 3010cea7273f02e33f65dd5d78390f0f5b7e4698 Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Thu, 4 Feb 2021 10:43:45 +0100
Subject: [PATCH] environment: Allow starting from existing profile
* guix/scripts/environment.scm (%options): Add -p/--profile switch.
(show-help): Document new switch.
(guix-environment): Handle new 'profile switch.
---
guix/scripts/environment.scm | 21 +++++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)
diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm
index f4d12f89bf..25bc208489 100644
--- a/guix/scripts/environment.scm
+++ b/guix/scripts/environment.scm
@@ -21,6 +21,7 @@
(define-module (guix scripts environment)
#:use-module (guix ui)
#:use-module (guix store)
+ #:use-module (guix utils)
#:use-module ((guix status) #:select (with-status-verbosity))
#:use-module (guix grafts)
#:use-module (guix derivations)
@@ -136,6 +137,8 @@ COMMAND or an interactive shell in that environment.\n"))
FILE evaluates to"))
(display (G_ "
-m, --manifest=FILE create environment with the manifest from FILE"))
+ (display (G_ "
+ -p, --profile=PATH create environment from profile at PATH"))
(display (G_ "
--ad-hoc include all specified packages in the environment instead
of only their inputs"))
@@ -269,6 +272,10 @@ use '--preserve' instead~%"))
(option '(#\P "link-profile") #f #f
(lambda (opt name arg result)
(alist-cons 'link-profile? #t result)))
+ (option '(#\p "profile") #t #f
+ (lambda (opt name arg result)
+ (alist-cons 'profile arg
+ (alist-delete 'profile result eq?))))
(option '(#\u "user") #t #f
(lambda (opt name arg result)
(alist-cons 'user arg
@@ -706,6 +713,7 @@ message if any test fails."
(user (assoc-ref opts 'user))
(bootstrap? (assoc-ref opts 'bootstrap?))
(system (assoc-ref opts 'system))
+ (profile (assoc-ref opts 'profile))
(command (or (assoc-ref opts 'exec)
;; Spawn a shell if the user didn't specify
;; anything in particular.
@@ -735,8 +743,15 @@ message if any test fails."
#:dry-run?
(assoc-ref opts 'dry-run?))
(with-status-verbosity (assoc-ref opts 'verbosity)
- (define manifest
+ (define manifest-from-opts
(options/resolve-packages store opts))
+ (when (and profile (> (length (manifest-entries manifest-from-opts)) 0))
+ (leave (G_ "'--profile' cannot be used with package options~%")))
+
+ (define manifest
+ (if profile
+ (profile-manifest profile)
+ manifest-from-opts))
(set-build-options-from-command-line store opts)
@@ -755,7 +770,9 @@ message if any test fails."
system))
(prof-drv (manifest->derivation
manifest system bootstrap?))
- (profile -> (derivation->output-path prof-drv))
+ (profile -> (if profile
+ (readlink* profile)
+ (derivation->output-path prof-drv)))
(gc-root -> (assoc-ref opts 'gc-root)))
;; First build the inputs. This is necessary even for
--
2.26.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* bug#46291: [PATCH] environment: Allow starting from existing profile
2021-02-04 10:13 [bug#46291] [PATCH] environment: Allow starting from existing profile Lars-Dominik Braun
@ 2021-02-11 10:01 ` 宋文武
0 siblings, 0 replies; 2+ messages in thread
From: 宋文武 @ 2021-02-11 10:01 UTC (permalink / raw)
To: Lars-Dominik Braun; +Cc: 46291-done
Lars-Dominik Braun <lars@6xq.net> writes:
> Hi everyone,
>
> the attched patch allows starting a `guix environment` from an existing
> profile. Our use-case is this: We have profiles, created by
>
> guix package -p /path -i &
>
> because we need to parse desktop files in /path/share/applications. Also
> this does the heavy-lifting (substitutes/building/grafting) upfront once
> and not when starting an environment. Then we start an application from
> this profile using
>
> guix environment -C [&] -p /path -- jupyterlab [&]
>
> This is much faster (10x) for large profiles (i.e. JupyterLab) than
>
> guix environment -C [&] -m manifest.scm -- jupyterlab [&]
>
> and makes sure the environment is exactly the same as
>
> source /path/etc/profile
>
> I think there have been many discussions about how `guix environment`
> should work and this is certainly not the silver bullet, but it.s a huge
> improvement for us with very limited code changes required.
Look excellent to me, pushed, thank you!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-02-11 10:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-04 10:13 [bug#46291] [PATCH] environment: Allow starting from existing profile Lars-Dominik Braun
2021-02-11 10:01 ` bug#46291: " 宋文武
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.