diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2022-06-22 18:48:00 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2022-06-22 18:48:00 +0200 |
| commit | 8655a714457dbf1cde45979507012d9515614028 (patch) | |
| tree | 7712625328f45794ccda9baa730a4825bb2efb47 /guix/scripts/shell.scm | |
| parent | a589049e141588ebcf4079116e378d60b779f6b4 (diff) | |
| parent | 2af3f5eef045f7d177cc394c89be069bac895688 (diff) | |
Merge branch master into core-updates
Diffstat (limited to 'guix/scripts/shell.scm')
| -rw-r--r-- | guix/scripts/shell.scm | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/guix/scripts/shell.scm b/guix/scripts/shell.scm index 1a6df98829..004ed7af2e 100644 --- a/guix/scripts/shell.scm +++ b/guix/scripts/shell.scm @@ -256,6 +256,7 @@ Return the modified OPTS." ((('package . _) . _) #t) ((('load . _) . _) #t) ((('manifest . _) . _) #t) + ((('profile . _) . _) #t) ((('expression . _) . _) #t) ((_ . rest) (options-contain-payload? rest)))) @@ -465,6 +466,8 @@ concatenates MANIFESTS, a list of expressions." (filter-map (match-lambda (('manifest . file) (load-manifest file)) + (('profile . file) + (profile-manifest file)) (_ #f)) opts))))) (display (G_ "\ |