diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2023-01-30 11:33:18 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2023-01-30 12:39:40 +0200 |
| commit | 4cf1acc7f3033b50b0bf19e02c9f522d522d338c (patch) | |
| tree | 9fd64956ee60304c15387eb394cd649e49f01467 /guix/self.scm | |
| parent | edb8c09addd186d9538d43b12af74d6c7aeea082 (diff) | |
| parent | 595b53b74e3ef57a1c0c96108ba86d38a170a241 (diff) | |
Merge remote-tracking branch 'origin/master' into core-updates
Conflicts:
doc/guix.texi
gnu/local.mk
gnu/packages/admin.scm
gnu/packages/base.scm
gnu/packages/chromium.scm
gnu/packages/compression.scm
gnu/packages/databases.scm
gnu/packages/diffoscope.scm
gnu/packages/freedesktop.scm
gnu/packages/gnome.scm
gnu/packages/gnupg.scm
gnu/packages/guile.scm
gnu/packages/inkscape.scm
gnu/packages/llvm.scm
gnu/packages/openldap.scm
gnu/packages/pciutils.scm
gnu/packages/ruby.scm
gnu/packages/samba.scm
gnu/packages/sqlite.scm
gnu/packages/statistics.scm
gnu/packages/syndication.scm
gnu/packages/tex.scm
gnu/packages/tls.scm
gnu/packages/version-control.scm
gnu/packages/xml.scm
guix/build-system/copy.scm
guix/scripts/home.scm
Diffstat (limited to 'guix/self.scm')
| -rw-r--r-- | guix/self.scm | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/guix/self.scm b/guix/self.scm index fc80e78804..93019e1c64 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -62,7 +62,7 @@ ("guile-lzlib" (ref '(gnu packages guile) 'guile-lzlib)) ("guile-zstd" (ref '(gnu packages guile) 'guile-zstd)) ("guile-gcrypt" (ref '(gnu packages gnupg) 'guile-gcrypt)) - ("gnutls" (ref '(gnu packages tls) 'gnutls)) + ("guile-gnutls" (ref '(gnu packages tls) 'guile-gnutls)) ("disarchive" (ref '(gnu packages backup) 'disarchive)) ("guile-lzma" (ref '(gnu packages guile) 'guile-lzma)) ("gzip" (ref '(gnu packages compression) 'gzip)) @@ -787,8 +787,8 @@ itself." (define guile-semver (specification->package "guile-semver")) - (define gnutls - (specification->package "gnutls")) + (define guile-gnutls + (specification->package "guile-gnutls")) (define disarchive (specification->package "disarchive")) @@ -798,7 +798,7 @@ itself." (define dependencies (append-map transitive-package-dependencies - (list guile-gcrypt gnutls guile-git guile-avahi + (list guile-gcrypt guile-gnutls guile-git guile-avahi guile-json guile-semver guile-ssh guile-sqlite3 guile-lib guile-zlib guile-lzlib guile-zstd))) @@ -1090,6 +1090,12 @@ itself." (scheme-file "config.scm" #~(;; The following expressions get spliced. (#$defmod (guix config) + + ;; Mark it as non-declarative to prevent cross-module + ;; inlining that could lead to inlining %GUIX-VERSION in + ;; (guix ui). + #:declarative? #f + #:export (%guix-package-name %guix-version %guix-bug-report-address |