me/guix
Archived
1
0
Fork 0
Code Activity

Merge branch 'master' into staging

Browse source
This commit is contained in:
Marius Bakke 2022-11-20 21:09:53 +01:00
commit c37a426038
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
33 changed files with 724 additions and 322 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnu/local.mk
View file

@ -1587,6 +1587,7 @@ dist_patch_DATA = \
%D%/packages/patches/nvi-dbpagesize-binpower.patch \ %D%/packages/patches/nvi-dbpagesize-binpower.patch \
%D%/packages/patches/nvi-db4.patch \ %D%/packages/patches/nvi-db4.patch \
%D%/packages/patches/nyacc-binary-literals.patch \ %D%/packages/patches/nyacc-binary-literals.patch \
%D%/packages/patches/oath-toolkit-xmlsec-compat.patch \
%D%/packages/patches/obs-modules-location.patch \ %D%/packages/patches/obs-modules-location.patch \
%D%/packages/patches/ocaml-dose3-add-unix-dependency.patch \ %D%/packages/patches/ocaml-dose3-add-unix-dependency.patch \
%D%/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch \ %D%/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch \

2
gnu/packages/admin.scm
View file

@ -2872,7 +2872,7 @@ sys.argv[0] = re.sub(r'\\.([^/]*)-real$', r'\\1', sys.argv[0])
(list openssh (list openssh
openssl openssl
python-mock python-mock
python-pycrypto python-pycryptodome
python-pytest python-pytest
python-pytest-forked python-pytest-forked
python-pytest-mock python-pytest-mock

5
gnu/packages/assembly.scm
View file

@ -12,6 +12,7 @@
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2022 Felix Gruber <felgru@posteo.net> ;;; Copyright © 2022 Felix Gruber <felgru@posteo.net>
;;; Copyright © 2022 Andy Tai <atai@atai.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -132,14 +133,14 @@ debugging information in STABS, DWARF 2, and CodeView 8 formats.")
(define-public lightning (define-public lightning
(package (package
(name "lightning") (name "lightning")
(version "2.1.3") (version "2.2.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/lightning/lightning-" (uri (string-append "mirror://gnu/lightning/lightning-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1jgxbq2cm51dzi3zhz38mmgwdcgs328mfl8iviw8dxn6dn36p1gd")))) "03kwvn00qggys203vpzb2kq2asy0ql7x84ajk05a62yg3kzq8faf"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (list zlib)) (native-inputs (list zlib))
(arguments (arguments

2
gnu/packages/audio.scm
View file

@ -3111,6 +3111,8 @@ including air absorption, occlusion, and environmental reverb, are available
through the EFX extension. It also facilitates streaming audio, multi-channel through the EFX extension. It also facilitates streaming audio, multi-channel
buffers, and audio capture.") buffers, and audio capture.")
(home-page "https://openal-soft.org/") (home-page "https://openal-soft.org/")
(properties
'((upstream-name . "openal-soft")))
(license license:lgpl2.0+))) (license license:lgpl2.0+)))
(define-public freealut (define-public freealut

1
gnu/packages/authentication.scm
View file

@ -43,6 +43,7 @@
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.savannah.nongnu.org/releases/" (uri (string-append "https://download.savannah.nongnu.org/releases/"
name "/" name "-" version ".tar.gz")) name "/" name "-" version ".tar.gz"))
(patches (search-patches "oath-toolkit-xmlsec-compat.patch"))
(sha256 (sha256
(base32 "1aa620k05lsw3l3slkp2mzma40q3p9wginspn9zk8digiz7dzv9n")))) (base32 "1aa620k05lsw3l3slkp2mzma40q3p9wginspn9zk8digiz7dzv9n"))))
(build-system gnu-build-system) (build-system gnu-build-system)

2
gnu/packages/configuration-management.scm
View file

@ -76,7 +76,7 @@
go-github-com-muesli-reflow-padding go-github-com-muesli-reflow-padding
go-github-com-muesli-termenv go-github-com-muesli-termenv
go-github-com-google-goterm go-github-com-google-goterm
go-golang-org-colorful go-github-com-lucasb-eyer-go-colorful
go-github-com-mattn-go-isatty go-github-com-mattn-go-isatty
go-github.com-mattn-go-runewidth go-github.com-mattn-go-runewidth
go-github-com-olekukonko-tablewriter go-github-com-olekukonko-tablewriter

31
gnu/packages/databases.scm
View file

@ -1222,17 +1222,17 @@ and high-availability (HA).")
(license license:gpl2))) ;'COPYING' says "version 2" only (license license:gpl2))) ;'COPYING' says "version 2" only
;; Don't forget to update the other postgresql packages when upgrading this one. ;; Don't forget to update the other postgresql packages when upgrading this one.
(define-public postgresql-14 (define-public postgresql-15
(package (package
(name "postgresql") (name "postgresql")
(version "14.4") (version "15.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://ftp.postgresql.org/pub/source/v" (uri (string-append "https://ftp.postgresql.org/pub/source/v"
version "/postgresql-" version ".tar.bz2")) version "/postgresql-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"0slg7ld5mldmv3pn1wxxwglm4s3xc6c91ixx24apj713qlvn4fy2")) "1bi19sqmri569hyjvbk8grlws7f5dalsqz87wkgx1yjafcyz5zb4"))
(patches (search-patches "postgresql-disable-resolve_symlinks.patch")))) (patches (search-patches "postgresql-disable-resolve_symlinks.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
@ -1284,30 +1284,43 @@ TIMESTAMP. It also supports storage of binary large objects, including
pictures, sounds, or video.") pictures, sounds, or video.")
(license (license:x11-style "file://COPYRIGHT")))) (license (license:x11-style "file://COPYRIGHT"))))
(define-public postgresql-14
(package
(inherit postgresql-15)
(name "postgresql")
(version "14.4")
(source (origin
(inherit (package-source postgresql-15))
(uri (string-append "https://ftp.postgresql.org/pub/source/v"
version "/postgresql-" version ".tar.bz2"))
(sha256
(base32
"0slg7ld5mldmv3pn1wxxwglm4s3xc6c91ixx24apj713qlvn4fy2"))))))
(define-public postgresql-13 (define-public postgresql-13
(package (package
(inherit postgresql-14) (inherit postgresql-14)
(version "13.6") (version "13.9")
(source (origin (source (origin
(inherit (package-source postgresql-14)) (inherit (package-source postgresql-14))
(uri (string-append "https://ftp.postgresql.org/pub/source/v" (uri (string-append "https://ftp.postgresql.org/pub/source/v"
version "/postgresql-" version ".tar.bz2")) version "/postgresql-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"1z37ix80hb2bqa2smh1hbj9r507ypnl3pil43gkqznnlv6ipzz5s")))))) "05d46dzkya6s0qbaxvksc5j12syb514q5lha6z9vx7z4lp06c6gg"))))))
(define-public postgresql-11 (define-public postgresql-11
(package (package
(inherit postgresql-13) (inherit postgresql-13)
(name "postgresql") (name "postgresql")
(version "11.16") (version "11.18")
(source (origin (source (origin
(inherit (package-source postgresql-13)) (inherit (package-source postgresql-13))
(uri (string-append "https://ftp.postgresql.org/pub/source/v" (uri (string-append "https://ftp.postgresql.org/pub/source/v"
version "/postgresql-" version ".tar.bz2")) version "/postgresql-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"1983a7y4y6zhbgh0qcdfkf99445j1zm5q1ncrbkrx555y08y3n9d")))) "013m1x53qfxcry7l033ahhxjc3lflb7fj8fapk7qm49fqppj0kyj"))))
(native-inputs (native-inputs
(modify-inputs (package-native-inputs postgresql-13) (modify-inputs (package-native-inputs postgresql-13)
(replace "docbook-xml" docbook-xml-4.2))))) (replace "docbook-xml" docbook-xml-4.2)))))
@ -1315,14 +1328,14 @@ pictures, sounds, or video.")
(define-public postgresql-10 (define-public postgresql-10
(package (package
(inherit postgresql-11) (inherit postgresql-11)
(version "10.21") (version "10.23")
(source (origin (source (origin
(inherit (package-source postgresql-11)) (inherit (package-source postgresql-11))
(uri (string-append "https://ftp.postgresql.org/pub/source/v" (uri (string-append "https://ftp.postgresql.org/pub/source/v"
version "/postgresql-" version ".tar.bz2")) version "/postgresql-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"1la5dx4hhy5yaznwk9gwdsymih3sd23fyhh6spssdaajdn2rh8fk")))) "1sgfssjc9lnzijhn108r6z26fri655k413f1c9b8wibjhd9b594l"))))
(native-inputs (native-inputs
(modify-inputs (package-native-inputs postgresql-11) (modify-inputs (package-native-inputs postgresql-11)
(append opensp docbook-sgml-4.2) (append opensp docbook-sgml-4.2)

21
gnu/packages/ebook.scm
View file

@ -386,34 +386,35 @@ accessing and converting various ebook file formats.")
(package (package
(name "inkbox") (name "inkbox")
(version "1.7") (version "1.7")
(home-page "https://github.com/Kobo-InkBox/inkbox")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (uri
(git-reference (git-reference
(url "https://alpinekobox.ddns.net/InkBox/inkbox/") (url home-page)
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "126cqn0ixcn608lv2hd9f7zmzj4g448bnpxc7wv9cvg83qqajh5n")))) (base32 "126cqn0ixcn608lv2hd9f7zmzj4g448bnpxc7wv9cvg83qqajh5n"))))
(build-system qt-build-system) (build-system qt-build-system)
(arguments (arguments
'(#:tests? #f ; no test suite (list
#:make-flags #:tests? #f ; no test suite
(list (string-append "PREFIX=" #:make-flags
(assoc-ref %outputs "out"))) #~(list (string-append "PREFIX=" #$output))
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'prefix-opt (add-after 'unpack 'prefix-opt
(lambda* (#:key outputs #:allow-other-keys) (lambda _
(substitute* "inkbox.pro" (substitute* "inkbox.pro"
(("/opt/\\$\\$\\{TARGET\\}") (string-append (assoc-ref outputs "out")))))) (("/opt/\\$\\$\\{TARGET\\}")
#$output))))
(replace 'configure (replace 'configure
(lambda* (#:key make-flags #:allow-other-keys) (lambda* (#:key make-flags #:allow-other-keys)
(apply invoke (cons "qmake" make-flags))))))) (apply invoke (cons "qmake" make-flags)))))))
(native-inputs (native-inputs
(list qtbase-5)) (list qtbase-5))
(home-page "https://alpinekobox.ddns.net/InkBox/inkbox/")
(synopsis "EBook reader") (synopsis "EBook reader")
(description "This package provides InkBox eBook reader.") (description "This package provides InkBox eBook reader.")
(license license:gpl3))) (license license:gpl3)))

19
gnu/packages/game-development.scm
View file

@ -380,9 +380,10 @@ PCM data.")
(substitute* (find-files "." "^Makefile\\.in$") (substitute* (find-files "." "^Makefile\\.in$")
(("-Werror") "")) (("-Werror") ""))
#t))))) #t)))))
(native-inputs `(("pkgconfig" ,pkg-config))) (native-inputs (list pkg-config))
(inputs (list bdb (inputs (list bdb
glib glib
gmp
guile-3.0 guile-3.0
libmicrohttpd libmicrohttpd
ncurses ncurses
@ -2444,12 +2445,20 @@ computer games, 3D authoring tools and simulation tools.")
(commit (string-append "Chipmunk-" version)))) (commit (string-append "Chipmunk-" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1qmkn01g06p3rnhmbyffmjns6wj5vhgf9cscigk3wzxcpwv1hyxb")))) (base32 "1qmkn01g06p3rnhmbyffmjns6wj5vhgf9cscigk3wzxcpwv1hyxb"))
(modules '((guix build utils)))
(snippet
#~(begin
;; This is fixed in the upstream repository but the fix
;; has not been released.
(substitute* "src/cpHastySpace.c"
(("#include <sys/sysctl.h>") ""))))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f ;no test (list #:tests? #f ;no test
#:configure-flags '("-DBUILD_STATIC=OFF" #:configure-flags
"-DBUILD_DEMOS=OFF"))) #~(list "-DBUILD_STATIC=OFF"
"-DBUILD_DEMOS=OFF")))
(inputs (inputs
(list freeglut libxmu libxrandr)) (list freeglut libxmu libxrandr))
(home-page "https://chipmunk-physics.net/") (home-page "https://chipmunk-physics.net/")

2
gnu/packages/games.scm
View file

@ -828,7 +828,7 @@ possible, while battling many vicious aliens.")
(home-page "https://github.com/vattam/BSDGames") (home-page "https://github.com/vattam/BSDGames")
(synopsis "Collection of the old text-based games and amusements") (synopsis "Collection of the old text-based games and amusements")
(description (description
"These are the BSD games. See the fortune-mod package for fortunes. "These are the BSD games.
Action: atc (keep the airplanes safe), hack (explore the dangerous Dungeon), Action: atc (keep the airplanes safe), hack (explore the dangerous Dungeon),
hunt (kill the others for the Pair of Boots, multi-player only), robots (avoid hunt (kill the others for the Pair of Boots, multi-player only), robots (avoid

164
gnu/packages/golang.scm
View file

@ -5894,9 +5894,9 @@ without requiring a real database connection.")
golang's database/sql package.") golang's database/sql package.")
(license license:mpl2.0))) (license license:mpl2.0)))
(define-public go-golang-org-colorful (define-public go-github-com-lucasb-eyer-go-colorful
(package (package
(name "go-golang-org-colorful") (name "go-github-com-lucasb-eyer-go-colorful")
(version "1.2.0") (version "1.2.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
@ -5908,17 +5908,20 @@ golang's database/sql package.")
(base32 (base32
"08c3fkf27r16izjjd4w94xd1z7w1r4mdalbl53ms2ka2j465s3qs")))) "08c3fkf27r16izjjd4w94xd1z7w1r4mdalbl53ms2ka2j465s3qs"))))
(build-system go-build-system) (build-system go-build-system)
(propagated-inputs (list go-golang-org-x-image))
(arguments (arguments
'(#:import-path "github.com/lucasb-eyer/go-colorful")) (list #:import-path "github.com/lucasb-eyer/go-colorful"))
(native-inputs
(list go-golang-org-sql-mock))
(synopsis "Convert between colorspaces and generate colors")
(description "This package implements Go's @code{color.Color} interface
and provides a means of converting colors stored as RGB to various
colorspaces.")
(home-page "https://github.com/lucasb-eyer/go-colorful") (home-page "https://github.com/lucasb-eyer/go-colorful")
(synopsis "Library for playing with colors in Go")
(description
"The colorful package provides a library for using colors in Go.
It stores colors in RGB and provides methods for converting these to
various color spaces.")
(license license:expat))) (license license:expat)))
(define-public go-golang-org-colorful
(deprecated-package "go-golang-org-colorful" go-github-com-lucasb-eyer-go-colorful))
(define-public go-github-com-gdamore-encoding (define-public go-github-com-gdamore-encoding
(package (package
(name "go-github-com-gdamore-encoding") (name "go-github-com-gdamore-encoding")
@ -5966,8 +5969,10 @@ non-UTF-friendly sources.")
(arguments (arguments
`(#:import-path "github.com/gdamore/tcell")) `(#:import-path "github.com/gdamore/tcell"))
(inputs (inputs
(list go-github.com-mattn-go-runewidth go-golang-org-colorful (list go-github.com-mattn-go-runewidth
go-golang-org-x-text go-github-com-gdamore-encoding)) go-github-com-lucasb-eyer-go-colorful
go-golang-org-x-text
go-github-com-gdamore-encoding))
(home-page "https://github.com/gdamore/tcell") (home-page "https://github.com/gdamore/tcell")
(synopsis "Provide a cell-based view for text terminals") (synopsis "Provide a cell-based view for text terminals")
(description "This package includes a full parser and expander for (description "This package includes a full parser and expander for
@ -6006,6 +6011,36 @@ systems.")
(modify-inputs (package-inputs go-github-com-gdamore-tcell) (modify-inputs (package-inputs go-github-com-gdamore-tcell)
(prepend go-golang-org-x-term go-golang-org-x-sys))))) (prepend go-golang-org-x-term go-golang-org-x-sys)))))
(define-public go-github-com-rivo-tview
(package
(name "go-github-com-rivo-tview")
(version "0.0.0-20220703182358-a13d901d3386")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rivo/tview")
(commit (go-version->git-ref version))))
(file-name (git-file-name name version))
(sha256
(base32
"0gf1m3ndbc3kgxpv0ryq9a1ahijg6m896sc9k7dvwfjd8vy0q0yd"))))
(build-system go-build-system)
(arguments
(list #:import-path "github.com/rivo/tview"))
(propagated-inputs (list go-golang-org-x-term
go-golang-org-x-sys
go-github-com-rivo-uniseg
go-github-com-mattn-go-runewidth
go-github-com-lucasb-eyer-go-colorful
go-github-com-gdamore-tcell-v2))
(home-page "https://github.com/rivo/tview")
(synopsis "Rich Interactive Widgets for Terminal UIs")
(description
"The tview package implements rich widgets for terminal based user
interfaces. The widgets provided with this package are useful for data
exploration and data entry.")
(license license:expat)))
(define-public go-github-com-xo-terminfo (define-public go-github-com-xo-terminfo
(package (package
(name "go-github-com-xo-terminfo") (name "go-github-com-xo-terminfo")
@ -7716,8 +7751,10 @@ io.Writers helping you to transform blocks of text.")
(arguments (arguments
`(#:import-path "github.com/muesli/termenv")) `(#:import-path "github.com/muesli/termenv"))
(native-inputs (native-inputs
(list go-github-com-google-goterm go-golang-org-colorful (list go-github-com-google-goterm
go-github-com-mattn-go-isatty go-github.com-mattn-go-runewidth)) go-github-com-lucasb-eyer-go-colorful
go-github-com-mattn-go-isatty
go-github.com-mattn-go-runewidth))
(home-page "https://github.com/muesli/termenv/") (home-page "https://github.com/muesli/termenv/")
(synopsis "Advanced styling options on the terminal") (synopsis "Advanced styling options on the terminal")
(description "termenv lets you safely use advanced styling options on the (description "termenv lets you safely use advanced styling options on the
@ -7846,7 +7883,7 @@ which produce colorized output using github.com/fatih/color.")
go-github.com-mattn-go-runewidth go-github.com-mattn-go-runewidth
go-github-com-muesli-termenv go-github-com-muesli-termenv
go-github-com-google-goterm go-github-com-google-goterm
go-golang-org-colorful go-github-com-lucasb-eyer-go-colorful
go-github-com-mattn-go-isatty go-github-com-mattn-go-isatty
go-github-com-olekukonko-tablewriter go-github-com-olekukonko-tablewriter
go-github-com-yuin-goldmark go-github-com-yuin-goldmark
@ -9693,7 +9730,7 @@ string.")
("github.com/mattn/go-runewidth" ,go-github.com-mattn-go-runewidth) ("github.com/mattn/go-runewidth" ,go-github.com-mattn-go-runewidth)
("go-github-com-muesli-reflow-indent" ,go-github-com-muesli-reflow-indent) ("go-github-com-muesli-reflow-indent" ,go-github-com-muesli-reflow-indent)
("go-github-com-muesli-reflow-ansi" ,go-github-com-muesli-reflow-ansi) ("go-github-com-muesli-reflow-ansi" ,go-github-com-muesli-reflow-ansi)
("go-golang-org-colorful" ,go-golang-org-colorful) ("go-github-com-lucasb-eyer-go-colorful" ,go-github-com-lucasb-eyer-go-colorful)
("github.com/containerd/console" ,go-github-com-containerd-console) ("github.com/containerd/console" ,go-github-com-containerd-console)
("go-github-com-muesli-reflow-truncate" ,go-github-com-muesli-reflow-truncate) ("go-github-com-muesli-reflow-truncate" ,go-github-com-muesli-reflow-truncate)
("go-golang-org-x-crypto" ,go-golang-org-x-crypto) ("go-golang-org-x-crypto" ,go-golang-org-x-crypto)
@ -10045,6 +10082,27 @@ pcredential store, Pass, Secret Service, KDE Wallet, Encrypted File.")
(home-page "https://gopkg.in/ini.v1") (home-page "https://gopkg.in/ini.v1")
(license license:asl2.0))) (license license:asl2.0)))
;;; XXX: Since commit bfb61065f05a6eac0cf63b16db43d0c3e864c658, the
;;; canonical name of the ini package is `go-github-com-go-ini-ini`,
;;; not `go-gopkg-in-ini`.
(define-public go-github-com-go-ini-ini
(package
(inherit go-gopkg-in-ini)
(name "go-github-com-go-ini-ini")
(version "1.66.6")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/go-ini/ini")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0kqg13606hnw8f75cb59fsy1m85kiqf3csi2g7q2512avdmaphc9"))))
(arguments
(list #:import-path "github.com/go-ini/ini"))
(propagated-inputs (list go-github-com-stretchr-testify))))
(define-public go-github-com-skratchdot-open-golang (define-public go-github-com-skratchdot-open-golang
(let ((commit "79abb63cd66e41cb1473e26d11ebdcd68b04c8e5") (let ((commit "79abb63cd66e41cb1473e26d11ebdcd68b04c8e5")
(revision "0")) (revision "0"))
@ -10448,7 +10506,7 @@ using shell-style rules for quoting and commenting.")
(lambda* (#:key inputs import-path (lambda* (#:key inputs import-path
#:allow-other-keys) #:allow-other-keys)
(invoke "tar" "xf" (invoke "tar" "xf"
#$notmuch-fixtures "-C" #+notmuch-fixtures "-C"
(string-append "src/" import-path (string-append "src/" import-path
"/fixtures"))))))) "/fixtures")))))))
(inputs (list notmuch)) (inputs (list notmuch))
@ -10459,6 +10517,34 @@ using shell-style rules for quoting and commenting.")
email library.") email library.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public go-github-com-jaytaylor-html2text
(package
(name "go-github-com-jaytaylor-html2text")
(version "0.0.0-20211105163654-bc68cce691ba")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/jaytaylor/html2text")
(commit (go-version->git-ref version))))
(file-name (git-file-name name version))
(sha256
(base32
"12ckgkp8xqgp0fh6019nwp4ssg2k1rv1a67cpk37ian4q5zrvppm"))))
(build-system go-build-system)
(arguments
(list #:import-path "github.com/jaytaylor/html2text"
;; Tests are broken: <https://github.com/jaytaylor/html2text/issues/53>
#:tests? #f))
(propagated-inputs (list go-golang-org-x-net
go-github-com-olekukonko-tablewriter
go-github-com-ssor-bom))
(home-page "https://github.com/jaytaylor/html2text")
(synopsis "Convert HTML emails to text")
(description
"The html2text package converts HTML emails to plain text, allowing
text-only mail clients to display them.")
(license license:expat)))
(define-public go-github-com-creack-pty (define-public go-github-com-creack-pty
(package (package
(name "go-github-com-creack-pty") (name "go-github-com-creack-pty")
@ -10556,6 +10642,52 @@ config, data and cache directories according to the XDG Base Directory
Specification.") Specification.")
(license license:expat))) (license license:expat)))
(define-public go-github-com-ssor-bom
(package
(name "go-github-com-ssor-bom")
(version "0.0.0-20170718123548-6386211fdfcf")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/ssor/bom")
(commit (go-version->git-ref version))))
(file-name (git-file-name name version))
(sha256
(base32
"09g5496ifwqxqclh2iw58plcwcz0sczlnxwqxzwmnl4shdl371ld"))))
(build-system go-build-system)
(arguments
(list #:import-path "github.com/ssor/bom"))
(home-page "https://github.com/ssor/bom")
(synopsis "Cleaning BOMs in Go")
(description
"The bom package provides small tools for cleaning BOMs from a byte
array or reader.")
(license license:expat)))
(define-public go-github-com-gogs-chardet
(package
(name "go-github-com-gogs-chardet")
(version "0.0.0-20211120154057-b7413eaefb8f")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/gogs/chardet")
(commit (go-version->git-ref version))))
(file-name (git-file-name name version))
(sha256
(base32
"12j8q5wc9m4n51v2j2m40nahqdl9bh3hzpdp26clzq91kc2amiz0"))))
(build-system go-build-system)
(arguments
(list #:import-path "github.com/gogs/chardet"))
(home-page "https://github.com/gogs/chardet")
(synopsis "Character set detection for Go")
(description
"The chardet package ports character set detection from
ICU to Go.")
(license license:expat)))
;;; ;;;
;;; Avoid adding new packages to the end of this file. To reduce the chances ;;; Avoid adding new packages to the end of this file. To reduce the chances
;;; of a merge conflict, place them above by existing packages with similar ;;; of a merge conflict, place them above by existing packages with similar

2
gnu/packages/image-viewers.scm
View file

@ -532,7 +532,7 @@ It supports JPEG, PNG and GIF formats.")
'(#:import-path "github.com/eliukblau/pixterm/cmd/pixterm" '(#:import-path "github.com/eliukblau/pixterm/cmd/pixterm"
#:unpack-path "github.com/eliukblau/pixterm")) #:unpack-path "github.com/eliukblau/pixterm"))
(inputs (list go-github-com-disintegration-imaging (inputs (list go-github-com-disintegration-imaging
go-golang-org-colorful go-github-com-lucasb-eyer-go-colorful
go-golang-org-x-crypto go-golang-org-x-crypto
go-golang-org-x-image)) go-golang-org-x-image))
(home-page "https://github.com/eliukblau/pixterm") (home-page "https://github.com/eliukblau/pixterm")

4
gnu/packages/linux.scm
View file

@ -8866,7 +8866,7 @@ tools for managing PipeWire.")
(define-public ell (define-public ell
(package (package
(name "ell") (name "ell")
(version "0.48") (version "0.54")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -8875,7 +8875,7 @@ tools for managing PipeWire.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0lxjizby3zdyhzad5a0gbz4m2pp44jf1j4l1pn18d04rw9mr2gqy")))) "1vsv5ibiyli1cvk32l5avms6ngv6i0jxxqd5vw5kbfcp6ph94brs"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
;; Tests launch dbus-daemon instances that all try to bind to ;; Tests launch dbus-daemon instances that all try to bind to

151
gnu/packages/lisp-xyz.scm
View file

@ -7095,6 +7095,46 @@ the return type of a function.")
;; The tests get stuck indefinitly ;; The tests get stuck indefinitly
'(#:tests? #f)))) '(#:tests? #f))))
(define-public sbcl-simplified-types
(let ((commit "8fd0727a70a9de76289ac62c1567b8d278e7434e")
(revision "0"))
(package
(name "sbcl-simplified-types")
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/marcoheisig/simplified-types")
(commit commit)))
(file-name (git-file-name "cl-simplified-types" version))
(sha256
(base32 "1hdwmn5lz717aj6qdqmfmr3cbjl8l3giwn0fb5ca9pj83cx7fg8y"))))
(build-system asdf-build-system/sbcl)
(inputs
(list sbcl-alexandria
sbcl-introspect-environment
sbcl-trivia))
(home-page "https://github.com/marcoheisig/simplified-types")
(synopsis "Simplify Common Lisp type specifiers")
(description
"Simplified-Types is a library that provides functions for simplifying
Common Lisp type specifiers. The API consists of two functions:
@itemize
@item @code{simplify-type} takes a type specifier and, optionally, an
environment, and returns the corresponding simplified type.
@item @code{simplified-type-of} takes an object and returns the simplified
type of that object.
@end itemize")
(license license:expat))))
(define-public cl-simplified-types
(sbcl-package->cl-source-package sbcl-simplified-types))
(define-public ecl-simplified-types
(sbcl-package->ecl-package sbcl-simplified-types))
(define-public sbcl-typo (define-public sbcl-typo
(let ((commit "0e883490f81edf2a1be4e5b101d1caec78d7853b") (let ((commit "0e883490f81edf2a1be4e5b101d1caec78d7853b")
(revision "0")) (revision "0"))
@ -19164,6 +19204,77 @@ fit together as required by any particular game.")
(define-public cl-trial (define-public cl-trial
(sbcl-package->cl-source-package sbcl-trial)) (sbcl-package->cl-source-package sbcl-trial))
(define-public sbcl-virality
(package
(name "sbcl-virality")
(version "0.3.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/bufferswap/ViralityEngine")
(commit (string-append "v" version))))
(file-name (git-file-name "cl-virality" version))
(sha256
(base32 "0hvjcvyd628jh4if6swk1wrfb9qdlnpk9ax1y3jarr8ms7ghfcdb"))))
(build-system asdf-build-system/sbcl)
(arguments
`(#:asd-systems '("virality"
"vorigin"
"vorigin.test"
"vshadow"
"vumbra"
"vutils")
#:phases (modify-phases %standard-phases
(add-after 'unpack 'delete-examples
(lambda _
;; Don't install the big "examples" directory.
(delete-file-recursively "examples"))))))
(inputs
(list sbcl-3b-bmfont
sbcl-babel
sbcl-cl-cpus
sbcl-cl-graph
sbcl-cl-opengl
sbcl-cl-ppcre
sbcl-cl-slug
sbcl-closer-mop
sbcl-fast-io
sbcl-global-vars
sbcl-glsl-packing
sbcl-jsown
sbcl-lparallel
sbcl-pngload
sbcl-printv
sbcl-queues
sbcl-sdl2
sbcl-serapeum
sbcl-split-sequence
sbcl-static-vectors
sbcl-trivial-features
sbcl-varjo))
(home-page "https://github.com/bufferswap/ViralityEngine")
(synopsis "Component-based game engine written in Common Lisp")
(description
"Virality Engine provides a system and workflow that helps describe the
elements needed to write 2D or 3D games. It was designed with several domain
specific languages that make it easier to describe, manipulate, and use assets
commonly found in game making. Such assets include (but are not limited to)
textures, materials, shader programs, and scene trees of actors that are
available for instantiation. Virality Engine also knows how to accept input
from keyboards and most joysticks and gamepads.
The component system is a hybrid model between an ECS and an object model. The
components are defined similar to CLOS defclass, and regular generic methods
can be used with them. Components are added to Actors which represent game
concepts like players, scenery, effects, etc. We define a component protocol
invoked by Virality Engine to move your components to the next state and
render them each frame.")
(license license:expat)))
(define-public cl-virality
(sbcl-package->cl-source-package sbcl-virality))
(define-public sbcl-cl-liballegro (define-public sbcl-cl-liballegro
(let ((commit "49f632ce97fc4f835bf5d450588793234b980a64") (let ((commit "49f632ce97fc4f835bf5d450588793234b980a64")
(revision "1")) (revision "1"))
@ -20364,6 +20475,46 @@ configuration file format.")
(define-public ecl-clop (define-public ecl-clop
(sbcl-package->ecl-package sbcl-clop)) (sbcl-package->ecl-package sbcl-clop))
(define-public sbcl-pp-toml
(let ((commit "54f7d08c939d18b24363342c98c19b6812d7afb9")
(revision "0"))
(package
(name "sbcl-pp-toml")
(version (git-version "1.0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/pnathan/pp-toml")
(commit commit)))
(file-name (git-file-name "cl-pp-toml" version))
(sha256
(base32 "136d7jzz7l2ck9wwld0ac46jmpm94lvja6m50sy73s232slka2hg"))))
(build-system asdf-build-system/sbcl)
(native-inputs
(list sbcl-fiveam))
(inputs
(list sbcl-alexandria
sbcl-cl-ppcre
sbcl-esrap
sbcl-generic-comparability
sbcl-local-time
sbcl-parse-number
sbcl-split-sequence))
(home-page "https://github.com/pnathan/pp-toml")
(synopsis "TOML parser for Common Lisp")
(description
"PP-TOML is a Common Lisp library for parsing strings in the TOML
configuration file format. It implements only the 0.1.0 specification of
TOML.")
(license license:llgpl))))
(define-public cl-pp-toml
(sbcl-package->cl-source-package sbcl-pp-toml))
(define-public ecl-pp-toml
(sbcl-package->ecl-package sbcl-pp-toml))
(define-public sbcl-linedit (define-public sbcl-linedit
(let ((commit "0561c97dfca2f5854fcc66558a567a9875ddcb8f") (let ((commit "0561c97dfca2f5854fcc66558a567a9875ddcb8f")
(revision "1")) (revision "1"))

10
gnu/packages/music.scm
View file

@ -5558,13 +5558,12 @@ discard bad quality ones.
,(map (lambda (label) ,(map (lambda (label)
(string-append (assoc-ref inputs label) (string-append (assoc-ref inputs label)
"/lib/qt5/plugins")) "/lib/qt5/plugins"))
'("qtbase" "qtmultimedia-5" "qtsvg-5"))) '("qtbase" "qtmultimedia" "qtsvg")))
`("QML2_IMPORT_PATH" ":" prefix `("QML2_IMPORT_PATH" ":" prefix
,(map (lambda (label) ,(map (lambda (label)
(string-append (assoc-ref inputs label) (string-append (assoc-ref inputs label)
"/lib/qt5/qml")) "/lib/qt5/qml"))
'("qtmultimedia-5")))) '("qtmultimedia"))))))))))
#t))))))
(inputs (inputs
(list alsa-lib (list alsa-lib
fftw fftw
@ -5574,10 +5573,7 @@ discard bad quality ones.
qtmultimedia-5 qtmultimedia-5
qtsvg-5)) qtsvg-5))
(native-inputs (native-inputs
`(("gettext" ,gettext-minimal) (list gettext-minimal hicolor-icon-theme itstool qttools-5))
("hicolor-icon-theme" ,hicolor-icon-theme)
("itstool" ,itstool)
("qttools-5" ,qttools-5)))
(synopsis "Musical instrument tuner") (synopsis "Musical instrument tuner")
(description "FMIT is a graphical utility for tuning musical instruments, (description "FMIT is a graphical utility for tuning musical instruments,
with error and volume history, and advanced features.") with error and volume history, and advanced features.")

4
gnu/packages/networking.scm
View file

@ -3856,7 +3856,7 @@ powerful route filtering syntax and an easy-to-use configuration interface.")
(define-public iwd (define-public iwd
(package (package
(name "iwd") (name "iwd")
(version "1.24") (version "2.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -3865,7 +3865,7 @@ powerful route filtering syntax and an easy-to-use configuration interface.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1sdi7008j5jhlg2rqpczh1pzb8zay6mc9dpnjjsmdnsmrcr3v7wi")))) "0icrmd0361yy24sa7wdd388ykaknv1va4678h9ksysz1dmykdr7m"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
(list dbus ell (package-source ell) readline)) (list dbus ell (package-source ell) readline))

79
gnu/packages/patches/oath-toolkit-xmlsec-compat.patch Normal file
View file

@ -0,0 +1,79 @@
Adjust tests for compatibility with newer xmlsec.
Taken from upstream:
https://gitlab.com/oath-toolkit/oath-toolkit/-/commit/0ae59b9c72f69ee21044e736e292b73051df3272
diff --git a/libpskc/examples/pskc-hotp-signed.xml b/libpskc/examples/pskc-hotp-signed.xml
index 359dd4723cf2b5ae1ca53d793cc6900a15bd4969..396e0829ff245b3ad6953cc3523d77568c8a18f4 100644
--- a/libpskc/examples/pskc-hotp-signed.xml
+++ b/libpskc/examples/pskc-hotp-signed.xml
@@ -38,7 +38,8 @@ rIXbwqKhnBP943U4Ch31oEbZtbo+XRbiq11wv6dLNsi76TNGDqsjTKgEcSIYI6Vd
rMxnil6ChoIBvSSPGHhJuj1bW1EPW92JtIa6byrAj1m4RwSviQy2i65YoIdtrhRt
CWekj2zuL/0szv5rZMCCvxioOCA8znqELEPMfs0Aa/cACD2MZcC4gGXehNCvzYJr
TmB6lFpxP6f0g6eO7PVcqYN9NCwECxb5Cvx2j2uNlereY35/9oPR6YJx+V7sL+DB
-n6F0mN8OUAFxDamepKdGRApU8uZ35624o/I4</X509Certificate>
+n6F0mN8OUAFxDamepKdGRApU8uZ35624o/I4
+</X509Certificate>
</X509Data>
</KeyInfo>
</Signature></KeyContainer>
diff --git a/pskctool/tests/pskc-all-signed.xml b/pskctool/tests/pskc-all-signed.xml
index 39cf8af5bb00e34fa5e1acb97cea59ff742758f4..5d44e72d928ccf1f46975e6ccca58297e235be95 100644
--- a/pskctool/tests/pskc-all-signed.xml
+++ b/pskctool/tests/pskc-all-signed.xml
@@ -38,7 +38,8 @@ rIXbwqKhnBP943U4Ch31oEbZtbo+XRbiq11wv6dLNsi76TNGDqsjTKgEcSIYI6Vd
rMxnil6ChoIBvSSPGHhJuj1bW1EPW92JtIa6byrAj1m4RwSviQy2i65YoIdtrhRt
CWekj2zuL/0szv5rZMCCvxioOCA8znqELEPMfs0Aa/cACD2MZcC4gGXehNCvzYJr
TmB6lFpxP6f0g6eO7PVcqYN9NCwECxb5Cvx2j2uNlereY35/9oPR6YJx+V7sL+DB
-n6F0mN8OUAFxDamepKdGRApU8uZ35624o/I4</X509Certificate>
+n6F0mN8OUAFxDamepKdGRApU8uZ35624o/I4
+</X509Certificate>
</X509Data>
</KeyInfo>
</Signature></KeyContainer>
diff --git a/pskctool/tests/tst_libexamples.sh b/pskctool/tests/tst_libexamples.sh
index 0e8e558b4cbefbac9f2ca301fddb2ac4b8cfbdfa..5cb52ce44f40a78ab886ff12d2eac64e5b5c4c7e 100755
--- a/pskctool/tests/tst_libexamples.sh
+++ b/pskctool/tests/tst_libexamples.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# tst_libexamples.sh - keep pskctool output in GTK-DOC manual up to date
-# Copyright (C) 2012-2021 Simon Josefsson
+# Copyright (C) 2012-2022 Simon Josefsson
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -45,7 +45,8 @@ fi
$PSKCTOOL --sign --sign-key $srcdir/pskc-ee-key.pem \
--sign-crt $srcdir/pskc-ee-crt.pem \
- $srcdir/../../libpskc/examples/pskc-hotp.xml > foo
+ $srcdir/../../libpskc/examples/pskc-hotp.xml \
+ | sed 's,4</X509Cert,4\n</X509Cert,' > foo
if ! diff -ur $srcdir/../../libpskc/examples/pskc-hotp-signed.xml foo; then
echo "FAIL: pskctool --sign output change, commit updated file."
exit 1
diff --git a/pskctool/tests/tst_sign.sh b/pskctool/tests/tst_sign.sh
index b62757336061394746d60f706369127fe1db466d..2d452d69f2e6595ff85a34540939801324dbdfea 100755
--- a/pskctool/tests/tst_sign.sh
+++ b/pskctool/tests/tst_sign.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# tst_sign.sh - test that pskctool can sign and verify
-# Copyright (C) 2012-2021 Simon Josefsson
+# Copyright (C) 2012-2022 Simon Josefsson
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -32,7 +32,7 @@ $PSKCTOOL --info --strict --debug $pskc_all > tmp-pre-human.txt
$PSKCTOOL --sign \
--sign-key $pskc_ee_key \
--sign-crt $pskc_ee_crt \
- $pskc_all > tmp-signed.xml
+ $pskc_all | sed 's,4</X509Cert,4\n</X509Cert,' > tmp-signed.xml
diff -ur $pskc_all_signed tmp-signed.xml

7
gnu/packages/protobuf.scm
View file

@ -212,10 +212,9 @@ internal RPC protocols and file formats.")
(sha256 (sha256
(base32 (base32
"040rcs9fpv4bslhiy43v7dcrzakz4vwwpyqg4jp8bn24sl95ci7f")))) "040rcs9fpv4bslhiy43v7dcrzakz4vwwpyqg4jp8bn24sl95ci7f"))))
(arguments (substitute-keyword-arguments (package-arguments protobuf) (build-system gnu-build-system)
((#:phases phases) (arguments '())
#~(modify-phases #$phases (outputs '("out"))))
(delete 'disable-broken-tests)))))))
(define-public protobuf-c (define-public protobuf-c
(package (package

6
gnu/packages/python-crypto.scm
View file

@ -1002,14 +1002,14 @@ protocol (Javascript Object Signing and Encryption).")
(define-public python-pycryptodome (define-public python-pycryptodome
(package (package
(name "python-pycryptodome") (name "python-pycryptodome")
(version "3.11.0") (version "3.15.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "pycryptodome" version)) (uri (pypi-uri "pycryptodome" version))
(sha256 (sha256
(base32 (base32
"1l3a80z3lxcj1q0hzj1d3plavy2d51y4vzcd85zj0zm7yyxrd022")) "1f0qc0ns3ppybkr7wi66gsl5wfkcx1fdklmh3362nn84spddsdci"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet pycryptodome-unbundle-tomcrypt-snippet))) (snippet pycryptodome-unbundle-tomcrypt-snippet)))
(build-system python-build-system) (build-system python-build-system)
@ -1064,7 +1064,7 @@ PyCryptodome variants, the other being python-pycryptodomex.")
(method url-fetch) (method url-fetch)
(uri (pypi-uri "pycryptodomex" version)) (uri (pypi-uri "pycryptodomex" version))
(sha256 (sha256
(base32 "0vcd65ylri2a4pdqcc1897jasj7wfmqklj8x3pdynmdvark3d603")) (base32 "1vf0xbsqvcp4k3cl8cmxrlij9a88hajw6d3z0jhd3c5d5nxz2hbk"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet pycryptodome-unbundle-tomcrypt-snippet))) (snippet pycryptodome-unbundle-tomcrypt-snippet)))
(description (description

2
gnu/packages/python-web.scm
View file

@ -3881,7 +3881,7 @@ pretty printer and a tree visitor.")
(substitute* "flask_restful/__init__.py" (substitute* "flask_restful/__init__.py"
(("flask\\.helpers") "flask.scaffold"))))))) (("flask\\.helpers") "flask.scaffold")))))))
(propagated-inputs (propagated-inputs
(list python-aniso8601 python-flask python-pycrypto python-pytz)) (list python-aniso8601 python-flask python-pytz))
(native-inputs (native-inputs
(list ;; Optional dependency of Flask. Tests need it. (list ;; Optional dependency of Flask. Tests need it.
python-blinker python-mock ; For tests python-blinker python-mock ; For tests

2
gnu/packages/python-xyz.scm
View file

@ -19274,8 +19274,6 @@ from the header, as well as section details and data available.")
(replace 'check (replace 'check
(lambda _ (lambda _
(invoke "python" "test/test_pbkdf2.py")))))) (invoke "python" "test/test_pbkdf2.py"))))))
(propagated-inputs
(list python-pycrypto)) ; optional
(home-page "https://www.dlitz.net/software/python-pbkdf2/") (home-page "https://www.dlitz.net/software/python-pbkdf2/")
(synopsis "Password-based key derivation") (synopsis "Password-based key derivation")
(description "This module implements the password-based key derivation (description "This module implements the password-based key derivation

49
gnu/packages/qt.scm
View file

@ -3741,35 +3741,32 @@ a binding language:
@end itemize\n") @end itemize\n")
(license license:lgpl3))) ;version 3 only (+ exception) (license license:lgpl3))) ;version 3 only (+ exception)
;; There have been no public releases yet.
(define-public qtcolorwidgets (define-public qtcolorwidgets
(let ((commit "a95f72e935fe9e046061a1d1c3930cbfbcb533e0") (package
(revision "1")) (name "qtcolorwidgets")
(package (version "2.2.0")
(name "qtcolorwidgets") (source (origin
(version (git-version "0" revision commit)) (method git-fetch)
(source (origin (uri (git-reference
(method git-fetch) (url "https://gitlab.com/mattia.basaglia/Qt-Color-Widgets")
(uri (git-reference (commit (string-append "v" version))))
(url "https://gitlab.com/mattia.basaglia/Qt-Color-Widgets") (file-name (git-file-name name version))
(commit commit))) (sha256
(file-name (git-file-name name version)) (base32
(sha256 "1fp7sr5a56bjp2abc6ng331q0bwvk6mf2nxdga81aj6cd9afs22q"))))
(base32 (build-system cmake-build-system)
"0dkiwlqh2gwhlp78c1fmchj3shl4p9inspcl96ya5aa8mn6kydy8")))) (arguments '(#:tests? #f)) ;there are no tests
(build-system cmake-build-system) (native-inputs
(arguments `(#:tests? #f)) ; There are no tests (list qttools-5))
(native-inputs (inputs
(list qttools-5)) (list qtbase-5))
(inputs (home-page "https://gitlab.com/mattia.basaglia/Qt-Color-Widgets")
(list qtbase-5)) (synopsis "Color management widgets")
(home-page "https://gitlab.com/mattia.basaglia/Qt-Color-Widgets") (description "QtColorWidgets provides a Qt color dialog that is more
(synopsis "Color management widgets")
(description "QtColorWidgets provides a Qt color dialog that is more
user-friendly than the default @code{QColorDialog} and several other user-friendly than the default @code{QColorDialog} and several other
color-related widgets.") color-related widgets.")
;; Includes a license exception for combining with GPL2 code. ;; Includes a license exception for combining with GPL2 code.
(license license:lgpl3+)))) (license license:lgpl3+)))
(define-public qcustomplot (define-public qcustomplot
(package (package

1
gnu/packages/virtualization.scm
View file

@ -28,7 +28,6 @@
;;; Copyright © 2022 Ekaitz Zarraga <ekaitz@elenq.tech> ;;; Copyright © 2022 Ekaitz Zarraga <ekaitz@elenq.tech>
;;; Copyright © 2022 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2022 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com> ;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com>
;;; Copyright © 2022 Leo Nikkilä <hello@lnikki.la>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;

17
gnu/packages/xml.scm
View file

@ -1153,14 +1153,14 @@ XSL-T processor. It also performs any necessary post-processing.")
(define-public xmlsec (define-public xmlsec
(package (package
(name "xmlsec") (name "xmlsec")
(version "1.2.32") (version "1.2.36")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.aleksey.com/xmlsec/download/" (uri (string-append "https://www.aleksey.com/xmlsec/download/"
"xmlsec1-" version ".tar.gz")) "xmlsec1-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0hy0nwz57n9r5wwab9xa66gzwlwvzs54nhlfn3jh8q13acl710z3")))) "100wsklff8x30rsg0xp191kg8p3z5va2d0q3iy08a791ic07xngh"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(propagated-inputs ; according to xmlsec1.pc (propagated-inputs ; according to xmlsec1.pc
(list libxml2 libxslt)) (list libxml2 libxslt))
@ -1175,6 +1175,8 @@ XSL-T processor. It also performs any necessary post-processing.")
supports XML security standards such as XML Signature, XML Encryption, supports XML security standards such as XML Signature, XML Encryption,
Canonical XML (part of Libxml2) and Exclusive Canonical XML (part of Canonical XML (part of Libxml2) and Exclusive Canonical XML (part of
Libxml2).") Libxml2).")
(properties
'((upstream-name . "xmlsec1")))
(license (license:x11-style "file://COPYING" (license (license:x11-style "file://COPYING"
"See 'COPYING' in the distribution.")))) "See 'COPYING' in the distribution."))))
@ -1182,12 +1184,10 @@ Libxml2).")
(package/inherit xmlsec (package/inherit xmlsec
(name "xmlsec-nss") (name "xmlsec-nss")
(native-inputs (native-inputs
;; For tests. (modify-inputs (package-native-inputs xmlsec)
`(("nss:bin" ,nss "bin") ; for certutil (prepend `(,nss "bin")))) ;certutil, for tests
,@(package-native-inputs xmlsec)))
(inputs (inputs
`(("nss" ,nss) (list nss libltdl))
("libltdl" ,libltdl)))
(arguments (arguments
;; NSS no longer supports MD5 since 3.59, don't attempt to use it. ;; NSS no longer supports MD5 since 3.59, don't attempt to use it.
'(#:configure-flags '("--disable-md5"))) '(#:configure-flags '("--disable-md5")))
@ -1197,8 +1197,7 @@ Libxml2).")
(package/inherit xmlsec (package/inherit xmlsec
(name "xmlsec-openssl") (name "xmlsec-openssl")
(inputs (inputs
`(("openssl" ,openssl) (list openssl libltdl))
("libltdl" ,libltdl)))
(synopsis "XML Security Library (using OpenSSL instead of GnuTLS)"))) (synopsis "XML Security Library (using OpenSSL instead of GnuTLS)")))
(define-public minixml (define-public minixml

199
gnu/services/databases.scm
View file

@ -6,8 +6,9 @@
;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2018 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2018 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2019 Robert Vollmert <rob@vllmrt.net> ;;; Copyright © 2019 Robert Vollmert <rob@vllmrt.net>
;;; Copyright © 2020 Marius Bakke <marius@gnu.org> ;;; Copyright © 2020, 2022 Marius Bakke <marius@gnu.org>
;;; Copyright © 2021 David Larsson <david.larsson@selfhosted.xyz> ;;; Copyright © 2021 David Larsson <david.larsson@selfhosted.xyz>
;;; Copyright © 2021 Aljosha Papsch <ep@stern-data.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -29,6 +30,7 @@
#:use-module (gnu services shepherd) #:use-module (gnu services shepherd)
#:use-module (gnu system shadow) #:use-module (gnu system shadow)
#:use-module (gnu packages admin) #:use-module (gnu packages admin)
#:use-module (gnu packages base)
#:use-module (gnu packages databases) #:use-module (gnu packages databases)
#:use-module (guix build-system trivial) #:use-module (guix build-system trivial)
#:use-module (guix build union) #:use-module (guix build union)
@ -532,6 +534,7 @@ applications.")))
(bind-address mysql-configuration-bind-address (default "127.0.0.1")) (bind-address mysql-configuration-bind-address (default "127.0.0.1"))
(port mysql-configuration-port (default 3306)) (port mysql-configuration-port (default 3306))
(socket mysql-configuration-socket (default "/run/mysqld/mysqld.sock")) (socket mysql-configuration-socket (default "/run/mysqld/mysqld.sock"))
(datadir mysql-configuration-datadir (default "/var/lib/mysql"))
(extra-content mysql-configuration-extra-content (default "")) (extra-content mysql-configuration-extra-content (default ""))
(extra-environment mysql-configuration-extra-environment (default #~'())) (extra-environment mysql-configuration-extra-environment (default #~'()))
(auto-upgrade? mysql-configuration-auto-upgrade? (default #t))) (auto-upgrade? mysql-configuration-auto-upgrade? (default #t)))
@ -549,112 +552,114 @@ applications.")))
(define mysql-configuration-file (define mysql-configuration-file
(match-lambda (match-lambda
(($ <mysql-configuration> mysql bind-address port socket extra-content) (($ <mysql-configuration> mysql bind-address port socket datadir extra-content)
(mixed-text-file "my.cnf" "[mysqld] (mixed-text-file "my.cnf" "[mysqld]
datadir=/var/lib/mysql datadir=" datadir "
socket=" socket " socket=" socket "
bind-address=" bind-address " bind-address=" bind-address "
port=" (number->string port) " port=" (number->string port) "
" extra-content " " extra-content "
")))) "))))
(define (%mysql-activation config) (define (mysqld-wrapper config)
"Return an activation gexp for the MySQL or MariaDB database server." "Start mysqld, and initialize the system tables if necessary."
(let ((mysql (mysql-configuration-mysql config)) (program-file
(my.cnf (mysql-configuration-file config))) "mysqld-wrapper"
#~(begin (with-imported-modules (source-module-closure
(use-modules (ice-9 popen) '((guix build utils)))
(guix build utils)) (let ((mysql (mysql-configuration-mysql config))
(let* ((mysqld (string-append #$mysql "/bin/mysqld")) (datadir (mysql-configuration-datadir config))
(user (getpwnam "mysql")) (my.cnf (mysql-configuration-file config)))
(uid (passwd:uid user)) #~(begin
(gid (passwd:gid user)) (use-modules (guix build utils))
(datadir "/var/lib/mysql") (let* ((mysqld (string-append #$mysql "/bin/mysqld"))
(rundir "/run/mysqld")) (user (getpwnam "mysql"))
(mkdir-p datadir) (uid (passwd:uid user))
(chown datadir uid gid) (gid (passwd:gid user))
(mkdir-p rundir) (rundir "/run/mysqld"))
(chown rundir uid gid) (mkdir-p #$datadir)
;; Initialize the database when it doesn't exist. (chown #$datadir uid gid)
(when (not (file-exists? (string-append datadir "/mysql"))) (mkdir-p rundir)
(if (string-prefix? "mysql-" (strip-store-file-name #$mysql)) (chown rundir uid gid)
;; For MySQL. (unless (file-exists? (string-append #$datadir "/mysql"))
(system* mysqld (let ((init (system* #$(mysql-install config))))
(string-append "--defaults-file=" #$my.cnf) (unless (= 0 (status:exit-val init))
"--initialize" (throw 'system-error "MySQL initialization failed."))))
"--user=mysql") ;; Drop privileges and start the server.
;; For MariaDB. (setgid gid) (setuid uid)
;; XXX: The 'mysql_install_db' script doesn't work directly (execl mysqld mysqld
;; due to missing 'mkdir' in PATH. (string-append "--defaults-file=" #$my.cnf))))))))
(let ((p (open-pipe* OPEN_WRITE mysqld
(string-append
"--defaults-file=" #$my.cnf)
"--bootstrap"
"--user=mysql")))
;; Create the system database, as does by 'mysql_install_db'.
(display "create database mysql;\n" p)
(display "use mysql;\n" p)
(for-each
(lambda (sql)
(call-with-input-file
(string-append #$mysql:lib "/share/mysql/" sql)
(lambda (in) (dump-port in p))))
'("mysql_system_tables.sql"
"mysql_performance_tables.sql"
"mysql_system_tables_data.sql"
"fill_help_tables.sql"))
;; Remove the anonymous user and disable root access from
;; remote machines, as does by 'mysql_secure_installation'.
(display "
DELETE FROM user WHERE User='';
DELETE FROM user WHERE User='root' AND
Host NOT IN ('localhost', '127.0.0.1', '::1');
FLUSH PRIVILEGES;
" p)
(close-pipe p))))))))
(define (mysql-shepherd-service config) (define (mysql-shepherd-service config)
(list (shepherd-service (list (shepherd-service
(provision '(mysql)) (provision '(mysql))
(requirement '(user-processes))
(documentation "Run the MySQL server.") (documentation "Run the MySQL server.")
(start (let ((mysql (mysql-configuration-mysql config)) (start (let ((mysql (mysql-configuration-mysql config))
(extra-env (mysql-configuration-extra-environment config)) (extra-env (mysql-configuration-extra-environment config))
(my.cnf (mysql-configuration-file config))) (my.cnf (mysql-configuration-file config)))
#~(make-forkexec-constructor #~(make-forkexec-constructor
(list (string-append #$mysql "/bin/mysqld") (list #$(mysqld-wrapper config))
(string-append "--defaults-file=" #$my.cnf)) #:log-file "/var/log/mysqld.log"
#:user "mysql" #:group "mysql" #:environment-variables #$extra-env)))
#:log-file "/var/log/mysqld.log"
#:environment-variables #$extra-env)))
(stop #~(make-kill-destructor))))) (stop #~(make-kill-destructor)))))
(define (mysql-upgrade-wrapper mysql socket-file) (define (mysql-install config)
"Install MySQL system database and secure the installation."
(let ((mysql (mysql-configuration-mysql config))
(my.cnf (mysql-configuration-file config)))
(program-file
"mysql-install"
(with-imported-modules (source-module-closure
'((guix build utils)))
#~(begin
(use-modules (guix build utils))
;; Make sed, mkdir, uname, etc available for mariadb-install-db.
(set-path-environment-variable "PATH" '("bin")
(list #$sed #$coreutils))
(if (string=? "mariadb" #$(package-name mysql))
;; For MariaDB.
(system* #$(file-append mysql "/bin/mariadb-install-db")
(string-append "--defaults-file=" #$my.cnf)
"--skip-test-db"
"--user=mysql")
;; For MySQL.
(system* #$(file-append mysql "/bin/mysqld")
(string-append "--defaults-file=" #$my.cnf)
"--initialize"
"--user=mysql")))))))
(define (mysql-upgrade-wrapper config)
;; The MySQL socket and PID file may appear before the server is ready to ;; The MySQL socket and PID file may appear before the server is ready to
;; accept connections. Ensure the socket is responsive before attempting ;; accept connections. Ensure the socket is responsive before attempting
;; to run the upgrade script. ;; to run the upgrade script.
(program-file (let ((mysql (mysql-configuration-mysql config))
"mysql-upgrade-wrapper" (socket-file (mysql-configuration-socket config))
#~(begin (config-file (mysql-configuration-file config)))
(let ((mysql-upgrade #$(file-append mysql "/bin/mysql_upgrade")) (program-file
(timeout 10)) "mysql-upgrade-wrapper"
(begin #~(begin
(let loop ((i 0)) (let ((mysql-upgrade #$(file-append mysql "/bin/mysql_upgrade"))
(catch 'system-error (timeout 20))
(lambda () (begin
(let ((sock (socket PF_UNIX SOCK_STREAM 0))) (let loop ((i 0))
(connect sock AF_UNIX #$socket-file) (catch 'system-error
(close-port sock) (lambda ()
;; The socket is ready! (let ((sock (socket PF_UNIX SOCK_STREAM 0)))
(execl mysql-upgrade mysql-upgrade (connect sock AF_UNIX #$socket-file)
(string-append "--socket=" #$socket-file)))) (close-port sock)
(lambda args ;; The socket is ready!
(if (< i timeout) (execl mysql-upgrade mysql-upgrade
(begin (string-append "--defaults-file=" #$config-file)
(sleep 1) "--user=mysql")))
(loop (+ 1 i))) (lambda args
;; No luck, give up. (if (< i timeout)
(throw 'timeout-error (begin
"MySQL server did not appear in time!")))))))))) (sleep 1)
(loop (+ 1 i)))
;; No luck, give up.
(throw 'timeout-error
"MySQL server did not appear in time!")))))))))))
(define (mysql-upgrade-shepherd-service config) (define (mysql-upgrade-shepherd-service config)
(list (shepherd-service (list (shepherd-service
@ -662,17 +667,17 @@ FLUSH PRIVILEGES;
(requirement '(mysql)) (requirement '(mysql))
(one-shot? #t) (one-shot? #t)
(documentation "Upgrade MySQL database schemas.") (documentation "Upgrade MySQL database schemas.")
(start (let ((mysql (mysql-configuration-mysql config)) (start #~(make-forkexec-constructor
(socket (mysql-configuration-socket config))) (list #$(mysql-upgrade-wrapper config))
#~(make-forkexec-constructor #:user "mysql" #:group "mysql"
(list #$(mysql-upgrade-wrapper mysql socket)) #:log-file "/var/log/mysql_upgrade.log")))))
#:user "mysql" #:group "mysql"))))))
(define (mysql-shepherd-services config) (define (mysql-shepherd-services config)
(if (mysql-configuration-auto-upgrade? config) (let ((mysql-services (mysql-shepherd-service config)))
(append (mysql-shepherd-service config) (if (mysql-configuration-auto-upgrade? config)
(mysql-upgrade-shepherd-service config)) (append mysql-services
(mysql-shepherd-service config))) (mysql-upgrade-shepherd-service config))
mysql-services)))
(define mysql-service-type (define mysql-service-type
(service-type (service-type
@ -680,8 +685,6 @@ FLUSH PRIVILEGES;
(extensions (extensions
(list (service-extension account-service-type (list (service-extension account-service-type
(const %mysql-accounts)) (const %mysql-accounts))
(service-extension activation-service-type
%mysql-activation)
(service-extension shepherd-root-service-type (service-extension shepherd-root-service-type
mysql-shepherd-services))) mysql-shepherd-services)))
(default-value (mysql-configuration)) (default-value (mysql-configuration))

242
gnu/services/guix.scm
View file

@ -333,31 +333,38 @@
(documentation "Guix Build Coordinator") (documentation "Guix Build Coordinator")
(provision '(guix-build-coordinator)) (provision '(guix-build-coordinator))
(requirement '(networking)) (requirement '(networking))
(start #~(make-forkexec-constructor (start #~(lambda args
(list #$(make-guix-build-coordinator-start-script (parameterize ((%current-logfile-date-format ""))
database-uri-string (apply
allocation-strategy make-forkexec-constructor
"/var/run/guix-build-coordinator/pid" (list #$(make-guix-build-coordinator-start-script
package database-uri-string
#:agent-communication-uri-string allocation-strategy
agent-communication-uri-string "/var/run/guix-build-coordinator/pid"
#:client-communication-uri-string package
client-communication-uri-string #:agent-communication-uri-string
#:hooks hooks agent-communication-uri-string
#:parallel-hooks parallel-hooks #:client-communication-uri-string
#:guile guile)) client-communication-uri-string
#:user #$user #:hooks hooks
#:group #$group #:parallel-hooks parallel-hooks
#:pid-file "/var/run/guix-build-coordinator/pid" #:guile guile))
;; Allow time for migrations to run #:user #$user
#:pid-file-timeout 60 #:group #$group
#:environment-variables #:pid-file "/var/run/guix-build-coordinator/pid"
`(,(string-append ;; Allow time for migrations to run
"GUIX_LOCPATH=" #$glibc-utf8-locales "/lib/locale") #:pid-file-timeout 60
"LC_ALL=en_US.utf8" #:environment-variables
"PATH=/run/current-system/profile/bin") ; for hooks `(,(string-append
#:log-file "/var/log/guix-build-coordinator/coordinator.log")) "GUIX_LOCPATH=" #$glibc-utf8-locales "/lib/locale")
(stop #~(make-kill-destructor)))))) "LC_ALL=en_US.utf8"
"PATH=/run/current-system/profile/bin") ; for hooks
#:log-file "/var/log/guix-build-coordinator/coordinator.log"
args))))
(stop #~(make-kill-destructor))
(modules
`((shepherd comm)
,@%default-modules))))))
(define (guix-build-coordinator-activation config) (define (guix-build-coordinator-activation config)
#~(begin #~(begin
@ -419,61 +426,67 @@
(documentation "Guix Build Coordinator Agent") (documentation "Guix Build Coordinator Agent")
(provision '(guix-build-coordinator-agent)) (provision '(guix-build-coordinator-agent))
(requirement '(networking)) (requirement '(networking))
(start #~(make-forkexec-constructor (start
(list #$(file-append package "/bin/guix-build-coordinator-agent") #~(lambda _
#$(string-append "--coordinator=" coordinator) (parameterize ((%current-logfile-date-format ""))
#$@(match authentication (fork+exec-command
(($ <guix-build-coordinator-agent-password-auth> (list #$(file-append package "/bin/guix-build-coordinator-agent")
uuid password) #$(string-append "--coordinator=" coordinator)
#~(#$(string-append "--uuid=" uuid) #$@(match authentication
#$(string-append "--password=" password))) (($ <guix-build-coordinator-agent-password-auth>
(($ <guix-build-coordinator-agent-password-file-auth> uuid password)
uuid password-file) #~(#$(string-append "--uuid=" uuid)
#~(#$(string-append "--uuid=" uuid) #$(string-append "--password=" password)))
#$(string-append "--password-file=" (($ <guix-build-coordinator-agent-password-file-auth>
password-file))) uuid password-file)
(($ <guix-build-coordinator-agent-dynamic-auth> #~(#$(string-append "--uuid=" uuid)
agent-name token) #$(string-append "--password-file="
#~(#$(string-append "--name=" agent-name) password-file)))
#$(string-append "--dynamic-auth-token=" token))) (($ <guix-build-coordinator-agent-dynamic-auth>
(($ agent-name token)
<guix-build-coordinator-agent-dynamic-auth-with-file> #~(#$(string-append "--name=" agent-name)
agent-name token-file) #$(string-append "--dynamic-auth-token=" token)))
#~(#$(string-append "--name=" agent-name) (($
#$(string-append "--dynamic-auth-token-file=" <guix-build-coordinator-agent-dynamic-auth-with-file>
token-file)))) agent-name token-file)
#$(simple-format #f "--max-parallel-builds=~A" #~(#$(string-append "--name=" agent-name)
max-parallel-builds) #$(string-append "--dynamic-auth-token-file="
#$@(if max-allocated-builds token-file))))
#~(#$(simple-format #f "--max-allocated-builds=~A" #$(simple-format #f "--max-parallel-builds=~A"
max-allocated-builds)) max-parallel-builds)
#~()) #$@(if max-allocated-builds
#$@(if max-1min-load-average #~(#$(simple-format #f "--max-allocated-builds=~A"
#~(#$(simple-format #f "--max-1min-load-average=~A" max-allocated-builds))
max-1min-load-average)) #~())
#~()) #$@(if max-1min-load-average
#$@(if derivation-substitute-urls #~(#$(simple-format #f "--max-1min-load-average=~A"
#~(#$(string-append max-1min-load-average))
"--derivation-substitute-urls=" #~())
#$@(if derivation-substitute-urls
#~(#$(string-append
"--derivation-substitute-urls="
(string-join derivation-substitute-urls " "))) (string-join derivation-substitute-urls " ")))
#~()) #~())
#$@(if non-derivation-substitute-urls #$@(if non-derivation-substitute-urls
#~(#$(string-append #~(#$(string-append
"--non-derivation-substitute-urls=" "--non-derivation-substitute-urls="
(string-join non-derivation-substitute-urls " "))) (string-join non-derivation-substitute-urls " ")))
#~()) #~())
#$@(map (lambda (system) #$@(map (lambda (system)
(string-append "--system=" system)) (string-append "--system=" system))
(or systems '()))) (or systems '())))
#:user #$user #:user #$user
#:environment-variables #:environment-variables
`(,(string-append `(,(string-append
"GUIX_LOCPATH=" #$glibc-utf8-locales "/lib/locale") "GUIX_LOCPATH=" #$glibc-utf8-locales "/lib/locale")
;; XDG_CACHE_HOME is used by Guix when caching narinfo files ;; XDG_CACHE_HOME is used by Guix when caching narinfo files
"XDG_CACHE_HOME=/var/cache/guix-build-coordinator-agent" "XDG_CACHE_HOME=/var/cache/guix-build-coordinator-agent"
"LC_ALL=en_US.utf8") "LC_ALL=en_US.utf8")
#:log-file "/var/log/guix-build-coordinator/agent.log")) #:log-file "/var/log/guix-build-coordinator/agent.log"))))
(stop #~(make-kill-destructor)))))) (stop #~(make-kill-destructor))
(modules
`((shepherd comm)
,@%default-modules))))))
(define (guix-build-coordinator-agent-activation config) (define (guix-build-coordinator-agent-activation config)
#~(begin #~(begin
@ -526,39 +539,44 @@
(provision '(guix-build-coordinator-queue-builds)) (provision '(guix-build-coordinator-queue-builds))
(requirement '(networking)) (requirement '(networking))
(start (start
#~(make-forkexec-constructor #~(lambda _
(list (parameterize ((%current-logfile-date-format ""))
#$(file-append (fork+exec-command
package (list
"/bin/guix-build-coordinator-queue-builds-from-guix-data-service") #$(file-append
#$(string-append "--coordinator=" coordinator) package
#$@(map (lambda (system) "/bin/guix-build-coordinator-queue-builds-from-guix-data-service")
(string-append "--system=" system)) #$(string-append "--coordinator=" coordinator)
(or systems '())) #$@(map (lambda (system)
#$@(map (match-lambda (string-append "--system=" system))
((system . target) (or systems '()))
(string-append "--system-and-target=" system "=" target))) #$@(map (match-lambda
(or systems-and-targets '())) ((system . target)
#$@(if guix-data-service (string-append "--system-and-target=" system "=" target)))
#~(#$(string-append "--guix-data-service=" guix-data-service)) (or systems-and-targets '()))
#~()) #$@(if guix-data-service
#$@(if guix-data-service-build-server-id #~(#$(string-append "--guix-data-service=" guix-data-service))
#~(#$(simple-format #~())
#f #$@(if guix-data-service-build-server-id
"--guix-data-service-build-server-id=~A" #~(#$(simple-format
guix-data-service-build-server-id)) #f
#~()) "--guix-data-service-build-server-id=~A"
#$@(if processed-commits-file guix-data-service-build-server-id))
#~(#$(string-append "--processed-commits-file=" #~())
processed-commits-file)) #$@(if processed-commits-file
#~())) #~(#$(string-append "--processed-commits-file="
#:user #$user processed-commits-file))
#:environment-variables #~()))
`(,(string-append #:user #$user
"GUIX_LOCPATH=" #$glibc-utf8-locales "/lib/locale") #:environment-variables
"LC_ALL=en_US.utf8") `(,(string-append
#:log-file "/var/log/guix-build-coordinator/queue-builds.log")) "GUIX_LOCPATH=" #$glibc-utf8-locales "/lib/locale")
(stop #~(make-kill-destructor)))))) "LC_ALL=en_US.utf8")
#:log-file "/var/log/guix-build-coordinator/queue-builds.log"))))
(stop #~(make-kill-destructor))
(modules
`((shepherd comm)
,@%default-modules))))))
(define (guix-build-coordinator-queue-builds-activation config) (define (guix-build-coordinator-queue-builds-activation config)
#~(begin #~(begin

1
gnu/services/virtualization.scm
View file

@ -4,6 +4,7 @@
;;; Copyright © 2020,2021 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2020,2021 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2021 Timotej Lazar <timotej.lazar@araneo.si> ;;; Copyright © 2021 Timotej Lazar <timotej.lazar@araneo.si>
;;; Copyright © 2022 Oleg Pykhalov <go.wigust@gmail.com> ;;; Copyright © 2022 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2022 Leo Nikkilä <hello@lnikki.la>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;

3
gnu/tests/databases.scm
View file

@ -430,6 +430,9 @@ data double PRECISION NULL
(test-assert "mysql_upgrade completed" (test-assert "mysql_upgrade completed"
(wait-for-file "/var/lib/mysql/mysql_upgrade_info" marionette)) (wait-for-file "/var/lib/mysql/mysql_upgrade_info" marionette))
(test-assert "socket is ready"
(wait-for-unix-socket "/run/mysqld/mysqld.sock" marionette))
(test-eq "create database" (test-eq "create database"
0 0
(marionette-eval (marionette-eval

2
guix/import/egg.scm
View file

@ -67,7 +67,7 @@
;;; ;;;
;;; * Support for CHICKEN 4? ;;; * Support for CHICKEN 4?
;;; ;;;
;;; * Some packages will specify a specific version of a depencency in the ;;; * Some packages will specify a specific version of a dependency in the
;;; PACKAGE.egg file, how should we handle this? ;;; PACKAGE.egg file, how should we handle this?
;;; ;;;
;;; Code: ;;; Code:

2
guix/scripts/home.scm
View file

@ -705,7 +705,7 @@ deploy the home environment described by these files.\n")
(define (service-type-description-string type) (define (service-type-description-string type)
"Return the rendered and localised description of TYPE, a service type." "Return the rendered and localised description of TYPE, a service type."
(and=> (service-type-description type) (and=> (service-type-description type)
(compose texi->plain-text P_))) (compose texi->plain-text G_)))
(define %service-type-metrics (define %service-type-metrics
;; Metrics used to estimate the relevance of a search result. ;; Metrics used to estimate the relevance of a search result.

4
guix/scripts/system/search.scm
View file

@ -127,7 +127,7 @@ procedure that may return a colorized version of its argument."
(parameterize ((%text-width width*)) (parameterize ((%text-width width*))
(texi->plain-text (texi->plain-text
(string-append "description: " (string-append "description: "
(or (and=> (service-type-description type) P_) (or (and=> (service-type-description type) G_)
"")))) ""))))
#\newline))))) #\newline)))))
@ -144,7 +144,7 @@ procedure that may return a colorized version of its argument."
(define (service-type-description-string type) (define (service-type-description-string type)
"Return the rendered and localised description of TYPE, a service type." "Return the rendered and localised description of TYPE, a service type."
(and=> (service-type-description type) (and=> (service-type-description type)
(compose texi->plain-text P_))) (compose texi->plain-text G_)))
(define %service-type-metrics (define %service-type-metrics
;; Metrics used to estimate the relevance of a search result. ;; Metrics used to estimate the relevance of a search result.

4
po/guix/POTFILES.in
View file

@ -4,10 +4,14 @@ gnu.scm
gnu/packages.scm gnu/packages.scm
gnu/services.scm gnu/services.scm
gnu/system.scm gnu/system.scm
gnu/services/base.scm
gnu/services/certbot.scm
gnu/services/configuration.scm gnu/services/configuration.scm
gnu/services/file-sharing.scm
gnu/services/networking.scm gnu/services/networking.scm
gnu/services/shepherd.scm gnu/services/shepherd.scm
gnu/services/samba.scm gnu/services/samba.scm
gnu/services/version-control.scm
gnu/home/services.scm gnu/home/services.scm
gnu/home/services/ssh.scm gnu/home/services/ssh.scm
gnu/home/services/symlink-manager.scm gnu/home/services/symlink-manager.scm

5
po/packages/POTFILES.in
View file

@ -57,8 +57,3 @@ gnu/packages/webkit.scm
gnu/packages/web.scm gnu/packages/web.scm
gnu/packages/wordnet.scm gnu/packages/wordnet.scm
gnu/packages/xiph.scm gnu/packages/xiph.scm
gnu/services/base.scm
gnu/services/certbot.scm
gnu/services/file-sharing.scm
gnu/services/networking.scm
gnu/services/version-control.scm