me
/
guix
Archived
1
0
Fork 0
Code

self: Restructure accessing packages. 

Both for consistency (always use specification->package as defined in this
module) and so that all the packages that are used can be accessed (which
comes in useful when applying grafts).

* guix/self.scm (%packages): New variable.
(specification->package): Use %packages.
(locale-data, translate-texi-manuals, info-manual, guix-command,
compiled-guix): Use specification->package.

Signed-off-by: Christopher Baines <mail@cbaines.net>
master
Christopher Baines 2023-02-28 15:47:02 +00:00
parent 095754ea88
commit e5c33837cb
No known key found for this signature in database
GPG Key ID: 5E28A33B0B84F577
1 changed files with 48 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
guix/self.scm
View File

@ -43,34 +43,42 @@
;;; Dependency handling. ;;; Dependency handling.
;;; ;;;
(define specification->package (define %packages
(let ((ref (lambda (module variable)
(delay
(module-ref (resolve-interface
`(gnu packages ,module))
variable)))))
`(("guile" . ,(ref 'guile 'guile-3.0-latest))
("guile-avahi" . ,(ref 'guile-xyz 'guile-avahi))
("guile-json" . ,(ref 'guile 'guile-json-4))
("guile-ssh" . ,(ref 'ssh 'guile-ssh))
("guile-git" . ,(ref 'guile 'guile-git))
("guile-semver" . ,(ref 'guile-xyz 'guile-semver))
("guile-lib" . ,(ref 'guile-xyz 'guile-lib))
("guile-sqlite3" . ,(ref 'guile 'guile-sqlite3))
("guile-zlib" . ,(ref 'guile 'guile-zlib))
("guile-lzlib" . ,(ref 'guile 'guile-lzlib))
("guile-zstd" . ,(ref 'guile 'guile-zstd))
("guile-gcrypt" . ,(ref 'gnupg 'guile-gcrypt))
("guile-gnutls" . ,(ref 'tls 'guile-gnutls))
("guix-daemon" . ,(ref 'package-management 'guix-daemon))
("disarchive" . ,(ref 'backup 'disarchive))
("guile-lzma" . ,(ref 'guile 'guile-lzma))
("gzip" . ,(ref 'compression 'gzip))
("bzip2" . ,(ref 'compression 'bzip2))
("xz" . ,(ref 'compression 'xz))
("po4a" . ,(ref 'gettext 'po4a))
("gettext-minimal" . ,(ref 'gettext 'gettext-minimal))
("gcc-toolchain" . ,(ref 'commencement 'gcc-toolchain))
("glibc-utf8-locales" . ,(ref 'base 'glibc-utf8-locales))
("graphviz" . ,(ref 'graphviz 'graphviz))
("texinfo" . ,(ref 'texinfo 'texinfo)))))
(define (specification->package name)
;; Use our own variant of that procedure because that of (gnu packages) ;; Use our own variant of that procedure because that of (gnu packages)
;; would traverse all the .scm files, which is wasteful. ;; would traverse all the .scm files, which is wasteful.
(let ((ref (lambda (module variable) (and=> (assoc-ref %packages name) force))
(module-ref (resolve-interface module) variable))))
(match-lambda
("guile" (ref '(gnu packages guile) 'guile-3.0-latest))
("guile-avahi" (ref '(gnu packages guile-xyz) 'guile-avahi))
("guile-json" (ref '(gnu packages guile) 'guile-json-4))
("guile-ssh" (ref '(gnu packages ssh) 'guile-ssh))
("guile-git" (ref '(gnu packages guile) 'guile-git))
("guile-semver" (ref '(gnu packages guile-xyz) 'guile-semver))
("guile-lib" (ref '(gnu packages guile-xyz) 'guile-lib))
("guile-sqlite3" (ref '(gnu packages guile) 'guile-sqlite3))
("guile-zlib" (ref '(gnu packages guile) 'guile-zlib))
("guile-lzlib" (ref '(gnu packages guile) 'guile-lzlib))
("guile-zstd" (ref '(gnu packages guile) 'guile-zstd))
("guile-gcrypt" (ref '(gnu packages gnupg) 'guile-gcrypt))
("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))
("bzip2" (ref '(gnu packages compression) 'bzip2))
("xz" (ref '(gnu packages compression) 'xz))
("po4a" (ref '(gnu packages gettext) 'po4a))
("gettext" (ref '(gnu packages gettext) 'gettext-minimal))
("gcc-toolchain" (ref '(gnu packages commencement) 'gcc-toolchain))
(_ #f)))) ;no such package
;;; ;;;
@ -239,9 +247,8 @@ record with the new file name."
#:optional (directory domain)) #:optional (directory domain))
"Return the locale data from 'po/DIRECTORY' in SOURCE, corresponding to "Return the locale data from 'po/DIRECTORY' in SOURCE, corresponding to
DOMAIN, a gettext domain." DOMAIN, a gettext domain."
(define gettext (define gettext-minimal
(module-ref (resolve-interface '(gnu packages gettext)) (specification->package "gettext-minimal"))
'gettext-minimal))
(define build (define build
(with-imported-modules '((guix build utils)) (with-imported-modules '((guix build utils))
@ -257,7 +264,7 @@ DOMAIN, a gettext domain."
(let ((gmo (string-append #$output "/" language "/LC_MESSAGES/" (let ((gmo (string-append #$output "/" language "/LC_MESSAGES/"
#$domain ".mo"))) #$domain ".mo")))
(mkdir-p (dirname gmo)) (mkdir-p (dirname gmo))
(invoke #+(file-append gettext "/bin/msgfmt") (invoke #+(file-append gettext-minimal "/bin/msgfmt")
"-c" "--statistics" "--verbose" "-c" "--statistics" "--verbose"
"-o" gmo "-o" gmo
(string-append po-directory "/" language ".po")))) (string-append po-directory "/" language ".po"))))
@ -279,20 +286,19 @@ DOMAIN, a gettext domain."
"Return the translated texinfo manuals built from SOURCE." "Return the translated texinfo manuals built from SOURCE."
(define po4a (define po4a
(specification->package "po4a")) (specification->package "po4a"))
(define gettext (define gettext-minimal
(specification->package "gettext")) (specification->package "gettext-minimal"))
(define glibc-utf8-locales (define glibc-utf8-locales
(module-ref (resolve-interface '(gnu packages base)) (specification->package "glibc-utf8-locales"))
'glibc-utf8-locales))
(define documentation (define documentation
(file-append* source "doc")) (file-append* source "doc"))
(define documentation-po (define documentation-po
(file-append* source "po/doc")) (file-append* source "po/doc"))
(define build (define build
(with-imported-modules '((guix build utils) (guix build po)) (with-imported-modules '((guix build utils) (guix build po))
#~(begin #~(begin
@ -364,7 +370,7 @@ a list of extra files, such as '(\"contributing\")."
(setenv "GUIX_LOCPATH" (setenv "GUIX_LOCPATH"
#+(file-append glibc-utf8-locales "/lib/locale")) #+(file-append glibc-utf8-locales "/lib/locale"))
(setenv "PATH" #+(file-append gettext "/bin")) (setenv "PATH" #+(file-append gettext-minimal "/bin"))
(setenv "LC_ALL" "en_US.UTF-8") (setenv "LC_ALL" "en_US.UTF-8")
(setlocale LC_ALL "en_US.UTF-8") (setlocale LC_ALL "en_US.UTF-8")
@ -393,16 +399,13 @@ a list of extra files, such as '(\"contributing\")."
(define (info-manual source) (define (info-manual source)
"Return the Info manual built from SOURCE." "Return the Info manual built from SOURCE."
(define texinfo (define texinfo
(module-ref (resolve-interface '(gnu packages texinfo)) (specification->package "texinfo"))
'texinfo))
(define graphviz (define graphviz
(module-ref (resolve-interface '(gnu packages graphviz)) (specification->package "graphviz"))
'graphviz))
(define glibc-utf8-locales (define glibc-utf8-locales
(module-ref (resolve-interface '(gnu packages base)) (specification->package "glibc-utf8-locales"))
'glibc-utf8-locales))
(define documentation (define documentation
(file-append* source "doc")) (file-append* source "doc"))
@ -585,8 +588,7 @@ instead of 'C'."
"Return the 'guix' command such that it adds MODULES and DEPENDENCIES in its "Return the 'guix' command such that it adds MODULES and DEPENDENCIES in its
load path." load path."
(define glibc-utf8-locales (define glibc-utf8-locales
(module-ref (resolve-interface '(gnu packages base)) (specification->package "glibc-utf8-locales"))
'glibc-utf8-locales))
(define module-directory (define module-directory
;; To minimize the number of 'stat' calls needed to locate a module, ;; To minimize the number of 'stat' calls needed to locate a module,
@ -1029,10 +1031,7 @@ itself."
;; Include 'guix-daemon'. XXX: Here we inject an ;; Include 'guix-daemon'. XXX: Here we inject an
;; older snapshot of guix-daemon, but that's a good ;; older snapshot of guix-daemon, but that's a good
;; enough approximation for now. ;; enough approximation for now.
#:daemon (module-ref (resolve-interface #:daemon (specification->package "guix-daemon")
'(gnu packages
package-management))
'guix-daemon)
#:info (info-manual source) #:info (info-manual source)
#:miscellany (miscellaneous-files source) #:miscellany (miscellaneous-files source)