diff options
| author | Marius Bakke <marius@gnu.org> | 2021-08-12 00:30:27 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-08-12 00:30:27 +0200 |
| commit | c4133c43c7cfe2476ebfae87f9e4d10d96de9bc7 (patch) | |
| tree | 47bd773d2f434384b54e56916c1a287dd8e51511 /guix/self.scm | |
| parent | ffa01e68859bb7a6daa9fcffdc8d77ca35db4bc0 (diff) | |
| parent | 4eb0a5146ae5a195a29c79f586fcc1e58f7fa69b (diff) | |
| download | guix-patches-c4133c43c7cfe2476ebfae87f9e4d10d96de9bc7.tar guix-patches-c4133c43c7cfe2476ebfae87f9e4d10d96de9bc7.tar.gz | |
Merge branch 'master' into core-updates-frozen
Conflicts:
gnu/packages/algebra.scm
gnu/packages/games.scm
gnu/packages/golang.scm
gnu/packages/kerberos.scm
gnu/packages/mail.scm
gnu/packages/python.scm
gnu/packages/ruby.scm
gnu/packages/scheme.scm
gnu/packages/tex.scm
gnu/packages/tls.scm
gnu/packages/version-control.scm
Diffstat (limited to 'guix/self.scm')
| -rw-r--r-- | guix/self.scm | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/guix/self.scm b/guix/self.scm index 530632db7d..79d93357a2 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -872,7 +872,9 @@ itself." ;; rebuilt when the version changes, which in turn means we ;; can have substitutes for it. #:extra-modules - `(((guix config) => ,(make-config.scm))) + `(((guix config) + => ,(make-config.scm + #:config-variables %default-config-variables))) ;; (guix man-db) is needed at build-time by (guix profiles) ;; but we don't need to compile it; not compiling it allows @@ -974,6 +976,8 @@ itself." (list *core-package-modules* *package-modules* *extra-modules* *system-modules* *core-modules* *cli-modules*) ;for (guix scripts pack), etc. + #:extra-files (file-imports source "gnu/tests/data" + (const #t)) #:extensions dependencies #:guile-for-build guile-for-build)) @@ -1082,10 +1086,17 @@ itself." (variables rest ...)))))) (variables %localstatedir %storedir %sysconfdir))) +(define %default-config-variables + ;; Default values of the configuration variables above. + `((%localstatedir . "/var") + (%storedir . "/gnu/store") + (%sysconfdir . "/etc"))) + (define* (make-config.scm #:key gzip xz bzip2 (package-name "GNU Guix") (package-version "0") (channel-metadata #f) + (config-variables %config-variables) (bug-report-address "bug-guix@gnu.org") (home-page-url "https://guix.gnu.org")) @@ -1115,7 +1126,7 @@ itself." #$@(map (match-lambda ((name . value) #~(define-public #$name #$value))) - %config-variables) + config-variables) (define %store-directory (or (and=> (getenv "NIX_STORE_DIR") canonicalize-path) |