diff options
| author | Marius Bakke <marius@gnu.org> | 2021-10-14 00:01:12 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-10-14 00:01:12 +0200 |
| commit | 0f77e50139b023cb1a5a82ac3a0b9b7fa990c45b (patch) | |
| tree | 8796bb011e021bf01fe5cb15c70641ee0c0ed5f0 /guix | |
| parent | 641b31de5e9716ff8bd088f4834c98d4a664b55a (diff) | |
| parent | 1961b28445080c7b9fb8bf5291ac9a814303522a (diff) | |
Merge branch 'master' into core-updates-frozen
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/self.scm | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/guix/self.scm b/guix/self.scm index 61ff423086..a0d448742a 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -968,13 +968,32 @@ itself." #:extensions dependencies #:guile-for-build guile-for-build)) + (define *core-cli-modules* + ;; Core command-line interface modules that do not depend on (gnu system + ;; …) or (gnu home …), and not even on *PACKAGE-MODULES*. + (scheme-node "guix-cli-core" + (remove (match-lambda + (('guix 'scripts 'system . _) #t) + (('guix 'scripts 'environment) #t) + (('guix 'scripts 'container . _) #t) + (('guix 'scripts 'deploy) #t) + (('guix 'scripts 'home . _) #t) + (('guix 'scripts 'import . _) #t) + (('guix 'pack) #t) + (_ #f)) + (scheme-modules* source "guix/scripts")) + (list *core-modules* *extra-modules* + *core-package-modules*) + #:extensions dependencies + #:guile-for-build guile-for-build)) + (define *cli-modules* (scheme-node "guix-cli" (append (scheme-modules* source "/guix/scripts") `((gnu ci))) (list *core-modules* *extra-modules* *core-package-modules* *package-modules* - *system-modules* *home-modules*) + *core-cli-modules* *system-modules* *home-modules*) #:extensions dependencies #:guile-for-build guile-for-build)) @@ -1020,6 +1039,7 @@ itself." ;; comes with *CORE-MODULES*. (list *config* *cli-modules* + *core-cli-modules* *system-test-modules* *system-modules* *home-modules* |