amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into core-updates

Browse source
This commit is contained in:
Ludovic Courtès 2022-06-08 14:46:24 +02:00
commit 8c3e9da13a
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
595 changed files with 271729 additions and 561947 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.dir-locals.el
View file

@ -6,9 +6,9 @@
(sentence-end-double-space . t) (sentence-end-double-space . t)
;; For use with 'bug-reference-prog-mode'. ;; For use with 'bug-reference-prog-mode'.
(bug-reference-url-format . "http://bugs.gnu.org/%s")
(bug-reference-bug-regexp (bug-reference-bug-regexp
. "<https?://\\(debbugs\\|bugs\\)\\.gnu\\.org/\\([0-9]+\\)>") . "\\(<https?://\\bugs\\.gnu\\.org/\\([0-9]+\\)>\\)")
(bug-reference-url-format . "https://bugs.gnu.org/%s")
;; Emacs-Guix ;; Emacs-Guix
(eval . (setq-local guix-directory (eval . (setq-local guix-directory

1
.gitignore vendored
View file

@ -157,3 +157,4 @@ tmp
/gnu/packages/bootstrap /gnu/packages/bootstrap
/gnu/packages/aux-files/guile-guile-launcher.o /gnu/packages/aux-files/guile-guile-launcher.o
/guile /guile
.DS_Store

48
Makefile.am
View file

@ -130,7 +130,14 @@ MODULES = \
guix/cache.scm \ guix/cache.scm \
guix/cve.scm \ guix/cve.scm \
guix/workers.scm \ guix/workers.scm \
guix/least-authority.scm \
guix/ipfs.scm \ guix/ipfs.scm \
guix/platform.scm \
guix/platforms/arm.scm \
guix/platforms/mips.scm \
guix/platforms/powerpc.scm \
guix/platforms/riscv.scm \
guix/platforms/x86.scm \
guix/build-system.scm \ guix/build-system.scm \
guix/build-system/android-ndk.scm \ guix/build-system/android-ndk.scm \
guix/build-system/ant.scm \ guix/build-system/ant.scm \
@ -140,6 +147,7 @@ MODULES = \
guix/build-system/cmake.scm \ guix/build-system/cmake.scm \
guix/build-system/dub.scm \ guix/build-system/dub.scm \
guix/build-system/dune.scm \ guix/build-system/dune.scm \
guix/build-system/elm.scm \
guix/build-system/emacs.scm \ guix/build-system/emacs.scm \
guix/build-system/font.scm \ guix/build-system/font.scm \
guix/build-system/go.scm \ guix/build-system/go.scm \
@ -192,6 +200,7 @@ MODULES = \
guix/build/cmake-build-system.scm \ guix/build/cmake-build-system.scm \
guix/build/dub-build-system.scm \ guix/build/dub-build-system.scm \
guix/build/dune-build-system.scm \ guix/build/dune-build-system.scm \
guix/build/elm-build-system.scm \
guix/build/emacs-build-system.scm \ guix/build/emacs-build-system.scm \
guix/build/meson-build-system.scm \ guix/build/meson-build-system.scm \
guix/build/minify-build-system.scm \ guix/build/minify-build-system.scm \
@ -257,6 +266,7 @@ MODULES = \
guix/import/cran.scm \ guix/import/cran.scm \
guix/import/crate.scm \ guix/import/crate.scm \
guix/import/egg.scm \ guix/import/egg.scm \
guix/import/elm.scm \
guix/import/elpa.scm \ guix/import/elpa.scm \
guix/import/gem.scm \ guix/import/gem.scm \
guix/import/git.scm \ guix/import/git.scm \
@ -299,15 +309,18 @@ MODULES = \
guix/scripts/describe.scm \ guix/scripts/describe.scm \
guix/scripts/style.scm \ guix/scripts/style.scm \
guix/scripts/system.scm \ guix/scripts/system.scm \
guix/scripts/system/search.scm \ guix/scripts/system/edit.scm \
guix/scripts/system/reconfigure.scm \ guix/scripts/system/reconfigure.scm \
guix/scripts/system/search.scm \
guix/scripts/home.scm \ guix/scripts/home.scm \
guix/scripts/home/edit.scm \
guix/scripts/home/import.scm \ guix/scripts/home/import.scm \
guix/scripts/lint.scm \ guix/scripts/lint.scm \
guix/scripts/challenge.scm \ guix/scripts/challenge.scm \
guix/scripts/import/crate.scm \ guix/scripts/import/crate.scm \
guix/scripts/import/cran.scm \ guix/scripts/import/cran.scm \
guix/scripts/import/egg.scm \ guix/scripts/import/egg.scm \
guix/scripts/import/elm.scm \
guix/scripts/import/elpa.scm \ guix/scripts/import/elpa.scm \
guix/scripts/import/gem.scm \ guix/scripts/import/gem.scm \
guix/scripts/import/gnu.scm \ guix/scripts/import/gnu.scm \
@ -380,10 +393,10 @@ AUX_FILES = \
gnu/packages/aux-files/chromium/master-preferences.json \ gnu/packages/aux-files/chromium/master-preferences.json \
gnu/packages/aux-files/emacs/guix-emacs.el \ gnu/packages/aux-files/emacs/guix-emacs.el \
gnu/packages/aux-files/guix.vim \ gnu/packages/aux-files/guix.vim \
gnu/packages/aux-files/linux-libre/5.16-arm.conf \ gnu/packages/aux-files/linux-libre/5.17-arm.conf \
gnu/packages/aux-files/linux-libre/5.16-arm64.conf \ gnu/packages/aux-files/linux-libre/5.17-arm64.conf \
gnu/packages/aux-files/linux-libre/5.16-i686.conf \ gnu/packages/aux-files/linux-libre/5.17-i686.conf \
gnu/packages/aux-files/linux-libre/5.16-x86_64.conf \ gnu/packages/aux-files/linux-libre/5.17-x86_64.conf \
gnu/packages/aux-files/linux-libre/5.15-arm.conf \ gnu/packages/aux-files/linux-libre/5.15-arm.conf \
gnu/packages/aux-files/linux-libre/5.15-arm64.conf \ gnu/packages/aux-files/linux-libre/5.15-arm64.conf \
gnu/packages/aux-files/linux-libre/5.15-i686.conf \ gnu/packages/aux-files/linux-libre/5.15-i686.conf \
@ -405,8 +418,6 @@ AUX_FILES = \
gnu/packages/aux-files/linux-libre/4.14-x86_64.conf \ gnu/packages/aux-files/linux-libre/4.14-x86_64.conf \
gnu/packages/aux-files/linux-libre/4.9-i686.conf \ gnu/packages/aux-files/linux-libre/4.9-i686.conf \
gnu/packages/aux-files/linux-libre/4.9-x86_64.conf \ gnu/packages/aux-files/linux-libre/4.9-x86_64.conf \
gnu/packages/aux-files/linux-libre/4.4-i686.conf \
gnu/packages/aux-files/linux-libre/4.4-x86_64.conf \
gnu/packages/aux-files/pack-audit.c \ gnu/packages/aux-files/pack-audit.c \
gnu/packages/aux-files/python/sanity-check.py \ gnu/packages/aux-files/python/sanity-check.py \
gnu/packages/aux-files/python/sitecustomize.py \ gnu/packages/aux-files/python/sitecustomize.py \
@ -474,6 +485,7 @@ SCM_TESTS = \
tests/derivations.scm \ tests/derivations.scm \
tests/discovery.scm \ tests/discovery.scm \
tests/egg.scm \ tests/egg.scm \
tests/elm.scm \
tests/elpa.scm \ tests/elpa.scm \
tests/file-systems.scm \ tests/file-systems.scm \
tests/gem.scm \ tests/gem.scm \
@ -487,6 +499,7 @@ SCM_TESTS = \
tests/gremlin.scm \ tests/gremlin.scm \
tests/hackage.scm \ tests/hackage.scm \
tests/home-import.scm \ tests/home-import.scm \
tests/home-services.scm \
tests/http-client.scm \ tests/http-client.scm \
tests/import-git.scm \ tests/import-git.scm \
tests/import-github.scm \ tests/import-github.scm \
@ -569,6 +582,7 @@ SH_TESTS = \
tests/guix-environment.sh \ tests/guix-environment.sh \
tests/guix-environment-container.sh \ tests/guix-environment-container.sh \
tests/guix-shell.sh \ tests/guix-shell.sh \
tests/guix-shell-export-manifest.sh \
tests/guix-graph.sh \ tests/guix-graph.sh \
tests/guix-describe.sh \ tests/guix-describe.sh \
tests/guix-repl.sh \ tests/guix-repl.sh \
@ -1069,21 +1083,35 @@ WEBLATE_REPO = https://framagit.org/tyreunom/guix-translations
# form. # form.
download-po: download-po:
dir=$$(mktemp -d); \ dir=$$(mktemp -d); \
git clone --depth 1 "$(WEBLATE_REPO)" "$$dir/translations"; \ git clone --depth 1 "$(WEBLATE_REPO)" "$$dir/translations" && \
for domain in po/doc po/guix po/packages; do \ for domain in po/doc po/guix po/packages; do \
for po in "$$dir/translations/$$domain"/*.po; do \ for po in "$$dir/translations/$$domain"/*.po; do \
translated=$$(LANG=en_US.UTF-8 msgfmt --statistics "$$po" 2>&1 | cut -f1 -d' '); \ translated=$$(LANG=en_US.UTF-8 msgfmt --statistics "$$po" 2>&1 | cut -f1 -d' '); \
untranslated=$$(LANG=en_US.UTF-8 msgfmt --statistics "$$po" 2>&1 | rev | cut -f3 -d' ' | rev); \
untranslated=$${untranslated:-0}; \
total=$$(($$translated+$$untranslated)); \
target=$$(basename "$$po"); \ target=$$(basename "$$po"); \
target="$$domain/$$target"; \ target="$$domain/$$target"; \
if msgfmt -c "$$po" && [ "$$translated" != "0" ]; then \ msgfmt -c "$$po"; \
if msgfmt -c "$$po" && [ "$$translated" != "0" ] && ([ "$$domain" != "po/doc" ] || [ "$$translated" -gt $$(($$total/10)) ] || [ -f $$target ]); then \
msgfilter --no-wrap -i "$$po" cat > "$$po".tmp; \ msgfilter --no-wrap -i "$$po" cat > "$$po".tmp; \
mv "$$po".tmp "$$target"; \ mv "$$po".tmp "$$target"; \
echo "copied $$target."; \ echo "copied $$target."; \
else \ else \
echo "WARN: $$target ($$translated translated messages) was not added/updated."; \ echo "WARN: $$target ($$translated translated messages ($$((translated/total*100))%)) was not added/updated."; \
fi; \ fi; \
done; \ done; \
done; \ done; \
for po in po/doc/*.po; do \
translated=$$(LANG=en_US.UTF-8 msgfmt --statistics "$$po" 2>&1 | cut -f1 -d' '); \
untranslated=$$(LANG=en_US.UTF-8 msgfmt --statistics "$$po" 2>&1 | rev | cut -f3 -d' ' | rev); \
untranslated=$${untranslated:-0}; \
total=$$(($$translated + $$untranslated)); \
if [ "$$translated" -lt "$$(($$total/20))" ]; then \
echo "WARN: $$po was removed because it is below the 5% threshold: $$((translated/total*100))%"; \
rm $$po; \
fi; \
done; \
rm -rf "$$dir" rm -rf "$$dir"
.PHONY: download-po .PHONY: download-po

53
build-aux/cuirass/evaluate.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016, 2017, 2018, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016-2018, 2020, 2022 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2021 Mathieu Othacehe <othacehe@gnu.org> ;;; Copyright © 2021 Mathieu Othacehe <othacehe@gnu.org>
;;; ;;;
@ -78,28 +78,35 @@
;; up the evaluation speed as the evaluations can be performed ;; up the evaluation speed as the evaluations can be performed
;; concurrently. It also decreases the amount of memory needed per ;; concurrently. It also decreases the amount of memory needed per
;; evaluation process. ;; evaluation process.
(n-par-for-each ;;
(/ (current-processor-count) 2) ;; Fork inferior processes upfront before we have created any
(lambda (system) ;; threads.
(with-store store (let ((inferiors (map (lambda _
(let ((inferior (open-inferior (derivation->output-path derivation)))
(open-inferior (derivation->output-path derivation))) %cuirass-supported-systems)))
(channels (map channel-instance->sexp instances))) (n-par-for-each
(inferior-eval '(use-modules (gnu ci)) inferior) (min (length %cuirass-supported-systems)
(let ((jobs (current-processor-count))
(inferior-eval-with-store (lambda (system inferior)
inferior store (with-store store
`(lambda (store) (let ((channels (map channel-instance->sexp instances)))
(cuirass-jobs store (inferior-eval '(use-modules (gnu ci)) inferior)
'((subset . all) (let ((jobs
(systems . ,(list system)) (inferior-eval-with-store
(channels . ,channels)))))) inferior store
(file `(lambda (store)
(string-append directory "/jobs-" system ".scm"))) (cuirass-jobs store
(call-with-output-file file '((subset . all)
(lambda (port) (systems . ,(list system))
(write jobs port))))))) (channels . ,channels))))))
%cuirass-supported-systems)))))) (file
(string-append directory "/jobs-" system ".scm")))
(close-inferior inferior)
(call-with-output-file file
(lambda (port)
(write jobs port)))))))
%cuirass-supported-systems
inferiors)))))))
(x (x
(format (current-error-port) "Wrong command: ~a~%." x) (format (current-error-port) "Wrong command: ~a~%." x)
(exit 1))) (exit 1)))

26
doc/build.scm
View file

@ -62,11 +62,19 @@
(or (getenv "GUIX_MANUAL") (or (getenv "GUIX_MANUAL")
"guix")) "guix"))
(define %manual-languages
;; Available translations for the 'guix-manual' text domain.
'("de" "en" "es" "fr" "ru" "zh_CN"))
(define %cookbook-languages
;; Available translations for the 'guix-cookbook' text domain.
'("de" "en" "fr" "sk"))
(define %languages (define %languages
;; The cookbook is not translated in the same languages as the manual ;; Available translations for the document being built.
(if (string=? %manual "guix-cookbook") (if (string=? %manual "guix-cookbook")
'("de" "en" "fr" "sk") %cookbook-languages
'("de" "en" "es" "fr" "ru" "zh_CN"))) %manual-languages))
(define (texinfo-manual-images source) (define (texinfo-manual-images source)
"Return a directory containing all the images used by the user manual, taken "Return a directory containing all the images used by the user manual, taken
@ -301,8 +309,9 @@ actual file name."
(define (html-files directory) (define (html-files directory)
;; Return the list of HTML files under DIRECTORY. ;; Return the list of HTML files under DIRECTORY.
(map (cut string-append directory "/" <>) (map (cut string-append directory "/" <>)
(scandir #$manual (lambda (file) (or (scandir #$manual (lambda (file)
(string-suffix? ".html" file))))) (string-suffix? ".html" file)))
'())))
(define anchors (define anchors
(sort (concatenate (sort (concatenate
@ -969,7 +978,8 @@ PDF for language '~a'!~%~%"
(computed-file (string-append manual "-pdf-manual") build (computed-file (string-append manual "-pdf-manual") build
#:local-build? #f)) #:local-build? #f))
(define (guix-manual-text-domain source languages) (define* (guix-manual-text-domain source
#:optional (languages %manual-languages))
"Return the PO files for LANGUAGES of the 'guix-manual' text domain taken "Return the PO files for LANGUAGES of the 'guix-manual' text domain taken
from SOURCE." from SOURCE."
(define po-directory (define po-directory
@ -1042,9 +1052,7 @@ must be the Guix top-level source directory, from which PO files are taken."
(define exp (define exp
`(begin `(begin
(bindtextdomain "guix-manual" (bindtextdomain "guix-manual"
#+(guix-manual-text-domain #+(guix-manual-text-domain source))
source
languages))
(bindtextdomain "iso_639-3" ;language names (bindtextdomain "iso_639-3" ;language names
#+(file-append iso-codes #+(file-append iso-codes
"/share/locale")) "/share/locale"))

104
doc/contributing.texi
View file

@ -447,6 +447,7 @@ needed is to review and apply the patch.
* Perl Modules:: Little pearls. * Perl Modules:: Little pearls.
* Java Packages:: Coffee break. * Java Packages:: Coffee break.
* Rust Crates:: Beware of oxidation. * Rust Crates:: Beware of oxidation.
* Elm Packages:: Trees of browser code
* Fonts:: Fond of fonts. * Fonts:: Fond of fonts.
@end menu @end menu
@ -898,6 +899,87 @@ developed for a different Operating System, depend on features from the Nightly
Rust compiler, or the test suite may have atrophied since it was released. Rust compiler, or the test suite may have atrophied since it was released.
@node Elm Packages
@subsection Elm Packages
@cindex Elm
Elm applications can be named like other software: their names need not
mention Elm.
Packages in the Elm sense (see @code{elm-build-system} under @ref{Build
Systems}) are required use names of the format
@var{author}@code{/}@var{project}, where both the @var{author} and the
@var{project} may contain hyphens internally, and the @var{author} sometimes
contains uppercase letters.
To form the Guix package name from the upstream name, we follow a convention
similar to Python packages (@pxref{Python Modules}), adding an @code{elm-}
prefix unless the name would already begin with @code{elm-}.
In many cases we can reconstruct an Elm package's upstream name heuristically,
but, since conversion to a Guix-style name involves a loss of information,
this is not always possible. Care should be taken to add the
@code{'upstream-name} property when necessary so that @samp{guix import elm}
will work correctly (@pxref{Invoking guix import}). The most notable scenarios
when explicitly specifying the upstream name is necessary are:
@enumerate
@item
When the @var{author} is @code{elm} and the @var{project} contains one or more
hyphens, as with @code{elm/virtual-dom}; and
@item
When the @var{author} contains hyphens or uppercase letters, as with
@code{Elm-Canvas/raster-shapes}---unless the @var{author} is
@code{elm-explorations}, which is handled as a special case, so packages like
@code{elm-explorations/markdown} do @emph{not} need to use the
@code{'upstream-name} property.
@end enumerate
The module @code{(guix build-system elm)} provides the following utilities for
working with names and related conventions:
@deffn {Scheme procedure} elm-package-origin @var{elm-name} @var{version} @
@var{hash}
Returns a Git origin using the repository naming and tagging regime required
for a published Elm package with the upstream name @var{elm-name} at version
@var{version} with sha256 checksum @var{hash}.
For example:
@lisp
(package
(name "elm-html")
(version "1.0.0")
(source
(elm-package-origin
"elm/html"
version
(base32 "15k1679ja57vvlpinpv06znmrxy09lbhzfkzdc89i01qa8c4gb4a")))
...)
@end lisp
@end deffn
@deffn {Scheme procedure} elm->package-name @var{elm-name}
Returns the Guix-style package name for an Elm package with upstream name
@var{elm-name}.
Note that there is more than one possible @var{elm-name} for which
@code{elm->package-name} will produce a given result.
@end deffn
@deffn {Scheme procedure} guix-package->elm-name @var{package}
Given an Elm @var{package}, returns the possibly-inferred upstream name, or
@code{#f} the upstream name is not specified via the @code{'upstream-name}
property and can not be inferred by @code{infer-elm-package-name}.
@end deffn
@deffn {Scheme procedure} infer-elm-package-name @var{guix-name}
Given the @var{guix-name} of an Elm package, returns the inferred upstream
name, or @code{#f} if the upstream name can't be inferred. If the result is
not @code{#f}, supplying it to @code{elm->package-name} would produce
@var{guix-name}.
@end deffn
@node Fonts @node Fonts
@subsection Fonts @subsection Fonts
@ -1911,6 +1993,28 @@ Currently, some parts of Guix cannot be translated on Weblate, help wanted!
translated. translated.
@end itemize @end itemize
@subsubheading Conditions for Inclusion
There are no conditions for adding new translations of the @code{guix} and
@code{guix-packages} components, other than they need at least one translated
string. New languages will be added to Guix as soon as possible. The
files may be removed if they fall out of sync and have no more translated
strings.
Given that the web site is dedicated to new users, we want its translation
to be as complete as possible before we include it in the language menu.
For a new language to be included, it needs to reach at least 80% completion.
When a language is included, it may be removed in the future if it stays
out of sync and falls below 60% completion.
The manual and cookbook are automatically added in the default compilation
target. Every time we synchronize translations, developers need to
recompile all the translated manuals and cookbooks. This is useless for what
is essentially the English manual or cookbook. Therefore, we will only
include a new language when it reaches 10% completion in the component.
When a language is included, it may be removed in the future if it stays
out of sync and falls below 5% completion.
@subsubheading Translation Infrastructure @subsubheading Translation Infrastructure
Weblate is backed by a git repository from which it discovers new strings to Weblate is backed by a git repository from which it discovers new strings to

13
doc/guix-cookbook.texi
View file

@ -296,7 +296,7 @@ online}, together with
@uref{https://ocw.mit.edu/courses/electrical-engineering-and-computer-science/6-001-structure-and-interpretation-of-computer-programs-spring-2005/video-lectures/, @uref{https://ocw.mit.edu/courses/electrical-engineering-and-computer-science/6-001-structure-and-interpretation-of-computer-programs-spring-2005/video-lectures/,
videos of the lectures by the authors}. The book is available in Texinfo videos of the lectures by the authors}. The book is available in Texinfo
format as the @code{sicp} Guix package. Go ahead, run @code{guix install format as the @code{sicp} Guix package. Go ahead, run @code{guix install
sicp} and start reading with @code{info sicp} (@pxref{,,, sicp, Structure and Interpretation of Computer Programs}). sicp} and start reading with @code{info sicp} (@pxref{Top,,, sicp, Structure and Interpretation of Computer Programs}).
An @uref{https://sarabander.github.io/sicp/, unofficial ebook is also An @uref{https://sarabander.github.io/sicp/, unofficial ebook is also
available}. available}.
@ -903,7 +903,7 @@ Installed in the store and in the profile, as well as
being present at build time. being present at build time.
@end table @end table
@xref{Package Reference,,, guix, GNU Guix Reference Manual} for more details. @xref{package Reference,,, guix, GNU Guix Reference Manual} for more details.
The distinction between the various inputs is important: if a dependency can be The distinction between the various inputs is important: if a dependency can be
handled as an @emph{input} instead of a @emph{propagated input}, it should be done so, or handled as an @emph{input} instead of a @emph{propagated input}, it should be done so, or
@ -2533,8 +2533,9 @@ Let's dive in the set up!
@node Basic setup with manifests @node Basic setup with manifests
@subsection Basic setup with manifests @subsection Basic setup with manifests
A Guix profile can be set up @emph{via} a so-called @emph{manifest specification} that looks like A Guix profile can be set up @i{via} a @dfn{manifest}. A manifest is a
this: snippet of Scheme code that specifies the set of packages you want to
have in your profile; it looks like this:
@lisp @lisp
(specifications->manifest (specifications->manifest
@ -2547,8 +2548,8 @@ this:
"package-N")) "package-N"))
@end lisp @end lisp
@pxref{Invoking guix package,,, guix, GNU Guix Reference Manual}, for @xref{Writing Manifests,,, guix, GNU Guix Reference Manual}, for
the syntax details. more information about the syntax.
We can create a manifest specification per profile and install them this way: We can create a manifest specification per profile and install them this way:

1054
doc/guix.texi
View file

File diff suppressed because it is too large Load diff

9
doc/htmlxref.cnf
View file

@ -1,9 +1,9 @@
# htmlxref.cnf - reference file for free Texinfo manuals on the web. # htmlxref.cnf - reference file for free Texinfo manuals on the web.
# Modified by Ludovic Courtès <ludo@gnu.org> for the GNU Guix manual. # Modified by Ludovic Courtès <ludo@gnu.org> for the GNU Guix manual.
htmlxrefversion=2021-09-24.23; # UTC htmlxrefversion=2022-04-08.17; # UTC
# Copyright 2010-2020 Free Software Foundation, Inc. # Copyright 2010-2020, 2022 Free Software Foundation, Inc.
# #
# Copying and distribution of this file, with or without modification, # Copying and distribution of this file, with or without modification,
# are permitted in any medium without royalty provided the copyright # are permitted in any medium without royalty provided the copyright
@ -414,7 +414,8 @@ guile-gtk node ${GS}/guile-gtk/docs/guile-gtk/
guile-rpc mono ${GS}/guile-rpc/manual/guile-rpc.html guile-rpc mono ${GS}/guile-rpc/manual/guile-rpc.html
guile-rpc node ${GS}/guile-rpc/manual/html_node/ guile-rpc node ${GS}/guile-rpc/manual/html_node/
GUIX = ${GS}/guix/manual GUIX_ROOT = https://guix.gnu.org
GUIX = ${GUIX_ROOT}/guix/manual
guix.de mono ${GUIX}/de/guix.de.html guix.de mono ${GUIX}/de/guix.de.html
guix.de node ${GUIX}/de/html_node/ guix.de node ${GUIX}/de/html_node/
guix.es mono ${GUIX}/es/guix.es.html guix.es mono ${GUIX}/es/guix.es.html
@ -428,7 +429,7 @@ GUIX = ${GS}/guix/manual
guix mono ${GUIX}/en/guix.html guix mono ${GUIX}/en/guix.html
guix node ${GUIX}/en/html_node/ guix node ${GUIX}/en/html_node/
GUIX_COOKBOOK = ${GS}/guix/cookbook GUIX_COOKBOOK = ${GUIX_ROOT}/cookbook
guix-cookbook.de mono ${GUIX_COOKBOOK}/de/guix-cookbook.html guix-cookbook.de mono ${GUIX_COOKBOOK}/de/guix-cookbook.html
guix-cookbook.de node ${GUIX_COOKBOOK}/de/html_node/ guix-cookbook.de node ${GUIX_COOKBOOK}/de/html_node/
guix-cookbook.fr mono ${GUIX_COOKBOOK}/fr/guix-cookbook.html guix-cookbook.fr mono ${GUIX_COOKBOOK}/fr/guix-cookbook.html

18
doc/local.mk
View file

@ -22,8 +22,8 @@
# along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. # along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
# If adding a language, update the following variables, and info_TEXINFOS. # If adding a language, update the following variables, and info_TEXINFOS.
MANUAL_LANGUAGES = de es fa fi fr it ko pt_BR ru sk zh_CN MANUAL_LANGUAGES = de es fr pt_BR ru zh_CN
COOKBOOK_LANGUAGES = de es fa fi fr ko pt_BR ru sk uk zh_Hans COOKBOOK_LANGUAGES = de fr ko sk
# Arg1: A list of languages codes. # Arg1: A list of languages codes.
# Arg2: The file name stem. # Arg2: The file name stem.
@ -34,27 +34,15 @@ lang_to_texinfo = $(foreach lang,$(1),%D%/$(2).$(lang).texi)
info_TEXINFOS = %D%/guix.texi \ info_TEXINFOS = %D%/guix.texi \
%D%/guix.de.texi \ %D%/guix.de.texi \
%D%/guix.es.texi \ %D%/guix.es.texi \
%D%/guix.fa.texi \
%D%/guix.fi.texi \
%D%/guix.fr.texi \ %D%/guix.fr.texi \
%D%/guix.it.texi \
%D%/guix.ko.texi \
%D%/guix.pt_BR.texi \ %D%/guix.pt_BR.texi \
%D%/guix.ru.texi \ %D%/guix.ru.texi \
%D%/guix.sk.texi \
%D%/guix.zh_CN.texi \ %D%/guix.zh_CN.texi \
%D%/guix-cookbook.texi \ %D%/guix-cookbook.texi \
%D%/guix-cookbook.de.texi \ %D%/guix-cookbook.de.texi \
%D%/guix-cookbook.es.texi \
%D%/guix-cookbook.fa.texi \
%D%/guix-cookbook.fi.texi \
%D%/guix-cookbook.fr.texi \ %D%/guix-cookbook.fr.texi \
%D%/guix-cookbook.ko.texi \ %D%/guix-cookbook.ko.texi \
%D%/guix-cookbook.pt_BR.texi \ %D%/guix-cookbook.sk.texi
%D%/guix-cookbook.ru.texi \
%D%/guix-cookbook.sk.texi \
%D%/guix-cookbook.uk.texi \
%D%/guix-cookbook.zh_Hans.texi
%C%_guix_TEXINFOS = \ %C%_guix_TEXINFOS = \
%D%/contributing.texi \ %D%/contributing.texi \

197
etc/committer.scm.in
View file

@ -6,6 +6,7 @@
;;; Copyright © 2020, 2021 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2020, 2021 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev> ;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz> ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -28,19 +29,19 @@
;;; Code: ;;; Code:
(import (sxml xpath) (use-modules ((sxml xpath) #:prefix xpath:)
(srfi srfi-1) (srfi srfi-1)
(srfi srfi-2) (srfi srfi-2)
(srfi srfi-9) (srfi srfi-9)
(srfi srfi-11) (srfi srfi-11)
(srfi srfi-26) (srfi srfi-26)
(ice-9 format) (ice-9 format)
(ice-9 popen) (ice-9 popen)
(ice-9 match) (ice-9 match)
(ice-9 rdelim) (ice-9 rdelim)
(ice-9 regex) (ice-9 regex)
(ice-9 textual-ports) (ice-9 textual-ports)
(guix gexp)) (guix gexp))
(define* (break-string str #:optional (max-line-length 70)) (define* (break-string str #:optional (max-line-length 70))
"Break the string STR into lines that are no longer than MAX-LINE-LENGTH. "Break the string STR into lines that are no longer than MAX-LINE-LENGTH.
@ -100,12 +101,16 @@ LINE-NO in PORT."
(read-line port) (read-line port)
(loop (1- i) last-top-level-sexp)))))) (loop (1- i) last-top-level-sexp))))))
;;; Whether the hunk contains a newly added package (definition), a removed
;;; package (removal) or something else (#false).
(define hunk-types '(addition removal #false))
(define-record-type <hunk> (define-record-type <hunk>
(make-hunk file-name (make-hunk file-name
old-line-number old-line-number
new-line-number new-line-number
diff-lines diff-lines
definition?) type)
hunk? hunk?
(file-name hunk-file-name) (file-name hunk-file-name)
;; Line number before the change ;; Line number before the change
@ -114,8 +119,8 @@ LINE-NO in PORT."
(new-line-number hunk-new-line-number) (new-line-number hunk-new-line-number)
;; The full diff to be used with "git apply --cached" ;; The full diff to be used with "git apply --cached"
(diff-lines hunk-diff-lines) (diff-lines hunk-diff-lines)
;; Does this hunk add a definition? ;; Does this hunk add or remove a package?
(definition? hunk-definition?)) (type hunk-type)) ;one of 'hunk-types'
(define* (hunk->patch hunk #:optional (port (current-output-port))) (define* (hunk->patch hunk #:optional (port (current-output-port)))
(let ((file-name (hunk-file-name hunk))) (let ((file-name (hunk-file-name hunk)))
@ -133,25 +138,30 @@ LINE-NO in PORT."
;; new definitions with changes to existing ;; new definitions with changes to existing
;; definitions. ;; definitions.
"--unified=1" "--unified=1"
"gnu"))) "--" "gnu")))
(define (extract-line-number line-tag) (define (extract-line-number line-tag)
(abs (string->number (abs (string->number
(car (string-split line-tag #\,))))) (car (string-split line-tag #\,)))))
(define (read-hunk) (define (read-hunk)
(let loop ((lines '()) (let loop ((lines '())
(definition? #false)) (type #false))
(let ((line (read-line port 'concat))) (let ((line (read-line port 'concat)))
(cond (cond
((eof-object? line) ((eof-object? line)
(values (reverse lines) definition?)) (values (reverse lines) type))
((or (string-prefix? "@@ " line) ((or (string-prefix? "@@ " line)
(string-prefix? "diff --git" line)) (string-prefix? "diff --git" line))
(unget-string port line) (unget-string port line)
(values (reverse lines) definition?)) (values (reverse lines) type))
(else (else
(loop (cons line lines) (loop (cons line lines)
(or definition? (or type
(string-prefix? "+(define" line)))))))) (cond
((string-prefix? "+(define" line)
'addition)
((string-prefix? "-(define" line)
'removal)
(else #false)))))))))
(define info (define info
(let loop ((acc '()) (let loop ((acc '())
(file-name #f)) (file-name #f))
@ -166,13 +176,13 @@ LINE-NO in PORT."
(match (string-split line #\space) (match (string-split line #\space)
((_ old-start new-start . _) ((_ old-start new-start . _)
(let-values (let-values
(((diff-lines definition?) (read-hunk))) (((diff-lines type) (read-hunk)))
(loop (cons (make-hunk file-name (loop (cons (make-hunk file-name
(extract-line-number old-start) (extract-line-number old-start)
(extract-line-number new-start) (extract-line-number new-start)
(cons (string-append line "\n") (cons (string-append line "\n")
diff-lines) diff-lines)
definition?) acc) type) acc)
file-name))))) file-name)))))
(else (loop acc file-name)))))) (else (loop acc file-name))))))
(close-pipe port) (close-pipe port)
@ -214,10 +224,10 @@ corresponding to the top-level definition containing the staged changes."
(define* (change-commit-message file-name old new #:optional (port (current-output-port))) (define* (change-commit-message file-name old new #:optional (port (current-output-port)))
"Print ChangeLog commit message for changes between OLD and NEW." "Print ChangeLog commit message for changes between OLD and NEW."
(define (get-values expr field) (define (get-values expr field)
(match ((sxpath `(// ,field quasiquote *)) expr) (match ((xpath:sxpath `(// ,field quasiquote *)) expr)
(() (()
;; New-style plain lists ;; New-style plain lists
(match ((sxpath `(// ,field list *)) expr) (match ((xpath:sxpath `(// ,field list *)) expr)
((inner) inner) ((inner) inner)
(_ '()))) (_ '())))
;; Old-style labelled inputs ;; Old-style labelled inputs
@ -234,7 +244,7 @@ corresponding to the top-level definition containing the staged changes."
(define variable-name (define variable-name
(second old)) (second old))
(define version (define version
(and=> ((sxpath '(// version *any*)) new) (and=> ((xpath:sxpath '(// version *any*)) new)
first)) first))
(format port (format port
"gnu: ~a: Update to ~a.~%~%* ~a (~a): Update to ~a.~%" "gnu: ~a: Update to ~a.~%~%* ~a (~a): Update to ~a.~%"
@ -262,10 +272,18 @@ corresponding to the top-level definition containing the staged changes."
(listify added)))))))))) (listify added))))))))))
'(inputs propagated-inputs native-inputs))) '(inputs propagated-inputs native-inputs)))
(define* (add-commit-message file-name variable-name #:optional (port (current-output-port))) (define* (add-commit-message file-name variable-name
"Print ChangeLog commit message for a change to FILE-NAME adding a definition." #:optional (port (current-output-port)))
(format port "Print ChangeLog commit message for a change to FILE-NAME adding a
"gnu: Add ~a.~%~%* ~a (~a): New variable.~%" definition."
(format port "gnu: Add ~a.~%~%* ~a (~a): New variable.~%"
variable-name file-name variable-name))
(define* (remove-commit-message file-name variable-name
#:optional (port (current-output-port)))
"Print ChangeLog commit message for a change to FILE-NAME removing a
definition."
(format port "gnu: Remove ~a.~%~%* ~a (~a): Delete variable.~%"
variable-name file-name variable-name)) variable-name file-name variable-name))
(define* (custom-commit-message file-name variable-name message changelog (define* (custom-commit-message file-name variable-name message changelog
@ -344,66 +362,67 @@ modifying."
(() (()
(display "Nothing to be done.\n" (current-error-port))) (display "Nothing to be done.\n" (current-error-port)))
(hunks (hunks
(let-values (let-values (((definitions changes) (partition hunk-type hunks)))
(((definitions changes) ;; Additions/removals.
(partition hunk-definition? hunks))) (for-each
(lambda (hunk)
(and-let* ((define-line (find (cut string-match "(\\+|-)\\(define" <>)
(hunk-diff-lines hunk)))
(variable-name (and=> (string-tokenize define-line)
second))
(commit-message-proc (match (hunk-type hunk)
('addition add-commit-message)
('removal remove-commit-message))))
(commit-message-proc (hunk-file-name hunk) variable-name)
(let ((port (open-pipe* OPEN_WRITE
"git" "apply"
"--cached"
"--unidiff-zero")))
(hunk->patch hunk port)
(unless (eqv? 0 (status:exit-val (close-pipe port)))
(error "Cannot apply")))
;; Additions. (let ((port (open-pipe* OPEN_WRITE "git" "commit" "-F" "-")))
(for-each (lambda (hunk) (commit-message-proc (hunk-file-name hunk) variable-name port)
(and-let* (usleep %delay)
((define-line (find (cut string-prefix? "+(define" <>) (unless (eqv? 0 (status:exit-val (close-pipe port)))
(hunk-diff-lines hunk))) (error "Cannot commit"))))
(variable-name (and=> (string-tokenize define-line) second))) (usleep %delay))
(add-commit-message (hunk-file-name hunk) variable-name) definitions))
(let ((port (open-pipe* OPEN_WRITE
"git" "apply"
"--cached"
"--unidiff-zero")))
(hunk->patch hunk port)
(unless (eqv? 0 (status:exit-val (close-pipe port)))
(error "Cannot apply")))
(let ((port (open-pipe* OPEN_WRITE "git" "commit" "-F" "-"))) ;; Changes.
(add-commit-message (hunk-file-name hunk) (for-each
variable-name port) (match-lambda
(usleep %delay) ((new old . hunks)
(for-each (lambda (hunk)
(let ((port (open-pipe* OPEN_WRITE
"git" "apply"
"--cached"
"--unidiff-zero")))
(hunk->patch hunk port)
(unless (eqv? 0 (status:exit-val (close-pipe port))) (unless (eqv? 0 (status:exit-val (close-pipe port)))
(error "Cannot commit")))) (error "Cannot apply")))
(usleep %delay)) (usleep %delay))
definitions) hunks)
(define copyright-line
;; Changes. (any (lambda (line) (and=> (string-prefix? "+;;; Copyright ©" line)
(for-each (match-lambda (const line)))
((new old . hunks) (hunk-diff-lines (first hunks))))
(for-each (lambda (hunk) (cond
(let ((port (open-pipe* OPEN_WRITE (copyright-line
"git" "apply" (add-copyright-line copyright-line))
"--cached" (else
"--unidiff-zero"))) (let ((port (open-pipe* OPEN_WRITE "git" "commit" "-F" "-")))
(hunk->patch hunk port) (change-commit-message* (hunk-file-name (first hunks))
(unless (eqv? 0 (status:exit-val (close-pipe port))) old new)
(error "Cannot apply"))) (change-commit-message* (hunk-file-name (first hunks))
(usleep %delay)) old new
hunks) port)
(define copyright-line (usleep %delay)
(any (lambda (line) (and=> (string-prefix? "+;;; Copyright ©" line) (unless (eqv? 0 (status:exit-val (close-pipe port)))
(const line))) (error "Cannot commit")))))))
(hunk-diff-lines (first hunks)))) ;; XXX: we recompute the hunks here because previous
(cond ;; insertions lead to offsets.
(copyright-line (new+old+hunks (diff-info))))))
(add-copyright-line copyright-line))
(else
(let ((port (open-pipe* OPEN_WRITE "git" "commit" "-F" "-")))
(change-commit-message* (hunk-file-name (first hunks))
old new)
(change-commit-message* (hunk-file-name (first hunks))
old new
port)
(usleep %delay)
(unless (eqv? 0 (status:exit-val (close-pipe port)))
(error "Cannot commit")))))))
;; XXX: we recompute the hunks here because previous
;; insertions lead to offsets.
(new+old+hunks (diff-info)))))))
(apply main (cdr (command-line))) (apply main (cdr (command-line)))

61
etc/completion/bash/guix
View file

@ -117,58 +117,59 @@ _guix_is_removing ()
$result $result
} }
_guix_is_short_option ()
{
case "${COMP_WORDS[$COMP_CWORD - 1]}" in
--*) false;;
-*$1) true ;;
*) false ;;
esac
}
_guix_is_long_option ()
{
# Don't handle (non-GNU?) ‘--long-option VALUE’, as Guix doesn't either.
case "${COMP_WORDS[$COMP_CWORD]}" in
--$1=*) true ;;
*) false ;;
esac
}
_guix_is_dash_f () _guix_is_dash_f ()
{ {
[ "${COMP_WORDS[$COMP_CWORD - 1]}" = "-f" ] \ _guix_is_short_option f ||
|| { case "${COMP_WORDS[$COMP_CWORD]}" in _guix_is_long_option file ||
--file=*|--install-from-file=*) true;; _guix_is_long_option install-from-file
*) false;;
esac }
} }
_guix_is_dash_l () _guix_is_dash_l ()
{ {
[ "${COMP_WORDS[$COMP_CWORD - 1]}" = "-l" ] \ _guix_is_short_option l ||
|| { case "${COMP_WORDS[$COMP_CWORD]}" in _guix_is_long_option load
--load=*) true;;
*) false;;
esac }
} }
_guix_is_dash_L () _guix_is_dash_L ()
{ {
[ "${COMP_WORDS[$COMP_CWORD - 1]}" = "-L" ] \ _guix_is_short_option L ||
|| { case "${COMP_WORDS[$COMP_CWORD]}" in _guix_is_long_option load-path
--load-path=*) true;;
*) false;;
esac }
} }
_guix_is_dash_m () _guix_is_dash_m ()
{ {
[ "${COMP_WORDS[$COMP_CWORD - 1]}" = "-m" ] \ _guix_is_short_option m ||
|| { case "${COMP_WORDS[$COMP_CWORD]}" in _guix_is_long_option manifest
--manifest=*) true;;
*) false;;
esac }
} }
_guix_is_dash_C () _guix_is_dash_C ()
{ {
[ "${COMP_WORDS[$COMP_CWORD - 1]}" = "-C" ] \ _guix_is_short_option C ||
|| { case "${COMP_WORDS[$COMP_CWORD]}" in _guix_is_long_option channels
--channels=*) true;;
*) false;;
esac }
} }
_guix_is_dash_p () _guix_is_dash_p ()
{ {
[ "${COMP_WORDS[$COMP_CWORD - 1]}" = "-p" ] \ _guix_is_short_option p ||
|| { case "${COMP_WORDS[$COMP_CWORD]}" in _guix_is_long_option profile
--profile=*) true;;
*) false;;
esac }
} }
_guix_complete_file () _guix_complete_file ()

163
etc/news.scm
View file

@ -13,7 +13,7 @@
;; Copyright © 2021 Leo Famulari <leo@famulari.name> ;; Copyright © 2021 Leo Famulari <leo@famulari.name>
;; Copyright © 2021 Zhu Zihao <all_but_last@163.com> ;; Copyright © 2021 Zhu Zihao <all_but_last@163.com>
;; Copyright © 2021 Chris Marusich <cmmarusich@gmail.com> ;; Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be> ;; Copyright © 2021, 2022 Maxime Devos <maximedevos@telenet.be>
;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz> ;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
;; Copyright © 2021 Andrew Tropin <andrew@trop.in> ;; Copyright © 2021 Andrew Tropin <andrew@trop.in>
;; Copyright © 2021 Jonathan Brielmaier <jonathan.brielmaier@web.de> ;; Copyright © 2021 Jonathan Brielmaier <jonathan.brielmaier@web.de>
@ -25,6 +25,167 @@
(channel-news (channel-news
(version 0) (version 0)
(entry (commit "35c1edb20ad07250728d3bdcd0296bd0cedaf6bb")
(title
(en "New @command{edit} sub-commands for services")
(de "Neue @command{edit}-Unterbefehle für Dienste")
(fr "Nouvelles commandes @command{edit} pour les services")
(nl "Nieuwe deelopdracht @command{edit} voor diensten"))
(body
(en "The new @command{guix system edit} and @command{guix home edit} commands
allow you to view or edit service types defined for Guix System or Guix Home.
For example, here is how you would open the definition of the OpenSSH system
service:
@example
guix system edit openssh
@end example
Run @command{info \"(guix) Invoking guix system\"} or @command{info \"(guix)
Invoking guix home\"} for more info.")
(de "Mit den neuen Befehlen @command{guix system edit} und
@command{guix home edit} können Sie Diensttypen für Guix System oder Guix Home
betrachten und bearbeiten. Zum Beispiel würden Sie die Definition des
OpenSSH-Systemdienstes wie folgt öffnen:
@example
guix system edit openssh
@end example
Führen Sie @command{info \"(guix.de) Aufruf von guix system\"} oder
@command{info \"(guix.de) Aufruf von guix home\"} aus, um mehr zu erfahren.")
(fr "Les nouvelles commandes @command{guix system edit} et
@command{guix home edit} permettent de visualiser ou d'éditer les types de
services définis pour Guix System ou Guix Home. Par exemple, voici comment
ouvrir la définition du service système OpenSSH :
@example
guix system edit openssh
@end example
Lancer @command{info \"(guix.fr) Invoquer guix system\"} ou @command{info
\"(guix.fr) Invoquer guix home\"} pour plus d'informations.")
;; TODO: pas verwijzingen naar de handleiding aan wanneer ze vertaald is
(nl "Met de nieuwe bewerkingen @command{guix system edit} en
@command{guix home edit} kan je dienstsoorten van Guix System en Guix
Home bekijken en bewerken. Je kan bijvoorbeeld de definitie van de
systeemdienst OpenSSH als volgt openen:
@example
guix system edit openssh
@end example
Voer @command{info \"(guix) Invoking guix system\"} of @command{info
\"(guix)Invoking guix home\"} uit voor meer informatie.")))
(entry (commit "903c82583e1cec4c9ff09d5895c5cc646c37b661")
(title
(en "New @command{guix import elm} command")
(de "Neuer Befehl @command{guix import elm}")
(fr "Nouvelle commande @command{guix import elm}"))
(body
(en "The new @command{guix import elm} command allows packagers to
generate a package definition or given the name of a package for Elm, a
functional programming language for the Web:
@example
guix import elm elm/bytes
@end example
Run @command{info \"(guix) Invoking guix import\"} for more info.
This comes with a new build system for Elm packages---run @command{info
\"(guix) Build Systems\"} for details.")
(de "Mit dem neuen Befehl @command{guix import elm} können Paketautoren
eine Paketdefinition anhand des Namens eines Pakets für Elm, einer funktionalen
Programmiersprache für das Web, erzeugen:
@example
guix import elm elm/bytes
@end example
Führen Sie @command{info \"(guix.de) Aufruf von guix import\"} aus, um mehr
Informationen zu bekommen.
Dazu kommt ein neues Erstellungssystem für Elm-Pakete. Führen Sie
@command{info \"(guix.de) Erstellungssysteme\"} aus, um mehr zu erfahren.")
(fr "La nouvelle commande @command{guix import elm} permet de générer
une définition de paquet reposant sur Elm, un langage de programmation
fonctionnelle pour le Web:
@example
guix import elm elm/bytes
@end example
Lancer @command{info \"(guix.fr) Invoquer guix import\"} pour plus
d'informations.
Cela vient avec un nouveau système de construction pour paquets Elm---lancer
@command{info \"(guix.fr) Systèmes de construction\"} pour plus de détails.")))
(entry (commit "b6b2de2a0d52530bc1ee128c61580bed662ee15c")
(title (en "Linux-libre kernel updated to 5.17")
(de "Linux-libre-Kernel wird auf 5.17 aktualisiert"))
(body
(en "The default version of the linux-libre kernel has been
updated to the 5.17 release series.")
(de "Der standardmäßig verwendete @code{linux-libre}-Kernel basiert
jetzt auf der 5.17-Versionsreihe.")))
(entry (commit "c42b7baf13c7633b4512e94da7445299c57b247d")
(title
(en "New @option{--export-manifest} option for @command{guix shell}")
(de "Neue Option @option{--export-manifest} für @command{guix shell}")
(fr "Nouvelle option @option{--export-manifest} de @command{guix shell}"))
(body
(en "If you use @command{guix shell}, you might wonder how to
``translate'' a command line into a manifest file that you can keep under
version control, share with others, and pass to @command{guix shell -m} and in
fact to most @command{guix} commands. This is what the new
@option{--export-manifest} option does.
For example, the command below prints a manifest for the given packages:
@lisp
guix shell --export-manifest \\
-D guile git emacs emacs-geiser emacs-geiser-guile
@end lisp
Run @code{info \"(guix) Invoking guix shell\"} for more information.")
(de "Wenn Sie @command{guix shell} benutzen, haben Sie sich vielleicht
einmal gefragt, wie Sie eine Befehlszeile in eine Manifest-Datei „übersetzen“
können, die Sie unter Versionskontrolle stellen können, mit anderen teilen
können und an @command{guix shell -m} oder tatsächlich die meisten anderen
@command{guix}-Befehle übergeben können. Die Antwort ist die neue
Befehlszeilenoption @option{--export-manifest}.
Zum Beispiel gibt der folgende Befehl ein Manifest mit den genannten Paketen
aus:
@lisp
guix shell --export-manifest \\
-D guile git emacs emacs-geiser emacs-geiser-guile
@end lisp
Führen Sie @command{info \"(guix.de) Aufruf von guix shell\"} aus, um mehr
zu erfahren.")
(fr "Si tu utilises @command{guix shell}, tu t'es peut-être déjà
demandé comment « traduire » une ligne de commande en un fichier manifeste que
tu puisse garder en gestion de version, partager et passer à @command{guix
shell -m} et autres commandes @command{guix}. C'est ce que la nouvelle option
@option{--export-manifest} fait.
Par exemple, la commande ci-dessous affiche un manifeste pour les paquets
donnés :
@lisp
guix shell --export-manifest \\
-D guile git emacs emacs-geiser emacs-geiser-guile
@end lisp
Lancer @code{info \"(guix.fr) Invoquer guix shell\"} pour plus
d'informations.")))
(entry (commit "094a2cfbe45c104d0da30ff9d975d052ca0c118c") (entry (commit "094a2cfbe45c104d0da30ff9d975d052ca0c118c")
(title (title
(en "New @command{guix home container} command") (en "New @command{guix home container} command")

4
etc/release-manifest.scm
View file

@ -23,7 +23,7 @@
(use-modules (gnu packages) (use-modules (gnu packages)
(guix packages) (guix packages)
(guix profiles) (guix profiles)
((gnu ci) #:select (%cross-targets)) ((guix platform) #:select (targets))
((gnu services xorg) #:select (%default-xorg-modules)) ((gnu services xorg) #:select (%default-xorg-modules))
(guix utils) (guix utils)
(srfi srfi-1) (srfi srfi-1)
@ -144,7 +144,7 @@ TARGET."
%packages-to-cross-build))) %packages-to-cross-build)))
;; XXX: Important bits like libsigsegv and libffi don't support ;; XXX: Important bits like libsigsegv and libffi don't support
;; RISCV at the moment, so don't require RISCV support. ;; RISCV at the moment, so don't require RISCV support.
(delete "riscv64-linux-gnu" %cross-targets)))) (delete "riscv64-linux-gnu" (targets)))))
(define %cross-bootstrap-manifest (define %cross-bootstrap-manifest
(manifest (manifest

13
etc/snippets/text-mode/guix-commit-message-remove-package Normal file
View file

@ -0,0 +1,13 @@
# -*- mode: snippet -*-
# name: guix-commit-message-remove-package
# key: remove
# condition: git-commit-mode
# --
gnu: Remove ${1:`(with-temp-buffer
(magit-git-wash #'magit-diff-wash-diffs
"diff" "--staged")
(goto-char (point-min))
(when (re-search-forward "\\-(define-public \\(\\S-+\\)" nil 'noerror)
(match-string-no-properties 1)))`}.
* `(car (magit-staged-files))` ($1): Delete variable.

39
etc/system-tests.scm
View file

@ -18,6 +18,8 @@
(use-modules (gnu tests) (use-modules (gnu tests)
(gnu packages package-management) (gnu packages package-management)
(guix monads)
(guix store)
((gnu ci) #:select (channel-source->package)) ((gnu ci) #:select (channel-source->package))
((guix git-download) #:select (git-predicate)) ((guix git-download) #:select (git-predicate))
((guix utils) #:select (current-source-directory)) ((guix utils) #:select (current-source-directory))
@ -41,6 +43,21 @@ determined."
(repository-close! repository)) (repository-close! repository))
#f)))) #f))))
(define-syntax mparameterize
(syntax-rules ()
"This form implements dynamic scoping, similar to 'parameterize', but in a
monadic context."
((_ monad ((parameter value) rest ...) body ...)
(let ((old-value (parameter)))
(mbegin monad
;; XXX: Non-local exits are not correctly handled.
(return (parameter value))
(mlet monad ((result (mparameterize monad (rest ...) body ...)))
(parameter old-value)
(return result)))))
((_ monad () body ...)
(mbegin monad body ...))))
(define (tests-for-current-guix source commit) (define (tests-for-current-guix source commit)
"Return a list of tests for perform, using Guix built from SOURCE, a channel "Return a list of tests for perform, using Guix built from SOURCE, a channel
instance." instance."
@ -48,15 +65,19 @@ instance."
;; of tests to run in the usual way: ;; of tests to run in the usual way:
;; ;;
;; make check-system TESTS=installed-os ;; make check-system TESTS=installed-os
(parameterize ((current-guix-package (let ((guix (channel-source->package source #:commit commit)))
(channel-source->package source #:commit commit))) (map (lambda (test)
(match (getenv "TESTS") (system-test
(#f (inherit test)
(all-system-tests)) (value (mparameterize %store-monad ((current-guix-package guix))
((= string-tokenize (tests ...)) (system-test-value test)))))
(filter (lambda (test) (match (getenv "TESTS")
(member (system-test-name test) tests)) (#f
(all-system-tests)))))) (all-system-tests))
((= string-tokenize (tests ...))
(filter (lambda (test)
(member (system-test-name test) tests))
(all-system-tests)))))))
(define (system-test->manifest-entry test) (define (system-test->manifest-entry test)
"Return a manifest entry for TEST, a system test." "Return a manifest entry for TEST, a system test."

34
gnu/bootloader/grub.scm
View file

@ -7,6 +7,7 @@
;;; Copyright © 2019, 2020 Miguel Ángel Arruga Vivas <rosen644835@gmail.com> ;;; Copyright © 2019, 2020 Miguel Ángel Arruga Vivas <rosen644835@gmail.com>
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 Stefan <stefan-guix@vodafonemail.de> ;;; Copyright © 2020 Stefan <stefan-guix@vodafonemail.de>
;;; Copyright © 2022 Karl Hallsby <karl@hallsby.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -50,10 +51,12 @@
grub-theme-color-highlight grub-theme-color-highlight
grub-theme-gfxmode grub-theme-gfxmode
install-grub-efi-removable
install-grub-efi-netboot install-grub-efi-netboot
grub-bootloader grub-bootloader
grub-efi-bootloader grub-efi-bootloader
grub-efi-removable-bootloader
grub-efi-netboot-bootloader grub-efi-netboot-bootloader
grub-mkrescue-bootloader grub-mkrescue-bootloader
grub-minimal-bootloader grub-minimal-bootloader
@ -608,6 +611,31 @@ fi~%"))))
"--bootloader-id=Guix" "--bootloader-id=Guix"
"--efi-directory" target-esp))))) "--efi-directory" target-esp)))))
(define install-grub-efi-removable
#~(lambda (bootloader efi-dir mount-point)
;; NOTE: mount-point is /mnt in guix system init /etc/config.scm /mnt/point
;; NOTE: efi-dir comes from target list of booloader configuration
;; There is nothing useful to do when called in the context of a disk
;; image generation.
(when efi-dir
;; Install GRUB onto the EFI partition mounted at EFI-DIR, for the
;; system whose root is mounted at MOUNT-POINT.
(let ((grub-install (string-append bootloader "/sbin/grub-install"))
(install-dir (string-append mount-point "/boot"))
;; When installing Guix, it's common to mount EFI-DIR below
;; MOUNT-POINT rather than /boot/efi on the live image.
(target-esp (if (file-exists? (string-append mount-point efi-dir))
(string-append mount-point efi-dir)
efi-dir)))
;; Tell 'grub-install' that there might be a LUKS-encrypted /boot or
;; root partition.
(setenv "GRUB_ENABLE_CRYPTODISK" "y")
(invoke/quiet grub-install "--boot-directory" install-dir
"--removable"
;; "--no-nvram"
"--bootloader-id=Guix"
"--efi-directory" target-esp)))))
(define (install-grub-efi-netboot subdir) (define (install-grub-efi-netboot subdir)
"Define a grub-efi-netboot bootloader installer for installation in SUBDIR, "Define a grub-efi-netboot bootloader installer for installation in SUBDIR,
which is usually efi/Guix or efi/boot." which is usually efi/Guix or efi/boot."
@ -734,6 +762,12 @@ considered for security aspects."
(name 'grub-efi) (name 'grub-efi)
(package grub-efi))) (package grub-efi)))
(define grub-efi-removable-bootloader
(bootloader
(inherit grub-efi-bootloader)
(name 'grub-efi-removable-bootloader)
(installer install-grub-efi-removable)))
(define grub-efi-netboot-bootloader (define grub-efi-netboot-bootloader
(bootloader (bootloader
(inherit grub-efi-bootloader) (inherit grub-efi-bootloader)

118
gnu/build/file-systems.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2020, 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014-2018, 2020-2022 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017 David Craven <david@craven.ch> ;;; Copyright © 2016, 2017 David Craven <david@craven.ch>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net>
@ -54,6 +54,7 @@
bind-mount bind-mount
system*/tty
mount-flags->bit-mask mount-flags->bit-mask
check-file-system check-file-system
mount-file-system mount-file-system
@ -67,6 +68,33 @@
;;; ;;;
;;; Code: ;;; Code:
(define (system*/console program . args)
"Run PROGRAM with ARGS in a tty on top of /dev/console. The return value is
as for 'system*'."
(match (primitive-fork)
(0
(dynamic-wind
(const #t)
(lambda ()
(login-tty (open-fdes "/dev/console" O_RDWR))
(apply execlp program program args))
(lambda ()
(primitive-_exit 127))))
(pid
(cdr (waitpid pid)))))
(define (system*/tty program . args)
"Run PROGRAM with ARGS, creating a tty if its standard input isn't one.
The return value is as for 'system*'.
This is necessary for commands such as 'cryptsetup open' or 'fsck' that may
need to interact with the user but might be invoked from shepherd, where
standard input is /dev/null."
(apply (if (isatty? (current-input-port))
system*
system*/console)
program args))
(define (bind-mount source target) (define (bind-mount source target)
"Bind-mount SOURCE at TARGET." "Bind-mount SOURCE at TARGET."
(mount source target "" MS_BIND)) (mount source target "" MS_BIND))
@ -180,13 +208,13 @@ true, check the file system even if it's marked as clean. If REPAIR is false,
do not write to the file system to fix errors. If it's #t, fix all do not write to the file system to fix errors. If it's #t, fix all
errors. Otherwise, fix only those considered safe to repair automatically." errors. Otherwise, fix only those considered safe to repair automatically."
(match (status:exit-val (match (status:exit-val
(apply system* `("e2fsck" "-v" "-C" "0" (apply system*/tty "e2fsck" "-v" "-C" "0"
,@(if force? '("-f") '()) `(,@(if force? '("-f") '())
,@(match repair ,@(match repair
(#f '("-n")) (#f '("-n"))
(#t '("-y")) (#t '("-y"))
(_ '("-p"))) (_ '("-p")))
,device))) ,device)))
(0 'pass) (0 'pass)
(1 'errors-corrected) (1 'errors-corrected)
(2 'reboot-required) (2 'reboot-required)
@ -312,14 +340,14 @@ errors. Otherwise, fix only those considered safe to repair automatically."
(status (status
;; A number, or #f on abnormal termination (e.g., assertion failure). ;; A number, or #f on abnormal termination (e.g., assertion failure).
(status:exit-val (status:exit-val
(apply system* `("bcachefs" "fsck" "-v" (apply system*/tty "bcachefs" "fsck" "-v"
,@(if force? '("-f") '()) `(,@(if force? '("-f") '())
,@(match repair ,@(match repair
(#f '("-n")) (#f '("-n"))
(#t '("-y")) (#t '("-y"))
(_ '("-p"))) (_ '("-p")))
;; Make each multi-device member a separate argument. ;; Make each multi-device member a separate argument.
,@(string-split device #\:)))))) ,@(string-split device #\:))))))
(match (and=> status (cut logand <> (lognot ignored-bits))) (match (and=> status (cut logand <> (lognot ignored-bits)))
(0 'pass) (0 'pass)
(1 'errors-corrected) (1 'errors-corrected)
@ -364,17 +392,17 @@ false, do not write to DEVICE. If it's #t, fix any errors found. Otherwise,
fix only those considered safe to repair automatically." fix only those considered safe to repair automatically."
(if force? (if force?
(match (status:exit-val (match (status:exit-val
(apply system* `("btrfs" "check" "--progress" (apply system*/tty "btrfs" "check" "--progress"
;; Btrfs's ‘--force’ is not relevant to us here. ;; Btrfs's ‘--force’ is not relevant to us here.
,@(match repair `(,@(match repair
;; Upstream considers ALL repairs dangerous ;; Upstream considers ALL repairs dangerous
;; and will warn the user at run time. ;; and will warn the user at run time.
(#t '("--repair")) (#t '("--repair"))
(_ '("--readonly" ; a no-op for clarity (_ '("--readonly" ; a no-op for clarity
;; A 466G file system with 180G used is ;; A 466G file system with 180G used is
;; enough to kill btrfs with 6G of RAM. ;; enough to kill btrfs with 6G of RAM.
"--mode" "lowmem"))) "--mode" "lowmem")))
,device))) ,device)))
(0 'pass) (0 'pass)
(_ 'fatal-error)) (_ 'fatal-error))
'pass)) 'pass))
@ -412,11 +440,11 @@ ignored: a full file system scan is always performed. If REPAIR is false, do
not write to the file system to fix errors. Otherwise, automatically fix them not write to the file system to fix errors. Otherwise, automatically fix them
using the least destructive approach." using the least destructive approach."
(match (status:exit-val (match (status:exit-val
(apply system* `("fsck.vfat" "-v" (system*/tty "fsck.vfat" "-v"
,@(match repair (match repair
(#f '("-n")) (#f "-n")
(_ '("-a"))) ; no 'safe/#t distinction (_ "-a")) ;no 'safe/#t distinction
,device))) device))
(0 'pass) (0 'pass)
(1 'errors-corrected) (1 'errors-corrected)
(_ 'fatal-error))) (_ 'fatal-error)))
@ -545,7 +573,7 @@ do not write to the file system to fix errors, and replay the transaction log
only if FORCE? is true. Otherwise, replay the transaction log before checking only if FORCE? is true. Otherwise, replay the transaction log before checking
and automatically fix found errors." and automatically fix found errors."
(match (status:exit-val (match (status:exit-val
(apply system* (apply system*/tty
`("jfs_fsck" "-v" `("jfs_fsck" "-v"
;; The ‘LEVEL’ logic is convoluted. To quote fsck/xchkdsk.c ;; The ‘LEVEL’ logic is convoluted. To quote fsck/xchkdsk.c
;; (‘-p’, ‘-a’, and ‘-r’ are aliases in every way): ;; (‘-p’, ‘-a’, and ‘-r’ are aliases in every way):
@ -621,10 +649,10 @@ REPAIR are true, automatically fix found errors."
"warning: forced check of F2FS ~a implies repairing any errors~%" "warning: forced check of F2FS ~a implies repairing any errors~%"
device)) device))
(match (status:exit-val (match (status:exit-val
(apply system* `("fsck.f2fs" (apply system*/tty "fsck.f2fs"
,@(if force? '("-f") '()) `(,@(if force? '("-f") '())
,@(if repair '("-p") '("--dry-run")) ,@(if repair '("-p") '("--dry-run"))
,device))) ,device)))
;; 0 and -1 are the only two possibilities according to the man page. ;; 0 and -1 are the only two possibilities according to the man page.
(0 'pass) (0 'pass)
(_ 'fatal-error))) (_ 'fatal-error)))
@ -709,9 +737,9 @@ ignored: a full check is always performed. Repair is not possible: if REPAIR is
true and the volume has been repaired by an external tool, clear the volume true and the volume has been repaired by an external tool, clear the volume
dirty flag to indicate that it's now safe to mount." dirty flag to indicate that it's now safe to mount."
(match (status:exit-val (match (status:exit-val
(apply system* `("ntfsfix" (system*/tty "ntfsfix"
,@(if repair '("--clear-dirty") '("--no-action")) (if repair "--clear-dirty" "--no-action")
,device))) device))
(0 'pass) (0 'pass)
(_ 'fatal-error))) (_ 'fatal-error)))
@ -754,11 +782,11 @@ write to DEVICE. If it's #t, replay the log, check, and fix any errors found.
Otherwise, only replay the log, and check without attempting further repairs." Otherwise, only replay the log, and check without attempting further repairs."
(define (xfs_repair) (define (xfs_repair)
(status:exit-val (status:exit-val
(apply system* `("xfs_repair" "-Pv" (system*/tty "xfs_repair" "-Pv"
,@(match repair (match repair
(#t '("-e")) (#t "-e")
(_ '("-n"))) ; will miss some errors (_ "-n")) ;will miss some errors
,device)))) device)))
(if force? (if force?
;; xfs_repair fails with exit status 2 if the log is dirty, which is ;; xfs_repair fails with exit status 2 if the log is dirty, which is
;; likely in situations where you're running xfs_repair. Only the kernel ;; likely in situations where you're running xfs_repair. Only the kernel

31
gnu/build/image.scm
View file

@ -5,6 +5,7 @@
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020, 2022 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2020, 2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2022 Pavel Shlyak <p.shlyak@pantherx.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -48,12 +49,13 @@
"Take SEXP, a tuple as returned by 'partition->gexp', and turn it into a "Take SEXP, a tuple as returned by 'partition->gexp', and turn it into a
<partition> record." <partition> record."
(match sexp (match sexp
((size file-system file-system-options label uuid) ((size file-system file-system-options label uuid flags)
(partition (size size) (partition (size size)
(file-system file-system) (file-system file-system)
(file-system-options file-system-options) (file-system-options file-system-options)
(label label) (label label)
(uuid uuid))))) (uuid uuid)
(flags flags)))))
(define (size-in-kib size) (define (size-in-kib size)
"Convert SIZE expressed in bytes, to kilobytes and return it as a string." "Convert SIZE expressed in bytes, to kilobytes and return it as a string."
@ -78,6 +80,7 @@ turn doesn't take any constant overhead into account, force a 1-MiB minimum."
(fs-options (partition-file-system-options partition)) (fs-options (partition-file-system-options partition))
(label (partition-label partition)) (label (partition-label partition))
(uuid (partition-uuid partition)) (uuid (partition-uuid partition))
(flags (partition-flags partition))
(journal-options "lazy_itable_init=1,lazy_journal_init=1")) (journal-options "lazy_itable_init=1,lazy_journal_init=1"))
(apply invoke (apply invoke
`("fakeroot" "mke2fs" "-t" ,fs "-d" ,root `("fakeroot" "mke2fs" "-t" ,fs "-d" ,root
@ -92,16 +95,18 @@ turn doesn't take any constant overhead into account, force a 1-MiB minimum."
(estimate-partition-size root) (estimate-partition-size root)
size))))))) size)))))))
(define* (make-vfat-image partition target root) (define* (make-vfat-image partition target root fs-bits)
"Handle the creation of VFAT partition images. See 'make-partition-image'." "Handle the creation of VFAT partition images. See 'make-partition-image'."
(let ((size (partition-size partition)) (let ((size (partition-size partition))
(label (partition-label partition))) (label (partition-label partition))
(invoke "fakeroot" "mkdosfs" "-n" label "-C" target (flags (partition-flags partition)))
"-F" "16" "-S" "1024" (apply invoke "fakeroot" "mkdosfs" "-n" label "-C" target
(size-in-kib "-F" (number->string fs-bits)
(if (eq? size 'guess) (size-in-kib
(estimate-partition-size root) (if (eq? size 'guess)
size))) (estimate-partition-size root)
size))
(if (member 'esp flags) (list "-S" "1024") '()))
(for-each (lambda (file) (for-each (lambda (file)
(unless (member file '("." "..")) (unless (member file '("." ".."))
(invoke "mcopy" "-bsp" "-i" target (invoke "mcopy" "-bsp" "-i" target
@ -117,8 +122,10 @@ ROOT directory to populate the image."
(cond (cond
((string-prefix? "ext" type) ((string-prefix? "ext" type)
(make-ext-image partition target root)) (make-ext-image partition target root))
((string=? type "vfat") ((or (string=? type "vfat") (string=? type "fat16"))
(make-vfat-image partition target root)) (make-vfat-image partition target root 16))
((string=? type "fat32")
(make-vfat-image partition target root 32))
(else (else
(raise (condition (raise (condition
(&message (&message

78
gnu/build/linux-container.scm
View file

@ -301,8 +301,28 @@ delete it when leaving the dynamic extent of this call."
(lambda () (lambda ()
(false-if-exception (delete-file-recursively tmp-dir)))))) (false-if-exception (delete-file-recursively tmp-dir))))))
(define (wait-child-process)
"Wait for one child process and return a pair, like 'waitpid', or return #f
if there are no child processes left."
(catch 'system-error
(lambda ()
(waitpid WAIT_ANY))
(lambda args
(if (= ECHILD (system-error-errno args))
#f
(apply throw args)))))
(define (status->exit-status status)
"Reify STATUS as an exit status."
(or (status:exit-val status)
;; See <http://www.tldp.org/LDP/abs/html/exitcodes.html#EXITCODESREF>.
(+ 128 (or (status:term-sig status)
(status:stop-sig status)))))
(define* (call-with-container mounts thunk #:key (namespaces %namespaces) (define* (call-with-container mounts thunk #:key (namespaces %namespaces)
(host-uids 1) (guest-uid 0) (guest-gid 0) (host-uids 1) (guest-uid 0) (guest-gid 0)
(relayed-signals (list SIGINT SIGTERM))
(child-is-pid1? #t)
(process-spawned-hook (const #t))) (process-spawned-hook (const #t)))
"Run THUNK in a new container process and return its exit status; call "Run THUNK in a new container process and return its exit status; call
PROCESS-SPAWNED-HOOK with the PID of the new process that has been spawned. PROCESS-SPAWNED-HOOK with the PID of the new process that has been spawned.
@ -320,20 +340,64 @@ can map more than a single uid/gid.
GUEST-UID and GUEST-GID specify the first UID (respectively GID) that host GUEST-UID and GUEST-GID specify the first UID (respectively GID) that host
UIDs (respectively GIDs) map to in the namespace. UIDs (respectively GIDs) map to in the namespace.
RELAYED-SIGNALS is the list of signals that are \"relayed\" to the container
process when caught by its parent.
When CHILD-IS-PID1? is true, and if NAMESPACES contains 'pid', then the child
process runs directly as PID 1. As such, it is responsible for (1) installing
signal handlers and (2) reaping terminated processes by calling 'waitpid'.
When CHILD-IS-PID1? is false, a new intermediate process is created instead
that takes this responsibility.
Note that if THUNK needs to load any additional Guile modules, the relevant Note that if THUNK needs to load any additional Guile modules, the relevant
module files must be present in one of the mappings in MOUNTS and the Guile module files must be present in one of the mappings in MOUNTS and the Guile
load path must be adjusted as needed." load path must be adjusted as needed."
(define thunk*
(if (and (memq 'pid namespaces)
(not child-is-pid1?))
(lambda ()
;; Behave like an init process: create a sub-process that calls
;; THUNK, and wait for child processes. Furthermore, forward
;; RELAYED-SIGNALS to the child process.
(match (primitive-fork)
(0
(call-with-clean-exit thunk))
(pid
(install-signal-handlers pid)
(let loop ()
(match (wait-child-process)
((child . status)
(if (= child pid)
(primitive-exit (status->exit-status status))
(loop)))
(#f
(primitive-exit 128))))))) ;cannot happen
thunk))
(define (periodically-schedule-asyncs)
;; XXX: In Guile there's a time window where a signal-handling async could
;; be queued without being processed by the time we enter a blocking
;; syscall like waitpid(2) (info "(guile) Signals"). This terrible hack
;; ensures pending asyncs get a chance to run periodically.
(sigaction SIGALRM (lambda _ (alarm 1)))
(alarm 1))
(define (install-signal-handlers pid)
;; Install handlers that forward signals to PID.
(define (relay-signal signal)
(false-if-exception (kill pid signal)))
(periodically-schedule-asyncs)
(for-each (lambda (signal)
(sigaction signal relay-signal))
relayed-signals))
(call-with-temporary-directory (call-with-temporary-directory
(lambda (root) (lambda (root)
(let ((pid (run-container root mounts namespaces host-uids thunk (let ((pid (run-container root mounts namespaces host-uids thunk*
#:guest-uid guest-uid #:guest-uid guest-uid
#:guest-gid guest-gid))) #:guest-gid guest-gid)))
;; Catch SIGINT and kill the container process. (install-signal-handlers pid)
(sigaction SIGINT
(lambda (signum)
(false-if-exception
(kill pid SIGKILL))))
(process-spawned-hook pid) (process-spawned-hook pid)
(match (waitpid pid) (match (waitpid pid)
((_ . status) status)))))) ((_ . status) status))))))

45
gnu/build/marionette.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016-2022 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018 Chris Marusich <cmmarusich@gmail.com> ;;; Copyright © 2018 Chris Marusich <cmmarusich@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -196,31 +196,38 @@ FILE has not shown up after TIMEOUT seconds, raise an error."
(error "file didn't show up" file)))) (error "file didn't show up" file))))
(define* (wait-for-tcp-port port marionette (define* (wait-for-tcp-port port marionette
#:key (timeout 20)) #:key
(timeout 20)
(address `(make-socket-address AF_INET
INADDR_LOOPBACK
,port)))
"Wait for up to TIMEOUT seconds for PORT to accept connections in "Wait for up to TIMEOUT seconds for PORT to accept connections in
MARIONETTE. Raise an error on failure." MARIONETTE. ADDRESS must be an expression that returns a socket address,
typically a call to 'make-socket-address'. Raise an error on failure."
;; Note: The 'connect' loop has to run within the guest because, when we ;; Note: The 'connect' loop has to run within the guest because, when we
;; forward ports to the host, connecting to the host never raises ;; forward ports to the host, connecting to the host never raises
;; ECONNREFUSED. ;; ECONNREFUSED.
(match (marionette-eval (match (marionette-eval
`(begin `(let* ((address ,address)
(let ((sock (socket PF_INET SOCK_STREAM 0))) (sock (socket (sockaddr:fam address) SOCK_STREAM 0)))
(let loop ((i 0)) (let loop ((i 0))
(catch 'system-error (catch 'system-error
(lambda () (lambda ()
(connect sock AF_INET INADDR_LOOPBACK ,port) (connect sock address)
(close-port sock) (close-port sock)
'success) 'success)
(lambda args (lambda args
(if (< i ,timeout) (if (< i ,timeout)
(begin (begin
(sleep 1) (sleep 1)
(loop (+ 1 i))) (loop (+ 1 i)))
'failure)))))) (list 'failure address))))))
marionette) marionette)
('success #t) ('success #t)
('failure (('failure address)
(error "nobody's listening on port" port)))) (error "nobody's listening on port"
(list (inet-ntop (sockaddr:fam address) (sockaddr:addr address))
(sockaddr:port address))))))
(define* (wait-for-unix-socket file-name marionette (define* (wait-for-unix-socket file-name marionette
#:key (timeout 20)) #:key (timeout 20))

90
gnu/build/secret-service.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020, 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2020-2022 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -47,6 +47,52 @@
;; to syslog. ;; to syslog.
#'(format (current-output-port) fmt args ...)))))) #'(format (current-output-port) fmt args ...))))))
(define-syntax with-modules
(syntax-rules ()
"Dynamically load the given MODULEs at run time, making the chosen
bindings available within the lexical scope of BODY."
((_ ((module #:select (bindings ...)) rest ...) body ...)
(let* ((iface (resolve-interface 'module))
(bindings (module-ref iface 'bindings))
...)
(with-modules (rest ...) body ...)))
((_ () body ...)
(begin body ...))))
(define (wait-for-readable-fd port timeout)
"Wait until PORT has data available for reading or TIMEOUT has expired.
Return #t in the former case and #f in the latter case."
(match (resolve-module '(fibers) #f) ;using Fibers?
(#f
(log "blocking on socket...~%")
(match (select (list port) '() '() timeout)
(((_) () ()) #t)
((() () ()) #f)))
(fibers
;; We're running on the Shepherd 0.9+ with Fibers. Arrange to make a
;; non-blocking wait so that other fibers can be scheduled in while we
;; wait for PORT.
(with-modules (((fibers) #:select (spawn-fiber sleep))
((fibers channels)
#:select (make-channel put-message get-message)))
;; Make PORT non-blocking.
(let ((flags (fcntl port F_GETFL)))
(fcntl port F_SETFL (logior O_NONBLOCK flags)))
(let ((channel (make-channel)))
(spawn-fiber
(lambda ()
(sleep timeout) ;suspends the fiber
(put-message channel 'timeout)))
(spawn-fiber
(lambda ()
(lookahead-u8 port) ;suspends the fiber
(put-message channel 'readable)))
(log "suspending fiber on socket...~%")
(match (get-message channel)
('readable #t)
('timeout #f)))))))
(define* (secret-service-send-secrets port secret-root (define* (secret-service-send-secrets port secret-root
#:key (retry 60) #:key (retry 60)
(handshake-timeout 120)) (handshake-timeout 120))
@ -74,7 +120,10 @@ wait for at most HANDSHAKE-TIMEOUT seconds for handshake to complete. Return
(log "sending secrets to ~a~%" port) (log "sending secrets to ~a~%" port)
(let ((sock (socket AF_INET SOCK_STREAM 0)) (let ((sock (socket AF_INET SOCK_STREAM 0))
(addr (make-socket-address AF_INET INADDR_LOOPBACK port))) (addr (make-socket-address AF_INET INADDR_LOOPBACK port))
(sleep (if (resolve-module '(fibers) #f)
(module-ref (resolve-interface '(fibers)) 'sleep)
sleep)))
;; Connect to QEMU on the forwarded port. The 'connect' call succeeds as ;; Connect to QEMU on the forwarded port. The 'connect' call succeeds as
;; soon as QEMU is ready, even if there's no server listening on the ;; soon as QEMU is ready, even if there's no server listening on the
;; forward port inside the guest. ;; forward port inside the guest.
@ -93,23 +142,22 @@ wait for at most HANDSHAKE-TIMEOUT seconds for handshake to complete. Return
;; Wait for "hello" message from the server. This is the only way to know ;; Wait for "hello" message from the server. This is the only way to know
;; that we're really connected to the server inside the guest. ;; that we're really connected to the server inside the guest.
(match (select (list sock) '() '() handshake-timeout) (if (wait-for-readable-fd sock handshake-timeout)
(((_) () ()) (match (read sock)
(match (read sock) (('secret-service-server ('version version ...))
(('secret-service-server ('version version ...)) (log "sending files from ~s...~%" secret-root)
(log "sending files from ~s...~%" secret-root) (send-files sock)
(send-files sock) (log "done sending files to port ~a~%" port)
(log "done sending files to port ~a~%" port) (close-port sock)
(close-port sock) secret-root)
secret-root) (x
(x (log "invalid handshake ~s~%" x)
(log "invalid handshake ~s~%" x) (close-port sock)
(close-port sock) #f))
#f))) (begin ;timeout
((() () ()) ;timeout (log "timeout while sending files to ~a~%" port)
(log "timeout while sending files to ~a~%" port) (close-port sock)
(close-port sock) #f))))
#f))))
(define (delete-file* file) (define (delete-file* file)
"Ensure FILE does not exist." "Ensure FILE does not exist."
@ -202,4 +250,8 @@ and #f otherwise."
(close-port port)) (close-port port))
result)) result))
;;; Local Variables:
;;; eval: (put 'with-modules 'scheme-indent-function 1)
;;; End:
;;; secret-service.scm ends here ;;; secret-service.scm ends here

92
gnu/build/shepherd.scm
View file

@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2017, 2018, 2019, 2020, 2022 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2020 Mathieu Othacehe <othacehe@gnu.org> ;;; Copyright © 2020 Mathieu Othacehe <othacehe@gnu.org>
;;; Copyright © 2022 Leo Nikkilä <hello@lnikki.la>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -30,7 +31,8 @@
exec-command exec-command
%precious-signals) %precious-signals)
#:autoload (shepherd system) (unblock-signals) #:autoload (shepherd system) (unblock-signals)
#:export (make-forkexec-constructor/container #:export (default-mounts
make-forkexec-constructor/container
fork+exec-command/container)) fork+exec-command/container))
;;; Commentary: ;;; Commentary:
@ -103,8 +105,13 @@
separate mount and PID name space. Return the \"outer\" PID. " separate mount and PID name space. Return the \"outer\" PID. "
(match (container-excursion* pid (match (container-excursion* pid
(lambda () (lambda ()
(read-pid-file pid-file ;; XXX: Trick for Shepherd 0.9: prevent 'read-pid-file' from
#:max-delay max-delay))) ;; using (@ (fibers) sleep), which would try to suspend the
;; current task, which doesn't work in this extra process.
(with-continuation-barrier
(lambda ()
(read-pid-file pid-file
#:max-delay max-delay)))))
(#f (#f
;; Send SIGTERM to the whole process group. ;; Send SIGTERM to the whole process group.
(catch-system-error (kill (- pid) SIGTERM)) (catch-system-error (kill (- pid) SIGTERM))
@ -114,6 +121,28 @@ separate mount and PID name space. Return the \"outer\" PID. "
;; PID is always 1, but that's not what Shepherd needs to know. ;; PID is always 1, but that's not what Shepherd needs to know.
pid))) pid)))
(define* (exec-command* command #:key user group log-file pid-file
(supplementary-groups '())
(directory "/") (environment-variables (environ)))
"Like 'exec-command', but first restore signal handles modified by
shepherd (PID 1)."
;; First restore the default handlers.
(for-each (cut sigaction <> SIG_DFL) %precious-signals)
;; Unblock any signals that have been blocked by the parent process.
(unblock-signals %precious-signals)
(mkdir-p "/var/run")
(clean-up pid-file)
(exec-command command
#:user user
#:group group
#:supplementary-groups supplementary-groups
#:log-file log-file
#:directory directory
#:environment-variables environment-variables))
(define* (make-forkexec-constructor/container command (define* (make-forkexec-constructor/container command
#:key #:key
(namespaces (namespaces
@ -121,6 +150,7 @@ separate mount and PID name space. Return the \"outer\" PID. "
(mappings '()) (mappings '())
(user #f) (user #f)
(group #f) (group #f)
(supplementary-groups '())
(log-file #f) (log-file #f)
pid-file pid-file
(pid-file-timeout 5) (pid-file-timeout 5)
@ -164,24 +194,16 @@ namespace, in addition to essential bind-mounts such /proc."
(let ((pid (run-container container-directory (let ((pid (run-container container-directory
mounts namespaces 1 mounts namespaces 1
(lambda () (lambda ()
;; First restore the default handlers. (exec-command* command
(for-each (cut sigaction <> SIG_DFL) #:user user
%precious-signals) #:group group
#:supplementary-groups
;; Unblock any signals that have been blocked supplementary-groups
;; by the parent process. #:pid-file pid-file
(unblock-signals %precious-signals) #:log-file log-file
#:directory directory
(mkdir-p "/var/run") #:environment-variables
(clean-up pid-file) environment-variables)))))
(exec-command command
#:user user
#:group group
#:log-file log-file
#:directory directory
#:environment-variables
environment-variables)))))
(if pid-file (if pid-file
(if (or (memq 'mnt namespaces) (memq 'pid namespaces)) (if (or (memq 'mnt namespaces) (memq 'pid namespaces))
(read-pid-file/container pid pid-file (read-pid-file/container pid pid-file
@ -209,14 +231,24 @@ on Hurd systems for instance, fallback to direct forking."
((head . rest) ((head . rest)
(loop rest (cons head result)))))) (loop rest (cons head result))))))
(let ((container-support? (let ((container-support? (file-exists? "/proc/self/ns")))
(file-exists? "/proc/self/ns")) (if (and container-support?
(fork-proc (lambda () (not (and pid (= pid (getpid)))))
(apply fork+exec-command command (container-excursion* pid
(strip-pid args))))) (lambda ()
(if container-support? ;; Note: In the Shepherd 0.9, 'fork+exec-command' expects to be
(container-excursion* pid fork-proc) ;; called from the shepherd process (because it creates a pipe to
(fork-proc)))) ;; capture stdout/stderr and spawns a logging fiber) so we cannot
;; use it here.
(match (primitive-fork)
(0 (dynamic-wind
(const #t)
(lambda ()
(apply exec-command* command (strip-pid args)))
(lambda ()
(primitive-_exit 127))))
(pid pid)))) ;XXX: assuming the same PID namespace
(apply fork+exec-command command (strip-pid args)))))
;; Local Variables: ;; Local Variables:
;; eval: (put 'container-excursion* 'scheme-indent-function 1) ;; eval: (put 'container-excursion* 'scheme-indent-function 1)

15
gnu/ci.scm
View file

@ -55,6 +55,7 @@
#:use-module (gnu packages multiprecision) #:use-module (gnu packages multiprecision)
#:use-module (gnu packages make-bootstrap) #:use-module (gnu packages make-bootstrap)
#:use-module (gnu packages package-management) #:use-module (gnu packages package-management)
#:use-module (guix platform)
#:use-module (gnu system) #:use-module (gnu system)
#:use-module (gnu system image) #:use-module (gnu system image)
#:use-module (gnu system vm) #:use-module (gnu system vm)
@ -71,7 +72,6 @@
image->job image->job
%core-packages %core-packages
%cross-targets
channel-source->package channel-source->package
arguments->systems arguments->systems
@ -169,17 +169,6 @@ SYSTEM."
(drop-right %core-packages 6) (drop-right %core-packages 6)
%core-packages)) %core-packages))
(define %cross-targets
'("mips64el-linux-gnu"
"arm-linux-gnueabihf"
"aarch64-linux-gnu"
"powerpc-linux-gnu"
"powerpc64le-linux-gnu"
"riscv64-linux-gnu"
"i586-pc-gnu" ;aka. GNU/Hurd
"i686-w64-mingw32"
"x86_64-w64-mingw32"))
(define (cross-jobs store system) (define (cross-jobs store system)
"Return a list of cross-compilation jobs for SYSTEM." "Return a list of cross-compilation jobs for SYSTEM."
(define (from-32-to-64? target) (define (from-32-to-64? target)
@ -221,7 +210,7 @@ SYSTEM."
package target system)) package target system))
(packages-to-cross-build target))) (packages-to-cross-build target)))
(remove (either from-32-to-64? same? pointless?) (remove (either from-32-to-64? same? pointless?)
%cross-targets))) (targets))))
(define* (guix-jobs store systems #:key source commit) (define* (guix-jobs store systems #:key source commit)
"Return a list of jobs for Guix itself." "Return a list of jobs for Guix itself."

45
gnu/home/services.scm
View file

@ -33,12 +33,14 @@
#:use-module (guix modules) #:use-module (guix modules)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (ice-9 match) #:use-module (ice-9 match)
#:use-module (ice-9 vlist)
#:export (home-service-type #:export (home-service-type
home-profile-service-type home-profile-service-type
home-environment-variables-service-type home-environment-variables-service-type
home-files-service-type home-files-service-type
home-xdg-configuration-files-service-type home-xdg-configuration-files-service-type
home-xdg-data-files-service-type
home-run-on-first-login-service-type home-run-on-first-login-service-type
home-activation-service-type home-activation-service-type
home-run-on-change-service-type home-run-on-change-service-type
@ -46,8 +48,10 @@
home-files-directory home-files-directory
xdg-configuration-files-directory xdg-configuration-files-directory
xdg-data-files-directory
fold-home-service-types fold-home-service-types
lookup-home-service-types
home-provenance home-provenance
%initialize-gettext) %initialize-gettext)
@ -285,10 +289,10 @@ directory containing FILES."
(description "Files that will be put in (description "Files that will be put in
@file{~~/.guix-home/files}, and further processed during activation."))) @file{~~/.guix-home/files}, and further processed during activation.")))
(define xdg-configuration-files-directory "config") (define xdg-configuration-files-directory ".config")
(define (xdg-configuration-files files) (define (xdg-configuration-files files)
"Add config/ prefix to each file-path in FILES." "Add .config/ prefix to each file-path in FILES."
(map (match-lambda (map (match-lambda
((file-path . rest) ((file-path . rest)
(cons (string-append xdg-configuration-files-directory "/" file-path) (cons (string-append xdg-configuration-files-directory "/" file-path)
@ -296,7 +300,7 @@ directory containing FILES."
files)) files))
(define home-xdg-configuration-files-service-type (define home-xdg-configuration-files-service-type
(service-type (name 'home-files) (service-type (name 'home-xdg-configuration)
(extensions (extensions
(list (service-extension home-files-service-type (list (service-extension home-files-service-type
xdg-configuration-files))) xdg-configuration-files)))
@ -304,7 +308,30 @@ directory containing FILES."
(extend append) (extend append)
(default-value '()) (default-value '())
(description "Files that will be put in (description "Files that will be put in
@file{~~/.guix-home/files/config}, and further processed during activation."))) @file{~~/.guix-home/files/.config}, and further processed during activation.")))
(define xdg-data-files-directory ".local/share")
(define (xdg-data-files files)
"Add .local/share prefix to each file-path in FILES."
(map (match-lambda
((file-path . rest)
(cons (string-append xdg-data-files-directory "/" file-path)
rest)))
files))
(define home-xdg-data-files-service-type
(service-type (name 'home-xdg-data)
(extensions
(list (service-extension home-files-service-type
xdg-data-files)))
(compose concatenate)
(extend append)
(default-value '())
(description "Files that will be put in
@file{~~/.guix-home/files/.local/share}, and further processed during
activation.")))
(define %initialize-gettext (define %initialize-gettext
#~(begin #~(begin
@ -580,3 +607,13 @@ environment, and its configuration file, when available.")))
(define* (fold-home-service-types proc seed) (define* (fold-home-service-types proc seed)
(fold-service-types proc seed (all-home-service-modules))) (fold-service-types proc seed (all-home-service-modules)))
(define lookup-home-service-types
(let ((table
(delay (fold-home-service-types (lambda (type result)
(vhash-consq (service-type-name type)
type result))
vlist-null))))
(lambda (name)
"Return the list of services with the given NAME (a symbol)."
(vhash-foldq* cons '() name (force table)))))

36
gnu/home/services/shells.scm
View file

@ -77,7 +77,7 @@ user's customizations. Extend home-shell-profile service only if you
really know what you do.")) really know what you do."))
(define (add-shell-profile-file config) (define (add-shell-profile-file config)
`(("profile" `((".profile"
,(mixed-text-file ,(mixed-text-file
"shell-profile" "shell-profile"
"\ "\
@ -211,18 +211,18 @@ source ~/.profile
(zsh-serialize-field config field))))) (zsh-serialize-field config field)))))
(define (zsh-get-configuration-files config) (define (zsh-get-configuration-files config)
`(("zprofile" ,(zsh-file-by-field config 'zprofile)) ;; Always non-empty `((".zprofile" ,(zsh-file-by-field config 'zprofile)) ;; Always non-empty
,@(if (and (zsh-field-not-empty? config 'zshenv) ,@(if (or (zsh-field-not-empty? config 'zshenv)
(zsh-field-not-empty? config 'environment-variables)) (zsh-field-not-empty? config 'environment-variables))
`(("zshenv" ,(zsh-file-by-field config 'zshenv))) '()) `((".zshenv" ,(zsh-file-by-field config 'zshenv))) '())
,@(if (zsh-field-not-empty? config 'zshrc) ,@(if (zsh-field-not-empty? config 'zshrc)
`(("zshrc" ,(zsh-file-by-field config 'zshrc))) '()) `((".zshrc" ,(zsh-file-by-field config 'zshrc))) '())
,@(if (zsh-field-not-empty? config 'zlogin) ,@(if (zsh-field-not-empty? config 'zlogin)
`(("zlogin" ,(zsh-file-by-field config 'zlogin))) '()) `((".zlogin" ,(zsh-file-by-field config 'zlogin))) '())
,@(if (zsh-field-not-empty? config 'zlogout) ,@(if (zsh-field-not-empty? config 'zlogout)
`(("zlogout" ,(zsh-file-by-field config 'zlogout))) '()))) `((".zlogout" ,(zsh-file-by-field config 'zlogout))) '())))
(define (zsh-home-files config) (define (add-zsh-dot-configuration config)
(define zshenv-auxiliary-file (define zshenv-auxiliary-file
(mixed-text-file (mixed-text-file
"zshenv-auxiliary" "zshenv-auxiliary"
@ -230,14 +230,14 @@ source ~/.profile
"[[ -f $ZDOTDIR/.zshenv ]] && source $ZDOTDIR/.zshenv\n")) "[[ -f $ZDOTDIR/.zshenv ]] && source $ZDOTDIR/.zshenv\n"))
(if (home-zsh-configuration-xdg-flavor? config) (if (home-zsh-configuration-xdg-flavor? config)
`(("zshenv" ,zshenv-auxiliary-file)) `((".zshenv" ,zshenv-auxiliary-file))
(zsh-get-configuration-files config))) (zsh-get-configuration-files config)))
(define (zsh-xdg-configuration-files config) (define (add-zsh-xdg-configuration config)
(if (home-zsh-configuration-xdg-flavor? config) (if (home-zsh-configuration-xdg-flavor? config)
(map (map
(lambda (lst) (lambda (lst)
(cons (string-append "zsh/." (car lst)) (cons (string-append "zsh/" (car lst))
(cdr lst))) (cdr lst)))
(zsh-get-configuration-files config)) (zsh-get-configuration-files config))
'())) '()))
@ -298,10 +298,10 @@ source ~/.profile
(extensions (extensions
(list (service-extension (list (service-extension
home-files-service-type home-files-service-type
zsh-home-files) add-zsh-dot-configuration)
(service-extension (service-extension
home-xdg-configuration-files-service-type home-xdg-configuration-files-service-type
zsh-xdg-configuration-files) add-zsh-xdg-configuration)
(service-extension (service-extension
home-profile-service-type home-profile-service-type
add-zsh-packages))) add-zsh-packages)))
@ -430,7 +430,7 @@ alias grep='grep --color=auto'\n")
(field-obj (car (filter-fields field)))) (field-obj (car (filter-fields field))))
(if (or extra-content (if (or extra-content
(not (null? ((configuration-field-getter field-obj) config)))) (not (null? ((configuration-field-getter field-obj) config))))
`(,(object->snake-case-string file-name) `(,(string-append "." (object->snake-case-string file-name))
,(apply mixed-text-file ,(apply mixed-text-file
(object->snake-case-string file-name) (object->snake-case-string file-name)
(append (or extra-content '()) (append (or extra-content '())
@ -439,7 +439,7 @@ alias grep='grep --color=auto'\n")
(filter (filter
(compose not null?) (compose not null?)
`(("bash_profile" `((".bash_profile"
,(mixed-text-file ,(mixed-text-file
"bash_profile" "bash_profile"
"\ "\
@ -586,7 +586,7 @@ when typed in the shell, will automatically expand to the full text."
serialize-fish-abbreviations)) serialize-fish-abbreviations))
(define (fish-files-service config) (define (fish-files-service config)
`(("config/fish/config.fish" `(("fish/config.fish"
,(mixed-text-file ,(mixed-text-file
"fish-config.fish" "fish-config.fish"
#~(string-append "\ #~(string-append "\
@ -650,7 +650,7 @@ end\n\n")
(service-type (name 'home-fish) (service-type (name 'home-fish)
(extensions (extensions
(list (service-extension (list (service-extension
home-files-service-type home-xdg-configuration-files-service-type
fish-files-service) fish-files-service)
(service-extension (service-extension
home-profile-service-type home-profile-service-type

44
gnu/home/services/shepherd.scm
View file

@ -51,7 +51,7 @@
home-shepherd-configuration make-home-shepherd-configuration home-shepherd-configuration make-home-shepherd-configuration
home-shepherd-configuration? home-shepherd-configuration?
(shepherd home-shepherd-configuration-shepherd (shepherd home-shepherd-configuration-shepherd
(default shepherd)) ; package (default shepherd-0.9)) ; package
(auto-start? home-shepherd-configuration-auto-start? (auto-start? home-shepherd-configuration-auto-start?
(default #t)) (default #t))
(services home-shepherd-configuration-services (services home-shepherd-configuration-services
@ -78,12 +78,16 @@ as shepherd package."
'#$files)) '#$files))
(action 'root 'daemonize) (action 'root 'daemonize)
(format #t "Starting services...~%") (format #t "Starting services...~%")
(for-each (let ((services-to-start
(lambda (service) (start service)) '#$(append-map shepherd-service-provision
'#$(append-map shepherd-service-provision (filter shepherd-service-auto-start?
(filter shepherd-service-auto-start? services))))
services))) (if (defined? 'start-in-the-background)
(newline))) (start-in-the-background services-to-start)
(for-each start services-to-start))
(redirect-port (open-input-file "/dev/null")
(current-input-port)))))
(scheme-file "shepherd.conf" config))) (scheme-file "shepherd.conf" config)))
@ -92,17 +96,21 @@ as shepherd package."
(services (home-shepherd-configuration-services config))) (services (home-shepherd-configuration-services config)))
(if (home-shepherd-configuration-auto-start? config) (if (home-shepherd-configuration-auto-start? config)
(with-imported-modules '((guix build utils)) (with-imported-modules '((guix build utils))
#~(let ((log-dir (or (getenv "XDG_LOG_HOME") #~(unless (file-exists?
(format #f "~a/.local/var/log" (getenv "HOME"))))) (string-append
((@ (guix build utils) mkdir-p) log-dir) (or (getenv "XDG_RUNTIME_DIR")
(system* (format #f "/run/user/~a" (getuid)))
#$(file-append shepherd "/bin/shepherd") "/shepherd/socket"))
"--logfile" (let ((log-dir (or (getenv "XDG_LOG_HOME")
(string-append (format #f "~a/.local/var/log"
log-dir (getenv "HOME")))))
"/shepherd.log") ((@ (guix build utils) mkdir-p) log-dir)
"--config" (system*
#$(home-shepherd-configuration-file services shepherd)))) #$(file-append shepherd "/bin/shepherd")
"--logfile"
(string-append log-dir "/shepherd.log")
"--config"
#$(home-shepherd-configuration-file services shepherd)))))
#~""))) #~"")))
(define (reload-configuration-gexp config) (define (reload-configuration-gexp config)

36
gnu/home/services/symlink-manager.scm
View file

@ -54,6 +54,10 @@
(or (getenv "XDG_CONFIG_HOME") (or (getenv "XDG_CONFIG_HOME")
(string-append (getenv "HOME") "/.config"))) (string-append (getenv "HOME") "/.config")))
(define xdg-data-home
(or (getenv "XDG_DATA_HOME")
(string-append (getenv "HOME") "/.local/share")))
(define backup-directory (define backup-directory
(string-append home-directory "/" (number->string (current-time)) (string-append home-directory "/" (number->string (current-time))
"-guix-home-legacy-configs-backup")) "-guix-home-legacy-configs-backup"))
@ -61,19 +65,30 @@
(define (preprocess-file file) (define (preprocess-file file)
"If file is in XDG-CONFIGURATION-FILES-DIRECTORY use "If file is in XDG-CONFIGURATION-FILES-DIRECTORY use
subdirectory from XDG_CONFIG_HOME to generate a target path." subdirectory from XDG_CONFIG_HOME to generate a target path."
(if (string-prefix? #$xdg-configuration-files-directory file) (cond
(string-append ((string-prefix? #$xdg-configuration-files-directory file)
(substring xdg-config-home (string-append
(1+ (string-length home-directory))) (substring xdg-config-home
(substring file (1+ (string-length home-directory)))
(string-length #$xdg-configuration-files-directory))) (substring file
(string-append "." file))) (string-length #$xdg-configuration-files-directory))))
((string-prefix? #$xdg-data-files-directory file)
(string-append
(substring xdg-data-home
(1+ (string-length home-directory)))
(substring file
(string-length #$xdg-data-files-directory))))
(else file)))
(define (target-file file) (define (target-file file)
;; Return the target of FILE, a config file name sans leading dot ;; Return the target of FILE, a config file name sans leading dot
;; such as "config/fontconfig/fonts.conf" or "bashrc". ;; such as "config/fontconfig/fonts.conf" or "bashrc".
(string-append home-directory "/" (preprocess-file file))) (string-append home-directory "/" (preprocess-file file)))
(define (no-follow-file-exists? file)
"Return #t if file exists, even if it's a dangling symlink."
(->bool (false-if-exception (lstat file))))
(define (symlink-to-store? file) (define (symlink-to-store? file)
(catch 'system-error (catch 'system-error
(lambda () (lambda ()
@ -112,7 +127,7 @@ subdirectory from XDG_CONFIG_HOME to generate a target path."
(const #t) (const #t)
(lambda (file stat _) ;leaf (lambda (file stat _) ;leaf
(let ((file (target-file (strip file)))) (let ((file (target-file (strip file))))
(when (file-exists? file) (when (no-follow-file-exists? file)
;; DO NOT remove the file if it is no longer a symlink to ;; DO NOT remove the file if it is no longer a symlink to
;; the store, it will be backed up later during ;; the store, it will be backed up later during
;; create-symlinks phase. ;; create-symlinks phase.
@ -142,6 +157,7 @@ subdirectory from XDG_CONFIG_HOME to generate a target path."
#t #t
(G_ "Skipping ~a (not an empty directory)... done\n") (G_ "Skipping ~a (not an empty directory)... done\n")
directory)) directory))
((= ENOENT errno) #t)
((= ENOTDIR errno) #t) ((= ENOTDIR errno) #t)
(else (else
(apply throw args))))))))) (apply throw args)))))))))
@ -171,7 +187,7 @@ subdirectory from XDG_CONFIG_HOME to generate a target path."
(lambda (file stat result) ;leaf (lambda (file stat result) ;leaf
(let ((source (source-file (strip file))) (let ((source (source-file (strip file)))
(target (target-file (strip file)))) (target (target-file (strip file))))
(when (file-exists? target) (when (no-follow-file-exists? target)
(backup-file (strip file))) (backup-file (strip file)))
(format #t (G_ "Symlinking ~a -> ~a...") (format #t (G_ "Symlinking ~a -> ~a...")
target source) target source)
@ -180,7 +196,7 @@ subdirectory from XDG_CONFIG_HOME to generate a target path."
(lambda (directory stat result) ;down (lambda (directory stat result) ;down
(unless (string=? directory config-file-directory) (unless (string=? directory config-file-directory)
(let ((target (target-file (strip directory)))) (let ((target (target-file (strip directory))))
(when (and (file-exists? target) (when (and (no-follow-file-exists? target)
(not (file-is-directory? target))) (not (file-is-directory? target)))
(backup-file (strip directory))) (backup-file (strip directory)))

5
gnu/home/services/xdg.scm
View file

@ -421,7 +421,8 @@ that the application cannot open the specified MIME type.")
(define (add-xdg-desktop-entry-file entry) (define (add-xdg-desktop-entry-file entry)
(let ((file (first entry)) (let ((file (first entry))
(config (second entry))) (config (second entry)))
(list (format #f "local/share/applications/~a" file) ;; TODO: Use xdg-data-files instead of home-files here
(list (format #f "applications/~a" file)
(apply mixed-text-file (apply mixed-text-file
(format #f "xdg-desktop-~a-entry" file) (format #f "xdg-desktop-~a-entry" file)
config)))) config))))
@ -468,7 +469,7 @@ that the application cannot open the specified MIME type.")
(service-type (name 'home-xdg-mime-applications) (service-type (name 'home-xdg-mime-applications)
(extensions (extensions
(list (service-extension (list (service-extension
home-files-service-type home-xdg-data-files-service-type
home-xdg-mime-applications-files) home-xdg-mime-applications-files)
(service-extension (service-extension
home-xdg-configuration-files-service-type home-xdg-configuration-files-service-type

2
gnu/image.scm
View file

@ -17,7 +17,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu image) (define-module (gnu image)
#:use-module (gnu platform) #:use-module (guix platform)
#:use-module (guix records) #:use-module (guix records)
#:export (partition #:export (partition
partition? partition?

49
gnu/installer/newt/user.scm
View file

@ -40,6 +40,9 @@ REAL-NAME, and HOME-DIRECTORY as the initial values in the form."
(define (pad-label label) (define (pad-label label)
(string-pad-right label 25)) (string-pad-right label 25))
(define (root-account? name)
(string=? name "root"))
(let* ((label-name (let* ((label-name
(make-label -1 -1 (pad-label (G_ "Name")))) (make-label -1 -1 (pad-label (G_ "Name"))))
(label-real-name (label-real-name
@ -116,10 +119,14 @@ REAL-NAME, and HOME-DIRECTORY as the initial values in the form."
GRID-ELEMENT-SUBGRID button-grid) GRID-ELEMENT-SUBGRID button-grid)
title) title)
(let ((error-page (let ((error-empty-field-page
(lambda () (lambda ()
(run-error-page (G_ "Empty inputs are not allowed.") (run-error-page (G_ "Empty inputs are not allowed.")
(G_ "Empty input"))))) (G_ "Empty input"))))
(error-root-page
(lambda ()
(run-error-page (G_ "Root account is automatically created.")
(G_ "Root account")))))
(receive (exit-reason argument) (receive (exit-reason argument)
(run-form form) (run-form form)
(dynamic-wind (dynamic-wind
@ -132,22 +139,28 @@ REAL-NAME, and HOME-DIRECTORY as the initial values in the form."
(real-name (entry-value entry-real-name)) (real-name (entry-value entry-real-name))
(home-directory (entry-value entry-home-directory)) (home-directory (entry-value entry-home-directory))
(password (entry-value entry-password))) (password (entry-value entry-password)))
(if (or (string=? name "") (cond
(string=? home-directory "")) ;; Empty field.
(begin ((or (string=? name "")
(error-page) (string=? home-directory ""))
(run-user-add-page)) (error-empty-field-page)
(let ((password (confirm-password password))) (run-user-add-page))
(if password ;; Reject root account.
(user ((root-account? name)
(name name) (error-root-page)
(real-name real-name) (run-user-add-page))
(home-directory home-directory) (else
(password (make-secret password))) (let ((password (confirm-password password)))
(run-user-add-page #:name name (if password
#:real-name real-name (user
#:home-directory (name name)
home-directory))))))))) (real-name real-name)
(home-directory home-directory)
(password (make-secret password)))
(run-user-add-page #:name name
#:real-name real-name
#:home-directory
home-directory))))))))))
(lambda () (lambda ()
(destroy-form-and-pop form))))))) (destroy-form-and-pop form)))))))

110
gnu/local.mk
View file

@ -11,7 +11,7 @@
# Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com> # Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
# Copyright © 2016, 2017, 2018, 2019 Alex Vong <alexvong1995@gmail.com> # Copyright © 2016, 2017, 2018, 2019 Alex Vong <alexvong1995@gmail.com>
# Copyright © 2016, 2017, 2018, 2019, 2020, 2021, 2022 Efraim Flashner <efraim@flashner.co.il> # Copyright © 2016, 2017, 2018, 2019, 2020, 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
# Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> # Copyright © 2016, 2017, 2018, 2019, 2020, 2021, 2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
# Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> # Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
# Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org> # Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org>
# Copyright © 2017, 2020 Mathieu Othacehe <m.othacehe@gmail.com> # Copyright © 2017, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
@ -49,6 +49,7 @@
# Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com> # Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
# Copyright © 2022 Daniel Meißner <daniel.meissner-i4k@ruhr-uni-bochum.de> # Copyright © 2022 Daniel Meißner <daniel.meissner-i4k@ruhr-uni-bochum.de>
# Copyright © 2022 Remco van 't Veer <remco@remworks.net> # Copyright © 2022 Remco van 't Veer <remco@remworks.net>
# Copyright © 2022 Artyom V. Poptsov <poptsov.artyom@gmail.com>
# #
# This file is part of GNU Guix. # This file is part of GNU Guix.
# #
@ -88,7 +89,6 @@ GNU_SYSTEM_MODULES = \
%D%/home/services/utils.scm \ %D%/home/services/utils.scm \
%D%/home/services/xdg.scm \ %D%/home/services/xdg.scm \
%D%/image.scm \ %D%/image.scm \
%D%/platform.scm \
%D%/packages.scm \ %D%/packages.scm \
%D%/packages/abduco.scm \ %D%/packages/abduco.scm \
%D%/packages/abiword.scm \ %D%/packages/abiword.scm \
@ -119,6 +119,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/autotools.scm \ %D%/packages/autotools.scm \
%D%/packages/avahi.scm \ %D%/packages/avahi.scm \
%D%/packages/avr.scm \ %D%/packages/avr.scm \
%D%/packages/avr-xyz.scm \
%D%/packages/axoloti.scm \ %D%/packages/axoloti.scm \
%D%/packages/backup.scm \ %D%/packages/backup.scm \
%D%/packages/base.scm \ %D%/packages/base.scm \
@ -189,6 +190,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/debian.scm \ %D%/packages/debian.scm \
%D%/packages/debug.scm \ %D%/packages/debug.scm \
%D%/packages/dejagnu.scm \ %D%/packages/dejagnu.scm \
%D%/packages/dezyne.scm \
%D%/packages/dhall.scm \ %D%/packages/dhall.scm \
%D%/packages/dico.scm \ %D%/packages/dico.scm \
%D%/packages/dictionaries.scm \ %D%/packages/dictionaries.scm \
@ -472,6 +474,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/phabricator.scm \ %D%/packages/phabricator.scm \
%D%/packages/php.scm \ %D%/packages/php.scm \
%D%/packages/piet.scm \ %D%/packages/piet.scm \
%D%/packages/pikchr.scm \
%D%/packages/pkg-config.scm \ %D%/packages/pkg-config.scm \
%D%/packages/plan9.scm \ %D%/packages/plan9.scm \
%D%/packages/plotutils.scm \ %D%/packages/plotutils.scm \
@ -609,7 +612,6 @@ GNU_SYSTEM_MODULES = \
%D%/packages/web-browsers.scm \ %D%/packages/web-browsers.scm \
%D%/packages/webkit.scm \ %D%/packages/webkit.scm \
%D%/packages/wget.scm \ %D%/packages/wget.scm \
%D%/packages/wicd.scm \
%D%/packages/wine.scm \ %D%/packages/wine.scm \
%D%/packages/wireservice.scm \ %D%/packages/wireservice.scm \
%D%/packages/wm.scm \ %D%/packages/wm.scm \
@ -627,9 +629,6 @@ GNU_SYSTEM_MODULES = \
%D%/packages/zile.scm \ %D%/packages/zile.scm \
%D%/packages/zwave.scm \ %D%/packages/zwave.scm \
\ \
%D%/platforms/arm.scm \
%D%/platforms/hurd.scm \
\
%D%/services.scm \ %D%/services.scm \
%D%/services/admin.scm \ %D%/services/admin.scm \
%D%/services/audio.scm \ %D%/services/audio.scm \
@ -826,8 +825,6 @@ MODULES_NOT_COMPILED += \
patchdir = $(guilemoduledir)/%D%/packages/patches patchdir = $(guilemoduledir)/%D%/packages/patches
dist_patch_DATA = \ dist_patch_DATA = \
%D%/packages/patches/4store-fix-buildsystem.patch \
%D%/packages/patches/4store-unset-preprocessor-directive.patch \
%D%/packages/patches/a2ps-CVE-2001-1593.patch \ %D%/packages/patches/a2ps-CVE-2001-1593.patch \
%D%/packages/patches/a2ps-CVE-2014-0466.patch \ %D%/packages/patches/a2ps-CVE-2014-0466.patch \
%D%/packages/patches/a2ps-CVE-2015-8107.patch \ %D%/packages/patches/a2ps-CVE-2015-8107.patch \
@ -917,6 +914,7 @@ dist_patch_DATA = \
%D%/packages/patches/bloomberg-bde-cmake-module-path.patch \ %D%/packages/patches/bloomberg-bde-cmake-module-path.patch \
%D%/packages/patches/bloomberg-bde-tools-fix-install-path.patch \ %D%/packages/patches/bloomberg-bde-tools-fix-install-path.patch \
%D%/packages/patches/bpftrace-disable-bfd-disasm.patch \ %D%/packages/patches/bpftrace-disable-bfd-disasm.patch \
%D%/packages/patches/breezy-fix-gio.patch \
%D%/packages/patches/byobu-writable-status.patch \ %D%/packages/patches/byobu-writable-status.patch \
%D%/packages/patches/bubblewrap-fix-locale-in-tests.patch \ %D%/packages/patches/bubblewrap-fix-locale-in-tests.patch \
%D%/packages/patches/cabal-install-base16-bytestring1.0.patch \ %D%/packages/patches/cabal-install-base16-bytestring1.0.patch \
@ -926,7 +924,6 @@ dist_patch_DATA = \
%D%/packages/patches/calibre-no-updates-dialog.patch \ %D%/packages/patches/calibre-no-updates-dialog.patch \
%D%/packages/patches/calibre-remove-test-sqlite.patch \ %D%/packages/patches/calibre-remove-test-sqlite.patch \
%D%/packages/patches/calibre-remove-test-unrar.patch \ %D%/packages/patches/calibre-remove-test-unrar.patch \
%D%/packages/patches/casync-renameat2-declaration.patch \
%D%/packages/patches/catdoc-CVE-2017-11110.patch \ %D%/packages/patches/catdoc-CVE-2017-11110.patch \
%D%/packages/patches/circos-remove-findbin.patch \ %D%/packages/patches/circos-remove-findbin.patch \
%D%/packages/patches/cdparanoia-fpic.patch \ %D%/packages/patches/cdparanoia-fpic.patch \
@ -951,6 +948,7 @@ dist_patch_DATA = \
%D%/packages/patches/clang-11.0-libc-search-path.patch \ %D%/packages/patches/clang-11.0-libc-search-path.patch \
%D%/packages/patches/clang-12.0-libc-search-path.patch \ %D%/packages/patches/clang-12.0-libc-search-path.patch \
%D%/packages/patches/clang-13.0-libc-search-path.patch \ %D%/packages/patches/clang-13.0-libc-search-path.patch \
%D%/packages/patches/clang-14.0-libc-search-path.patch \
%D%/packages/patches/clang-runtime-asan-build-fixes.patch \ %D%/packages/patches/clang-runtime-asan-build-fixes.patch \
%D%/packages/patches/clang-runtime-esan-build-fixes.patch \ %D%/packages/patches/clang-runtime-esan-build-fixes.patch \
%D%/packages/patches/clang-runtime-9-libsanitizer-mode-field.patch \ %D%/packages/patches/clang-runtime-9-libsanitizer-mode-field.patch \
@ -990,8 +988,6 @@ dist_patch_DATA = \
%D%/packages/patches/dbus-c++-gcc-compat.patch \ %D%/packages/patches/dbus-c++-gcc-compat.patch \
%D%/packages/patches/dbus-c++-threading-mutex.patch \ %D%/packages/patches/dbus-c++-threading-mutex.patch \
%D%/packages/patches/dbxfs-remove-sentry-sdk.patch \ %D%/packages/patches/dbxfs-remove-sentry-sdk.patch \
%D%/packages/patches/dealii-fix-compiliation-with-boost-1.78.patch \
%D%/packages/patches/dealii-fix-sundials.patch \
%D%/packages/patches/debops-constants-for-external-program-names.patch \ %D%/packages/patches/debops-constants-for-external-program-names.patch \
%D%/packages/patches/debops-debops-defaults-fall-back-to-less.patch \ %D%/packages/patches/debops-debops-defaults-fall-back-to-less.patch \
%D%/packages/patches/dee-vapi.patch \ %D%/packages/patches/dee-vapi.patch \
@ -1015,25 +1011,31 @@ dist_patch_DATA = \
%D%/packages/patches/ecl-16-ignore-stderr-write-error.patch \ %D%/packages/patches/ecl-16-ignore-stderr-write-error.patch \
%D%/packages/patches/ecl-16-libffi.patch \ %D%/packages/patches/ecl-16-libffi.patch \
%D%/packages/patches/efibootmgr-remove-extra-decl.patch \ %D%/packages/patches/efibootmgr-remove-extra-decl.patch \
%D%/packages/patches/efivar-211.patch \
%D%/packages/patches/eigen-remove-openmp-error-counting.patch \ %D%/packages/patches/eigen-remove-openmp-error-counting.patch \
%D%/packages/patches/eigen-stabilise-sparseqr-test.patch \ %D%/packages/patches/eigen-stabilise-sparseqr-test.patch \
%D%/packages/patches/einstein-build.patch \ %D%/packages/patches/einstein-build.patch \
%D%/packages/patches/elfutils-tests-ptrace.patch \ %D%/packages/patches/elfutils-tests-ptrace.patch \
%D%/packages/patches/elixir-path-length.patch \ %D%/packages/patches/elixir-path-length.patch \
%D%/packages/patches/elm-compiler-disable-reactor.patch \ %D%/packages/patches/elm-offline-package-registry.patch \
%D%/packages/patches/elm-compiler-fix-map-key.patch \ %D%/packages/patches/elm-reactor-static-files.patch \
%D%/packages/patches/elogind-revert-polkit-detection.patch \ %D%/packages/patches/elogind-revert-polkit-detection.patch \
%D%/packages/patches/emacs-deferred-fix-number-of-arguments.patch \
%D%/packages/patches/emacs-exec-path.patch \ %D%/packages/patches/emacs-exec-path.patch \
%D%/packages/patches/emacs-ess-fix-obsolete-function-alias.patch \
%D%/packages/patches/emacs-git-email-missing-parens.patch \
%D%/packages/patches/emacs-fix-scheme-indent-function.patch \ %D%/packages/patches/emacs-fix-scheme-indent-function.patch \
%D%/packages/patches/emacs-ignore-empty-xim-styles.patch \
%D%/packages/patches/emacs-json-reformat-fix-tests.patch \ %D%/packages/patches/emacs-json-reformat-fix-tests.patch \
%D%/packages/patches/emacs-helpful-fix-docstring-test.patch \
%D%/packages/patches/emacs-highlight-stages-add-gexp.patch \ %D%/packages/patches/emacs-highlight-stages-add-gexp.patch \
%D%/packages/patches/emacs-hyperbole-toggle-messaging.patch \ %D%/packages/patches/emacs-hyperbole-toggle-messaging.patch \
%D%/packages/patches/emacs-libgit-use-system-libgit2.patch \ %D%/packages/patches/emacs-libgit-use-system-libgit2.patch \
%D%/packages/patches/emacs-lispy-fix-thread-last-test.patch \
%D%/packages/patches/emacs-source-date-epoch.patch \ %D%/packages/patches/emacs-source-date-epoch.patch \
%D%/packages/patches/emacs-telega-path-placeholder.patch \ %D%/packages/patches/emacs-telega-path-placeholder.patch \
%D%/packages/patches/emacs-telega-test-env.patch \ %D%/packages/patches/emacs-telega-test-env.patch \
%D%/packages/patches/emacs-wordnut-require-adaptive-wrap.patch \ %D%/packages/patches/emacs-wordnut-require-adaptive-wrap.patch \
%D%/packages/patches/emacs-yasnippet-fix-tests.patch \
%D%/packages/patches/enjarify-setup-py.patch \ %D%/packages/patches/enjarify-setup-py.patch \
%D%/packages/patches/enlightenment-fix-setuid-path.patch \ %D%/packages/patches/enlightenment-fix-setuid-path.patch \
%D%/packages/patches/eog-update-libportal-usage.patch \ %D%/packages/patches/eog-update-libportal-usage.patch \
@ -1065,6 +1067,7 @@ dist_patch_DATA = \
%D%/packages/patches/findutils-localstatedir.patch \ %D%/packages/patches/findutils-localstatedir.patch \
%D%/packages/patches/flann-cmake-3.11.patch \ %D%/packages/patches/flann-cmake-3.11.patch \
%D%/packages/patches/flatpak-fix-path.patch \ %D%/packages/patches/flatpak-fix-path.patch \
%D%/packages/patches/flatpak-unset-gdk-pixbuf-for-sandbox.patch \
%D%/packages/patches/fontconfig-cache-ignore-mtime.patch \ %D%/packages/patches/fontconfig-cache-ignore-mtime.patch \
%D%/packages/patches/foobillard++-pkg-config.patch \ %D%/packages/patches/foobillard++-pkg-config.patch \
%D%/packages/patches/foomatic-filters-CVE-2015-8327.patch \ %D%/packages/patches/foomatic-filters-CVE-2015-8327.patch \
@ -1079,11 +1082,10 @@ dist_patch_DATA = \
%D%/packages/patches/fxdiv-system-libraries.patch \ %D%/packages/patches/fxdiv-system-libraries.patch \
%D%/packages/patches/gajim-honour-GAJIM_PLUGIN_PATH.patch \ %D%/packages/patches/gajim-honour-GAJIM_PLUGIN_PATH.patch \
%D%/packages/patches/ganeti-disable-version-symlinks.patch \ %D%/packages/patches/ganeti-disable-version-symlinks.patch \
%D%/packages/patches/ganeti-haskell-compat.patch \
%D%/packages/patches/ganeti-haskell-pythondir.patch \ %D%/packages/patches/ganeti-haskell-pythondir.patch \
%D%/packages/patches/ganeti-pyyaml-compat.patch \
%D%/packages/patches/ganeti-shepherd-master-failover.patch \ %D%/packages/patches/ganeti-shepherd-master-failover.patch \
%D%/packages/patches/ganeti-shepherd-support.patch \ %D%/packages/patches/ganeti-shepherd-support.patch \
%D%/packages/patches/ganeti-sphinx-compat.patch \
%D%/packages/patches/gawk-shell.patch \ %D%/packages/patches/gawk-shell.patch \
%D%/packages/patches/gcc-arm-bug-71399.patch \ %D%/packages/patches/gcc-arm-bug-71399.patch \
%D%/packages/patches/gcc-arm-link-spec-fix.patch \ %D%/packages/patches/gcc-arm-link-spec-fix.patch \
@ -1124,7 +1126,10 @@ dist_patch_DATA = \
%D%/packages/patches/gcc-8-strmov-store-file-names.patch \ %D%/packages/patches/gcc-8-strmov-store-file-names.patch \
%D%/packages/patches/gcc-9-asan-fix-limits-include.patch \ %D%/packages/patches/gcc-9-asan-fix-limits-include.patch \
%D%/packages/patches/gcc-9-strmov-store-file-names.patch \ %D%/packages/patches/gcc-9-strmov-store-file-names.patch \
%D%/packages/patches/gcc-12-strmov-store-file-names.patch \
%D%/packages/patches/gcc-10-cross-environment-variables.patch \ %D%/packages/patches/gcc-10-cross-environment-variables.patch \
%D%/packages/patches/gcc-12-cross-environment-variables.patch \
%D%/packages/patches/gcolor3-update-libportal-usage.patch \
%D%/packages/patches/gd-fix-tests-on-i686.patch \ %D%/packages/patches/gd-fix-tests-on-i686.patch \
%D%/packages/patches/gd-brect-bounds.patch \ %D%/packages/patches/gd-brect-bounds.patch \
%D%/packages/patches/gd-Revert-fix-303-gdlib.pc.patch \ %D%/packages/patches/gd-Revert-fix-303-gdlib.pc.patch \
@ -1207,6 +1212,7 @@ dist_patch_DATA = \
%D%/packages/patches/go-github-com-urfave-cli-fix-tests.patch \ %D%/packages/patches/go-github-com-urfave-cli-fix-tests.patch \
%D%/packages/patches/go-github-com-urfave-cli-v2-fix-tests.patch \ %D%/packages/patches/go-github-com-urfave-cli-v2-fix-tests.patch \
%D%/packages/patches/go-skip-gc-test.patch \ %D%/packages/patches/go-skip-gc-test.patch \
%D%/packages/patches/gourmet-sqlalchemy-compat.patch \
%D%/packages/patches/gpaste-fix-paths.patch \ %D%/packages/patches/gpaste-fix-paths.patch \
%D%/packages/patches/gpm-glibc-2.26.patch \ %D%/packages/patches/gpm-glibc-2.26.patch \
%D%/packages/patches/gpodder-disable-updater.patch \ %D%/packages/patches/gpodder-disable-updater.patch \
@ -1229,6 +1235,7 @@ dist_patch_DATA = \
%D%/packages/patches/guile-3.0-relocatable.patch \ %D%/packages/patches/guile-3.0-relocatable.patch \
%D%/packages/patches/guile-linux-syscalls.patch \ %D%/packages/patches/guile-linux-syscalls.patch \
%D%/packages/patches/guile-3.0-linux-syscalls.patch \ %D%/packages/patches/guile-3.0-linux-syscalls.patch \
%D%/packages/patches/guile-ac-d-bus-fix-tests.patch \
%D%/packages/patches/guile-cross-compilation.patch \ %D%/packages/patches/guile-cross-compilation.patch \
%D%/packages/patches/guile-fibers-destroy-peer-schedulers.patch \ %D%/packages/patches/guile-fibers-destroy-peer-schedulers.patch \
%D%/packages/patches/guile-fibers-wait-for-io-readiness.patch \ %D%/packages/patches/guile-fibers-wait-for-io-readiness.patch \
@ -1245,7 +1252,6 @@ dist_patch_DATA = \
%D%/packages/patches/gtk3-respect-GUIX_GTK3_PATH.patch \ %D%/packages/patches/gtk3-respect-GUIX_GTK3_PATH.patch \
%D%/packages/patches/gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch \ %D%/packages/patches/gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch \
%D%/packages/patches/gtk-doc-respect-xml-catalog.patch \ %D%/packages/patches/gtk-doc-respect-xml-catalog.patch \
%D%/packages/patches/gtk-introspection-test.patch \
%D%/packages/patches/gtk4-respect-GUIX_GTK4_PATH.patch \ %D%/packages/patches/gtk4-respect-GUIX_GTK4_PATH.patch \
%D%/packages/patches/gtkglext-disable-disable-deprecated.patch \ %D%/packages/patches/gtkglext-disable-disable-deprecated.patch \
%D%/packages/patches/gtksourceview-2-add-default-directory.patch \ %D%/packages/patches/gtksourceview-2-add-default-directory.patch \
@ -1271,6 +1277,7 @@ dist_patch_DATA = \
%D%/packages/patches/hueplusplus-mbedtls.patch \ %D%/packages/patches/hueplusplus-mbedtls.patch \
%D%/packages/patches/hurd-cross.patch \ %D%/packages/patches/hurd-cross.patch \
%D%/packages/patches/hurd-xattr.patch \ %D%/packages/patches/hurd-xattr.patch \
%D%/packages/patches/hwloc-1-test-btrfs.patch \
%D%/packages/patches/i7z-gcc-10.patch \ %D%/packages/patches/i7z-gcc-10.patch \
%D%/packages/patches/icecat-makeicecat.patch \ %D%/packages/patches/icecat-makeicecat.patch \
%D%/packages/patches/icecat-avoid-bundled-libraries.patch \ %D%/packages/patches/icecat-avoid-bundled-libraries.patch \
@ -1280,9 +1287,7 @@ dist_patch_DATA = \
%D%/packages/patches/icedtea-7-hotspot-aarch64-use-c++98.patch\ %D%/packages/patches/icedtea-7-hotspot-aarch64-use-c++98.patch\
%D%/packages/patches/id3lib-CVE-2007-4460.patch \ %D%/packages/patches/id3lib-CVE-2007-4460.patch \
%D%/packages/patches/id3lib-UTF16-writing-bug.patch \ %D%/packages/patches/id3lib-UTF16-writing-bug.patch \
%D%/packages/patches/idris-disable-test.patch \ %D%/packages/patches/idris-test-ffi008.patch \
%D%/packages/patches/idris-build-with-haskeline-0.8.patch \
%D%/packages/patches/idris-build-with-megaparsec-9.patch \
%D%/packages/patches/ilmbase-fix-tests.patch \ %D%/packages/patches/ilmbase-fix-tests.patch \
%D%/packages/patches/imagemagick-CVE-2020-27829.patch \ %D%/packages/patches/imagemagick-CVE-2020-27829.patch \
%D%/packages/patches/imagemagick-ReadDCMImage-fix.patch \ %D%/packages/patches/imagemagick-ReadDCMImage-fix.patch \
@ -1294,8 +1299,9 @@ dist_patch_DATA = \
%D%/packages/patches/iputils-libcap-compat.patch \ %D%/packages/patches/iputils-libcap-compat.patch \
%D%/packages/patches/ipxe-reproducible-geniso.patch \ %D%/packages/patches/ipxe-reproducible-geniso.patch \
%D%/packages/patches/irrlicht-use-system-libs.patch \ %D%/packages/patches/irrlicht-use-system-libs.patch \
%D%/packages/patches/isc-dhcp-gcc-compat.patch \ %D%/packages/patches/irrlicht-link-against-needed-libs.patch \
%D%/packages/patches/isl-0.11.1-aarch64-support.patch \ %D%/packages/patches/isl-0.11.1-aarch64-support.patch \
%D%/packages/patches/itk-snap-alt-glibc-compat.patch \
%D%/packages/patches/json-c-0.13-CVE-2020-12762.patch \ %D%/packages/patches/json-c-0.13-CVE-2020-12762.patch \
%D%/packages/patches/json-c-0.12-CVE-2020-12762.patch \ %D%/packages/patches/json-c-0.12-CVE-2020-12762.patch \
%D%/packages/patches/jsoncpp-pkg-config-version.patch \ %D%/packages/patches/jsoncpp-pkg-config-version.patch \
@ -1330,6 +1336,7 @@ dist_patch_DATA = \
%D%/packages/patches/kdbusaddons-kinit-file-name.patch \ %D%/packages/patches/kdbusaddons-kinit-file-name.patch \
%D%/packages/patches/libffi-3.3-powerpc-fixes.patch \ %D%/packages/patches/libffi-3.3-powerpc-fixes.patch \
%D%/packages/patches/libffi-float128-powerpc64le.patch \ %D%/packages/patches/libffi-float128-powerpc64le.patch \
%D%/packages/patches/libobjc2-unbundle-robin-map.patch \
%D%/packages/patches/librime-fix-build-with-gcc10.patch \ %D%/packages/patches/librime-fix-build-with-gcc10.patch \
%D%/packages/patches/libvirt-add-install-prefix.patch \ %D%/packages/patches/libvirt-add-install-prefix.patch \
%D%/packages/patches/libziparchive-add-includes.patch \ %D%/packages/patches/libziparchive-add-includes.patch \
@ -1397,7 +1404,6 @@ dist_patch_DATA = \
%D%/packages/patches/libmad-length-check.patch \ %D%/packages/patches/libmad-length-check.patch \
%D%/packages/patches/libmad-md_size.patch \ %D%/packages/patches/libmad-md_size.patch \
%D%/packages/patches/libmad-mips-newgcc.patch \ %D%/packages/patches/libmad-mips-newgcc.patch \
%D%/packages/patches/libmicrohttpd-0.9.73-test-ssl3.patch \
%D%/packages/patches/libmp4v2-c++11.patch \ %D%/packages/patches/libmp4v2-c++11.patch \
%D%/packages/patches/libmpeg2-arm-private-symbols.patch \ %D%/packages/patches/libmpeg2-arm-private-symbols.patch \
%D%/packages/patches/libmpeg2-global-symbol-test.patch \ %D%/packages/patches/libmpeg2-global-symbol-test.patch \
@ -1425,6 +1431,7 @@ dist_patch_DATA = \
%D%/packages/patches/libxml2-terminating-newline.patch \ %D%/packages/patches/libxml2-terminating-newline.patch \
%D%/packages/patches/libxml2-xpath-recursion-limit.patch \ %D%/packages/patches/libxml2-xpath-recursion-limit.patch \
%D%/packages/patches/libxml2-xpath0-Add-option-xpath0.patch \ %D%/packages/patches/libxml2-xpath0-Add-option-xpath0.patch \
%D%/packages/patches/libxmlb-install-xb-tool-into-bindir.patch \
%D%/packages/patches/libxslt-generated-ids.patch \ %D%/packages/patches/libxslt-generated-ids.patch \
%D%/packages/patches/libxt-guix-search-paths.patch \ %D%/packages/patches/libxt-guix-search-paths.patch \
%D%/packages/patches/lierolibre-check-unaligned-access.patch \ %D%/packages/patches/lierolibre-check-unaligned-access.patch \
@ -1484,7 +1491,7 @@ dist_patch_DATA = \
%D%/packages/patches/mesa-skip-tests.patch \ %D%/packages/patches/mesa-skip-tests.patch \
%D%/packages/patches/meson-allow-dirs-outside-of-prefix.patch \ %D%/packages/patches/meson-allow-dirs-outside-of-prefix.patch \
%D%/packages/patches/mhash-keygen-test-segfault.patch \ %D%/packages/patches/mhash-keygen-test-segfault.patch \
%D%/packages/patches/minetest-add-MINETEST_MOD_PATH.patch \ %D%/packages/patches/mia-fix-boost-headers.patch \
%D%/packages/patches/mingw-w64-6.0.0-gcc.patch \ %D%/packages/patches/mingw-w64-6.0.0-gcc.patch \
%D%/packages/patches/mingw-w64-dlltool-temp-prefix.patch \ %D%/packages/patches/mingw-w64-dlltool-temp-prefix.patch \
%D%/packages/patches/mingw-w64-reproducible-gendef.patch \ %D%/packages/patches/mingw-w64-reproducible-gendef.patch \
@ -1500,13 +1507,6 @@ dist_patch_DATA = \
%D%/packages/patches/monero-use-system-miniupnpc.patch \ %D%/packages/patches/monero-use-system-miniupnpc.patch \
%D%/packages/patches/mono-mdoc-timestamping.patch \ %D%/packages/patches/mono-mdoc-timestamping.patch \
%D%/packages/patches/mosaicatcher-unbundle-htslib.patch \ %D%/packages/patches/mosaicatcher-unbundle-htslib.patch \
%D%/packages/patches/mozjs17-aarch64-support.patch \
%D%/packages/patches/mozjs24-aarch64-support.patch \
%D%/packages/patches/mozjs38-pkg-config-version.patch \
%D%/packages/patches/mozjs38-shell-version.patch \
%D%/packages/patches/mozjs38-tracelogger.patch \
%D%/packages/patches/mozjs38-version-detection.patch \
%D%/packages/patches/mozjs60-riscv64-support.patch \
%D%/packages/patches/mrrescue-support-love-11.patch \ %D%/packages/patches/mrrescue-support-love-11.patch \
%D%/packages/patches/mtools-mformat-uninitialized.patch \ %D%/packages/patches/mtools-mformat-uninitialized.patch \
%D%/packages/patches/mumps-build-parallelism.patch \ %D%/packages/patches/mumps-build-parallelism.patch \
@ -1520,6 +1520,7 @@ dist_patch_DATA = \
%D%/packages/patches/m4-gnulib-libio.patch \ %D%/packages/patches/m4-gnulib-libio.patch \
%D%/packages/patches/nautilus-add-libportal-gtk3.patch \ %D%/packages/patches/nautilus-add-libportal-gtk3.patch \
%D%/packages/patches/ncompress-fix-softlinks.patch \ %D%/packages/patches/ncompress-fix-softlinks.patch \
%D%/packages/patches/ncftp-reproducible.patch \
%D%/packages/patches/netcdf-date-time.patch \ %D%/packages/patches/netcdf-date-time.patch \
%D%/packages/patches/netpbm-CVE-2017-2586.patch \ %D%/packages/patches/netpbm-CVE-2017-2586.patch \
%D%/packages/patches/netpbm-CVE-2017-2587.patch \ %D%/packages/patches/netpbm-CVE-2017-2587.patch \
@ -1527,6 +1528,7 @@ dist_patch_DATA = \
%D%/packages/patches/netsurf-system-utf8proc.patch \ %D%/packages/patches/netsurf-system-utf8proc.patch \
%D%/packages/patches/netsurf-y2038-tests.patch \ %D%/packages/patches/netsurf-y2038-tests.patch \
%D%/packages/patches/netsurf-longer-test-timeout.patch \ %D%/packages/patches/netsurf-longer-test-timeout.patch \
%D%/packages/patches/nftables-fix-makefile.patch \
%D%/packages/patches/nhc98-c-update.patch \ %D%/packages/patches/nhc98-c-update.patch \
%D%/packages/patches/nix-dont-build-html-doc.diff \ %D%/packages/patches/nix-dont-build-html-doc.diff \
%D%/packages/patches/nfs4-acl-tools-0.3.7-fixpaths.patch \ %D%/packages/patches/nfs4-acl-tools-0.3.7-fixpaths.patch \
@ -1560,11 +1562,14 @@ dist_patch_DATA = \
%D%/packages/patches/onnx-skip-model-downloads.patch \ %D%/packages/patches/onnx-skip-model-downloads.patch \
%D%/packages/patches/openboardview-use-system-imgui.patch \ %D%/packages/patches/openboardview-use-system-imgui.patch \
%D%/packages/patches/openboardview-use-system-utf8.patch \ %D%/packages/patches/openboardview-use-system-utf8.patch \
%D%/packages/patches/openbox-python3.patch \
%D%/packages/patches/opencascade-oce-glibc-2.26.patch \ %D%/packages/patches/opencascade-oce-glibc-2.26.patch \
%D%/packages/patches/openfoam-4.1-cleanup.patch \ %D%/packages/patches/openfoam-4.1-cleanup.patch \
%D%/packages/patches/openjdk-10-idlj-reproducibility.patch \ %D%/packages/patches/openjdk-10-idlj-reproducibility.patch \
%D%/packages/patches/openjdk-15-xcursor-no-dynamic.patch \
%D%/packages/patches/openmpi-mtl-priorities.patch \ %D%/packages/patches/openmpi-mtl-priorities.patch \
%D%/packages/patches/openssh-hurd.patch \ %D%/packages/patches/openssh-hurd.patch \
%D%/packages/patches/openssh-trust-guix-store-directory.patch \
%D%/packages/patches/openresolv-restartcmd-guix.patch \ %D%/packages/patches/openresolv-restartcmd-guix.patch \
%D%/packages/patches/openrgb-unbundle-hueplusplus.patch \ %D%/packages/patches/openrgb-unbundle-hueplusplus.patch \
%D%/packages/patches/opensles-add-license-file.patch \ %D%/packages/patches/opensles-add-license-file.patch \
@ -1591,6 +1596,7 @@ dist_patch_DATA = \
%D%/packages/patches/python-chai-drop-python2.patch \ %D%/packages/patches/python-chai-drop-python2.patch \
%D%/packages/patches/python-random2-getrandbits-test.patch \ %D%/packages/patches/python-random2-getrandbits-test.patch \
%D%/packages/patches/python-poppler-qt5-fix-build.patch \ %D%/packages/patches/python-poppler-qt5-fix-build.patch \
%D%/packages/patches/python-w3lib-fix-test-failure.patch \
%D%/packages/patches/sdcc-disable-non-free-code.patch \ %D%/packages/patches/sdcc-disable-non-free-code.patch \
%D%/packages/patches/sdl-pango-api_additions.patch \ %D%/packages/patches/sdl-pango-api_additions.patch \
%D%/packages/patches/sdl-pango-blit_overflow.patch \ %D%/packages/patches/sdl-pango-blit_overflow.patch \
@ -1600,8 +1606,6 @@ dist_patch_DATA = \
%D%/packages/patches/sdl-pango-sans-serif.patch \ %D%/packages/patches/sdl-pango-sans-serif.patch \
%D%/packages/patches/smalltalk-multiplication-overflow.patch \ %D%/packages/patches/smalltalk-multiplication-overflow.patch \
%D%/packages/patches/sqlite-hurd.patch \ %D%/packages/patches/sqlite-hurd.patch \
%D%/packages/patches/sssd-collision-with-external-nss-symbol.patch \
%D%/packages/patches/sssd-fix-samba-4.15.3.patch \
%D%/packages/patches/strace-readlink-tests.patch \ %D%/packages/patches/strace-readlink-tests.patch \
%D%/packages/patches/sunxi-tools-remove-sys-io.patch \ %D%/packages/patches/sunxi-tools-remove-sys-io.patch \
%D%/packages/patches/p11-kit-hurd.patch \ %D%/packages/patches/p11-kit-hurd.patch \
@ -1625,11 +1629,6 @@ dist_patch_DATA = \
%D%/packages/patches/picard-fix-id3-rename-test.patch \ %D%/packages/patches/picard-fix-id3-rename-test.patch \
%D%/packages/patches/picprog-non-intel-support.patch \ %D%/packages/patches/picprog-non-intel-support.patch \
%D%/packages/patches/pidgin-add-search-path.patch \ %D%/packages/patches/pidgin-add-search-path.patch \
%D%/packages/patches/pigx-bsseq-no-citeproc.patch \
%D%/packages/patches/pigx-chipseq-no-citeproc.patch \
%D%/packages/patches/pigx-rnaseq-no-citeproc.patch \
%D%/packages/patches/pigx-sars-cov2-ww-no-citeproc.patch \
%D%/packages/patches/pigx-scrnaseq-no-citeproc.patch \
%D%/packages/patches/pinball-system-ltdl.patch \ %D%/packages/patches/pinball-system-ltdl.patch \
%D%/packages/patches/pingus-boost-headers.patch \ %D%/packages/patches/pingus-boost-headers.patch \
%D%/packages/patches/pingus-sdl-libs-config.patch \ %D%/packages/patches/pingus-sdl-libs-config.patch \
@ -1679,10 +1678,13 @@ dist_patch_DATA = \
%D%/packages/patches/python-argcomplete-1.11.1-fish31.patch \ %D%/packages/patches/python-argcomplete-1.11.1-fish31.patch \
%D%/packages/patches/python-cross-compile.patch \ %D%/packages/patches/python-cross-compile.patch \
%D%/packages/patches/python-configobj-setuptools.patch \ %D%/packages/patches/python-configobj-setuptools.patch \
%D%/packages/patches/python-debugpy-unbundle-pydevd.patch \
%D%/packages/patches/python-docopt-pytest6-compat.patch \ %D%/packages/patches/python-docopt-pytest6-compat.patch \
%D%/packages/patches/python-execnet-read-only-fix.patch \ %D%/packages/patches/python-execnet-read-only-fix.patch \
%D%/packages/patches/python-fixtures-remove-monkeypatch-test.patch \ %D%/packages/patches/python-fixtures-remove-monkeypatch-test.patch \
%D%/packages/patches/python-flask-restful-werkzeug-compat.patch \ %D%/packages/patches/python-flask-restful-werkzeug-compat.patch \
%D%/packages/patches/python-ipython-documentation-chars.patch \
%D%/packages/patches/python-ipython-documentation-repro.patch \
%D%/packages/patches/python-keras-integration-test.patch \ %D%/packages/patches/python-keras-integration-test.patch \
%D%/packages/patches/python-pdoc3-tests.patch \ %D%/packages/patches/python-pdoc3-tests.patch \
%D%/packages/patches/python-peachpy-determinism.patch \ %D%/packages/patches/python-peachpy-determinism.patch \
@ -1698,29 +1700,27 @@ dist_patch_DATA = \
%D%/packages/patches/python-mox3-python3.6-compat.patch \ %D%/packages/patches/python-mox3-python3.6-compat.patch \
%D%/packages/patches/python-typing-inspect-fix.patch \ %D%/packages/patches/python-typing-inspect-fix.patch \
%D%/packages/patches/python-packaging-test-arch.patch \ %D%/packages/patches/python-packaging-test-arch.patch \
%D%/packages/patches/python2-parameterized-docstring-test.patch \
%D%/packages/patches/python-paste-remove-timing-test.patch \ %D%/packages/patches/python-paste-remove-timing-test.patch \
%D%/packages/patches/python-pycrypto-CVE-2013-7459.patch \ %D%/packages/patches/python-pycrypto-CVE-2013-7459.patch \
%D%/packages/patches/python-pycrypto-time-clock.patch \ %D%/packages/patches/python-pycrypto-time-clock.patch \
%D%/packages/patches/python-pyan3-fix-absolute-path-bug.patch \ %D%/packages/patches/python-pyan3-fix-absolute-path-bug.patch \
%D%/packages/patches/python-pyan3-fix-positional-arguments.patch \ %D%/packages/patches/python-pyan3-fix-positional-arguments.patch \
%D%/packages/patches/python2-pygobject-2-deprecation.patch \
%D%/packages/patches/python-pygpgme-fix-pinentry-tests.patch \ %D%/packages/patches/python-pygpgme-fix-pinentry-tests.patch \
%D%/packages/patches/python-pytorch-runpath.patch \ %D%/packages/patches/python-pytorch-runpath.patch \
%D%/packages/patches/python-pytorch-system-libraries.patch \ %D%/packages/patches/python-pytorch-system-libraries.patch \
%D%/packages/patches/python-pytorch-1.9.0-system-libraries.patch \ %D%/packages/patches/python-pytorch-1.9.0-system-libraries.patch \
%D%/packages/patches/python-robotframework-atest.patch \
%D%/packages/patches/python-robotframework-source-date-epoch.patch \ %D%/packages/patches/python-robotframework-source-date-epoch.patch \
%D%/packages/patches/python-robotframework-ug2html.patch \
%D%/packages/patches/python-robotframework-sshlibrary-rf5-compat.patch \ %D%/packages/patches/python-robotframework-sshlibrary-rf5-compat.patch \
%D%/packages/patches/python-seaborn-kde-test.patch \ %D%/packages/patches/python-seaborn-kde-test.patch \
%D%/packages/patches/python-seaborn-2690.patch \ %D%/packages/patches/python-seaborn-2690.patch \
%D%/packages/patches/python2-subprocess32-disable-input-test.patch \
%D%/packages/patches/python-unittest2-python3-compat.patch \ %D%/packages/patches/python-unittest2-python3-compat.patch \
%D%/packages/patches/python-unittest2-remove-argparse.patch \ %D%/packages/patches/python-unittest2-remove-argparse.patch \
%D%/packages/patches/python-versioneer-guix-support.patch \ %D%/packages/patches/python-versioneer-guix-support.patch \
%D%/packages/patches/python-waitress-fix-tests.patch \ %D%/packages/patches/python-waitress-fix-tests.patch \
%D%/packages/patches/python-werkzeug-tests.patch \ %D%/packages/patches/python-werkzeug-tests.patch \
%D%/packages/patches/python-mypy-12332.patch \ %D%/packages/patches/python-mypy-12332.patch \
%D%/packages/patches/python-mypy-use-sys-path.patch \
%D%/packages/patches/qemu-build-info-manual.patch \ %D%/packages/patches/qemu-build-info-manual.patch \
%D%/packages/patches/qemu-glibc-2.27.patch \ %D%/packages/patches/qemu-glibc-2.27.patch \
%D%/packages/patches/qemu-glibc-2.30.patch \ %D%/packages/patches/qemu-glibc-2.30.patch \
@ -1741,7 +1741,6 @@ dist_patch_DATA = \
%D%/packages/patches/ragel-char-signedness.patch \ %D%/packages/patches/ragel-char-signedness.patch \
%D%/packages/patches/randomjungle-disable-static-build.patch \ %D%/packages/patches/randomjungle-disable-static-build.patch \
%D%/packages/patches/range-v3-build-with-gcc10.patch \ %D%/packages/patches/range-v3-build-with-gcc10.patch \
%D%/packages/patches/rapicorn-isnan.patch \
%D%/packages/patches/rapidjson-gcc-compat.patch \ %D%/packages/patches/rapidjson-gcc-compat.patch \
%D%/packages/patches/raptor2-heap-overflow.patch \ %D%/packages/patches/raptor2-heap-overflow.patch \
%D%/packages/patches/ratpoints-sturm_and_rp_private.patch \ %D%/packages/patches/ratpoints-sturm_and_rp_private.patch \
@ -1756,8 +1755,6 @@ dist_patch_DATA = \
%D%/packages/patches/ripperx-missing-file.patch \ %D%/packages/patches/ripperx-missing-file.patch \
%D%/packages/patches/rpcbind-CVE-2017-8779.patch \ %D%/packages/patches/rpcbind-CVE-2017-8779.patch \
%D%/packages/patches/rtags-separate-rct.patch \ %D%/packages/patches/rtags-separate-rct.patch \
%D%/packages/patches/racket-enable-scheme-backport.patch \
%D%/packages/patches/racket-gui-tethered-launcher-backport.patch \
%D%/packages/patches/racket-minimal-sh-via-rktio.patch \ %D%/packages/patches/racket-minimal-sh-via-rktio.patch \
%D%/packages/patches/remake-impure-dirs.patch \ %D%/packages/patches/remake-impure-dirs.patch \
%D%/packages/patches/restic-0.9.6-fix-tests-for-go1.15.patch \ %D%/packages/patches/restic-0.9.6-fix-tests-for-go1.15.patch \
@ -1777,6 +1774,7 @@ dist_patch_DATA = \
%D%/packages/patches/i3status-rust-enable-unstable-features.patch \ %D%/packages/patches/i3status-rust-enable-unstable-features.patch \
%D%/packages/patches/rust-ndarray-remove-blas-src-dep.patch \ %D%/packages/patches/rust-ndarray-remove-blas-src-dep.patch \
%D%/packages/patches/rust-ndarray-0.13-remove-blas-src.patch \ %D%/packages/patches/rust-ndarray-0.13-remove-blas-src.patch \
%D%/packages/patches/rust-ndarray-0.14-remove-blas-src.patch \
%D%/packages/patches/rust-nettle-disable-vendor.patch \ %D%/packages/patches/rust-nettle-disable-vendor.patch \
%D%/packages/patches/rust-nettle-sys-disable-vendor.patch \ %D%/packages/patches/rust-nettle-sys-disable-vendor.patch \
%D%/packages/patches/rust-openssl-sys-no-vendor.patch \ %D%/packages/patches/rust-openssl-sys-no-vendor.patch \
@ -1816,7 +1814,7 @@ dist_patch_DATA = \
%D%/packages/patches/snappy-add-inline-for-GCC.patch \ %D%/packages/patches/snappy-add-inline-for-GCC.patch \
%D%/packages/patches/sphinxbase-fix-doxygen.patch \ %D%/packages/patches/sphinxbase-fix-doxygen.patch \
%D%/packages/patches/spice-vdagent-glib-2.68.patch \ %D%/packages/patches/spice-vdagent-glib-2.68.patch \
%D%/packages/patches/sssd-fix-samba.patch \ %D%/packages/patches/sssd-optional-systemd.patch \
%D%/packages/patches/sssd-system-directories.patch \ %D%/packages/patches/sssd-system-directories.patch \
%D%/packages/patches/steghide-fixes.patch \ %D%/packages/patches/steghide-fixes.patch \
%D%/packages/patches/suitesparse-mongoose-cmake.patch \ %D%/packages/patches/suitesparse-mongoose-cmake.patch \
@ -1858,11 +1856,9 @@ dist_patch_DATA = \
%D%/packages/patches/tlf-support-hamlib-4.2+.patch \ %D%/packages/patches/tlf-support-hamlib-4.2+.patch \
gnu/packages/patches/tootle-glib-object-naming.patch \ gnu/packages/patches/tootle-glib-object-naming.patch \
gnu/packages/patches/tootle-reason-phrase.patch \ gnu/packages/patches/tootle-reason-phrase.patch \
%D%/packages/patches/tor-sandbox-i686.patch \
%D%/packages/patches/transcode-ffmpeg.patch \ %D%/packages/patches/transcode-ffmpeg.patch \
%D%/packages/patches/transfig-gcc10-fno-common.patch \ %D%/packages/patches/transfig-gcc10-fno-common.patch \
%D%/packages/patches/transmission-honor-localedir.patch \ %D%/packages/patches/transmission-honor-localedir.patch \
%D%/packages/patches/tremc-fix-decodestring.patch \
%D%/packages/patches/trytond-add-egg-modules-to-path.patch \ %D%/packages/patches/trytond-add-egg-modules-to-path.patch \
%D%/packages/patches/trytond-add-guix_trytond_path.patch \ %D%/packages/patches/trytond-add-guix_trytond_path.patch \
%D%/packages/patches/ttf2eot-cstddef.patch \ %D%/packages/patches/ttf2eot-cstddef.patch \
@ -1873,7 +1869,6 @@ dist_patch_DATA = \
%D%/packages/patches/u-boot-nintendo-nes-serial.patch \ %D%/packages/patches/u-boot-nintendo-nes-serial.patch \
%D%/packages/patches/u-boot-rockchip-inno-usb.patch \ %D%/packages/patches/u-boot-rockchip-inno-usb.patch \
%D%/packages/patches/u-boot-sifive-prevent-reloc-initrd-fdt.patch \ %D%/packages/patches/u-boot-sifive-prevent-reloc-initrd-fdt.patch \
%D%/packages/patches/u-boot-riscv64-fix-extlinux.patch \
%D%/packages/patches/u-boot-rk3399-enable-emmc-phy.patch \ %D%/packages/patches/u-boot-rk3399-enable-emmc-phy.patch \
%D%/packages/patches/ucx-tcp-iface-ioctl.patch \ %D%/packages/patches/ucx-tcp-iface-ioctl.patch \
%D%/packages/patches/ungoogled-chromium-extension-search-path.patch \ %D%/packages/patches/ungoogled-chromium-extension-search-path.patch \
@ -1921,27 +1916,26 @@ dist_patch_DATA = \
%D%/packages/patches/util-linux-tests.patch \ %D%/packages/patches/util-linux-tests.patch \
%D%/packages/patches/util-linux-CVE-2021-3995.patch \ %D%/packages/patches/util-linux-CVE-2021-3995.patch \
%D%/packages/patches/util-linux-CVE-2021-3996.patch \ %D%/packages/patches/util-linux-CVE-2021-3996.patch \
%D%/packages/patches/valgrind-enable-arm.patch \ %D%/packages/patches/valgrind-enable-arm.patch \
%D%/packages/patches/valgrind-fix-default-debuginfo-path.patch \
%D%/packages/patches/vboot-utils-fix-format-load-address.patch \ %D%/packages/patches/vboot-utils-fix-format-load-address.patch \
%D%/packages/patches/vboot-utils-fix-tests-show-contents.patch \ %D%/packages/patches/vboot-utils-fix-tests-show-contents.patch \
%D%/packages/patches/vboot-utils-skip-test-workbuf.patch \ %D%/packages/patches/vboot-utils-skip-test-workbuf.patch \
%D%/packages/patches/vinagre-newer-freerdp.patch \ %D%/packages/patches/vinagre-newer-freerdp.patch \
%D%/packages/patches/vinagre-newer-rdp-parameters.patch \ %D%/packages/patches/vinagre-newer-rdp-parameters.patch \
%D%/packages/patches/virglrenderer-CVE-2017-6386.patch \ %D%/packages/patches/virglrenderer-CVE-2017-6386.patch \
%D%/packages/patches/virtuoso-ose-remove-pre-built-jar-files.patch \
%D%/packages/patches/vsearch-unbundle-cityhash.patch \ %D%/packages/patches/vsearch-unbundle-cityhash.patch \
%D%/packages/patches/vte-CVE-2012-2738-pt1.patch \ %D%/packages/patches/vte-CVE-2012-2738-pt1.patch \
%D%/packages/patches/vte-CVE-2012-2738-pt2.patch \ %D%/packages/patches/vte-CVE-2012-2738-pt2.patch \
%D%/packages/patches/vtk-fix-freetypetools-build-failure.patch \ %D%/packages/patches/vtk-fix-freetypetools-build-failure.patch \
%D%/packages/patches/vtk-7-gcc-10-compat.patch \
%D%/packages/patches/vtk-7-hdf5-compat.patch \
%D%/packages/patches/vtk-7-python-compat.patch \
%D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch \ %D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch \
%D%/packages/patches/webkitgtk-bind-all-fonts.patch \
%D%/packages/patches/webkitgtk-adjust-bubblewrap-paths.patch \ %D%/packages/patches/webkitgtk-adjust-bubblewrap-paths.patch \
%D%/packages/patches/webkitgtk-canonicalize-paths.patch \
%D%/packages/patches/webrtc-audio-processing-big-endian.patch \ %D%/packages/patches/webrtc-audio-processing-big-endian.patch \
%D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch \ %D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch \
%D%/packages/patches/wicd-bitrate-none-fix.patch \
%D%/packages/patches/wicd-get-selected-profile-fix.patch \
%D%/packages/patches/wicd-urwid-1.3.patch \
%D%/packages/patches/wicd-wpa2-ttls.patch \
%D%/packages/patches/widelands-add-missing-map-include.patch \ %D%/packages/patches/widelands-add-missing-map-include.patch \
%D%/packages/patches/widelands-system-wide_minizip.patch \ %D%/packages/patches/widelands-system-wide_minizip.patch \
%D%/packages/patches/wmctrl-64-fix.patch \ %D%/packages/patches/wmctrl-64-fix.patch \
@ -1977,13 +1971,9 @@ dist_patch_DATA = \
%D%/packages/patches/xsane-fix-snprintf-buffer-length.patch \ %D%/packages/patches/xsane-fix-snprintf-buffer-length.patch \
%D%/packages/patches/xsane-support-ipv6.patch \ %D%/packages/patches/xsane-support-ipv6.patch \
%D%/packages/patches/xsane-tighten-default-umask.patch \ %D%/packages/patches/xsane-tighten-default-umask.patch \
%D%/packages/patches/xterm-370-explicit-xcursor.patch \
%D%/packages/patches/xygrib-fix-finding-data.patch \ %D%/packages/patches/xygrib-fix-finding-data.patch \
%D%/packages/patches/yggdrasil-extra-config.patch \ %D%/packages/patches/yggdrasil-extra-config.patch \
%D%/packages/patches/ytfzf-programs.patch \
%D%/packages/patches/ytfzf-updates.patch \
%D%/packages/patches/ytnef-CVE-2021-3403.patch \
%D%/packages/patches/ytnef-CVE-2021-3404.patch \
%D%/packages/patches/zig-disable-libc-note-test.patch \
%D%/packages/patches/zig-use-system-paths.patch %D%/packages/patches/zig-use-system-paths.patch
MISC_DISTRO_FILES = \ MISC_DISTRO_FILES = \

53
gnu/packages.scm
View file

@ -4,6 +4,7 @@
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016, 2017 Alex Kost <alezost@gmail.com> ;;; Copyright © 2016, 2017 Alex Kost <alezost@gmail.com>
;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org> ;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
;;; Copyright © 2022 Antero Mejr <antero@mailbox.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -39,11 +40,11 @@
#:use-module (ice-9 binary-ports) #:use-module (ice-9 binary-ports)
#:autoload (system base compile) (compile) #:autoload (system base compile) (compile)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (srfi srfi-11)
#:use-module (srfi srfi-26) #:use-module (srfi srfi-26)
#:use-module (srfi srfi-34) #:use-module (srfi srfi-34)
#:use-module (srfi srfi-35) #:use-module (srfi srfi-35)
#:use-module (srfi srfi-39) #:use-module (srfi srfi-39)
#:use-module (srfi srfi-71)
#:export (search-patch #:export (search-patch
search-patches search-patches
search-auxiliary-file search-auxiliary-file
@ -65,6 +66,9 @@
specification->package+output specification->package+output
specification->location specification->location
specifications->manifest specifications->manifest
specifications->packages
package-unique-version-prefix
generate-package-cache)) generate-package-cache))
@ -139,13 +143,10 @@ flags."
;; Search path for package modules. Each item must be either a directory ;; Search path for package modules. Each item must be either a directory
;; name or a pair whose car is a directory and whose cdr is a sub-directory ;; name or a pair whose car is a directory and whose cdr is a sub-directory
;; to narrow the search. ;; to narrow the search.
(let*-values (((not-colon) (let* ((not-colon (char-set-complement (char-set #\:)))
(char-set-complement (char-set #\:))) (environment (string-tokenize (or (getenv "GUIX_PACKAGE_PATH") "")
((environment) not-colon))
(string-tokenize (or (getenv "GUIX_PACKAGE_PATH") "") (channels-scm channels-go (package-path-entries)))
not-colon))
((channels-scm channels-go)
(package-path-entries)))
;; Automatically add channels and items from $GUIX_PACKAGE_PATH to Guile's ;; Automatically add channels and items from $GUIX_PACKAGE_PATH to Guile's
;; search path. For historical reasons, $GUIX_PACKAGE_PATH goes to the ;; search path. For historical reasons, $GUIX_PACKAGE_PATH goes to the
;; front; channels go to the back so that they don't override Guix' own ;; front; channels go to the back so that they don't override Guix' own
@ -498,13 +499,13 @@ return its return value."
"Return a package matching SPEC. SPEC may be a package name, or a package "Return a package matching SPEC. SPEC may be a package name, or a package
name followed by an at-sign and a version number. If the version number is not name followed by an at-sign and a version number. If the version number is not
present, return the preferred newest version." present, return the preferred newest version."
(let-values (((name version) (package-name->name+version spec))) (let ((name version (package-name->name+version spec)))
(%find-package spec name version))) (%find-package spec name version)))
(define (specification->location spec) (define (specification->location spec)
"Return the location of the highest-numbered package matching SPEC, a "Return the location of the highest-numbered package matching SPEC, a
specification such as \"guile@2\" or \"emacs\"." specification such as \"guile@2\" or \"emacs\"."
(let-values (((name version) (package-name->name+version spec))) (let ((name version (package-name->name+version spec)))
(match (find-package-locations name version) (match (find-package-locations name version)
(() (()
(if version (if version
@ -539,8 +540,8 @@ version; if SPEC does not specify an output, return OUTPUT.
When OUTPUT is false and SPEC does not specify any output, return #f as the When OUTPUT is false and SPEC does not specify any output, return #f as the
output." output."
(let-values (((name version sub-drv) (let ((name version sub-drv
(package-specification->name+version+output spec output))) (package-specification->name+version+output spec output)))
(match (%find-package spec name version) (match (%find-package spec name version)
(#f (#f
(values #f #f)) (values #f #f))
@ -552,10 +553,36 @@ output."
(package-full-name package) (package-full-name package)
sub-drv)))))) sub-drv))))))
(define (specifications->packages specs)
"Given SPECS, a list of specifications such as \"emacs@25.2\" or
\"guile:debug\", return a list of package/output tuples."
;; This procedure exists so users of 'guix home' don't have to write out the
;; (map (compose list specification->package+output)... boilerplate.
(map (compose list specification->package+output) specs))
(define (specifications->manifest specs) (define (specifications->manifest specs)
"Given SPECS, a list of specifications such as \"emacs@25.2\" or "Given SPECS, a list of specifications such as \"emacs@25.2\" or
\"guile:debug\", return a profile manifest." \"guile:debug\", return a profile manifest."
;; This procedure exists mostly so users of 'guix package -m' don't have to ;; This procedure exists mostly so users of 'guix package -m' don't have to
;; fiddle with multiple-value returns. ;; fiddle with multiple-value returns.
(packages->manifest (packages->manifest
(map (compose list specification->package+output) specs))) (specifications->packages specs)))
(define (package-unique-version-prefix name version)
"Search among all the versions of package NAME that are available, and
return the shortest unambiguous version prefix to designate VERSION. If only
one version of the package is available, return the empty string."
(match (map package-version (find-packages-by-name name))
((_)
;; A single version of NAME is available, so do not specify the version
;; number, even if the available version doesn't match VERSION.
"")
(versions
;; If VERSION is the latest version, don't specify any version.
;; Otherwise return the shortest unique version prefix. Note that this
;; is based on the currently available packages so the result may vary
;; over time.
(if (every (cut version>? version <>)
(delete version versions))
""
(version-unique-prefix version versions)))))

29
gnu/packages/ada.scm
View file

@ -149,32 +149,3 @@ Ada system. Being an interpreter, it does not implement most representation
clauses, and thus does not support systems programming close to the machine clauses, and thus does not support systems programming close to the machine
level.") level.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public python2-langkit
(let ((commit "fe0bc8bf60dbd2937759810df76ac420d99fc15f")
(revision "0"))
(package
(name "python2-langkit")
(version (git-version "0.0.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/AdaCore/langkit")
(commit commit)))
(sha256
(base32
"1abqgw2p8pb1pm54my5kkbbixfhc6l0bwajdv1xlzyrh31xki3wx"))
(file-name (string-append name "-" version "-checkout"))))
(build-system python-build-system)
(propagated-inputs
(list python2-docutils python2-enum34 python2-funcy python2-mako))
(arguments
`(#:python ,python-2
#:tests? #f)) ; Tests would requite gprbuild (Ada).
(synopsis "Semantic analysis tool generator in Python")
(description "@code{Langkit} is a tool whose purpose is to make it easy
to create syntactic and semantic analysis engines. Write a language
specification in our Python DSL and Langkit will generate for you an
Ada library with bindings for the C and Python programming languages.")
(home-page "https://github.com/AdaCore/langkit/")
(license license:gpl3+)))) ; and gcc runtime library exception

337
gnu/packages/admin.scm
View file

@ -13,7 +13,7 @@
;;; Copyright © 2016 Peter Feigl <peter.feigl@nexoid.at> ;;; Copyright © 2016 Peter Feigl <peter.feigl@nexoid.at>
;;; Copyright © 2016 John J. Foerch <jjfoerch@earthlink.net> ;;; Copyright © 2016 John J. Foerch <jjfoerch@earthlink.net>
;;; Copyright © 2016, 2017 Nikita <nikita@n0.is> ;;; Copyright © 2016, 2017 Nikita <nikita@n0.is>
;;; Copyright © 2016–2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2016–2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016 John Darrington <jmd@gnu.org> ;;; Copyright © 2016 John Darrington <jmd@gnu.org>
;;; Copyright © 2017 Ben Sturmfels <ben@sturm.com.au> ;;; Copyright © 2017 Ben Sturmfels <ben@sturm.com.au>
;;; Copyright © 2017 Ethan R. Jones <doubleplusgood23@gmail.com> ;;; Copyright © 2017 Ethan R. Jones <doubleplusgood23@gmail.com>
@ -47,6 +47,8 @@
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be> ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2021 Petr Hodina <phodina@protonmail.com> ;;; Copyright © 2021 Petr Hodina <phodina@protonmail.com>
;;; Copyright © 2021 Artyom V. Poptsov <poptsov.artyom@gmail.com> ;;; Copyright © 2021 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;; Copyright © 2022 Wamm K. D. <jaft.r@outlook.com>
;;; Copyright © 2022 Roman Riabenko <roman@riabenko.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -109,6 +111,7 @@
#:use-module (gnu packages groff) #:use-module (gnu packages groff)
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
#:use-module (gnu packages guile) #:use-module (gnu packages guile)
#:use-module (gnu packages guile-xyz)
#:use-module (gnu packages hurd) #:use-module (gnu packages hurd)
#:use-module (gnu packages image) #:use-module (gnu packages image)
#:use-module (gnu packages imagemagick) #:use-module (gnu packages imagemagick)
@ -266,7 +269,7 @@ the percentage of copied data. It can also show estimated time and throughput,
and provides a \"top-like\" mode (monitoring).") and provides a \"top-like\" mode (monitoring).")
(license license:gpl3+))) (license license:gpl3+)))
(define-public shepherd (define-public shepherd-0.8
(package (package
(name "shepherd") (name "shepherd")
(version "0.8.1") (version "0.8.1")
@ -307,14 +310,49 @@ interface and is based on GNU Guile.")
(license license:gpl3+) (license license:gpl3+)
(home-page "https://www.gnu.org/software/shepherd/"))) (home-page "https://www.gnu.org/software/shepherd/")))
(define-public guile2.2-shepherd ;; Update on the next rebuild cycle.
(define-public shepherd shepherd-0.8)
(define-public shepherd-0.9
(package (package
(inherit shepherd) (inherit shepherd)
(version "0.9.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/shepherd/shepherd-"
version ".tar.gz"))
(sha256
(base32
"0l2arn6gsyw88xk9phxnyplvv1mn8sqp3ipgyyb0nszdzvxlgd36"))))
(arguments
(list #:configure-flags #~'("--localstatedir=/var")
#:make-flags #~'("GUILE_AUTO_COMPILE=0")
#:phases (if (%current-target-system)
#~(modify-phases %standard-phases
(add-before 'configure 'set-fibers-directory
(lambda _
;; When cross-compiling, refer to the target
;; Fibers, not the native one.
(substitute* '("herd.in" "shepherd.in")
(("%FIBERS_SOURCE_DIRECTORY%")
#$(file-append
(this-package-input "guile-fibers")
"/share/guile/site/3.0"))
(("%FIBERS_OBJECT_DIRECTORY%")
#$(file-append
(this-package-input "guile-fibers")
"/lib/guile/3.0/site-ccache"))))))
#~%standard-phases)))
(native-inputs (list pkg-config guile-3.0
guile-fibers-1.1)) ;for cross-compilation
(inputs (list guile-3.0 guile-fibers-1.1))))
(define-public guile2.2-shepherd
(package
(inherit shepherd-0.9)
(name "guile2.2-shepherd") (name "guile2.2-shepherd")
(native-inputs (native-inputs (list pkg-config guile-2.2))
(list pkg-config guile-2.2)) (inputs (list guile-2.2 guile2.2-fibers))))
(inputs
(list guile-2.2 guile2.2-readline))))
(define-public guile2.0-shepherd (define-public guile2.0-shepherd
(package (package
@ -370,7 +408,7 @@ inspired by @command{vi}.")
(define-public cloud-utils (define-public cloud-utils
(package (package
(name "cloud-utils") (name "cloud-utils")
(version "0.32") (version "0.33")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -382,7 +420,11 @@ inspired by @command{vi}.")
"0xxdi55lzw7j91zfajw7jhd2ilsqj2dy04i9brlk8j3pvb5ma8hk")))) "0xxdi55lzw7j91zfajw7jhd2ilsqj2dy04i9brlk8j3pvb5ma8hk"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:make-flags '(#:modules
((guix build gnu-build-system)
(guix build utils)
(srfi srfi-26))
#:make-flags
(let ((out (assoc-ref %outputs "out"))) (let ((out (assoc-ref %outputs "out")))
(list (string-append "BINDIR=" out "/bin") (list (string-append "BINDIR=" out "/bin")
(string-append "MANDIR=" out "/share/man/man1") (string-append "MANDIR=" out "/share/man/man1")
@ -396,11 +438,15 @@ inspired by @command{vi}.")
(let ((growpart (string-append (assoc-ref outputs "out") (let ((growpart (string-append (assoc-ref outputs "out")
"/bin/growpart"))) "/bin/growpart")))
(wrap-program growpart (wrap-program growpart
`("PATH" ":" prefix (,(dirname (which "sfdisk")) `("PATH" ":" prefix
,(dirname (which "readlink")))))) ,(map dirname
#t))))) (map (cut search-input-file inputs <>)
(list "bin/readlink"
"sbin/sfdisk")))))))))))
(inputs (inputs
(list python util-linux)) ; contains sfdisk for growpart (list coreutils ; for readlink
python
util-linux)) ; sfdisk for growpart
(home-page "https://launchpad.net/cloud-utils") (home-page "https://launchpad.net/cloud-utils")
(synopsis "Set of utilities for cloud computing environments") (synopsis "Set of utilities for cloud computing environments")
(description (description
@ -488,7 +534,7 @@ services.")
(base32 "0w4g0iyssyw7dd0061881z8s5czcl01mz6v00znax57zfxjqpvnm")))) (base32 "0w4g0iyssyw7dd0061881z8s5czcl01mz6v00znax57zfxjqpvnm"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments '(#:tests? #f)) ; No tests available. (arguments '(#:tests? #f)) ; No tests available.
(home-page "http://software.clapper.org/daemonize/") (home-page "https://software.clapper.org/daemonize/")
(synopsis "Command line utility to run a program as a daemon") (synopsis "Command line utility to run a program as a daemon")
(description (description
"daemonize runs a command as a Unix daemon. It will close all open file "daemonize runs a command as a Unix daemon. It will close all open file
@ -634,7 +680,7 @@ console.")
(define-public htop (define-public htop
(package (package
(name "htop") (name "htop")
(version "3.1.2") (version "3.2.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -642,7 +688,7 @@ console.")
(url "https://github.com/htop-dev/htop") (url "https://github.com/htop-dev/htop")
(commit version))) (commit version)))
(sha256 (sha256
(base32 "024qhrlmqgwmn6bwb5yiff9bhhdabryiphzx8y654k8r8vqi59j4")) (base32 "16l1r2ixzs640ybqp2x8bfyvk98kiywy7k3sjmp5j5npdzn5ryd7"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
@ -1031,7 +1077,7 @@ would need and has several interesting built-in capabilities.")
(define-public netcat-openbsd (define-public netcat-openbsd
(package (package
(name "netcat-openbsd") (name "netcat-openbsd")
(version "1.218-2") (version "1.218-5")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -1040,7 +1086,7 @@ would need and has several interesting built-in capabilities.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1rj4nx0jdism1idc4fghahqbafhv72cpk7zlyq9czgvbps10d1kh")))) "0hpbmz9m2q22a6qgbn9590z2x96xgffim8g0m1v47mariz3pqhlc"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; no test suite `(#:tests? #f ; no test suite
@ -1195,15 +1241,14 @@ connection alive.")
bind-release-version))) bind-release-version)))
(package (package
(name "isc-dhcp") (name "isc-dhcp")
(version "4.4.2-P1") (version "4.4.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://ftp.isc.org/isc/dhcp/" (uri (string-append "https://ftp.isc.org/isc/dhcp/"
version "/dhcp-" version ".tar.gz")) version "/dhcp-" version ".tar.gz"))
(patches (search-patches "isc-dhcp-gcc-compat.patch"))
(sha256 (sha256
(base32 (base32
"06jsr0cg5rsmyibshrpcb9za0qgwvqccashdma7mlm1rflrh8pmh")))) "062q2g8cj2zv0zv22x6pg21m21bdlscxkg3li0ac0pm0qasccghf"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:parallel-build? #f `(#:parallel-build? #f
@ -1724,7 +1769,7 @@ system administrator.")
(define-public sudo (define-public sudo
(package (package
(name "sudo") (name "sudo")
(version "1.9.10") (version "1.9.11")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (uri
@ -1734,7 +1779,7 @@ system administrator.")
version ".tar.gz"))) version ".tar.gz")))
(sha256 (sha256
(base32 (base32
"1x34k8sd2msfjjsahff1q143gr5j9z19jx2rmkkbiiz7k084d8a4")) "1gjingc1h7d6p17m0nn87yiwh8gbdchg4w4kv8s4g89wv0q6wixm"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -1992,10 +2037,16 @@ command.")
(add-after 'install-documentation 'install-dbus-conf (add-after 'install-documentation 'install-dbus-conf
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(dir (string-append out "/etc/dbus-1/system.d"))) (interfaces (string-append out "/etc/dbus-1/system.d"))
(mkdir-p dir) (services (string-append out
"/share/dbus-1/system-services")))
(mkdir-p interfaces)
(copy-file "dbus/dbus-wpa_supplicant.conf" (copy-file "dbus/dbus-wpa_supplicant.conf"
(string-append dir "/wpa_supplicant.conf"))) (string-append interfaces "/wpa_supplicant.conf"))
(mkdir-p services)
(copy-file "dbus/fi.w1.wpa_supplicant1.service"
(string-append services
"/fi.w1.wpa_supplicant1.service")))
#t)))))))) #t))))))))
(define-public wpa-supplicant-gui (define-public wpa-supplicant-gui
@ -2174,7 +2225,7 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).")
(define-public acpica (define-public acpica
(package (package
(name "acpica") (name "acpica")
(version "20211217") (version "20220331")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -2182,7 +2233,7 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0521hmaw2zhi0mpgnaf2i83dykfgql4bx98cg7xqy8wmj649z194")))) "0yjcl00nnnlw01sz6a1i5d3v75gr17mkbxkxfx2v344al33abk8w"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (list flex bison)) (native-inputs (list flex bison))
(arguments (arguments
@ -2459,7 +2510,7 @@ track changes in important system configuration files.")
(define-public libcap-ng (define-public libcap-ng
(package (package
(name "libcap-ng") (name "libcap-ng")
(version "0.8.2") (version "0.8.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -2467,11 +2518,12 @@ track changes in important system configuration files.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1sasp1n154aqy9fz0knlb966svm7xg1zjhg1vr4q839bgjvq7h2j")))) "0ba9dfga7chwf6lf7a03x1a30fgdy2pb4r7pnn1jzfr2is2gdmmy"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
(list "--without-python"))) (list "--disable-static"
"--without-python")))
(home-page "https://people.redhat.com/sgrubb/libcap-ng/") (home-page "https://people.redhat.com/sgrubb/libcap-ng/")
(synopsis "Library for more easily working with POSIX capabilities") (synopsis "Library for more easily working with POSIX capabilities")
(description (description
@ -2530,42 +2582,6 @@ degradation and failure.")
specified directories.") specified directories.")
(license license:expat))) (license license:expat)))
(define-public graphios
(package
(name "graphios")
(version "2.0.3")
(source
(origin
(method url-fetch)
(uri (pypi-uri "graphios" version))
(sha256
(base32
"1h87hvc315wg6lklbf4l7csd3n5pgljwrfli1p3nasdi0izgn66i"))))
(build-system python-build-system)
(arguments
;; Be warned: Building with Python 3 succeeds, but the build process
;; throws a syntax error that is ignored.
`(#:python ,python-2
#:phases
(modify-phases %standard-phases
(add-before 'build 'fix-setup.py
(lambda* (#:key outputs #:allow-other-keys)
;; Fix hardcoded, unprefixed file names.
(let ((out (assoc-ref outputs "out")))
(substitute* '("setup.py")
(("/etc") (string-append out "/etc"))
(("/usr") out)
(("distro_ver = .*") "distro_ver = ''"))
#t))))))
(home-page "https://github.com/shawn-sterling/graphios")
(synopsis "Emit Nagios metrics to Graphite, Statsd, and Librato")
(description
"Graphios is a script to emit nagios perfdata to various upstream metrics
processing and time-series systems. It's currently compatible with Graphite,
Statsd, Librato and InfluxDB. Graphios can emit Nagios metrics to any number
of supported upstream metrics systems simultaneously.")
(license license:gpl2+)))
(define-public ansible-core (define-public ansible-core
(package (package
(name "ansible-core") (name "ansible-core")
@ -2706,15 +2722,15 @@ provides the following commands:
(build-system python-build-system) (build-system python-build-system)
(propagated-inputs (propagated-inputs
(list ansible-core)) (list ansible-core))
;; The Ansible collections are found by ansible-core via PYTHONPATH; the ;; The Ansible collections are found by ansible-core via the Python search
;; following search path ensures that they are found even when Python is ;; path; the following search path ensures that they are found even when
;; not present in the profile. ;; Python is not present in the profile.
(native-search-paths (native-search-paths
;; XXX: Attempting to use (package-native-search-paths python) ;; XXX: Attempting to use (package-native-search-paths python)
;; here would cause an error about python being an unbound ;; here would cause an error about python being an unbound
;; variable in the tests/cpan.scm test. ;; variable in the tests/cpan.scm test.
(list (search-path-specification (list (search-path-specification
(variable "PYTHONPATH") (variable "GUIX_PYTHONPATH")
(files (list "lib/python3.9/site-packages"))))) (files (list "lib/python3.9/site-packages")))))
(home-page "https://www.ansible.com/") (home-page "https://www.ansible.com/")
(synopsis "Radically simple IT automation") (synopsis "Radically simple IT automation")
@ -3017,10 +3033,17 @@ displays a table of current bandwidth usage by pairs of hosts.")
(list openssl libgcrypt)) (list openssl libgcrypt))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:configure-flags `(#:configure-flags
(list "--localstatedir=/var" (list "--localstatedir=/var"
(string-append "--with-pkgconfigdir=" (string-append "--with-pkgconfigdir="
(assoc-ref %outputs "out") "/lib/pkgconfig")) (assoc-ref %outputs "out") "/lib/pkgconfig")
(string-append "--with-libgcrypt-prefix="
(assoc-ref %build-inputs "libgcrypt"))
,@(if (%current-target-system)
;; Assume yes on pipes when cross compiling.
`("ac_cv_file__dev_spx=yes"
"x_ac_cv_check_fifo_recvfd=yes")
'()))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
;; XXX Many test series fail. Some might be fixable, others do no-no ;; XXX Many test series fail. Some might be fixable, others do no-no
@ -3056,13 +3079,13 @@ platform-specific methods.")
(package (package
(name "audit") (name "audit")
(home-page "https://people.redhat.com/sgrubb/audit/") (home-page "https://people.redhat.com/sgrubb/audit/")
(version "3.0.7") (version "3.0.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append home-page "audit-" version ".tar.gz")) (uri (string-append home-page "audit-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"15r5lrrkv2zj3dvpqssd46w61hmrq27y7c2rz33s20ck59iphk4b")))) "04w9m9ffvi58z11i344wa1hji9ba68cdklrkizhiwf39mnwxkx5m"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags (list "--with-python=no" `(#:configure-flags (list "--with-python=no"
@ -3147,10 +3170,12 @@ rules is done with the @code{auditctl} utility.")
(,(python-path ndiff))))))) (,(python-path ndiff)))))))
;; These are the tests that do not require network access. ;; These are the tests that do not require network access.
(replace 'check (replace 'check
(lambda _ (invoke "make" (lambda* (#:key tests? #:allow-other-keys)
"check-nse" (when tests?
"check-ndiff" (invoke "make"
"check-dns")))) "check-nse"
"check-ndiff"
"check-dns")))))
;; Nmap can't cope with out-of-source building. ;; Nmap can't cope with out-of-source building.
#:out-of-source? #f)) #:out-of-source? #f))
(home-page "https://nmap.org/") (home-page "https://nmap.org/")
@ -3690,6 +3715,32 @@ used in screenshots to show other users what operating system or distribution
you are running, what theme or icon set you are using, etc.") you are running, what theme or icon set you are using, etc.")
(license license:expat))) (license license:expat)))
(define-public hyfetch
(package
(name "hyfetch")
(version "1.0.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "HyFetch" version))
(sha256
(base32 "1bfkycdhsyzkk6q24gdy1xwvyz0rvkr7xk2khbn74b3nk6kp83r2"))))
(build-system python-build-system)
(inputs (list python-hypy-utils python-typing-extensions))
(arguments `(#:phases (modify-phases %standard-phases
(add-before 'build 'set-HOME
(lambda _ ;; Tries to set files in .config
(setenv "HOME" "/tmp"))))))
(home-page "https://github.com/hykilpikonna/HyFetch")
(synopsis "@code{neofetch} with pride flags <3")
(description "HyFetch is a command-line system information tool fork of
@code{neofetch}. HyFetch displays information about your system next to your
OS logo in ASCII representation. The ASCII representation is then colored in
the pattern of the pride flag of your choice. The main purpose of HyFetch is to
be used in screenshots to show other users what operating system or distribution
you are running, what theme or icon set you are using, etc.")
(license license:expat)))
(define-public screenfetch (define-public screenfetch
(package (package
(name "screenfetch") (name "screenfetch")
@ -3833,30 +3884,29 @@ information tool.")
(define-public nnn (define-public nnn
(package (package
(name "nnn") (name "nnn")
(version "4.4") (version "4.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/jarun/nnn/releases/download/v" (uri (string-append "https://github.com/jarun/nnn/releases/download/v"
version "/nnn-v" version ".tar.gz")) version "/nnn-v" version ".tar.gz"))
(sha256 (sha256
(base32 "0lqn7pyy8c1vy29vn8ad4x23cw67cy1d21ghns6f3w9a1h7kyjp0")))) (base32 "1aj9hzhpwxl2v1dlf3jpd3rp81z689dq8iycbipc0024dnyibp7s"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
(list ncurses readline)) (list ncurses readline))
(native-inputs (native-inputs
(list pkg-config)) (list pkg-config))
(arguments (arguments
`(#:tests? #f ; no tests (list #:tests? #f ; no tests
#:phases #:make-flags
(modify-phases %standard-phases #~(list
(delete 'configure)) ; no configure script (string-append "PREFIX=" #$output)
#:make-flags (string-append "CC=" #$(cc-for-target))
(list (string-append "PKG_CONFIG=" #$(pkg-config-for-target)))
(string-append "PREFIX=" #:phases
(assoc-ref %outputs "out")) #~(modify-phases %standard-phases
(string-append "CC=" ,(cc-for-target)) (delete 'configure)))) ; no configure script
(string-append "PKG_CONFIG=" ,(pkg-config-for-target)))))
(home-page "https://github.com/jarun/nnn") (home-page "https://github.com/jarun/nnn")
(synopsis "Terminal file browser") (synopsis "Terminal file browser")
(description (description
@ -4058,7 +4108,7 @@ Python loading in HPC environments.")
(let ((real-name "inxi")) (let ((real-name "inxi"))
(package (package
(name "inxi-minimal") (name "inxi-minimal")
(version "3.3.11-1") (version "3.3.15-1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -4067,7 +4117,7 @@ Python loading in HPC environments.")
(commit version))) (commit version)))
(file-name (git-file-name real-name version)) (file-name (git-file-name real-name version))
(sha256 (sha256
(base32 "1nk3q2xg0myykq1myasxhvhhr0vk8qv3m7pb3icw81r3ydasnls0")))) (base32 "02zy94bd6ayfl9y7ka6gk32q254k49cbq3a6wgi31r2fcvybyrf7"))))
(build-system trivial-build-system) (build-system trivial-build-system)
(inputs (inputs
`(("bash" ,bash-minimal) `(("bash" ,bash-minimal)
@ -4117,7 +4167,7 @@ Python loading in HPC environments.")
(string-append dir "/lib/perl5/site_perl")) (string-append dir "/lib/perl5/site_perl"))
(_ "")) (_ ""))
%build-inputs))))) %build-inputs)))))
(invoke "gzip" "inxi.1") (invoke "gzip" "-n" "inxi.1")
(install-file "inxi.1.gz" (install-file "inxi.1.gz"
(string-append %output "/share/man/man1")))))) (string-append %output "/share/man/man1"))))))
(home-page "https://smxi.org/docs/inxi.htm") (home-page "https://smxi.org/docs/inxi.htm")
@ -4298,7 +4348,7 @@ Logitech Unifying Receiver.")
(package (package
(name "lynis") (name "lynis")
;; Also update the ‘lynis-sdk’ input to the commit matching this release. ;; Also update the ‘lynis-sdk’ input to the commit matching this release.
(version "3.0.6") (version "3.0.8")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -4307,7 +4357,7 @@ Logitech Unifying Receiver.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1a1n8alcq6zil1rwk9940cg3x2nz3igcxfad99505pdh7ccz9324")) (base32 "19kz1ffbbd431cdfw7fjcl5hjkks3gfkwk3w2zkwsxgyiky1gx3w"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -4323,13 +4373,20 @@ Logitech Unifying Receiver.")
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/CISOfy/lynis-sdk") (url "https://github.com/CISOfy/lynis-sdk")
(commit "1c4e5f60a03e29a1525ca9ec17c793461058253d"))) (commit "dffe5d352e4d6029ea95a84d50604ccd97cb8999")))
(file-name (git-file-name "lynis-sdk" version)) (file-name (git-file-name "lynis-sdk" version))
(sha256 (sha256
(base32 "060k8k1q4c7nvrv3cwscxq8md2v75q3nrwwim1hgfw20divw3npy")))))) (base32 "05qq4395x8f0kyl1ppm74npsf8sb3hhgz0ck4fya91sy6a26b4ja"))))))
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'unpack
;; XXX Remove after fixing <https://issues.guix.gnu.org/55287>.
(lambda* (#:key source #:allow-other-keys)
(mkdir "source")
(chdir "source")
(copy-recursively source "."
#:keep-mtime? #t)))
(replace 'configure (replace 'configure
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(substitute* "lynis" (substitute* "lynis"
@ -4465,7 +4522,7 @@ supplied by the user when logging in.")
(define-public jc (define-public jc
(package (package
(name "jc") (name "jc")
(version "1.13.4") (version "1.19.0")
(source (source
(origin (origin
;; The PyPI tarball lacks the test suite. ;; The PyPI tarball lacks the test suite.
@ -4475,8 +4532,16 @@ supplied by the user when logging in.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0rwvyyrdnw43pixp8h51rncq2inc9pbbj1j2191y5si00pjw34zr")))) (base32 "021zk0y8kb6v3qf3hwfg8qjzzmrca039nz3fjywiy2njmbhr8hyi"))))
(build-system python-build-system) (build-system python-build-system)
(arguments
(list #:phases
#~(modify-phases %standard-phases
;; XXX Guix's America/Los_Angeles time zone is somehow broken.
(add-before 'check 'hack-time-zone
(lambda _
(substitute* (find-files "tests" "^test.*\\.py$")
(("America/Los_Angeles") "PST8PDT")))))))
(propagated-inputs (propagated-inputs
(list python-pygments python-ruamel.yaml python-xmltodict)) (list python-pygments python-ruamel.yaml python-xmltodict))
(home-page "https://github.com/kellyjonbrazil/jc") (home-page "https://github.com/kellyjonbrazil/jc")
@ -4624,49 +4689,40 @@ Netgear devices.")
(define-public atop (define-public atop
(package (package
(name "atop") (name "atop")
(version "2.6.0") (version "2.7.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.atoptool.nl/download/atop-" (uri (string-append "https://www.atoptool.nl/download/atop-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0wlg0n0h9vwpjp2dcb623jvvqck422jrjpq9mbpzg4hnawxcmhly")))) "0kjwgf94skbrndv1krlmsrq34smzi3iwk73fbsnyw787gvqx4j6a"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; no test suite (list
#:tests? #f ; no test suite
#:make-flags #:make-flags
(list (string-append "CC=" ,(cc-for-target)) #~(list (string-append "CC=" #$(cc-for-target))
;; The installer requires a choice between systemd or SysV. (string-append "DESTDIR=" #$output)
"systemdinstall" (string-append "SYSDPATH=/etc/systemd/system")
(string-append "DESTDIR=" (assoc-ref %outputs "out")) (string-append "PMPATHD=/etc/systemd/system-sleep")
(string-append "BINPATH=/bin") ;; Or else it tries to create /var/log/atop...
(string-append "SBINPATH=/sbin") (string-append "LOGPATH="))
(string-append "SYSDPATH=/etc/systemd/system")
(string-append "PMPATHD=/etc/systemd/system-sleep")
(string-append "MAN1PATH=/share/man/man1")
(string-append "MAN5PATH=/share/man/man5")
(string-append "MAN8PATH=/share/man/man8")
;; Or else it tries to create /var/log/atop...
(string-append "LOGPATH="))
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(delete 'configure) ; No ./configure script (delete 'configure) ; No ./configure script
(add-before 'build 'patch-build (add-before 'build 'patch-build
(lambda* (#:key outputs #:allow-other-keys) (lambda _
(substitute* "Makefile" (substitute* "Makefile"
;; We don't need to chown things in the build environment. ;; Don't use /usr as a prefix.
(("chown.*$") "") (("/usr") "")
;; We can't toggle the setuid bit in the build environment. ;; Otherwise, it creates a blank configuration file as a "default".
(("chmod 04711") "chmod 0711") (("touch.*DEFPATH)/atop") "")
;; Otherwise, it creates a blank configuration file as a "default". (("chmod.*DEFPATH)/atop") "")))))))
(("touch.*DEFPATH)/atop") "")
(("chmod.*DEFPATH)/atop") ""))
#t)))))
(inputs (inputs
`(("ncurses" ,ncurses) (list ncurses
("python" ,python-wrapper) ; for `atopgpud` python-wrapper ; for `atopgpud`
("zlib" ,zlib))) zlib))
(home-page "https://www.atoptool.nl/") (home-page "https://www.atoptool.nl/")
(synopsis "Linux performance monitoring console") (synopsis "Linux performance monitoring console")
(description "Atop is an ASCII full-screen performance monitor for Linux (description "Atop is an ASCII full-screen performance monitor for Linux
@ -4677,6 +4733,8 @@ using colors, etc. At regular intervals, it shows system-level activity related
to the CPU, memory, swap, disks (including LVM) and network layers, and for to the CPU, memory, swap, disks (including LVM) and network layers, and for
every process (and thread) it shows e.g. the CPU utilization, memory growth, every process (and thread) it shows e.g. the CPU utilization, memory growth,
disk utilization, priority, username, state, and exit code.") disk utilization, priority, username, state, and exit code.")
(properties
`((release-monitoring-url . "https://www.atoptool.nl/downloadatop.php")))
(license license:gpl2+))) (license license:gpl2+)))
;; TODO: Unvendor u-root (pkg: forth, golang, testutil). ;; TODO: Unvendor u-root (pkg: forth, golang, testutil).
@ -4798,7 +4856,7 @@ the XMODEM/YMODEM/ZMODEM file transfer protocols.")
(define-public nq (define-public nq
(package (package
(name "nq") (name "nq")
(version "0.4") (version "0.5")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -4807,16 +4865,17 @@ the XMODEM/YMODEM/ZMODEM file transfer protocols.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0sdamjzvmf6cxhjmd1rjvn7zm6k10fp5n6vabyxd3yl30cgrxw2i")))) (base32 "0szbndvwl6ghwjzb165s09977s0r1yq8h0ziknm0h6xndkcjspl3"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
(list perl)) (list perl))
(arguments (arguments
`(#:make-flags (list (string-append "CC=" ,(cc-for-target)) (list #:make-flags
(string-append "PREFIX=" (assoc-ref %outputs "out"))) #~(list (string-append "CC=" #$(cc-for-target))
#:phases (string-append "PREFIX=" #$output))
(modify-phases %standard-phases #:phases
(delete 'configure)))) #~(modify-phases %standard-phases
(delete 'configure))))
(synopsis "Unix command line queue utility") (synopsis "Unix command line queue utility")
(description (description
"@code{nq} can create very lightweight job queue systems which require no "@code{nq} can create very lightweight job queue systems which require no

39
gnu/packages/agda.scm
View file

@ -2,7 +2,7 @@
;;; Copyright © 2018 Alex ter Weele <alex.ter.weele@gmail.com> ;;; Copyright © 2018 Alex ter Weele <alex.ter.weele@gmail.com>
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 John Soo <jsoo1@asu.edu> ;;; Copyright © 2018 John Soo <jsoo1@asu.edu>
;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
@ -29,6 +29,7 @@
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system haskell) #:use-module (guix build-system haskell)
#:use-module (guix build-system trivial) #:use-module (guix build-system trivial)
#:use-module (guix gexp)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
@ -37,7 +38,7 @@
(define-public agda (define-public agda
(package (package
(name "agda") (name "agda")
(version "2.6.2.1") (version "2.6.2.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -45,7 +46,7 @@
"https://hackage.haskell.org/package/Agda/Agda-" "https://hackage.haskell.org/package/Agda/Agda-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 "03dw7jfqr3ffik6avigm525djqh2gn5c3qwnb2h6298zkr9lch9w")))) (base32 "0yjjbhc593ylrm4mq4j01nkdvh7xqsg5in30wxj4y53vf5hkggp5"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(inputs (inputs
(list ghc-aeson (list ghc-aeson
@ -71,22 +72,22 @@
ghc-uri-encode ghc-uri-encode
ghc-zlib)) ghc-zlib))
(arguments (arguments
`(#:modules ((guix build haskell-build-system) (list #:modules `((guix build haskell-build-system)
(guix build utils) (guix build utils)
(srfi srfi-26) (srfi srfi-26)
(ice-9 match)) (ice-9 match))
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
;; This allows us to call the 'agda' binary before installing. ;; This allows us to call the 'agda' binary before installing.
(add-after 'unpack 'set-ld-library-path (add-after 'unpack 'set-ld-library-path
(lambda _ (lambda _
(setenv "LD_LIBRARY_PATH" (string-append (getcwd) "/dist/build")))) (setenv "LD_LIBRARY_PATH" (string-append (getcwd) "/dist/build"))))
(add-after 'compile 'agda-compile (add-after 'compile 'agda-compile
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let ((agda-compiler (string-append #$output "/bin/agda")))
(agda-compiler (string-append out "/bin/agda"))) (for-each (cut invoke agda-compiler <>)
(for-each (cut invoke agda-compiler <>) (find-files (string-append #$output "/share")
(find-files (string-append out "/share") "\\.agda$")))))))) "\\.agda$"))))))))
(home-page "https://wiki.portal.chalmers.se/agda/") (home-page "https://wiki.portal.chalmers.se/agda/")
(synopsis (synopsis
"Dependently typed functional programming language and proof assistant") "Dependently typed functional programming language and proof assistant")

12
gnu/packages/algebra.scm
View file

@ -127,7 +127,7 @@ greatest common divisor operations.")
(define-public cm (define-public cm
(package (package
(name "cm") (name "cm")
(version "0.3.1") (version "0.4.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -135,7 +135,7 @@ greatest common divisor operations.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0qq6b1kwb1byj8ws33ya5awq0ilkpm32037pi1l4cf2737fg9m42")))) "04l3inafql40n0r5rq8rmp21zplgdrzblil2kgkpx5s0jbs9i8rr"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(propagated-inputs (propagated-inputs
(list mpfrcx zlib)) ; Header files included from cm_common.h. (list mpfrcx zlib)) ; Header files included from cm_common.h.
@ -226,7 +226,7 @@ the real span of the lattice.")
(define-public pari-gp (define-public pari-gp
(package (package
(name "pari-gp") (name "pari-gp")
(version "2.13.3") (version "2.13.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -234,7 +234,7 @@ the real span of the lattice.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1jm1cz1687cz8pl8lgvmyk3l33cms1xbayv38ca4z1f60qb7zfnc")))) "11g1pkrj12dmggj1n6r00ijpnmk3f3dpqsf1h51q34hmmv79xpmw"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("texlive" ,(texlive-updmap.cfg `(("texlive" ,(texlive-updmap.cfg
@ -470,7 +470,7 @@ fast arithmetic.")
(define-public arb (define-public arb
(package (package
(name "arb") (name "arb")
(version "2.21.1") (version "2.22.1")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -479,7 +479,7 @@ fast arithmetic.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1lmcl122qy6mr1g1y65bm7dk9fj0sym7gzmvar5vdgk7ln03c5iq")))) "0qcyf8a7w95yxap0r3sb7xibk53nbs5kkidja3ljvqpbpk5xvpax"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(propagated-inputs (propagated-inputs
(list flint)) ; flint.h is included by arf.h (list flint)) ; flint.h is included by arf.h

22
gnu/packages/android.scm
View file

@ -4,7 +4,7 @@
;;; Copyright © 2016, 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2016, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2017 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2017 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2017, 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2017, 2020, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019, 2020 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2019, 2020 Andreas Enge <andreas@enge.fr>
@ -1078,23 +1078,33 @@ backups. It supports encrypted archives.")
(define-public python-miio (define-public python-miio
(package (package
(name "python-miio") (name "python-miio")
(version "0.5.8") (version "0.5.11")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "python-miio" version)) (uri (pypi-uri "python-miio" version))
(sha256 (sha256
(base32 (base32
"0a4f5ybjvibawwxcjm3r9nnrzf1yff6wwgy05yzyk0bb3rmc99fp")))) "1dyzzywfa5h6q8clmzxsqmszlby8757ajmvkhdyvq6719z4bn46n"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'relax-requirements
(lambda _
(substitute* "setup.py"
(("cryptography>=35")
"cryptography"))))
(add-after 'unpack 'adjust-for-click-8
(lambda _
(substitute* '("miio/integrations/vacuum/roborock/vacuum.py"
"miio/integrations/vacuum/roborock/vacuum_cli.py")
(("resultcallback")
"result_callback"))))
(replace 'check (replace 'check
(lambda* (#:key inputs outputs tests? #:allow-other-keys) (lambda* (#:key tests? #:allow-other-keys)
(when tests? (when tests?
(add-installed-pythonpath inputs outputs) (invoke "pytest" "-vv" "miio")))))))
(invoke "pytest" "miio")))))))
(native-inputs (native-inputs
(list python-pytest (list python-pytest
python-pytest-mock python-pytest-mock

132
gnu/packages/antivirus.scm
View file

@ -21,6 +21,7 @@
(define-module (gnu packages antivirus) (define-module (gnu packages antivirus)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix gexp)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix utils) #:use-module (guix utils)
@ -44,14 +45,14 @@
(define-public clamav (define-public clamav
(package (package
(name "clamav") (name "clamav")
(version "0.103.3") (version "0.103.6")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.clamav.net/downloads/production/" (uri (string-append "https://www.clamav.net/downloads/production/"
"clamav-" version ".tar.gz")) "clamav-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1sba4zccgwjqk29b5qkgfc9gm794hmk6j7bpj8wilgcz8hc3svlz")) "0cxsv5m9pqxxb56qd7hlj11pwmdgm07s3msh3hxk47czq4yjx8da"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -59,8 +60,7 @@
'("win32" ; unnecessary '("win32" ; unnecessary
"libclamav/c++/llvm" ; use system llvm "libclamav/c++/llvm" ; use system llvm
"libclamav/tomsfastmath" ; use system tomsfastmath "libclamav/tomsfastmath" ; use system tomsfastmath
"libclamunrar")) ; non-free license "libclamunrar")))) ; non-free license
#t))
(patches (patches
(search-patches "clamav-system-tomsfastmath.patch" (search-patches "clamav-system-tomsfastmath.patch"
"clamav-config-llvm-libs.patch")))) "clamav-config-llvm-libs.patch"))))
@ -72,70 +72,70 @@
libtool libtool
pkg-config)) pkg-config))
(inputs (inputs
`(("bzip2" ,bzip2) (list bzip2
("libcurl" ,curl) curl
("libjson" ,json-c) json-c
("libltdl" ,libltdl) libltdl
("libmspack" ,libmspack) libmspack
("llvm" ,llvm-3.6) ; requires <3.7, for JIT/verifier llvm-3.6 ; requires <3.7, for JIT/verifier
("ncurses" ,ncurses) ncurses
("openssl" ,libressl) libressl
("pcre2" ,pcre2) pcre2
("sasl" ,cyrus-sasl) ; for linking curl with libtool cyrus-sasl ; for linking curl with libtool
("tomsfastmath" ,tomsfastmath) tomsfastmath
("xml" ,libxml2) libxml2
("zlib" ,zlib))) zlib))
(arguments (arguments
`(#:configure-flags (list #:configure-flags
(let-syntax ((with (syntax-rules () #~(let-syntax ((with (syntax-rules ()
((_ name) ((_ name use)
(string-append "--with-" name "=" (string-append "--with-" name "="
(assoc-ref %build-inputs name)))))) (assoc-ref %build-inputs use))))))
(list "--disable-unrar" (list "--disable-unrar"
"--enable-llvm" "--enable-llvm"
"--with-system-llvm" "--with-system-llvm"
"--with-system-libmspack" "--with-system-libmspack"
"--without-included-ltdl" "--without-included-ltdl"
(with "xml") (with "xml" "libxml2")
(with "openssl") (with "openssl" "libressl")
(with "libjson") (with "libjson" "json-c")
(with "pcre2") (with "pcre2" "pcre2")
(with "zlib") (with "zlib" "zlib")
(with "libcurl") (with "libcurl" "curl")
;; For sanity, specifying --enable-* flags turns ;; For sanity, specifying --enable-* flags turns
;; "support unavailable" warnings into errors. ;; "support unavailable" warnings into errors.
"--enable-bzip2" "--enable-bzip2"
"--enable-check" "--enable-check"
"--sysconfdir=/etc/clamav" "--sysconfdir=/etc/clamav"
;; Default database directory needs to be writeable ;; Default database directory needs to be writeable
"--with-dbdir=/var/db/clamav")) "--with-dbdir=/var/db/clamav"))
;; install sample .conf files to %output/etc rather than /etc/clamav ;; install sample .conf files to %output/etc rather than /etc/clamav
#:make-flags (list (string-append "sysconfdir=" %output "/etc")) #:make-flags
#:phases (modify-phases %standard-phases #~(list (string-append "sysconfdir=" %output "/etc"))
;; Regenerate configure script. Without this we don't get #:phases
;; the correct value for LLVM linker variables. #~(modify-phases %standard-phases
(add-after 'unpack 'reconf ;; Regenerate configure script. Without this we don't get
(lambda _ (invoke "autoreconf" "-vfi"))) ;; the correct value for LLVM linker variables.
(add-before 'configure 'patch-llvm-config (add-after 'unpack 'reconf
(lambda _ (lambda _ (invoke "autoreconf" "-vfi")))
(substitute* '("libclamav/c++/detect.cpp" (add-before 'configure 'patch-llvm-config
"libclamav/c++/ClamBCRTChecks.cpp" (lambda _
"libclamav/c++/bytecode2llvm.cpp") (substitute* '("libclamav/c++/detect.cpp"
(("llvm/Config/config.h") "llvm/Config/llvm-config.h")) "libclamav/c++/ClamBCRTChecks.cpp"
;; `llvm-config --libfiles` inappropriately lists lib*.a "libclamav/c++/bytecode2llvm.cpp")
;; libraries, rather than the lib*.so's that our llvm (("llvm/Config/config.h") "llvm/Config/llvm-config.h"))
;; contains. They're used only for listing extra build ;; `llvm-config --libfiles` inappropriately lists lib*.a
;; dependencies, so ignore them until that's fixed. ;; libraries, rather than the lib*.so's that our llvm
(substitute* "libclamav/c++/Makefile.in" ;; contains. They're used only for listing extra build
(("@LLVMCONFIG_LIBFILES@") "")) ;; dependencies, so ignore them until that's fixed.
#t)) (substitute* "libclamav/c++/Makefile.in"
(add-before 'check 'skip-clamd-tests (("@LLVMCONFIG_LIBFILES@") ""))))
;; XXX: The check?_clamd tests fail inside the build (add-before 'check 'skip-clamd-tests
;; chroot, but pass outside. ;; XXX: The check?_clamd tests fail inside the build
(lambda _ ;; chroot, but pass outside.
(substitute* "unit_tests/Makefile" (lambda _
(("check2_clamd.sh.*check4_clamd.sh") "")) (substitute* "unit_tests/Makefile"
#t))))) (("check2_clamd.sh.*check4_clamd.sh") "")))))))
(home-page "https://www.clamav.net") (home-page "https://www.clamav.net")
(synopsis "Antivirus engine") (synopsis "Antivirus engine")
(description (description

75
gnu/packages/apl.scm
View file

@ -2,6 +2,7 @@
;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2017, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2022 Paul A. Patience <paul@apatience.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -19,9 +20,11 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages apl) (define-module (gnu packages apl)
#:use-module (guix licenses) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix git-download)
#:use-module (guix svn-download)
#:use-module (guix gexp)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (gnu packages gettext) #:use-module (gnu packages gettext)
#:use-module (gnu packages maths) #:use-module (gnu packages maths)
@ -30,30 +33,46 @@
#:use-module (gnu packages sqlite)) #:use-module (gnu packages sqlite))
(define-public apl (define-public apl
(package (let ((revision 1550))
(name "apl") (package
(version "1.8") (name "apl")
(source (version (string-append "1.8-r" (number->string revision)))
(origin (source
(method url-fetch) (origin
(uri (string-append "mirror://gnu/apl/apl-" version ".tar.gz")) (method svn-fetch)
(sha256 (uri (svn-reference
(base32 (url "svn://svn.savannah.gnu.org/apl/trunk")
"1jxvv2h3y1am1fw6r5sn3say1n0dj8shmscbybl0qhqdia2lqkql")))) (revision revision)))
(build-system gnu-build-system) (file-name (git-file-name name version))
(home-page "https://www.gnu.org/software/apl/") (sha256
(inputs (base32 "1bgc3a09f35zrqq2irhm1hspppnxjqas0fmcw14hkc7910br9ip3"))))
`(("gettext" ,gettext-minimal) (build-system gnu-build-system)
("lapack" ,lapack) (home-page "https://www.gnu.org/software/apl/")
("pcre" ,pcre2) (inputs
("sqlite" ,sqlite) (list gettext-minimal
("readline" ,readline))) lapack
(arguments pcre2
`(#:configure-flags (list (string-append readline
"--with-sqlite3=" sqlite))
(assoc-ref %build-inputs "sqlite"))))) (arguments
(synopsis "APL interpreter") (list #:configure-flags #~(list (string-append
(description "--with-sqlite3="
"GNU APL is a free interpreter for the programming language APL. It is #$(this-package-input "sqlite")))
#:phases
#~(modify-phases %standard-phases
(add-before 'configure 'fix-configure
(lambda _
(substitute* "buildtag.sh"
;; Don't exit on failed SVN-related calls.
(("^ +return 0\n") "")
;; Manually set the SVN revision, since the directory is
;; unversioned and we know it anyway.
(("^SVNINFO=.*")
(string-append "SVNINFO=" #$(number->string revision) "\n"))
;; Requires running ‘svn info’ on a versioned directory.
(("\\\\\"\\$ARCHIVE_SVNINFO\\\\\"") "\\\"\\\"")))))))
(synopsis "APL interpreter")
(description
"GNU APL is a free interpreter for the programming language APL. It is
an implementation of the ISO standard 13751.") an implementation of the ISO standard 13751.")
(license gpl3+))) (license license:gpl3+))))

7
gnu/packages/aspell.scm
View file

@ -490,14 +490,14 @@ under permissive licensing terms. See the 'Copyright' file."))))
(define-public ispell (define-public ispell
(package (package
(name "ispell") (name "ispell")
(version "3.4.04") (version "3.4.05")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.cs.hmc.edu/~geoff/tars/ispell-" (uri (string-append "https://www.cs.hmc.edu/~geoff/tars/ispell-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 "0gp1rwn8grkvz28wgisc2j9w9svldnaiahl3lyis118xabqddg47")))) (base32 "00jni7gvdswjd9sdwip5ixnvjg2qzv56mn3m8gdgl9gxwgnns36g"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:parallel-build? #f `(#:parallel-build? #f
@ -520,8 +520,7 @@ under permissive licensing terms. See the 'Copyright' file."))))
(format port "#define BINDIR \"~a/bin\"~%" out) (format port "#define BINDIR \"~a/bin\"~%" out)
(format port "#define LIBDIR \"~a/lib/ispell\"~%" out) (format port "#define LIBDIR \"~a/lib/ispell\"~%" out)
(format port "#define MAN1DIR \"~a/share/man/man1\"~%" out) (format port "#define MAN1DIR \"~a/share/man/man1\"~%" out)
(format port "#define MAN45DIR \"~a/share/man/man5\"~%" out)))) (format port "#define MAN45DIR \"~a/share/man/man5\"~%" out)))))))))
#t)))))
(inputs (inputs
(list grep ncurses)) (list grep ncurses))
(native-inputs (native-inputs

25
gnu/packages/assembly.scm
View file

@ -3,7 +3,7 @@
;;; Copyright © 2013, 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2016, 2020, 2021 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017–2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Guy Fleury Iteriteka <hoonandon@gmail.com> ;;; Copyright © 2019 Guy Fleury Iteriteka <hoonandon@gmail.com>
;;; Copyright © 2019 Andy Tai <atai@atai.org> ;;; Copyright © 2019 Andy Tai <atai@atai.org>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net> ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
@ -11,6 +11,7 @@
;;; Copyright © 2020 B. Wilson <elaexuotee@wilsonb.com> ;;; Copyright © 2020 B. Wilson <elaexuotee@wilsonb.com>
;;; 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>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -181,14 +182,14 @@ speed on x86, NEON on ARM, etc.).")
(define-public fasm (define-public fasm
(package (package
(name "fasm") (name "fasm")
(version "1.73.29") (version "1.73.30")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://flatassembler.net/fasm-" (uri (string-append "https://flatassembler.net/fasm-"
version ".tgz")) version ".tgz"))
(sha256 (sha256
(base32 "0ar1k1504cmwi49y6g254rkzayll0kn90vjd4zj09xv86kcg8a33")))) (base32 "00giqb94z8cxhv20yiyk8axkd2kzjcg1c0841yzbn7c8lm8m06bm"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; no tests exist `(#:tests? #f ; no tests exist
@ -342,7 +343,7 @@ package for the Game Boy and Game Boy Color. It consists of:
(define-public wla-dx (define-public wla-dx
(package (package
(name "wla-dx") (name "wla-dx")
(version "9.12") (version "10.1")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -351,12 +352,20 @@ package for the Game Boy and Game Boy Color. It consists of:
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1wlbqv2rgk9q6m9an1mi0i29250zl8lw7zipki2bbi9mczpyczli")))) "1nh2k2xn5fj389gq68f3fxgrxakgn8c6dw2ffqay86s3706hac9w"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs (list python-sphinx)) ; to generate man pages
`(("sphinx" ,python-sphinx))) ; to generate man pages
(arguments (arguments
`(#:tests? #f)) ; no tests `(#:phases
(modify-phases %standard-phases
(add-before 'check 'copy-tests-to-build-directory
(lambda _
(copy-recursively "../source/tests" "tests")))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(let ((sh (which "sh")))
(when tests?
(invoke sh "../source/run_tests.sh"))))))))
(home-page "https://github.com/vhelin/wla-dx") (home-page "https://github.com/vhelin/wla-dx")
(synopsis "Assemblers for various processors") (synopsis "Assemblers for various processors")
(description "WLA DX is a set of tools to assemble assembly files to (description "WLA DX is a set of tools to assemble assembly files to

53
gnu/packages/astronomy.scm
View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 John Darrington <jmd@gnu.org> ;;; Copyright © 2016 John Darrington <jmd@gnu.org>
;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018–2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019, 2020, 2021, 2022 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018, 2019, 2020, 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019 by Amar Singh <nly@disroot.org> ;;; Copyright © 2019 by Amar Singh <nly@disroot.org>
;;; Copyright © 2020 R Veera Kumar <vkor@vkten.in> ;;; Copyright © 2020 R Veera Kumar <vkor@vkten.in>
@ -39,6 +39,7 @@
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages curl) #:use-module (gnu packages curl)
#:use-module (gnu packages fontutils) #:use-module (gnu packages fontutils)
#:use-module (gnu packages gcc)
#:use-module (gnu packages gettext) #:use-module (gnu packages gettext)
#:use-module (gnu packages gl) #:use-module (gnu packages gl)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
@ -71,6 +72,41 @@
#:use-module (ice-9 match) #:use-module (ice-9 match)
#:use-module (srfi srfi-1)) #:use-module (srfi srfi-1))
(define-public calceph
(package
(name "calceph")
(version "3.5.1")
(source
(origin
(method url-fetch)
(uri (string-append
"https://www.imcce.fr/content/medias/recherche/equipes/asd/calceph/calceph-"
version ".tar.gz"))
(sha256
(base32 "078wn773pwf4pg9m0h0l00g4aq744pq1rb6kz6plgdpzp3hhpk1k"))))
(build-system gnu-build-system)
(native-inputs
(list gfortran))
(home-page "https://www.imcce.fr/inpop/calceph")
(properties `((release-monitoring-url . ,home-page)))
(synopsis "Astronomical library to access the binary planetary ephemeris files")
(description
"The CALCEPH Library is designed to access the binary planetary ephemeris files,
such INPOPxx and JPL DExxx ephemeris files, (called @code{original JPL binary} or
@code{INPOP 2.0 or 3.0 binary} ephemeris files in the next sections) and the SPICE
kernel files (called @code{SPICE} ephemeris files in the next sections). At the
moment, supported SPICE files are:
@itemize
@item text Planetary Constants Kernel (KPL/PCK) files;
@item binary PCK (DAF/PCK) files;
@item binary SPK (DAF/SPK) files containing segments of type 1, 2, 3, 5, 8, 9,
12, 13, 17, 18, 19, 20, 21, 102, 103 and 120;
@item meta kernel (KPL/MK) files;
@item frame kernel (KPL/FK) files (only basic support).
@end itemize\n")
(license license:cecill)))
(define-public cfitsio (define-public cfitsio
(package (package
(name "cfitsio") (name "cfitsio")
@ -107,21 +143,20 @@ in FITS files.")
(define-public python-fitsio (define-public python-fitsio
(package (package
(name "python-fitsio") (name "python-fitsio")
(version "1.1.5") (version "1.1.7")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "fitsio" version)) (uri (pypi-uri "fitsio" version))
(sha256 (sha256
(base32 "1llql2i6xr9lkdl81jx5nvz80kspamvira90546y32ldy551hq1l")) (base32 "0q8siijys9kmjnqvyipjgh6hkhf4fwvr1swhsf4if211i9b0m1xy"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Remove the bundled cfitsio ;; Remove the bundled cfitsio
`(begin `(begin
(delete-file-recursively "cfitsio3490") (delete-file-recursively "cfitsio3490")
(substitute* "MANIFEST.in" (substitute* "MANIFEST.in"
(("recursive-include cfitsio3490.*$\n") "")) (("recursive-include cfitsio3490.*$\n") ""))))))
#t))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -748,13 +783,13 @@ astronomy and astrophysics.")
(define-public python-astroquery (define-public python-astroquery
(package (package
(name "python-astroquery") (name "python-astroquery")
(version "0.4.5") (version "0.4.6")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "astroquery" version)) (uri (pypi-uri "astroquery" version))
(sha256 (sha256
(base32 "06xy0qzqmps6z5vwfkh5fkhr151p7g94r2j0mvp1rc8zns22y010")))) (base32 "1vhkzsqlgn3ji5by2rdf2gwklhbyzvpzb1iglalhqjkkrdaaaz1h"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -1366,13 +1401,13 @@ Moon position, etc.")
(define-public python-jplephem (define-public python-jplephem
(package (package
(name "python-jplephem") (name "python-jplephem")
(version "2.16") (version "2.17")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "jplephem" version)) (uri (pypi-uri "jplephem" version))
(sha256 (sha256
(base32 "1xvivnsywjaf5lxn3kyg2jhhq393gcwkjrl634m8dn52ypidrcdb")))) (base32 "09xaibxnwbzzs3x9g3ibqa2la17z3r6in93321glh02dbibfbip1"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases `(#:phases

433
gnu/packages/audio.scm
View file

@ -11,7 +11,7 @@
;;; Copyright © 2016–2022 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2016–2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2020 Oleg Pykhalov <go.wigust@gmail.com> ;;; Copyright © 2018, 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2018 okapi <okapi@firemail.cc> ;;; Copyright © 2018 okapi <okapi@firemail.cc>
;;; Copyright © 2018, 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2018, 2020, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2018 Brett Gilio <brettg@gnu.org> ;;; Copyright © 2018 Brett Gilio <brettg@gnu.org>
;;; Copyright © 2018, 2019 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2018, 2019 Marius Bakke <mbakke@fastmail.com>
@ -110,6 +110,7 @@
#:use-module (gnu packages qt) #:use-module (gnu packages qt)
#:use-module (gnu packages rdf) #:use-module (gnu packages rdf)
#:use-module (gnu packages readline) #:use-module (gnu packages readline)
#:use-module (gnu packages samba)
#:use-module (gnu packages sdl) #:use-module (gnu packages sdl)
#:use-module (gnu packages serialization) #:use-module (gnu packages serialization)
#:use-module (gnu packages sqlite) #:use-module (gnu packages sqlite)
@ -616,8 +617,7 @@ Filter) modules follow the convention of 1V / Octave.")
"--enable-jack" "--enable-jack"
"--enable-sndfile" "--enable-sndfile"
"--enable-samplerate" "--enable-samplerate"
"--enable-avcodec") "--enable-avcodec")))
#:python ,python-2))
(inputs (inputs
(list jack-1 libsndfile libsamplerate fftwf ffmpeg)) ; for libavcodec (list jack-1 libsndfile libsamplerate fftwf ffmpeg)) ; for libavcodec
(native-inputs (native-inputs
@ -1980,6 +1980,51 @@ patches that can be used with softsynths such as Timidity and WildMidi.")
;; GPLv2+ with exception for compositions using these patches. ;; GPLv2+ with exception for compositions using these patches.
(license license:gpl2+))) (license license:gpl2+)))
(define-public freepats-gm
(package
(name "freepats-gm")
(version "20210329")
(source (origin
(method url-fetch)
(uri (string-append "https://freepats.zenvoid.org/SoundSets/"
"FreePats-GeneralMIDI/FreePatsGM-SF2-" version ".7z"))
(sha256
(base32
"19a1mp9yi33j2zff4mjvhrjz97dwwgjwzfdlf84j9xyydhx0crhc"))))
(build-system trivial-build-system)
(native-inputs
`(("p7zip" ,p7zip)))
(arguments
`(#:modules ((guix build utils))
#:builder
(let ((dir (string-append "FreePatsGM-SF2-" ,version))
(file (string-append "FreePatsGM-" ,version ".sf2"))
(out (string-append %output "/share/soundfonts"))
(doc (string-append %output "/share/doc/freepats-gm-" ,version)))
(use-modules (guix build utils))
(invoke (string-append (assoc-ref %build-inputs "p7zip") "/bin/7z")
"e" (assoc-ref %build-inputs "source")
(string-append dir "/" file)
(string-append dir "/gpl.txt")
(string-append dir "/cc0.txt")
(string-append dir "/readme.txt"))
(mkdir-p out)
(copy-file file (string-append out "/FreePatsGM.sf2"))
(mkdir-p doc)
(for-each
(lambda (file)
(copy-file file (string-append doc "/" file)))
(find-files "." "\\.txt$"))
#t)))
(home-page "https://freepats.zenvoid.org/SoundSets/general-midi.html")
(synopsis "General MIDI sound set")
(description "FreePats is a project to create a free (as in free software)
collection of digital instruments for music production. This sound bank is a
partial release of the General MIDI sound set.")
(license (list
license:gpl3+ ; with sampling exception
license:cc0))))
(define-public guitarix (define-public guitarix
(package (package
(name "guitarix") (name "guitarix")
@ -2194,23 +2239,23 @@ synchronous execution of all clients, and low latency operation.")
;; jack-2 implement the same API. JACK2 is provided primarily as a client ;; jack-2 implement the same API. JACK2 is provided primarily as a client
;; program for users who might benefit from the D-BUS features. ;; program for users who might benefit from the D-BUS features.
(define-public jack-2 (define-public jack-2
(package (inherit jack-1) (package
(inherit jack-1)
(name "jack2") (name "jack2")
(version "1.9.14") (version "1.9.21")
(source (origin (source (origin
(method url-fetch) (method git-fetch)
(uri (string-append "https://github.com/jackaudio/jack2/releases/" (uri (git-reference
"download/v" version "/jack2-" (url "https://github.com/jackaudio/jack2")
version ".tar.gz")) (commit (string-append "v" version))))
(file-name (string-append name "-" version ".tar.gz")) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0z11hf55a6mi8h50hfz5wry9pshlwl4mzfwgslghdh40cwv342m2")))) "0sbrffmdbajvrk7iqvsvrnwnpvmicvbjyq3f52r6ashdsznsz03b"))))
(build-system waf-build-system) (build-system waf-build-system)
(arguments (arguments
`(#:tests? #f ; no check target `(#:tests? #f ; no check target
#:configure-flags '("--dbus" #:configure-flags '("--dbus" "--alsa")
"--alsa")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'set-linkflags (add-before 'configure 'set-linkflags
@ -2224,16 +2269,13 @@ synchronous execution of all clients, and low latency operation.")
((".*CFLAGS.*-Wall.*" m) ((".*CFLAGS.*-Wall.*" m)
(string-append m (string-append m
" conf.env.append_unique('LINKFLAGS'," " conf.env.append_unique('LINKFLAGS',"
"'-Wl,-rpath=" %output "/lib')\n"))) "'-Wl,-rpath=" %output "/lib')\n")))))
#t))
(add-after 'install 'wrap-python-scripts (add-after 'install 'wrap-python-scripts
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; Make sure 'jack_control' runs with the correct PYTHONPATH. ;; Make sure 'jack_control' runs with the correct PYTHONPATH.
(let* ((out (assoc-ref outputs "out")) (wrap-program (search-input-file outputs "bin/jack_control")
(path (getenv "GUIX_PYTHONPATH"))) `("GUIX_PYTHONPATH" ":"
(wrap-program (string-append out "/bin/jack_control") prefix (,(getenv "GUIX_PYTHONPATH")))))))))
`("GUIX_PYTHONPATH" ":" prefix (,path))))
#t)))))
(inputs (inputs
(list alsa-lib (list alsa-lib
dbus dbus
@ -2260,17 +2302,15 @@ synchronous execution of all clients, and low latency operation.")
"05lycfq0f06zjp5xqvzjz9hx9kmqx72yng1lghh76hv63dw43lcj")))) "05lycfq0f06zjp5xqvzjz9hx9kmqx72yng1lghh76hv63dw43lcj"))))
(build-system waf-build-system) (build-system waf-build-system)
(arguments (arguments
`(#:tests? #f ; no check target `(#:tests? #f)) ; no check target
#:python ,python-2))
(inputs (inputs
`(("lv2" ,lv2) (list lv2
("lilv" ,lilv) lilv
("suil" ,suil) suil
("gtk2" ,gtk+-2) gtk
("gtk3" ,gtk+) gtkmm
("gtkmm" ,gtkmm-2) qtbase-5
("qtbase" ,qtbase-5) jack-1))
("jack" ,jack-1)))
(native-inputs (native-inputs
(list pkg-config)) (list pkg-config))
(home-page "https://drobilla.net/software/jalv/") (home-page "https://drobilla.net/software/jalv/")
@ -2522,9 +2562,6 @@ compensation, (de)interleaving, and byte-swapping
cross-platform audio input/output stream library.") cross-platform audio input/output stream library.")
(license license:expat))) (license license:expat)))
(define-public python2-pyaudio
(package-with-python2 python-pyaudio))
(define-public python-pyliblo (define-public python-pyliblo
(package (package
(name "python-pyliblo") (name "python-pyliblo")
@ -2551,9 +2588,6 @@ to send and receive OSC messages using a nice and simple Python API. Also
included are the command line utilities @code{send_osc} and @code{dump_osc}.") included are the command line utilities @code{send_osc} and @code{dump_osc}.")
(license license:lgpl2.1+))) (license license:lgpl2.1+)))
(define-public python2-pyliblo
(package-with-python2 python-pyliblo))
(define-public python-soundfile (define-public python-soundfile
(package (package
(name "python-soundfile") (name "python-soundfile")
@ -2761,37 +2795,33 @@ software.")
(description "An LV2 port of the mda EPiano VSTi."))) (description "An LV2 port of the mda EPiano VSTi.")))
(define-public lvtk (define-public lvtk
(package ;; Use the latest commit, as the latest release was made in 2014 and depends
(name "lvtk") ;; on Python 2.
(version "1.2.0") (let ((commit "a73feabe772f9650aa071e6a4df660e549ab7c48")
(source (origin (revision "0"))
(method git-fetch) (package
(uri (git-reference (name "lvtk")
(url "https://github.com/lvtk/lvtk") (version (git-version "1.2.0" revision commit))
(commit version))) (source (origin
(file-name (git-file-name name version)) (method git-fetch)
(sha256 (uri (git-reference
(base32 (url "https://github.com/lvtk/lvtk")
"1b01zvzl70ana6l1kn8fgyr7msnn3c7x61cgw7fdpp50322352p8")))) (commit commit)))
(build-system waf-build-system) (file-name (git-file-name name version))
(arguments (sha256
`(#:tests? #f ; no check target (base32
#:python ,python-2 "0scmv8b4jlm88d21dqqchjy98wb93zclc9x960h213gdi871vsaj"))))
#:configure-flags (build-system waf-build-system)
(list (string-append "--boost-includes=" (arguments (list #:tests? #f)) ;no check target
(assoc-ref %build-inputs "boost") (inputs (list boost gtkmm lv2))
"/include")))) (native-inputs (list pkg-config))
(inputs (home-page "https://github.com/lvtk/lvtk")
(list boost gtkmm-2 lv2)) (synopsis "C++ libraries for LV2 plugins")
(native-inputs (description
(list pkg-config)) "The LV2 Toolkit (LVTK) contains libraries that wrap the LV2 C API and
(home-page "https://github.com/lvtk/lvtk")
(synopsis "C++ libraries for LV2 plugins")
(description
"The LV2 Toolkit (LVTK) contains libraries that wrap the LV2 C API and
extensions into easy to use C++ classes. It is the successor of extensions into easy to use C++ classes. It is the successor of
lv2-c++-tools.") lv2-c++-tools.")
(license license:gpl3+))) (license license:isc))))
(define-public openal (define-public openal
(package (package
@ -2928,14 +2958,14 @@ different audio devices such as ALSA or PulseAudio.")
(define-public qjackctl (define-public qjackctl
(package (package
(name "qjackctl") (name "qjackctl")
(version "0.9.6") (version "0.9.7")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/qjackctl/qjackctl/" (uri (string-append "mirror://sourceforge/qjackctl/qjackctl/"
version "/qjackctl-" version ".tar.gz")) version "/qjackctl-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0sqni9ppwadc01fnyqj6lkwy30ql1vccqglv9imd3zdchffjpjir")))) "104hfvr15v8cbkzil8slrqj48y3fl7lx060alj80q1sjh5hl6j2j"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:tests? #f)) ; no check target '(#:tests? #f)) ; no check target
@ -3117,49 +3147,6 @@ using Guix System.")
;; GNU Library (not Lesser) General Public License. ;; GNU Library (not Lesser) General Public License.
(license license:lgpl2.0+))) (license license:lgpl2.0+)))
(define-public raul
(package
(name "raul")
(version "0.8.0")
(source (origin
(method url-fetch)
(uri (string-append "https://download.drobilla.net/raul-"
version ".tar.bz2"))
(sha256
(base32
"09ms40xc1x6qli6lxkwn5ibqh62nl9w7dq0b6jh1q2zvnrxwsd8b"))))
(build-system waf-build-system)
(arguments
`(#:python ,python-2
#:tests? #f)) ; no check target
(inputs
(list glib boost))
(native-inputs
(list pkg-config))
(home-page "https://drobilla.net/software/raul/")
(synopsis "Real-time audio utility library")
(description
"Raul (Real-time Audio Utility Library) is a C++ utility library primarily
aimed at audio/musical applications.")
(license license:gpl2+)))
(define-public raul-devel
(let ((commit "4db870b2b20b0a608ec0283139056b836c5b1624")
(revision "1"))
(package (inherit raul)
(name "raul")
(version (string-append "0.8.9-" revision "."
(string-take commit 9)))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://git.drobilla.net/raul.git")
(commit commit)))
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32
"04fajrass3ymr72flx5js5vxc601ccrmx8ny8scp0rw7j0igyjdr")))))))
(define-public resample (define-public resample
(package (package
(name "resample") (name "resample")
@ -4301,9 +4288,6 @@ It is currently fairly complete for PCM devices, and has some support for
mixers.") mixers.")
(license license:psfl))) (license license:psfl)))
(define-public python2-pyalsaaudio
(package-with-python2 python-pyalsaaudio))
(define-public ldacbt (define-public ldacbt
(package (package
(name "ldacbt") (name "ldacbt")
@ -4587,37 +4571,44 @@ representations.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1mziklmqifhnb4kg9ia2r56r8wjn6xp40bkpf484hsgqvnrccl86")))) "1mziklmqifhnb4kg9ia2r56r8wjn6xp40bkpf484hsgqvnrccl86"))
(modules '((guix build utils)))
(snippet
#~(begin
(delete-file-recursively "iniparser")
(substitute* "configure.ac"
(("AC_CONFIG_FILES\\(iniparser/Makefile\\)") ""))
(substitute* "Makefile.am"
(("SUBDIRS = iniparser") ""))))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs (list autoconf automake libtool))
(list autoconf automake libtool)) (inputs (list fftw ncurses pulseaudio iniparser))
(inputs
(list fftw ncurses pulseaudio))
(arguments (arguments
`(#:configure-flags (list #:configure-flags
(list (string-append "PREFIX=" %output) #~(list (string-append "PREFIX="
(string-append "FONT_DIR=" %output "/share/consolefonts")) #$output)
#:make-flags (string-append "FONT_DIR="
(let ((lib (string-append %output "/lib"))) #$output "/share/consolefonts"))
(list (string-append "cava_LDFLAGS = -L" lib " -Wl,-rpath " lib))) #:make-flags
#:phases #~(let ((lib (string-append #$output "/lib")))
(modify-phases %standard-phases (list (string-append "cava_LDFLAGS = -L" lib " -Wl,-rpath " lib " -lrt")))
(replace 'bootstrap #:phases
(lambda* (#:key outputs #:allow-other-keys) #~(modify-phases %standard-phases
(setenv "HOME" (getcwd)) (replace 'bootstrap
(invoke "sh" "autogen.sh"))) (lambda _
(add-before 'build 'make-cava-ldflags (setenv "HOME"
(lambda* (#:key outputs #:allow-other-keys) (getcwd))
(mkdir-p (string-append (assoc-ref outputs "out") "/lib")) (invoke "sh" "autogen.sh")))
#t)) (add-before 'build 'make-cava-ldflags
(add-after 'install 'data (lambda _
(lambda* (#:key outputs #:allow-other-keys) (mkdir-p (string-append #$output "/lib"))))
(for-each (lambda (file) (add-after 'install 'data
(install-file file (lambda _
(string-append (assoc-ref outputs "out") (for-each (lambda (file)
"/share/doc/examples"))) (install-file file
(find-files "example_files")) (string-append #$output
#t))))) "/share/doc/examples")))
(find-files "example_files")))))))
(home-page "https://karlstav.github.io/cava/") (home-page "https://karlstav.github.io/cava/")
(synopsis "Console audio visualizer for ALSA, MPD, and PulseAudio") (synopsis "Console audio visualizer for ALSA, MPD, and PulseAudio")
(description "C.A.V.A. is a bar audio spectrum visualizer for the terminal (description "C.A.V.A. is a bar audio spectrum visualizer for the terminal
@ -4945,50 +4936,47 @@ as is the case with audio plugins.")
(base32 "01ngkmfcxyg1bb4qmfvlkkjbx4lx62akxqhizl8zmqnhfcy4p9bx")))) (base32 "01ngkmfcxyg1bb4qmfvlkkjbx4lx62akxqhizl8zmqnhfcy4p9bx"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; no "check" target (list #:tests? #f ; no "check" target
#:make-flags #:make-flags
(list (string-append "PREFIX=" (assoc-ref %outputs "out"))) #~(list (string-append "PREFIX=" #$output))
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(delete 'configure) ; no configure script (delete 'configure) ; no configure script
(add-before 'build 'set-CC-variable-and-show-features (add-before 'build 'set-CC-variable-and-show-features
(lambda _ (lambda _
(setenv "CC" "gcc") (setenv "CC" #$(cc-for-target))
(invoke "make" "features"))) (invoke "make" "features")))
(add-after 'install 'make-carla-executable (add-after 'install 'make-carla-executable
(lambda* (#:key outputs #:allow-other-keys) (lambda _
(let ((out (assoc-ref outputs "out"))) (chmod (string-append #$output "/share/carla/carla") #o555)))
(chmod (string-append out "/share/carla/carla") #o555) (add-after 'install 'wrap-executables
#t))) (lambda* (#:key inputs #:allow-other-keys)
(add-after 'install 'wrap-executables (wrap-script (string-append #$output "/bin/carla")
(lambda* (#:key inputs outputs #:allow-other-keys) #:guile (search-input-file inputs "bin/guile")
(let ((out (assoc-ref outputs "out"))) `("GUIX_PYTHONPATH" ":" prefix
(wrap-script (string-append out "/bin/carla") (,(getenv "GUIX_PYTHONPATH")))))))))
#:guile (search-input-file inputs "bin/guile")
`("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))))
#t))))))
(inputs (inputs
`(("alsa-lib" ,alsa-lib) (list alsa-lib
("ffmpeg" ,ffmpeg) ffmpeg
("fluidsynth" ,fluidsynth) fluidsynth
("file" ,file) file
("liblo" ,liblo) liblo
("libsndfile" ,libsndfile) libsndfile
("gtk2" ,gtk+-2) ;needed for bridging GTK2 plugins in GTK3 hosts libx11
("gtk+" ,gtk+) gtk+-2 ;needed for bridging GTK2 plugins in GTK3 hosts
("python-pyliblo" ,python-pyliblo) gtk+
("python-pyqt" ,python-pyqt) python-pyliblo
("python-rdflib" ,python-rdflib) python-pyqt
;; python-pyqt shows the following error without python-wrapper: python-rdflib
;; Error while finding module specification for 'PyQt5.uic.pyuic' ;; python-pyqt shows the following error without python-wrapper:
;; (ModuleNotFoundError: No module named 'PyQt5') ;; Error while finding module specification for 'PyQt5.uic.pyuic'
("python-wrapper" ,python-wrapper) ;; (ModuleNotFoundError: No module named 'PyQt5')
("libx11" ,libx11) python-wrapper
("qtbase" ,qtbase-5) qtbase-5
("zlib" ,zlib) zlib
;; For WRAP-SCRIPT above. ;; For WRAP-SCRIPT above.
("guile" ,guile-2.2))) guile-2.2))
(native-inputs (native-inputs
(list pkg-config)) (list pkg-config))
(home-page "https://kx.studio/Applications:Carla") (home-page "https://kx.studio/Applications:Carla")
@ -5399,55 +5387,54 @@ while still staying in time.")
(define-public butt (define-public butt
(package (package
(name "butt") (name "butt")
(version "0.1.32") (version "0.1.34")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/butt/butt/butt-" (uri (string-append "mirror://sourceforge/butt/butt/butt-"
version "/butt-" version ".tar.gz")) version "/butt-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1qwllkx9p1gb3syhbbck3agrk375m82l18fb81aqygi4g3dg3s9r")) "0zd1g1673pv8z437y34fllxska8dzpd7mygpham35pzwpdyc5c1p"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(substitute* "src/butt.cpp" '(substitute* "src/butt.cpp"
((".*zica.*") ""))))) ((".*zica.*") "")))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases (list #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'install 'install-documentation (add-after 'install 'install-documentation
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda _
(let* ((out (assoc-ref outputs "out")) (let ((doc (string-append #$output "/share/doc/" #$name)))
(manual (assoc-ref inputs "manual")) (install-file "README" doc)
(doc (string-append out "/share/doc/" ,name "-" ,version))) (copy-file #$(this-package-native-input "manual")
(install-file "README" doc) (string-append doc "/butt-manual.pdf"))))))))
(copy-file manual (string-append doc "/butt-manual.pdf"))))))))
(inputs
`(("dbus" ,dbus)
("flac" ,flac)
("fltk" ,fltk)
("lame" ,lame)
("libfdk" ,libfdk)
("libsamplerate" ,libsamplerate)
("libvorbis" ,libvorbis)
("libx11" ,libx11)
("libxext" ,libxext)
("libxfixes" ,libxfixes)
("libxft" ,libxft)
("libxrender" ,libxrender)
("ogg" ,libogg)
("openssl" ,openssl)
("opus" ,opus)
("portaudio" ,portaudio)))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("manual" ,(origin ("manual"
(method url-fetch) ,(origin
(uri (string-append "https://danielnoethen.de/butt/butt-" (method url-fetch)
version "_manual.pdf")) (uri (string-append "https://danielnoethen.de/butt/butt-"
(sha256 version "_manual.pdf"))
(base32 (sha256
"0g70jyyxbx5nin3xs9q9zf878b2kyy7rn8gn9w91x1ychbjd6dhh")))))) (base32 "0kadqzzbk25n0aqxgbqhg4mq4hsbjq44phzcx5qj1b8847yzz8si"))))))
(inputs
(list dbus
flac
fltk
lame
libfdk
libsamplerate
libvorbis
libx11
libxext
libxfixes
libxft
libxrender
libogg
openssl
opus
portaudio))
(home-page "https://danielnoethen.de/butt/") (home-page "https://danielnoethen.de/butt/")
(synopsis "Audio streaming tool") (synopsis "Audio streaming tool")
(description "Butt is a tool to stream audio to a ShoutCast or (description "Butt is a tool to stream audio to a ShoutCast or

4
gnu/packages/autogen.scm
View file

@ -62,6 +62,10 @@
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'build 'set-man-page-date
;; Avoid embedding the current date for reproducible builds
(lambda _
(setenv "MAN_PAGE_DATE" "2012-04-18")))
(add-before 'patch-source-shebangs 'patch-test-scripts (add-before 'patch-source-shebangs 'patch-test-scripts
(lambda _ (lambda _
(let ((sh (which "sh"))) (let ((sh (which "sh")))

14
gnu/packages/autotools.scm
View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2020, 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012-2018, 2020-2022 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015 Mathieu Lirzin <mthl@openmailbox.org> ;;; Copyright © 2015 Mathieu Lirzin <mthl@openmailbox.org>
;;; Copyright © 2014 Manolis Fragkiskos Ragkousis <manolis837@gmail.com> ;;; Copyright © 2014 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
;;; Copyright © 2015, 2017, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015, 2017, 2018 Mark H Weaver <mhw@netris.org>
@ -520,6 +520,18 @@ complexity of working with shared libraries across platforms.")
(license gpl3+) (license gpl3+)
(home-page "https://www.gnu.org/software/libtool/"))) (home-page "https://www.gnu.org/software/libtool/")))
(define-public libtool-2.4.7
(package
(inherit libtool)
(version "2.4.7")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/libtool/libtool-"
version ".tar.xz"))
(sha256
(base32
"0pb3l4x37k6fj1lwnpzws55gi3pxl0hx56jm4bzmbrkw0mzj2zsg"))))))
(define-public config (define-public config
(let ((revision "1") (let ((revision "1")
(commit "c8ddc8472f8efcadafc1ef53ca1d863415fddd5f")) (commit "c8ddc8472f8efcadafc1ef53ca1d863415fddd5f"))

8632
gnu/packages/aux-files/linux-libre/4.4-i686.conf
View file

File diff suppressed because it is too large Load diff

8441
gnu/packages/aux-files/linux-libre/4.4-x86_64.conf
View file

File diff suppressed because it is too large Load diff

166
gnu/packages/aux-files/linux-libre/5.16-arm.conf → gnu/packages/aux-files/linux-libre/5.17-arm.conf
View file

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/arm 5.16.0 Kernel Configuration # Linux/arm 5.17.3 Kernel Configuration
# #
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0" CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
CONFIG_CC_IS_GCC=y CONFIG_CC_IS_GCC=y
@ -221,7 +221,6 @@ CONFIG_ELF_CORE=y
CONFIG_BASE_FULL=y CONFIG_BASE_FULL=y
CONFIG_FUTEX=y CONFIG_FUTEX=y
CONFIG_FUTEX_PI=y CONFIG_FUTEX_PI=y
CONFIG_HAVE_FUTEX_CMPXCHG=y
CONFIG_EPOLL=y CONFIG_EPOLL=y
CONFIG_SIGNALFD=y CONFIG_SIGNALFD=y
CONFIG_TIMERFD=y CONFIG_TIMERFD=y
@ -526,6 +525,7 @@ CONFIG_SWP_EMULATE=y
# CONFIG_CPU_BPREDICT_DISABLE is not set # CONFIG_CPU_BPREDICT_DISABLE is not set
CONFIG_CPU_SPECTRE=y CONFIG_CPU_SPECTRE=y
CONFIG_HARDEN_BRANCH_PREDICTOR=y CONFIG_HARDEN_BRANCH_PREDICTOR=y
CONFIG_HARDEN_BRANCH_HISTORY=y
CONFIG_KUSER_HELPERS=y CONFIG_KUSER_HELPERS=y
CONFIG_VDSO=y CONFIG_VDSO=y
CONFIG_OUTER_CACHE=y CONFIG_OUTER_CACHE=y
@ -809,6 +809,7 @@ CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
CONFIG_HAVE_EXIT_THREAD=y CONFIG_HAVE_EXIT_THREAD=y
CONFIG_ARCH_MMAP_RND_BITS=8 CONFIG_ARCH_MMAP_RND_BITS=8
CONFIG_PAGE_SIZE_LESS_THAN_64KB=y CONFIG_PAGE_SIZE_LESS_THAN_64KB=y
CONFIG_PAGE_SIZE_LESS_THAN_256KB=y
CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y
CONFIG_CLONE_BACKWARDS=y CONFIG_CLONE_BACKWARDS=y
CONFIG_OLD_SIGSUSPEND3=y CONFIG_OLD_SIGSUSPEND3=y
@ -852,6 +853,7 @@ CONFIG_MODVERSIONS=y
CONFIG_MODULE_COMPRESS_GZIP=y CONFIG_MODULE_COMPRESS_GZIP=y
# CONFIG_MODULE_COMPRESS_XZ is not set # CONFIG_MODULE_COMPRESS_XZ is not set
# CONFIG_MODULE_COMPRESS_ZSTD is not set # CONFIG_MODULE_COMPRESS_ZSTD is not set
CONFIG_MODULE_DECOMPRESS=y
# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
CONFIG_MODPROBE_PATH="/run/current-system/profile/bin/modprobe" CONFIG_MODPROBE_PATH="/run/current-system/profile/bin/modprobe"
# CONFIG_TRIM_UNUSED_KSYMS is not set # CONFIG_TRIM_UNUSED_KSYMS is not set
@ -860,6 +862,7 @@ CONFIG_BLOCK=y
CONFIG_BLK_RQ_ALLOC_TIME=y CONFIG_BLK_RQ_ALLOC_TIME=y
CONFIG_BLK_CGROUP_RWSTAT=y CONFIG_BLK_CGROUP_RWSTAT=y
CONFIG_BLK_DEV_BSG_COMMON=y CONFIG_BLK_DEV_BSG_COMMON=y
CONFIG_BLK_ICQ=y
CONFIG_BLK_DEV_BSGLIB=y CONFIG_BLK_DEV_BSGLIB=y
CONFIG_BLK_DEV_INTEGRITY=y CONFIG_BLK_DEV_INTEGRITY=y
CONFIG_BLK_DEV_INTEGRITY_T10=y CONFIG_BLK_DEV_INTEGRITY_T10=y
@ -967,7 +970,6 @@ CONFIG_BOUNCE=y
CONFIG_MMU_NOTIFIER=y CONFIG_MMU_NOTIFIER=y
CONFIG_KSM=y CONFIG_KSM=y
CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
# CONFIG_CLEANCACHE is not set
CONFIG_FRONTSWAP=y CONFIG_FRONTSWAP=y
CONFIG_CMA=y CONFIG_CMA=y
# CONFIG_CMA_DEBUG is not set # CONFIG_CMA_DEBUG is not set
@ -1001,6 +1003,7 @@ CONFIG_HMM_MIRROR=y
# CONFIG_GUP_TEST is not set # CONFIG_GUP_TEST is not set
CONFIG_KMAP_LOCAL=y CONFIG_KMAP_LOCAL=y
CONFIG_KMAP_LOCAL_NON_LINEAR_PTE_ARRAY=y CONFIG_KMAP_LOCAL_NON_LINEAR_PTE_ARRAY=y
CONFIG_ANON_VMA_NAME=y
# #
# Data Access Monitoring # Data Access Monitoring
@ -1201,7 +1204,6 @@ CONFIG_NF_TABLES_NETDEV=y
CONFIG_NFT_NUMGEN=m CONFIG_NFT_NUMGEN=m
CONFIG_NFT_CT=m CONFIG_NFT_CT=m
CONFIG_NFT_FLOW_OFFLOAD=m CONFIG_NFT_FLOW_OFFLOAD=m
CONFIG_NFT_COUNTER=m
CONFIG_NFT_CONNLIMIT=m CONFIG_NFT_CONNLIMIT=m
CONFIG_NFT_LOG=m CONFIG_NFT_LOG=m
CONFIG_NFT_LIMIT=m CONFIG_NFT_LIMIT=m
@ -1400,7 +1402,6 @@ CONFIG_NFT_REJECT_IPV4=m
CONFIG_NFT_DUP_IPV4=m CONFIG_NFT_DUP_IPV4=m
CONFIG_NFT_FIB_IPV4=m CONFIG_NFT_FIB_IPV4=m
CONFIG_NF_TABLES_ARP=y CONFIG_NF_TABLES_ARP=y
CONFIG_NF_FLOW_TABLE_IPV4=m
CONFIG_NF_DUP_IPV4=m CONFIG_NF_DUP_IPV4=m
CONFIG_NF_LOG_ARP=m CONFIG_NF_LOG_ARP=m
CONFIG_NF_LOG_IPV4=m CONFIG_NF_LOG_IPV4=m
@ -1440,7 +1441,6 @@ CONFIG_NF_TABLES_IPV6=y
CONFIG_NFT_REJECT_IPV6=m CONFIG_NFT_REJECT_IPV6=m
CONFIG_NFT_DUP_IPV6=m CONFIG_NFT_DUP_IPV6=m
CONFIG_NFT_FIB_IPV6=m CONFIG_NFT_FIB_IPV6=m
CONFIG_NF_FLOW_TABLE_IPV6=m
CONFIG_NF_DUP_IPV6=m CONFIG_NF_DUP_IPV6=m
CONFIG_NF_REJECT_IPV6=m CONFIG_NF_REJECT_IPV6=m
CONFIG_NF_LOG_IPV6=m CONFIG_NF_LOG_IPV6=m
@ -1836,6 +1836,7 @@ CONFIG_BT_DEBUGFS=y
CONFIG_BT_INTEL=m CONFIG_BT_INTEL=m
CONFIG_BT_BCM=m CONFIG_BT_BCM=m
CONFIG_BT_RTL=m CONFIG_BT_RTL=m
CONFIG_BT_MTK=m
CONFIG_BT_HCIBTUSB=m CONFIG_BT_HCIBTUSB=m
# CONFIG_BT_HCIBTUSB_AUTOSUSPEND is not set # CONFIG_BT_HCIBTUSB_AUTOSUSPEND is not set
CONFIG_BT_HCIBTUSB_BCM=y CONFIG_BT_HCIBTUSB_BCM=y
@ -1901,6 +1902,7 @@ CONFIG_RFKILL_LEDS=y
CONFIG_RFKILL_INPUT=y CONFIG_RFKILL_INPUT=y
# CONFIG_RFKILL_GPIO is not set # CONFIG_RFKILL_GPIO is not set
CONFIG_NET_9P=m CONFIG_NET_9P=m
CONFIG_NET_9P_FD=m
CONFIG_NET_9P_VIRTIO=m CONFIG_NET_9P_VIRTIO=m
# CONFIG_NET_9P_XEN is not set # CONFIG_NET_9P_XEN is not set
CONFIG_NET_9P_RDMA=m CONFIG_NET_9P_RDMA=m
@ -2052,6 +2054,7 @@ CONFIG_AUXILIARY_BUS=y
# CONFIG_UEVENT_HELPER is not set # CONFIG_UEVENT_HELPER is not set
CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y CONFIG_DEVTMPFS_MOUNT=y
CONFIG_DEVTMPFS_SAFE=y
CONFIG_STANDALONE=y CONFIG_STANDALONE=y
CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_PREVENT_FIRMWARE_BUILD=y
@ -2076,6 +2079,7 @@ CONFIG_DEV_COREDUMP=y
# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
CONFIG_SYS_HYPERVISOR=y CONFIG_SYS_HYPERVISOR=y
CONFIG_GENERIC_CPU_AUTOPROBE=y CONFIG_GENERIC_CPU_AUTOPROBE=y
CONFIG_GENERIC_CPU_VULNERABILITIES=y
CONFIG_SOC_BUS=y CONFIG_SOC_BUS=y
CONFIG_REGMAP=y CONFIG_REGMAP=y
CONFIG_REGMAP_AC97=m CONFIG_REGMAP_AC97=m
@ -2175,6 +2179,7 @@ CONFIG_ARM_SMCCC_SOC_ID=y
# end of Firmware Drivers # end of Firmware Drivers
CONFIG_GNSS=m CONFIG_GNSS=m
CONFIG_GNSS_USB=m
CONFIG_MTD=y CONFIG_MTD=y
# CONFIG_MTD_TESTS is not set # CONFIG_MTD_TESTS is not set
@ -2384,7 +2389,6 @@ CONFIG_XEN_BLKDEV_FRONTEND=m
CONFIG_XEN_BLKDEV_BACKEND=m CONFIG_XEN_BLKDEV_BACKEND=m
CONFIG_VIRTIO_BLK=m CONFIG_VIRTIO_BLK=m
CONFIG_BLK_DEV_RBD=m CONFIG_BLK_DEV_RBD=m
# CONFIG_BLK_DEV_RSXX is not set
CONFIG_BLK_DEV_RNBD=y CONFIG_BLK_DEV_RNBD=y
CONFIG_BLK_DEV_RNBD_CLIENT=m CONFIG_BLK_DEV_RNBD_CLIENT=m
CONFIG_BLK_DEV_RNBD_SERVER=m CONFIG_BLK_DEV_RNBD_SERVER=m
@ -2870,6 +2874,7 @@ CONFIG_NET_DSA_XRS700X=m
CONFIG_NET_DSA_XRS700X_I2C=m CONFIG_NET_DSA_XRS700X_I2C=m
CONFIG_NET_DSA_XRS700X_MDIO=m CONFIG_NET_DSA_XRS700X_MDIO=m
# CONFIG_NET_DSA_QCA8K is not set # CONFIG_NET_DSA_QCA8K is not set
CONFIG_NET_DSA_REALTEK=m
CONFIG_NET_DSA_REALTEK_SMI=m CONFIG_NET_DSA_REALTEK_SMI=m
# CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set # CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
# CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set # CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set
@ -2970,6 +2975,9 @@ CONFIG_BE2NET_BE2=y
CONFIG_BE2NET_BE3=y CONFIG_BE2NET_BE3=y
CONFIG_BE2NET_LANCER=y CONFIG_BE2NET_LANCER=y
CONFIG_BE2NET_SKYHAWK=y CONFIG_BE2NET_SKYHAWK=y
CONFIG_NET_VENDOR_ENGLEDER=y
CONFIG_TSNEP=m
# CONFIG_TSNEP_SELFTESTS is not set
CONFIG_NET_VENDOR_EZCHIP=y CONFIG_NET_VENDOR_EZCHIP=y
# CONFIG_EZCHIP_NPS_MANAGEMENT_ENET is not set # CONFIG_EZCHIP_NPS_MANAGEMENT_ENET is not set
CONFIG_NET_VENDOR_FARADAY=y CONFIG_NET_VENDOR_FARADAY=y
@ -3067,6 +3075,7 @@ CONFIG_ENC28J60=m
# CONFIG_ENC28J60_WRITEVERIFY is not set # CONFIG_ENC28J60_WRITEVERIFY is not set
# CONFIG_ENCX24J600 is not set # CONFIG_ENCX24J600 is not set
# CONFIG_LAN743X is not set # CONFIG_LAN743X is not set
# CONFIG_LAN966X_SWITCH is not set
CONFIG_NET_VENDOR_MICROSEMI=y CONFIG_NET_VENDOR_MICROSEMI=y
CONFIG_MSCC_OCELOT_SWITCH_LIB=m CONFIG_MSCC_OCELOT_SWITCH_LIB=m
CONFIG_MSCC_OCELOT_SWITCH=m CONFIG_MSCC_OCELOT_SWITCH=m
@ -3176,6 +3185,8 @@ CONFIG_TI_CPSW=m
CONFIG_TI_CPSW_SWITCHDEV=m CONFIG_TI_CPSW_SWITCHDEV=m
# CONFIG_TI_CPTS is not set # CONFIG_TI_CPTS is not set
CONFIG_TLAN=m CONFIG_TLAN=m
CONFIG_NET_VENDOR_VERTEXCOM=y
CONFIG_MSE102X=m
CONFIG_NET_VENDOR_VIA=y CONFIG_NET_VENDOR_VIA=y
# CONFIG_VIA_RHINE is not set # CONFIG_VIA_RHINE is not set
CONFIG_VIA_VELOCITY=m CONFIG_VIA_VELOCITY=m
@ -3250,6 +3261,9 @@ CONFIG_VITESSE_PHY=m
# #
# MCTP Device Drivers # MCTP Device Drivers
# #
CONFIG_MCTP_SERIAL=m
# end of MCTP Device Drivers
CONFIG_MDIO_DEVICE=y CONFIG_MDIO_DEVICE=y
CONFIG_MDIO_BUS=y CONFIG_MDIO_BUS=y
CONFIG_FWNODE_MDIO=y CONFIG_FWNODE_MDIO=y
@ -3261,7 +3275,7 @@ CONFIG_MDIO_BCM_UNIMAC=m
# CONFIG_MDIO_HISI_FEMAC is not set # CONFIG_MDIO_HISI_FEMAC is not set
CONFIG_MDIO_I2C=m CONFIG_MDIO_I2C=m
CONFIG_MDIO_MVUSB=m CONFIG_MDIO_MVUSB=m
# CONFIG_MDIO_MSCC_MIIM is not set CONFIG_MDIO_MSCC_MIIM=m
# CONFIG_MDIO_IPQ4019 is not set # CONFIG_MDIO_IPQ4019 is not set
CONFIG_MDIO_IPQ8064=m CONFIG_MDIO_IPQ8064=m
@ -3471,7 +3485,6 @@ CONFIG_IWLWIFI_LEDS=y
CONFIG_IWLDVM=m CONFIG_IWLDVM=m
CONFIG_IWLMVM=m CONFIG_IWLMVM=m
CONFIG_IWLWIFI_OPMODE_MODULAR=y CONFIG_IWLWIFI_OPMODE_MODULAR=y
# CONFIG_IWLWIFI_BCAST_FILTERING is not set
# #
# Debugging Options # Debugging Options
@ -3623,6 +3636,7 @@ CONFIG_IEEE802154_ADF7242=m
# Wireless WAN # Wireless WAN
# #
CONFIG_WWAN=y CONFIG_WWAN=y
# CONFIG_WWAN_DEBUGFS is not set
# CONFIG_WWAN_HWSIM is not set # CONFIG_WWAN_HWSIM is not set
CONFIG_MHI_WWAN_CTRL=m CONFIG_MHI_WWAN_CTRL=m
CONFIG_MHI_WWAN_MBIM=m CONFIG_MHI_WWAN_MBIM=m
@ -3946,6 +3960,7 @@ CONFIG_SERIAL_8250_FSL=y
CONFIG_SERIAL_8250_DW=y CONFIG_SERIAL_8250_DW=y
# CONFIG_SERIAL_8250_RT288X is not set # CONFIG_SERIAL_8250_RT288X is not set
# CONFIG_SERIAL_8250_OMAP is not set # CONFIG_SERIAL_8250_OMAP is not set
CONFIG_SERIAL_8250_PERICOM=y
CONFIG_SERIAL_8250_TEGRA=y CONFIG_SERIAL_8250_TEGRA=y
CONFIG_SERIAL_OF_PLATFORM=y CONFIG_SERIAL_OF_PLATFORM=y
@ -4119,7 +4134,6 @@ CONFIG_I2C_OMAP=y
CONFIG_I2C_PCA_PLATFORM=m CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PXA is not set # CONFIG_I2C_PXA is not set
CONFIG_I2C_RK3X=m CONFIG_I2C_RK3X=m
CONFIG_HAVE_S3C2410_I2C=y
CONFIG_I2C_S3C2410=y CONFIG_I2C_S3C2410=y
CONFIG_I2C_SIMTEC=m CONFIG_I2C_SIMTEC=m
CONFIG_I2C_SUN6I_P2WI=m CONFIG_I2C_SUN6I_P2WI=m
@ -4278,15 +4292,16 @@ CONFIG_PINCTRL_AXP209=m
CONFIG_PINCTRL_MCP23S08_I2C=m CONFIG_PINCTRL_MCP23S08_I2C=m
CONFIG_PINCTRL_MCP23S08_SPI=m CONFIG_PINCTRL_MCP23S08_SPI=m
CONFIG_PINCTRL_MCP23S08=m CONFIG_PINCTRL_MCP23S08=m
CONFIG_PINCTRL_ROCKCHIP=y # CONFIG_PINCTRL_MICROCHIP_SGPIO is not set
CONFIG_PINCTRL_SINGLE=y # CONFIG_PINCTRL_OCELOT is not set
# CONFIG_PINCTRL_SX150X is not set
# CONFIG_PINCTRL_STMFX is not set
CONFIG_PINCTRL_PALMAS=y CONFIG_PINCTRL_PALMAS=y
CONFIG_PINCTRL_RK805=m CONFIG_PINCTRL_RK805=m
# CONFIG_PINCTRL_OCELOT is not set CONFIG_PINCTRL_ROCKCHIP=y
# CONFIG_PINCTRL_MICROCHIP_SGPIO is not set CONFIG_PINCTRL_SINGLE=y
# CONFIG_PINCTRL_STMFX is not set
# CONFIG_PINCTRL_SX150X is not set
CONFIG_PINCTRL_BCM2835=y CONFIG_PINCTRL_BCM2835=y
CONFIG_PINCTRL_MADERA=m
CONFIG_PINCTRL_IMX=y CONFIG_PINCTRL_IMX=y
CONFIG_PINCTRL_IMX51=y CONFIG_PINCTRL_IMX51=y
CONFIG_PINCTRL_IMX53=y CONFIG_PINCTRL_IMX53=y
@ -4296,6 +4311,7 @@ CONFIG_PINCTRL_IMX8MN=y
CONFIG_PINCTRL_IMX8MP=y CONFIG_PINCTRL_IMX8MP=y
CONFIG_PINCTRL_IMX8MQ=y CONFIG_PINCTRL_IMX8MQ=y
# CONFIG_PINCTRL_IMX8ULP is not set # CONFIG_PINCTRL_IMX8ULP is not set
# CONFIG_PINCTRL_IMXRT1050 is not set
CONFIG_PINCTRL_MVEBU=y CONFIG_PINCTRL_MVEBU=y
CONFIG_PINCTRL_ARMADA_370=y CONFIG_PINCTRL_ARMADA_370=y
CONFIG_PINCTRL_ARMADA_375=y CONFIG_PINCTRL_ARMADA_375=y
@ -4341,7 +4357,6 @@ CONFIG_PINCTRL_TEGRA_XUSB=y
CONFIG_PINCTRL_TI_IODELAY=y CONFIG_PINCTRL_TI_IODELAY=y
CONFIG_PINCTRL_WMT=y CONFIG_PINCTRL_WMT=y
CONFIG_PINCTRL_WM8850=y CONFIG_PINCTRL_WM8850=y
CONFIG_PINCTRL_MADERA=m
CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
CONFIG_GPIOLIB=y CONFIG_GPIOLIB=y
CONFIG_GPIOLIB_FASTPATH_LIMIT=512 CONFIG_GPIOLIB_FASTPATH_LIMIT=512
@ -4404,7 +4419,6 @@ CONFIG_GPIO_PCF857X=m
# #
# MFD GPIO expanders # MFD GPIO expanders
# #
CONFIG_GPIO_BD70528=m
CONFIG_GPIO_BD71815=m CONFIG_GPIO_BD71815=m
CONFIG_GPIO_BD71828=m CONFIG_GPIO_BD71828=m
CONFIG_GPIO_BD9571MWV=m CONFIG_GPIO_BD9571MWV=m
@ -4448,6 +4462,7 @@ CONFIG_GPIO_VIPERBOARD=m
CONFIG_GPIO_AGGREGATOR=m CONFIG_GPIO_AGGREGATOR=m
# CONFIG_GPIO_MOCKUP is not set # CONFIG_GPIO_MOCKUP is not set
CONFIG_GPIO_VIRTIO=m CONFIG_GPIO_VIRTIO=m
# CONFIG_GPIO_SIM is not set
# end of Virtual GPIO drivers # end of Virtual GPIO drivers
CONFIG_W1=m CONFIG_W1=m
@ -4545,6 +4560,7 @@ CONFIG_CHARGER_GPIO=m
# CONFIG_CHARGER_LT3651 is not set # CONFIG_CHARGER_LT3651 is not set
# CONFIG_CHARGER_LTC4162L is not set # CONFIG_CHARGER_LTC4162L is not set
# CONFIG_CHARGER_DETECTOR_MAX14656 is not set # CONFIG_CHARGER_DETECTOR_MAX14656 is not set
# CONFIG_CHARGER_MAX77976 is not set
CONFIG_CHARGER_MT6360=m CONFIG_CHARGER_MT6360=m
CONFIG_CHARGER_BQ2415X=m CONFIG_CHARGER_BQ2415X=m
# CONFIG_CHARGER_BQ24190 is not set # CONFIG_CHARGER_BQ24190 is not set
@ -4674,6 +4690,7 @@ CONFIG_SENSORS_NCT6775=m
# CONFIG_SENSORS_NCT7904 is not set # CONFIG_SENSORS_NCT7904 is not set
# CONFIG_SENSORS_NPCM7XX is not set # CONFIG_SENSORS_NPCM7XX is not set
# CONFIG_SENSORS_NZXT_KRAKEN2 is not set # CONFIG_SENSORS_NZXT_KRAKEN2 is not set
# CONFIG_SENSORS_NZXT_SMART2 is not set
# CONFIG_SENSORS_OCC_P8_I2C is not set # CONFIG_SENSORS_OCC_P8_I2C is not set
# CONFIG_SENSORS_PCF8591 is not set # CONFIG_SENSORS_PCF8591 is not set
# CONFIG_PMBUS is not set # CONFIG_PMBUS is not set
@ -4705,6 +4722,7 @@ CONFIG_SENSORS_ADS7871=m
CONFIG_SENSORS_AMC6821=m CONFIG_SENSORS_AMC6821=m
# CONFIG_SENSORS_INA209 is not set # CONFIG_SENSORS_INA209 is not set
# CONFIG_SENSORS_INA2XX is not set # CONFIG_SENSORS_INA2XX is not set
# CONFIG_SENSORS_INA238 is not set
# CONFIG_SENSORS_INA3221 is not set # CONFIG_SENSORS_INA3221 is not set
# CONFIG_SENSORS_TC74 is not set # CONFIG_SENSORS_TC74 is not set
CONFIG_SENSORS_THMC50=m CONFIG_SENSORS_THMC50=m
@ -5004,7 +5022,6 @@ CONFIG_TWL6040_CORE=y
# CONFIG_MFD_WM8350_I2C is not set # CONFIG_MFD_WM8350_I2C is not set
# CONFIG_MFD_WM8994 is not set # CONFIG_MFD_WM8994 is not set
CONFIG_MFD_ROHM_BD718XX=m CONFIG_MFD_ROHM_BD718XX=m
CONFIG_MFD_ROHM_BD70528=m
CONFIG_MFD_ROHM_BD71828=m CONFIG_MFD_ROHM_BD71828=m
CONFIG_MFD_ROHM_BD957XMUF=m CONFIG_MFD_ROHM_BD957XMUF=m
# CONFIG_MFD_STPMIC1 is not set # CONFIG_MFD_STPMIC1 is not set
@ -5059,6 +5076,7 @@ CONFIG_REGULATOR_GPIO=m
CONFIG_REGULATOR_MAX8893=m CONFIG_REGULATOR_MAX8893=m
# CONFIG_REGULATOR_MAX8952 is not set # CONFIG_REGULATOR_MAX8952 is not set
# CONFIG_REGULATOR_MAX8973 is not set # CONFIG_REGULATOR_MAX8973 is not set
# CONFIG_REGULATOR_MAX20086 is not set
CONFIG_REGULATOR_MAX77686=m CONFIG_REGULATOR_MAX77686=m
# CONFIG_REGULATOR_MAX77802 is not set # CONFIG_REGULATOR_MAX77802 is not set
# CONFIG_REGULATOR_MAX77826 is not set # CONFIG_REGULATOR_MAX77826 is not set
@ -5697,6 +5715,7 @@ CONFIG_VIDEO_OV5648=m
CONFIG_VIDEO_OV6650=m CONFIG_VIDEO_OV6650=m
CONFIG_VIDEO_OV5670=m CONFIG_VIDEO_OV5670=m
CONFIG_VIDEO_OV5675=m CONFIG_VIDEO_OV5675=m
# CONFIG_VIDEO_OV5693 is not set
CONFIG_VIDEO_OV5695=m CONFIG_VIDEO_OV5695=m
CONFIG_VIDEO_OV7251=m CONFIG_VIDEO_OV7251=m
CONFIG_VIDEO_OV772X=m CONFIG_VIDEO_OV772X=m
@ -6005,9 +6024,8 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y
CONFIG_DRM_TTM=m CONFIG_DRM_TTM=m
CONFIG_DRM_VRAM_HELPER=m CONFIG_DRM_VRAM_HELPER=m
CONFIG_DRM_TTM_HELPER=m CONFIG_DRM_TTM_HELPER=m
CONFIG_DRM_GEM_CMA_HELPER=y CONFIG_DRM_GEM_CMA_HELPER=m
CONFIG_DRM_KMS_CMA_HELPER=y CONFIG_DRM_GEM_SHMEM_HELPER=m
CONFIG_DRM_GEM_SHMEM_HELPER=y
CONFIG_DRM_SCHED=m CONFIG_DRM_SCHED=m
# #
@ -6073,7 +6091,8 @@ CONFIG_DRM_UDL=m
# CONFIG_DRM_MGAG200 is not set # CONFIG_DRM_MGAG200 is not set
# CONFIG_DRM_ARMADA is not set # CONFIG_DRM_ARMADA is not set
# CONFIG_DRM_RCAR_DW_HDMI is not set # CONFIG_DRM_RCAR_DW_HDMI is not set
# CONFIG_DRM_RCAR_LVDS is not set # CONFIG_DRM_RCAR_USE_LVDS is not set
# CONFIG_DRM_RCAR_MIPI_DSI is not set
# CONFIG_DRM_SUN4I is not set # CONFIG_DRM_SUN4I is not set
CONFIG_DRM_OMAP=m CONFIG_DRM_OMAP=m
# CONFIG_OMAP2_DSS_DEBUG is not set # CONFIG_OMAP2_DSS_DEBUG is not set
@ -6115,6 +6134,7 @@ CONFIG_DRM_PANEL=y
# CONFIG_DRM_PANEL_ABT_Y030XX067A is not set # CONFIG_DRM_PANEL_ABT_Y030XX067A is not set
CONFIG_DRM_PANEL_ARM_VERSATILE=m CONFIG_DRM_PANEL_ARM_VERSATILE=m
CONFIG_DRM_PANEL_ASUS_Z00T_TM5P5_NT35596=m CONFIG_DRM_PANEL_ASUS_Z00T_TM5P5_NT35596=m
# CONFIG_DRM_PANEL_BOE_BF060Y8M_AJ0 is not set
CONFIG_DRM_PANEL_BOE_HIMAX8279D=m CONFIG_DRM_PANEL_BOE_HIMAX8279D=m
CONFIG_DRM_PANEL_BOE_TV101WUM_NL6=m CONFIG_DRM_PANEL_BOE_TV101WUM_NL6=m
CONFIG_DRM_PANEL_DSI_CM=m CONFIG_DRM_PANEL_DSI_CM=m
@ -6130,6 +6150,7 @@ CONFIG_DRM_PANEL_ILITEK_ILI9881C=m
CONFIG_DRM_PANEL_INNOLUX_EJ030NA=m CONFIG_DRM_PANEL_INNOLUX_EJ030NA=m
# CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
# CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
# CONFIG_DRM_PANEL_JDI_R63452 is not set
# CONFIG_DRM_PANEL_KHADAS_TS050 is not set # CONFIG_DRM_PANEL_KHADAS_TS050 is not set
# CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set # CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set
# CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set # CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set
@ -6139,6 +6160,7 @@ CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829=m
# CONFIG_DRM_PANEL_LG_LG4573 is not set # CONFIG_DRM_PANEL_LG_LG4573 is not set
# CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set # CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set
CONFIG_DRM_PANEL_NOVATEK_NT35510=m CONFIG_DRM_PANEL_NOVATEK_NT35510=m
# CONFIG_DRM_PANEL_NOVATEK_NT35950 is not set
# CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set # CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set
# CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set # CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set
CONFIG_DRM_PANEL_MANTIX_MLAF057WE51=m CONFIG_DRM_PANEL_MANTIX_MLAF057WE51=m
@ -6170,6 +6192,7 @@ CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01=m
# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
CONFIG_DRM_PANEL_SONY_ACX424AKP=m CONFIG_DRM_PANEL_SONY_ACX424AKP=m
# CONFIG_DRM_PANEL_SONY_ACX565AKM is not set # CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
# CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521 is not set
# CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set # CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
# CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set # CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set
# CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set # CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
@ -6246,6 +6269,7 @@ CONFIG_DRM_CIRRUS_QEMU=m
CONFIG_DRM_GM12U320=m CONFIG_DRM_GM12U320=m
CONFIG_DRM_SIMPLEDRM=m CONFIG_DRM_SIMPLEDRM=m
# CONFIG_TINYDRM_HX8357D is not set # CONFIG_TINYDRM_HX8357D is not set
# CONFIG_TINYDRM_ILI9163 is not set
# CONFIG_TINYDRM_ILI9225 is not set # CONFIG_TINYDRM_ILI9225 is not set
# CONFIG_TINYDRM_ILI9341 is not set # CONFIG_TINYDRM_ILI9341 is not set
CONFIG_TINYDRM_ILI9486=m CONFIG_TINYDRM_ILI9486=m
@ -6268,6 +6292,7 @@ CONFIG_DRM_LEGACY=y
CONFIG_DRM_VIA=m CONFIG_DRM_VIA=m
CONFIG_DRM_SAVAGE=m CONFIG_DRM_SAVAGE=m
CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
CONFIG_DRM_NOMODESET=y
# #
# Frame buffer Devices # Frame buffer Devices
@ -6384,6 +6409,7 @@ CONFIG_HDMI=y
# #
CONFIG_DUMMY_CONSOLE=y CONFIG_DUMMY_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y
# CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
@ -6580,6 +6606,7 @@ CONFIG_SND_SOC_ADI=m
CONFIG_SND_SOC_ADI_AXI_I2S=m CONFIG_SND_SOC_ADI_AXI_I2S=m
CONFIG_SND_SOC_ADI_AXI_SPDIF=m CONFIG_SND_SOC_ADI_AXI_SPDIF=m
# CONFIG_SND_SOC_AMD_ACP is not set # CONFIG_SND_SOC_AMD_ACP is not set
# CONFIG_SND_AMD_ACP_CONFIG is not set
# CONFIG_SND_ATMEL_SOC is not set # CONFIG_SND_ATMEL_SOC is not set
CONFIG_SND_BCM2835_SOC_I2S=m CONFIG_SND_BCM2835_SOC_I2S=m
CONFIG_SND_BCM63XX_I2S_WHISTLER=m CONFIG_SND_BCM63XX_I2S_WHISTLER=m
@ -6726,6 +6753,7 @@ CONFIG_SND_SOC_ADAU7118_HW=m
CONFIG_SND_SOC_ADAU7118_I2C=m CONFIG_SND_SOC_ADAU7118_I2C=m
# CONFIG_SND_SOC_AK4104 is not set # CONFIG_SND_SOC_AK4104 is not set
# CONFIG_SND_SOC_AK4118 is not set # CONFIG_SND_SOC_AK4118 is not set
# CONFIG_SND_SOC_AK4375 is not set
CONFIG_SND_SOC_AK4458=m CONFIG_SND_SOC_AK4458=m
# CONFIG_SND_SOC_AK4554 is not set # CONFIG_SND_SOC_AK4554 is not set
# CONFIG_SND_SOC_AK4613 is not set # CONFIG_SND_SOC_AK4613 is not set
@ -6831,6 +6859,7 @@ CONFIG_SND_SOC_SGTL5000=m
# CONFIG_SND_SOC_TDA7419 is not set # CONFIG_SND_SOC_TDA7419 is not set
# CONFIG_SND_SOC_TFA9879 is not set # CONFIG_SND_SOC_TFA9879 is not set
# CONFIG_SND_SOC_TFA989X is not set # CONFIG_SND_SOC_TFA989X is not set
# CONFIG_SND_SOC_TLV320ADC3XXX is not set
CONFIG_SND_SOC_TLV320AIC23=m CONFIG_SND_SOC_TLV320AIC23=m
CONFIG_SND_SOC_TLV320AIC23_I2C=m CONFIG_SND_SOC_TLV320AIC23_I2C=m
# CONFIG_SND_SOC_TLV320AIC23_SPI is not set # CONFIG_SND_SOC_TLV320AIC23_SPI is not set
@ -6963,6 +6992,7 @@ CONFIG_HID_KENSINGTON=m
CONFIG_HID_LCPOWER=m CONFIG_HID_LCPOWER=m
CONFIG_HID_LED=m CONFIG_HID_LED=m
CONFIG_HID_LENOVO=m CONFIG_HID_LENOVO=m
CONFIG_HID_LETSKETCH=m
CONFIG_HID_LOGITECH=m CONFIG_HID_LOGITECH=m
CONFIG_HID_LOGITECH_DJ=m CONFIG_HID_LOGITECH_DJ=m
CONFIG_HID_LOGITECH_HIDPP=m CONFIG_HID_LOGITECH_HIDPP=m
@ -7116,6 +7146,7 @@ CONFIG_USB_U132_HCD=m
# CONFIG_USB_HCD_BCMA is not set # CONFIG_USB_HCD_BCMA is not set
# CONFIG_USB_HCD_SSB is not set # CONFIG_USB_HCD_SSB is not set
# CONFIG_USB_HCD_TEST_MODE is not set # CONFIG_USB_HCD_TEST_MODE is not set
CONFIG_USB_XEN_HCD=m
# #
# USB Device Class drivers # USB Device Class drivers
@ -7604,6 +7635,10 @@ CONFIG_LEDS_TRIGGER_PANIC=y
# CONFIG_LEDS_TRIGGER_PATTERN is not set # CONFIG_LEDS_TRIGGER_PATTERN is not set
CONFIG_LEDS_TRIGGER_AUDIO=m CONFIG_LEDS_TRIGGER_AUDIO=m
CONFIG_LEDS_TRIGGER_TTY=m CONFIG_LEDS_TRIGGER_TTY=m
#
# Simple LED drivers
#
CONFIG_ACCESSIBILITY=y CONFIG_ACCESSIBILITY=y
CONFIG_A11Y_BRAILLE_CONSOLE=y CONFIG_A11Y_BRAILLE_CONSOLE=y
@ -8063,6 +8098,7 @@ CONFIG_COMMON_CLK_SI5341=m
# CONFIG_COMMON_CLK_CDCE706 is not set # CONFIG_COMMON_CLK_CDCE706 is not set
# CONFIG_COMMON_CLK_CDCE925 is not set # CONFIG_COMMON_CLK_CDCE925 is not set
# CONFIG_COMMON_CLK_CS2000_CP is not set # CONFIG_COMMON_CLK_CS2000_CP is not set
# CONFIG_COMMON_CLK_LAN966X is not set
CONFIG_COMMON_CLK_S2MPS11=m CONFIG_COMMON_CLK_S2MPS11=m
CONFIG_CLK_TWL6040=m CONFIG_CLK_TWL6040=m
CONFIG_COMMON_CLK_AXI_CLKGEN=m CONFIG_COMMON_CLK_AXI_CLKGEN=m
@ -8269,6 +8305,7 @@ CONFIG_ROCKCHIP_PM_DOMAINS=y
CONFIG_SOC_SAMSUNG=y CONFIG_SOC_SAMSUNG=y
CONFIG_EXYNOS_ASV_ARM=y CONFIG_EXYNOS_ASV_ARM=y
CONFIG_EXYNOS_CHIPID=y CONFIG_EXYNOS_CHIPID=y
# CONFIG_EXYNOS_USI is not set
CONFIG_EXYNOS_PMU=y CONFIG_EXYNOS_PMU=y
CONFIG_EXYNOS_PMU_ARM_DRIVERS=y CONFIG_EXYNOS_PMU_ARM_DRIVERS=y
CONFIG_EXYNOS_PM_DOMAINS=y CONFIG_EXYNOS_PM_DOMAINS=y
@ -8309,6 +8346,7 @@ CONFIG_ARM_IMX_BUS_DEVFREQ=m
CONFIG_ARM_IMX8M_DDRC_DEVFREQ=m CONFIG_ARM_IMX8M_DDRC_DEVFREQ=m
CONFIG_ARM_TEGRA_DEVFREQ=m CONFIG_ARM_TEGRA_DEVFREQ=m
# CONFIG_ARM_RK3399_DMC_DEVFREQ is not set # CONFIG_ARM_RK3399_DMC_DEVFREQ is not set
# CONFIG_ARM_SUN8I_A33_MBUS_DEVFREQ is not set
# CONFIG_PM_DEVFREQ_EVENT is not set # CONFIG_PM_DEVFREQ_EVENT is not set
CONFIG_EXTCON=y CONFIG_EXTCON=y
@ -8479,6 +8517,12 @@ CONFIG_VIPERBOARD_ADC=m
CONFIG_XILINX_XADC=m CONFIG_XILINX_XADC=m
# end of Analog to digital converters # end of Analog to digital converters
#
# Analog to digital and digital to analog converters
#
# CONFIG_AD74413R is not set
# end of Analog to digital and digital to analog converters
# #
# Analog Front Ends # Analog Front Ends
# #
@ -8544,6 +8588,7 @@ CONFIG_IIO_ST_SENSORS_CORE=m
# #
# Digital to analog converters # Digital to analog converters
# #
# CONFIG_AD3552R is not set
# CONFIG_AD5064 is not set # CONFIG_AD5064 is not set
# CONFIG_AD5360 is not set # CONFIG_AD5360 is not set
# CONFIG_AD5380 is not set # CONFIG_AD5380 is not set
@ -8563,6 +8608,7 @@ CONFIG_IIO_ST_SENSORS_CORE=m
# CONFIG_AD5766 is not set # CONFIG_AD5766 is not set
# CONFIG_AD5770R is not set # CONFIG_AD5770R is not set
# CONFIG_AD5791 is not set # CONFIG_AD5791 is not set
# CONFIG_AD7293 is not set
# CONFIG_AD7303 is not set # CONFIG_AD7303 is not set
# CONFIG_AD8801 is not set # CONFIG_AD8801 is not set
# CONFIG_DPOT_DAC is not set # CONFIG_DPOT_DAC is not set
@ -8586,6 +8632,11 @@ CONFIG_IIO_ST_SENSORS_CORE=m
# #
# end of IIO dummy driver # end of IIO dummy driver
#
# Filters
#
# end of Filters
# #
# Frequency Synthesizers DDS/PLL # Frequency Synthesizers DDS/PLL
# #
@ -8601,6 +8652,7 @@ CONFIG_IIO_ST_SENSORS_CORE=m
# #
# CONFIG_ADF4350 is not set # CONFIG_ADF4350 is not set
CONFIG_ADF4371=m CONFIG_ADF4371=m
CONFIG_ADMV1013=m
# CONFIG_ADRF6780 is not set # CONFIG_ADRF6780 is not set
# end of Phase-Locked Loop (PLL) frequency synthesizers # end of Phase-Locked Loop (PLL) frequency synthesizers
# end of Frequency Synthesizers DDS/PLL # end of Frequency Synthesizers DDS/PLL
@ -8948,6 +9000,7 @@ CONFIG_PHY_CADENCE_TORRENT=m
# CONFIG_PHY_CADENCE_SALVO is not set # CONFIG_PHY_CADENCE_SALVO is not set
# CONFIG_PHY_FSL_IMX8MQ_USB is not set # CONFIG_PHY_FSL_IMX8MQ_USB is not set
CONFIG_PHY_MIXEL_MIPI_DPHY=m CONFIG_PHY_MIXEL_MIPI_DPHY=m
# CONFIG_PHY_FSL_IMX8M_PCIE is not set
CONFIG_ARMADA375_USBCLUSTER_PHY=y CONFIG_ARMADA375_USBCLUSTER_PHY=y
CONFIG_PHY_MVEBU_A3700_COMPHY=m CONFIG_PHY_MVEBU_A3700_COMPHY=m
CONFIG_PHY_MVEBU_A3700_UTMI=m CONFIG_PHY_MVEBU_A3700_UTMI=m
@ -8956,6 +9009,7 @@ CONFIG_PHY_MVEBU_CP110_COMPHY=m
CONFIG_PHY_MVEBU_CP110_UTMI=m CONFIG_PHY_MVEBU_CP110_UTMI=m
# CONFIG_PHY_PXA_28NM_HSIC is not set # CONFIG_PHY_PXA_28NM_HSIC is not set
# CONFIG_PHY_PXA_28NM_USB2 is not set # CONFIG_PHY_PXA_28NM_USB2 is not set
# CONFIG_PHY_LAN966X_SERDES is not set
# CONFIG_PHY_CPCAP_USB is not set # CONFIG_PHY_CPCAP_USB is not set
# CONFIG_PHY_MAPPHONE_MDM6600 is not set # CONFIG_PHY_MAPPHONE_MDM6600 is not set
# CONFIG_PHY_OCELOT_SERDES is not set # CONFIG_PHY_OCELOT_SERDES is not set
@ -9167,6 +9221,7 @@ CONFIG_FSCACHE_STATS=y
# CONFIG_FSCACHE_DEBUG is not set # CONFIG_FSCACHE_DEBUG is not set
CONFIG_CACHEFILES=m CONFIG_CACHEFILES=m
# CONFIG_CACHEFILES_DEBUG is not set # CONFIG_CACHEFILES_DEBUG is not set
# CONFIG_CACHEFILES_ERROR_INJECTION is not set
# end of Caches # end of Caches
# #
@ -9693,28 +9748,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
# CONFIG_CRYPTO_STATS is not set # CONFIG_CRYPTO_STATS is not set
CONFIG_CRYPTO_HASH_INFO=y CONFIG_CRYPTO_HASH_INFO=y
#
# Crypto library routines
#
CONFIG_CRYPTO_LIB_AES=y
CONFIG_CRYPTO_LIB_ARC4=m
CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=m
CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
CONFIG_CRYPTO_LIB_BLAKE2S=m
CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
CONFIG_CRYPTO_LIB_CHACHA=m
CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
CONFIG_CRYPTO_LIB_CURVE25519=m
CONFIG_CRYPTO_LIB_DES=m
CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
CONFIG_CRYPTO_LIB_POLY1305=m
CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
CONFIG_CRYPTO_LIB_SHA256=y
CONFIG_CRYPTO_LIB_SM4=m
CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_HW=y
CONFIG_CRYPTO_DEV_ALLWINNER=y CONFIG_CRYPTO_DEV_ALLWINNER=y
CONFIG_CRYPTO_DEV_SUN4I_SS=m CONFIG_CRYPTO_DEV_SUN4I_SS=m
@ -9785,6 +9818,29 @@ CONFIG_RATIONAL=y
CONFIG_GENERIC_PCI_IOMAP=y CONFIG_GENERIC_PCI_IOMAP=y
CONFIG_STMP_DEVICE=y CONFIG_STMP_DEVICE=y
CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
#
# Crypto library routines
#
CONFIG_CRYPTO_LIB_AES=y
CONFIG_CRYPTO_LIB_ARC4=m
CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=y
CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
CONFIG_CRYPTO_LIB_CHACHA=m
CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
CONFIG_CRYPTO_LIB_CURVE25519=m
CONFIG_CRYPTO_LIB_DES=m
CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
CONFIG_CRYPTO_LIB_POLY1305=m
CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
CONFIG_CRYPTO_LIB_SHA256=y
CONFIG_CRYPTO_LIB_SM4=m
# end of Crypto library routines
CONFIG_CRC_CCITT=m CONFIG_CRC_CCITT=m
CONFIG_CRC16=y CONFIG_CRC16=y
CONFIG_CRC_T10DIF=y CONFIG_CRC_T10DIF=y
@ -9974,6 +10030,13 @@ CONFIG_HAVE_KCSAN_COMPILER=y
CONFIG_DEBUG_KERNEL=y CONFIG_DEBUG_KERNEL=y
CONFIG_DEBUG_MISC=y CONFIG_DEBUG_MISC=y
#
# Networking Debugging
#
# CONFIG_NET_DEV_REFCNT_TRACKER is not set
# CONFIG_NET_NS_REFCNT_TRACKER is not set
# end of Networking Debugging
# #
# Memory Debugging # Memory Debugging
# #
@ -10000,6 +10063,12 @@ CONFIG_HAVE_ARCH_KASAN=y
CONFIG_CC_HAS_KASAN_GENERIC=y CONFIG_CC_HAS_KASAN_GENERIC=y
CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y
# CONFIG_KASAN is not set # CONFIG_KASAN is not set
CONFIG_HAVE_ARCH_KFENCE=y
CONFIG_KFENCE=y
CONFIG_KFENCE_SAMPLE_INTERVAL=0
CONFIG_KFENCE_NUM_OBJECTS=255
# CONFIG_KFENCE_STATIC_KEYS is not set
CONFIG_KFENCE_STRESS_TEST_FAULTS=0
# end of Memory Debugging # end of Memory Debugging
# CONFIG_DEBUG_SHIRQ is not set # CONFIG_DEBUG_SHIRQ is not set
@ -10090,6 +10159,8 @@ CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
CONFIG_HAVE_SYSCALL_TRACEPOINTS=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
CONFIG_HAVE_C_RECORDMCOUNT=y CONFIG_HAVE_C_RECORDMCOUNT=y
CONFIG_HAVE_BUILDTIME_MCOUNT_SORT=y
CONFIG_BUILDTIME_MCOUNT_SORT=y
CONFIG_TRACER_MAX_TRACE=y CONFIG_TRACER_MAX_TRACE=y
CONFIG_TRACE_CLOCK=y CONFIG_TRACE_CLOCK=y
CONFIG_RING_BUFFER=y CONFIG_RING_BUFFER=y
@ -10133,6 +10204,7 @@ CONFIG_SYNTH_EVENTS=y
# CONFIG_TRACE_EVAL_MAP_FILE is not set # CONFIG_TRACE_EVAL_MAP_FILE is not set
# CONFIG_FTRACE_RECORD_RECURSION is not set # CONFIG_FTRACE_RECORD_RECURSION is not set
# CONFIG_FTRACE_STARTUP_TEST is not set # CONFIG_FTRACE_STARTUP_TEST is not set
# CONFIG_FTRACE_SORT_STARTUP_TEST is not set
# CONFIG_RING_BUFFER_STARTUP_TEST is not set # CONFIG_RING_BUFFER_STARTUP_TEST is not set
# CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set # CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set
# CONFIG_PREEMPTIRQ_DELAY_TEST is not set # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
@ -10148,6 +10220,7 @@ CONFIG_IO_STRICT_DEVMEM=y
CONFIG_ARM_PTDUMP_CORE=y CONFIG_ARM_PTDUMP_CORE=y
# CONFIG_ARM_PTDUMP_DEBUGFS is not set # CONFIG_ARM_PTDUMP_DEBUGFS is not set
CONFIG_UNWINDER_FRAME_POINTER=y CONFIG_UNWINDER_FRAME_POINTER=y
# CONFIG_BACKTRACE_VERBOSE is not set
# CONFIG_DEBUG_USER is not set # CONFIG_DEBUG_USER is not set
# CONFIG_DEBUG_LL is not set # CONFIG_DEBUG_LL is not set
CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S" CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
@ -10174,6 +10247,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
# CONFIG_TEST_MIN_HEAP is not set # CONFIG_TEST_MIN_HEAP is not set
# CONFIG_TEST_DIV64 is not set # CONFIG_TEST_DIV64 is not set
# CONFIG_BACKTRACE_SELF_TEST is not set # CONFIG_BACKTRACE_SELF_TEST is not set
# CONFIG_TEST_REF_TRACKER is not set
# CONFIG_RBTREE_TEST is not set # CONFIG_RBTREE_TEST is not set
# CONFIG_REED_SOLOMON_TEST is not set # CONFIG_REED_SOLOMON_TEST is not set
# CONFIG_INTERVAL_TREE_TEST is not set # CONFIG_INTERVAL_TREE_TEST is not set
@ -10192,7 +10266,7 @@ CONFIG_TEST_SCANF=m
CONFIG_TEST_XARRAY=m CONFIG_TEST_XARRAY=m
# CONFIG_TEST_OVERFLOW is not set # CONFIG_TEST_OVERFLOW is not set
# CONFIG_TEST_RHASHTABLE is not set # CONFIG_TEST_RHASHTABLE is not set
# CONFIG_TEST_HASH is not set # CONFIG_TEST_SIPHASH is not set
# CONFIG_TEST_IDA is not set # CONFIG_TEST_IDA is not set
# CONFIG_TEST_LKM is not set # CONFIG_TEST_LKM is not set
CONFIG_TEST_BITOPS=m CONFIG_TEST_BITOPS=m

220
gnu/packages/aux-files/linux-libre/5.16-arm64.conf → gnu/packages/aux-files/linux-libre/5.17-arm64.conf
View file

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/arm64 5.16.0 Kernel Configuration # Linux/arm64 5.17.3 Kernel Configuration
# #
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0" CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
CONFIG_CC_IS_GCC=y CONFIG_CC_IS_GCC=y
@ -225,7 +225,6 @@ CONFIG_ELF_CORE=y
CONFIG_BASE_FULL=y CONFIG_BASE_FULL=y
CONFIG_FUTEX=y CONFIG_FUTEX=y
CONFIG_FUTEX_PI=y CONFIG_FUTEX_PI=y
CONFIG_HAVE_FUTEX_CMPXCHG=y
CONFIG_EPOLL=y CONFIG_EPOLL=y
CONFIG_SIGNALFD=y CONFIG_SIGNALFD=y
CONFIG_TIMERFD=y CONFIG_TIMERFD=y
@ -246,6 +245,7 @@ CONFIG_RSEQ=y
# CONFIG_DEBUG_RSEQ is not set # CONFIG_DEBUG_RSEQ is not set
# CONFIG_EMBEDDED is not set # CONFIG_EMBEDDED is not set
CONFIG_HAVE_PERF_EVENTS=y CONFIG_HAVE_PERF_EVENTS=y
CONFIG_GUEST_PERF_EVENTS=y
# CONFIG_PC104 is not set # CONFIG_PC104 is not set
# #
@ -368,6 +368,8 @@ CONFIG_ARM64_ERRATUM_1286807=y
CONFIG_ARM64_ERRATUM_1463225=y CONFIG_ARM64_ERRATUM_1463225=y
CONFIG_ARM64_ERRATUM_1542419=y CONFIG_ARM64_ERRATUM_1542419=y
CONFIG_ARM64_ERRATUM_1508412=y CONFIG_ARM64_ERRATUM_1508412=y
CONFIG_ARM64_ERRATUM_2051678=y
CONFIG_ARM64_ERRATUM_2077057=y
CONFIG_ARM64_WORKAROUND_TSB_FLUSH_FAILURE=y CONFIG_ARM64_WORKAROUND_TSB_FLUSH_FAILURE=y
CONFIG_ARM64_ERRATUM_2054223=y CONFIG_ARM64_ERRATUM_2054223=y
CONFIG_ARM64_ERRATUM_2067961=y CONFIG_ARM64_ERRATUM_2067961=y
@ -404,10 +406,6 @@ CONFIG_NR_CPUS=256
CONFIG_HOTPLUG_CPU=y CONFIG_HOTPLUG_CPU=y
CONFIG_NUMA=y CONFIG_NUMA=y
CONFIG_NODES_SHIFT=2 CONFIG_NODES_SHIFT=2
CONFIG_USE_PERCPU_NUMA_NODE_ID=y
CONFIG_HAVE_SETUP_PER_CPU_AREA=y
CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
# CONFIG_HZ_100 is not set # CONFIG_HZ_100 is not set
CONFIG_HZ_250=y CONFIG_HZ_250=y
# CONFIG_HZ_300 is not set # CONFIG_HZ_300 is not set
@ -416,7 +414,6 @@ CONFIG_HZ=250
CONFIG_SCHED_HRTICK=y CONFIG_SCHED_HRTICK=y
CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_ARCH_SPARSEMEM_ENABLE=y
CONFIG_HW_PERF_EVENTS=y CONFIG_HW_PERF_EVENTS=y
CONFIG_ARCH_HAS_FILTER_PGPROT=y
CONFIG_PARAVIRT=y CONFIG_PARAVIRT=y
# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
CONFIG_KEXEC=y CONFIG_KEXEC=y
@ -428,6 +425,7 @@ CONFIG_XEN_DOM0=y
CONFIG_XEN=y CONFIG_XEN=y
CONFIG_FORCE_MAX_ZONEORDER=11 CONFIG_FORCE_MAX_ZONEORDER=11
CONFIG_UNMAP_KERNEL_AT_EL0=y CONFIG_UNMAP_KERNEL_AT_EL0=y
CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y
CONFIG_RODATA_FULL_DEFAULT_ENABLED=y CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
# CONFIG_ARM64_SW_TTBR0_PAN is not set # CONFIG_ARM64_SW_TTBR0_PAN is not set
CONFIG_ARM64_TAGGED_ADDR_ABI=y CONFIG_ARM64_TAGGED_ADDR_ABI=y
@ -600,6 +598,7 @@ CONFIG_ARCH_SUPPORTS_ACPI=y
CONFIG_ACPI=y CONFIG_ACPI=y
CONFIG_ACPI_GENERIC_GSI=y CONFIG_ACPI_GENERIC_GSI=y
CONFIG_ACPI_CCA_REQUIRED=y CONFIG_ACPI_CCA_REQUIRED=y
CONFIG_ACPI_TABLE_LIB=y
# CONFIG_ACPI_DEBUGGER is not set # CONFIG_ACPI_DEBUGGER is not set
CONFIG_ACPI_SPCR_TABLE=y CONFIG_ACPI_SPCR_TABLE=y
# CONFIG_ACPI_EC_DEBUGFS is not set # CONFIG_ACPI_EC_DEBUGFS is not set
@ -632,9 +631,11 @@ CONFIG_ACPI_HMAT=y
CONFIG_HAVE_ACPI_APEI=y CONFIG_HAVE_ACPI_APEI=y
# CONFIG_ACPI_APEI is not set # CONFIG_ACPI_APEI is not set
# CONFIG_ACPI_CONFIGFS is not set # CONFIG_ACPI_CONFIGFS is not set
CONFIG_ACPI_PFRUT=m
CONFIG_ACPI_IORT=y CONFIG_ACPI_IORT=y
CONFIG_ACPI_GTDT=y CONFIG_ACPI_GTDT=y
CONFIG_ACPI_PPTT=y CONFIG_ACPI_PPTT=y
CONFIG_ACPI_PCC=y
# CONFIG_PMIC_OPREGION is not set # CONFIG_PMIC_OPREGION is not set
CONFIG_ACPI_VIOT=y CONFIG_ACPI_VIOT=y
CONFIG_IRQ_BYPASS_MANAGER=y CONFIG_IRQ_BYPASS_MANAGER=y
@ -748,6 +749,7 @@ CONFIG_ARCH_MMAP_RND_BITS=18
CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11 CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11
CONFIG_PAGE_SIZE_LESS_THAN_64KB=y CONFIG_PAGE_SIZE_LESS_THAN_64KB=y
CONFIG_PAGE_SIZE_LESS_THAN_256KB=y
CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y
CONFIG_CLONE_BACKWARDS=y CONFIG_CLONE_BACKWARDS=y
CONFIG_OLD_SIGSUSPEND3=y CONFIG_OLD_SIGSUSPEND3=y
@ -796,6 +798,7 @@ CONFIG_ASM_MODVERSIONS=y
CONFIG_MODULE_COMPRESS_GZIP=y CONFIG_MODULE_COMPRESS_GZIP=y
# CONFIG_MODULE_COMPRESS_XZ is not set # CONFIG_MODULE_COMPRESS_XZ is not set
# CONFIG_MODULE_COMPRESS_ZSTD is not set # CONFIG_MODULE_COMPRESS_ZSTD is not set
CONFIG_MODULE_DECOMPRESS=y
# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
CONFIG_MODPROBE_PATH="/run/current-system/profile/bin/modprobe" CONFIG_MODPROBE_PATH="/run/current-system/profile/bin/modprobe"
# CONFIG_TRIM_UNUSED_KSYMS is not set # CONFIG_TRIM_UNUSED_KSYMS is not set
@ -804,6 +807,7 @@ CONFIG_BLOCK=y
CONFIG_BLK_RQ_ALLOC_TIME=y CONFIG_BLK_RQ_ALLOC_TIME=y
CONFIG_BLK_CGROUP_RWSTAT=y CONFIG_BLK_CGROUP_RWSTAT=y
CONFIG_BLK_DEV_BSG_COMMON=y CONFIG_BLK_DEV_BSG_COMMON=y
CONFIG_BLK_ICQ=y
CONFIG_BLK_DEV_BSGLIB=y CONFIG_BLK_DEV_BSGLIB=y
CONFIG_BLK_DEV_INTEGRITY=y CONFIG_BLK_DEV_INTEGRITY=y
CONFIG_BLK_DEV_INTEGRITY_T10=m CONFIG_BLK_DEV_INTEGRITY_T10=m
@ -978,7 +982,10 @@ CONFIG_HWPOISON_INJECT=m
CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_TRANSPARENT_HUGEPAGE=y
CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
# CONFIG_CLEANCACHE is not set CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
CONFIG_USE_PERCPU_NUMA_NODE_ID=y
CONFIG_HAVE_SETUP_PER_CPU_AREA=y
CONFIG_FRONTSWAP=y CONFIG_FRONTSWAP=y
CONFIG_CMA=y CONFIG_CMA=y
# CONFIG_CMA_DEBUG is not set # CONFIG_CMA_DEBUG is not set
@ -1020,6 +1027,7 @@ CONFIG_VMAP_PFN=y
CONFIG_ARCH_HAS_PTE_SPECIAL=y CONFIG_ARCH_HAS_PTE_SPECIAL=y
CONFIG_MAPPING_DIRTY_HELPERS=y CONFIG_MAPPING_DIRTY_HELPERS=y
CONFIG_SECRETMEM=y CONFIG_SECRETMEM=y
CONFIG_ANON_VMA_NAME=y
# #
# Data Access Monitoring # Data Access Monitoring
@ -1223,7 +1231,6 @@ CONFIG_NF_TABLES_NETDEV=y
CONFIG_NFT_NUMGEN=m CONFIG_NFT_NUMGEN=m
CONFIG_NFT_CT=m CONFIG_NFT_CT=m
# CONFIG_NFT_FLOW_OFFLOAD is not set # CONFIG_NFT_FLOW_OFFLOAD is not set
CONFIG_NFT_COUNTER=m
CONFIG_NFT_CONNLIMIT=m CONFIG_NFT_CONNLIMIT=m
CONFIG_NFT_LOG=m CONFIG_NFT_LOG=m
CONFIG_NFT_LIMIT=m CONFIG_NFT_LIMIT=m
@ -1423,7 +1430,6 @@ CONFIG_NFT_REJECT_IPV4=m
CONFIG_NFT_DUP_IPV4=m CONFIG_NFT_DUP_IPV4=m
CONFIG_NFT_FIB_IPV4=m CONFIG_NFT_FIB_IPV4=m
CONFIG_NF_TABLES_ARP=y CONFIG_NF_TABLES_ARP=y
CONFIG_NF_FLOW_TABLE_IPV4=m
CONFIG_NF_DUP_IPV4=m CONFIG_NF_DUP_IPV4=m
CONFIG_NF_LOG_ARP=m CONFIG_NF_LOG_ARP=m
CONFIG_NF_LOG_IPV4=m CONFIG_NF_LOG_IPV4=m
@ -1463,7 +1469,6 @@ CONFIG_NF_TABLES_IPV6=y
CONFIG_NFT_REJECT_IPV6=m CONFIG_NFT_REJECT_IPV6=m
CONFIG_NFT_DUP_IPV6=m CONFIG_NFT_DUP_IPV6=m
CONFIG_NFT_FIB_IPV6=m CONFIG_NFT_FIB_IPV6=m
CONFIG_NF_FLOW_TABLE_IPV6=m
CONFIG_NF_DUP_IPV6=m CONFIG_NF_DUP_IPV6=m
CONFIG_NF_REJECT_IPV6=m CONFIG_NF_REJECT_IPV6=m
CONFIG_NF_LOG_IPV6=m CONFIG_NF_LOG_IPV6=m
@ -1862,6 +1867,7 @@ CONFIG_BT_INTEL=m
CONFIG_BT_BCM=m CONFIG_BT_BCM=m
CONFIG_BT_RTL=m CONFIG_BT_RTL=m
CONFIG_BT_QCA=m CONFIG_BT_QCA=m
CONFIG_BT_MTK=m
CONFIG_BT_HCIBTUSB=m CONFIG_BT_HCIBTUSB=m
# CONFIG_BT_HCIBTUSB_AUTOSUSPEND is not set # CONFIG_BT_HCIBTUSB_AUTOSUSPEND is not set
CONFIG_BT_HCIBTUSB_BCM=y CONFIG_BT_HCIBTUSB_BCM=y
@ -1941,6 +1947,7 @@ CONFIG_RFKILL_LEDS=y
CONFIG_RFKILL_INPUT=y CONFIG_RFKILL_INPUT=y
# CONFIG_RFKILL_GPIO is not set # CONFIG_RFKILL_GPIO is not set
CONFIG_NET_9P=m CONFIG_NET_9P=m
CONFIG_NET_9P_FD=m
CONFIG_NET_9P_VIRTIO=m CONFIG_NET_9P_VIRTIO=m
# CONFIG_NET_9P_XEN is not set # CONFIG_NET_9P_XEN is not set
CONFIG_NET_9P_RDMA=m CONFIG_NET_9P_RDMA=m
@ -2018,6 +2025,7 @@ CONFIG_PCI_IOV=y
# CONFIG_PCI_PRI is not set # CONFIG_PCI_PRI is not set
# CONFIG_PCI_PASID is not set # CONFIG_PCI_PASID is not set
CONFIG_PCI_LABEL=y CONFIG_PCI_LABEL=y
CONFIG_PCI_HYPERV=m
# CONFIG_PCIE_BUS_TUNE_OFF is not set # CONFIG_PCIE_BUS_TUNE_OFF is not set
CONFIG_PCIE_BUS_DEFAULT=y CONFIG_PCIE_BUS_DEFAULT=y
# CONFIG_PCIE_BUS_SAFE is not set # CONFIG_PCIE_BUS_SAFE is not set
@ -2046,6 +2054,7 @@ CONFIG_PCI_HOST_THUNDER_ECAM=y
CONFIG_PCIE_ROCKCHIP=y CONFIG_PCIE_ROCKCHIP=y
CONFIG_PCIE_ROCKCHIP_HOST=m CONFIG_PCIE_ROCKCHIP_HOST=m
CONFIG_PCIE_BRCMSTB=m CONFIG_PCIE_BRCMSTB=m
CONFIG_PCI_HYPERV_INTERFACE=m
CONFIG_PCIE_MICROCHIP_HOST=y CONFIG_PCIE_MICROCHIP_HOST=y
CONFIG_PCIE_APPLE_MSI_DOORBELL_ADDR=0xfffff000 CONFIG_PCIE_APPLE_MSI_DOORBELL_ADDR=0xfffff000
CONFIG_PCIE_APPLE=m CONFIG_PCIE_APPLE=m
@ -2112,6 +2121,7 @@ CONFIG_AUXILIARY_BUS=y
# CONFIG_UEVENT_HELPER is not set # CONFIG_UEVENT_HELPER is not set
CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS=y
# CONFIG_DEVTMPFS_MOUNT is not set # CONFIG_DEVTMPFS_MOUNT is not set
CONFIG_DEVTMPFS_SAFE=y
CONFIG_STANDALONE=y CONFIG_STANDALONE=y
CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_PREVENT_FIRMWARE_BUILD=y
@ -2252,6 +2262,7 @@ CONFIG_GNSS_SERIAL=m
CONFIG_GNSS_MTK_SERIAL=m CONFIG_GNSS_MTK_SERIAL=m
CONFIG_GNSS_SIRF_SERIAL=m CONFIG_GNSS_SIRF_SERIAL=m
CONFIG_GNSS_UBX_SERIAL=m CONFIG_GNSS_UBX_SERIAL=m
CONFIG_GNSS_USB=m
CONFIG_MTD=m CONFIG_MTD=m
# CONFIG_MTD_TESTS is not set # CONFIG_MTD_TESTS is not set
@ -2466,7 +2477,6 @@ CONFIG_XEN_BLKDEV_FRONTEND=m
CONFIG_XEN_BLKDEV_BACKEND=m CONFIG_XEN_BLKDEV_BACKEND=m
CONFIG_VIRTIO_BLK=m CONFIG_VIRTIO_BLK=m
CONFIG_BLK_DEV_RBD=m CONFIG_BLK_DEV_RBD=m
# CONFIG_BLK_DEV_RSXX is not set
CONFIG_BLK_DEV_RNBD=y CONFIG_BLK_DEV_RNBD=y
CONFIG_BLK_DEV_RNBD_CLIENT=m CONFIG_BLK_DEV_RNBD_CLIENT=m
CONFIG_BLK_DEV_RNBD_SERVER=m CONFIG_BLK_DEV_RNBD_SERVER=m
@ -2974,6 +2984,7 @@ CONFIG_NET_DSA_XRS700X=m
CONFIG_NET_DSA_XRS700X_I2C=m CONFIG_NET_DSA_XRS700X_I2C=m
CONFIG_NET_DSA_XRS700X_MDIO=m CONFIG_NET_DSA_XRS700X_MDIO=m
# CONFIG_NET_DSA_QCA8K is not set # CONFIG_NET_DSA_QCA8K is not set
CONFIG_NET_DSA_REALTEK=m
CONFIG_NET_DSA_REALTEK_SMI=m CONFIG_NET_DSA_REALTEK_SMI=m
# CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set # CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
# CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set # CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set
@ -3087,6 +3098,9 @@ CONFIG_BE2NET_BE2=y
CONFIG_BE2NET_BE3=y CONFIG_BE2NET_BE3=y
CONFIG_BE2NET_LANCER=y CONFIG_BE2NET_LANCER=y
CONFIG_BE2NET_SKYHAWK=y CONFIG_BE2NET_SKYHAWK=y
CONFIG_NET_VENDOR_ENGLEDER=y
CONFIG_TSNEP=m
# CONFIG_TSNEP_SELFTESTS is not set
CONFIG_NET_VENDOR_EZCHIP=y CONFIG_NET_VENDOR_EZCHIP=y
# CONFIG_EZCHIP_NPS_MANAGEMENT_ENET is not set # CONFIG_EZCHIP_NPS_MANAGEMENT_ENET is not set
CONFIG_NET_VENDOR_FREESCALE=y CONFIG_NET_VENDOR_FREESCALE=y
@ -3192,6 +3206,7 @@ CONFIG_NET_VENDOR_MICROCHIP=y
# CONFIG_ENC28J60 is not set # CONFIG_ENC28J60 is not set
# CONFIG_ENCX24J600 is not set # CONFIG_ENCX24J600 is not set
# CONFIG_LAN743X is not set # CONFIG_LAN743X is not set
# CONFIG_LAN966X_SWITCH is not set
CONFIG_NET_VENDOR_MICROSEMI=y CONFIG_NET_VENDOR_MICROSEMI=y
CONFIG_MSCC_OCELOT_SWITCH_LIB=m CONFIG_MSCC_OCELOT_SWITCH_LIB=m
CONFIG_MSCC_OCELOT_SWITCH=m CONFIG_MSCC_OCELOT_SWITCH=m
@ -3307,6 +3322,8 @@ CONFIG_TEHUTI=m
CONFIG_NET_VENDOR_TI=y CONFIG_NET_VENDOR_TI=y
# CONFIG_TI_CPSW_PHY_SEL is not set # CONFIG_TI_CPSW_PHY_SEL is not set
CONFIG_TLAN=m CONFIG_TLAN=m
CONFIG_NET_VENDOR_VERTEXCOM=y
CONFIG_MSE102X=m
CONFIG_NET_VENDOR_VIA=y CONFIG_NET_VENDOR_VIA=y
# CONFIG_VIA_RHINE is not set # CONFIG_VIA_RHINE is not set
CONFIG_VIA_VELOCITY=m CONFIG_VIA_VELOCITY=m
@ -3383,6 +3400,9 @@ CONFIG_VITESSE_PHY=m
# #
# MCTP Device Drivers # MCTP Device Drivers
# #
CONFIG_MCTP_SERIAL=m
# end of MCTP Device Drivers
CONFIG_MDIO_DEVICE=m CONFIG_MDIO_DEVICE=m
CONFIG_MDIO_BUS=m CONFIG_MDIO_BUS=m
CONFIG_FWNODE_MDIO=m CONFIG_FWNODE_MDIO=m
@ -3611,7 +3631,6 @@ CONFIG_IWLWIFI_LEDS=y
CONFIG_IWLDVM=m CONFIG_IWLDVM=m
CONFIG_IWLMVM=m CONFIG_IWLMVM=m
CONFIG_IWLWIFI_OPMODE_MODULAR=y CONFIG_IWLWIFI_OPMODE_MODULAR=y
# CONFIG_IWLWIFI_BCAST_FILTERING is not set
# #
# Debugging Options # Debugging Options
@ -3776,6 +3795,7 @@ CONFIG_IEEE802154_MCR20A=m
# Wireless WAN # Wireless WAN
# #
CONFIG_WWAN=y CONFIG_WWAN=y
# CONFIG_WWAN_DEBUGFS is not set
# CONFIG_WWAN_HWSIM is not set # CONFIG_WWAN_HWSIM is not set
CONFIG_MHI_WWAN_CTRL=m CONFIG_MHI_WWAN_CTRL=m
CONFIG_MHI_WWAN_MBIM=m CONFIG_MHI_WWAN_MBIM=m
@ -4001,6 +4021,7 @@ CONFIG_SERIAL_8250_BCM2835AUX=y
CONFIG_SERIAL_8250_FSL=y CONFIG_SERIAL_8250_FSL=y
CONFIG_SERIAL_8250_DW=y CONFIG_SERIAL_8250_DW=y
# CONFIG_SERIAL_8250_RT288X is not set # CONFIG_SERIAL_8250_RT288X is not set
CONFIG_SERIAL_8250_PERICOM=y
CONFIG_SERIAL_8250_TEGRA=y CONFIG_SERIAL_8250_TEGRA=y
CONFIG_SERIAL_OF_PLATFORM=y CONFIG_SERIAL_OF_PLATFORM=y
@ -4017,6 +4038,7 @@ CONFIG_SERIAL_MESON_CONSOLE=y
CONFIG_SERIAL_SAMSUNG=m CONFIG_SERIAL_SAMSUNG=m
CONFIG_SERIAL_SAMSUNG_UARTS_4=y CONFIG_SERIAL_SAMSUNG_UARTS_4=y
CONFIG_SERIAL_SAMSUNG_UARTS=4 CONFIG_SERIAL_SAMSUNG_UARTS=4
CONFIG_SERIAL_SAMSUNG_CONSOLE=y
CONFIG_SERIAL_TEGRA=y CONFIG_SERIAL_TEGRA=y
CONFIG_SERIAL_TEGRA_TCU=m CONFIG_SERIAL_TEGRA_TCU=m
# CONFIG_SERIAL_MAX3100 is not set # CONFIG_SERIAL_MAX3100 is not set
@ -4093,6 +4115,7 @@ CONFIG_HW_RANDOM_OPTEE=m
CONFIG_HW_RANDOM_CCTRNG=m CONFIG_HW_RANDOM_CCTRNG=m
CONFIG_HW_RANDOM_XIPHERA=m CONFIG_HW_RANDOM_XIPHERA=m
CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=m CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=m
CONFIG_HW_RANDOM_CN10K=m
# CONFIG_APPLICOM is not set # CONFIG_APPLICOM is not set
CONFIG_DEVMEM=y CONFIG_DEVMEM=y
CONFIG_DEVPORT=y CONFIG_DEVPORT=y
@ -4346,21 +4369,22 @@ CONFIG_GENERIC_PINMUX_FUNCTIONS=y
CONFIG_PINCONF=y CONFIG_PINCONF=y
CONFIG_GENERIC_PINCONF=y CONFIG_GENERIC_PINCONF=y
# CONFIG_DEBUG_PINCTRL is not set # CONFIG_DEBUG_PINCTRL is not set
CONFIG_PINCTRL_AMD=y
CONFIG_PINCTRL_APPLE_GPIO=m CONFIG_PINCTRL_APPLE_GPIO=m
CONFIG_PINCTRL_AXP209=m CONFIG_PINCTRL_AXP209=m
CONFIG_PINCTRL_AMD=y
CONFIG_PINCTRL_BM1880=y CONFIG_PINCTRL_BM1880=y
CONFIG_PINCTRL_KEEMBAY=m
CONFIG_PINCTRL_MAX77620=y
# CONFIG_PINCTRL_MCP23S08 is not set # CONFIG_PINCTRL_MCP23S08 is not set
# CONFIG_PINCTRL_MICROCHIP_SGPIO is not set
# CONFIG_PINCTRL_OCELOT is not set
# CONFIG_PINCTRL_RK805 is not set
CONFIG_PINCTRL_ROCKCHIP=y CONFIG_PINCTRL_ROCKCHIP=y
CONFIG_PINCTRL_SINGLE=y CONFIG_PINCTRL_SINGLE=y
# CONFIG_PINCTRL_SX150X is not set
# CONFIG_PINCTRL_STMFX is not set # CONFIG_PINCTRL_STMFX is not set
CONFIG_PINCTRL_MAX77620=y # CONFIG_PINCTRL_SX150X is not set
# CONFIG_PINCTRL_RK805 is not set
# CONFIG_PINCTRL_OCELOT is not set
# CONFIG_PINCTRL_MICROCHIP_SGPIO is not set
CONFIG_PINCTRL_KEEMBAY=m
CONFIG_PINCTRL_BCM2835=y CONFIG_PINCTRL_BCM2835=y
CONFIG_PINCTRL_MADERA=m
CONFIG_PINCTRL_IMX=y CONFIG_PINCTRL_IMX=y
CONFIG_PINCTRL_IMX_SCU=y CONFIG_PINCTRL_IMX_SCU=y
CONFIG_PINCTRL_IMX8MM=y CONFIG_PINCTRL_IMX8MM=y
@ -4371,6 +4395,15 @@ CONFIG_PINCTRL_IMX8QM=y
CONFIG_PINCTRL_IMX8QXP=y CONFIG_PINCTRL_IMX8QXP=y
CONFIG_PINCTRL_IMX8DXL=y CONFIG_PINCTRL_IMX8DXL=y
CONFIG_PINCTRL_IMX8ULP=y CONFIG_PINCTRL_IMX8ULP=y
# CONFIG_PINCTRL_IMXRT1050 is not set
CONFIG_PINCTRL_MESON=y
CONFIG_PINCTRL_MESON_GXBB=y
CONFIG_PINCTRL_MESON_GXL=y
CONFIG_PINCTRL_MESON8_PMX=y
CONFIG_PINCTRL_MESON_AXG=y
CONFIG_PINCTRL_MESON_AXG_PMX=y
CONFIG_PINCTRL_MESON_G12A=y
CONFIG_PINCTRL_MESON_A1=y
CONFIG_PINCTRL_MVEBU=y CONFIG_PINCTRL_MVEBU=y
CONFIG_PINCTRL_ARMADA_AP806=y CONFIG_PINCTRL_ARMADA_AP806=y
CONFIG_PINCTRL_ARMADA_CP110=y CONFIG_PINCTRL_ARMADA_CP110=y
@ -4408,9 +4441,11 @@ CONFIG_PINCTRL_QCOM_SSBI_PMIC=y
# CONFIG_PINCTRL_SM6115 is not set # CONFIG_PINCTRL_SM6115 is not set
# CONFIG_PINCTRL_SM6125 is not set # CONFIG_PINCTRL_SM6125 is not set
# CONFIG_PINCTRL_SM6350 is not set # CONFIG_PINCTRL_SM6350 is not set
# CONFIG_PINCTRL_SDX65 is not set
CONFIG_PINCTRL_SM8150=m CONFIG_PINCTRL_SM8150=m
CONFIG_PINCTRL_SM8250=m CONFIG_PINCTRL_SM8250=m
# CONFIG_PINCTRL_SM8350 is not set # CONFIG_PINCTRL_SM8350 is not set
# CONFIG_PINCTRL_SM8450 is not set
# CONFIG_PINCTRL_LPASS_LPI is not set # CONFIG_PINCTRL_LPASS_LPI is not set
# #
@ -4447,15 +4482,6 @@ CONFIG_PINCTRL_TEGRA124=y
CONFIG_PINCTRL_TEGRA210=y CONFIG_PINCTRL_TEGRA210=y
CONFIG_PINCTRL_TEGRA194=y CONFIG_PINCTRL_TEGRA194=y
CONFIG_PINCTRL_TEGRA_XUSB=y CONFIG_PINCTRL_TEGRA_XUSB=y
CONFIG_PINCTRL_MESON=y
CONFIG_PINCTRL_MESON_GXBB=y
CONFIG_PINCTRL_MESON_GXL=y
CONFIG_PINCTRL_MESON8_PMX=y
CONFIG_PINCTRL_MESON_AXG=y
CONFIG_PINCTRL_MESON_AXG_PMX=y
CONFIG_PINCTRL_MESON_G12A=y
CONFIG_PINCTRL_MESON_A1=y
CONFIG_PINCTRL_MADERA=m
CONFIG_PINCTRL_VISCONTI=y CONFIG_PINCTRL_VISCONTI=y
CONFIG_PINCTRL_TMPV7700=y CONFIG_PINCTRL_TMPV7700=y
CONFIG_GPIOLIB=y CONFIG_GPIOLIB=y
@ -4522,7 +4548,6 @@ CONFIG_GPIO_PCA9570=m
# #
# MFD GPIO expanders # MFD GPIO expanders
# #
CONFIG_GPIO_BD70528=m
CONFIG_GPIO_BD71815=m CONFIG_GPIO_BD71815=m
CONFIG_GPIO_BD71828=m CONFIG_GPIO_BD71828=m
CONFIG_GPIO_MADERA=m CONFIG_GPIO_MADERA=m
@ -4562,6 +4587,7 @@ CONFIG_GPIO_VIPERBOARD=m
CONFIG_GPIO_AGGREGATOR=m CONFIG_GPIO_AGGREGATOR=m
# CONFIG_GPIO_MOCKUP is not set # CONFIG_GPIO_MOCKUP is not set
CONFIG_GPIO_VIRTIO=m CONFIG_GPIO_VIRTIO=m
# CONFIG_GPIO_SIM is not set
# end of Virtual GPIO drivers # end of Virtual GPIO drivers
CONFIG_W1=m CONFIG_W1=m
@ -4654,6 +4680,7 @@ CONFIG_CHARGER_GPIO=m
# CONFIG_CHARGER_LT3651 is not set # CONFIG_CHARGER_LT3651 is not set
# CONFIG_CHARGER_LTC4162L is not set # CONFIG_CHARGER_LTC4162L is not set
# CONFIG_CHARGER_DETECTOR_MAX14656 is not set # CONFIG_CHARGER_DETECTOR_MAX14656 is not set
# CONFIG_CHARGER_MAX77976 is not set
# CONFIG_CHARGER_MT6360 is not set # CONFIG_CHARGER_MT6360 is not set
CONFIG_CHARGER_QCOM_SMBB=m CONFIG_CHARGER_QCOM_SMBB=m
# CONFIG_CHARGER_BQ2415X is not set # CONFIG_CHARGER_BQ2415X is not set
@ -4784,6 +4811,7 @@ CONFIG_SENSORS_NCT6775=m
# CONFIG_SENSORS_NCT7904 is not set # CONFIG_SENSORS_NCT7904 is not set
# CONFIG_SENSORS_NPCM7XX is not set # CONFIG_SENSORS_NPCM7XX is not set
CONFIG_SENSORS_NZXT_KRAKEN2=m CONFIG_SENSORS_NZXT_KRAKEN2=m
CONFIG_SENSORS_NZXT_SMART2=m
# CONFIG_SENSORS_OCC_P8_I2C is not set # CONFIG_SENSORS_OCC_P8_I2C is not set
# CONFIG_SENSORS_PCF8591 is not set # CONFIG_SENSORS_PCF8591 is not set
# CONFIG_PMBUS is not set # CONFIG_PMBUS is not set
@ -4815,6 +4843,7 @@ CONFIG_SENSORS_ADS7871=m
CONFIG_SENSORS_AMC6821=m CONFIG_SENSORS_AMC6821=m
# CONFIG_SENSORS_INA209 is not set # CONFIG_SENSORS_INA209 is not set
# CONFIG_SENSORS_INA2XX is not set # CONFIG_SENSORS_INA2XX is not set
# CONFIG_SENSORS_INA238 is not set
# CONFIG_SENSORS_INA3221 is not set # CONFIG_SENSORS_INA3221 is not set
# CONFIG_SENSORS_TC74 is not set # CONFIG_SENSORS_TC74 is not set
CONFIG_SENSORS_THMC50=m CONFIG_SENSORS_THMC50=m
@ -4942,6 +4971,7 @@ CONFIG_MESON_WATCHDOG=m
CONFIG_ARM_SMC_WATCHDOG=m CONFIG_ARM_SMC_WATCHDOG=m
CONFIG_PM8916_WATCHDOG=m CONFIG_PM8916_WATCHDOG=m
CONFIG_VISCONTI_WATCHDOG=m CONFIG_VISCONTI_WATCHDOG=m
CONFIG_APPLE_WATCHDOG=m
# CONFIG_ALIM7101_WDT is not set # CONFIG_ALIM7101_WDT is not set
# CONFIG_I6300ESB_WDT is not set # CONFIG_I6300ESB_WDT is not set
CONFIG_BCM2835_WDT=m CONFIG_BCM2835_WDT=m
@ -5105,7 +5135,6 @@ CONFIG_MFD_SYSCON=y
# CONFIG_MFD_WM8350_I2C is not set # CONFIG_MFD_WM8350_I2C is not set
CONFIG_MFD_WM8994=m CONFIG_MFD_WM8994=m
CONFIG_MFD_ROHM_BD718XX=m CONFIG_MFD_ROHM_BD718XX=m
CONFIG_MFD_ROHM_BD70528=m
CONFIG_MFD_ROHM_BD71828=m CONFIG_MFD_ROHM_BD71828=m
CONFIG_MFD_ROHM_BD957XMUF=m CONFIG_MFD_ROHM_BD957XMUF=m
# CONFIG_MFD_STPMIC1 is not set # CONFIG_MFD_STPMIC1 is not set
@ -5163,6 +5192,7 @@ CONFIG_REGULATOR_MAX77620=m
# CONFIG_REGULATOR_MAX8893 is not set # CONFIG_REGULATOR_MAX8893 is not set
# CONFIG_REGULATOR_MAX8952 is not set # CONFIG_REGULATOR_MAX8952 is not set
# CONFIG_REGULATOR_MAX8973 is not set # CONFIG_REGULATOR_MAX8973 is not set
# CONFIG_REGULATOR_MAX20086 is not set
# CONFIG_REGULATOR_MAX77826 is not set # CONFIG_REGULATOR_MAX77826 is not set
# CONFIG_REGULATOR_MCP16502 is not set # CONFIG_REGULATOR_MCP16502 is not set
CONFIG_REGULATOR_MP5416=m CONFIG_REGULATOR_MP5416=m
@ -5787,6 +5817,7 @@ CONFIG_VIDEO_OV5648=m
CONFIG_VIDEO_OV6650=m CONFIG_VIDEO_OV6650=m
CONFIG_VIDEO_OV5670=m CONFIG_VIDEO_OV5670=m
CONFIG_VIDEO_OV5675=m CONFIG_VIDEO_OV5675=m
CONFIG_VIDEO_OV5693=m
CONFIG_VIDEO_OV5695=m CONFIG_VIDEO_OV5695=m
CONFIG_VIDEO_OV7251=m CONFIG_VIDEO_OV7251=m
CONFIG_VIDEO_OV772X=m CONFIG_VIDEO_OV772X=m
@ -6096,9 +6127,8 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y
CONFIG_DRM_TTM=m CONFIG_DRM_TTM=m
CONFIG_DRM_VRAM_HELPER=m CONFIG_DRM_VRAM_HELPER=m
CONFIG_DRM_TTM_HELPER=m CONFIG_DRM_TTM_HELPER=m
CONFIG_DRM_GEM_CMA_HELPER=y CONFIG_DRM_GEM_CMA_HELPER=m
CONFIG_DRM_KMS_CMA_HELPER=y CONFIG_DRM_GEM_SHMEM_HELPER=m
CONFIG_DRM_GEM_SHMEM_HELPER=y
CONFIG_DRM_SCHED=m CONFIG_DRM_SCHED=m
# #
@ -6167,7 +6197,8 @@ CONFIG_DRM_UDL=m
CONFIG_DRM_AST=m CONFIG_DRM_AST=m
# CONFIG_DRM_MGAG200 is not set # CONFIG_DRM_MGAG200 is not set
# CONFIG_DRM_RCAR_DW_HDMI is not set # CONFIG_DRM_RCAR_DW_HDMI is not set
# CONFIG_DRM_RCAR_LVDS is not set # CONFIG_DRM_RCAR_USE_LVDS is not set
# CONFIG_DRM_RCAR_MIPI_DSI is not set
# CONFIG_DRM_SUN4I is not set # CONFIG_DRM_SUN4I is not set
CONFIG_DRM_QXL=m CONFIG_DRM_QXL=m
CONFIG_DRM_VIRTIO_GPU=m CONFIG_DRM_VIRTIO_GPU=m
@ -6195,6 +6226,7 @@ CONFIG_DRM_PANEL=y
# CONFIG_DRM_PANEL_ABT_Y030XX067A is not set # CONFIG_DRM_PANEL_ABT_Y030XX067A is not set
CONFIG_DRM_PANEL_ARM_VERSATILE=m CONFIG_DRM_PANEL_ARM_VERSATILE=m
CONFIG_DRM_PANEL_ASUS_Z00T_TM5P5_NT35596=m CONFIG_DRM_PANEL_ASUS_Z00T_TM5P5_NT35596=m
CONFIG_DRM_PANEL_BOE_BF060Y8M_AJ0=m
CONFIG_DRM_PANEL_BOE_HIMAX8279D=m CONFIG_DRM_PANEL_BOE_HIMAX8279D=m
CONFIG_DRM_PANEL_BOE_TV101WUM_NL6=m CONFIG_DRM_PANEL_BOE_TV101WUM_NL6=m
CONFIG_DRM_PANEL_DSI_CM=m CONFIG_DRM_PANEL_DSI_CM=m
@ -6210,6 +6242,7 @@ CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02=m
# CONFIG_DRM_PANEL_INNOLUX_EJ030NA is not set # CONFIG_DRM_PANEL_INNOLUX_EJ030NA is not set
# CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
# CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
# CONFIG_DRM_PANEL_JDI_R63452 is not set
CONFIG_DRM_PANEL_KHADAS_TS050=m CONFIG_DRM_PANEL_KHADAS_TS050=m
# CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set # CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set
# CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set # CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set
@ -6219,6 +6252,7 @@ CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829=m
# CONFIG_DRM_PANEL_LG_LG4573 is not set # CONFIG_DRM_PANEL_LG_LG4573 is not set
# CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set # CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set
CONFIG_DRM_PANEL_NOVATEK_NT35510=m CONFIG_DRM_PANEL_NOVATEK_NT35510=m
CONFIG_DRM_PANEL_NOVATEK_NT35950=m
# CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set # CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set
# CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set # CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set
CONFIG_DRM_PANEL_MANTIX_MLAF057WE51=m CONFIG_DRM_PANEL_MANTIX_MLAF057WE51=m
@ -6250,6 +6284,7 @@ CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01=m
# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
CONFIG_DRM_PANEL_SONY_ACX424AKP=m CONFIG_DRM_PANEL_SONY_ACX424AKP=m
# CONFIG_DRM_PANEL_SONY_ACX565AKM is not set # CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521=m
# CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set # CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
# CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set # CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set
# CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set # CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
@ -6326,6 +6361,7 @@ CONFIG_DRM_CIRRUS_QEMU=m
CONFIG_DRM_GM12U320=m CONFIG_DRM_GM12U320=m
CONFIG_DRM_SIMPLEDRM=m CONFIG_DRM_SIMPLEDRM=m
# CONFIG_TINYDRM_HX8357D is not set # CONFIG_TINYDRM_HX8357D is not set
# CONFIG_TINYDRM_ILI9163 is not set
# CONFIG_TINYDRM_ILI9225 is not set # CONFIG_TINYDRM_ILI9225 is not set
# CONFIG_TINYDRM_ILI9341 is not set # CONFIG_TINYDRM_ILI9341 is not set
CONFIG_TINYDRM_ILI9486=m CONFIG_TINYDRM_ILI9486=m
@ -6348,6 +6384,7 @@ CONFIG_DRM_LEGACY=y
CONFIG_DRM_VIA=m CONFIG_DRM_VIA=m
CONFIG_DRM_SAVAGE=m CONFIG_DRM_SAVAGE=m
CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
CONFIG_DRM_NOMODESET=y
# #
# Frame buffer Devices # Frame buffer Devices
@ -6466,6 +6503,7 @@ CONFIG_DUMMY_CONSOLE=y
CONFIG_DUMMY_CONSOLE_COLUMNS=80 CONFIG_DUMMY_CONSOLE_COLUMNS=80
CONFIG_DUMMY_CONSOLE_ROWS=25 CONFIG_DUMMY_CONSOLE_ROWS=25
CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y
# CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
@ -6608,6 +6646,9 @@ CONFIG_SND_HDA_RECONFIG=y
CONFIG_SND_HDA_INPUT_BEEP=y CONFIG_SND_HDA_INPUT_BEEP=y
CONFIG_SND_HDA_INPUT_BEEP_MODE=1 CONFIG_SND_HDA_INPUT_BEEP_MODE=1
CONFIG_SND_HDA_PATCH_LOADER=y CONFIG_SND_HDA_PATCH_LOADER=y
CONFIG_SND_HDA_SCODEC_CS35L41=m
CONFIG_SND_HDA_SCODEC_CS35L41_I2C=m
CONFIG_SND_HDA_SCODEC_CS35L41_SPI=m
CONFIG_SND_HDA_CODEC_REALTEK=m CONFIG_SND_HDA_CODEC_REALTEK=m
CONFIG_SND_HDA_CODEC_ANALOG=m CONFIG_SND_HDA_CODEC_ANALOG=m
CONFIG_SND_HDA_CODEC_SIGMATEL=m CONFIG_SND_HDA_CODEC_SIGMATEL=m
@ -6668,6 +6709,7 @@ CONFIG_SND_SOC_ADI=m
CONFIG_SND_SOC_ADI_AXI_I2S=m CONFIG_SND_SOC_ADI_AXI_I2S=m
CONFIG_SND_SOC_ADI_AXI_SPDIF=m CONFIG_SND_SOC_ADI_AXI_SPDIF=m
# CONFIG_SND_SOC_AMD_ACP is not set # CONFIG_SND_SOC_AMD_ACP is not set
# CONFIG_SND_AMD_ACP_CONFIG is not set
# CONFIG_SND_ATMEL_SOC is not set # CONFIG_SND_ATMEL_SOC is not set
CONFIG_SND_BCM2835_SOC_I2S=m CONFIG_SND_BCM2835_SOC_I2S=m
CONFIG_SND_BCM63XX_I2S_WHISTLER=m CONFIG_SND_BCM63XX_I2S_WHISTLER=m
@ -6840,6 +6882,7 @@ CONFIG_SND_SOC_ADAU7118_HW=m
CONFIG_SND_SOC_ADAU7118_I2C=m CONFIG_SND_SOC_ADAU7118_I2C=m
# CONFIG_SND_SOC_AK4104 is not set # CONFIG_SND_SOC_AK4104 is not set
# CONFIG_SND_SOC_AK4118 is not set # CONFIG_SND_SOC_AK4118 is not set
# CONFIG_SND_SOC_AK4375 is not set
CONFIG_SND_SOC_AK4458=m CONFIG_SND_SOC_AK4458=m
# CONFIG_SND_SOC_AK4554 is not set # CONFIG_SND_SOC_AK4554 is not set
# CONFIG_SND_SOC_AK4613 is not set # CONFIG_SND_SOC_AK4613 is not set
@ -6856,6 +6899,7 @@ CONFIG_SND_SOC_CROS_EC_CODEC=m
# CONFIG_SND_SOC_CS35L34 is not set # CONFIG_SND_SOC_CS35L34 is not set
# CONFIG_SND_SOC_CS35L35 is not set # CONFIG_SND_SOC_CS35L35 is not set
# CONFIG_SND_SOC_CS35L36 is not set # CONFIG_SND_SOC_CS35L36 is not set
CONFIG_SND_SOC_CS35L41_LIB=m
# CONFIG_SND_SOC_CS35L41_SPI is not set # CONFIG_SND_SOC_CS35L41_SPI is not set
# CONFIG_SND_SOC_CS35L41_I2C is not set # CONFIG_SND_SOC_CS35L41_I2C is not set
# CONFIG_SND_SOC_CS42L42 is not set # CONFIG_SND_SOC_CS42L42 is not set
@ -6927,6 +6971,7 @@ CONFIG_SND_SOC_RT5677=m
CONFIG_SND_SOC_RT5677_SPI=m CONFIG_SND_SOC_RT5677_SPI=m
CONFIG_SND_SOC_RT5682=m CONFIG_SND_SOC_RT5682=m
CONFIG_SND_SOC_RT5682_I2C=m CONFIG_SND_SOC_RT5682_I2C=m
CONFIG_SND_SOC_RT5682S=m
# CONFIG_SND_SOC_RT9120 is not set # CONFIG_SND_SOC_RT9120 is not set
CONFIG_SND_SOC_SGTL5000=m CONFIG_SND_SOC_SGTL5000=m
CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
@ -6951,10 +6996,11 @@ CONFIG_SND_SOC_SSM2518=m
# CONFIG_SND_SOC_TDA7419 is not set # CONFIG_SND_SOC_TDA7419 is not set
# CONFIG_SND_SOC_TFA9879 is not set # CONFIG_SND_SOC_TFA9879 is not set
CONFIG_SND_SOC_TFA989X=m CONFIG_SND_SOC_TFA989X=m
# CONFIG_SND_SOC_TLV320ADC3XXX is not set
CONFIG_SND_SOC_TLV320AIC23=m CONFIG_SND_SOC_TLV320AIC23=m
CONFIG_SND_SOC_TLV320AIC23_I2C=m CONFIG_SND_SOC_TLV320AIC23_I2C=m
# CONFIG_SND_SOC_TLV320AIC23_SPI is not set # CONFIG_SND_SOC_TLV320AIC23_SPI is not set
# CONFIG_SND_SOC_TLV320AIC31XX is not set CONFIG_SND_SOC_TLV320AIC31XX=m
# CONFIG_SND_SOC_TLV320AIC32X4_I2C is not set # CONFIG_SND_SOC_TLV320AIC32X4_I2C is not set
# CONFIG_SND_SOC_TLV320AIC32X4_SPI is not set # CONFIG_SND_SOC_TLV320AIC32X4_SPI is not set
CONFIG_SND_SOC_TLV320AIC3X=m CONFIG_SND_SOC_TLV320AIC3X=m
@ -7082,6 +7128,7 @@ CONFIG_HID_KENSINGTON=m
CONFIG_HID_LCPOWER=m CONFIG_HID_LCPOWER=m
CONFIG_HID_LED=m CONFIG_HID_LED=m
CONFIG_HID_LENOVO=m CONFIG_HID_LENOVO=m
CONFIG_HID_LETSKETCH=m
CONFIG_HID_LOGITECH=m CONFIG_HID_LOGITECH=m
CONFIG_HID_LOGITECH_DJ=m CONFIG_HID_LOGITECH_DJ=m
CONFIG_HID_LOGITECH_HIDPP=m CONFIG_HID_LOGITECH_HIDPP=m
@ -7244,6 +7291,7 @@ CONFIG_USB_U132_HCD=m
# CONFIG_USB_HCD_BCMA is not set # CONFIG_USB_HCD_BCMA is not set
# CONFIG_USB_HCD_SSB is not set # CONFIG_USB_HCD_SSB is not set
# CONFIG_USB_HCD_TEST_MODE is not set # CONFIG_USB_HCD_TEST_MODE is not set
CONFIG_USB_XEN_HCD=m
# #
# USB Device Class drivers # USB Device Class drivers
@ -7761,6 +7809,10 @@ CONFIG_LEDS_TRIGGER_PANIC=y
# CONFIG_LEDS_TRIGGER_PATTERN is not set # CONFIG_LEDS_TRIGGER_PATTERN is not set
CONFIG_LEDS_TRIGGER_AUDIO=m CONFIG_LEDS_TRIGGER_AUDIO=m
CONFIG_LEDS_TRIGGER_TTY=m CONFIG_LEDS_TRIGGER_TTY=m
#
# Simple LED drivers
#
CONFIG_ACCESSIBILITY=y CONFIG_ACCESSIBILITY=y
CONFIG_A11Y_BRAILLE_CONSOLE=y CONFIG_A11Y_BRAILLE_CONSOLE=y
@ -7824,6 +7876,7 @@ CONFIG_EDAC_ALTERA_ETHERNET=y
CONFIG_EDAC_ALTERA_NAND=y CONFIG_EDAC_ALTERA_NAND=y
CONFIG_EDAC_ALTERA_USB=y CONFIG_EDAC_ALTERA_USB=y
CONFIG_EDAC_ALTERA_SDMMC=y CONFIG_EDAC_ALTERA_SDMMC=y
CONFIG_EDAC_SYNOPSYS=m
CONFIG_EDAC_XGENE=m CONFIG_EDAC_XGENE=m
# CONFIG_EDAC_QCOM is not set # CONFIG_EDAC_QCOM is not set
CONFIG_EDAC_DMC520=m CONFIG_EDAC_DMC520=m
@ -8269,6 +8322,7 @@ CONFIG_COMMON_CLK_BM1880=y
# CONFIG_COMMON_CLK_CDCE706 is not set # CONFIG_COMMON_CLK_CDCE706 is not set
# CONFIG_COMMON_CLK_CDCE925 is not set # CONFIG_COMMON_CLK_CDCE925 is not set
# CONFIG_COMMON_CLK_CS2000_CP is not set # CONFIG_COMMON_CLK_CS2000_CP is not set
# CONFIG_COMMON_CLK_LAN966X is not set
CONFIG_COMMON_CLK_AXI_CLKGEN=m CONFIG_COMMON_CLK_AXI_CLKGEN=m
CONFIG_COMMON_CLK_XGENE=y CONFIG_COMMON_CLK_XGENE=y
# CONFIG_COMMON_CLK_PWM is not set # CONFIG_COMMON_CLK_PWM is not set
@ -8351,6 +8405,7 @@ CONFIG_MDM_GCC_9607=m
# CONFIG_MSM_GCC_8953 is not set # CONFIG_MSM_GCC_8953 is not set
# CONFIG_MSM_GCC_8974 is not set # CONFIG_MSM_GCC_8974 is not set
# CONFIG_MSM_MMCC_8974 is not set # CONFIG_MSM_MMCC_8974 is not set
# CONFIG_MSM_GCC_8976 is not set
# CONFIG_MSM_MMCC_8994 is not set # CONFIG_MSM_MMCC_8994 is not set
# CONFIG_MSM_GCC_8994 is not set # CONFIG_MSM_GCC_8994 is not set
CONFIG_MSM_GCC_8996=y CONFIG_MSM_GCC_8996=y
@ -8387,6 +8442,7 @@ CONFIG_SDM_DISPCC_845=m
CONFIG_SDM_LPASSCC_845=m CONFIG_SDM_LPASSCC_845=m
CONFIG_SDX_GCC_55=m CONFIG_SDX_GCC_55=m
CONFIG_SM_CAMCC_8250=m CONFIG_SM_CAMCC_8250=m
CONFIG_SDX_GCC_65=m
CONFIG_SM_DISPCC_8250=m CONFIG_SM_DISPCC_8250=m
# CONFIG_SM_GCC_6115 is not set # CONFIG_SM_GCC_6115 is not set
CONFIG_SM_GCC_6125=m CONFIG_SM_GCC_6125=m
@ -8394,6 +8450,7 @@ CONFIG_SM_GCC_6125=m
# CONFIG_SM_GCC_8150 is not set # CONFIG_SM_GCC_8150 is not set
CONFIG_SM_GCC_8250=m CONFIG_SM_GCC_8250=m
CONFIG_SM_GCC_8350=m CONFIG_SM_GCC_8350=m
CONFIG_SM_GCC_8450=m
# CONFIG_SM_GPUCC_8150 is not set # CONFIG_SM_GPUCC_8150 is not set
# CONFIG_SM_GPUCC_8250 is not set # CONFIG_SM_GPUCC_8250 is not set
# CONFIG_SM_VIDEOCC_8150 is not set # CONFIG_SM_VIDEOCC_8150 is not set
@ -8428,6 +8485,7 @@ CONFIG_SUN8I_DE2_CCU=y
CONFIG_SUN8I_R_CCU=y CONFIG_SUN8I_R_CCU=y
CONFIG_CLK_TEGRA_BPMP=y CONFIG_CLK_TEGRA_BPMP=y
CONFIG_TEGRA_CLK_DFLL=y CONFIG_TEGRA_CLK_DFLL=y
CONFIG_COMMON_CLK_VISCONTI=y
# CONFIG_XILINX_VCU is not set # CONFIG_XILINX_VCU is not set
# CONFIG_HWSPINLOCK is not set # CONFIG_HWSPINLOCK is not set
@ -8541,6 +8599,12 @@ CONFIG_MESON_EE_PM_DOMAINS=y
CONFIG_MESON_SECURE_PM_DOMAINS=y CONFIG_MESON_SECURE_PM_DOMAINS=y
# end of Amlogic SoC drivers # end of Amlogic SoC drivers
#
# Apple SoC drivers
#
CONFIG_APPLE_PMGR_PWRSTATE=y
# end of Apple SoC drivers
# #
# Broadcom SoC drivers # Broadcom SoC drivers
# #
@ -8634,6 +8698,7 @@ CONFIG_ARM_IMX_BUS_DEVFREQ=m
CONFIG_ARM_IMX8M_DDRC_DEVFREQ=m CONFIG_ARM_IMX8M_DDRC_DEVFREQ=m
CONFIG_ARM_TEGRA_DEVFREQ=m CONFIG_ARM_TEGRA_DEVFREQ=m
# CONFIG_ARM_RK3399_DMC_DEVFREQ is not set # CONFIG_ARM_RK3399_DMC_DEVFREQ is not set
CONFIG_ARM_SUN8I_A33_MBUS_DEVFREQ=m
# CONFIG_PM_DEVFREQ_EVENT is not set # CONFIG_PM_DEVFREQ_EVENT is not set
CONFIG_EXTCON=y CONFIG_EXTCON=y
@ -8794,6 +8859,12 @@ CONFIG_VIPERBOARD_ADC=m
CONFIG_XILINX_XADC=m CONFIG_XILINX_XADC=m
# end of Analog to digital converters # end of Analog to digital converters
#
# Analog to digital and digital to analog converters
#
CONFIG_AD74413R=m
# end of Analog to digital and digital to analog converters
# #
# Analog Front Ends # Analog Front Ends
# #
@ -8858,6 +8929,7 @@ CONFIG_IIO_SCMI=m
# #
# Digital to analog converters # Digital to analog converters
# #
CONFIG_AD3552R=m
# CONFIG_AD5064 is not set # CONFIG_AD5064 is not set
# CONFIG_AD5360 is not set # CONFIG_AD5360 is not set
# CONFIG_AD5380 is not set # CONFIG_AD5380 is not set
@ -8877,6 +8949,7 @@ CONFIG_AD5446=m
# CONFIG_AD5766 is not set # CONFIG_AD5766 is not set
# CONFIG_AD5770R is not set # CONFIG_AD5770R is not set
# CONFIG_AD5791 is not set # CONFIG_AD5791 is not set
# CONFIG_AD7293 is not set
# CONFIG_AD7303 is not set # CONFIG_AD7303 is not set
# CONFIG_AD8801 is not set # CONFIG_AD8801 is not set
# CONFIG_DPOT_DAC is not set # CONFIG_DPOT_DAC is not set
@ -8900,6 +8973,12 @@ CONFIG_AD5446=m
# #
# end of IIO dummy driver # end of IIO dummy driver
#
# Filters
#
CONFIG_ADMV8818=m
# end of Filters
# #
# Frequency Synthesizers DDS/PLL # Frequency Synthesizers DDS/PLL
# #
@ -8915,6 +8994,7 @@ CONFIG_AD5446=m
# #
# CONFIG_ADF4350 is not set # CONFIG_ADF4350 is not set
CONFIG_ADF4371=m CONFIG_ADF4371=m
CONFIG_ADMV1013=m
# CONFIG_ADRF6780 is not set # CONFIG_ADRF6780 is not set
# end of Phase-Locked Loop (PLL) frequency synthesizers # end of Phase-Locked Loop (PLL) frequency synthesizers
# end of Frequency Synthesizers DDS/PLL # end of Frequency Synthesizers DDS/PLL
@ -9281,6 +9361,7 @@ CONFIG_PHY_CADENCE_TORRENT=m
CONFIG_PHY_CADENCE_SALVO=m CONFIG_PHY_CADENCE_SALVO=m
CONFIG_PHY_FSL_IMX8MQ_USB=m CONFIG_PHY_FSL_IMX8MQ_USB=m
CONFIG_PHY_MIXEL_MIPI_DPHY=m CONFIG_PHY_MIXEL_MIPI_DPHY=m
CONFIG_PHY_FSL_IMX8M_PCIE=m
CONFIG_PHY_HI6220_USB=m CONFIG_PHY_HI6220_USB=m
CONFIG_PHY_HI3660_USB=m CONFIG_PHY_HI3660_USB=m
CONFIG_PHY_HI3670_USB=m CONFIG_PHY_HI3670_USB=m
@ -9294,10 +9375,12 @@ CONFIG_PHY_MVEBU_CP110_COMPHY=m
CONFIG_PHY_MVEBU_CP110_UTMI=m CONFIG_PHY_MVEBU_CP110_UTMI=m
# CONFIG_PHY_PXA_28NM_HSIC is not set # CONFIG_PHY_PXA_28NM_HSIC is not set
# CONFIG_PHY_PXA_28NM_USB2 is not set # CONFIG_PHY_PXA_28NM_USB2 is not set
CONFIG_PHY_LAN966X_SERDES=m
# CONFIG_PHY_CPCAP_USB is not set # CONFIG_PHY_CPCAP_USB is not set
# CONFIG_PHY_MAPPHONE_MDM6600 is not set # CONFIG_PHY_MAPPHONE_MDM6600 is not set
# CONFIG_PHY_OCELOT_SERDES is not set # CONFIG_PHY_OCELOT_SERDES is not set
CONFIG_PHY_QCOM_APQ8064_SATA=m CONFIG_PHY_QCOM_APQ8064_SATA=m
CONFIG_PHY_QCOM_EDP=m
CONFIG_PHY_QCOM_IPQ4019_USB=m CONFIG_PHY_QCOM_IPQ4019_USB=m
CONFIG_PHY_QCOM_IPQ806X_SATA=m CONFIG_PHY_QCOM_IPQ806X_SATA=m
CONFIG_PHY_QCOM_PCIE2=m CONFIG_PHY_QCOM_PCIE2=m
@ -9347,7 +9430,9 @@ CONFIG_THUNDERX2_PMU=m
# CONFIG_XGENE_PMU is not set # CONFIG_XGENE_PMU is not set
# CONFIG_ARM_SPE_PMU is not set # CONFIG_ARM_SPE_PMU is not set
CONFIG_ARM_DMC620_PMU=m CONFIG_ARM_DMC620_PMU=m
CONFIG_MARVELL_CN10K_TAD_PMU=m
# CONFIG_HISI_PMU is not set # CONFIG_HISI_PMU is not set
CONFIG_HISI_PCIE_PMU=m
# end of Performance monitor support # end of Performance monitor support
CONFIG_RAS=y CONFIG_RAS=y
@ -9368,7 +9453,6 @@ CONFIG_ND_CLAIM=y
CONFIG_ND_BTT=y CONFIG_ND_BTT=y
CONFIG_BTT=y CONFIG_BTT=y
CONFIG_OF_PMEM=y CONFIG_OF_PMEM=y
CONFIG_DAX_DRIVER=y
CONFIG_DAX=y CONFIG_DAX=y
CONFIG_DEV_DAX=m CONFIG_DEV_DAX=m
CONFIG_DEV_DAX_HMEM=m CONFIG_DEV_DAX_HMEM=m
@ -9429,7 +9513,9 @@ CONFIG_INTERCONNECT_QCOM=y
CONFIG_INTERCONNECT_QCOM_MSM8916=m CONFIG_INTERCONNECT_QCOM_MSM8916=m
CONFIG_INTERCONNECT_QCOM_MSM8939=m CONFIG_INTERCONNECT_QCOM_MSM8939=m
# CONFIG_INTERCONNECT_QCOM_MSM8974 is not set # CONFIG_INTERCONNECT_QCOM_MSM8974 is not set
CONFIG_INTERCONNECT_QCOM_MSM8996=m
CONFIG_INTERCONNECT_QCOM_OSM_L3=m CONFIG_INTERCONNECT_QCOM_OSM_L3=m
CONFIG_INTERCONNECT_QCOM_QCM2290=m
# CONFIG_INTERCONNECT_QCOM_QCS404 is not set # CONFIG_INTERCONNECT_QCOM_QCS404 is not set
CONFIG_INTERCONNECT_QCOM_SDM660=m CONFIG_INTERCONNECT_QCOM_SDM660=m
CONFIG_INTERCONNECT_QCOM_SMD_RPM=m CONFIG_INTERCONNECT_QCOM_SMD_RPM=m
@ -9542,6 +9628,7 @@ CONFIG_FSCACHE_STATS=y
# CONFIG_FSCACHE_DEBUG is not set # CONFIG_FSCACHE_DEBUG is not set
CONFIG_CACHEFILES=m CONFIG_CACHEFILES=m
# CONFIG_CACHEFILES_DEBUG is not set # CONFIG_CACHEFILES_DEBUG is not set
# CONFIG_CACHEFILES_ERROR_INJECTION is not set
# end of Caches # end of Caches
# #
@ -10075,27 +10162,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
# CONFIG_CRYPTO_STATS is not set # CONFIG_CRYPTO_STATS is not set
CONFIG_CRYPTO_HASH_INFO=y CONFIG_CRYPTO_HASH_INFO=y
#
# Crypto library routines
#
CONFIG_CRYPTO_LIB_AES=y
CONFIG_CRYPTO_LIB_ARC4=m
CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
CONFIG_CRYPTO_LIB_BLAKE2S=m
CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
CONFIG_CRYPTO_LIB_CHACHA=m
CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
CONFIG_CRYPTO_LIB_CURVE25519=m
CONFIG_CRYPTO_LIB_DES=m
CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
CONFIG_CRYPTO_LIB_POLY1305=m
CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
CONFIG_CRYPTO_LIB_SHA256=y
CONFIG_CRYPTO_LIB_SM4=m
CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_HW=y
CONFIG_CRYPTO_DEV_ALLWINNER=y CONFIG_CRYPTO_DEV_ALLWINNER=y
CONFIG_CRYPTO_DEV_SUN4I_SS=m CONFIG_CRYPTO_DEV_SUN4I_SS=m
@ -10195,7 +10261,6 @@ CONFIG_HAVE_ARCH_BITREVERSE=y
CONFIG_GENERIC_STRNCPY_FROM_USER=y CONFIG_GENERIC_STRNCPY_FROM_USER=y
CONFIG_GENERIC_STRNLEN_USER=y CONFIG_GENERIC_STRNLEN_USER=y
CONFIG_GENERIC_NET_UTILS=y CONFIG_GENERIC_NET_UTILS=y
CONFIG_GENERIC_FIND_FIRST_BIT=y
CONFIG_CORDIC=m CONFIG_CORDIC=m
CONFIG_PRIME_NUMBERS=m CONFIG_PRIME_NUMBERS=m
CONFIG_RATIONAL=y CONFIG_RATIONAL=y
@ -10205,6 +10270,28 @@ CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
CONFIG_ARCH_HAS_FAST_MULTIPLIER=y CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
CONFIG_ARCH_USE_SYM_ANNOTATIONS=y CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
# CONFIG_INDIRECT_PIO is not set # CONFIG_INDIRECT_PIO is not set
#
# Crypto library routines
#
CONFIG_CRYPTO_LIB_AES=y
CONFIG_CRYPTO_LIB_ARC4=m
CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
CONFIG_CRYPTO_LIB_CHACHA=m
CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
CONFIG_CRYPTO_LIB_CURVE25519=m
CONFIG_CRYPTO_LIB_DES=m
CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
CONFIG_CRYPTO_LIB_POLY1305=m
CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
CONFIG_CRYPTO_LIB_SHA256=y
CONFIG_CRYPTO_LIB_SM4=m
# end of Crypto library routines
CONFIG_CRC_CCITT=m CONFIG_CRC_CCITT=m
CONFIG_CRC16=y CONFIG_CRC16=y
CONFIG_CRC_T10DIF=y CONFIG_CRC_T10DIF=y
@ -10402,12 +10489,21 @@ CONFIG_HAVE_ARCH_KGDB=y
# CONFIG_KGDB is not set # CONFIG_KGDB is not set
CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
# CONFIG_UBSAN is not set # CONFIG_UBSAN is not set
CONFIG_HAVE_ARCH_KCSAN=y
CONFIG_HAVE_KCSAN_COMPILER=y CONFIG_HAVE_KCSAN_COMPILER=y
# CONFIG_KCSAN is not set
# end of Generic Kernel Debugging Instruments # end of Generic Kernel Debugging Instruments
CONFIG_DEBUG_KERNEL=y CONFIG_DEBUG_KERNEL=y
CONFIG_DEBUG_MISC=y CONFIG_DEBUG_MISC=y
#
# Networking Debugging
#
# CONFIG_NET_DEV_REFCNT_TRACKER is not set
# CONFIG_NET_NS_REFCNT_TRACKER is not set
# end of Networking Debugging
# #
# Memory Debugging # Memory Debugging
# #
@ -10445,7 +10541,7 @@ CONFIG_HAVE_ARCH_KFENCE=y
CONFIG_KFENCE=y CONFIG_KFENCE=y
CONFIG_KFENCE_SAMPLE_INTERVAL=0 CONFIG_KFENCE_SAMPLE_INTERVAL=0
CONFIG_KFENCE_NUM_OBJECTS=255 CONFIG_KFENCE_NUM_OBJECTS=255
CONFIG_KFENCE_STATIC_KEYS=y # CONFIG_KFENCE_STATIC_KEYS is not set
CONFIG_KFENCE_STRESS_TEST_FAULTS=0 CONFIG_KFENCE_STRESS_TEST_FAULTS=0
# end of Memory Debugging # end of Memory Debugging
@ -10612,12 +10708,12 @@ CONFIG_FUNCTION_ERROR_INJECTION=y
# CONFIG_FAULT_INJECTION is not set # CONFIG_FAULT_INJECTION is not set
CONFIG_ARCH_HAS_KCOV=y CONFIG_ARCH_HAS_KCOV=y
CONFIG_CC_HAS_SANCOV_TRACE_PC=y CONFIG_CC_HAS_SANCOV_TRACE_PC=y
# CONFIG_KCOV is not set
CONFIG_RUNTIME_TESTING_MENU=y CONFIG_RUNTIME_TESTING_MENU=y
# CONFIG_LKDTM is not set # CONFIG_LKDTM is not set
# CONFIG_TEST_MIN_HEAP is not set # CONFIG_TEST_MIN_HEAP is not set
# CONFIG_TEST_DIV64 is not set # CONFIG_TEST_DIV64 is not set
# CONFIG_BACKTRACE_SELF_TEST is not set # CONFIG_BACKTRACE_SELF_TEST is not set
# CONFIG_TEST_REF_TRACKER is not set
# CONFIG_RBTREE_TEST is not set # CONFIG_RBTREE_TEST is not set
# CONFIG_REED_SOLOMON_TEST is not set # CONFIG_REED_SOLOMON_TEST is not set
# CONFIG_INTERVAL_TREE_TEST is not set # CONFIG_INTERVAL_TREE_TEST is not set
@ -10636,7 +10732,7 @@ CONFIG_TEST_SCANF=m
CONFIG_TEST_XARRAY=m CONFIG_TEST_XARRAY=m
# CONFIG_TEST_OVERFLOW is not set # CONFIG_TEST_OVERFLOW is not set
# CONFIG_TEST_RHASHTABLE is not set # CONFIG_TEST_RHASHTABLE is not set
# CONFIG_TEST_HASH is not set # CONFIG_TEST_SIPHASH is not set
# CONFIG_TEST_IDA is not set # CONFIG_TEST_IDA is not set
# CONFIG_TEST_LKM is not set # CONFIG_TEST_LKM is not set
CONFIG_TEST_BITOPS=m CONFIG_TEST_BITOPS=m

184
gnu/packages/aux-files/linux-libre/5.16-i686.conf → gnu/packages/aux-files/linux-libre/5.17-i686.conf
View file

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/i386 5.16.0 Kernel Configuration # Linux/i386 5.17.3 Kernel Configuration
# #
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0" CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
CONFIG_CC_IS_GCC=y CONFIG_CC_IS_GCC=y
@ -256,6 +256,7 @@ CONFIG_RSEQ=y
# CONFIG_DEBUG_RSEQ is not set # CONFIG_DEBUG_RSEQ is not set
# CONFIG_EMBEDDED is not set # CONFIG_EMBEDDED is not set
CONFIG_HAVE_PERF_EVENTS=y CONFIG_HAVE_PERF_EVENTS=y
CONFIG_GUEST_PERF_EVENTS=y
# CONFIG_PC104 is not set # CONFIG_PC104 is not set
# #
@ -299,9 +300,6 @@ CONFIG_ARCH_MAY_HAVE_PC_FDC=y
CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_GENERIC_CALIBRATE_DELAY=y
CONFIG_ARCH_HAS_CPU_RELAX=y CONFIG_ARCH_HAS_CPU_RELAX=y
CONFIG_ARCH_HAS_FILTER_PGPROT=y CONFIG_ARCH_HAS_FILTER_PGPROT=y
CONFIG_HAVE_SETUP_PER_CPU_AREA=y
CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
CONFIG_ARCH_HIBERNATION_POSSIBLE=y CONFIG_ARCH_HIBERNATION_POSSIBLE=y
CONFIG_ARCH_NR_GPIO=512 CONFIG_ARCH_NR_GPIO=512
CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_ARCH_SUSPEND_POSSIBLE=y
@ -536,6 +534,7 @@ CONFIG_ACPI=y
CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y
CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y
CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y
CONFIG_ACPI_TABLE_LIB=y
# CONFIG_ACPI_DEBUGGER is not set # CONFIG_ACPI_DEBUGGER is not set
CONFIG_ACPI_SPCR_TABLE=y CONFIG_ACPI_SPCR_TABLE=y
CONFIG_ACPI_SLEEP=y CONFIG_ACPI_SLEEP=y
@ -582,6 +581,7 @@ CONFIG_DPTF_PCH_FIVR=m
CONFIG_ACPI_WATCHDOG=y CONFIG_ACPI_WATCHDOG=y
CONFIG_ACPI_EXTLOG=m CONFIG_ACPI_EXTLOG=m
CONFIG_ACPI_CONFIGFS=m CONFIG_ACPI_CONFIGFS=m
CONFIG_ACPI_PCC=y
# CONFIG_PMIC_OPREGION is not set # CONFIG_PMIC_OPREGION is not set
CONFIG_TPS68470_PMIC_OPREGION=y CONFIG_TPS68470_PMIC_OPREGION=y
CONFIG_ACPI_VIOT=y CONFIG_ACPI_VIOT=y
@ -617,6 +617,7 @@ CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
# #
CONFIG_X86_INTEL_PSTATE=y CONFIG_X86_INTEL_PSTATE=y
CONFIG_X86_PCC_CPUFREQ=y CONFIG_X86_PCC_CPUFREQ=y
CONFIG_X86_AMD_PSTATE=y
CONFIG_X86_ACPI_CPUFREQ=y CONFIG_X86_ACPI_CPUFREQ=y
CONFIG_X86_ACPI_CPUFREQ_CPB=y CONFIG_X86_ACPI_CPUFREQ_CPB=y
CONFIG_X86_POWERNOW_K6=m CONFIG_X86_POWERNOW_K6=m
@ -687,9 +688,11 @@ CONFIG_COMPAT_32=y
CONFIG_HAVE_ATOMIC_IOMAP=y CONFIG_HAVE_ATOMIC_IOMAP=y
CONFIG_HAVE_KVM=y CONFIG_HAVE_KVM=y
CONFIG_HAVE_KVM_PFNCACHE=y
CONFIG_HAVE_KVM_IRQCHIP=y CONFIG_HAVE_KVM_IRQCHIP=y
CONFIG_HAVE_KVM_IRQFD=y CONFIG_HAVE_KVM_IRQFD=y
CONFIG_HAVE_KVM_IRQ_ROUTING=y CONFIG_HAVE_KVM_IRQ_ROUTING=y
CONFIG_HAVE_KVM_DIRTY_RING=y
CONFIG_HAVE_KVM_EVENTFD=y CONFIG_HAVE_KVM_EVENTFD=y
CONFIG_KVM_MMIO=y CONFIG_KVM_MMIO=y
CONFIG_KVM_ASYNC_PF=y CONFIG_KVM_ASYNC_PF=y
@ -797,6 +800,7 @@ CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
CONFIG_HAVE_EXIT_THREAD=y CONFIG_HAVE_EXIT_THREAD=y
CONFIG_ARCH_MMAP_RND_BITS=8 CONFIG_ARCH_MMAP_RND_BITS=8
CONFIG_PAGE_SIZE_LESS_THAN_64KB=y CONFIG_PAGE_SIZE_LESS_THAN_64KB=y
CONFIG_PAGE_SIZE_LESS_THAN_256KB=y
CONFIG_ISA_BUS_API=y CONFIG_ISA_BUS_API=y
CONFIG_CLONE_BACKWARDS=y CONFIG_CLONE_BACKWARDS=y
CONFIG_OLD_SIGSUSPEND3=y CONFIG_OLD_SIGSUSPEND3=y
@ -847,6 +851,7 @@ CONFIG_MODULE_SRCVERSION_ALL=y
CONFIG_MODULE_COMPRESS_GZIP=y CONFIG_MODULE_COMPRESS_GZIP=y
# CONFIG_MODULE_COMPRESS_XZ is not set # CONFIG_MODULE_COMPRESS_XZ is not set
# CONFIG_MODULE_COMPRESS_ZSTD is not set # CONFIG_MODULE_COMPRESS_ZSTD is not set
CONFIG_MODULE_DECOMPRESS=y
# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
CONFIG_MODPROBE_PATH="/run/current-system/profile/bin/modprobe" CONFIG_MODPROBE_PATH="/run/current-system/profile/bin/modprobe"
# CONFIG_TRIM_UNUSED_KSYMS is not set # CONFIG_TRIM_UNUSED_KSYMS is not set
@ -855,6 +860,7 @@ CONFIG_BLOCK=y
CONFIG_BLK_RQ_ALLOC_TIME=y CONFIG_BLK_RQ_ALLOC_TIME=y
CONFIG_BLK_CGROUP_RWSTAT=y CONFIG_BLK_CGROUP_RWSTAT=y
CONFIG_BLK_DEV_BSG_COMMON=y CONFIG_BLK_DEV_BSG_COMMON=y
CONFIG_BLK_ICQ=y
CONFIG_BLK_DEV_BSGLIB=y CONFIG_BLK_DEV_BSGLIB=y
CONFIG_BLK_DEV_INTEGRITY=y CONFIG_BLK_DEV_INTEGRITY=y
CONFIG_BLK_DEV_INTEGRITY_T10=y CONFIG_BLK_DEV_INTEGRITY_T10=y
@ -970,7 +976,9 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_TRANSPARENT_HUGEPAGE=y
CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
CONFIG_CLEANCACHE=y CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
CONFIG_HAVE_SETUP_PER_CPU_AREA=y
CONFIG_FRONTSWAP=y CONFIG_FRONTSWAP=y
CONFIG_CMA=y CONFIG_CMA=y
# CONFIG_CMA_DEBUG is not set # CONFIG_CMA_DEBUG is not set
@ -1011,6 +1019,7 @@ CONFIG_ARCH_HAS_PTE_SPECIAL=y
CONFIG_MAPPING_DIRTY_HELPERS=y CONFIG_MAPPING_DIRTY_HELPERS=y
CONFIG_KMAP_LOCAL=y CONFIG_KMAP_LOCAL=y
CONFIG_SECRETMEM=y CONFIG_SECRETMEM=y
CONFIG_ANON_VMA_NAME=y
# #
# Data Access Monitoring # Data Access Monitoring
@ -1217,7 +1226,6 @@ CONFIG_NF_TABLES_NETDEV=y
CONFIG_NFT_NUMGEN=m CONFIG_NFT_NUMGEN=m
CONFIG_NFT_CT=m CONFIG_NFT_CT=m
CONFIG_NFT_FLOW_OFFLOAD=m CONFIG_NFT_FLOW_OFFLOAD=m
CONFIG_NFT_COUNTER=m
CONFIG_NFT_CONNLIMIT=m CONFIG_NFT_CONNLIMIT=m
CONFIG_NFT_LOG=m CONFIG_NFT_LOG=m
CONFIG_NFT_LIMIT=m CONFIG_NFT_LIMIT=m
@ -1416,7 +1424,6 @@ CONFIG_NFT_REJECT_IPV4=m
CONFIG_NFT_DUP_IPV4=m CONFIG_NFT_DUP_IPV4=m
CONFIG_NFT_FIB_IPV4=m CONFIG_NFT_FIB_IPV4=m
CONFIG_NF_TABLES_ARP=y CONFIG_NF_TABLES_ARP=y
CONFIG_NF_FLOW_TABLE_IPV4=m
CONFIG_NF_DUP_IPV4=m CONFIG_NF_DUP_IPV4=m
CONFIG_NF_LOG_ARP=m CONFIG_NF_LOG_ARP=m
CONFIG_NF_LOG_IPV4=m CONFIG_NF_LOG_IPV4=m
@ -1456,7 +1463,6 @@ CONFIG_NF_TABLES_IPV6=y
CONFIG_NFT_REJECT_IPV6=m CONFIG_NFT_REJECT_IPV6=m
CONFIG_NFT_DUP_IPV6=m CONFIG_NFT_DUP_IPV6=m
CONFIG_NFT_FIB_IPV6=m CONFIG_NFT_FIB_IPV6=m
CONFIG_NF_FLOW_TABLE_IPV6=m
CONFIG_NF_DUP_IPV6=m CONFIG_NF_DUP_IPV6=m
CONFIG_NF_REJECT_IPV6=m CONFIG_NF_REJECT_IPV6=m
CONFIG_NF_LOG_IPV6=m CONFIG_NF_LOG_IPV6=m
@ -1904,6 +1910,7 @@ CONFIG_BT_INTEL=m
CONFIG_BT_BCM=m CONFIG_BT_BCM=m
CONFIG_BT_RTL=m CONFIG_BT_RTL=m
CONFIG_BT_QCA=m CONFIG_BT_QCA=m
CONFIG_BT_MTK=m
CONFIG_BT_HCIBTUSB=m CONFIG_BT_HCIBTUSB=m
# CONFIG_BT_HCIBTUSB_AUTOSUSPEND is not set # CONFIG_BT_HCIBTUSB_AUTOSUSPEND is not set
CONFIG_BT_HCIBTUSB_BCM=y CONFIG_BT_HCIBTUSB_BCM=y
@ -1987,6 +1994,7 @@ CONFIG_RFKILL_LEDS=y
CONFIG_RFKILL_INPUT=y CONFIG_RFKILL_INPUT=y
CONFIG_RFKILL_GPIO=m CONFIG_RFKILL_GPIO=m
CONFIG_NET_9P=m CONFIG_NET_9P=m
CONFIG_NET_9P_FD=m
CONFIG_NET_9P_VIRTIO=m CONFIG_NET_9P_VIRTIO=m
CONFIG_NET_9P_XEN=m CONFIG_NET_9P_XEN=m
CONFIG_NET_9P_RDMA=m CONFIG_NET_9P_RDMA=m
@ -2177,9 +2185,7 @@ CONFIG_RAPIDIO_MPORT_CDEV=m
# #
# RapidIO Switch drivers # RapidIO Switch drivers
# #
CONFIG_RAPIDIO_TSI57X=m
CONFIG_RAPIDIO_CPS_XX=m CONFIG_RAPIDIO_CPS_XX=m
CONFIG_RAPIDIO_TSI568=m
CONFIG_RAPIDIO_CPS_GEN2=m CONFIG_RAPIDIO_CPS_GEN2=m
CONFIG_RAPIDIO_RXS_GEN3=m CONFIG_RAPIDIO_RXS_GEN3=m
# end of RapidIO Switch drivers # end of RapidIO Switch drivers
@ -2192,6 +2198,7 @@ CONFIG_UEVENT_HELPER=y
CONFIG_UEVENT_HELPER_PATH="" CONFIG_UEVENT_HELPER_PATH=""
CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y CONFIG_DEVTMPFS_MOUNT=y
CONFIG_DEVTMPFS_SAFE=y
# CONFIG_STANDALONE is not set # CONFIG_STANDALONE is not set
CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_PREVENT_FIRMWARE_BUILD=y
@ -2310,6 +2317,7 @@ CONFIG_GNSS_SERIAL=m
CONFIG_GNSS_MTK_SERIAL=m CONFIG_GNSS_MTK_SERIAL=m
CONFIG_GNSS_SIRF_SERIAL=m CONFIG_GNSS_SIRF_SERIAL=m
CONFIG_GNSS_UBX_SERIAL=m CONFIG_GNSS_UBX_SERIAL=m
CONFIG_GNSS_USB=m
CONFIG_MTD=m CONFIG_MTD=m
# CONFIG_MTD_TESTS is not set # CONFIG_MTD_TESTS is not set
@ -2566,7 +2574,6 @@ CONFIG_XEN_BLKDEV_FRONTEND=y
CONFIG_XEN_BLKDEV_BACKEND=m CONFIG_XEN_BLKDEV_BACKEND=m
CONFIG_VIRTIO_BLK=y CONFIG_VIRTIO_BLK=y
CONFIG_BLK_DEV_RBD=m CONFIG_BLK_DEV_RBD=m
CONFIG_BLK_DEV_RSXX=m
CONFIG_BLK_DEV_RNBD=y CONFIG_BLK_DEV_RNBD=y
CONFIG_BLK_DEV_RNBD_CLIENT=m CONFIG_BLK_DEV_RNBD_CLIENT=m
CONFIG_BLK_DEV_RNBD_SERVER=m CONFIG_BLK_DEV_RNBD_SERVER=m
@ -2871,7 +2878,6 @@ CONFIG_ATA_BMDMA=y
CONFIG_ATA_PIIX=y CONFIG_ATA_PIIX=y
CONFIG_SATA_DWC=m CONFIG_SATA_DWC=m
# CONFIG_SATA_DWC_OLD_DMA is not set # CONFIG_SATA_DWC_OLD_DMA is not set
# CONFIG_SATA_DWC_DEBUG is not set
CONFIG_SATA_MV=m CONFIG_SATA_MV=m
CONFIG_SATA_NV=m CONFIG_SATA_NV=m
CONFIG_SATA_PROMISE=m CONFIG_SATA_PROMISE=m
@ -3153,6 +3159,7 @@ CONFIG_NET_DSA_XRS700X=m
CONFIG_NET_DSA_XRS700X_I2C=m CONFIG_NET_DSA_XRS700X_I2C=m
CONFIG_NET_DSA_XRS700X_MDIO=m CONFIG_NET_DSA_XRS700X_MDIO=m
CONFIG_NET_DSA_QCA8K=m CONFIG_NET_DSA_QCA8K=m
CONFIG_NET_DSA_REALTEK=m
CONFIG_NET_DSA_REALTEK_SMI=m CONFIG_NET_DSA_REALTEK_SMI=m
CONFIG_NET_DSA_SMSC_LAN9303=m CONFIG_NET_DSA_SMSC_LAN9303=m
CONFIG_NET_DSA_SMSC_LAN9303_I2C=m CONFIG_NET_DSA_SMSC_LAN9303_I2C=m
@ -3272,6 +3279,9 @@ CONFIG_BE2NET_BE2=y
CONFIG_BE2NET_BE3=y CONFIG_BE2NET_BE3=y
CONFIG_BE2NET_LANCER=y CONFIG_BE2NET_LANCER=y
CONFIG_BE2NET_SKYHAWK=y CONFIG_BE2NET_SKYHAWK=y
CONFIG_NET_VENDOR_ENGLEDER=y
CONFIG_TSNEP=m
# CONFIG_TSNEP_SELFTESTS is not set
CONFIG_NET_VENDOR_EZCHIP=y CONFIG_NET_VENDOR_EZCHIP=y
CONFIG_NET_VENDOR_FUJITSU=y CONFIG_NET_VENDOR_FUJITSU=y
CONFIG_PCMCIA_FMVJ18X=m CONFIG_PCMCIA_FMVJ18X=m
@ -3301,6 +3311,7 @@ CONFIG_IAVF=m
CONFIG_I40EVF=m CONFIG_I40EVF=m
CONFIG_ICE=m CONFIG_ICE=m
CONFIG_ICE_SWITCHDEV=y CONFIG_ICE_SWITCHDEV=y
CONFIG_ICE_HWTS=y
CONFIG_FM10K=m CONFIG_FM10K=m
CONFIG_IGC=m CONFIG_IGC=m
CONFIG_NET_VENDOR_MICROSOFT=y CONFIG_NET_VENDOR_MICROSOFT=y
@ -3468,6 +3479,8 @@ CONFIG_TEHUTI=m
CONFIG_NET_VENDOR_TI=y CONFIG_NET_VENDOR_TI=y
# CONFIG_TI_CPSW_PHY_SEL is not set # CONFIG_TI_CPSW_PHY_SEL is not set
CONFIG_TLAN=m CONFIG_TLAN=m
CONFIG_NET_VENDOR_VERTEXCOM=y
CONFIG_MSE102X=m
CONFIG_NET_VENDOR_VIA=y CONFIG_NET_VENDOR_VIA=y
CONFIG_VIA_RHINE=m CONFIG_VIA_RHINE=m
CONFIG_VIA_RHINE_MMIO=y CONFIG_VIA_RHINE_MMIO=y
@ -3550,6 +3563,9 @@ CONFIG_MICREL_KS8995MA=m
# #
# MCTP Device Drivers # MCTP Device Drivers
# #
CONFIG_MCTP_SERIAL=m
# end of MCTP Device Drivers
CONFIG_MDIO_DEVICE=y CONFIG_MDIO_DEVICE=y
CONFIG_MDIO_BUS=y CONFIG_MDIO_BUS=y
CONFIG_FWNODE_MDIO=y CONFIG_FWNODE_MDIO=y
@ -3774,7 +3790,6 @@ CONFIG_IWLWIFI_LEDS=y
CONFIG_IWLDVM=m CONFIG_IWLDVM=m
CONFIG_IWLMVM=m CONFIG_IWLMVM=m
CONFIG_IWLWIFI_OPMODE_MODULAR=y CONFIG_IWLWIFI_OPMODE_MODULAR=y
# CONFIG_IWLWIFI_BCAST_FILTERING is not set
# #
# Debugging Options # Debugging Options
@ -3967,6 +3982,7 @@ CONFIG_IEEE802154_MCR20A=m
# Wireless WAN # Wireless WAN
# #
CONFIG_WWAN=y CONFIG_WWAN=y
# CONFIG_WWAN_DEBUGFS is not set
# CONFIG_WWAN_HWSIM is not set # CONFIG_WWAN_HWSIM is not set
CONFIG_MHI_WWAN_CTRL=m CONFIG_MHI_WWAN_CTRL=m
CONFIG_MHI_WWAN_MBIM=m CONFIG_MHI_WWAN_MBIM=m
@ -4394,6 +4410,7 @@ CONFIG_SERIAL_8250_DW=m
CONFIG_SERIAL_8250_RT288X=y CONFIG_SERIAL_8250_RT288X=y
CONFIG_SERIAL_8250_LPSS=m CONFIG_SERIAL_8250_LPSS=m
CONFIG_SERIAL_8250_MID=m CONFIG_SERIAL_8250_MID=m
CONFIG_SERIAL_8250_PERICOM=m
# #
# Non-8250 serial port support # Non-8250 serial port support
@ -4745,6 +4762,7 @@ CONFIG_PINCTRL_MCP23S08_I2C=m
CONFIG_PINCTRL_MCP23S08_SPI=m CONFIG_PINCTRL_MCP23S08_SPI=m
CONFIG_PINCTRL_MCP23S08=m CONFIG_PINCTRL_MCP23S08=m
CONFIG_PINCTRL_SX150X=y CONFIG_PINCTRL_SX150X=y
CONFIG_PINCTRL_MADERA=m
# #
# Intel pinctrl drivers # Intel pinctrl drivers
@ -4774,7 +4792,6 @@ CONFIG_PINCTRL_TIGERLAKE=m
# #
# end of Renesas pinctrl drivers # end of Renesas pinctrl drivers
CONFIG_PINCTRL_MADERA=m
CONFIG_GPIOLIB=y CONFIG_GPIOLIB=y
CONFIG_GPIOLIB_FASTPATH_LIMIT=512 CONFIG_GPIOLIB_FASTPATH_LIMIT=512
CONFIG_GPIO_ACPI=y CONFIG_GPIO_ACPI=y
@ -4892,6 +4909,7 @@ CONFIG_GPIO_VIPERBOARD=m
CONFIG_GPIO_AGGREGATOR=m CONFIG_GPIO_AGGREGATOR=m
# CONFIG_GPIO_MOCKUP is not set # CONFIG_GPIO_MOCKUP is not set
CONFIG_GPIO_VIRTIO=m CONFIG_GPIO_VIRTIO=m
# CONFIG_GPIO_SIM is not set
# end of Virtual GPIO drivers # end of Virtual GPIO drivers
CONFIG_W1=m CONFIG_W1=m
@ -4988,6 +5006,7 @@ CONFIG_CHARGER_LT3651=m
CONFIG_CHARGER_LTC4162L=m CONFIG_CHARGER_LTC4162L=m
CONFIG_CHARGER_MAX14577=m CONFIG_CHARGER_MAX14577=m
CONFIG_CHARGER_MAX77693=m CONFIG_CHARGER_MAX77693=m
CONFIG_CHARGER_MAX77976=m
CONFIG_CHARGER_MAX8997=m CONFIG_CHARGER_MAX8997=m
CONFIG_CHARGER_MAX8998=m CONFIG_CHARGER_MAX8998=m
CONFIG_CHARGER_MP2629=m CONFIG_CHARGER_MP2629=m
@ -5135,6 +5154,7 @@ CONFIG_SENSORS_NCT7802=m
CONFIG_SENSORS_NCT7904=m CONFIG_SENSORS_NCT7904=m
CONFIG_SENSORS_NPCM7XX=m CONFIG_SENSORS_NPCM7XX=m
CONFIG_SENSORS_NZXT_KRAKEN2=m CONFIG_SENSORS_NZXT_KRAKEN2=m
CONFIG_SENSORS_NZXT_SMART2=m
CONFIG_SENSORS_PCF8591=m CONFIG_SENSORS_PCF8591=m
CONFIG_PMBUS=m CONFIG_PMBUS=m
CONFIG_SENSORS_PMBUS=m CONFIG_SENSORS_PMBUS=m
@ -5142,6 +5162,7 @@ CONFIG_SENSORS_ADM1266=m
CONFIG_SENSORS_ADM1275=m CONFIG_SENSORS_ADM1275=m
CONFIG_SENSORS_BEL_PFE=m CONFIG_SENSORS_BEL_PFE=m
CONFIG_SENSORS_BPA_RS600=m CONFIG_SENSORS_BPA_RS600=m
CONFIG_SENSORS_DELTA_AHE50DC_FAN=m
CONFIG_SENSORS_FSP_3Y=m CONFIG_SENSORS_FSP_3Y=m
CONFIG_SENSORS_IBM_CFFPS=m CONFIG_SENSORS_IBM_CFFPS=m
CONFIG_SENSORS_DPS920AB=m CONFIG_SENSORS_DPS920AB=m
@ -5149,6 +5170,7 @@ CONFIG_SENSORS_INSPUR_IPSPS=m
CONFIG_SENSORS_IR35221=m CONFIG_SENSORS_IR35221=m
CONFIG_SENSORS_IR36021=m CONFIG_SENSORS_IR36021=m
CONFIG_SENSORS_IR38064=m CONFIG_SENSORS_IR38064=m
CONFIG_SENSORS_IR38064_REGULATOR=y
CONFIG_SENSORS_IRPS5401=m CONFIG_SENSORS_IRPS5401=m
CONFIG_SENSORS_ISL68137=m CONFIG_SENSORS_ISL68137=m
CONFIG_SENSORS_LM25066=m CONFIG_SENSORS_LM25066=m
@ -5165,6 +5187,7 @@ CONFIG_SENSORS_MAX34440=m
CONFIG_SENSORS_MAX8688=m CONFIG_SENSORS_MAX8688=m
CONFIG_SENSORS_MP2888=m CONFIG_SENSORS_MP2888=m
CONFIG_SENSORS_MP2975=m CONFIG_SENSORS_MP2975=m
CONFIG_SENSORS_MP5023=m
CONFIG_SENSORS_PIM4328=m CONFIG_SENSORS_PIM4328=m
CONFIG_SENSORS_PM6764TR=m CONFIG_SENSORS_PM6764TR=m
CONFIG_SENSORS_PXE1610=m CONFIG_SENSORS_PXE1610=m
@ -5202,6 +5225,7 @@ CONFIG_SENSORS_ADS7871=m
CONFIG_SENSORS_AMC6821=m CONFIG_SENSORS_AMC6821=m
CONFIG_SENSORS_INA209=m CONFIG_SENSORS_INA209=m
CONFIG_SENSORS_INA2XX=m CONFIG_SENSORS_INA2XX=m
CONFIG_SENSORS_INA238=m
CONFIG_SENSORS_INA3221=m CONFIG_SENSORS_INA3221=m
CONFIG_SENSORS_TC74=m CONFIG_SENSORS_TC74=m
CONFIG_SENSORS_THMC50=m CONFIG_SENSORS_THMC50=m
@ -5236,6 +5260,8 @@ CONFIG_SENSORS_INTEL_M10_BMC_HWMON=m
# #
CONFIG_SENSORS_ACPI_POWER=m CONFIG_SENSORS_ACPI_POWER=m
CONFIG_SENSORS_ATK0110=m CONFIG_SENSORS_ATK0110=m
CONFIG_SENSORS_ASUS_WMI=m
CONFIG_SENSORS_ASUS_WMI_EC=m
CONFIG_THERMAL=y CONFIG_THERMAL=y
CONFIG_THERMAL_NETLINK=y CONFIG_THERMAL_NETLINK=y
# CONFIG_THERMAL_STATISTICS is not set # CONFIG_THERMAL_STATISTICS is not set
@ -5349,6 +5375,7 @@ CONFIG_MACHZ_WDT=m
CONFIG_SBC_EPX_C3_WATCHDOG=m CONFIG_SBC_EPX_C3_WATCHDOG=m
CONFIG_NI903X_WDT=m CONFIG_NI903X_WDT=m
CONFIG_NIC7018_WDT=m CONFIG_NIC7018_WDT=m
CONFIG_SIEMENS_SIMATIC_IPC_WDT=m
CONFIG_MEN_A21_WDT=m CONFIG_MEN_A21_WDT=m
CONFIG_XEN_WDT=m CONFIG_XEN_WDT=m
@ -5443,7 +5470,6 @@ CONFIG_MFD_INTEL_LPSS=m
CONFIG_MFD_INTEL_LPSS_ACPI=m CONFIG_MFD_INTEL_LPSS_ACPI=m
CONFIG_MFD_INTEL_LPSS_PCI=m CONFIG_MFD_INTEL_LPSS_PCI=m
CONFIG_MFD_INTEL_PMC_BXT=m CONFIG_MFD_INTEL_PMC_BXT=m
CONFIG_MFD_INTEL_PMT=m
CONFIG_MFD_IQS62X=m CONFIG_MFD_IQS62X=m
CONFIG_MFD_JANZ_CMODIO=m CONFIG_MFD_JANZ_CMODIO=m
CONFIG_MFD_KEMPLD=m CONFIG_MFD_KEMPLD=m
@ -5568,6 +5594,7 @@ CONFIG_REGULATOR_MAX8925=m
CONFIG_REGULATOR_MAX8952=m CONFIG_REGULATOR_MAX8952=m
CONFIG_REGULATOR_MAX8997=m CONFIG_REGULATOR_MAX8997=m
CONFIG_REGULATOR_MAX8998=m CONFIG_REGULATOR_MAX8998=m
CONFIG_REGULATOR_MAX20086=m
CONFIG_REGULATOR_MAX77693=m CONFIG_REGULATOR_MAX77693=m
CONFIG_REGULATOR_MAX77826=m CONFIG_REGULATOR_MAX77826=m
CONFIG_REGULATOR_MC13XXX_CORE=m CONFIG_REGULATOR_MC13XXX_CORE=m
@ -5615,6 +5642,7 @@ CONFIG_REGULATOR_TPS6524X=m
CONFIG_REGULATOR_TPS6586X=m CONFIG_REGULATOR_TPS6586X=m
CONFIG_REGULATOR_TPS65910=m CONFIG_REGULATOR_TPS65910=m
CONFIG_REGULATOR_TPS65912=m CONFIG_REGULATOR_TPS65912=m
CONFIG_REGULATOR_TPS68470=m
CONFIG_REGULATOR_TWL4030=m CONFIG_REGULATOR_TWL4030=m
CONFIG_REGULATOR_WM831X=m CONFIG_REGULATOR_WM831X=m
CONFIG_REGULATOR_WM8350=m CONFIG_REGULATOR_WM8350=m
@ -6207,6 +6235,7 @@ CONFIG_VIDEO_OV5648=m
CONFIG_VIDEO_OV6650=m CONFIG_VIDEO_OV6650=m
CONFIG_VIDEO_OV5670=m CONFIG_VIDEO_OV5670=m
CONFIG_VIDEO_OV5675=m CONFIG_VIDEO_OV5675=m
CONFIG_VIDEO_OV5693=m
CONFIG_VIDEO_OV5695=m CONFIG_VIDEO_OV5695=m
CONFIG_VIDEO_OV7251=m CONFIG_VIDEO_OV7251=m
CONFIG_VIDEO_OV772X=m CONFIG_VIDEO_OV772X=m
@ -6525,9 +6554,8 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y
CONFIG_DRM_TTM=m CONFIG_DRM_TTM=m
CONFIG_DRM_VRAM_HELPER=m CONFIG_DRM_VRAM_HELPER=m
CONFIG_DRM_TTM_HELPER=m CONFIG_DRM_TTM_HELPER=m
CONFIG_DRM_GEM_CMA_HELPER=y CONFIG_DRM_GEM_CMA_HELPER=m
CONFIG_DRM_KMS_CMA_HELPER=y CONFIG_DRM_GEM_SHMEM_HELPER=m
CONFIG_DRM_GEM_SHMEM_HELPER=y
CONFIG_DRM_SCHED=m CONFIG_DRM_SCHED=m
# #
@ -6644,6 +6672,7 @@ CONFIG_DRM_CIRRUS_QEMU=m
CONFIG_DRM_GM12U320=m CONFIG_DRM_GM12U320=m
# CONFIG_DRM_SIMPLEDRM is not set # CONFIG_DRM_SIMPLEDRM is not set
CONFIG_TINYDRM_HX8357D=m CONFIG_TINYDRM_HX8357D=m
CONFIG_TINYDRM_ILI9163=m
CONFIG_TINYDRM_ILI9225=m CONFIG_TINYDRM_ILI9225=m
CONFIG_TINYDRM_ILI9341=m CONFIG_TINYDRM_ILI9341=m
CONFIG_TINYDRM_ILI9486=m CONFIG_TINYDRM_ILI9486=m
@ -6658,6 +6687,8 @@ CONFIG_DRM_GUD=m
CONFIG_DRM_HYPERV=m CONFIG_DRM_HYPERV=m
# CONFIG_DRM_LEGACY is not set # CONFIG_DRM_LEGACY is not set
CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
CONFIG_DRM_NOMODESET=y
CONFIG_DRM_PRIVACY_SCREEN=y
# #
# Frame buffer Devices # Frame buffer Devices
@ -6838,6 +6869,7 @@ CONFIG_DUMMY_CONSOLE=y
CONFIG_DUMMY_CONSOLE_COLUMNS=80 CONFIG_DUMMY_CONSOLE_COLUMNS=80
CONFIG_DUMMY_CONSOLE_ROWS=25 CONFIG_DUMMY_CONSOLE_ROWS=25
CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y
# CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
@ -6948,7 +6980,9 @@ CONFIG_SND_MSND_PINNACLE=m
CONFIG_SND_MSND_CLASSIC=m CONFIG_SND_MSND_CLASSIC=m
CONFIG_SND_PCI=y CONFIG_SND_PCI=y
CONFIG_SND_AD1889=m CONFIG_SND_AD1889=m
CONFIG_SND_ALS300=m
CONFIG_SND_ALS4000=m CONFIG_SND_ALS4000=m
CONFIG_SND_ALI5451=m
CONFIG_SND_ASIHPI=m CONFIG_SND_ASIHPI=m
CONFIG_SND_ATIIXP=m CONFIG_SND_ATIIXP=m
CONFIG_SND_ATIIXP_MODEM=m CONFIG_SND_ATIIXP_MODEM=m
@ -6956,6 +6990,7 @@ CONFIG_SND_AU8810=m
CONFIG_SND_AU8820=m CONFIG_SND_AU8820=m
CONFIG_SND_AU8830=m CONFIG_SND_AU8830=m
CONFIG_SND_AW2=m CONFIG_SND_AW2=m
CONFIG_SND_AZT3328=m
CONFIG_SND_BT87X=m CONFIG_SND_BT87X=m
# CONFIG_SND_BT87X_OVERCLOCK is not set # CONFIG_SND_BT87X_OVERCLOCK is not set
CONFIG_SND_CA0106=m CONFIG_SND_CA0106=m
@ -6984,18 +7019,26 @@ CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGODJX=m CONFIG_SND_INDIGODJX=m
CONFIG_SND_EMU10K1=m CONFIG_SND_EMU10K1=m
CONFIG_SND_EMU10K1_SEQ=m CONFIG_SND_EMU10K1_SEQ=m
CONFIG_SND_EMU10K1X=m
CONFIG_SND_ENS1370=m CONFIG_SND_ENS1370=m
CONFIG_SND_ENS1371=m CONFIG_SND_ENS1371=m
CONFIG_SND_ES1938=m
CONFIG_SND_ES1968=m
CONFIG_SND_ES1968_INPUT=y
CONFIG_SND_ES1968_RADIO=y
CONFIG_SND_FM801=m CONFIG_SND_FM801=m
CONFIG_SND_FM801_TEA575X_BOOL=y CONFIG_SND_FM801_TEA575X_BOOL=y
CONFIG_SND_HDSP=m CONFIG_SND_HDSP=m
CONFIG_SND_HDSPM=m CONFIG_SND_HDSPM=m
CONFIG_SND_ICE1712=m
CONFIG_SND_ICE1724=m CONFIG_SND_ICE1724=m
CONFIG_SND_INTEL8X0=m CONFIG_SND_INTEL8X0=m
CONFIG_SND_INTEL8X0M=m CONFIG_SND_INTEL8X0M=m
CONFIG_SND_KORG1212=m CONFIG_SND_KORG1212=m
CONFIG_SND_LOLA=m CONFIG_SND_LOLA=m
CONFIG_SND_LX6464ES=m CONFIG_SND_LX6464ES=m
CONFIG_SND_MAESTRO3=m
CONFIG_SND_MAESTRO3_INPUT=y
CONFIG_SND_MIXART=m CONFIG_SND_MIXART=m
CONFIG_SND_NM256=m CONFIG_SND_NM256=m
CONFIG_SND_PCXHR=m CONFIG_SND_PCXHR=m
@ -7003,6 +7046,9 @@ CONFIG_SND_RIPTIDE=m
CONFIG_SND_RME32=m CONFIG_SND_RME32=m
CONFIG_SND_RME96=m CONFIG_SND_RME96=m
CONFIG_SND_RME9652=m CONFIG_SND_RME9652=m
CONFIG_SND_SIS7019=m
CONFIG_SND_SONICVIBES=m
CONFIG_SND_TRIDENT=m
CONFIG_SND_VIA82XX=m CONFIG_SND_VIA82XX=m
CONFIG_SND_VIA82XX_MODEM=m CONFIG_SND_VIA82XX_MODEM=m
CONFIG_SND_VIRTUOSO=m CONFIG_SND_VIRTUOSO=m
@ -7020,6 +7066,9 @@ CONFIG_SND_HDA_RECONFIG=y
CONFIG_SND_HDA_INPUT_BEEP=y CONFIG_SND_HDA_INPUT_BEEP=y
CONFIG_SND_HDA_INPUT_BEEP_MODE=0 CONFIG_SND_HDA_INPUT_BEEP_MODE=0
CONFIG_SND_HDA_PATCH_LOADER=y CONFIG_SND_HDA_PATCH_LOADER=y
CONFIG_SND_HDA_SCODEC_CS35L41=m
CONFIG_SND_HDA_SCODEC_CS35L41_I2C=m
CONFIG_SND_HDA_SCODEC_CS35L41_SPI=m
CONFIG_SND_HDA_CODEC_REALTEK=m CONFIG_SND_HDA_CODEC_REALTEK=m
CONFIG_SND_HDA_CODEC_ANALOG=m CONFIG_SND_HDA_CODEC_ANALOG=m
CONFIG_SND_HDA_CODEC_SIGMATEL=m CONFIG_SND_HDA_CODEC_SIGMATEL=m
@ -7099,6 +7148,7 @@ CONFIG_SND_SOC_AMD_ACP5x=m
CONFIG_SND_SOC_AMD_VANGOGH_MACH=m CONFIG_SND_SOC_AMD_VANGOGH_MACH=m
CONFIG_SND_SOC_AMD_ACP6x=m CONFIG_SND_SOC_AMD_ACP6x=m
CONFIG_SND_SOC_AMD_YC_MACH=m CONFIG_SND_SOC_AMD_YC_MACH=m
CONFIG_SND_AMD_ACP_CONFIG=m
CONFIG_SND_SOC_AMD_ACP_COMMON=m CONFIG_SND_SOC_AMD_ACP_COMMON=m
CONFIG_SND_SOC_AMD_ACP_I2S=m CONFIG_SND_SOC_AMD_ACP_I2S=m
CONFIG_SND_SOC_AMD_ACP_PCM=m CONFIG_SND_SOC_AMD_ACP_PCM=m
@ -7193,6 +7243,7 @@ CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m
CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH=m CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH=m
CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m
CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH=m CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH=m
CONFIG_SND_SOC_INTEL_SOF_NAU8825_MACH=m
CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
@ -7207,6 +7258,9 @@ CONFIG_SND_SOC_SOF_ACPI_DEV=m
# CONFIG_SND_SOC_SOF_DEVELOPER_SUPPORT is not set # CONFIG_SND_SOC_SOF_DEVELOPER_SUPPORT is not set
CONFIG_SND_SOC_SOF=m CONFIG_SND_SOC_SOF=m
CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE=y CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE=y
CONFIG_SND_SOC_SOF_AMD_TOPLEVEL=m
CONFIG_SND_SOC_SOF_AMD_COMMON=m
CONFIG_SND_SOC_SOF_AMD_RENOIR=m
CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y
CONFIG_SND_SOC_SOF_INTEL_HIFI_EP_IPC=m CONFIG_SND_SOC_SOF_INTEL_HIFI_EP_IPC=m
CONFIG_SND_SOC_SOF_INTEL_ATOM_HIFI_EP=m CONFIG_SND_SOC_SOF_INTEL_ATOM_HIFI_EP=m
@ -7268,6 +7322,7 @@ CONFIG_SND_SOC_ADAU7118_HW=m
CONFIG_SND_SOC_ADAU7118_I2C=m CONFIG_SND_SOC_ADAU7118_I2C=m
CONFIG_SND_SOC_AK4104=m CONFIG_SND_SOC_AK4104=m
CONFIG_SND_SOC_AK4118=m CONFIG_SND_SOC_AK4118=m
CONFIG_SND_SOC_AK4375=m
CONFIG_SND_SOC_AK4458=m CONFIG_SND_SOC_AK4458=m
CONFIG_SND_SOC_AK4554=m CONFIG_SND_SOC_AK4554=m
CONFIG_SND_SOC_AK4613=m CONFIG_SND_SOC_AK4613=m
@ -7283,6 +7338,8 @@ CONFIG_SND_SOC_CS35L33=m
CONFIG_SND_SOC_CS35L34=m CONFIG_SND_SOC_CS35L34=m
CONFIG_SND_SOC_CS35L35=m CONFIG_SND_SOC_CS35L35=m
CONFIG_SND_SOC_CS35L36=m CONFIG_SND_SOC_CS35L36=m
CONFIG_SND_SOC_CS35L41_LIB=m
CONFIG_SND_SOC_CS35L41=m
CONFIG_SND_SOC_CS35L41_SPI=m CONFIG_SND_SOC_CS35L41_SPI=m
CONFIG_SND_SOC_CS35L41_I2C=m CONFIG_SND_SOC_CS35L41_I2C=m
CONFIG_SND_SOC_CS42L42=m CONFIG_SND_SOC_CS42L42=m
@ -7405,6 +7462,7 @@ CONFIG_SND_SOC_TAS6424=m
CONFIG_SND_SOC_TDA7419=m CONFIG_SND_SOC_TDA7419=m
CONFIG_SND_SOC_TFA9879=m CONFIG_SND_SOC_TFA9879=m
CONFIG_SND_SOC_TFA989X=m CONFIG_SND_SOC_TFA989X=m
CONFIG_SND_SOC_TLV320ADC3XXX=m
CONFIG_SND_SOC_TLV320AIC23=m CONFIG_SND_SOC_TLV320AIC23=m
CONFIG_SND_SOC_TLV320AIC23_I2C=m CONFIG_SND_SOC_TLV320AIC23_I2C=m
CONFIG_SND_SOC_TLV320AIC23_SPI=m CONFIG_SND_SOC_TLV320AIC23_SPI=m
@ -7537,6 +7595,7 @@ CONFIG_HID_KENSINGTON=m
CONFIG_HID_LCPOWER=m CONFIG_HID_LCPOWER=m
CONFIG_HID_LED=m CONFIG_HID_LED=m
CONFIG_HID_LENOVO=m CONFIG_HID_LENOVO=m
CONFIG_HID_LETSKETCH=m
CONFIG_HID_LOGITECH=m CONFIG_HID_LOGITECH=m
CONFIG_HID_LOGITECH_DJ=m CONFIG_HID_LOGITECH_DJ=m
CONFIG_HID_LOGITECH_HIDPP=m CONFIG_HID_LOGITECH_HIDPP=m
@ -7685,6 +7744,7 @@ CONFIG_USB_R8A66597_HCD=m
CONFIG_USB_HCD_BCMA=m CONFIG_USB_HCD_BCMA=m
CONFIG_USB_HCD_SSB=m CONFIG_USB_HCD_SSB=m
# CONFIG_USB_HCD_TEST_MODE is not set # CONFIG_USB_HCD_TEST_MODE is not set
CONFIG_USB_XEN_HCD=m
# #
# USB Device Class drivers # USB Device Class drivers
@ -8177,6 +8237,11 @@ CONFIG_LEDS_TRIGGER_NETDEV=m
CONFIG_LEDS_TRIGGER_PATTERN=m CONFIG_LEDS_TRIGGER_PATTERN=m
CONFIG_LEDS_TRIGGER_AUDIO=m CONFIG_LEDS_TRIGGER_AUDIO=m
CONFIG_LEDS_TRIGGER_TTY=m CONFIG_LEDS_TRIGGER_TTY=m
#
# Simple LED drivers
#
CONFIG_LEDS_SIEMENS_SIMATIC_IPC=m
# CONFIG_ACCESSIBILITY is not set # CONFIG_ACCESSIBILITY is not set
CONFIG_INFINIBAND=m CONFIG_INFINIBAND=m
CONFIG_INFINIBAND_USER_MAD=m CONFIG_INFINIBAND_USER_MAD=m
@ -8794,7 +8859,6 @@ CONFIG_FB_TFT_TLS8204=m
CONFIG_FB_TFT_UC1611=m CONFIG_FB_TFT_UC1611=m
CONFIG_FB_TFT_UC1701=m CONFIG_FB_TFT_UC1701=m
CONFIG_FB_TFT_UPD161704=m CONFIG_FB_TFT_UPD161704=m
CONFIG_FB_TFT_WATTEROTT=m
CONFIG_MOST_COMPONENTS=m CONFIG_MOST_COMPONENTS=m
CONFIG_MOST_NET=m CONFIG_MOST_NET=m
CONFIG_MOST_VIDEO=m CONFIG_MOST_VIDEO=m
@ -8813,6 +8877,7 @@ CONFIG_PEAQ_WMI=m
CONFIG_NVIDIA_WMI_EC_BACKLIGHT=m CONFIG_NVIDIA_WMI_EC_BACKLIGHT=m
CONFIG_XIAOMI_WMI=m CONFIG_XIAOMI_WMI=m
CONFIG_GIGABYTE_WMI=m CONFIG_GIGABYTE_WMI=m
CONFIG_YOGABOOK_WMI=m
CONFIG_ACERHDF=m CONFIG_ACERHDF=m
CONFIG_ACER_WIRELESS=m CONFIG_ACER_WIRELESS=m
CONFIG_ACER_WMI=m CONFIG_ACER_WMI=m
@ -8823,6 +8888,7 @@ CONFIG_ASUS_LAPTOP=m
CONFIG_ASUS_WIRELESS=m CONFIG_ASUS_WIRELESS=m
CONFIG_ASUS_WMI=m CONFIG_ASUS_WMI=m
CONFIG_ASUS_NB_WMI=m CONFIG_ASUS_NB_WMI=m
CONFIG_ASUS_TF103C_DOCK=m
CONFIG_MERAKI_MX100=m CONFIG_MERAKI_MX100=m
CONFIG_EEEPC_LAPTOP=m CONFIG_EEEPC_LAPTOP=m
CONFIG_EEEPC_WMI=m CONFIG_EEEPC_WMI=m
@ -8883,6 +8949,7 @@ CONFIG_INTEL_MRFLD_PWRBTN=m
CONFIG_INTEL_PUNIT_IPC=m CONFIG_INTEL_PUNIT_IPC=m
CONFIG_INTEL_RST=m CONFIG_INTEL_RST=m
CONFIG_INTEL_SMARTCONNECT=m CONFIG_INTEL_SMARTCONNECT=m
CONFIG_INTEL_VSEC=m
CONFIG_MSI_LAPTOP=m CONFIG_MSI_LAPTOP=m
CONFIG_MSI_WMI=m CONFIG_MSI_WMI=m
CONFIG_PCENGINES_APU2=m CONFIG_PCENGINES_APU2=m
@ -8904,6 +8971,7 @@ CONFIG_TOPSTAR_LAPTOP=m
CONFIG_I2C_MULTI_INSTANTIATE=m CONFIG_I2C_MULTI_INSTANTIATE=m
# CONFIG_MLX_PLATFORM is not set # CONFIG_MLX_PLATFORM is not set
# CONFIG_TOUCHSCREEN_DMI is not set # CONFIG_TOUCHSCREEN_DMI is not set
# CONFIG_X86_ANDROID_TABLETS is not set
CONFIG_FW_ATTR_CLASS=m CONFIG_FW_ATTR_CLASS=m
CONFIG_INTEL_IMR=y CONFIG_INTEL_IMR=y
CONFIG_INTEL_IPS=m CONFIG_INTEL_IPS=m
@ -8912,6 +8980,7 @@ CONFIG_INTEL_SCU=y
CONFIG_INTEL_SCU_PCI=y CONFIG_INTEL_SCU_PCI=y
CONFIG_INTEL_SCU_PLATFORM=m CONFIG_INTEL_SCU_PLATFORM=m
CONFIG_INTEL_SCU_IPC_UTIL=m CONFIG_INTEL_SCU_IPC_UTIL=m
CONFIG_SIEMENS_SIMATIC_IPC=m
CONFIG_PMC_ATOM=y CONFIG_PMC_ATOM=y
CONFIG_CHROME_PLATFORMS=y CONFIG_CHROME_PLATFORMS=y
CONFIG_CHROMEOS_LAPTOP=m CONFIG_CHROMEOS_LAPTOP=m
@ -8947,6 +9016,7 @@ CONFIG_COMMON_CLK_SI5341=m
CONFIG_COMMON_CLK_SI5351=m CONFIG_COMMON_CLK_SI5351=m
CONFIG_COMMON_CLK_SI544=m CONFIG_COMMON_CLK_SI544=m
CONFIG_COMMON_CLK_CDCE706=m CONFIG_COMMON_CLK_CDCE706=m
CONFIG_COMMON_CLK_TPS68470=m
CONFIG_COMMON_CLK_CS2000_CP=m CONFIG_COMMON_CLK_CS2000_CP=m
CONFIG_CLK_TWL6040=m CONFIG_CLK_TWL6040=m
CONFIG_COMMON_CLK_PALMAS=m CONFIG_COMMON_CLK_PALMAS=m
@ -9228,6 +9298,9 @@ CONFIG_TI_ADC128S052=m
CONFIG_TI_ADC161S626=m CONFIG_TI_ADC161S626=m
CONFIG_TI_ADS1015=m CONFIG_TI_ADS1015=m
CONFIG_TI_ADS7950=m CONFIG_TI_ADS7950=m
CONFIG_TI_ADS8344=m
CONFIG_TI_ADS8688=m
CONFIG_TI_ADS124S08=m
CONFIG_TI_ADS131E08=m CONFIG_TI_ADS131E08=m
CONFIG_TI_AM335X_ADC=m CONFIG_TI_AM335X_ADC=m
CONFIG_TI_TLC4541=m CONFIG_TI_TLC4541=m
@ -9238,6 +9311,12 @@ CONFIG_VIPERBOARD_ADC=m
CONFIG_XILINX_XADC=m CONFIG_XILINX_XADC=m
# end of Analog to digital converters # end of Analog to digital converters
#
# Analog to digital and digital to analog converters
#
CONFIG_AD74413R=m
# end of Analog to digital and digital to analog converters
# #
# Analog Front Ends # Analog Front Ends
# #
@ -9312,6 +9391,7 @@ CONFIG_IIO_ST_SENSORS_CORE=m
# #
# Digital to analog converters # Digital to analog converters
# #
CONFIG_AD3552R=m
CONFIG_AD5064=m CONFIG_AD5064=m
CONFIG_AD5360=m CONFIG_AD5360=m
CONFIG_AD5380=m CONFIG_AD5380=m
@ -9333,6 +9413,7 @@ CONFIG_AD5764=m
CONFIG_AD5766=m CONFIG_AD5766=m
CONFIG_AD5770R=m CONFIG_AD5770R=m
CONFIG_AD5791=m CONFIG_AD5791=m
CONFIG_AD7293=m
CONFIG_AD7303=m CONFIG_AD7303=m
CONFIG_AD8801=m CONFIG_AD8801=m
CONFIG_DS4424=m CONFIG_DS4424=m
@ -9340,6 +9421,7 @@ CONFIG_LTC1660=m
CONFIG_LTC2632=m CONFIG_LTC2632=m
CONFIG_M62332=m CONFIG_M62332=m
CONFIG_MAX517=m CONFIG_MAX517=m
CONFIG_MAX5821=m
CONFIG_MCP4725=m CONFIG_MCP4725=m
CONFIG_MCP4922=m CONFIG_MCP4922=m
CONFIG_TI_DAC082S085=m CONFIG_TI_DAC082S085=m
@ -9356,6 +9438,11 @@ CONFIG_IIO_SIMPLE_DUMMY=m
# CONFIG_IIO_SIMPLE_DUMMY_BUFFER is not set # CONFIG_IIO_SIMPLE_DUMMY_BUFFER is not set
# end of IIO dummy driver # end of IIO dummy driver
#
# Filters
#
# end of Filters
# #
# Frequency Synthesizers DDS/PLL # Frequency Synthesizers DDS/PLL
# #
@ -9371,6 +9458,7 @@ CONFIG_AD9523=m
# #
CONFIG_ADF4350=m CONFIG_ADF4350=m
CONFIG_ADF4371=m CONFIG_ADF4371=m
CONFIG_ADMV1013=m
CONFIG_ADRF6780=m CONFIG_ADRF6780=m
# end of Phase-Locked Loop (PLL) frequency synthesizers # end of Phase-Locked Loop (PLL) frequency synthesizers
# end of Frequency Synthesizers DDS/PLL # end of Frequency Synthesizers DDS/PLL
@ -9781,7 +9869,6 @@ CONFIG_ND_CLAIM=y
CONFIG_ND_BTT=m CONFIG_ND_BTT=m
CONFIG_BTT=y CONFIG_BTT=y
CONFIG_NVDIMM_KEYS=y CONFIG_NVDIMM_KEYS=y
CONFIG_DAX_DRIVER=y
CONFIG_DAX=y CONFIG_DAX=y
CONFIG_DEV_DAX=m CONFIG_DEV_DAX=m
CONFIG_NVMEM=y CONFIG_NVMEM=y
@ -9963,6 +10050,7 @@ CONFIG_FSCACHE_STATS=y
# CONFIG_FSCACHE_DEBUG is not set # CONFIG_FSCACHE_DEBUG is not set
CONFIG_CACHEFILES=m CONFIG_CACHEFILES=m
# CONFIG_CACHEFILES_DEBUG is not set # CONFIG_CACHEFILES_DEBUG is not set
# CONFIG_CACHEFILES_ERROR_INJECTION is not set
# end of Caches # end of Caches
# #
@ -10524,6 +10612,7 @@ CONFIG_CRYPTO_DRBG_HASH=y
CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG_CTR=y
CONFIG_CRYPTO_DRBG=y CONFIG_CRYPTO_DRBG=y
CONFIG_CRYPTO_JITTERENTROPY=y CONFIG_CRYPTO_JITTERENTROPY=y
CONFIG_CRYPTO_KDF800108_CTR=y
CONFIG_CRYPTO_USER_API=m CONFIG_CRYPTO_USER_API=m
CONFIG_CRYPTO_USER_API_HASH=m CONFIG_CRYPTO_USER_API_HASH=m
CONFIG_CRYPTO_USER_API_SKCIPHER=m CONFIG_CRYPTO_USER_API_SKCIPHER=m
@ -10533,25 +10622,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
# CONFIG_CRYPTO_STATS is not set # CONFIG_CRYPTO_STATS is not set
CONFIG_CRYPTO_HASH_INFO=y CONFIG_CRYPTO_HASH_INFO=y
#
# Crypto library routines
#
CONFIG_CRYPTO_LIB_AES=y
CONFIG_CRYPTO_LIB_ARC4=m
CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
CONFIG_CRYPTO_LIB_BLAKE2S=m
CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
CONFIG_CRYPTO_LIB_CHACHA=m
CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
CONFIG_CRYPTO_LIB_CURVE25519=m
CONFIG_CRYPTO_LIB_DES=m
CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
CONFIG_CRYPTO_LIB_POLY1305=m
CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
CONFIG_CRYPTO_LIB_SHA256=y
CONFIG_CRYPTO_LIB_SM4=m
CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_HW=y
CONFIG_CRYPTO_DEV_PADLOCK=y CONFIG_CRYPTO_DEV_PADLOCK=y
CONFIG_CRYPTO_DEV_PADLOCK_AES=m CONFIG_CRYPTO_DEV_PADLOCK_AES=m
@ -10611,7 +10681,6 @@ CONFIG_BITREVERSE=y
CONFIG_GENERIC_STRNCPY_FROM_USER=y CONFIG_GENERIC_STRNCPY_FROM_USER=y
CONFIG_GENERIC_STRNLEN_USER=y CONFIG_GENERIC_STRNLEN_USER=y
CONFIG_GENERIC_NET_UTILS=y CONFIG_GENERIC_NET_UTILS=y
CONFIG_GENERIC_FIND_FIRST_BIT=y
CONFIG_CORDIC=m CONFIG_CORDIC=m
CONFIG_PRIME_NUMBERS=m CONFIG_PRIME_NUMBERS=m
CONFIG_RATIONAL=y CONFIG_RATIONAL=y
@ -10619,6 +10688,26 @@ CONFIG_GENERIC_PCI_IOMAP=y
CONFIG_GENERIC_IOMAP=y CONFIG_GENERIC_IOMAP=y
CONFIG_ARCH_HAS_FAST_MULTIPLIER=y CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
CONFIG_ARCH_USE_SYM_ANNOTATIONS=y CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
#
# Crypto library routines
#
CONFIG_CRYPTO_LIB_AES=y
CONFIG_CRYPTO_LIB_ARC4=m
CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
CONFIG_CRYPTO_LIB_CHACHA=m
CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
CONFIG_CRYPTO_LIB_CURVE25519=m
CONFIG_CRYPTO_LIB_DES=m
CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
CONFIG_CRYPTO_LIB_POLY1305=m
CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
CONFIG_CRYPTO_LIB_SHA256=y
CONFIG_CRYPTO_LIB_SM4=m
# end of Crypto library routines
CONFIG_CRC_CCITT=y CONFIG_CRC_CCITT=y
CONFIG_CRC16=y CONFIG_CRC16=y
CONFIG_CRC_T10DIF=y CONFIG_CRC_T10DIF=y
@ -10813,6 +10902,13 @@ CONFIG_HAVE_KCSAN_COMPILER=y
CONFIG_DEBUG_KERNEL=y CONFIG_DEBUG_KERNEL=y
CONFIG_DEBUG_MISC=y CONFIG_DEBUG_MISC=y
#
# Networking Debugging
#
# CONFIG_NET_DEV_REFCNT_TRACKER is not set
# CONFIG_NET_NS_REFCNT_TRACKER is not set
# end of Networking Debugging
# #
# Memory Debugging # Memory Debugging
# #
@ -10850,7 +10946,7 @@ CONFIG_HAVE_ARCH_KFENCE=y
CONFIG_KFENCE=y CONFIG_KFENCE=y
CONFIG_KFENCE_SAMPLE_INTERVAL=0 CONFIG_KFENCE_SAMPLE_INTERVAL=0
CONFIG_KFENCE_NUM_OBJECTS=255 CONFIG_KFENCE_NUM_OBJECTS=255
CONFIG_KFENCE_STATIC_KEYS=y # CONFIG_KFENCE_STATIC_KEYS is not set
CONFIG_KFENCE_STRESS_TEST_FAULTS=0 CONFIG_KFENCE_STRESS_TEST_FAULTS=0
# end of Memory Debugging # end of Memory Debugging
@ -10951,6 +11047,8 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
CONFIG_HAVE_SYSCALL_TRACEPOINTS=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
CONFIG_HAVE_FENTRY=y CONFIG_HAVE_FENTRY=y
CONFIG_HAVE_C_RECORDMCOUNT=y CONFIG_HAVE_C_RECORDMCOUNT=y
CONFIG_HAVE_BUILDTIME_MCOUNT_SORT=y
CONFIG_BUILDTIME_MCOUNT_SORT=y
CONFIG_TRACER_MAX_TRACE=y CONFIG_TRACER_MAX_TRACE=y
CONFIG_TRACE_CLOCK=y CONFIG_TRACE_CLOCK=y
CONFIG_RING_BUFFER=y CONFIG_RING_BUFFER=y
@ -10998,6 +11096,7 @@ CONFIG_SYNTH_EVENTS=y
# CONFIG_TRACE_EVAL_MAP_FILE is not set # CONFIG_TRACE_EVAL_MAP_FILE is not set
# CONFIG_FTRACE_RECORD_RECURSION is not set # CONFIG_FTRACE_RECORD_RECURSION is not set
# CONFIG_FTRACE_STARTUP_TEST is not set # CONFIG_FTRACE_STARTUP_TEST is not set
# CONFIG_FTRACE_SORT_STARTUP_TEST is not set
# CONFIG_RING_BUFFER_STARTUP_TEST is not set # CONFIG_RING_BUFFER_STARTUP_TEST is not set
# CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set # CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set
# CONFIG_MMIOTRACE_TEST is not set # CONFIG_MMIOTRACE_TEST is not set
@ -11053,6 +11152,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
# CONFIG_TEST_MIN_HEAP is not set # CONFIG_TEST_MIN_HEAP is not set
# CONFIG_TEST_DIV64 is not set # CONFIG_TEST_DIV64 is not set
# CONFIG_BACKTRACE_SELF_TEST is not set # CONFIG_BACKTRACE_SELF_TEST is not set
# CONFIG_TEST_REF_TRACKER is not set
# CONFIG_RBTREE_TEST is not set # CONFIG_RBTREE_TEST is not set
# CONFIG_REED_SOLOMON_TEST is not set # CONFIG_REED_SOLOMON_TEST is not set
CONFIG_INTERVAL_TREE_TEST=m CONFIG_INTERVAL_TREE_TEST=m
@ -11071,7 +11171,7 @@ CONFIG_TEST_UUID=m
CONFIG_TEST_XARRAY=m CONFIG_TEST_XARRAY=m
CONFIG_TEST_OVERFLOW=m CONFIG_TEST_OVERFLOW=m
CONFIG_TEST_RHASHTABLE=m CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_HASH=m CONFIG_TEST_SIPHASH=m
CONFIG_TEST_IDA=m CONFIG_TEST_IDA=m
CONFIG_TEST_PARMAN=m CONFIG_TEST_PARMAN=m
CONFIG_TEST_LKM=m CONFIG_TEST_LKM=m

203
gnu/packages/aux-files/linux-libre/5.16-x86_64.conf → gnu/packages/aux-files/linux-libre/5.17-x86_64.conf
View file

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/x86 5.16.0 Kernel Configuration # Linux/x86 5.17.3 Kernel Configuration
# #
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0" CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
CONFIG_CC_IS_GCC=y CONFIG_CC_IS_GCC=y
@ -269,6 +269,7 @@ CONFIG_RSEQ=y
# CONFIG_DEBUG_RSEQ is not set # CONFIG_DEBUG_RSEQ is not set
# CONFIG_EMBEDDED is not set # CONFIG_EMBEDDED is not set
CONFIG_HAVE_PERF_EVENTS=y CONFIG_HAVE_PERF_EVENTS=y
CONFIG_GUEST_PERF_EVENTS=y
# CONFIG_PC104 is not set # CONFIG_PC104 is not set
# #
@ -313,9 +314,6 @@ CONFIG_ARCH_MAY_HAVE_PC_FDC=y
CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_GENERIC_CALIBRATE_DELAY=y
CONFIG_ARCH_HAS_CPU_RELAX=y CONFIG_ARCH_HAS_CPU_RELAX=y
CONFIG_ARCH_HAS_FILTER_PGPROT=y CONFIG_ARCH_HAS_FILTER_PGPROT=y
CONFIG_HAVE_SETUP_PER_CPU_AREA=y
CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
CONFIG_ARCH_HIBERNATION_POSSIBLE=y CONFIG_ARCH_HIBERNATION_POSSIBLE=y
CONFIG_ARCH_NR_GPIO=1024 CONFIG_ARCH_NR_GPIO=1024
CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_ARCH_SUSPEND_POSSIBLE=y
@ -511,7 +509,6 @@ CONFIG_LIVEPATCH=y
CONFIG_ARCH_HAS_ADD_PAGES=y CONFIG_ARCH_HAS_ADD_PAGES=y
CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y
CONFIG_USE_PERCPU_NUMA_NODE_ID=y
# #
# Power management and ACPI options # Power management and ACPI options
@ -546,6 +543,7 @@ CONFIG_ACPI=y
CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y
CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y
CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y
CONFIG_ACPI_TABLE_LIB=y
# CONFIG_ACPI_DEBUGGER is not set # CONFIG_ACPI_DEBUGGER is not set
CONFIG_ACPI_SPCR_TABLE=y CONFIG_ACPI_SPCR_TABLE=y
CONFIG_ACPI_FPDT=y CONFIG_ACPI_FPDT=y
@ -602,6 +600,8 @@ CONFIG_ACPI_WATCHDOG=y
CONFIG_ACPI_EXTLOG=m CONFIG_ACPI_EXTLOG=m
CONFIG_ACPI_ADXL=y CONFIG_ACPI_ADXL=y
CONFIG_ACPI_CONFIGFS=m CONFIG_ACPI_CONFIGFS=m
CONFIG_ACPI_PFRUT=m
CONFIG_ACPI_PCC=y
# CONFIG_PMIC_OPREGION is not set # CONFIG_PMIC_OPREGION is not set
CONFIG_TPS68470_PMIC_OPREGION=y CONFIG_TPS68470_PMIC_OPREGION=y
CONFIG_ACPI_VIOT=y CONFIG_ACPI_VIOT=y
@ -631,6 +631,7 @@ CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
# #
CONFIG_X86_INTEL_PSTATE=y CONFIG_X86_INTEL_PSTATE=y
CONFIG_X86_PCC_CPUFREQ=y CONFIG_X86_PCC_CPUFREQ=y
CONFIG_X86_AMD_PSTATE=y
CONFIG_X86_ACPI_CPUFREQ=y CONFIG_X86_ACPI_CPUFREQ=y
CONFIG_X86_ACPI_CPUFREQ_CPB=y CONFIG_X86_ACPI_CPUFREQ_CPB=y
CONFIG_X86_POWERNOW_K8=y CONFIG_X86_POWERNOW_K8=y
@ -683,9 +684,11 @@ CONFIG_SYSVIPC_COMPAT=y
# end of Binary Emulations # end of Binary Emulations
CONFIG_HAVE_KVM=y CONFIG_HAVE_KVM=y
CONFIG_HAVE_KVM_PFNCACHE=y
CONFIG_HAVE_KVM_IRQCHIP=y CONFIG_HAVE_KVM_IRQCHIP=y
CONFIG_HAVE_KVM_IRQFD=y CONFIG_HAVE_KVM_IRQFD=y
CONFIG_HAVE_KVM_IRQ_ROUTING=y CONFIG_HAVE_KVM_IRQ_ROUTING=y
CONFIG_HAVE_KVM_DIRTY_RING=y
CONFIG_HAVE_KVM_EVENTFD=y CONFIG_HAVE_KVM_EVENTFD=y
CONFIG_KVM_MMIO=y CONFIG_KVM_MMIO=y
CONFIG_KVM_ASYNC_PF=y CONFIG_KVM_ASYNC_PF=y
@ -805,6 +808,7 @@ CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8 CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8
CONFIG_HAVE_ARCH_COMPAT_MMAP_BASES=y CONFIG_HAVE_ARCH_COMPAT_MMAP_BASES=y
CONFIG_PAGE_SIZE_LESS_THAN_64KB=y CONFIG_PAGE_SIZE_LESS_THAN_64KB=y
CONFIG_PAGE_SIZE_LESS_THAN_256KB=y
CONFIG_HAVE_STACK_VALIDATION=y CONFIG_HAVE_STACK_VALIDATION=y
CONFIG_HAVE_RELIABLE_STACKTRACE=y CONFIG_HAVE_RELIABLE_STACKTRACE=y
CONFIG_ISA_BUS_API=y CONFIG_ISA_BUS_API=y
@ -828,9 +832,11 @@ CONFIG_HAVE_STATIC_CALL_INLINE=y
CONFIG_HAVE_PREEMPT_DYNAMIC=y CONFIG_HAVE_PREEMPT_DYNAMIC=y
CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
CONFIG_ARCH_SUPPORTS_PAGE_TABLE_CHECK=y
CONFIG_ARCH_HAS_ELFCORE_COMPAT=y CONFIG_ARCH_HAS_ELFCORE_COMPAT=y
CONFIG_ARCH_HAS_PARANOID_L1D_FLUSH=y CONFIG_ARCH_HAS_PARANOID_L1D_FLUSH=y
CONFIG_DYNAMIC_SIGFRAME=y CONFIG_DYNAMIC_SIGFRAME=y
CONFIG_HAVE_ARCH_NODE_DEV_GROUP=y
# #
# GCOV-based kernel profiling # GCOV-based kernel profiling
@ -859,6 +865,7 @@ CONFIG_MODULE_SRCVERSION_ALL=y
CONFIG_MODULE_COMPRESS_GZIP=y CONFIG_MODULE_COMPRESS_GZIP=y
# CONFIG_MODULE_COMPRESS_XZ is not set # CONFIG_MODULE_COMPRESS_XZ is not set
# CONFIG_MODULE_COMPRESS_ZSTD is not set # CONFIG_MODULE_COMPRESS_ZSTD is not set
CONFIG_MODULE_DECOMPRESS=y
# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
CONFIG_MODPROBE_PATH="/run/current-system/profile/bin/modprobe" CONFIG_MODPROBE_PATH="/run/current-system/profile/bin/modprobe"
# CONFIG_TRIM_UNUSED_KSYMS is not set # CONFIG_TRIM_UNUSED_KSYMS is not set
@ -867,6 +874,7 @@ CONFIG_BLOCK=y
CONFIG_BLK_RQ_ALLOC_TIME=y CONFIG_BLK_RQ_ALLOC_TIME=y
CONFIG_BLK_CGROUP_RWSTAT=y CONFIG_BLK_CGROUP_RWSTAT=y
CONFIG_BLK_DEV_BSG_COMMON=y CONFIG_BLK_DEV_BSG_COMMON=y
CONFIG_BLK_ICQ=y
CONFIG_BLK_DEV_BSGLIB=y CONFIG_BLK_DEV_BSGLIB=y
CONFIG_BLK_DEV_INTEGRITY=y CONFIG_BLK_DEV_INTEGRITY=y
CONFIG_BLK_DEV_INTEGRITY_T10=y CONFIG_BLK_DEV_INTEGRITY_T10=y
@ -999,7 +1007,10 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
CONFIG_ARCH_WANTS_THP_SWAP=y CONFIG_ARCH_WANTS_THP_SWAP=y
CONFIG_THP_SWAP=y CONFIG_THP_SWAP=y
CONFIG_CLEANCACHE=y CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
CONFIG_USE_PERCPU_NUMA_NODE_ID=y
CONFIG_HAVE_SETUP_PER_CPU_AREA=y
CONFIG_FRONTSWAP=y CONFIG_FRONTSWAP=y
CONFIG_CMA=y CONFIG_CMA=y
# CONFIG_CMA_DEBUG is not set # CONFIG_CMA_DEBUG is not set
@ -1047,6 +1058,7 @@ CONFIG_ARCH_HAS_PKEYS=y
CONFIG_ARCH_HAS_PTE_SPECIAL=y CONFIG_ARCH_HAS_PTE_SPECIAL=y
CONFIG_MAPPING_DIRTY_HELPERS=y CONFIG_MAPPING_DIRTY_HELPERS=y
CONFIG_SECRETMEM=y CONFIG_SECRETMEM=y
CONFIG_ANON_VMA_NAME=y
# #
# Data Access Monitoring # Data Access Monitoring
@ -1256,7 +1268,6 @@ CONFIG_NF_TABLES_NETDEV=y
CONFIG_NFT_NUMGEN=m CONFIG_NFT_NUMGEN=m
CONFIG_NFT_CT=m CONFIG_NFT_CT=m
CONFIG_NFT_FLOW_OFFLOAD=m CONFIG_NFT_FLOW_OFFLOAD=m
CONFIG_NFT_COUNTER=m
CONFIG_NFT_CONNLIMIT=m CONFIG_NFT_CONNLIMIT=m
CONFIG_NFT_LOG=m CONFIG_NFT_LOG=m
CONFIG_NFT_LIMIT=m CONFIG_NFT_LIMIT=m
@ -1456,7 +1467,6 @@ CONFIG_NFT_REJECT_IPV4=m
CONFIG_NFT_DUP_IPV4=m CONFIG_NFT_DUP_IPV4=m
CONFIG_NFT_FIB_IPV4=m CONFIG_NFT_FIB_IPV4=m
CONFIG_NF_TABLES_ARP=y CONFIG_NF_TABLES_ARP=y
CONFIG_NF_FLOW_TABLE_IPV4=m
CONFIG_NF_DUP_IPV4=m CONFIG_NF_DUP_IPV4=m
CONFIG_NF_LOG_ARP=m CONFIG_NF_LOG_ARP=m
CONFIG_NF_LOG_IPV4=m CONFIG_NF_LOG_IPV4=m
@ -1496,7 +1506,6 @@ CONFIG_NF_TABLES_IPV6=y
CONFIG_NFT_REJECT_IPV6=m CONFIG_NFT_REJECT_IPV6=m
CONFIG_NFT_DUP_IPV6=m CONFIG_NFT_DUP_IPV6=m
CONFIG_NFT_FIB_IPV6=m CONFIG_NFT_FIB_IPV6=m
CONFIG_NF_FLOW_TABLE_IPV6=m
CONFIG_NF_DUP_IPV6=m CONFIG_NF_DUP_IPV6=m
CONFIG_NF_REJECT_IPV6=m CONFIG_NF_REJECT_IPV6=m
CONFIG_NF_LOG_IPV6=m CONFIG_NF_LOG_IPV6=m
@ -1934,6 +1943,7 @@ CONFIG_BT_INTEL=m
CONFIG_BT_BCM=m CONFIG_BT_BCM=m
CONFIG_BT_RTL=m CONFIG_BT_RTL=m
CONFIG_BT_QCA=m CONFIG_BT_QCA=m
CONFIG_BT_MTK=m
CONFIG_BT_HCIBTUSB=m CONFIG_BT_HCIBTUSB=m
# CONFIG_BT_HCIBTUSB_AUTOSUSPEND is not set # CONFIG_BT_HCIBTUSB_AUTOSUSPEND is not set
CONFIG_BT_HCIBTUSB_BCM=y CONFIG_BT_HCIBTUSB_BCM=y
@ -2017,6 +2027,7 @@ CONFIG_RFKILL_LEDS=y
CONFIG_RFKILL_INPUT=y CONFIG_RFKILL_INPUT=y
CONFIG_RFKILL_GPIO=m CONFIG_RFKILL_GPIO=m
CONFIG_NET_9P=m CONFIG_NET_9P=m
CONFIG_NET_9P_FD=m
CONFIG_NET_9P_VIRTIO=m CONFIG_NET_9P_VIRTIO=m
CONFIG_NET_9P_XEN=m CONFIG_NET_9P_XEN=m
CONFIG_NET_9P_RDMA=m CONFIG_NET_9P_RDMA=m
@ -2206,9 +2217,7 @@ CONFIG_RAPIDIO_MPORT_CDEV=m
# #
# RapidIO Switch drivers # RapidIO Switch drivers
# #
CONFIG_RAPIDIO_TSI57X=m
CONFIG_RAPIDIO_CPS_XX=m CONFIG_RAPIDIO_CPS_XX=m
CONFIG_RAPIDIO_TSI568=m
CONFIG_RAPIDIO_CPS_GEN2=m CONFIG_RAPIDIO_CPS_GEN2=m
CONFIG_RAPIDIO_RXS_GEN3=m CONFIG_RAPIDIO_RXS_GEN3=m
# end of RapidIO Switch drivers # end of RapidIO Switch drivers
@ -2221,6 +2230,7 @@ CONFIG_UEVENT_HELPER=y
CONFIG_UEVENT_HELPER_PATH="" CONFIG_UEVENT_HELPER_PATH=""
CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y CONFIG_DEVTMPFS_MOUNT=y
CONFIG_DEVTMPFS_SAFE=y
# CONFIG_STANDALONE is not set # CONFIG_STANDALONE is not set
CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_PREVENT_FIRMWARE_BUILD=y
@ -2336,6 +2346,7 @@ CONFIG_GNSS_SERIAL=m
CONFIG_GNSS_MTK_SERIAL=m CONFIG_GNSS_MTK_SERIAL=m
CONFIG_GNSS_SIRF_SERIAL=m CONFIG_GNSS_SIRF_SERIAL=m
CONFIG_GNSS_UBX_SERIAL=m CONFIG_GNSS_UBX_SERIAL=m
CONFIG_GNSS_USB=m
CONFIG_MTD=m CONFIG_MTD=m
# CONFIG_MTD_TESTS is not set # CONFIG_MTD_TESTS is not set
@ -2586,7 +2597,6 @@ CONFIG_XEN_BLKDEV_FRONTEND=y
CONFIG_XEN_BLKDEV_BACKEND=m CONFIG_XEN_BLKDEV_BACKEND=m
CONFIG_VIRTIO_BLK=y CONFIG_VIRTIO_BLK=y
CONFIG_BLK_DEV_RBD=m CONFIG_BLK_DEV_RBD=m
CONFIG_BLK_DEV_RSXX=m
CONFIG_BLK_DEV_RNBD=y CONFIG_BLK_DEV_RNBD=y
CONFIG_BLK_DEV_RNBD_CLIENT=m CONFIG_BLK_DEV_RNBD_CLIENT=m
CONFIG_BLK_DEV_RNBD_SERVER=m CONFIG_BLK_DEV_RNBD_SERVER=m
@ -2884,7 +2894,6 @@ CONFIG_ATA_BMDMA=y
CONFIG_ATA_PIIX=y CONFIG_ATA_PIIX=y
CONFIG_SATA_DWC=m CONFIG_SATA_DWC=m
# CONFIG_SATA_DWC_OLD_DMA is not set # CONFIG_SATA_DWC_OLD_DMA is not set
# CONFIG_SATA_DWC_DEBUG is not set
CONFIG_SATA_MV=m CONFIG_SATA_MV=m
CONFIG_SATA_NV=m CONFIG_SATA_NV=m
CONFIG_SATA_PROMISE=m CONFIG_SATA_PROMISE=m
@ -3158,6 +3167,7 @@ CONFIG_NET_DSA_XRS700X=m
CONFIG_NET_DSA_XRS700X_I2C=m CONFIG_NET_DSA_XRS700X_I2C=m
CONFIG_NET_DSA_XRS700X_MDIO=m CONFIG_NET_DSA_XRS700X_MDIO=m
CONFIG_NET_DSA_QCA8K=m CONFIG_NET_DSA_QCA8K=m
CONFIG_NET_DSA_REALTEK=m
CONFIG_NET_DSA_REALTEK_SMI=m CONFIG_NET_DSA_REALTEK_SMI=m
CONFIG_NET_DSA_SMSC_LAN9303=m CONFIG_NET_DSA_SMSC_LAN9303=m
CONFIG_NET_DSA_SMSC_LAN9303_I2C=m CONFIG_NET_DSA_SMSC_LAN9303_I2C=m
@ -3277,6 +3287,9 @@ CONFIG_BE2NET_BE2=y
CONFIG_BE2NET_BE3=y CONFIG_BE2NET_BE3=y
CONFIG_BE2NET_LANCER=y CONFIG_BE2NET_LANCER=y
CONFIG_BE2NET_SKYHAWK=y CONFIG_BE2NET_SKYHAWK=y
CONFIG_NET_VENDOR_ENGLEDER=y
CONFIG_TSNEP=m
# CONFIG_TSNEP_SELFTESTS is not set
CONFIG_NET_VENDOR_EZCHIP=y CONFIG_NET_VENDOR_EZCHIP=y
CONFIG_NET_VENDOR_FUJITSU=y CONFIG_NET_VENDOR_FUJITSU=y
CONFIG_PCMCIA_FMVJ18X=m CONFIG_PCMCIA_FMVJ18X=m
@ -3308,6 +3321,7 @@ CONFIG_IAVF=m
CONFIG_I40EVF=m CONFIG_I40EVF=m
CONFIG_ICE=m CONFIG_ICE=m
CONFIG_ICE_SWITCHDEV=y CONFIG_ICE_SWITCHDEV=y
CONFIG_ICE_HWTS=y
CONFIG_FM10K=m CONFIG_FM10K=m
CONFIG_IGC=m CONFIG_IGC=m
CONFIG_NET_VENDOR_MICROSOFT=y CONFIG_NET_VENDOR_MICROSOFT=y
@ -3474,6 +3488,8 @@ CONFIG_TEHUTI=m
CONFIG_NET_VENDOR_TI=y CONFIG_NET_VENDOR_TI=y
# CONFIG_TI_CPSW_PHY_SEL is not set # CONFIG_TI_CPSW_PHY_SEL is not set
CONFIG_TLAN=m CONFIG_TLAN=m
CONFIG_NET_VENDOR_VERTEXCOM=y
CONFIG_MSE102X=m
CONFIG_NET_VENDOR_VIA=y CONFIG_NET_VENDOR_VIA=y
CONFIG_VIA_RHINE=m CONFIG_VIA_RHINE=m
CONFIG_VIA_RHINE_MMIO=y CONFIG_VIA_RHINE_MMIO=y
@ -3556,6 +3572,9 @@ CONFIG_MICREL_KS8995MA=m
# #
# MCTP Device Drivers # MCTP Device Drivers
# #
CONFIG_MCTP_SERIAL=m
# end of MCTP Device Drivers
CONFIG_MDIO_DEVICE=y CONFIG_MDIO_DEVICE=y
CONFIG_MDIO_BUS=y CONFIG_MDIO_BUS=y
CONFIG_FWNODE_MDIO=y CONFIG_FWNODE_MDIO=y
@ -3782,7 +3801,6 @@ CONFIG_IWLWIFI_LEDS=y
CONFIG_IWLDVM=m CONFIG_IWLDVM=m
CONFIG_IWLMVM=m CONFIG_IWLMVM=m
CONFIG_IWLWIFI_OPMODE_MODULAR=y CONFIG_IWLWIFI_OPMODE_MODULAR=y
# CONFIG_IWLWIFI_BCAST_FILTERING is not set
# #
# Debugging Options # Debugging Options
@ -3982,6 +4000,7 @@ CONFIG_IEEE802154_MCR20A=m
# Wireless WAN # Wireless WAN
# #
CONFIG_WWAN=y CONFIG_WWAN=y
# CONFIG_WWAN_DEBUGFS is not set
# CONFIG_WWAN_HWSIM is not set # CONFIG_WWAN_HWSIM is not set
CONFIG_MHI_WWAN_CTRL=m CONFIG_MHI_WWAN_CTRL=m
CONFIG_MHI_WWAN_MBIM=m CONFIG_MHI_WWAN_MBIM=m
@ -4398,6 +4417,7 @@ CONFIG_SERIAL_8250_DW=m
CONFIG_SERIAL_8250_RT288X=y CONFIG_SERIAL_8250_RT288X=y
CONFIG_SERIAL_8250_LPSS=m CONFIG_SERIAL_8250_LPSS=m
CONFIG_SERIAL_8250_MID=m CONFIG_SERIAL_8250_MID=m
CONFIG_SERIAL_8250_PERICOM=m
# #
# Non-8250 serial port support # Non-8250 serial port support
@ -4737,6 +4757,7 @@ CONFIG_PINCTRL_MCP23S08_I2C=m
CONFIG_PINCTRL_MCP23S08_SPI=m CONFIG_PINCTRL_MCP23S08_SPI=m
CONFIG_PINCTRL_MCP23S08=m CONFIG_PINCTRL_MCP23S08=m
CONFIG_PINCTRL_SX150X=y CONFIG_PINCTRL_SX150X=y
CONFIG_PINCTRL_MADERA=m
# #
# Intel pinctrl drivers # Intel pinctrl drivers
@ -4766,7 +4787,6 @@ CONFIG_PINCTRL_TIGERLAKE=m
# #
# end of Renesas pinctrl drivers # end of Renesas pinctrl drivers
CONFIG_PINCTRL_MADERA=m
CONFIG_GPIOLIB=y CONFIG_GPIOLIB=y
CONFIG_GPIOLIB_FASTPATH_LIMIT=512 CONFIG_GPIOLIB_FASTPATH_LIMIT=512
CONFIG_GPIO_ACPI=y CONFIG_GPIO_ACPI=y
@ -4880,6 +4900,7 @@ CONFIG_GPIO_VIPERBOARD=m
CONFIG_GPIO_AGGREGATOR=m CONFIG_GPIO_AGGREGATOR=m
# CONFIG_GPIO_MOCKUP is not set # CONFIG_GPIO_MOCKUP is not set
CONFIG_GPIO_VIRTIO=m CONFIG_GPIO_VIRTIO=m
# CONFIG_GPIO_SIM is not set
# end of Virtual GPIO drivers # end of Virtual GPIO drivers
CONFIG_W1=m CONFIG_W1=m
@ -4976,6 +4997,7 @@ CONFIG_CHARGER_LT3651=m
CONFIG_CHARGER_LTC4162L=m CONFIG_CHARGER_LTC4162L=m
CONFIG_CHARGER_MAX14577=m CONFIG_CHARGER_MAX14577=m
CONFIG_CHARGER_MAX77693=m CONFIG_CHARGER_MAX77693=m
CONFIG_CHARGER_MAX77976=m
CONFIG_CHARGER_MAX8997=m CONFIG_CHARGER_MAX8997=m
CONFIG_CHARGER_MAX8998=m CONFIG_CHARGER_MAX8998=m
CONFIG_CHARGER_MP2629=m CONFIG_CHARGER_MP2629=m
@ -5125,6 +5147,7 @@ CONFIG_SENSORS_NCT7802=m
CONFIG_SENSORS_NCT7904=m CONFIG_SENSORS_NCT7904=m
CONFIG_SENSORS_NPCM7XX=m CONFIG_SENSORS_NPCM7XX=m
CONFIG_SENSORS_NZXT_KRAKEN2=m CONFIG_SENSORS_NZXT_KRAKEN2=m
CONFIG_SENSORS_NZXT_SMART2=m
CONFIG_SENSORS_PCF8591=m CONFIG_SENSORS_PCF8591=m
CONFIG_PMBUS=m CONFIG_PMBUS=m
CONFIG_SENSORS_PMBUS=m CONFIG_SENSORS_PMBUS=m
@ -5132,6 +5155,7 @@ CONFIG_SENSORS_ADM1266=m
CONFIG_SENSORS_ADM1275=m CONFIG_SENSORS_ADM1275=m
CONFIG_SENSORS_BEL_PFE=m CONFIG_SENSORS_BEL_PFE=m
CONFIG_SENSORS_BPA_RS600=m CONFIG_SENSORS_BPA_RS600=m
CONFIG_SENSORS_DELTA_AHE50DC_FAN=m
CONFIG_SENSORS_FSP_3Y=m CONFIG_SENSORS_FSP_3Y=m
CONFIG_SENSORS_IBM_CFFPS=m CONFIG_SENSORS_IBM_CFFPS=m
CONFIG_SENSORS_DPS920AB=m CONFIG_SENSORS_DPS920AB=m
@ -5139,6 +5163,7 @@ CONFIG_SENSORS_INSPUR_IPSPS=m
CONFIG_SENSORS_IR35221=m CONFIG_SENSORS_IR35221=m
CONFIG_SENSORS_IR36021=m CONFIG_SENSORS_IR36021=m
CONFIG_SENSORS_IR38064=m CONFIG_SENSORS_IR38064=m
CONFIG_SENSORS_IR38064_REGULATOR=y
CONFIG_SENSORS_IRPS5401=m CONFIG_SENSORS_IRPS5401=m
CONFIG_SENSORS_ISL68137=m CONFIG_SENSORS_ISL68137=m
CONFIG_SENSORS_LM25066=m CONFIG_SENSORS_LM25066=m
@ -5155,6 +5180,7 @@ CONFIG_SENSORS_MAX34440=m
CONFIG_SENSORS_MAX8688=m CONFIG_SENSORS_MAX8688=m
CONFIG_SENSORS_MP2888=m CONFIG_SENSORS_MP2888=m
CONFIG_SENSORS_MP2975=m CONFIG_SENSORS_MP2975=m
CONFIG_SENSORS_MP5023=m
CONFIG_SENSORS_PIM4328=m CONFIG_SENSORS_PIM4328=m
CONFIG_SENSORS_PM6764TR=m CONFIG_SENSORS_PM6764TR=m
CONFIG_SENSORS_PXE1610=m CONFIG_SENSORS_PXE1610=m
@ -5192,6 +5218,7 @@ CONFIG_SENSORS_ADS7871=m
CONFIG_SENSORS_AMC6821=m CONFIG_SENSORS_AMC6821=m
CONFIG_SENSORS_INA209=m CONFIG_SENSORS_INA209=m
CONFIG_SENSORS_INA2XX=m CONFIG_SENSORS_INA2XX=m
CONFIG_SENSORS_INA238=m
CONFIG_SENSORS_INA3221=m CONFIG_SENSORS_INA3221=m
CONFIG_SENSORS_TC74=m CONFIG_SENSORS_TC74=m
CONFIG_SENSORS_THMC50=m CONFIG_SENSORS_THMC50=m
@ -5226,6 +5253,8 @@ CONFIG_SENSORS_INTEL_M10_BMC_HWMON=m
# #
CONFIG_SENSORS_ACPI_POWER=m CONFIG_SENSORS_ACPI_POWER=m
CONFIG_SENSORS_ATK0110=m CONFIG_SENSORS_ATK0110=m
CONFIG_SENSORS_ASUS_WMI=m
CONFIG_SENSORS_ASUS_WMI_EC=m
CONFIG_THERMAL=y CONFIG_THERMAL=y
CONFIG_THERMAL_NETLINK=y CONFIG_THERMAL_NETLINK=y
# CONFIG_THERMAL_STATISTICS is not set # CONFIG_THERMAL_STATISTICS is not set
@ -5338,6 +5367,7 @@ CONFIG_MACHZ_WDT=m
CONFIG_SBC_EPX_C3_WATCHDOG=m CONFIG_SBC_EPX_C3_WATCHDOG=m
CONFIG_NI903X_WDT=m CONFIG_NI903X_WDT=m
CONFIG_NIC7018_WDT=m CONFIG_NIC7018_WDT=m
CONFIG_SIEMENS_SIMATIC_IPC_WDT=m
CONFIG_MEN_A21_WDT=m CONFIG_MEN_A21_WDT=m
CONFIG_XEN_WDT=m CONFIG_XEN_WDT=m
@ -5424,7 +5454,6 @@ CONFIG_MFD_INTEL_LPSS=m
CONFIG_MFD_INTEL_LPSS_ACPI=m CONFIG_MFD_INTEL_LPSS_ACPI=m
CONFIG_MFD_INTEL_LPSS_PCI=m CONFIG_MFD_INTEL_LPSS_PCI=m
CONFIG_MFD_INTEL_PMC_BXT=m CONFIG_MFD_INTEL_PMC_BXT=m
CONFIG_MFD_INTEL_PMT=m
CONFIG_MFD_IQS62X=m CONFIG_MFD_IQS62X=m
CONFIG_MFD_JANZ_CMODIO=m CONFIG_MFD_JANZ_CMODIO=m
CONFIG_MFD_KEMPLD=m CONFIG_MFD_KEMPLD=m
@ -5547,6 +5576,7 @@ CONFIG_REGULATOR_MAX8925=m
CONFIG_REGULATOR_MAX8952=m CONFIG_REGULATOR_MAX8952=m
CONFIG_REGULATOR_MAX8997=m CONFIG_REGULATOR_MAX8997=m
CONFIG_REGULATOR_MAX8998=m CONFIG_REGULATOR_MAX8998=m
CONFIG_REGULATOR_MAX20086=m
CONFIG_REGULATOR_MAX77693=m CONFIG_REGULATOR_MAX77693=m
CONFIG_REGULATOR_MAX77826=m CONFIG_REGULATOR_MAX77826=m
CONFIG_REGULATOR_MC13XXX_CORE=m CONFIG_REGULATOR_MC13XXX_CORE=m
@ -5594,6 +5624,7 @@ CONFIG_REGULATOR_TPS6524X=m
CONFIG_REGULATOR_TPS6586X=m CONFIG_REGULATOR_TPS6586X=m
CONFIG_REGULATOR_TPS65910=m CONFIG_REGULATOR_TPS65910=m
CONFIG_REGULATOR_TPS65912=m CONFIG_REGULATOR_TPS65912=m
CONFIG_REGULATOR_TPS68470=m
CONFIG_REGULATOR_TWL4030=m CONFIG_REGULATOR_TWL4030=m
CONFIG_REGULATOR_WM831X=m CONFIG_REGULATOR_WM831X=m
CONFIG_REGULATOR_WM8350=m CONFIG_REGULATOR_WM8350=m
@ -6170,6 +6201,7 @@ CONFIG_VIDEO_OV5648=m
CONFIG_VIDEO_OV6650=m CONFIG_VIDEO_OV6650=m
CONFIG_VIDEO_OV5670=m CONFIG_VIDEO_OV5670=m
CONFIG_VIDEO_OV5675=m CONFIG_VIDEO_OV5675=m
CONFIG_VIDEO_OV5693=m
CONFIG_VIDEO_OV5695=m CONFIG_VIDEO_OV5695=m
CONFIG_VIDEO_OV7251=m CONFIG_VIDEO_OV7251=m
CONFIG_VIDEO_OV772X=m CONFIG_VIDEO_OV772X=m
@ -6482,9 +6514,8 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y
CONFIG_DRM_TTM=m CONFIG_DRM_TTM=m
CONFIG_DRM_VRAM_HELPER=m CONFIG_DRM_VRAM_HELPER=m
CONFIG_DRM_TTM_HELPER=m CONFIG_DRM_TTM_HELPER=m
CONFIG_DRM_GEM_CMA_HELPER=y CONFIG_DRM_GEM_CMA_HELPER=m
CONFIG_DRM_KMS_CMA_HELPER=y CONFIG_DRM_GEM_SHMEM_HELPER=m
CONFIG_DRM_GEM_SHMEM_HELPER=y
CONFIG_DRM_SCHED=m CONFIG_DRM_SCHED=m
# #
@ -6603,6 +6634,7 @@ CONFIG_DRM_CIRRUS_QEMU=m
CONFIG_DRM_GM12U320=m CONFIG_DRM_GM12U320=m
# CONFIG_DRM_SIMPLEDRM is not set # CONFIG_DRM_SIMPLEDRM is not set
CONFIG_TINYDRM_HX8357D=m CONFIG_TINYDRM_HX8357D=m
CONFIG_TINYDRM_ILI9163=m
CONFIG_TINYDRM_ILI9225=m CONFIG_TINYDRM_ILI9225=m
CONFIG_TINYDRM_ILI9341=m CONFIG_TINYDRM_ILI9341=m
CONFIG_TINYDRM_ILI9486=m CONFIG_TINYDRM_ILI9486=m
@ -6617,6 +6649,8 @@ CONFIG_DRM_GUD=m
CONFIG_DRM_HYPERV=m CONFIG_DRM_HYPERV=m
# CONFIG_DRM_LEGACY is not set # CONFIG_DRM_LEGACY is not set
CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
CONFIG_DRM_NOMODESET=y
CONFIG_DRM_PRIVACY_SCREEN=y
# #
# Frame buffer Devices # Frame buffer Devices
@ -6790,6 +6824,7 @@ CONFIG_DUMMY_CONSOLE=y
CONFIG_DUMMY_CONSOLE_COLUMNS=80 CONFIG_DUMMY_CONSOLE_COLUMNS=80
CONFIG_DUMMY_CONSOLE_ROWS=25 CONFIG_DUMMY_CONSOLE_ROWS=25
CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y
# CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
@ -6860,7 +6895,9 @@ CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
CONFIG_SND_SB_COMMON=m CONFIG_SND_SB_COMMON=m
CONFIG_SND_PCI=y CONFIG_SND_PCI=y
CONFIG_SND_AD1889=m CONFIG_SND_AD1889=m
CONFIG_SND_ALS300=m
CONFIG_SND_ALS4000=m CONFIG_SND_ALS4000=m
CONFIG_SND_ALI5451=m
CONFIG_SND_ASIHPI=m CONFIG_SND_ASIHPI=m
CONFIG_SND_ATIIXP=m CONFIG_SND_ATIIXP=m
CONFIG_SND_ATIIXP_MODEM=m CONFIG_SND_ATIIXP_MODEM=m
@ -6868,6 +6905,7 @@ CONFIG_SND_AU8810=m
CONFIG_SND_AU8820=m CONFIG_SND_AU8820=m
CONFIG_SND_AU8830=m CONFIG_SND_AU8830=m
CONFIG_SND_AW2=m CONFIG_SND_AW2=m
CONFIG_SND_AZT3328=m
CONFIG_SND_BT87X=m CONFIG_SND_BT87X=m
# CONFIG_SND_BT87X_OVERCLOCK is not set # CONFIG_SND_BT87X_OVERCLOCK is not set
CONFIG_SND_CA0106=m CONFIG_SND_CA0106=m
@ -6894,18 +6932,26 @@ CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGODJX=m CONFIG_SND_INDIGODJX=m
CONFIG_SND_EMU10K1=m CONFIG_SND_EMU10K1=m
CONFIG_SND_EMU10K1_SEQ=m CONFIG_SND_EMU10K1_SEQ=m
CONFIG_SND_EMU10K1X=m
CONFIG_SND_ENS1370=m CONFIG_SND_ENS1370=m
CONFIG_SND_ENS1371=m CONFIG_SND_ENS1371=m
CONFIG_SND_ES1938=m
CONFIG_SND_ES1968=m
CONFIG_SND_ES1968_INPUT=y
CONFIG_SND_ES1968_RADIO=y
CONFIG_SND_FM801=m CONFIG_SND_FM801=m
CONFIG_SND_FM801_TEA575X_BOOL=y CONFIG_SND_FM801_TEA575X_BOOL=y
CONFIG_SND_HDSP=m CONFIG_SND_HDSP=m
CONFIG_SND_HDSPM=m CONFIG_SND_HDSPM=m
CONFIG_SND_ICE1712=m
CONFIG_SND_ICE1724=m CONFIG_SND_ICE1724=m
CONFIG_SND_INTEL8X0=m CONFIG_SND_INTEL8X0=m
CONFIG_SND_INTEL8X0M=m CONFIG_SND_INTEL8X0M=m
CONFIG_SND_KORG1212=m CONFIG_SND_KORG1212=m
CONFIG_SND_LOLA=m CONFIG_SND_LOLA=m
CONFIG_SND_LX6464ES=m CONFIG_SND_LX6464ES=m
CONFIG_SND_MAESTRO3=m
CONFIG_SND_MAESTRO3_INPUT=y
CONFIG_SND_MIXART=m CONFIG_SND_MIXART=m
CONFIG_SND_NM256=m CONFIG_SND_NM256=m
CONFIG_SND_PCXHR=m CONFIG_SND_PCXHR=m
@ -6913,6 +6959,8 @@ CONFIG_SND_RIPTIDE=m
CONFIG_SND_RME32=m CONFIG_SND_RME32=m
CONFIG_SND_RME96=m CONFIG_SND_RME96=m
CONFIG_SND_RME9652=m CONFIG_SND_RME9652=m
CONFIG_SND_SONICVIBES=m
CONFIG_SND_TRIDENT=m
CONFIG_SND_VIA82XX=m CONFIG_SND_VIA82XX=m
CONFIG_SND_VIA82XX_MODEM=m CONFIG_SND_VIA82XX_MODEM=m
CONFIG_SND_VIRTUOSO=m CONFIG_SND_VIRTUOSO=m
@ -6930,6 +6978,9 @@ CONFIG_SND_HDA_RECONFIG=y
CONFIG_SND_HDA_INPUT_BEEP=y CONFIG_SND_HDA_INPUT_BEEP=y
CONFIG_SND_HDA_INPUT_BEEP_MODE=0 CONFIG_SND_HDA_INPUT_BEEP_MODE=0
CONFIG_SND_HDA_PATCH_LOADER=y CONFIG_SND_HDA_PATCH_LOADER=y
CONFIG_SND_HDA_SCODEC_CS35L41=m
CONFIG_SND_HDA_SCODEC_CS35L41_I2C=m
CONFIG_SND_HDA_SCODEC_CS35L41_SPI=m
CONFIG_SND_HDA_CODEC_REALTEK=m CONFIG_SND_HDA_CODEC_REALTEK=m
CONFIG_SND_HDA_CODEC_ANALOG=m CONFIG_SND_HDA_CODEC_ANALOG=m
CONFIG_SND_HDA_CODEC_SIGMATEL=m CONFIG_SND_HDA_CODEC_SIGMATEL=m
@ -7009,6 +7060,7 @@ CONFIG_SND_SOC_AMD_ACP5x=m
CONFIG_SND_SOC_AMD_VANGOGH_MACH=m CONFIG_SND_SOC_AMD_VANGOGH_MACH=m
CONFIG_SND_SOC_AMD_ACP6x=m CONFIG_SND_SOC_AMD_ACP6x=m
CONFIG_SND_SOC_AMD_YC_MACH=m CONFIG_SND_SOC_AMD_YC_MACH=m
CONFIG_SND_AMD_ACP_CONFIG=m
CONFIG_SND_SOC_AMD_ACP_COMMON=m CONFIG_SND_SOC_AMD_ACP_COMMON=m
CONFIG_SND_SOC_AMD_ACP_I2S=m CONFIG_SND_SOC_AMD_ACP_I2S=m
CONFIG_SND_SOC_AMD_ACP_PCM=m CONFIG_SND_SOC_AMD_ACP_PCM=m
@ -7103,6 +7155,7 @@ CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m
CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH=m CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH=m
CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m
CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH=m CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH=m
CONFIG_SND_SOC_INTEL_SOF_NAU8825_MACH=m
CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
@ -7117,6 +7170,9 @@ CONFIG_SND_SOC_SOF_ACPI_DEV=m
# CONFIG_SND_SOC_SOF_DEVELOPER_SUPPORT is not set # CONFIG_SND_SOC_SOF_DEVELOPER_SUPPORT is not set
CONFIG_SND_SOC_SOF=m CONFIG_SND_SOC_SOF=m
CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE=y CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE=y
CONFIG_SND_SOC_SOF_AMD_TOPLEVEL=m
CONFIG_SND_SOC_SOF_AMD_COMMON=m
CONFIG_SND_SOC_SOF_AMD_RENOIR=m
CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y
CONFIG_SND_SOC_SOF_INTEL_HIFI_EP_IPC=m CONFIG_SND_SOC_SOF_INTEL_HIFI_EP_IPC=m
CONFIG_SND_SOC_SOF_INTEL_ATOM_HIFI_EP=m CONFIG_SND_SOC_SOF_INTEL_ATOM_HIFI_EP=m
@ -7179,6 +7235,7 @@ CONFIG_SND_SOC_ADAU7118_HW=m
CONFIG_SND_SOC_ADAU7118_I2C=m CONFIG_SND_SOC_ADAU7118_I2C=m
CONFIG_SND_SOC_AK4104=m CONFIG_SND_SOC_AK4104=m
CONFIG_SND_SOC_AK4118=m CONFIG_SND_SOC_AK4118=m
CONFIG_SND_SOC_AK4375=m
CONFIG_SND_SOC_AK4458=m CONFIG_SND_SOC_AK4458=m
CONFIG_SND_SOC_AK4554=m CONFIG_SND_SOC_AK4554=m
CONFIG_SND_SOC_AK4613=m CONFIG_SND_SOC_AK4613=m
@ -7194,6 +7251,8 @@ CONFIG_SND_SOC_CS35L33=m
CONFIG_SND_SOC_CS35L34=m CONFIG_SND_SOC_CS35L34=m
CONFIG_SND_SOC_CS35L35=m CONFIG_SND_SOC_CS35L35=m
CONFIG_SND_SOC_CS35L36=m CONFIG_SND_SOC_CS35L36=m
CONFIG_SND_SOC_CS35L41_LIB=m
CONFIG_SND_SOC_CS35L41=m
CONFIG_SND_SOC_CS35L41_SPI=m CONFIG_SND_SOC_CS35L41_SPI=m
CONFIG_SND_SOC_CS35L41_I2C=m CONFIG_SND_SOC_CS35L41_I2C=m
CONFIG_SND_SOC_CS42L42=m CONFIG_SND_SOC_CS42L42=m
@ -7329,6 +7388,7 @@ CONFIG_SND_SOC_TAS6424=m
CONFIG_SND_SOC_TDA7419=m CONFIG_SND_SOC_TDA7419=m
CONFIG_SND_SOC_TFA9879=m CONFIG_SND_SOC_TFA9879=m
CONFIG_SND_SOC_TFA989X=m CONFIG_SND_SOC_TFA989X=m
CONFIG_SND_SOC_TLV320ADC3XXX=m
CONFIG_SND_SOC_TLV320AIC23=m CONFIG_SND_SOC_TLV320AIC23=m
CONFIG_SND_SOC_TLV320AIC23_I2C=m CONFIG_SND_SOC_TLV320AIC23_I2C=m
CONFIG_SND_SOC_TLV320AIC23_SPI=m CONFIG_SND_SOC_TLV320AIC23_SPI=m
@ -7396,6 +7456,7 @@ CONFIG_SND_SIMPLE_CARD_UTILS=m
CONFIG_SND_SIMPLE_CARD=m CONFIG_SND_SIMPLE_CARD=m
CONFIG_SND_X86=y CONFIG_SND_X86=y
CONFIG_HDMI_LPE_AUDIO=m CONFIG_HDMI_LPE_AUDIO=m
CONFIG_SND_SYNTH_EMUX=m
CONFIG_SND_XEN_FRONTEND=m CONFIG_SND_XEN_FRONTEND=m
CONFIG_SND_VIRTIO=m CONFIG_SND_VIRTIO=m
CONFIG_AC97_BUS=m CONFIG_AC97_BUS=m
@ -7464,6 +7525,7 @@ CONFIG_HID_KENSINGTON=m
CONFIG_HID_LCPOWER=m CONFIG_HID_LCPOWER=m
CONFIG_HID_LED=m CONFIG_HID_LED=m
CONFIG_HID_LENOVO=m CONFIG_HID_LENOVO=m
CONFIG_HID_LETSKETCH=m
CONFIG_HID_LOGITECH=m CONFIG_HID_LOGITECH=m
CONFIG_HID_LOGITECH_DJ=m CONFIG_HID_LOGITECH_DJ=m
CONFIG_HID_LOGITECH_HIDPP=m CONFIG_HID_LOGITECH_HIDPP=m
@ -7634,6 +7696,7 @@ CONFIG_USB_R8A66597_HCD=m
CONFIG_USB_HCD_BCMA=m CONFIG_USB_HCD_BCMA=m
CONFIG_USB_HCD_SSB=m CONFIG_USB_HCD_SSB=m
# CONFIG_USB_HCD_TEST_MODE is not set # CONFIG_USB_HCD_TEST_MODE is not set
CONFIG_USB_XEN_HCD=m
# #
# USB Device Class drivers # USB Device Class drivers
@ -8123,6 +8186,11 @@ CONFIG_LEDS_TRIGGER_NETDEV=m
CONFIG_LEDS_TRIGGER_PATTERN=m CONFIG_LEDS_TRIGGER_PATTERN=m
CONFIG_LEDS_TRIGGER_AUDIO=m CONFIG_LEDS_TRIGGER_AUDIO=m
CONFIG_LEDS_TRIGGER_TTY=m CONFIG_LEDS_TRIGGER_TTY=m
#
# Simple LED drivers
#
CONFIG_LEDS_SIEMENS_SIMATIC_IPC=m
# CONFIG_ACCESSIBILITY is not set # CONFIG_ACCESSIBILITY is not set
CONFIG_INFINIBAND=m CONFIG_INFINIBAND=m
CONFIG_INFINIBAND_USER_MAD=m CONFIG_INFINIBAND_USER_MAD=m
@ -8773,7 +8841,6 @@ CONFIG_FB_TFT_TLS8204=m
CONFIG_FB_TFT_UC1611=m CONFIG_FB_TFT_UC1611=m
CONFIG_FB_TFT_UC1701=m CONFIG_FB_TFT_UC1701=m
CONFIG_FB_TFT_UPD161704=m CONFIG_FB_TFT_UPD161704=m
CONFIG_FB_TFT_WATTEROTT=m
CONFIG_MOST_COMPONENTS=m CONFIG_MOST_COMPONENTS=m
CONFIG_MOST_NET=m CONFIG_MOST_NET=m
CONFIG_MOST_VIDEO=m CONFIG_MOST_VIDEO=m
@ -8792,6 +8859,7 @@ CONFIG_PEAQ_WMI=m
CONFIG_NVIDIA_WMI_EC_BACKLIGHT=m CONFIG_NVIDIA_WMI_EC_BACKLIGHT=m
CONFIG_XIAOMI_WMI=m CONFIG_XIAOMI_WMI=m
CONFIG_GIGABYTE_WMI=m CONFIG_GIGABYTE_WMI=m
CONFIG_YOGABOOK_WMI=m
CONFIG_ACERHDF=m CONFIG_ACERHDF=m
CONFIG_ACER_WIRELESS=m CONFIG_ACER_WIRELESS=m
CONFIG_ACER_WMI=m CONFIG_ACER_WMI=m
@ -8802,6 +8870,7 @@ CONFIG_ASUS_LAPTOP=m
CONFIG_ASUS_WIRELESS=m CONFIG_ASUS_WIRELESS=m
CONFIG_ASUS_WMI=m CONFIG_ASUS_WMI=m
CONFIG_ASUS_NB_WMI=m CONFIG_ASUS_NB_WMI=m
CONFIG_ASUS_TF103C_DOCK=m
CONFIG_MERAKI_MX100=m CONFIG_MERAKI_MX100=m
CONFIG_EEEPC_LAPTOP=m CONFIG_EEEPC_LAPTOP=m
CONFIG_EEEPC_WMI=m CONFIG_EEEPC_WMI=m
@ -8872,6 +8941,7 @@ CONFIG_INTEL_RST=m
CONFIG_INTEL_SMARTCONNECT=m CONFIG_INTEL_SMARTCONNECT=m
# CONFIG_INTEL_TURBO_MAX_3 is not set # CONFIG_INTEL_TURBO_MAX_3 is not set
CONFIG_INTEL_UNCORE_FREQ_CONTROL=m CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
CONFIG_INTEL_VSEC=m
CONFIG_MSI_LAPTOP=m CONFIG_MSI_LAPTOP=m
CONFIG_MSI_WMI=m CONFIG_MSI_WMI=m
CONFIG_PCENGINES_APU2=m CONFIG_PCENGINES_APU2=m
@ -8893,6 +8963,7 @@ CONFIG_TOPSTAR_LAPTOP=m
CONFIG_I2C_MULTI_INSTANTIATE=m CONFIG_I2C_MULTI_INSTANTIATE=m
# CONFIG_MLX_PLATFORM is not set # CONFIG_MLX_PLATFORM is not set
# CONFIG_TOUCHSCREEN_DMI is not set # CONFIG_TOUCHSCREEN_DMI is not set
CONFIG_X86_ANDROID_TABLETS=m
CONFIG_FW_ATTR_CLASS=m CONFIG_FW_ATTR_CLASS=m
CONFIG_INTEL_IPS=m CONFIG_INTEL_IPS=m
CONFIG_INTEL_SCU_IPC=y CONFIG_INTEL_SCU_IPC=y
@ -8900,6 +8971,7 @@ CONFIG_INTEL_SCU=y
CONFIG_INTEL_SCU_PCI=y CONFIG_INTEL_SCU_PCI=y
CONFIG_INTEL_SCU_PLATFORM=m CONFIG_INTEL_SCU_PLATFORM=m
CONFIG_INTEL_SCU_IPC_UTIL=m CONFIG_INTEL_SCU_IPC_UTIL=m
CONFIG_SIEMENS_SIMATIC_IPC=m
CONFIG_PMC_ATOM=y CONFIG_PMC_ATOM=y
CONFIG_CHROME_PLATFORMS=y CONFIG_CHROME_PLATFORMS=y
CONFIG_CHROMEOS_LAPTOP=m CONFIG_CHROMEOS_LAPTOP=m
@ -8950,6 +9022,7 @@ CONFIG_COMMON_CLK_SI5341=m
CONFIG_COMMON_CLK_SI5351=m CONFIG_COMMON_CLK_SI5351=m
CONFIG_COMMON_CLK_SI544=m CONFIG_COMMON_CLK_SI544=m
CONFIG_COMMON_CLK_CDCE706=m CONFIG_COMMON_CLK_CDCE706=m
CONFIG_COMMON_CLK_TPS68470=m
CONFIG_COMMON_CLK_CS2000_CP=m CONFIG_COMMON_CLK_CS2000_CP=m
CONFIG_CLK_TWL6040=m CONFIG_CLK_TWL6040=m
CONFIG_COMMON_CLK_PALMAS=m CONFIG_COMMON_CLK_PALMAS=m
@ -9244,6 +9317,9 @@ CONFIG_TI_ADC128S052=m
CONFIG_TI_ADC161S626=m CONFIG_TI_ADC161S626=m
CONFIG_TI_ADS1015=m CONFIG_TI_ADS1015=m
CONFIG_TI_ADS7950=m CONFIG_TI_ADS7950=m
CONFIG_TI_ADS8344=m
CONFIG_TI_ADS8688=m
CONFIG_TI_ADS124S08=m
CONFIG_TI_ADS131E08=m CONFIG_TI_ADS131E08=m
CONFIG_TI_AM335X_ADC=m CONFIG_TI_AM335X_ADC=m
CONFIG_TI_TLC4541=m CONFIG_TI_TLC4541=m
@ -9254,6 +9330,12 @@ CONFIG_VIPERBOARD_ADC=m
CONFIG_XILINX_XADC=m CONFIG_XILINX_XADC=m
# end of Analog to digital converters # end of Analog to digital converters
#
# Analog to digital and digital to analog converters
#
CONFIG_AD74413R=m
# end of Analog to digital and digital to analog converters
# #
# Analog Front Ends # Analog Front Ends
# #
@ -9328,6 +9410,7 @@ CONFIG_IIO_ST_SENSORS_CORE=m
# #
# Digital to analog converters # Digital to analog converters
# #
CONFIG_AD3552R=m
CONFIG_AD5064=m CONFIG_AD5064=m
CONFIG_AD5360=m CONFIG_AD5360=m
CONFIG_AD5380=m CONFIG_AD5380=m
@ -9349,6 +9432,7 @@ CONFIG_AD5764=m
CONFIG_AD5766=m CONFIG_AD5766=m
CONFIG_AD5770R=m CONFIG_AD5770R=m
CONFIG_AD5791=m CONFIG_AD5791=m
CONFIG_AD7293=m
CONFIG_AD7303=m CONFIG_AD7303=m
CONFIG_AD8801=m CONFIG_AD8801=m
CONFIG_DS4424=m CONFIG_DS4424=m
@ -9356,6 +9440,7 @@ CONFIG_LTC1660=m
CONFIG_LTC2632=m CONFIG_LTC2632=m
CONFIG_M62332=m CONFIG_M62332=m
CONFIG_MAX517=m CONFIG_MAX517=m
CONFIG_MAX5821=m
CONFIG_MCP4725=m CONFIG_MCP4725=m
CONFIG_MCP4922=m CONFIG_MCP4922=m
CONFIG_TI_DAC082S085=m CONFIG_TI_DAC082S085=m
@ -9372,6 +9457,12 @@ CONFIG_IIO_SIMPLE_DUMMY=m
# CONFIG_IIO_SIMPLE_DUMMY_BUFFER is not set # CONFIG_IIO_SIMPLE_DUMMY_BUFFER is not set
# end of IIO dummy driver # end of IIO dummy driver
#
# Filters
#
CONFIG_ADMV8818=m
# end of Filters
# #
# Frequency Synthesizers DDS/PLL # Frequency Synthesizers DDS/PLL
# #
@ -9387,6 +9478,7 @@ CONFIG_AD9523=m
# #
CONFIG_ADF4350=m CONFIG_ADF4350=m
CONFIG_ADF4371=m CONFIG_ADF4371=m
CONFIG_ADMV1013=m
CONFIG_ADRF6780=m CONFIG_ADRF6780=m
# end of Phase-Locked Loop (PLL) frequency synthesizers # end of Phase-Locked Loop (PLL) frequency synthesizers
# end of Frequency Synthesizers DDS/PLL # end of Frequency Synthesizers DDS/PLL
@ -9803,14 +9895,12 @@ CONFIG_ND_PFN=m
CONFIG_NVDIMM_PFN=y CONFIG_NVDIMM_PFN=y
CONFIG_NVDIMM_DAX=y CONFIG_NVDIMM_DAX=y
CONFIG_NVDIMM_KEYS=y CONFIG_NVDIMM_KEYS=y
CONFIG_DAX_DRIVER=y
CONFIG_DAX=y CONFIG_DAX=y
CONFIG_DEV_DAX=m CONFIG_DEV_DAX=m
CONFIG_DEV_DAX_PMEM=m CONFIG_DEV_DAX_PMEM=m
CONFIG_DEV_DAX_HMEM=m CONFIG_DEV_DAX_HMEM=m
CONFIG_DEV_DAX_HMEM_DEVICES=y CONFIG_DEV_DAX_HMEM_DEVICES=y
CONFIG_DEV_DAX_KMEM=m CONFIG_DEV_DAX_KMEM=m
CONFIG_DEV_DAX_PMEM_COMPAT=m
CONFIG_NVMEM=y CONFIG_NVMEM=y
CONFIG_NVMEM_SYSFS=y CONFIG_NVMEM_SYSFS=y
CONFIG_NVMEM_SPMI_SDAM=m CONFIG_NVMEM_SPMI_SDAM=m
@ -9994,6 +10084,7 @@ CONFIG_FSCACHE_STATS=y
# CONFIG_FSCACHE_DEBUG is not set # CONFIG_FSCACHE_DEBUG is not set
CONFIG_CACHEFILES=m CONFIG_CACHEFILES=m
# CONFIG_CACHEFILES_DEBUG is not set # CONFIG_CACHEFILES_DEBUG is not set
# CONFIG_CACHEFILES_ERROR_INJECTION is not set
# end of Caches # end of Caches
# #
@ -10274,8 +10365,7 @@ CONFIG_NLS_MAC_TURKISH=m
CONFIG_NLS_UTF8=m CONFIG_NLS_UTF8=m
CONFIG_DLM=m CONFIG_DLM=m
# CONFIG_DLM_DEBUG is not set # CONFIG_DLM_DEBUG is not set
CONFIG_UNICODE=y # CONFIG_UNICODE is not set
# CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set
CONFIG_IO_WQ=y CONFIG_IO_WQ=y
# end of File systems # end of File systems
@ -10585,6 +10675,7 @@ CONFIG_CRYPTO_DRBG_HASH=y
CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG_CTR=y
CONFIG_CRYPTO_DRBG=y CONFIG_CRYPTO_DRBG=y
CONFIG_CRYPTO_JITTERENTROPY=y CONFIG_CRYPTO_JITTERENTROPY=y
CONFIG_CRYPTO_KDF800108_CTR=y
CONFIG_CRYPTO_USER_API=m CONFIG_CRYPTO_USER_API=m
CONFIG_CRYPTO_USER_API_HASH=m CONFIG_CRYPTO_USER_API_HASH=m
CONFIG_CRYPTO_USER_API_SKCIPHER=m CONFIG_CRYPTO_USER_API_SKCIPHER=m
@ -10594,29 +10685,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
# CONFIG_CRYPTO_STATS is not set # CONFIG_CRYPTO_STATS is not set
CONFIG_CRYPTO_HASH_INFO=y CONFIG_CRYPTO_HASH_INFO=y
#
# Crypto library routines
#
CONFIG_CRYPTO_LIB_AES=y
CONFIG_CRYPTO_LIB_ARC4=m
CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=m
CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
CONFIG_CRYPTO_LIB_BLAKE2S=m
CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
CONFIG_CRYPTO_LIB_CHACHA=m
CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=m
CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
CONFIG_CRYPTO_LIB_CURVE25519=m
CONFIG_CRYPTO_LIB_DES=m
CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
CONFIG_CRYPTO_LIB_POLY1305=m
CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
CONFIG_CRYPTO_LIB_SHA256=y
CONFIG_CRYPTO_LIB_SM4=m
CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_HW=y
CONFIG_CRYPTO_DEV_PADLOCK=y CONFIG_CRYPTO_DEV_PADLOCK=y
CONFIG_CRYPTO_DEV_PADLOCK_AES=m CONFIG_CRYPTO_DEV_PADLOCK_AES=m
@ -10678,7 +10746,6 @@ CONFIG_BITREVERSE=y
CONFIG_GENERIC_STRNCPY_FROM_USER=y CONFIG_GENERIC_STRNCPY_FROM_USER=y
CONFIG_GENERIC_STRNLEN_USER=y CONFIG_GENERIC_STRNLEN_USER=y
CONFIG_GENERIC_NET_UTILS=y CONFIG_GENERIC_NET_UTILS=y
CONFIG_GENERIC_FIND_FIRST_BIT=y
CONFIG_CORDIC=m CONFIG_CORDIC=m
CONFIG_PRIME_NUMBERS=m CONFIG_PRIME_NUMBERS=m
CONFIG_RATIONAL=y CONFIG_RATIONAL=y
@ -10687,6 +10754,30 @@ CONFIG_GENERIC_IOMAP=y
CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
CONFIG_ARCH_HAS_FAST_MULTIPLIER=y CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
CONFIG_ARCH_USE_SYM_ANNOTATIONS=y CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
#
# Crypto library routines
#
CONFIG_CRYPTO_LIB_AES=y
CONFIG_CRYPTO_LIB_ARC4=m
CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=y
CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
CONFIG_CRYPTO_LIB_CHACHA=m
CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=m
CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
CONFIG_CRYPTO_LIB_CURVE25519=m
CONFIG_CRYPTO_LIB_DES=m
CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
CONFIG_CRYPTO_LIB_POLY1305=m
CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
CONFIG_CRYPTO_LIB_SHA256=y
CONFIG_CRYPTO_LIB_SM4=m
# end of Crypto library routines
CONFIG_CRC_CCITT=y CONFIG_CRC_CCITT=y
CONFIG_CRC16=y CONFIG_CRC16=y
CONFIG_CRC_T10DIF=y CONFIG_CRC_T10DIF=y
@ -10886,12 +10977,20 @@ CONFIG_HAVE_KCSAN_COMPILER=y
CONFIG_DEBUG_KERNEL=y CONFIG_DEBUG_KERNEL=y
CONFIG_DEBUG_MISC=y CONFIG_DEBUG_MISC=y
#
# Networking Debugging
#
# CONFIG_NET_DEV_REFCNT_TRACKER is not set
# CONFIG_NET_NS_REFCNT_TRACKER is not set
# end of Networking Debugging
# #
# Memory Debugging # Memory Debugging
# #
# CONFIG_PAGE_EXTENSION is not set # CONFIG_PAGE_EXTENSION is not set
# CONFIG_DEBUG_PAGEALLOC is not set # CONFIG_DEBUG_PAGEALLOC is not set
# CONFIG_PAGE_OWNER is not set # CONFIG_PAGE_OWNER is not set
# CONFIG_PAGE_TABLE_CHECK is not set
# CONFIG_PAGE_POISONING is not set # CONFIG_PAGE_POISONING is not set
# CONFIG_DEBUG_PAGE_REF is not set # CONFIG_DEBUG_PAGE_REF is not set
# CONFIG_DEBUG_RODATA_TEST is not set # CONFIG_DEBUG_RODATA_TEST is not set
@ -10925,7 +11024,7 @@ CONFIG_HAVE_ARCH_KFENCE=y
CONFIG_KFENCE=y CONFIG_KFENCE=y
CONFIG_KFENCE_SAMPLE_INTERVAL=0 CONFIG_KFENCE_SAMPLE_INTERVAL=0
CONFIG_KFENCE_NUM_OBJECTS=255 CONFIG_KFENCE_NUM_OBJECTS=255
CONFIG_KFENCE_STATIC_KEYS=y # CONFIG_KFENCE_STATIC_KEYS is not set
CONFIG_KFENCE_STRESS_TEST_FAULTS=0 CONFIG_KFENCE_STRESS_TEST_FAULTS=0
# end of Memory Debugging # end of Memory Debugging
@ -11030,6 +11129,8 @@ CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
CONFIG_HAVE_FENTRY=y CONFIG_HAVE_FENTRY=y
CONFIG_HAVE_OBJTOOL_MCOUNT=y CONFIG_HAVE_OBJTOOL_MCOUNT=y
CONFIG_HAVE_C_RECORDMCOUNT=y CONFIG_HAVE_C_RECORDMCOUNT=y
CONFIG_HAVE_BUILDTIME_MCOUNT_SORT=y
CONFIG_BUILDTIME_MCOUNT_SORT=y
CONFIG_TRACER_MAX_TRACE=y CONFIG_TRACER_MAX_TRACE=y
CONFIG_TRACE_CLOCK=y CONFIG_TRACE_CLOCK=y
CONFIG_RING_BUFFER=y CONFIG_RING_BUFFER=y
@ -11078,6 +11179,7 @@ CONFIG_SYNTH_EVENTS=y
# CONFIG_TRACE_EVAL_MAP_FILE is not set # CONFIG_TRACE_EVAL_MAP_FILE is not set
# CONFIG_FTRACE_RECORD_RECURSION is not set # CONFIG_FTRACE_RECORD_RECURSION is not set
# CONFIG_FTRACE_STARTUP_TEST is not set # CONFIG_FTRACE_STARTUP_TEST is not set
# CONFIG_FTRACE_SORT_STARTUP_TEST is not set
# CONFIG_RING_BUFFER_STARTUP_TEST is not set # CONFIG_RING_BUFFER_STARTUP_TEST is not set
# CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set # CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set
# CONFIG_MMIOTRACE_TEST is not set # CONFIG_MMIOTRACE_TEST is not set
@ -11138,6 +11240,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
# CONFIG_TEST_MIN_HEAP is not set # CONFIG_TEST_MIN_HEAP is not set
# CONFIG_TEST_DIV64 is not set # CONFIG_TEST_DIV64 is not set
# CONFIG_BACKTRACE_SELF_TEST is not set # CONFIG_BACKTRACE_SELF_TEST is not set
# CONFIG_TEST_REF_TRACKER is not set
# CONFIG_RBTREE_TEST is not set # CONFIG_RBTREE_TEST is not set
# CONFIG_REED_SOLOMON_TEST is not set # CONFIG_REED_SOLOMON_TEST is not set
CONFIG_INTERVAL_TREE_TEST=m CONFIG_INTERVAL_TREE_TEST=m
@ -11156,7 +11259,7 @@ CONFIG_TEST_UUID=m
CONFIG_TEST_XARRAY=m CONFIG_TEST_XARRAY=m
CONFIG_TEST_OVERFLOW=m CONFIG_TEST_OVERFLOW=m
CONFIG_TEST_RHASHTABLE=m CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_HASH=m CONFIG_TEST_SIPHASH=m
CONFIG_TEST_IDA=m CONFIG_TEST_IDA=m
CONFIG_TEST_PARMAN=m CONFIG_TEST_PARMAN=m
CONFIG_TEST_LKM=m CONFIG_TEST_LKM=m

97
gnu/packages/avr-xyz.scm Normal file
View file

@ -0,0 +1,97 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2022 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
;;; GNU Guix is free software; you can redistribute it and/or modify it
;;; under the terms of the GNU General Public License as published by
;;; the Free Software Foundation; either version 3 of the License, or (at
;;; your option) any later version.
;;;
;;; GNU Guix is distributed in the hope that it will be useful, but
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;;; GNU General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages avr-xyz)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix utils)
#:use-module (guix gexp)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix packages)
#:use-module (guix build-system gnu)
#:use-module (gnu packages)
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
#:use-module (gnu packages bash)
#:use-module (gnu packages avr)
#:use-module (gnu packages elf)
#:use-module (gnu packages gl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages version-control)
#:use-module (gnu packages ruby))
(define-public simavr
(package
(name "simavr")
(version "1.7")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/buserror/simavr")
(commit (string-append "v" version))))
(sha256
(base32 "0njz03lkw5374x1lxrq08irz4b86lzj2hibx46ssp7zv712pq55q"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(arguments
(list
#:tests? #f
#:modules '((guix build gnu-build-system)
(guix build utils))
#:phases #~(modify-phases %standard-phases
(delete 'configure)
(replace 'check
(lambda* (#:key tests? outputs #:allow-other-keys)
(when tests?
(invoke "make"
"-C"
"tests"
(string-append "CC=" #$(cc-for-target))
"RELEASE=1"
"run_tests")))))
#:make-flags #~(list (string-append "CC=" #$(cc-for-target))
"RELEASE=1"
(string-append "PREFIX=" #$output)
(string-append "DESTDIR=" #$output))))
(propagated-inputs
(list avr-toolchain))
(native-inputs
(list autoconf
which
git
automake
pkg-config
ncurses
ruby))
(inputs
(list bash-minimal libelf freeglut))
(home-page "https://github.com/buserror/simavr")
(synopsis "Lean, mean and hackable simulator for AVR CPUs/MCUs")
(description
"simavr is a new AVR simulator for GNU/Linux or any platform that uses
@command{avr-gcc}. It uses avr-gcc's own register definition to simplify
creating new targets for supported AVR devices. The core was made to be small
and compact, and hackable so allow quick prototyping of an AVR project. The
AVR core is now stable for use with parts with <= 128KB flash, and with
preliminary support for the bigger parts. The simulator loads ELF files
directly, and there is even a way to specify simulation parameterps directly
in the emulated code using an @code{.elf} section. You can also load
multipart HEX files.")
(license license:gpl3)))

122
gnu/packages/backup.scm
View file

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2015, 2020 Eric Bavier <bavier@posteo.net> ;;; Copyright © 2014, 2015, 2020 Eric Bavier <bavier@posteo.net>
;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net> ;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net>
;;; Copyright © 2015, 2016, 2017, 2021 Leo Famulari <leo@famulari.name> ;;; Copyright © 2015, 2016, 2017, 2021, 2022 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017, 2021 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2017, 2021 Arun Isaac <arunisaac@systemreboot.net>
@ -22,6 +22,7 @@
;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re> ;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev> ;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2022 Feng Shu <tumashu@163.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -62,6 +63,7 @@
#:use-module (gnu packages crypto) #:use-module (gnu packages crypto)
#:use-module (gnu packages databases) #:use-module (gnu packages databases)
#:use-module (gnu packages datastructures) #:use-module (gnu packages datastructures)
#:use-module (gnu packages digest)
#:use-module (gnu packages dbm) #:use-module (gnu packages dbm)
#:use-module (gnu packages dejagnu) #:use-module (gnu packages dejagnu)
#:use-module (gnu packages ftp) #:use-module (gnu packages ftp)
@ -70,6 +72,7 @@
#:use-module (gnu packages gnupg) #:use-module (gnu packages gnupg)
#:use-module (gnu packages golang) #:use-module (gnu packages golang)
#:use-module (gnu packages gperf) #:use-module (gnu packages gperf)
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile) #:use-module (gnu packages guile)
#:use-module (gnu packages guile-xyz) #:use-module (gnu packages guile-xyz)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
@ -629,13 +632,13 @@ detection, and lossless compression.")
(define-public borg (define-public borg
(package (package
(name "borg") (name "borg")
(version "1.1.17") (version "1.2.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "borgbackup" version)) (uri (pypi-uri "borgbackup" version))
(sha256 (sha256
(base32 "0x0ncy0b0bmf586hbdgrif3gjmkdw760vfnfxndr493v07y29fbs")) (base32 "0cy6chpa053rlvy4448vf9klb5v0v1vq3l76gqa3mcrwjb8y574z"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -645,8 +648,6 @@ detection, and lossless compression.")
;; generate the wrong list. ;; generate the wrong list.
(for-each delete-file (for-each delete-file
'("src/borg/algorithms/checksums.c" '("src/borg/algorithms/checksums.c"
"src/borg/algorithms/msgpack/_packer.cpp"
"src/borg/algorithms/msgpack/_unpacker.cpp"
"src/borg/chunker.c" "src/borg/chunker.c"
"src/borg/compress.c" "src/borg/compress.c"
"src/borg/crypto/low_level.c" "src/borg/crypto/low_level.c"
@ -656,11 +657,12 @@ detection, and lossless compression.")
"src/borg/platform/freebsd.c" "src/borg/platform/freebsd.c"
"src/borg/platform/linux.c" "src/borg/platform/linux.c"
"src/borg/platform/posix.c" "src/borg/platform/posix.c"
"src/borg/platform/syncfilerange.c")) "src/borg/platform/syncfilerange.c"
"src/borg/platform/windows.c"))
;; Remove bundled shared libraries. ;; Remove bundled shared libraries.
(with-directory-excursion "src/borg/algorithms" (with-directory-excursion "src/borg/algorithms"
(for-each delete-file-recursively (for-each delete-file-recursively
(list "blake2" "lz4" "zstd"))) (list "lz4" "xxh64" "zstd")))
#t)))) #t))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
@ -672,12 +674,12 @@ detection, and lossless compression.")
(add-after 'unpack 'set-env (add-after 'unpack 'set-env
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((openssl (assoc-ref inputs "openssl")) (let ((openssl (assoc-ref inputs "openssl"))
(libb2 (assoc-ref inputs "libb2"))
(lz4 (assoc-ref inputs "lz4")) (lz4 (assoc-ref inputs "lz4"))
(xxhash (assoc-ref inputs "xxhash"))
(zstd (assoc-ref inputs "zstd"))) (zstd (assoc-ref inputs "zstd")))
(setenv "BORG_OPENSSL_PREFIX" openssl) (setenv "BORG_OPENSSL_PREFIX" openssl)
(setenv "BORG_LIBB2_PREFIX" libb2)
(setenv "BORG_LIBLZ4_PREFIX" lz4) (setenv "BORG_LIBLZ4_PREFIX" lz4)
(setenv "BORG_LIBXXHASH_PREFIX" xxhash)
(setenv "BORG_LIBZSTD_PREFIX" zstd) (setenv "BORG_LIBZSTD_PREFIX" zstd)
(setenv "PYTHON_EGG_CACHE" "/tmp") (setenv "PYTHON_EGG_CACHE" "/tmp")
;; The test 'test_return_codes[python]' fails when ;; The test 'test_return_codes[python]' fails when
@ -687,32 +689,37 @@ detection, and lossless compression.")
;; The tests need to be run after Borg is installed. ;; The tests need to be run after Borg is installed.
(delete 'check) (delete 'check)
(add-after 'install 'check (add-after 'install 'check
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs tests? #:allow-other-keys)
;; Make the installed package available for the test suite. (when tests?
(add-installed-pythonpath inputs outputs) ;; Make the installed package available for the test suite.
;; The tests should be run in an empty directory. (add-installed-pythonpath inputs outputs)
(mkdir-p "tests") ;; The tests should be run in an empty directory.
(with-directory-excursion "tests" (mkdir-p "tests")
(invoke "py.test" "-v" "--pyargs" "borg.testsuite" "-k" (with-directory-excursion "tests"
(string-append (invoke "py.test" "-v" "--pyargs" "borg.testsuite" "-k"
;; These tests need to write to '/var'. (string-append
"not test_get_cache_dir " ;; These tests need to write to '/var'.
"and not test_get_config_dir " "not test_get_cache_dir "
"and not test_get_keys_dir " "and not test_get_config_dir "
"and not test_get_security_dir " "and not test_get_keys_dir "
;; These tests assume there is a root user in "and not test_get_security_dir "
;; '/etc/passwd'. ;; These tests assume there is a root user in '/etc/passwd'.
"and not test_access_acl " "and not test_access_acl "
"and not test_default_acl " "and not test_default_acl "
"and not test_non_ascii_acl " "and not test_get_item_uid_gid "
"and not test_create_stdin " "and not test_non_ascii_acl "
;; This test needs the unpackaged pytest-benchmark. "and not test_create_content_from_command "
"and not benchmark " "and not test_create_content_from_command_with_failed_command "
;; These tests assume the kernel supports FUSE. "and not test_create_stdin "
"and not test_fuse " ;; We don't need to run benchmarks
"and not test_fuse_allow_damaged_files " "and not benchmark "
"and not test_mount_hardlinks " ;; These tests assume the kernel supports FUSE.
"and not test_readonly_mount "))))) "and not test_fuse "
"and not test_fuse_allow_damaged_files "
"and not test_mount_hardlinks "
"and not test_readonly_mount "
"and not test_fuse_versions_view "
"and not test_migrate_lock_alive"))))))
(add-after 'install 'install-doc (add-after 'install 'install-doc
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
@ -720,10 +727,10 @@ detection, and lossless compression.")
(misc (string-append out "/share/borg/misc"))) (misc (string-append out "/share/borg/misc")))
(for-each (cut install-file <> misc) (for-each (cut install-file <> misc)
'("docs/misc/create_chunker-params.txt" '("docs/misc/create_chunker-params.txt"
"docs/misc/borg-data-flow.png"
"docs/misc/internals-picture.txt" "docs/misc/internals-picture.txt"
"docs/misc/prune-example.txt")) "docs/misc/prune-example.txt"))
(copy-recursively "docs/man" man) (copy-recursively "docs/man" man))))
#t)))
(add-after 'install-docs 'install-shell-completions (add-after 'install-docs 'install-shell-completions
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
@ -735,24 +742,27 @@ detection, and lossless compression.")
(install-file "zsh/_borg" (install-file "zsh/_borg"
(string-append share "/zsh/site-functions")) (string-append share "/zsh/site-functions"))
(install-file "fish/borg.fish" (install-file "fish/borg.fish"
(string-append share "/fish/vendor_completions.d"))) (string-append share "/fish/vendor_completions.d")))))))))
#t))))))
(native-inputs (native-inputs
(list python-cython python-setuptools-scm python-pytest)) (list python-cython python-dateutil python-setuptools-scm python-pytest))
(inputs (inputs
(list acl (list acl
libb2
lz4 lz4
openssl openssl
;; This is the latest version of msgpack accepted by 'setup.py'.
python-msgpack-1.0.2
;; FUSE 3 isn't working well, so we stick with FUSE 2 for now:
;; <https://issues.guix.gnu.org/53407>
python-llfuse python-llfuse
`(,zstd "lib"))) `(,zstd "lib")
xxhash))
(synopsis "Deduplicated, encrypted, authenticated and compressed backups") (synopsis "Deduplicated, encrypted, authenticated and compressed backups")
(description "Borg is a deduplicating backup program. Optionally, it (description "Borg is a deduplicating backup program. Optionally, it
supports compression and authenticated encryption. The main goal of Borg is to supports compression and authenticated encryption. The main goal of Borg is to
provide an efficient and secure way to backup data. The data deduplication provide an efficient and secure way to backup data. The data deduplication
technique used makes Borg suitable for daily backups since only changes are technique used makes Borg suitable for daily backups since only changes are
stored. The authenticated encryption technique makes it suitable for stored. The authenticated encryption technique makes it suitable for storing
storing backups on untrusted computers.") backups on untrusted computers.")
(home-page "https://www.borgbackup.org/") (home-page "https://www.borgbackup.org/")
(license license:bsd-3))) (license license:bsd-3)))
@ -1332,3 +1342,27 @@ tool. It supports the use of remote backup repositories. It can perform
scheduled backups, and has a graphical tool for browsing and extracting the Borg scheduled backups, and has a graphical tool for browsing and extracting the Borg
archives.") archives.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public grsync
(package
(name "grsync")
(version "1.3.0")
(source (origin
(method url-fetch)
(uri (string-append "http://www.opbyte.it/release/"
"grsync-" version ".tar.gz"))
(sha256
(base32
"1z1m782b50x348kgynzf753apy8yszkl31y32y1jsc055skcdixp"))))
(build-system gnu-build-system)
(native-inputs (list intltool pkg-config))
(inputs (list gtk+))
(propagated-inputs (list rsync))
(home-page "http://www.opbyte.it/grsync/")
(synopsis "GTK frontend for rsync")
(description
"Grsync is a simple graphical interface using GTK for the @command{rsync}
command line program. It currently supports only a limited set of the most
important rsync features, but can be used effectively for local directory
synchronization.")
(license license:gpl2)))

67
gnu/packages/base.scm
View file

@ -85,14 +85,14 @@
(define-public hello (define-public hello
(package (package
(name "hello") (name "hello")
(version "2.12") (version "2.12.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/hello/hello-" version (uri (string-append "mirror://gnu/hello/hello-" version
".tar.gz")) ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1ayhp9v4m4rdhjmnl2bq3cibrbqqkgjbl3s7yk2nhlh8vj3ay16g")))) "086vqwk2wl8zfs47sq2xpjc9k066ilmb8z6dn0q6ymwjzlm196cd"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(synopsis "Hello, GNU world: An example GNU package") (synopsis "Hello, GNU world: An example GNU package")
(description (description
@ -934,6 +934,60 @@ with the Linux kernel.")
;; Below are old libc versions, which we use mostly to build locale data in ;; Below are old libc versions, which we use mostly to build locale data in
;; the old format (which the new libc cannot cope with.) ;; the old format (which the new libc cannot cope with.)
(define-public glibc-2.32
(package
(inherit glibc)
(version "2.32")
(source (origin
(inherit (package-source glibc))
(uri (string-append "mirror://gnu/glibc/glibc-" version ".tar.xz"))
(sha256
(base32
"0di848ibffrnwq7g2dvgqrnn4xqhj3h96csn69q4da51ymafl9qn"))
(patches (search-patches
"glibc-skip-c++.patch"
"glibc-ldd-powerpc.patch"
"glibc-ldd-x86_64.patch"
"glibc-dl-cache.patch"
"glibc-hidden-visibility-ldconfig.patch"
"glibc-versioned-locpath.patch"
"glibc-allow-kernel-2.6.32.patch"
"glibc-reinstate-prlimit64-fallback.patch"
"glibc-supported-locales.patch"
"glibc-hurd-clock_t_centiseconds.patch"
"glibc-2.31-hurd-clock_gettime_monotonic.patch"
"glibc-hurd-signal-sa-siginfo.patch"
"glibc-hurd-mach-print.patch"
"glibc-hurd-gettyent.patch"))
#;
(patches (search-patches "glibc-ldd-x86_64.patch"
"glibc-hidden-visibility-ldconfig.patch"
"glibc-versioned-locpath.patch"
"glibc-allow-kernel-2.6.32.patch"
"glibc-reinstate-prlimit64-fallback.patch"
"glibc-supported-locales.patch"
"glibc-hurd-clock_t_centiseconds.patch"
"glibc-hurd-clock_gettime_monotonic.patch"
"glibc-hurd-signal-sa-siginfo.patch"))))
(arguments
(substitute-keyword-arguments (package-arguments glibc)
((#:make-flags flags '())
;; Arrange so that /etc/rpc & co. go to $out/etc.
`(list (string-append "sysconfdir="
(assoc-ref %outputs "out")
"/etc")))
((#:phases phases)
`(modify-phases ,phases
(add-before 'configure 'set-etc-rpc-installation-directory
(lambda* (#:key outputs #:allow-other-keys)
;; Install the rpc data base file under `$out/etc/rpc'.
(let ((out (assoc-ref outputs "out")))
(substitute* "sunrpc/Makefile"
(("^\\$\\(inst_sysconfdir\\)/rpc(.*)$" _ suffix)
(string-append out "/etc/rpc" suffix "\n"))
(("^install-others =.*$")
(string-append "install-others = " out "/etc/rpc\n"))))))))))))
(define-public glibc-2.31 (define-public glibc-2.31
(package (package
@ -1179,6 +1233,15 @@ test environments.")
(make-glibc-utf8-locales glibc))) (make-glibc-utf8-locales glibc)))
;; Packages provided to ease use of binaries linked against the previous libc. ;; Packages provided to ease use of binaries linked against the previous libc.
(define-public glibc-locales-2.32
(package (inherit (make-glibc-locales glibc-2.32))
(name "glibc-locales-2.32")))
(define-public glibc-locales-2.31
(package (inherit (make-glibc-locales glibc-2.31))
(name "glibc-locales-2.31")))
(define-public glibc-locales-2.30
(package (inherit (make-glibc-locales glibc-2.30))
(name "glibc-locales-2.30")))
(define-public glibc-locales-2.29 (define-public glibc-locales-2.29
(package (inherit (make-glibc-locales glibc-2.29)) (package (inherit (make-glibc-locales glibc-2.29))
(name "glibc-locales-2.29"))) (name "glibc-locales-2.29")))

91
gnu/packages/benchmark.scm
View file

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016, 2017, 2021 Marius Bakke <marius@gnu.org> ;;; Copyright © 2016, 2017, 2021 Marius Bakke <marius@gnu.org>
;;; Copyright © 2017 Dave Love <fx@gnu.org> ;;; Copyright © 2017 Dave Love <fx@gnu.org>
;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018–2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2019 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2019 Gábor Boskovits <boskovits@gmail.com> ;;; Copyright © 2019 Gábor Boskovits <boskovits@gmail.com>
@ -63,46 +63,47 @@
(define-public fio (define-public fio
(package (package
(name "fio") (name "fio")
(version "3.29") (version "3.30")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://brick.kernel.dk/snaps/" (uri (string-append "https://brick.kernel.dk/snaps/"
"fio-" version ".tar.bz2")) "fio-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"11k7ksksnb8lcbz0qdc9g7zlzaa0515j7kx4mlhk75sfs43v9zxc")))) "1qjivkisn7dxk8irrb0rglmmdpbnai6n7vindf18ln0j24cc1x56"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:modules (,@%gnu-build-system-modules (list #:modules
(ice-9 textual-ports)) `(,@%gnu-build-system-modules
#:test-target "test" (ice-9 textual-ports))
#:configure-flags '("--disable-native") ;don't generate code for the build CPU #:test-target "test"
#:phases #:configure-flags
(modify-phases %standard-phases #~(list "--disable-native") ;don't generate code for the build CPU
(replace 'configure #:phases
(lambda* (#:key (configure-flags ''()) outputs #:allow-other-keys) #~(modify-phases %standard-phases
;; The configure script doesn't understand some of the (replace 'configure
;; GNU options, so we can't use the stock phase. (lambda* (#:key (configure-flags ''()) #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) ;; The configure script doesn't understand some of the
(apply invoke "./configure" ;; GNU options, so we can't use the stock phase.
(string-append "--prefix=" out) (apply invoke "./configure"
configure-flags)))) (string-append "--prefix=" #$output)
;; The main `fio` executable is fairly small and self contained. configure-flags)))
;; Moving the auxiliary scripts to a separate output saves ~100 MiB ;; The main `fio` executable is fairly small and self contained.
;; on the closure. ;; Moving the auxiliary scripts to a separate output saves ~100 MiB
(add-after 'install 'move-outputs ;; on the closure.
(lambda* (#:key outputs #:allow-other-keys) (add-after 'install 'move-outputs
(let ((oldbin (string-append (assoc-ref outputs "out") "/bin")) (lambda _
(newbin (string-append (assoc-ref outputs "utils") "/bin")) (let ((oldbin (string-append #$output "/bin"))
(script? (lambda* (file #:rest _) (newbin (string-append #$output:utils "/bin"))
(call-with-input-file file (script? (lambda* (file #:rest _)
(lambda (port) (call-with-input-file file
(char=? #\# (peek-char port))))))) (lambda (port)
(mkdir-p newbin) (char=? #\# (peek-char port)))))))
(for-each (lambda (file) (mkdir-p newbin)
(link file (string-append newbin "/" (basename file))) (for-each (lambda (file)
(delete-file file)) (link file (string-append newbin "/" (basename file)))
(find-files oldbin script?)))))))) (delete-file file))
(find-files oldbin script?))))))))
(outputs '("out" "utils")) (outputs '("out" "utils"))
(inputs (inputs
(list libaio python zlib)) (list libaio python zlib))
@ -265,18 +266,25 @@ file metadata operations that can be performed per second.")
(define-public python-locust (define-public python-locust
(package (package
(name "python-locust") (name "python-locust")
(version "2.5.1") (version "2.8.6")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "locust" version)) (uri (pypi-uri "locust" version))
(sha256 (sha256
(base32 (base32
"1516z6z5pikybg7pma2cgxgj3wxaaky7z6d30mxf81wd4krbq16s")))) "1gn13j758j36knlcdyyyggn60rpw98iqdkvl3kjsz34brysic6q1"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
'(#:phases '(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'relax-requirements
(lambda _
(substitute* "setup.py"
(("setuptools_scm<=6.0.1")
"setuptools_scm")
(("Jinja2<3.1.0")
"Jinja2"))))
(replace 'check (replace 'check
(lambda* (#:key tests? #:allow-other-keys) (lambda* (#:key tests? #:allow-other-keys)
(when tests? (when tests?
@ -298,7 +306,10 @@ file metadata operations that can be performed per second.")
;; respectively (see: ;; respectively (see:
;; https://github.com/locustio/locust/issues/1708). ;; https://github.com/locustio/locust/issues/1708).
"not test_custom_exit_code" "not test_custom_exit_code"
"not test_webserver") " and ")))))))) "not test_webserver"
;; This test fails with "AssertionError:
;; 'stopped' != 'stopping'".
"not test_distributed_shape") " and "))))))))
(propagated-inputs (propagated-inputs
(list python-configargparse (list python-configargparse
python-flask python-flask
@ -306,6 +317,7 @@ file metadata operations that can be performed per second.")
python-flask-cors python-flask-cors
python-gevent python-gevent
python-geventhttpclient python-geventhttpclient
python-jinja2
python-msgpack python-msgpack
python-psutil python-psutil
python-pyzmq python-pyzmq
@ -314,8 +326,11 @@ file metadata operations that can be performed per second.")
python-typing-extensions python-typing-extensions
python-werkzeug)) python-werkzeug))
(native-inputs (native-inputs
(list python-mock python-pyquery python-pytest (list python-mock
python-retry python-setuptools-scm)) python-pyquery
python-pytest
python-retry
python-setuptools-scm))
(home-page "https://locust.io/") (home-page "https://locust.io/")
(synopsis "Distributed load testing framework") (synopsis "Distributed load testing framework")
(description "Locust is a performance testing tool that aims to be easy to (description "Locust is a performance testing tool that aims to be easy to

3440
gnu/packages/bioconductor.scm
View file

File diff suppressed because it is too large Load diff

1897
gnu/packages/bioinformatics.scm
View file

File diff suppressed because it is too large Load diff

53
gnu/packages/bittorrent.scm
View file

@ -105,6 +105,11 @@
#:glib-or-gtk-wrap-excluded-outputs '("out") #:glib-or-gtk-wrap-excluded-outputs '("out")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
;; Avoid embedding kernel version for reproducible build
(add-after 'unpack 'remove-kernel-version
(lambda _
(substitute* "third-party/miniupnpc/updateminiupnpcstrings.sh"
(("OS_VERSION=`uname -r`") "OS_VERSION=Guix"))))
(add-after 'install 'move-gui (add-after 'install 'move-gui
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; Move the GUI to its own output, so that "out" doesn't ;; Move the GUI to its own output, so that "out" doesn't
@ -226,7 +231,7 @@ XML-RPC over SCGI.")
(define-public tremc (define-public tremc
(package (package
(name "tremc") (name "tremc")
(version "0.9.2") (version "0.9.3")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -236,8 +241,7 @@ XML-RPC over SCGI.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1fqspp2ckafplahgba54xmx0sjidx1pdzyjaqjhz0ivh98dkx2n5")) "11izsgwj435skkgvw96an6ddcm1hk3ff1gji4ksnidlyv6g6npyv"))))
(patches (search-patches "tremc-fix-decodestring.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; no test suite `(#:tests? #f ; no test suite
@ -256,49 +260,6 @@ Transmission BitTorrent daemon.")
(home-page "https://github.com/tremc/tremc") (home-page "https://github.com/tremc/tremc")
(license l:gpl3+))) (license l:gpl3+)))
(define-public transmission-remote-cli
(package
(name "transmission-remote-cli")
(version "1.7.1")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/fagga/transmission-remote-cli")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"09w9f8vrm61lapin8fmq4rgahr95y3c6wss10g0fgd0kl16f895v"))))
(build-system python-build-system)
(arguments
`(#:python ,python-2 ; only supports Python 2
#:tests? #f ; no test suite
#:phases (modify-phases %standard-phases
;; The software is just a Python script that must be
;; copied into place.
(delete 'build)
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin"))
(man (string-append out "/share/man/man1"))
;; FIXME install zsh completions
(completions (string-append out "/etc/bash_completion.d")))
(install-file "transmission-remote-cli" bin)
(install-file "transmission-remote-cli.1" man)
(install-file
(string-append
"completion/bash/"
"transmission-remote-cli-bash-completion.sh")
completions)))))))
(synopsis "Console client for the Transmission BitTorrent daemon")
(description "Transmission-remote-cli is a console client, with a curses
interface, for the Transmission BitTorrent daemon. This package is no longer
maintained upstream.")
(home-page "https://github.com/fagga/transmission-remote-cli")
(license l:gpl3+)
(properties `((superseded . ,tremc)))))
(define-public aria2 (define-public aria2
(package (package
(name "aria2") (name "aria2")

7
gnu/packages/boost.scm
View file

@ -283,13 +283,6 @@ across a broad spectrum of applications.")
(define-public boost-with-python3 (define-public boost-with-python3
(deprecated-package "boost-with-python3" boost)) (deprecated-package "boost-with-python3" boost))
(define-public boost-with-python2
(package/inherit boost
(name "boost-python2")
(native-inputs
`(("python" ,python-2)
,@(alist-delete "python" (package-native-inputs boost))))))
(define-public boost-static (define-public boost-static
(package (package
(inherit boost) (inherit boost)

59
gnu/packages/bootloaders.scm
View file

@ -517,7 +517,7 @@ tree binary files. These are board description files used by Linux and BSD.")
(define u-boot (define u-boot
(package (package
(name "u-boot") (name "u-boot")
(version "2021.10") (version "2022.04")
(source (origin (source (origin
(patches (patches
(list %u-boot-rockchip-inno-usb-patch (list %u-boot-rockchip-inno-usb-patch
@ -530,19 +530,22 @@ tree binary files. These are board description files used by Linux and BSD.")
"u-boot-" version ".tar.bz2")) "u-boot-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"1m0bvwv8r62s4wk4w3cmvs888dhv9gnfa98dczr4drk2jbhj7ryd")))) "1l5w13dznj0z1ibqv2d6ljx2ma1gnf5x5ay3dqkqwxr6750nbq38"))))
(native-inputs (native-inputs
`(("bc" ,bc) `(("bc" ,bc)
("bison" ,bison) ("bison" ,bison)
("dtc" ,dtc) ("dtc" ,dtc)
("gnutls" ,gnutls)
("flex" ,flex) ("flex" ,flex)
("lz4" ,lz4) ("lz4" ,lz4)
("tinfo" ,ncurses/tinfo)
("perl" ,perl) ("perl" ,perl)
("python" ,python) ("python" ,python)
("python-coverage" ,python-coverage) ("python-coverage" ,python-coverage)
("python-pycryptodomex" ,python-pycryptodomex) ("python-pycryptodomex" ,python-pycryptodomex)
("python-pytest" ,python-pytest) ("python-pytest" ,python-pytest)
("swig" ,swig))) ("swig" ,swig)
("libuuid" ,util-linux "lib")))
(build-system gnu-build-system) (build-system gnu-build-system)
(home-page "https://www.denx.de/wiki/U-Boot/") (home-page "https://www.denx.de/wiki/U-Boot/")
(synopsis "ARM bootloader") (synopsis "ARM bootloader")
@ -911,14 +914,7 @@ to Novena upstream, does not load u-boot.img from the first partition.")
(make-u-boot-package "qemu-riscv64" "riscv64-linux-gnu")) (make-u-boot-package "qemu-riscv64" "riscv64-linux-gnu"))
(define-public u-boot-qemu-riscv64-smode (define-public u-boot-qemu-riscv64-smode
(let ((base (make-u-boot-package "qemu-riscv64_smode" "riscv64-linux-gnu"))) (make-u-boot-package "qemu-riscv64_smode" "riscv64-linux-gnu"))
(package
(inherit base)
(source (origin
(inherit (package-source u-boot))
(patches
(search-patches "u-boot-riscv64-fix-extlinux.patch"
%u-boot-allow-disabling-openssl-patch)))))))
(define-public u-boot-sifive-unleashed (define-public u-boot-sifive-unleashed
(make-u-boot-package "sifive_unleashed" "riscv64-linux-gnu")) (make-u-boot-package "sifive_unleashed" "riscv64-linux-gnu"))
@ -986,6 +982,37 @@ to Novena upstream, does not load u-boot.img from the first partition.")
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(setenv "BL31" (setenv "BL31"
(search-input-file inputs "/bl31.elf")))) (search-input-file inputs "/bl31.elf"))))
(add-after 'unpack 'patch-config
(lambda _
(substitute* "configs/rockpro64-rk3399_defconfig"
(("CONFIG_USB=y") "\
CONFIG_USB=y
CONFIG_AHCI=y
CONFIG_AHCI_PCI=y
CONFIG_SATA=y
CONFIG_SATA_SIL=y
CONFIG_SCSI=y
CONFIG_SCSI_AHCI=y
CONFIG_DM_SCSI=y
"))
(substitute* "include/config_distro_bootcmd.h"
(("\"scsi_need_init=false")
"\"setenv scsi_need_init false")
(("#define BOOTENV_SET_SCSI_NEED_INIT \"scsi_need_init=;")
"#define BOOTENV_SET_SCSI_NEED_INIT \"setenv scsi_need_init;"))
(substitute* "include/configs/rockchip-common.h"
(("#define BOOT_TARGET_DEVICES\\(func\\)")
"
#if CONFIG_IS_ENABLED(CMD_SCSI)
#define BOOT_TARGET_SCSI(func) func(SCSI, scsi, 0)
#else
#define BOOT_TARGET_SCSI(func)
#endif
#define BOOT_TARGET_DEVICES(func)")
(("BOOT_TARGET_NVME\\(func\\) \\\\")
"\
BOOT_TARGET_NVME(func) \\
BOOT_TARGET_SCSI(func) \\"))))
;; Phases do not succeed on the bl31 ELF. ;; Phases do not succeed on the bl31 ELF.
(delete 'strip) (delete 'strip)
(delete 'validate-runpath))))) (delete 'validate-runpath)))))
@ -1104,14 +1131,14 @@ tools, and more.")
(define-public os-prober (define-public os-prober
(package (package
(name "os-prober") (name "os-prober")
(version "1.79") (version "1.80")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://debian/pool/main/o/os-prober/os-prober_" (uri (string-append "mirror://debian/pool/main/o/os-prober/os-prober_"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 "1vhhk0bl2j4910513gn5h3z8nsaavyv3c8764bim2klc0xyk3rmb")))) (base32 "13z3rshgz5xj0328a80wavdimjw925yha9s1ks398sq0kn5w6qw0"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:modules ((guix build gnu-build-system) `(#:modules ((guix build gnu-build-system)
@ -1128,8 +1155,7 @@ tools, and more.")
(substitute* (find-files ".") (substitute* (find-files ".")
(("/usr") (assoc-ref outputs "out"))) (("/usr") (assoc-ref outputs "out")))
(substitute* (find-files "." "50mounted-tests$") (substitute* (find-files "." "50mounted-tests$")
(("mkdir") "mkdir -p")) (("mkdir") "mkdir -p"))))
#t))
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(define (find-files-non-recursive directory) (define (find-files-non-recursive directory)
@ -1160,8 +1186,7 @@ tools, and more.")
(append (find-files-non-recursive (string-append directory "/common")) (append (find-files-non-recursive (string-append directory "/common"))
(find-files-non-recursive (string-append directory "/x86"))))) (find-files-non-recursive (string-append directory "/x86")))))
(list "os-probes" "os-probes/mounted" "os-probes/init" (list "os-probes" "os-probes/mounted" "os-probes/init"
"linux-boot-probes" "linux-boot-probes/mounted")) "linux-boot-probes" "linux-boot-probes/mounted"))))))))
#t))))))
(home-page "https://joeyh.name/code/os-prober") (home-page "https://joeyh.name/code/os-prober")
(synopsis "Detect other operating systems") (synopsis "Detect other operating systems")
(description "os-prober probes disks on the system for other operating (description "os-prober probes disks on the system for other operating

47
gnu/packages/bootstrap.scm
View file

@ -26,6 +26,7 @@
(define-module (gnu packages bootstrap) (define-module (gnu packages bootstrap)
#:use-module (guix licenses) #:use-module (guix licenses)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (guix platform)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix build-system) #:use-module (guix build-system)
@ -312,33 +313,29 @@ or false to signal an error."
(%current-system)))) (%current-system))))
"Return the name of Glibc's dynamic linker for SYSTEM." "Return the name of Glibc's dynamic linker for SYSTEM."
;; See the 'SYSDEP_KNOWN_INTERPRETER_NAMES' cpp macro in libc. ;; See the 'SYSDEP_KNOWN_INTERPRETER_NAMES' cpp macro in libc.
(cond ((string=? system "x86_64-linux") "/lib/ld-linux-x86-64.so.2") (let ((platform (lookup-platform-by-system system)))
((string=? system "i686-linux") "/lib/ld-linux.so.2") (cond
((string=? system "armhf-linux") "/lib/ld-linux-armhf.so.3") ((platform? platform)
((string=? system "mips64el-linux") "/lib/ld.so.1") (platform-glibc-dynamic-linker platform))
((string=? system "i586-gnu") "/lib/ld.so.1")
((string=? system "i686-gnu") "/lib/ld.so.1")
((string=? system "aarch64-linux") "/lib/ld-linux-aarch64.so.1")
((string=? system "powerpc-linux") "/lib/ld.so.1")
((string=? system "powerpc64-linux") "/lib/ld64.so.1")
((string=? system "powerpc64le-linux") "/lib/ld64.so.2")
((string=? system "alpha-linux") "/lib/ld-linux.so.2")
((string=? system "s390x-linux") "/lib/ld64.so.1")
((string=? system "riscv64-linux") "/lib/ld-linux-riscv64-lp64d.so.1")
;; XXX: This one is used bare-bones, without a libc, so add a case ;; TODO: Define those as platforms.
;; here just so we can keep going. ((string=? system "i686-gnu") "/lib/ld.so.1")
((string=? system "arm-elf") "no-ld.so") ((string=? system "powerpc64-linux") "/lib/ld64.so.1")
((string=? system "arm-eabi") "no-ld.so") ((string=? system "alpha-linux") "/lib/ld-linux.so.2")
((string=? system "xtensa-elf") "no-ld.so")
((string=? system "avr") "no-ld.so")
((string=? system "propeller-elf") "no-ld.so")
((string=? system "i686-mingw") "no-ld.so")
((string=? system "x86_64-mingw") "no-ld.so")
((string=? system "vc4-elf") "no-ld.so")
(else (error "dynamic linker name not known for this system" ;; XXX: This one is used bare-bones, without a libc, so add a case
system)))) ;; here just so we can keep going.
((string=? system "arm-elf") "no-ld.so")
((string=? system "arm-eabi") "no-ld.so")
((string=? system "xtensa-elf") "no-ld.so")
((string=? system "avr") "no-ld.so")
((string=? system "propeller-elf") "no-ld.so")
((string=? system "i686-mingw") "no-ld.so")
((string=? system "x86_64-mingw") "no-ld.so")
((string=? system "vc4-elf") "no-ld.so")
(else (error "dynamic linker name not known for this system"
system)))))
;;; ;;;

4
gnu/packages/browser-extensions.scm
View file

@ -51,7 +51,7 @@ supported content to the Kodi media center.")
(define ublock-origin (define ublock-origin
(package (package
(name "ublock-origin") (name "ublock-origin")
(version "1.41.6") (version "1.42.4")
(home-page "https://github.com/gorhill/uBlock") (home-page "https://github.com/gorhill/uBlock")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
@ -62,7 +62,7 @@ supported content to the Kodi media center.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"05flr4jksa3l4cwi0fgkzmzn46rg5znaqd73615lwnxmnpr4va9d")))) "1is55pxnlylcr1pfigwgfn7kcx1rapy1cafdh6g83bdhscgh75g3"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("xpi" "firefox" "chromium")) (outputs '("xpi" "firefox" "chromium"))
(arguments (arguments

4
gnu/packages/build-tools.scm
View file

@ -102,7 +102,7 @@ makes a few sacrifices to acquire fast full and incremental build times.")
(define-public bear (define-public bear
(package (package
(name "bear") (name "bear")
(version "3.0.17") (version "3.0.19")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -111,7 +111,7 @@ makes a few sacrifices to acquire fast full and incremental build times.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0klbk99qphibrp2944w8gn6x1dwwgrbm7f2bh530wjp5h3bpkr45")))) (base32 "05jbcx5m923dg27j3i442hc73hdci5n7vp7a671x1w7bdivgqg96"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:phases (modify-phases %standard-phases `(#:phases (modify-phases %standard-phases

37
gnu/packages/busybox.scm
View file

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 John Darrington <jmd@gnu.org> ;;; Copyright © 2014 John Darrington <jmd@gnu.org>
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018–2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -34,7 +34,7 @@
(define-public busybox (define-public busybox
(package (package
(name "busybox") (name "busybox")
(version "1.33.1") (version "1.34.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -42,22 +42,20 @@
version ".tar.bz2")) version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"0a0dcvsh7nxnhxc5y73fky0z30i9p7r30qfidm2akn0n5fywdkhj")))) "0jfm9fik7nv4w21zqdg830pddgkdjmplmna9yjn9ck1lwn4vsps1"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases '(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'disable-timestamps (add-before 'configure 'disable-timestamps
(lambda _ (lambda _
(setenv "KCONFIG_NOTIMESTAMP" "1") (setenv "KCONFIG_NOTIMESTAMP" "1")))
#t))
(add-before 'configure 'disable-taskset (add-before 'configure 'disable-taskset
;; This feature fails its tests in the build environment, ;; This feature fails its tests in the build environment,
;; was default 'n' until after 1.26.2. ;; was default 'n' until after 1.26.2.
(lambda _ (lambda _
(substitute* "util-linux/taskset.c" (substitute* "util-linux/taskset.c"
(("default y") "default n")) (("default y") "default n"))))
#t))
(replace 'configure (replace 'configure
(lambda* (#:key make-flags #:allow-other-keys) (lambda* (#:key make-flags #:allow-other-keys)
(apply invoke "make" "defconfig" make-flags))) (apply invoke "make" "defconfig" make-flags)))
@ -65,8 +63,7 @@
(lambda _ (lambda _
(substitute* ".config" (substitute* ".config"
(("# CONFIG_INSTALL_NO_USR is not set") (("# CONFIG_INSTALL_NO_USR is not set")
"CONFIG_INSTALL_NO_USR=y")) "CONFIG_INSTALL_NO_USR=y"))))
#t))
(replace 'check (replace 'check
(lambda* (#:key make-flags #:allow-other-keys) (lambda* (#:key make-flags #:allow-other-keys)
(substitute* '("testsuite/du/du-s-works" (substitute* '("testsuite/du/du-s-works"
@ -123,7 +120,7 @@ any small or embedded system.")
(define-public toybox (define-public toybox
(package (package
(name "toybox") (name "toybox")
(version "0.8.6") (version "0.8.7")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -131,17 +128,18 @@ any small or embedded system.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0jq3368jps6jg717ikzhlc6whml3k2s9xy69zpj4i0r35c5ck622")))) "150lvp7hf9ndafvmr42kb8xi86hxjd2zj4binwwhgjw2dwrvy25m"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list #:phases (list #:make-flags
#~(list (string-append "CC=" #$(cc-for-target))
(string-append "HOSTCC=gcc")
(string-append "PREFIX=" #$output))
#:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-before 'configure 'set-environment-variables
(lambda _
(setenv "CC" #$(cc-for-target))
(setenv "HOSTCC" (which "gcc"))))
(replace 'configure (replace 'configure
(lambda _ (invoke "make" "defconfig"))) (lambda* (#:key make-flags #:allow-other-keys)
(apply invoke "make" "defconfig" make-flags)))
(add-before 'check 'fix-or-skip-broken-tests (add-before 'check 'fix-or-skip-broken-tests
(lambda _ (lambda _
;; Some tests expect $USER to magically be the current user. ;; Some tests expect $USER to magically be the current user.
@ -151,11 +149,6 @@ any small or embedded system.")
;; Delete tests that expect a root or 0 user to exist. ;; Delete tests that expect a root or 0 user to exist.
(substitute* "tests/id.test" (substitute* "tests/id.test"
(("^testing .*[ \\(]root.*") "")))) (("^testing .*[ \\(]root.*") ""))))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(invoke "make"
(string-append "PREFIX=" #$output)
"install")))
(add-after 'install 'remove-usr-directory (add-after 'install 'remove-usr-directory
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(delete-file-recursively (string-append #$output "/usr"))))) (delete-file-recursively (string-append #$output "/usr")))))

191
gnu/packages/c.scm
View file

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016, 2018 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017, 2018, 2019, 2021 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016, 2017, 2018, 2019, 2021 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018, 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2020–2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2018, 2019 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2019, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019, 2021 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2019, 2021 Guillaume Le Vaillant <glv@posteo.net>
@ -12,6 +12,8 @@
;;; Copyright © 2020, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2020, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020, 2021 Greg Hogan <code@greghogan.com> ;;; Copyright © 2020, 2021 Greg Hogan <code@greghogan.com>
;;; Copyright © 2021 David Dashyan <mail@davie.li> ;;; Copyright © 2021 David Dashyan <mail@davie.li>
;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com>
;;; Copyright © 2022 (unmatched parenthesis <paren@disroot.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -37,6 +39,7 @@
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system python)
#:use-module (guix build-system trivial) #:use-module (guix build-system trivial)
#:use-module (guix store) #:use-module (guix store)
#:use-module (gnu packages) #:use-module (gnu packages)
@ -143,10 +146,81 @@ compiler while still keeping it small, simple, fast and understandable.")
;; preferred. See http://pcc.ludd.ltu.se/licenses/ for more details. ;; preferred. See http://pcc.ludd.ltu.se/licenses/ for more details.
(license (list license:bsd-2 license:bsd-3)))) (license (list license:bsd-2 license:bsd-3))))
(define-public qbe
(let ((commit "2caa26e388b1c904d2f12fb09f84df7e761d8331")
(revision "1"))
(package
(name "qbe")
(version (git-version "0.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "git://c9x.me/qbe")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1gv03ym0gqrl4wkbhysa82025xwrkr1fg44z814b6vnggwlqgljc"))))
(build-system gnu-build-system)
(arguments
(list #:make-flags
#~(list (string-append "CC=" #$(cc-for-target))
(string-append "PREFIX=" #$output))
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'allow-cross-compilation
(lambda _
(substitute* "Makefile"
(("`uname -m`") #$(or (%current-target-system)
(%current-system))))))
(add-after 'allow-cross-compilation 'use-$CC-for-tests
(lambda _
(substitute* "tools/test.sh"
(("cc=\"cc -no-pie\"") "cc=\"${CC} -no-pie\""))))
(delete 'configure))))
(supported-systems (list "x86_64-linux" "aarch64-linux" "riscv64-linux"))
(synopsis "Simple compiler backend")
(description
"QBE is a small compiler backend using an SSA-based intermediate
language as input.")
(home-page "https://c9x.me/compile/")
(license license:expat))))
(define-public python-pcpp
(package
(name "python-pcpp")
(version "1.30")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/ned14/pcpp")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1rihvlg11nzk70kfzz4i3gi5izcy46w05ismcx04p5j1hlim0brb"))))
(build-system python-build-system)
(arguments
(list
#:phases #~(modify-phases %standard-phases
(add-after 'unpack 'unbundle-ply
(lambda _
(rmdir "pcpp/ply")
(substitute* "setup.py"
(("'pcpp/ply/ply'") "")))))))
(native-inputs (list python-pytest))
(propagated-inputs (list python-ply))
(home-page "https://github.com/ned14/pcpp")
(synopsis "C99 preprocessor written in Python")
(description "This package provides a C99 preprocessor written in pure
Python.")
(license license:bsd-3)))
(define-public libbytesize (define-public libbytesize
(package (package
(name "libbytesize") (name "libbytesize")
(version "2.2") (version "2.6")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -154,14 +228,12 @@ compiler while still keeping it small, simple, fast and understandable.")
"download/" version "/libbytesize-" version ".tar.gz")) "download/" version "/libbytesize-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1aivwypmnqcaj2230pifvf3jcgl5chja8rspkxf0j3480asm8g5r")))) "0h87ryi0mp8msq43h1cna453cqaw5knx1xaggfzm4fxvn8sjpapg"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f)) `(#:tests? #f))
(native-inputs (native-inputs
`(("gettext" ,gettext-minimal) (list gettext-minimal pkg-config python))
("pkg-config" ,pkg-config)
("python" ,python)))
(inputs (inputs
(list mpfr pcre2)) (list mpfr pcre2))
(home-page "https://github.com/storaged-project/libbytesize") (home-page "https://github.com/storaged-project/libbytesize")
@ -248,14 +320,14 @@ whose behaviour is inconsistent across *NIX flavours.")
(define-public libhx (define-public libhx
(package (package
(name "libhx") (name "libhx")
(version "4.2") (version "4.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://inai.de/files/libhx/" (uri (string-append "https://inai.de/files/libhx/"
"libHX-" version ".tar.xz")) "libHX-" version ".tar.xz"))
(sha256 (sha256
(base32 "1ri3sxiw5a8br27j7f20s40kihfvq6mmxzcrx68zydiwyxjvf5jj")))) (base32 "06zkzaya6j3vaafz80qcgn5qcri047003bhmjisv5sbikcw97jqy"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(home-page "https://inai.de/projects/libhx/") (home-page "https://inai.de/projects/libhx/")
(synopsis "C library with common data structures and functions") (synopsis "C library with common data structures and functions")
@ -581,11 +653,33 @@ portability.")
(license (list license:bsd-2 ;all files except... (license (list license:bsd-2 ;all files except...
license:bsd-3)))) ;...the unidef.1 manual page license:bsd-3)))) ;...the unidef.1 manual page
(define-public byacc
(package
(name "byacc")
(version "20220128")
(source (origin
(method url-fetch)
(uri (string-append
"https://invisible-mirror.net/archives/byacc/byacc-"
version ".tgz"))
(sha256
(base32
"173l5pdzgqk2ld6lf0ablii0iiw07sry2vrjfrm4wc99qmf81ha2"))))
(build-system gnu-build-system)
(home-page "https://invisible-island.net/byacc/byacc.html")
(synopsis "Berkeley Yacc LALR parser generator")
(description
"Berkeley Yacc is an LALR(1) parser generator. Yacc reads the grammar
specification from a file and generates an LALR(1) parser for it. The parsers
consist of a set of LALR(1) parsing tables and a driver routine written in the
C programming language.")
(license license:public-domain)))
(define-public aws-c-common (define-public aws-c-common
(package (package
(name "aws-c-common") (name "aws-c-common")
; Update only when updating aws-crt-cpp. ;; Update only when updating aws-crt-cpp.
(version "0.6.11") (version "0.6.20")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -594,12 +688,13 @@ portability.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1v4dhygiynl75y3702lbp9j8kph88j4f2sq39s4lkhn6lmbz5f0f")))) "089grcj58n4xs41kmnpaqpwsalcisjbqqb5yqahxxyfx2lf1j9c9"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:configure-flags '(#:configure-flags
'("-DBUILD_SHARED_LIBS=ON"))) '("-DBUILD_SHARED_LIBS=ON")))
(synopsis "Amazon Web Services core C library") (synopsis "Amazon Web Services core C library")
(supported-systems '("i686-linux" "x86_64-linux"))
(description (description
"This library provides common C99 primitives, configuration, data "This library provides common C99 primitives, configuration, data
structures, and error handling for the @acronym{AWS,Amazon Web Services} SDK.") structures, and error handling for the @acronym{AWS,Amazon Web Services} SDK.")
@ -609,7 +704,7 @@ portability.")
(define-public aws-checksums (define-public aws-checksums
(package (package
(name "aws-checksums") (name "aws-checksums")
; Update only when updating aws-crt-cpp. ;; Update only when updating aws-crt-cpp.
(version "0.1.12") (version "0.1.12")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
@ -638,7 +733,7 @@ with fallback to efficient C99 software implementations.")
(define-public aws-c-event-stream (define-public aws-c-event-stream
(package (package
(name "aws-c-event-stream") (name "aws-c-event-stream")
; Update only when updating aws-crt-cpp. ;; Update only when updating aws-crt-cpp.
(version "0.2.7") (version "0.2.7")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
@ -670,8 +765,8 @@ communication.")
(define-public aws-c-io (define-public aws-c-io
(package (package
(name "aws-c-io") (name "aws-c-io")
; Update only when updating aws-crt-cpp. ;; Update only when updating aws-crt-cpp.
(version "0.10.9") (version "0.10.20")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -680,7 +775,7 @@ communication.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"14rxa3k842fgk43702nz7z9y3clfhvax8j0k93i0c5vg14wj38yp")))) "07l5rfbm1irkigfv51sfygs992af8rxicmay97frbx6z21khdjnr"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:configure-flags '(#:configure-flags
@ -699,8 +794,8 @@ event-driven, asynchronous network application protocols.")
(define-public aws-c-cal (define-public aws-c-cal
(package (package
(name "aws-c-cal") (name "aws-c-cal")
; Update only when updating aws-crt-cpp. ;; Update only when updating aws-crt-cpp.
(version "0.5.12") (version "0.5.17")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -709,7 +804,7 @@ event-driven, asynchronous network application protocols.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"09zqf610x4g2mcjcaf9nh88k6dkw14pi721yr8hxb5rmsx7rlfrb")))) "0gd7xfzv509vcysifzfa8j2rykkc1prhiry7953snblkzm7airm5"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:configure-flags '(#:configure-flags
@ -727,6 +822,34 @@ cryptographic primitives for the @acronym{AWS,Amazon Web Services} SDK.")
(home-page "https://github.com/awslabs/aws-c-cal") (home-page "https://github.com/awslabs/aws-c-cal")
(license license:asl2.0))) (license license:asl2.0)))
(define-public aws-c-sdkutils
(package
(name "aws-c-sdkutils")
;; Update only when updating aws-crt-cpp.
(version "0.1.2")
(source (origin
(method git-fetch)
(uri (git-reference
(url (string-append "https://github.com/awslabs/" name))
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"14wpl3dxwjbbzas44v6m6m3ll89rgz34x9gb140qz624gwzs9v0v"))))
(build-system cmake-build-system)
(arguments
'(#:configure-flags
(list "-DBUILD_SHARED_LIBS=ON"
(string-append "-DCMAKE_PREFIX_PATH="
(assoc-ref %build-inputs "aws-c-common")))))
(propagated-inputs
(list aws-c-common))
(synopsis "Amazon Web Service utility library")
(description "This library provides for parsing and management of profiles
for the @acronym{AWS,Amazon Web Services} SDK.")
(home-page "https://github.com/awslabs/aws-c-sdkutils")
(license license:asl2.0)))
(define-public pcl (define-public pcl
(package (package
(name "pcl") (name "pcl")
@ -749,8 +872,8 @@ low level functionality for coroutines.")
(define-public aws-c-http (define-public aws-c-http
(package (package
(name "aws-c-http") (name "aws-c-http")
; Update only when updating aws-crt-cpp. ;; Update only when updating aws-crt-cpp.
(version "0.6.7") (version "0.6.13")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -759,7 +882,7 @@ low level functionality for coroutines.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1s06bz6w7355ldyhwjidcpbff7591ch4lwwjcj47a6k2kczdmiz4")))) "125glc9b3906r95519zqfbzzz6wj5ib4im2n45yxrigwkkpffbq9"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:configure-flags '(#:configure-flags
@ -779,7 +902,7 @@ specifications.")
(define-public aws-c-compression (define-public aws-c-compression
(package (package
(name "aws-c-compression") (name "aws-c-compression")
; Update only when updating aws-crt-cpp. ;; Update only when updating aws-crt-cpp.
(version "0.2.14") (version "0.2.14")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
@ -808,8 +931,8 @@ currently limited to Huffman encoding and decoding.")
(define-public aws-c-auth (define-public aws-c-auth
(package (package
(name "aws-c-auth") (name "aws-c-auth")
; Update only when updating aws-crt-cpp. ;; Update only when updating aws-crt-cpp.
(version "0.6.4") (version "0.6.11")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -818,7 +941,7 @@ currently limited to Huffman encoding and decoding.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"120p69lj279yq3d2b81f45kgfrvf32j6m7s03m8hh27w8yd4vbfp")) "0frfnbifkrib9l68mj92a3g1x8xc8hpdlzbga2a801zgf2flx4fy"))
(patches (patches
(search-patches (search-patches
"aws-c-auth-install-private-headers.patch")))) "aws-c-auth-install-private-headers.patch"))))
@ -830,7 +953,7 @@ currently limited to Huffman encoding and decoding.")
(assoc-ref %build-inputs "aws-c-common")) (assoc-ref %build-inputs "aws-c-common"))
"-DENABLE_NET_TESTS=OFF"))) "-DENABLE_NET_TESTS=OFF")))
(propagated-inputs (propagated-inputs
(list aws-c-cal aws-c-common aws-c-http aws-c-io)) (list aws-c-cal aws-c-common aws-c-http aws-c-io aws-c-sdkutils))
(synopsis "Amazon Web Services client-side authentication library") (synopsis "Amazon Web Services client-side authentication library")
(description (description
"This library provides a C99 implementation for AWS client-side "This library provides a C99 implementation for AWS client-side
@ -841,8 +964,8 @@ authentication.")
(define-public aws-c-s3 (define-public aws-c-s3
(package (package
(name "aws-c-s3") (name "aws-c-s3")
; Update only when updating aws-crt-cpp. ;; Update only when updating aws-crt-cpp.
(version "0.1.26") (version "0.1.38")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -851,7 +974,7 @@ authentication.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0gaxnwwk0jbvkgjnxcgchq13xmn7jk5vjvjsps6b0vaz6bf12wv8")))) "0n2y8hzb1bx3vnzlpb5hsav18dg33pwav0mpji6krz98y2l8msya"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:configure-flags '(#:configure-flags
@ -860,7 +983,7 @@ authentication.")
(assoc-ref %build-inputs "aws-c-common")) (assoc-ref %build-inputs "aws-c-common"))
"-DENABLE_NET_TESTS=OFF"))) "-DENABLE_NET_TESTS=OFF")))
(propagated-inputs (propagated-inputs
(list aws-c-auth aws-c-http)) (list aws-c-auth aws-c-http aws-checksums))
(synopsis "Amazon Web Services client library for Amazon S3") (synopsis "Amazon Web Services client library for Amazon S3")
(description (description
"This library provides a C99 client implementation of the Simple Storage "This library provides a C99 client implementation of the Simple Storage
@ -871,8 +994,8 @@ Service (S3) protocol for object storage.")
(define-public aws-c-mqtt (define-public aws-c-mqtt
(package (package
(name "aws-c-mqtt") (name "aws-c-mqtt")
; Update only when updating aws-crt-cpp. ;; Update only when updating aws-crt-cpp.
(version "0.7.8") (version "0.7.10")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -881,7 +1004,7 @@ Service (S3) protocol for object storage.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"19j6nw2v36c4yff4p0fbf0748s06fd5r9cp2yakry9ybn1ada99c")))) "0qmzx8b4wcsq9s99q2zrhx1s3jdmfy8zs16qys9bqv45gspi3ybr"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:configure-flags '(#:configure-flags

6
gnu/packages/ccache.scm
View file

@ -2,7 +2,7 @@
;;; Copyright © 2014, 2015, 2016, 2018 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014, 2015, 2016, 2018 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2021 Greg Hogan <code@greghogan.com> ;;; Copyright © 2021, 2022 Greg Hogan <code@greghogan.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -32,14 +32,14 @@
(define-public ccache (define-public ccache
(package (package
(name "ccache") (name "ccache")
(version "4.5.1") (version "4.6")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/ccache/ccache/releases/download/v" (uri (string-append "https://github.com/ccache/ccache/releases/download/v"
version "/ccache-" version ".tar.xz")) version "/ccache-" version ".tar.xz"))
(sha256 (sha256
(base32 "05wmflxdc8h3d00gr3kilr5dmrqxj6lcmq9ic575ydi60fz6w62i")))) (base32 "1sa576ff8hc1swq55mdfp5gsnpys276gf37n83k6k49myihbharx"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (list perl ; for test/run (native-inputs (list perl ; for test/run
(@ (gnu packages base) which))) (@ (gnu packages base) which)))

9
gnu/packages/certs.scm
View file

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016, 2017, 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016-2017, 2021-2022 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
@ -169,7 +169,12 @@ that was originally contributed to Debian.")
'(set-paths install-locale unpack)) '(set-paths install-locale unpack))
(add-after 'unpack 'install (add-after 'unpack 'install
(lambda _ (lambda _
(let ((certsdir (string-append %output "/etc/ssl/certs/"))) ;; TODO: On the next rebuild cycle, remove references to
;; '%output' and '%outputs'.
(let ((certsdir (string-append ,(if (%current-target-system)
'(assoc-ref %outputs "out")
'%output)
"/etc/ssl/certs/")))
(with-directory-excursion "nss/lib/ckfw/builtins/" (with-directory-excursion "nss/lib/ckfw/builtins/"
(unless (file-exists? "blacklist.txt") (unless (file-exists? "blacklist.txt")
(call-with-output-file "blacklist.txt" (const #t))) (call-with-output-file "blacklist.txt" (const #t)))

512
gnu/packages/check.scm
View file

@ -16,7 +16,7 @@
;;; Copyright © 2016 Troy Sankey <sankeytms@gmail.com> ;;; Copyright © 2016 Troy Sankey <sankeytms@gmail.com>
;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org> ;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org>
;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2016–2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2016–2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017, 2018 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2017, 2018 Arun Isaac <arunisaac@systemreboot.net>
@ -818,19 +818,8 @@ but it works for any C/C++ project.")
(description (description
"Parameterized is a Python library that aims to fix parameterized testing "Parameterized is a Python library that aims to fix parameterized testing
for every Python test framework. It supports nose, py.test, and unittest.") for every Python test framework. It supports nose, py.test, and unittest.")
(properties `((python2-variant . ,(delay python2-parameterized))))
(license license:bsd-2))) (license license:bsd-2)))
(define-public python2-parameterized
(let ((base (package-with-python2 (strip-python2-variant
python-parameterized))))
(package/inherit
base
(source
(origin
(inherit (package-source base))
(patches (search-patches "python2-parameterized-docstring-test.patch")))))))
(define-public python-minimock (define-public python-minimock
(package (package
(name "python-minimock") (name "python-minimock")
@ -849,9 +838,6 @@ for every Python test framework. It supports nose, py.test, and unittest.")
doctest.") doctest.")
(license license:expat))) (license license:expat)))
(define-public python2-minimock
(package-with-python2 python-minimock))
(define-public python-mock (define-public python-mock
(package (package
(name "python-mock") (name "python-mock")
@ -876,18 +862,8 @@ doctest.")
of your system under test with mock objects and make assertions about how they of your system under test with mock objects and make assertions about how they
have been used. This library is now part of Python (since Python 3.3), have been used. This library is now part of Python (since Python 3.3),
available via the @code{unittest.mock} module.") available via the @code{unittest.mock} module.")
(properties `((python2-variant . ,(delay python2-mock))))
(license license:expat))) (license license:expat)))
(define-public python2-mock
(let ((base (package-with-python2
(strip-python2-variant python-mock))))
(package/inherit base
(propagated-inputs
`(("python2-functools32" ,python2-functools32)
("python2-funcsigs" ,python2-funcsigs)
,@(package-propagated-inputs base))))))
;;; This package is unmaintained (see the note at the top of doc/index.rst). ;;; This package is unmaintained (see the note at the top of doc/index.rst).
(define-public python-nose (define-public python-nose
(package (package
@ -911,17 +887,7 @@ available via the @code{unittest.mock} module.")
(synopsis "Python testing library") (synopsis "Python testing library")
(description (description
"Nose extends the unittest library to make testing easier.") "Nose extends the unittest library to make testing easier.")
(license license:lgpl2.0+) (license license:lgpl2.0+)))
(properties `((python2-variant . ,(delay python2-nose))))))
(define-public python2-nose
(let ((base (package-with-python2
(strip-python2-variant python-nose))))
(package/inherit base
(arguments (substitute-keyword-arguments (package-arguments base)
((#:phases phases)
`(modify-phases ,phases
(delete 'invoke-2to3))))))))
(define-public python-nose2 (define-public python-nose2
(package (package
@ -947,9 +913,6 @@ better plugin api, being easier for users to configure, and simplifying internal
interfaces and processes.") interfaces and processes.")
(license license:bsd-2))) (license license:bsd-2)))
(define-public python2-nose2
(package-with-python2 python-nose2))
(define-public python-unittest2 (define-public python-unittest2
(package (package
(name "python-unittest2") (name "python-unittest2")
@ -980,9 +943,6 @@ interfaces and processes.")
standard library.") standard library.")
(license license:psfl))) (license license:psfl)))
(define-public python2-unittest2
(package-with-python2 python-unittest2))
(define-public python-pytest (define-public python-pytest
(package (package
(name "python-pytest") (name "python-pytest")
@ -1043,77 +1003,17 @@ standard library.")
"Pytest is a testing tool that provides auto-discovery of test modules "Pytest is a testing tool that provides auto-discovery of test modules
and functions, detailed info on failing assert statements, modular fixtures, and functions, detailed info on failing assert statements, modular fixtures,
and many external plugins.") and many external plugins.")
(license license:expat) (license license:expat)))
(properties `((python2-variant . ,(delay python2-pytest))))))
(define-public python-pytest-6 python-pytest) (define-public python-pytest-6 python-pytest)
;; Pytest 4.x are the last versions that support Python 2.
(define-public python2-pytest
(package
(inherit (strip-python2-variant python-pytest))
(name "python2-pytest")
(version "4.6.11")
(source (origin
(method url-fetch)
(uri (pypi-uri "pytest" version))
(sha256
(base32
"0ls3pqr86xgif6bphsb6wrww9r2vc7p7a2naq8zcq8115wwq5yjh"))))
(build-system python-build-system)
(arguments
`(#:python ,python-2
,@(package-arguments python-pytest)))
(propagated-inputs
`(("python-atomicwrites" ,python2-atomicwrites)
("python-attrs" ,python2-attrs-bootstrap)
("python-funcsigs" ,python2-funcsigs)
("python-importlib-metadata" ,python2-importlib-metadata-bootstrap)
("python-more-itertools" ,python2-more-itertools)
("python-packaging" ,python2-packaging-bootstrap)
("python-pathlib2" ,python2-pathlib2)
("python-pluggy" ,python2-pluggy)
("python-py" ,python2-py)
("python-six" ,python2-six-bootstrap)
("python-wcwidth" ,python2-wcwidth)))
(native-inputs
`(("bash" ,bash) ;tests require 'compgen'
("python-hypothesis" ,python2-hypothesis)
("python-nose" ,python2-nose)
("python-mock" ,python2-mock)
("python-pytest" ,python2-pytest-bootstrap)
("python-setuptools-scm" ,python2-setuptools-scm)))))
(define-public python-pytest-bootstrap (define-public python-pytest-bootstrap
(package (package
(inherit (strip-python2-variant python-pytest)) (inherit python-pytest)
(name "python-pytest-bootstrap") (name "python-pytest-bootstrap")
(native-inputs (list python-iniconfig python-setuptools-scm (native-inputs (list python-iniconfig python-setuptools-scm
python-toml)) python-toml))
(arguments `(#:tests? #f)) (arguments `(#:tests? #f))))
(properties `((python2-variant . ,(delay python2-pytest-bootstrap))))))
(define-public python2-pytest-bootstrap
(hidden-package
(package/inherit
python2-pytest
(name "python2-pytest-bootstrap")
(arguments
(substitute-keyword-arguments (package-arguments python2-pytest)
((#:tests? _ #f) #f)))
(native-inputs
`(("python-setuptools-scm" ,python2-setuptools-scm)))
(propagated-inputs
`(("python-atomicwrites" ,python2-atomicwrites)
("python-attrs" ,python2-attrs-bootstrap)
("python-funcsigs" ,python2-funcsigs-bootstrap)
("python-importlib-metadata" ,python2-importlib-metadata-bootstrap)
("python-more-itertools" ,python2-more-itertools)
("python-packaging" ,python2-packaging-bootstrap)
("python-pathlib2" ,python2-pathlib2-bootstrap)
("python-pluggy" ,python2-pluggy-bootstrap)
("python-py" ,python2-py)
("python-wcwidth" ,python2-wcwidth))))))
(define-public python-pytest-assume (define-public python-pytest-assume
(package (package
@ -1150,13 +1050,13 @@ following improvements:
(define-public python-pytest-cov (define-public python-pytest-cov
(package (package
(name "python-pytest-cov") (name "python-pytest-cov")
(version "2.8.1") (version "3.0.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "pytest-cov" version)) (uri (pypi-uri "pytest-cov" version))
(sha256 (sha256
(base32 "0avzlk9p4nc44k7lpx9109dybq71xqnggxb9f4hp0l64pbc44ryc")))) (base32 "0w6lfv8gc1lxmnvsz7mq5z9shxac5zz6s9mwrai108kxc6qzbw77"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -1178,9 +1078,6 @@ distributed testing in both @code{load} and @code{each} modes. It also
supports coverage of subprocesses.") supports coverage of subprocesses.")
(license license:expat))) (license license:expat)))
(define-public python2-pytest-cov
(package-with-python2 python-pytest-cov))
(define-public python-pytest-httpserver (define-public python-pytest-httpserver
(package (package
(name "python-pytest-httpserver") (name "python-pytest-httpserver")
@ -1242,6 +1139,47 @@ tests. Tests can be rerun in a specific order by passing a seed value
reported in a previous test run.") reported in a previous test run.")
(license license:expat))) (license license:expat)))
(define-public python-pytest-randomly
(package
(name "python-pytest-randomly")
(version "3.11.0")
(source (origin
(method git-fetch) ;no tests in pypi archive
(uri (git-reference
(url "https://github.com/pytest-dev/pytest-randomly")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"1sjgq49g8f8973vhmzrim79b6wz29a765n99azjk1maimqh7mmik"))))
(build-system python-build-system)
(arguments
(list
#:phases
#~(modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
;; The tests validating ordering fail, as well as as two
;; others, for unknown reasons (see:
;; https://github.com/pytest-dev/pytest-randomly/issues/454).
(invoke "pytest" "-vv" "-k"
(string-append
"not reordered "
"and not test_it_runs_before_stepwise "
"and not test_entrypoint_injection"))))))))
(native-inputs (list python-coverage
python-factory-boy
python-faker
python-numpy
python-pytest-xdist))
(propagated-inputs (list python-importlib-metadata python-pytest))
(home-page "https://github.com/pytest-dev/pytest-randomly")
(synopsis "Pytest plugin to randomly order tests")
(description "This is a Pytest plugin to randomly order tests and control
Python's @code{random.seed}.")
(license license:expat)))
(define-public python-pytest-runner (define-public python-pytest-runner
(package (package
(name "python-pytest-runner") (name "python-pytest-runner")
@ -1274,25 +1212,6 @@ reported in a previous test run.")
@file{setup.py} files can use to run tests.") @file{setup.py} files can use to run tests.")
(license license:expat))) (license license:expat)))
(define-public python2-pytest-runner
(package-with-python2 python-pytest-runner))
;; python-bleach 3.1.0 requires this ancient version of pytest-runner.
;; Remove once no longer needed.
(define-public python-pytest-runner-2
(package
(inherit python-pytest-runner)
(version "2.12.2")
(source (origin
(method url-fetch)
(uri (pypi-uri "pytest-runner" version))
(sha256
(base32
"11ivjj9hfphkv4yfb2g74av4yy86y8gcbf7gbif0p1hcdfnxg3w6"))))))
(define-public python2-pytest-runner-2
(package-with-python2 python-pytest-runner-2))
(define-public python-pytest-lazy-fixture (define-public python-pytest-lazy-fixture
(package (package
(name "python-pytest-lazy-fixture") (name "python-pytest-lazy-fixture")
@ -1364,29 +1283,8 @@ around the patching API provided by the @code{mock} package, but with the
benefit of not having to worry about undoing patches at the end of a test. benefit of not having to worry about undoing patches at the end of a test.
The mocker fixture has the same API as @code{mock.patch}, supporting the The mocker fixture has the same API as @code{mock.patch}, supporting the
same arguments.") same arguments.")
(properties `((python2-variant . ,(delay python2-pytest-mock))))
(license license:expat))) (license license:expat)))
(define-public python2-pytest-mock
(let ((base (package-with-python2
(strip-python2-variant python-pytest-mock))))
(package/inherit base
(version "1.10.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pytest-mock" version))
(sha256
(base32
"1i5mg3ff1qk0wqfcxfz60hwy3q5dskdp36i10ckigkzffg8hc3ad"))))
(arguments
`(#:python ,python-2))
(native-inputs
`(("python2-setuptools-scm" ,python2-setuptools-scm)))
(propagated-inputs
`(("python2-mock" ,python2-mock)
("python2-pytest" ,python2-pytest))))))
(define-public python-pytest-xdist (define-public python-pytest-xdist
(package (package
(name "python-pytest-xdist") (name "python-pytest-xdist")
@ -1422,6 +1320,20 @@ program code to a remote location, executes there, and then syncs the
result back.") result back.")
(license license:expat))) (license license:expat)))
(define-public python-pytest-xdist-next
(package/inherit python-pytest-xdist
(name "python-pytest-xdist")
(version "2.5.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pytest-xdist" version))
(sha256
(base32
"1psf5dqxvc38qzxvc305mkg5xpdmdkbkkfiyqlmdnkgh7z5dx025"))))
(propagated-inputs (list python-execnet python-pytest
python-pytest-forked-next))))
(define-public python-pytest-timeout (define-public python-pytest-timeout
(package (package
(name "python-pytest-timeout") (name "python-pytest-timeout")
@ -1491,6 +1403,23 @@ can be useful to isolate tests against undesirable global environment
side-effects (such as setting environment variables).") side-effects (such as setting environment variables).")
(license license:expat))) (license license:expat)))
(define-public python-pytest-forked-next
(package
(inherit python-pytest-forked)
(name "python-pytest-forked")
(version "1.4.0")
(source
(origin
(method git-fetch) ;for tests
(uri (git-reference
(url "https://github.com/pytest-dev/pytest-forked")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0j9bbjny7h3b4fig6l26f26c697r67mm62fzdd9m9rqyy2bmnqjs"))))
(native-inputs (list python-pytest-bootstrap python-setuptools-scm))))
(define-public python-scripttest (define-public python-scripttest
(package (package
(name "python-scripttest") (name "python-scripttest")
@ -1784,9 +1713,6 @@ library to determine which lines are executable, and which have been
executed.") executed.")
(license license:bsd-3))) (license license:bsd-3)))
(define-public python2-coverage
(package-with-python2 python-coverage))
(define-public python-pytest-asyncio (define-public python-pytest-asyncio
(package (package
(name "python-pytest-asyncio") (name "python-pytest-asyncio")
@ -1847,9 +1773,6 @@ and @code{nose2-cov}. It is useful for developing coverage plugins for these
testing frameworks.") testing frameworks.")
(license license:expat))) (license license:expat)))
(define-public python2-cov-core
(package-with-python2 python-cov-core))
(define-public python-codecov (define-public python-codecov
(package (package
(name "python-codecov") (name "python-codecov")
@ -1938,9 +1861,6 @@ tools for mocking system commands and recording calls to those.")
(home-page "https://github.com/trentm/testlib") (home-page "https://github.com/trentm/testlib")
(license license:expat))) (license license:expat)))
(define-public python2-testlib
(package-with-python2 python-testlib))
;;; The software provided by this package was integrated into pytest 2.8. ;;; The software provided by this package was integrated into pytest 2.8.
(define-public python-pytest-cache (define-public python-pytest-cache
(package (package
@ -1961,9 +1881,6 @@ the last py.test invocation.")
(home-page "https://bitbucket.org/hpk42/pytest-cache/") (home-page "https://bitbucket.org/hpk42/pytest-cache/")
(license license:expat))) (license license:expat)))
(define-public python2-pytest-cache
(package-with-python2 python-pytest-cache))
(define-public python-pytest-localserver (define-public python-pytest-localserver
(package (package
(name "python-pytest-localserver") (name "python-pytest-localserver")
@ -2034,9 +1951,6 @@ normally the case.")
(home-page "https://github.com/untitaker/pytest-subtesthack/") (home-page "https://github.com/untitaker/pytest-subtesthack/")
(license license:unlicense))) (license license:unlicense)))
(define-public python2-pytest-subtesthack
(package-with-python2 python-pytest-subtesthack))
(define-public python-pytest-sugar (define-public python-pytest-sugar
(package (package
(name "python-pytest-sugar") (name "python-pytest-sugar")
@ -2080,36 +1994,23 @@ instantly.")
much larger range of examples than you would ever want to write by hand. It’s much larger range of examples than you would ever want to write by hand. It’s
based on the Haskell library, Quickcheck, and is designed to integrate based on the Haskell library, Quickcheck, and is designed to integrate
seamlessly into your existing Python unit testing work flow.") seamlessly into your existing Python unit testing work flow.")
(home-page "https://github.com/HypothesisWorks/hypothesis-python") (home-page "https://github.com/HypothesisWorks/hypothesis")
(license license:mpl2.0) (license license:mpl2.0)))
(properties `((python2-variant . ,(delay python2-hypothesis))))))
(define-public python-hypothesis-6.23 ;;; TODO: Make the default python-hypothesis in the next rebuild cycle.
(define-public python-hypothesis-next
(package (package
(inherit python-hypothesis) (inherit python-hypothesis)
(version "6.23.4") (version "6.43.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "hypothesis" version)) (uri (pypi-uri "hypothesis" version))
(sha256 (sha256
(base32 (base32
"0wp8i9qmd5wl1sq1l2b97fgliyk5fyphssl6j7q5qn5zjlfgi4qs")))))) "0d67dlc5a47i48fxzmji2mnybzby0h1wdscmj54555fghcyp1045"))))
(propagated-inputs
;; This is the last version of Hypothesis that supports Python 2. (modify-inputs (package-propagated-inputs python-hypothesis)
(define-public python2-hypothesis (append python-pytest))))) ;to satisfy the sanity-check phase
(let ((hypothesis (package-with-python2
(strip-python2-variant python-hypothesis))))
(package (inherit hypothesis)
(version "4.57.1")
(source (origin
(method url-fetch)
(uri (pypi-uri "hypothesis" version))
(sha256
(base32
"183gpxbfcdhdqzlahkji5a71n6lmvgqsbkcb0ihqad51n2j6jhrw"))))
(propagated-inputs
(modify-inputs (package-propagated-inputs hypothesis)
(prepend python2-enum34))))))
(define-public python-hypothesmith (define-public python-hypothesmith
(package (package
@ -2159,6 +2060,114 @@ style test suites, summarizing their results, and providing indication of
failures.") failures.")
(license license:ncsa))) (license license:ncsa)))
;;; This is marked as a bootstrap package because it propagates bootstrapped
;;; versions of jaraco-context and jaraco-functools.
(define-public python-pytest-enabler-bootstrap
(hidden-package
(package
(name "python-pytest-enabler-bootstrap")
(version "1.2.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pytest-enabler" version))
(sha256
(base32 "023ymm0r2gpn5q7aikvx567s507j0zk46w41w6gxb69c688zgs73"))))
(build-system python-build-system)
(arguments (list #:tests? #f))
(propagated-inputs
(list python-jaraco-context-bootstrap
python-jaraco-functools-bootstrap
python-toml))
(native-inputs (list python-setuptools-scm))
(home-page "https://github.com/jaraco/pytest-enabler")
(synopsis "Enable installed pytest plugins")
(description "Enable installed pytest plugins")
(license license:expat))))
(define-public python-pytest-enabler
(package/inherit python-pytest-enabler-bootstrap
(arguments
(substitute-keyword-arguments
(package-arguments python-pytest-enabler-bootstrap)
((#:tests? _ #f)
#t)
((#:phases phases #~%standard-phases)
#~(modify-phases #$phases
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "python" "-m" "pytest" "-vv" "tests"))))))))
(propagated-inputs
(modify-inputs (package-propagated-inputs python-pytest-enabler-bootstrap)
(replace "python-jaraco-context-bootstrap" python-jaraco-context)
(replace "python-jaraco-functools-bootstrap" python-jaraco-functools)))
(native-inputs
(modify-inputs (package-native-inputs python-pytest-enabler-bootstrap)
(append python-pytest
python-pytest-black
python-pytest-checkdocs
python-pytest-cov
python-pytest-flake8
python-pytest-mypy
python-types-toml)))
(properties (alist-delete 'hidden?
(package-properties
python-pytest-enabler-bootstrap)))))
(define-public python-pytest-freezegun
(package
(name "python-pytest-freezegun")
(version "0.4.2")
(source (origin
;; The test suite is not included in the PyPI archive.
(method git-fetch)
(uri (git-reference
(url "https://github.com/ktosiek/pytest-freezegun")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"10c4pbh03b4s1q8cjd75lr0fvyf9id0zmdk29566qqsmaz28npas"))))
(build-system python-build-system)
(arguments
(list
#:phases
#~(modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "pytest" "-vv")))))))
(propagated-inputs (list python-freezegun python-pytest))
(native-inputs (list unzip))
(home-page "https://github.com/ktosiek/pytest-freezegun")
(synopsis "Pytest plugin to freeze time in test fixtures")
(description "The @code{pytest-freezegun} plugin wraps tests and fixtures
with @code{freeze_time}, which allows to control (i.e., freeze) the time seen
by the test.")
(license license:expat)))
(define-public python-pytest-mypy
(package
(name "python-pytest-mypy")
(version "0.9.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pytest-mypy" version))
(sha256
(base32 "0p5bd4r4gbwk1h7mpx1jkhdwkckapfz24bp9x5mmqb610ps3pylz"))))
(build-system python-build-system)
(native-inputs (list python-setuptools-scm))
(propagated-inputs
(list python-attrs python-filelock python-mypy python-pytest))
(home-page "https://github.com/dbader/pytest-mypy")
(synopsis "Mypy static type checker plugin for Pytest")
(description "@code{pytest-mypi} is a static type checker plugin for
Pytest that runs the mypy static type checker on your source files as part of
a Pytest test execution.")
(license license:expat)))
(define-public python-pytest-pep8 (define-public python-pytest-pep8
(package (package
(name "python-pytest-pep8") (name "python-pytest-pep8")
@ -2192,8 +2201,63 @@ failures.")
(description "Pytest plugin for checking PEP8 compliance.") (description "Pytest plugin for checking PEP8 compliance.")
(license license:expat))) (license license:expat)))
(define-public python2-pytest-pep8 (define-public python-pytest-perf
(package-with-python2 python-pytest-pep8)) (package
(name "python-pytest-perf")
(version "0.12.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/jaraco/pytest-perf")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"05mgknvrmyz1kmkgw8jzvisavc68wz1g2wxv69i6xvzgqxf17m9f"))))
(build-system python-build-system)
(arguments
(list
#:phases
#~(modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "pytest" "-k"
(string-append
;; Do not test the myproject.toml build as it tries to pull
;; dependencies from the internet.
"not project "
;; The benchmark test attempts to install the
;; package, failing to pull its dependencies from the
;; network.
"and not BenchmarkRunner "
;; The upstream_url test requires networking.
"and not upstream_url"))))))))
(native-inputs
(list python-pytest
python-pytest-black
python-pytest-checkdocs
python-pytest-cov
python-pytest-enabler
python-pytest-flake8
python-pytest-mypy))
(propagated-inputs
(list python-jaraco-context
python-jaraco-functools
python-more-itertools
python-packaging
python-pip-run
python-tempora))
(home-page "https://github.com/jaraco/pytest-perf")
(synopsis "Pytest plugin for performance testing")
(description "@code{pytest-perf} makes it easy to compare works by
creating two installs, the control and the experiment, and measuring the
performance of some Python code against each. Under the hood, it uses the
@command{pip-run} command to install from the upstream main
branch (e.g. https://github.com/jaraco/pytest-perf) for the control and from
@file{.} for the experiment. It then runs each of the experiments against
each of the environments.")
(license license:expat)))
(define-public python-pytest-flakes (define-public python-pytest-flakes
(package (package
@ -2226,9 +2290,6 @@ failures.")
(description "Pytest plugin for checking Python source code with pyflakes.") (description "Pytest plugin for checking Python source code with pyflakes.")
(license license:expat))) (license license:expat)))
(define-public python2-pytest-flakes
(package-with-python2 python-pytest-flakes))
(define-public python-coverage-test-runner (define-public python-coverage-test-runner
(package (package
(name "python-coverage-test-runner") (name "python-coverage-test-runner")
@ -2259,9 +2320,6 @@ unit tests and failing them if the unit test module does not exercise all
statements in the module it tests.") statements in the module it tests.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public python2-coverage-test-runner
(package-with-python2 python-coverage-test-runner))
(define-public python-pylint (define-public python-pylint
(package (package
(name "python-pylint") (name "python-pylint")
@ -2287,9 +2345,10 @@ statements in the module it tests.")
(delete-file "tests/primer/test_primer_external.py") (delete-file "tests/primer/test_primer_external.py")
(delete-file "tests/testutils/test_package_to_lint.py") (delete-file "tests/testutils/test_package_to_lint.py")
(setenv "HOME" "/tmp") (setenv "HOME" "/tmp")
(invoke "pytest" "-k" "test_functional"))))))) (invoke "pytest" "-k" "test_functional"
"-n" (number->string (parallel-job-count)))))))))
(native-inputs (native-inputs
(list python-pytest)) (list python-pytest python-pytest-xdist))
(propagated-inputs (propagated-inputs
(list python-astroid (list python-astroid
python-isort python-isort
@ -2332,9 +2391,6 @@ cases. Since they are TestCase subclasses, they work with other test suites tha
recognize TestCases.") recognize TestCases.")
(license license:bsd-2))) (license license:bsd-2)))
(define-public python2-python-paramunittest
(package-with-python2 python-paramunittest))
(define-public python-pytest-warnings (define-public python-pytest-warnings
(package (package
(name "python-pytest-warnings") (name "python-pytest-warnings")
@ -2355,14 +2411,7 @@ recognize TestCases.")
"Python-pytest-warnings is a pytest plugin to list Python warnings in "Python-pytest-warnings is a pytest plugin to list Python warnings in
pytest report.") pytest report.")
(license license:expat) (license license:expat)
(properties `((python2-variant . ,(delay python2-pytest-warnings)) (properties `((superseded unquote python-pytest)))))
;; This package is part of pytest as of version 3.1.0.
(superseded . ,python-pytest)))))
(define-public python2-pytest-warnings
(package (inherit (package-with-python2
(strip-python2-variant python-pytest-warnings)))
(properties `((superseded . ,python2-pytest)))))
(define-public python-pytest-capturelog (define-public python-pytest-capturelog
(package (package
@ -2384,9 +2433,6 @@ pytest report.")
"Python-pytest-catchlog is a pytest plugin to catch log messages.") "Python-pytest-catchlog is a pytest plugin to catch log messages.")
(license license:expat))) (license license:expat)))
(define-public python2-pytest-capturelog
(package-with-python2 python-pytest-capturelog))
(define-public python-pytest-catchlog (define-public python-pytest-catchlog
(package (package
(name "python-pytest-catchlog") (name "python-pytest-catchlog")
@ -2410,9 +2456,6 @@ pytest report.")
a fork of pytest-capturelog.") a fork of pytest-capturelog.")
(license license:expat))) (license license:expat)))
(define-public python2-pytest-catchlog
(package-with-python2 python-pytest-catchlog))
(define-public python-nosexcover (define-public python-nosexcover
(package (package
(name "python-nosexcover") (name "python-nosexcover")
@ -2436,9 +2479,6 @@ It will honor all the options you pass to the Nose coverage plugin,
especially -cover-package.") especially -cover-package.")
(license license:expat))) (license license:expat)))
(define-public python2-nosexcover
(package-with-python2 python-nosexcover))
(define-public python-discover (define-public python-discover
(package (package
(name "python-discover") (name "python-discover")
@ -2459,9 +2499,6 @@ especially -cover-package.")
backported from Python 2.7 for Python 2.4+.") backported from Python 2.7 for Python 2.4+.")
(license license:bsd-3))) (license license:bsd-3)))
(define-public python2-discover
(package-with-python2 python-discover))
(define-public behave (define-public behave
(package (package
(name "behave") (name "behave")
@ -2562,9 +2599,6 @@ JSON APIs with Behave.")
@command{nosetests} command of the Python Nose unit test framework.") @command{nosetests} command of the Python Nose unit test framework.")
(license license:bsd-3))) (license license:bsd-3)))
(define-public python2-rednose
(package-with-python2 python-rednose))
(define-public python-nose-random (define-public python-nose-random
(package (package
(name "python-nose-random") (name "python-nose-random")
@ -2615,9 +2649,6 @@ by resetting it to a repeatable number for each test, enabling the tests to
create data based on random numbers and yet remain repeatable.") create data based on random numbers and yet remain repeatable.")
(license license:bsd-3))) (license license:bsd-3)))
(define-public python2-nose-randomly
(package-with-python2 python-nose-randomly))
(define-public python-nose-timer (define-public python-nose-timer
(package (package
(name "python-nose-timer") (name "python-nose-timer")
@ -2636,9 +2667,6 @@ create data based on random numbers and yet remain repeatable.")
(description "Shows how much time was needed to run individual tests.") (description "Shows how much time was needed to run individual tests.")
(license license:expat))) (license license:expat)))
(define-public python2-nose-timer
(package-with-python2 python-nose-timer))
(define-public python-freezegun (define-public python-freezegun
(package (package
(name "python-freezegun") (name "python-freezegun")
@ -2669,9 +2697,6 @@ create data based on random numbers and yet remain repeatable.")
time by mocking the datetime module.") time by mocking the datetime module.")
(license license:asl2.0))) (license license:asl2.0)))
(define-public python2-freezegun
(package-with-python2 python-freezegun))
(define-public python-flexmock (define-public python-flexmock
(package (package
(name "python-flexmock") (name "python-flexmock")
@ -2690,9 +2715,6 @@ time by mocking the datetime module.")
mocks, stubs and fakes.") mocks, stubs and fakes.")
(license license:bsd-3))) (license license:bsd-3)))
(define-public python2-flexmock
(package-with-python2 python-flexmock))
(define-public python-flaky (define-public python-flaky
(package (package
(name "python-flaky") (name "python-flaky")
@ -2719,9 +2741,6 @@ those tests or marking them to @code{@@skip}, they can be automatically
retried.") retried.")
(license license:asl2.0))) (license license:asl2.0)))
(define-public python2-flaky
(package-with-python2 python-flaky))
(define-public python-pyhamcrest (define-public python-pyhamcrest
(package (package
(name "python-pyhamcrest") (name "python-pyhamcrest")
@ -2973,23 +2992,10 @@ under test to interact with a fake file system instead of the real file
system. The code under test requires no modification to work with pyfakefs.") system. The code under test requires no modification to work with pyfakefs.")
(license license:asl2.0))) (license license:asl2.0)))
;; This minimal variant is used to avoid a circular dependency between
;; python2-importlib-metadata, which requires pyfakefs for its tests, and
;; python2-pytest, which requires python2-importlib-metadata.
(define-public python2-pyfakefs-bootstrap
(hidden-package
(package
(inherit (package-with-python2 python-pyfakefs))
(name "python2-pyfakefs-bootstrap")
(native-inputs '())
(arguments
`(#:python ,python-2
#:tests? #f)))))
(define-public python-aiounittest (define-public python-aiounittest
(package (package
(name "python-aiounittest") (name "python-aiounittest")
(version "1.4.0") (version "1.4.1")
;; Pypi package lacks tests. ;; Pypi package lacks tests.
(source (source
(origin (method git-fetch) (origin (method git-fetch)
@ -2999,7 +3005,7 @@ system. The code under test requires no modification to work with pyfakefs.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0hql5mw62lclrpblbh7xvinwjfcdcfvhhlvl7xlq2hi9isjq1c8r")))) "10x7ds09b9415r92f7g9714gxixvvq3bm5mnh29ml9aba8blcb0n"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
'(#:phases (modify-phases %standard-phases '(#:phases (modify-phases %standard-phases

92
gnu/packages/chemistry.scm
View file

@ -128,35 +128,6 @@ science, and related areas. It offers flexible high quality rendering and a
powerful plugin architecture.") powerful plugin architecture.")
(license license:bsd-3))) (license license:bsd-3)))
(define-public domainfinder
(package
(name "domainfinder")
(version "2.0.5")
(source
(origin
(method url-fetch)
(uri (string-append "https://bitbucket.org/khinsen/"
"domainfinder/downloads/DomainFinder-"
version ".tar.gz"))
(sha256
(base32
"1z26lsyf7xwnzwjvimmbla7ckipx6p734w7y0jk2a2fzci8fkdcr"))))
(build-system python-build-system)
(inputs
(list python2-mmtk))
(arguments
`(#:python ,python-2
;; No test suite
#:tests? #f))
(home-page "http://dirac.cnrs-orleans.fr/DomainFinder.html")
(synopsis "Analysis of dynamical domains in proteins")
(description "DomainFinder is an interactive program for the determination
and characterization of dynamical domains in proteins. It can infer dynamical
domains by comparing two protein structures, or from normal mode analysis on a
single structure. The software is currently not actively maintained and works
only with Python 2 and NumPy < 1.9.")
(license license:cecill-c)))
(define-public inchi (define-public inchi
(package (package
(name "inchi") (name "inchi")
@ -332,69 +303,6 @@ with templates to facilitate the execution of the program. Input files can be
staged, and output files collected using a standard interface.") staged, and output files collected using a standard interface.")
(license license:bsd-3))) (license license:bsd-3)))
(define with-numpy-1.8
(package-input-rewriting `((,python2-numpy . ,python2-numpy-1.8))))
(define-public nmoldyn
(package
(name "nmoldyn")
(version "3.0.11")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/khinsen/nMOLDYN3")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"016h4bqg419p6s7bcx55q5iik91gqmk26hbnfgj2j6zl0j36w51r"))))
(build-system python-build-system)
(inputs
(list (with-numpy-1.8 python2-matplotlib) python2-scientific netcdf
gv))
(propagated-inputs
(list python2-mmtk))
(arguments
`(#:python ,python-2
#:tests? #f ; No test suite
#:phases
(modify-phases %standard-phases
(add-before 'build 'create-linux2-directory
(lambda _
(mkdir-p "nMOLDYN/linux2")))
(add-before 'build 'change-PDF-viewer
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "nMOLDYN/Preferences.py"
;; Set the paths for external executables, substituting
;; gv for acroread.
;; There is also vmd_path, but VMD is not free software
;; and Guix contains currently no free molecular viewer that
;; could be substituted.
(("PREFERENCES\\['acroread_path'\\] = ''")
(format #f "PREFERENCES['acroread_path'] = '~a'"
(which "gv")))
(("PREFERENCES\\['ncdump_path'\\] = ''")
(format #f "PREFERENCES['ncdump_path'] = '~a'"
(which "ncdump")))
(("PREFERENCES\\['ncgen_path'\\] = ''")
(format #f "PREFERENCES['ncgen_path'] = '~a'"
(which "ncgen3")))
(("PREFERENCES\\['task_manager_path'\\] = ''")
(format #f "PREFERENCES['task_manager_path'] = '~a'"
(which "task_manager")))
;; Show documentation as PDF
(("PREFERENCES\\['documentation_style'\\] = 'html'")
"PREFERENCES['documentation_style'] = 'pdf'") ))))))
(home-page "http://dirac.cnrs-orleans.fr/nMOLDYN.html")
(synopsis "Analysis software for Molecular Dynamics trajectories")
(description "nMOLDYN is an interactive analysis program for Molecular Dynamics
simulations. It is especially designed for the computation and decomposition of
neutron scattering spectra, but also computes other quantities. The software
is currently not actively maintained and works only with Python 2 and
NumPy < 1.9.")
(license license:cecill)))
(define-public tng (define-public tng
(package (package
(name "tng") (name "tng")

430
gnu/packages/chez.scm
View file

@ -4,7 +4,7 @@
;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Brett Gilio <brettg@gnu.org> ;;; Copyright © 2019 Brett Gilio <brettg@gnu.org>
;;; Copyright © 2020 Brendan Tildesley <mail@brendan.scot> ;;; Copyright © 2020 Brendan Tildesley <mail@brendan.scot>
;;; Copyright © 2021 Philip McGrath <philip@philipmcgrath.com> ;;; Copyright © 2021, 2022 Philip McGrath <philip@philipmcgrath.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -48,9 +48,7 @@
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (srfi srfi-26) #:use-module (srfi srfi-26)
#:export (chez-scheme-for-system #:export (chez-scheme-for-system
nix-system->chez-machine racket-cs-native-supported-system?
chez-machine->nonthreaded
chez-machine->threaded
unpack-nanopass+stex)) unpack-nanopass+stex))
;; Commentary: ;; Commentary:
@ -71,97 +69,141 @@
(define* (chez-scheme-for-system #:optional (define* (chez-scheme-for-system #:optional
(system (or (%current-target-system) (system (or (%current-target-system)
(%current-system)))) (%current-system))))
"Return 'chez-scheme' unless only 'chez-scheme-for-racket' supports SYSTEM, "Return 'chez-scheme' if it fully supports SYSTEM, including support for
including support for native threads." bootstrapping and native threads. Otherwise, return
(if (or 'chez-scheme-for-racket'."
;; full support upstream (if (and=> (chez-upstream-features-for-system system)
(and=> (chez-upstream-features-for-system system) (lambda (features)
(cut memq 'threads <>)) (every (cut memq <> features)
;; no support anywhere '(threads
(not (nix-system->chez-machine system))) ;; We can cross-compile for platforms without
;; bootstrap bootfiles, but we can't self-host
;; on them short of adding more binary seeds.
bootstrap-bootfiles))))
chez-scheme chez-scheme
chez-scheme-for-racket)) chez-scheme-for-racket))
(define (chez-machine->nonthreaded machine) (define* (target-chez-arch #:optional (system
"Given a string MACHINE naming a Chez Scheme machine type, returns a string (or (%current-target-system)
naming the nonthreaded machine type for the same architecture and OS as (%current-system))))
MACHINE. The returned string may share storage with MACHINE." "Return a string representing the architecture of SYSTEM as used in Chez
;; Chez Scheme documentation consistently uses "nonthreaded" rather than Scheme machine types, or '#f' if none is defined."
;; e.g. "unthreaded" (cond
(if (eqv? #\t (string-ref machine 0)) ((target-x86-64? system)
(substring machine 1) "a6")
machine)) ((target-x86-32? system)
(define (chez-machine->threaded machine) "i3")
"Like @code{chez-machine->nonthreaded}, but returns the threaded machine ((target-aarch64? system)
type." "arm64")
(if (eqv? #\t (string-ref machine 0)) ((target-arm32? system)
machine "arm32")
(string-append "t" machine))) ((target-ppc64le? system)
#f)
((target-ppc32? system)
"ppc32")
((target-riscv64? system)
#f)
(else
#f)))
;; Based on the implementation from raco-cross-lib/private/cross/platform.rkt (define* (target-chez-os #:optional (system (or (%current-target-system)
;; in https://github.com/racket/raco-cross. (%current-system))))
;; For supported platforms, refer to release_notes/release_notes.stex in the "Return a string representing the operating system kernel of SYSTEM as used
;; upstream Chez Scheme repository or to racket/src/ChezScheme/README.md in Chez Scheme machine types, or '#f' if none is defined."
;; in https://github.com/racket/racket. ;; e.g. "le" includes both GNU/Linux and Android
(define %nix-arch-to-chez-alist (cond
`(("x86_64" . "a6") ((target-linux? system)
("i386" . "i3") "le")
("aarch64" . "arm64") ((target-hurd? system)
("armhf" . "arm32") ;; Chez supports ARM v6+ #f)
("ppc" . "ppc32"))) ((target-mingw? system)
(define %nix-os-to-chez-alist "nt")
`(("w64-mingw32" . "nt") ;; missing (guix utils) predicates
("darwin" . "osx") ;; cf. https://github.com/NixOS/nixpkgs/blob/master/lib/systems/doubles.nix
("linux" . "le") ((string-suffix? "-darwin" system)
("freebsd" . "fb") "osx")
("openbsd" . "ob") ((string-suffix? "-freebsd" system)
("netbsd" . "nb") "fb")
("solaris" . "s2"))) ((string-suffix? "-openbsd" system)
"ob")
((string-suffix? "-netbsd" system)
"nb")
;; Nix says "x86_64-solaris", but accommodate "-solaris2"
((string-contains system "solaris")
"s2")
;; unknown
(else
#f)))
(define (chez-machine->nix-system machine) (define %chez-features-table
"Return the Nix system type corresponding to the Chez Scheme machine type ;; An alist of alists mapping:
MACHINE. If MACHINE is not a string representing a known machine type, an ;; os -> arch -> (or/c #f (listof symbol?))
exception is raised. This function does not distinguish between threaded and ;; where:
nonthreaded variants of MACHINE. ;; - `os` is a string for the OS part of a Chez Scheme machine type; and
;; - `arch` is a string for the architecture part of a Chez machine type.
Note that this function only handles Chez Scheme machine types in the ;;
strictest sense, not other kinds of descriptors sometimes used in place of a ;; The absence of an entry for a given arch--os pair means that neither
Chez Scheme machine type by Racket, such as @code{\"pb\"}, @code{#f}, or ;; upstream Chez Scheme nor the Racket variant can generate native code for
@code{\"racket\"}. (When using such extensions, the Chez Scheme machine type ;; that system. (The Racket variant can still provide support via its
for the host system is often still relevant.)" ;; ``portable bytecode'' backends and optional compilation to C.) A value
(let ((machine (chez-machine->nonthreaded machine))) ;; of `#f` means that upstream Chez Scheme does not support the arch--os
(let find-arch ((alist %nix-arch-to-chez-alist)) ;; pair at all, but the Racket variant does. A list has the same meaning as
(match alist ;; a result from `chez-upstream-features-for-system`.
(((nix . chez) . alist) ;;
(if (string-prefix? chez machine) ;; The arch--os pairs marked "commented out" have been commented out in the
(string-append ;; STeX source for the upstream release notes since the initial release as
nix "-" (let ((machine-os ;; free software, but they are reported to work and/or have been described
(substring machine (string-length chez)))) ;; as supported by upstream maintainers.
(let find-os ((alist %nix-os-to-chez-alist)) ;;
(match alist ;; For this overall approach to make sense, we assume that Racket's variant
(((nix . chez) . alist) ;; of Chez Scheme can generate native code for a superset of the platforms
(if (equal? chez machine-os) ;; supported upstream, supports threads on all platforms it supports at all
nix ;; (because they are needed for Racket), and doesn't need bootstrap
(find-os alist))))))) ;; bootfiles. Those assumptions have held for several years.
(find-arch alist))))))) '(;; Linux
("le"
(define* (nix-system->chez-machine #:optional ("i3" threads bootstrap-bootfiles)
(system (or (%current-target-system) ("a6" threads bootstrap-bootfiles)
(%current-system)))) ("arm32" bootstrap-bootfiles)
"Return the Chez Scheme machine type corresponding to the Nix system ("arm64" . #f)
identifier SYSTEM, or @code{#f} if the translation of SYSTEM to a Chez Scheme ("ppc32" threads))
machine type is undefined. ;; FreeBSD
("fb"
It is unspecified whether the resulting string will name a threaded or a ("i3" threads) ;; commented out
nonthreaded machine type: when the distinction is relevant, use ("a6" threads) ;; commented out
@code{chez-machine->nonthreaded} or @code{chez-machine->threaded} to adjust ("arm32" . #f)
the result." ("arm64" . #f)
(let* ((hyphen (string-index system #\-)) ("ppc32" . #f))
(nix-arch (substring system 0 hyphen)) ;; OpenBSD
(nix-os (substring system (+ 1 hyphen))) ("ob"
(chez-arch (assoc-ref %nix-arch-to-chez-alist nix-arch)) ("i3" threads) ;; commented out
(chez-os (assoc-ref %nix-os-to-chez-alist nix-os))) ("a6" threads) ;; commented out
(and chez-arch chez-os (string-append chez-arch chez-os)))) ("arm32" . #f)
("arm64" . #f)
("ppc32" . #f))
;; NetBSD
("nb"
("i3" threads) ;; commented out
("a6" threads) ;; commented out
("arm32" . #f)
("arm64" . #f)
("ppc32" . #f))
;; OpenSolaris / OpenIndiana / Illumos
("s2"
("i3" threads) ;; commented out
("a6" threads)) ;; commented out
;; Windows
("nt"
("i3" threads bootstrap-bootfiles)
("a6" threads bootstrap-bootfiles)
;; ^ threads "experiemental", but reportedly fine
("arm64" . #f))
;; Darwin
("osx"
("i3" threads bootstrap-bootfiles)
("a6" threads bootstrap-bootfiles)
("arm64" . #f)
("ppc32" . #f))))
(define* (chez-upstream-features-for-system #:optional (define* (chez-upstream-features-for-system #:optional
(system (system
@ -172,20 +214,27 @@ for the Nix system identifier SYSTEM, or @code{#f} if upstream Chez Scheme
does not support SYSTEM at all. does not support SYSTEM at all.
If native threads are supported, the returned list will include If native threads are supported, the returned list will include
@code{'threads}. Other feature symbols may be added in the future." @code{'threads}. If bootstrap bootfiles for SYSTEM are distributed in the
(cond upstream Chez Scheme repository, the returned list will include
((not (nix-system->chez-machine system)) @code{'bootstrap-bootfiles}. Other feature symbols may be added in the
#f) future."
((target-aarch64? system) (let ((chez-arch (target-chez-arch system))
#f) (chez-os (target-chez-os system)))
((target-arm32? system) (and=> (assoc-ref %chez-features-table chez-os)
(and (target-linux? system) (cut assoc-ref <> chez-arch))))
'()))
((target-ppc32? system) (define* (racket-cs-native-supported-system? #:optional
(and (target-linux? system) (system
'(threads))) (or (%current-target-system)
(else (%current-system))))
'(threads)))) "Can Racket's variant of Chez Scheme generate native code for SYSTEM?
Otherwise, SYSTEM can use only the ``portable bytecode'' backends."
(let ((chez-arch (target-chez-arch system))
(chez-os (target-chez-os system)))
(and (and=> (assoc-ref %chez-features-table chez-os)
;; NOT assoc-ref: supported even if cdr is #f
(cut assoc chez-arch <>))
#t)))
;; ;;
;; Chez Scheme: ;; Chez Scheme:
@ -210,7 +259,7 @@ If native threads are supported, the returned list will include
(name "chez-scheme") (name "chez-scheme")
;; The version should match `(scheme-version-number)`. ;; The version should match `(scheme-version-number)`.
;; See s/cmacros.ss c. line 360. ;; See s/cmacros.ss c. line 360.
(version "9.5.6") (version "9.5.8")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -218,7 +267,7 @@ If native threads are supported, the returned list will include
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(sha256 (sha256
(base32 (base32
"07s433hn1z2slfc026sidrpzxv3a8narcd40qqr1xrpb9012xdky")) "0xchqq8cm0ka5wgpn18sjs0hh15rc3nb7xrjqbbc9al3asq0d7gc"))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(snippet #~(begin (snippet #~(begin
(use-modules (guix build utils)) (use-modules (guix build utils))
@ -258,8 +307,18 @@ If native threads are supported, the returned list will include
(ice-9 ftw) (ice-9 ftw)
(ice-9 match)) (ice-9 match))
#:test-target "test" #:test-target "test"
;; TODO when we fix armhf, it may not support --threads #:configure-flags
#:configure-flags #~'("--threads") #~`(,(string-append "--installprefix=" #$output)
#$@(if (and=> (chez-upstream-features-for-system)
(cut memq 'threads <>))
#~("--threads")
#~())
"ZLIB=-lz"
"LZ4=-llz4"
"--libkernel"
;; Guix will do 'compress-man-pages',
;; and letting Chez try causes an error
"--nogzip-man-pages")
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'unpack-nanopass+stex (add-after 'unpack 'unpack-nanopass+stex
@ -273,26 +332,35 @@ If native threads are supported, the returned list will include
(search-input-directory (or native-inputs inputs) (search-input-directory (or native-inputs inputs)
"lib/chez-scheme-bootfiles") "lib/chez-scheme-bootfiles")
"boot"))) "boot")))
;; NOTE: the custom Chez 'configure' script doesn't allow ;; NOTE: The custom Chez 'configure' script doesn't allow
;; unrecognized flags, such as those automatically added ;; unrecognized flags, such as those automatically added
;; by `gnu-build-system`. ;; by `gnu-build-system`. This replacement phase uses only
;; the explicitly provided `#:configure-flags`.
(replace 'configure (replace 'configure
(lambda* (#:key inputs (configure-flags '()) #:allow-other-keys) (lambda* (#:key inputs (configure-flags '()) out-of-source?
;; add flags which are always required: #:allow-other-keys)
(let ((flags (cons* (string-append "--installprefix=" #$output) (let* ((abs-srcdir (getcwd))
"ZLIB=-lz" (srcdir (if out-of-source?
"LZ4=-llz4" (string-append "../" (basename abs-srcdir))
"--libkernel" ".")))
;; Guix will do compress-man-pages, (format #t "source directory: ~s (relative from build: ~s)~%"
;; and letting Chez try causes an error abs-srcdir srcdir)
"--nogzip-man-pages" (if out-of-source?
configure-flags))) (begin
(format #t "configure flags: ~s~%" flags) (mkdir "../build")
;; Some makefiles (for tests) don't seem to propagate CC (chdir "../build")))
;; properly, so we take it out of their hands: (format #t "build directory: ~s~%" (getcwd))
(setenv "CC" #$(cc-for-target)) (format #t "configure flags: ~s~%" configure-flags)
(setenv "HOME" "/tmp") (apply invoke
(apply invoke "./configure" flags)))) (string-append srcdir "/configure")
configure-flags))))
(add-after 'configure 'configure-environment-variables
(lambda args
;; Some makefiles (for tests) don't seem to propagate CC
;; properly, so we take it out of their hands:
(setenv "CC" #$(cc-for-target))
;; Likewise, some tests have needed HOME to be set:
(setenv "HOME" "/tmp")))
;; The binary file name is called "scheme" as is the one from ;; The binary file name is called "scheme" as is the one from
;; MIT/GNU Scheme. We add a symlink to use in case both are ;; MIT/GNU Scheme. We add a symlink to use in case both are
;; installed. ;; installed.
@ -309,43 +377,46 @@ If native threads are supported, the returned list will include
(string-append (dirname scheme.boot) (string-append (dirname scheme.boot)
"/chez-scheme.boot"))))))) "/chez-scheme.boot")))))))
;; Building the documentation requires stex and a running scheme. ;; Building the documentation requires stex and a running scheme.
;; FIXME: this is probably wrong for cross-compilation (add-after 'install-symlink 'install-docs
(add-after 'install-symlink 'install-doc
(lambda* (#:key native-inputs inputs outputs #:allow-other-keys) (lambda* (#:key native-inputs inputs outputs #:allow-other-keys)
(match (assoc-ref outputs "doc") (let* ((doc-prefix (or (assoc-ref outputs "doc")
(#f (assoc-ref outputs "out")))
(format #t "not installing docs~%")) (chez+version (strip-store-file-name #$output))
(doc-prefix (scheme (search-input-file outputs "/bin/scheme"))
(let* ((chez+version (strip-store-file-name #$output)) (stexlib (search-input-directory (or native-inputs
(scheme (search-input-file outputs "/bin/scheme")) inputs)
(stexlib (search-input-directory (or native-inputs "/lib/stex"))
inputs) (doc-dir (string-append doc-prefix
"/lib/stex")) "/share/doc/"
(doc-dir (string-append doc-prefix chez+version)))
"/share/doc/" (define* (stex-make #:optional (suffix ""))
chez+version))) (invoke "make" "install"
(define* (stex-make #:optional (suffix "")) (string-append "Scheme=" scheme)
(invoke "make" "install" (string-append "STEXLIB=" stexlib)
(string-append "Scheme=" scheme) (string-append "installdir=" doc-dir suffix)))
(string-append "STEXLIB=" stexlib) (with-directory-excursion "csug"
(string-append "installdir=" doc-dir suffix))) (stex-make "/csug"))
(with-directory-excursion "csug" (with-directory-excursion "release_notes"
(stex-make "/csug")) (stex-make "/release_notes")))))
(with-directory-excursion "release_notes" (add-after 'install-docs 'link-doc-pdfs
(stex-make "/release_notes")) ;; otherwise, it's hard to notice them in a forest of HTML files
(with-directory-excursion doc-dir (lambda* (#:key outputs #:allow-other-keys)
(symlink "release_notes/release_notes.pdf" (with-directory-excursion
"release_notes.pdf") (string-append (or (assoc-ref outputs "doc")
(symlink "csug/csug9_5.pdf" (assoc-ref outputs "out"))
"csug.pdf")))))))))) "/share/doc/"
;; Chez Scheme does not have a MIPS backend. (strip-store-file-name #$output))
;; FIXME: Debian backports patches to get armhf working. (symlink "release_notes/release_notes.pdf"
;; We should too. It is the Chez machine type arm32le "release_notes.pdf")
;; (no threaded version upstream yet, though there is in (match (find-files "csug"
;; Racket's fork), more specifically (per the release notes) ARMv6. "csug.*\\.pdf$" ;; embeded version number
#:fail-on-error? #t)
((pth)
(symlink pth
"csug.pdf")))))))))
(supported-systems (supported-systems
(delete (delete
"armhf-linux" ;; <-- should work, but reportedly broken "armhf-linux" ;; XXX reportedly broken, needs checking
(filter chez-upstream-features-for-system (filter chez-upstream-features-for-system
%supported-systems))) %supported-systems)))
(home-page "https://cisco.github.io/ChezScheme/") (home-page "https://cisco.github.io/ChezScheme/")
@ -361,7 +432,7 @@ and 32-bit PowerPC architectures.")
(package (package
(inherit chez-scheme) (inherit chez-scheme)
(name "chez-scheme-for-racket") (name "chez-scheme-for-racket")
(version "9.5.7.3") (version "9.5.7.6")
;; The version should match `(scheme-fork-version-number)`. ;; The version should match `(scheme-fork-version-number)`.
;; See racket/src/ChezScheme/s/cmacros.ss c. line 360. ;; See racket/src/ChezScheme/s/cmacros.ss c. line 360.
;; It will always be different than the upstream version! ;; It will always be different than the upstream version!
@ -377,7 +448,9 @@ and 32-bit PowerPC architectures.")
(arguments (arguments
(substitute-keyword-arguments (package-arguments chez-scheme) (substitute-keyword-arguments (package-arguments chez-scheme)
((#:configure-flags cfg-flags #~'()) ((#:configure-flags cfg-flags #~'())
#~(cons "--disable-x11" #$cfg-flags)) #~(cons* "--disable-x11"
"--threads" ;; ok to potentially duplicate
#$cfg-flags))
((#:phases those-phases #~%standard-phases) ((#:phases those-phases #~%standard-phases)
#~(let* ((those-phases #$those-phases) #~(let* ((those-phases #$those-phases)
(unpack (assoc-ref those-phases 'unpack))) (unpack (assoc-ref those-phases 'unpack)))
@ -389,7 +462,9 @@ and 32-bit PowerPC architectures.")
(add-after 'unpack 'chdir (add-after 'unpack 'chdir
(lambda args (lambda args
(chdir "racket/src/ChezScheme")))))))) (chdir "racket/src/ChezScheme"))))))))
(supported-systems (filter nix-system->chez-machine ;; TODO: How to build pbarch/pbchunks for other systems?
;; See https://racket.discourse.group/t/950
(supported-systems (filter racket-cs-native-supported-system?
%supported-systems)) %supported-systems))
(home-page "https://github.com/racket/ChezScheme") (home-page "https://github.com/racket/ChezScheme")
;; ^ This is downstream of https://github.com/racket/racket, ;; ^ This is downstream of https://github.com/racket/racket,
@ -442,16 +517,9 @@ Faster multiplication and division for large exact numbers
(list #:install-plan (list #:install-plan
#~`(("boot/" "lib/chez-scheme-bootfiles")))) #~`(("boot/" "lib/chez-scheme-bootfiles"))))
(supported-systems (supported-systems
;; Upstream only distributes pre-built bootfiles for
;; arm32le and t?(i3|a6)(le|nt|osx)
(filter (lambda (system) (filter (lambda (system)
(let ((machine (and=> (nix-system->chez-machine system) (and=> (chez-upstream-features-for-system system)
chez-machine->nonthreaded))) (cut memq 'bootstrap-bootfiles <>)))
(or (equal? "arm32le" machine)
(and machine
(member (substring machine 0 2) '("i3" "a6"))
(or-map (cut string-suffix? <> machine)
'("le" "nt" "osx"))))))
%supported-systems)) %supported-systems))
(synopsis "Chez Scheme bootfiles (binary seed)") (synopsis "Chez Scheme bootfiles (binary seed)")
(description (description
@ -461,7 +529,7 @@ current platform. (Chez can then cross-compile bootfiles for all other
supported platforms.) supported platforms.)
This package provides bootstrap bootfiles for upstream Chez Scheme. This package provides bootstrap bootfiles for upstream Chez Scheme.
Currently, it simply packages the binaries checked in to the upsream Currently, it simply packages the binaries checked in to the upstream
repository. Hopefully we can eventually adapt Racket's @code{cs-bootstrap} to repository. Hopefully we can eventually adapt Racket's @code{cs-bootstrap} to
work with upstream Chez Scheme so that we can bootstrap these files from work with upstream Chez Scheme so that we can bootstrap these files from
source."))) source.")))
@ -573,6 +641,10 @@ Chez Scheme.")))
("src" "lib/stex/") ("src" "lib/stex/")
("Mf-stex" "lib/stex/") ("Mf-stex" "lib/stex/")
("Makefile.template" "lib/stex/")) ("Makefile.template" "lib/stex/"))
#:modules
'((guix build copy-build-system)
(guix build utils)
(ice-9 popen))
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-before 'install 'patch-sources (add-before 'install 'patch-sources
@ -604,8 +676,14 @@ Chez Scheme.")))
(define makefile (define makefile
(string-append (getcwd) "/Makefile")) (string-append (getcwd) "/Makefile"))
(define machine (define machine
#$(and=> (nix-system->chez-machine) (let ((pipe (open-pipe* OPEN_BOTH scheme "-q")))
chez-machine->threaded)) ;; try to not be wrong for cross-compilation
;; (avoid #% reader abbreviation for Guile)
(write '(($primitive $target-machine)) pipe)
(force-output pipe)
(let ((sym (read pipe)))
(close-pipe pipe)
(symbol->string sym))))
(with-directory-excursion (with-directory-excursion
(search-input-directory outputs "/lib/stex") (search-input-directory outputs "/lib/stex")
(invoke "make" (invoke "make"
@ -634,7 +712,7 @@ Chez Scheme.")))
(else (else
(format #t "not making docs~%")))))))) (format #t "not making docs~%"))))))))
(home-page "https://github.com/dybvig/stex") (home-page "https://github.com/dybvig/stex")
(synopsis "LaTeX with embeded Scheme code and HTML generation") (synopsis "LaTeX with embedded Scheme code and HTML generation")
(description "The @code{stex} package extends LaTeX with a handful of (description "The @code{stex} package extends LaTeX with a handful of
commands for including Scheme code (or pretty much any other kind of code, as commands for including Scheme code (or pretty much any other kind of code, as
long as you don't plan to use the Scheme-specific transcript support) in a long as you don't plan to use the Scheme-specific transcript support) in a

145
gnu/packages/chromium.scm
View file

@ -129,10 +129,14 @@
"third_party/cros_system_api" ;BSD-3 "third_party/cros_system_api" ;BSD-3
"third_party/dav1d" ;BSD-2 "third_party/dav1d" ;BSD-2
"third_party/dawn" ;ASL2.0 "third_party/dawn" ;ASL2.0
"third_party/dawn/third_party/tint" ;; TODO: can likely be unbundled when Vulkan is updated.
"third_party/dawn/third_party/khronos" ;ASL2.0
"third_party/dawn/third_party/gn/webgpu-cts" ;BSD-3
"third_party/depot_tools/owners.py" ;BSD-3 "third_party/depot_tools/owners.py" ;BSD-3
"third_party/devtools-frontend" ;BSD-3 "third_party/devtools-frontend" ;BSD-3
"third_party/devtools-frontend/src/front_end/third_party/acorn" ;Expat "third_party/devtools-frontend/src/front_end/third_party/acorn" ;Expat
"third_party/devtools-frontend/src/front_end/third_party\
/additional_readme_paths.json" ;no explicit license; trivial
"third_party/devtools-frontend/src/front_end/third_party/axe-core" ;MPL2.0 "third_party/devtools-frontend/src/front_end/third_party/axe-core" ;MPL2.0
"third_party/devtools-frontend/src/front_end/third_party/chromium" ;BSD-3 "third_party/devtools-frontend/src/front_end/third_party/chromium" ;BSD-3
"third_party/devtools-frontend/src/front_end/third_party/codemirror" ;Expat "third_party/devtools-frontend/src/front_end/third_party/codemirror" ;Expat
@ -171,7 +175,6 @@
"third_party/khronos" ;Expat, SGI "third_party/khronos" ;Expat, SGI
"third_party/leveldatabase" ;BSD-3 "third_party/leveldatabase" ;BSD-3
"third_party/libavif" ;BSD-2 "third_party/libavif" ;BSD-2
"third_party/libXNVCtrl" ;Expat
"third_party/libaddressinput" ;ASL2.0 "third_party/libaddressinput" ;ASL2.0
"third_party/libaom" ;BSD-2 or "Alliance for Open Media Patent License 1.0" "third_party/libaom" ;BSD-2 or "Alliance for Open Media Patent License 1.0"
"third_party/libaom/source/libaom/third_party/fastfeat" ;BSD-3 "third_party/libaom/source/libaom/third_party/fastfeat" ;BSD-3
@ -256,14 +259,13 @@
"third_party/swiftshader/third_party/marl" ;ASL2.0 "third_party/swiftshader/third_party/marl" ;ASL2.0
"third_party/swiftshader/third_party/subzero" ;NCSA "third_party/swiftshader/third_party/subzero" ;NCSA
"third_party/swiftshader/third_party/SPIRV-Headers" ;X11-style "third_party/swiftshader/third_party/SPIRV-Headers" ;X11-style
"third_party/tcmalloc/chromium" ;BSD-3 "third_party/swiftshader/third_party/SPIRV-Tools" ;ASL2.0
"third_party/tensorflow-text" ;ASL2.0 "third_party/tensorflow-text" ;ASL2.0
"third_party/tflite" ;ASL2.0 "third_party/tflite" ;ASL2.0
"third_party/tflite/src/third_party/eigen3" ;MPL2.0 "third_party/tflite/src/third_party/eigen3" ;MPL2.0
"third_party/tflite/src/third_party/fft2d" ;ASL2.0 "third_party/tflite/src/third_party/fft2d" ;ASL2.0
"third_party/ukey2" ;ASL2.0 "third_party/ukey2" ;ASL2.0
"third_party/usb_ids" ;BSD-3 "third_party/usb_ids" ;BSD-3
"third_party/usrsctp" ;BSD-2
"third_party/utf" ;Expat "third_party/utf" ;Expat
"third_party/vulkan-deps" ;ASL2.0, BSD-3, Expat "third_party/vulkan-deps" ;ASL2.0, BSD-3, Expat
"third_party/vulkan_memory_allocator" ;Expat "third_party/vulkan_memory_allocator" ;Expat
@ -310,9 +312,9 @@
;; run the Blink performance tests, just remove everything to save ~70MiB. ;; run the Blink performance tests, just remove everything to save ~70MiB.
'("third_party/blink/perf_tests")) '("third_party/blink/perf_tests"))
(define %chromium-version "98.0.4758.102") (define %chromium-version "102.0.5005.61")
(define %ungoogled-revision (string-append %chromium-version "-1")) (define %ungoogled-revision (string-append %chromium-version "-3"))
(define %debian-revision "debian/90.0.4430.85-1") (define %debian-revision "debian/102.0.5005.61-1")
(define %ungoogled-origin (define %ungoogled-origin
(origin (origin
@ -322,27 +324,48 @@
(file-name (git-file-name "ungoogled-chromium" %ungoogled-revision)) (file-name (git-file-name "ungoogled-chromium" %ungoogled-revision))
(sha256 (sha256
(base32 (base32
"0baz90fnzpldw0wwibhmh4pmki7vlpci9b9vvifa0rj5cwckl8a0")))) "19i4ygxjm503dmck3bdqv3fcpda3dp9wr7z306pi6i1k989rbs8l"))))
(define* (debian-patch name hash #:optional (revision %debian-revision)) (define %debian-origin
(origin (origin
(method url-fetch) (method git-fetch)
(uri (string-append "https://salsa.debian.org/chromium-team/chromium/-/raw/" (uri (git-reference
revision "/debian/patches/" name)) (url "https://salsa.debian.org/chromium-team/chromium.git")
(file-name (match (string-split name #\/) (commit %debian-revision)))
((category name) (file-name (git-file-name "debian-chromium-patches"
(string-append "ungoogled-chromium-" category "-" name)))) (match (string-split %debian-revision #\/)
(sha256 (base32 hash)))) ((_ version) version))))
(sha256
(base32
"1ln6r1qzlr7dsgvcbssvvc34my4mpkwv9hmvlb2dhjncs7isp65j"))))
(define (debian-patch name)
(computed-file
(basename name)
#~(symlink (string-append #$%debian-origin "/debian/patches/" #$name)
#$output)))
(define %debian-patches (define %debian-patches
(list (debian-patch "fixes/nomerge.patch" (map debian-patch
"0lybs2b5gk08j8cr6vjrs9d3drd7qfw013z2r0y00by8dnpm74i3") '("upstream/libxml.patch"
(debian-patch "system/jsoncpp.patch" "upstream/dawn-version-fix.patch"
"16lvhci10hz0q9axc6p921b95a76kbzcla5cl81czxzfwnynr1w5") "upstream/blink-ftbfs.patch"
(debian-patch "system/zlib.patch" "upstream/nested-nested-nested-nested-nested-nested-regex-patterns.patch"
"0j313bd3q8qc065j60x97dckrfgbwl4qxc8jhz33iihvv4lwziwv") "system/jsoncpp.patch"
(debian-patch "system/openjpeg.patch" "system/zlib.patch"
"048405xh84pys0kky81vlqhaxjyxvcql4py217z01qxiv991zxaj"))) "system/openjpeg.patch")))
;; Take a patch from Arch that reverts a change which requires an unreleased
;; version of ffmpeg.
(define %ungoogled-chromium-unroll-ffmpeg.patch
(origin
(method url-fetch)
(uri "https://raw.githubusercontent.com/archlinux/svntogit-packages\
/f3225f99b900e11ac900725992ea883142d7309c/trunk/roll-src-third_party-ffmpeg.patch")
(file-name "ungoogled-chromium-unroll-ffmpeg.patch")
(sha256
(base32
"0i7crn6fcwq09kd6a4smqnffaldyv61lmv2p0drcnpfrwalmkprh"))))
(define %guix-patches (define %guix-patches
(list (local-file (list (local-file
@ -384,6 +407,9 @@
patch "--no-backup-if-mismatch")) patch "--no-backup-if-mismatch"))
(append '#+%debian-patches '#+%guix-patches)) (append '#+%debian-patches '#+%guix-patches))
(invoke "patch" "-Rp1" "--force" "--input" "--no-backup-if-mismatch"
"--input" #$%ungoogled-chromium-unroll-ffmpeg.patch)
(with-directory-excursion #+%ungoogled-origin (with-directory-excursion #+%ungoogled-origin
(format #t "Ungooglifying...~%") (format #t "Ungooglifying...~%")
(force-output) (force-output)
@ -451,7 +477,7 @@
%chromium-version ".tar.xz")) %chromium-version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0gpk13k8pfk65vinlmkg3p7mm0qb8z35psajkxzx0v3n2bllfns1")) "07vbi3gn9g4n04b2qi2hm34r122snrqaifa46yk3pyh1d79rfdqs"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (force ungoogled-chromium-snippet)))) (snippet (force ungoogled-chromium-snippet))))
(build-system gnu-build-system) (build-system gnu-build-system)
@ -497,6 +523,8 @@
"build_with_tflite_lib=false" "build_with_tflite_lib=false"
;; Avoid dependency on code formatting tools. ;; Avoid dependency on code formatting tools.
"blink_enable_generated_code_formatting=false" "blink_enable_generated_code_formatting=false"
;; Don't bother building Dawn tests.
"build_dawn_tests=false"
;; Define a custom toolchain that simply looks up CC, AR and ;; Define a custom toolchain that simply looks up CC, AR and
;; friends from the environment. ;; friends from the environment.
@ -557,7 +585,6 @@
"rtc_build_libvpx=true" "rtc_build_libvpx=true"
"rtc_build_opus=false" "rtc_build_opus=false"
"rtc_build_libsrtp=true" ;FIXME: fails to find headers "rtc_build_libsrtp=true" ;FIXME: fails to find headers
"rtc_build_usrsctp=true" ;TODO: package this
"rtc_build_ssl=true") ;XXX: requires BoringSSL "rtc_build_ssl=true") ;XXX: requires BoringSSL
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
@ -595,16 +622,14 @@
"#include \"opus/opus_types.h\""))) "#include \"opus/opus_types.h\"")))
(find-files (string-append "third_party/webrtc/modules" (find-files (string-append "third_party/webrtc/modules"
"/audio_coding/codecs/opus"))) "/audio_coding/codecs/opus")))
(substitute* "media/audio/audio_opus_encoder.h"
(("\"third_party/opus/src/include/opus.h\"")
"<opus/opus.h>"))
(substitute* "third_party/webrtc/rtc_base/strings/json.h" (substitute* "third_party/webrtc/rtc_base/strings/json.h"
(("#include \"third_party/jsoncpp/") (("#include \"third_party/jsoncpp/")
"#include \"json/")) "#include \"json/"))
;; This can be removed for M99.
(substitute* "media/gpu/chromeos/video_decoder_pipeline.cc"
(("third_party/libdrm/src/include/drm/drm_fourcc\\.h")
"libdrm/drm_fourcc.h"))
;; Many files try to include ICU headers from "third_party/icu/...". ;; Many files try to include ICU headers from "third_party/icu/...".
;; Remove the "third_party/" prefix to use system headers instead. ;; Remove the "third_party/" prefix to use system headers instead.
(substitute* (find-files "chrome" "\\.cc$") (substitute* (find-files "chrome" "\\.cc$")
@ -636,8 +661,18 @@
(libudev.so.1 (search-input-file inputs "/lib/libudev.so.1")) (libudev.so.1 (search-input-file inputs "/lib/libudev.so.1"))
(libvulkan.so.1 (search-input-file inputs (libvulkan.so.1 (search-input-file inputs
"/lib/libvulkan.so.1")) "/lib/libvulkan.so.1"))
(icd.d (search-input-directory inputs "share/vulkan/icd.d"))
(mesa-lib (dirname (search-input-file inputs (mesa-lib (dirname (search-input-file inputs
"/lib/libGL.so.1")))) "/lib/libGL.so.1")))
(gtk-libs '("libgio-2.0.so.0"
"libgdk_pixbuf-2.0.so.0"
"libgdk-3.so.0"
"libgtk-3.so.0")))
(for-each (lambda (lib)
(substitute* "ui/gtk/gtk_compat.cc"
((lib) (search-input-file
inputs (string-append "lib/" lib)))))
gtk-libs)
(substitute* "printing/cups_config_helper.py" (substitute* "printing/cups_config_helper.py"
(("cups_config =.*") (("cups_config =.*")
(string-append "cups_config = '" cups-config "'\n"))) (string-append "cups_config = '" cups-config "'\n")))
@ -645,8 +680,31 @@
(("libnssckbi\\.so") libnssckbi.so)) (("libnssckbi\\.so") libnssckbi.so))
(substitute* "device/udev_linux/udev1_loader.cc" (substitute* "device/udev_linux/udev1_loader.cc"
(("libudev\\.so\\.1") libudev.so.1)) (("libudev\\.so\\.1") libudev.so.1))
(substitute* "third_party/dawn/src/dawn_native/vulkan/BackendVk.cpp"
;; Patch libvulkan.so everywhere.
(substitute*
'("third_party/swiftshader/include/vulkan/vulkan.hpp"
"third_party/vulkan-deps/vulkan-tools\
/src/vulkaninfo/vulkaninfo.h"
"third_party/vulkan-deps/vulkan-headers\
/src/include/vulkan/vulkan.hpp"
"content/gpu/gpu_sandbox_hook_linux.cc"
"ui/ozone/platform/wayland/gpu/vulkan_implementation_wayland.cc"
"ui/ozone/platform/drm/gpu/vulkan_implementation_gbm.cc"
"ui/ozone/platform/x11/vulkan_implementation_x11.cc"
"third_party/skia/tools/sk_app/unix\
/DawnVulkanWindowContext_unix.cpp")
(("libvulkan\\.so\\.1") libvulkan.so.1)) (("libvulkan\\.so\\.1") libvulkan.so.1))
(substitute* "content/gpu/gpu_sandbox_hook_linux.cc"
(("/usr/share/vulkan/icd\\.d") icd.d))
;; Add the libvulkan directory to dawn built-in search paths.
(substitute* "third_party/dawn/src/dawn/native/Instance.cpp"
(("^([[:blank:]]+)mRuntimeSearchPaths\\.push_back\\(\"\"\\);"
all indent)
(string-append indent "mRuntimeSearchPaths.push_back(\""
(dirname libvulkan.so.1) "/\");\n" all)))
(substitute* (substitute*
'("ui/ozone/platform/x11/gl_ozone_glx.cc" '("ui/ozone/platform/x11/gl_ozone_glx.cc"
"ui/ozone/common/egl_util.cc" "ui/ozone/common/egl_util.cc"
@ -668,6 +726,15 @@
(setenv "AR" "llvm-ar") (setenv "NM" "llvm-nm") (setenv "AR" "llvm-ar") (setenv "NM" "llvm-nm")
(setenv "CC" "clang") (setenv "CXX" "clang++") (setenv "CC" "clang") (setenv "CXX" "clang++")
;; Disable compiler flags that require Clang 15.
(substitute* "build/config/compiler/BUILD.gn"
(("\"-no-opaque-pointers\",")
"")
(("\"-Wno-unqualified-std-cast-call\"")
"")
(("\"-Wno-deprecated-non-prototype\"")
""))
;; TODO: pre-compile instead. Avoids a race condition. ;; TODO: pre-compile instead. Avoids a race condition.
(setenv "PYTHONDONTWRITEBYTECODE" "1") (setenv "PYTHONDONTWRITEBYTECODE" "1")
@ -738,8 +805,9 @@
#$(local-file #$(local-file
(search-auxiliary-file (search-auxiliary-file
"chromium/master-preferences.json"))) "chromium/master-preferences.json")))
(gtk+ (assoc-ref inputs "gtk+")) (gtk (dirname (dirname
(xdg-utils (assoc-ref inputs "xdg-utils"))) (search-input-file inputs "lib/libgtk-3.so"))))
(xdg-utils (dirname (search-input-file inputs "bin/xdg-open"))))
(substitute* '("chrome/app/resources/manpage.1.in" (substitute* '("chrome/app/resources/manpage.1.in"
"chrome/installer/linux/common/desktop.template") "chrome/installer/linux/common/desktop.template")
@ -775,8 +843,8 @@
(wrap-program exe (wrap-program exe
;; Avoid file manager crash. See <https://bugs.gnu.org/26593>. ;; Avoid file manager crash. See <https://bugs.gnu.org/26593>.
`("XDG_DATA_DIRS" ":" prefix (,(string-append gtk+ "/share"))) `("XDG_DATA_DIRS" ":" prefix (,(string-append gtk "/share")))
`("PATH" ":" prefix (,(string-append xdg-utils "/bin"))))) `("PATH" ":" prefix (,xdg-utils))))
(with-directory-excursion "chrome/app/theme/chromium" (with-directory-excursion "chrome/app/theme/chromium"
(for-each (for-each
@ -789,7 +857,7 @@
'("24" "48" "64" "128" "256"))))))))) '("24" "48" "64" "128" "256")))))))))
(native-inputs (native-inputs
(list bison (list bison
clang-13 clang-14
gn gn
gperf gperf
lld-as-ld-wrapper lld-as-ld-wrapper
@ -804,6 +872,7 @@
(inputs (inputs
(list alsa-lib (list alsa-lib
atk atk
at-spi2-atk
cups cups
curl curl
dbus dbus

17
gnu/packages/ci.scm
View file

@ -28,6 +28,7 @@
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix download) #:use-module (guix download)
#:use-module ((guix search-paths) #:select ($SSL_CERT_DIR))
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages boost) #:use-module (gnu packages boost)
@ -52,7 +53,8 @@
#:use-module (gnu packages web) #:use-module (gnu packages web)
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)) #:use-module (guix build-system gnu)
#:use-module ((guix search-paths) #:select ($SSL_CERT_DIR)))
(define-public cuirass (define-public cuirass
(let ((commit "9f08035f942a1e78f92e2db886d7837b0ab98b2f") (let ((commit "9f08035f942a1e78f92e2db886d7837b0ab98b2f")
@ -162,7 +164,14 @@
;; FIXME: this is propagated by "guile-git", but it needs to be among ;; FIXME: this is propagated by "guile-git", but it needs to be among
;; the inputs to add it to GUILE_LOAD_PATH. ;; the inputs to add it to GUILE_LOAD_PATH.
guile-bytestructures guile-bytestructures
guix))
;; FIXME: The 'cuirass evaluate' command is multithreaded, but it
;; uses 'open-inferior', which calls 'primitive-fork', thus
;; potentially creating child processes that deadlock. To work
;; around that, use the last revision of Guix where
;; 'open-inferior' was using 'open-pipe*' rather than
;; 'primitive-fork'. See <https://issues.guix.gnu.org/55441>.
guix-for-cuirass))
(native-inputs (native-inputs
(list autoconf automake pkg-config texinfo ephemeralpg)) (list autoconf automake pkg-config texinfo ephemeralpg))
(native-search-paths (native-search-paths
@ -173,9 +182,7 @@
(file-type 'regular) (file-type 'regular)
(separator #f) ;single entry (separator #f) ;single entry
(files '("etc/ssl/certs/ca-certificates.crt"))) (files '("etc/ssl/certs/ca-certificates.crt")))
(search-path-specification $SSL_CERT_DIR))
(variable "SSL_CERT_DIR")
(files '("etc/ssl/certs")))))
(synopsis "Continuous integration system") (synopsis "Continuous integration system")
(description (description
"Cuirass is a continuous integration tool using GNU Guix. It is "Cuirass is a continuous integration tool using GNU Guix. It is

12
gnu/packages/cmake.scm
View file

@ -38,6 +38,7 @@
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#:use-module (guix build-system emacs) #:use-module (guix build-system emacs)
#:use-module ((guix search-paths) #:select ($SSL_CERT_DIR $SSL_CERT_FILE))
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages backup) #:use-module (gnu packages backup)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
@ -229,15 +230,8 @@ using the CMake build system.")
(files '(""))) (files '("")))
;; "cmake-curl-certificates.patch" changes CMake to honor 'SSL_CERT_DIR' ;; "cmake-curl-certificates.patch" changes CMake to honor 'SSL_CERT_DIR'
;; and 'SSL_CERT_FILE', hence these search path entries. ;; and 'SSL_CERT_FILE', hence these search path entries.
(search-path-specification $SSL_CERT_DIR
(variable "SSL_CERT_DIR") $SSL_CERT_FILE))
(separator #f) ;single entry
(files '("etc/ssl/certs")))
(search-path-specification
(variable "SSL_CERT_FILE")
(file-type 'regular)
(separator #f) ;single entry
(files '("etc/ssl/certs/ca-certificates.crt")))))
(home-page "https://cmake.org/") (home-page "https://cmake.org/")
(synopsis "Cross-platform build system") (synopsis "Cross-platform build system")
(description (description

124
gnu/packages/code.scm
View file

@ -11,11 +11,11 @@
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2019 Hartmut Goebel <h.goebel@goebel-consult.de> ;;; Copyright © 2019 Hartmut Goebel <h.goebel@goebel-consult.de>
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2020, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020, 2021 Marius Bakke <marius@gnu.org> ;;; Copyright © 2020, 2021 Marius Bakke <marius@gnu.org>
;;; Copyright © 2020 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2020 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2021 lu hui <luhuins@163.com> ;;; Copyright © 2021 lu hui <luhuins@163.com>
;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com> ;;; Copyright © 2021, 2022 Foo Chuan Wei <chuanwei.foo@hotmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -48,12 +48,14 @@
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages bash) #:use-module (gnu packages bash)
#:use-module (gnu packages bison)
#:use-module (gnu packages c) #:use-module (gnu packages c)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages cpp) #:use-module (gnu packages cpp)
#:use-module (gnu packages curl) #:use-module (gnu packages curl)
#:use-module (gnu packages elf) #:use-module (gnu packages elf)
#:use-module (gnu packages emacs) #:use-module (gnu packages emacs)
#:use-module (gnu packages flex)
#:use-module (gnu packages gcc) #:use-module (gnu packages gcc)
#:use-module (gnu packages graphviz) #:use-module (gnu packages graphviz)
#:use-module (gnu packages llvm) #:use-module (gnu packages llvm)
@ -65,7 +67,9 @@
#:use-module (gnu packages perl-compression) #:use-module (gnu packages perl-compression)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz) #:use-module (gnu packages python-xyz)
#:use-module (gnu packages readline)
#:use-module (gnu packages serialization) #:use-module (gnu packages serialization)
#:use-module (gnu packages sqlite) #:use-module (gnu packages sqlite)
#:use-module (gnu packages texinfo) #:use-module (gnu packages texinfo)
@ -117,6 +121,13 @@ a major mode for Emacs for examining the flowcharts that it produces.")
(base32 (base32
"0lr0l9kj2w3jilz9h9y4np9pf9i9ccpy6331lanki2fnz4z8ldvd")))) "0lr0l9kj2w3jilz9h9y4np9pf9i9ccpy6331lanki2fnz4z8ldvd"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments
(list #:phases
#~(modify-phases %standard-phases
(add-before 'build 'set-man-page-date
;; Avoid embedding the current date for reproducible builds
(lambda _
(setenv "MAN_PAGE_DATE" "2012-04-18"))))))
(native-inputs (native-inputs
(list texinfo autogen)) (list texinfo autogen))
(home-page "https://www.gnu.org/software/complexity/") (home-page "https://www.gnu.org/software/complexity/")
@ -925,6 +936,88 @@ extensions over the standard utility.")
source and header amalgamation in projects.") source and header amalgamation in projects.")
(license license:bsd-3)))) (license license:bsd-3))))
(define-public cdecl
(package
(name "cdecl")
(version "2.5")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.ibiblio.org/pub/linux/devel/lang/c/cdecl-"
version ".tar.gz"))
(sha256
(base32 "0dm98bp186r4cihli6fmcwzjaadgwl1z3b0zdxfik8h7hkqawk5p"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags
,#~(list "LIBS=-lreadline"
(string-append "BINDIR=" #$output "/bin")
(string-append "MANDIR=" #$output "/share/man/man1"))
#:phases
(modify-phases %standard-phases
(delete 'configure) ; No configure script.
(add-after 'unpack 'fix-build
(lambda _
(substitute* "Makefile"
(("lex cdlex.l")
"flex cdlex.l"))
(substitute* "cdecl.c"
;; Fix "error: conflicting types for ‘getline’".
(("char \\* getline\\(\\)")
"char * our_getline(void)")
(("char \\* getline \\(\\)")
"char * our_getline(void)")
(("line = getline\\(\\)")
"line = our_getline()")
;; Fix "error: conflicting types for ‘getopt’".
(("int getopt\\(int,char \\*\\*,char \\*\\);")
"")
;; Fix invalid use of "restrict" as a variable name.
(("i, j, restrict")
"i, j, restriction")
(("restrict =")
"restriction =")
;; Fix "warning: implicit declaration of function ‘add_history’".
(("# include <readline/readline.h>" all)
(string-append all "\n# include <readline/history.h>"))
;; Fix "warning: implicit declaration of function ‘dotmpfile_from_string’".
(("void setprogname\\(char \\*\\);" all)
(string-append all "\nint dotmpfile_from_string(char *);"))
;; Fix "warning: implicit declaration of function ‘completion_matches’".
(("matches = completion_matches\\(text, command_completion\\);")
"matches = rl_completion_matches(text, command_completion);")
(("char \\* command_completion\\(char \\*, int\\);")
"char * command_completion(const char *, int);")
(("char \\* command_completion\\(char \\*text, int flag\\)")
"char * command_completion(const char *text, int flag)")
;; Fix "warning: ‘CPPFunction’ is deprecated".
(("rl_attempted_completion_function = \\(CPPFunction \\*\\)attempt_completion;")
"rl_attempted_completion_function = (rl_completion_func_t *)attempt_completion;")
;; Fix "warning: ‘Function’ is deprecated".
(("rl_completion_entry_function = \\(Function \\*\\)keyword_completion;")
"rl_completion_entry_function = (rl_compentry_func_t *)keyword_completion;"))
;; Fix typo in man page.
(substitute* "cdecl.1"
(("<storage>\t::= auto \\| extern \\| register \\| auto")
"<storage>\t::= auto | extern | register | static"))))
(add-before 'install 'create-directories
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin"))
(man (string-append out "/share/man/man1")))
(mkdir-p bin)
(mkdir-p man)))))
#:tests? #f)) ; No "check" target.
(native-inputs (list bison flex))
(inputs (list readline))
(home-page "https://www.ibiblio.org/pub/linux/devel/lang/c/")
(synopsis "Turn English phrases into C or C++ declarations and vice versa")
(description "@code{cdecl} is a program that turns English-like phrases into C
declarations. It can also translate C into pseudo-English. It also handles
type casts and C++. It has command-line editing and history with the GNU
Readline library.")
(license license:public-domain)))
(define-public cscope (define-public cscope
(package (package
(name "cscope") (name "cscope")
@ -953,3 +1046,30 @@ also be used for C++ code.
Using cscope, you can easily search for where symbols are used and defined.") Using cscope, you can easily search for where symbols are used and defined.")
(license license:bsd-3))) (license license:bsd-3)))
(define-public xenon
(package
(name "xenon")
(version "0.9.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "xenon" version))
(sha256
(base32
"1f4gynjzfckm3rjfywwgz1c7icfx3zjqirf16aj73xv0c9ncpffj"))))
(build-system python-build-system)
(arguments (list #:tests? #f)) ;test suite not shipped with the PyPI archive
(inputs (list python-pyyaml python-radon python-requests))
(home-page "https://xenon.readthedocs.org/")
(synopsis "Monitor code metrics for Python on your CI server")
(description
"Xenon is a monitoring tool based on Radon. It monitors code complexity.
Ideally, @code{xenon} is run every time code is committed. Through command
line options, various thresholds can be set for the complexity of code. It
will fail (i.e. it will exit with a non-zero exit code) when any of these
requirements is not met.")
(license license:expat)))
(define-public python-xenon
(deprecated-package "python-xenon" xenon))

52
gnu/packages/commencement.scm
View file

@ -58,7 +58,6 @@
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system trivial) #:use-module (guix build-system trivial)
#:use-module (guix gexp)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix memoization) #:use-module (guix memoization)
#:use-module (guix utils) #:use-module (guix utils)
@ -2502,19 +2501,20 @@ memoized as a function of '%current-system'."
(define gnumach-headers-boot0 (define gnumach-headers-boot0
(with-boot0 (with-boot0
(package-with-bootstrap-guile (package
(package (inherit gnumach-headers)
(inherit gnumach-headers) (version "1.8-116-g28b53508")
(version "1.8-116-g28b53508") (source (bootstrap-origin
(source (bootstrap-origin (origin
(origin (method url-fetch)
(method url-fetch) (uri (list (string-append "mirror://gnu/guix/mirror/gnumach-"
(uri (string-append "https://lilypond.org/janneke/hurd/" version ".tar.gz")
"gnumach-" version ".tar.gz")) (string-append "https://lilypond.org/janneke/hurd/"
(sha256 "gnumach-" version ".tar.gz")))
(base32 (sha256
"006i0zgwy81vxarpfm12vip4q6i5mgmi5mmy5ldvxp5hx9h3l0zg"))))) (base32
(native-inputs '()))))) "006i0zgwy81vxarpfm12vip4q6i5mgmi5mmy5ldvxp5hx9h3l0zg")))))
(native-inputs '()))))
(define mig-boot0 (define mig-boot0
(let* ((mig (package (let* ((mig (package
@ -2531,14 +2531,15 @@ memoized as a function of '%current-system'."
(define hurd-version-boot0 "0.9-229-ga1efcee8") (define hurd-version-boot0 "0.9-229-ga1efcee8")
(define hurd-source-boot0 (define hurd-source-boot0
(let ((version hurd-version-boot0)) (let ((version hurd-version-boot0))
(bootstrap-origin (origin
(origin (method url-fetch)
(method url-fetch) (uri (list (string-append "mirror://gnu/guix/mirror/hurd-v"
(uri (string-append "https://lilypond.org/janneke/hurd/" version ".tar.gz")
"hurd-v" version ".tar.gz")) (string-append "https://lilypond.org/janneke/hurd/"
(sha256 "hurd-v" version ".tar.gz")))
(base32 (sha256
"0bq2q2jisxcy0kgcm6rz0z2fddwxxm7azsama7li28a2m08kdpzy")))))) (base32
"0bq2q2jisxcy0kgcm6rz0z2fddwxxm7azsama7li28a2m08kdpzy")))))
(define hurd-headers-boot0 (define hurd-headers-boot0
(let ((hurd-headers (package (inherit hurd-headers) (let ((hurd-headers (package (inherit hurd-headers)
@ -3122,7 +3123,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
(with-boot4 (hidden-package (with-boot4 (hidden-package
(package-with-bootstrap-guile guile-3.0/fixed)))) (package-with-bootstrap-guile guile-3.0/fixed))))
(define glibc-utf8-locales-final (define-public glibc-utf8-locales-final
;; Now that we have GUILE-FINAL, build the UTF-8 locales. They are needed ;; Now that we have GUILE-FINAL, build the UTF-8 locales. They are needed
;; by the build processes afterwards so their 'scm_to_locale_string' works ;; by the build processes afterwards so their 'scm_to_locale_string' works
;; with the full range of Unicode codepoints (remember ;; with the full range of Unicode codepoints (remember
@ -3130,6 +3131,8 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
;; function.) ;; function.)
(package (package
(inherit glibc-utf8-locales) (inherit glibc-utf8-locales)
(properties `((hidden? . #t)
,@(package-properties glibc-utf8-locales)))
(native-inputs (native-inputs
`(("glibc" ,glibc-final) `(("glibc" ,glibc-final)
("gzip" ,(with-boot4 gzip)))))) ("gzip" ,(with-boot4 gzip))))))
@ -3379,6 +3382,9 @@ is the GNU Compiler Collection.")
(define-public gcc-toolchain-11 (define-public gcc-toolchain-11
(make-gcc-toolchain gcc-11)) (make-gcc-toolchain gcc-11))
(define-public gcc-toolchain-12
(make-gcc-toolchain gcc-12))
(define-public gcc-toolchain-aka-gcc (define-public gcc-toolchain-aka-gcc
;; It's natural for users to try "guix install gcc". This package ;; It's natural for users to try "guix install gcc". This package
;; automatically "redirects" them to 'gcc-toolchain'. ;; automatically "redirects" them to 'gcc-toolchain'.

93
gnu/packages/compression.scm
View file

@ -10,7 +10,7 @@
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com> ;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org> ;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2016–2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2016–2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016 David Craven <david@craven.ch> ;;; Copyright © 2016 David Craven <david@craven.ch>
;;; Copyright © 2016, 2019, 2020 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2016, 2019, 2020 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2016, 2018, 2019, 2020, 2021 Marius Bakke <marius@gnu.org> ;;; Copyright © 2016, 2018, 2019, 2020, 2021 Marius Bakke <marius@gnu.org>
@ -53,6 +53,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages compression) (define-module (gnu packages compression)
#:use-module (guix gexp)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (guix packages) #:use-module (guix packages)
@ -397,8 +398,10 @@ decompression.")
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'unpack-gnulib (add-after 'unpack 'unpack-gnulib
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs native-inputs #:allow-other-keys)
(let ((gnulib (assoc-ref inputs "gnulib"))) (let ((gnulib
(dirname (search-input-file (or native-inputs inputs)
"gnulib-tool.py"))))
(copy-recursively gnulib "lib") (copy-recursively gnulib "lib")
(setenv "PATH" (string-append "lib:" (getenv "PATH"))) (setenv "PATH" (string-append "lib:" (getenv "PATH")))
#t))) #t)))
@ -616,14 +619,14 @@ archiving. Lzip is a clean implementation of the LZMA algorithm.")
(define-public lziprecover (define-public lziprecover
(package (package
(name "lziprecover") (name "lziprecover")
(version "1.22") (version "1.23")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://savannah/lzip/lziprecover/" (uri (string-append "mirror://savannah/lzip/lziprecover/"
"lziprecover-" version ".tar.gz")) "lziprecover-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0qh8dnhr5rly2k9dnx43qqynqwqzi5kfb15pyd29qwppfl4qm5gx")))) "0wmmyi03fv2lflsir5ldrsv04q57k3hmlqajzb1m3p86gwbh967j"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(home-page "https://www.nongnu.org/lzip/lziprecover.html") (home-page "https://www.nongnu.org/lzip/lziprecover.html")
(synopsis "Recover and decompress data from damaged lzip files") (synopsis "Recover and decompress data from damaged lzip files")
@ -964,31 +967,30 @@ byte-for-byte identical output.")
(define-public pigz (define-public pigz
(package (package
(name "pigz") (name "pigz")
(version "2.6") (version "2.7")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://zlib.net/pigz/" (uri (string-append "http://zlib.net/pigz/"
name "-" version ".tar.gz")) name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0z9avc4mifwcpj3qdsf9m2rjw9jx03b2r9pj0c4xgla9fh6ppv9f")))) "01y7n7lafp6maqnp4jrmasawnv67najh1bd7gjrmv3d08h1ydjdl"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases (list #:make-flags
(modify-phases %standard-phases #~(list (string-append "CC=" #$(cc-for-target)))
(delete 'configure) #:test-target "test"
(replace 'install #:phases
(lambda* (#:key outputs #:allow-other-keys) #~(modify-phases %standard-phases
(let* ((out (assoc-ref outputs "out")) (delete 'configure)
(bin (string-append out "/bin")) (replace 'install
(man (string-append out "/share/man/man1"))) (lambda _
(install-file "pigz" bin) (let* ((bin (string-append #$output "/bin"))
(symlink "pigz" (string-append bin "/unpigz")) (man (string-append #$output "/share/man/man1")))
(install-file "pigz.1" man) (install-file "pigz" bin)
#t)))) (symlink "pigz" (string-append bin "/unpigz"))
#:make-flags (install-file "pigz.1" man)))))))
(list ,(string-append "CC=" (cc-for-target))) (native-inputs (list which))
#:test-target "tests"))
(inputs (list zlib)) (inputs (list zlib))
(home-page "https://zlib.net/pigz/") (home-page "https://zlib.net/pigz/")
(synopsis "Parallel implementation of gzip") (synopsis "Parallel implementation of gzip")
@ -1072,7 +1074,7 @@ tarballs.")
(define-public libjcat (define-public libjcat
(package (package
(name "libjcat") (name "libjcat")
(version "0.1.9") (version "0.1.11")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -1082,13 +1084,12 @@ tarballs.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "02cgznk6qdylqpcyks6qykmvhpz1pplvnxp72bjzji1y6yj3zpkj")))) (base32 "08zywwhm9q8m8v17w2mp23w3w93p40ir1w4x18zrlbhs10xnhiys"))))
(build-system meson-build-system) (build-system meson-build-system)
(native-inputs (native-inputs
(list gobject-introspection help2man pkg-config)) (list gobject-introspection help2man pkg-config))
(inputs (inputs
(list git (list glib
glib
gnupg gnupg
gnutls gnutls
gpgme gpgme
@ -1141,14 +1142,14 @@ human-readable output.")
(define-public lrzip (define-public lrzip
(package (package
(name "lrzip") (name "lrzip")
(version "0.641") (version "0.651")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"http://ck.kolivas.org/apps/lrzip/lrzip-" version ".tar.xz")) "http://ck.kolivas.org/apps/lrzip/lrzip-" version ".tar.xz"))
(sha256 (sha256
(base32 "0ziyanspd96dc3lp2qdcylc7aq8dhb511jhqrhxvlp502fjqjqrc")))) (base32 "1y822rpl7ak57s1a4xzd6ja82cp3sff9axrpkdn5khcpn3n8vga8"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(;; nasm is only required when building for 32-bit x86 platforms `(;; nasm is only required when building for 32-bit x86 platforms
@ -1953,14 +1954,14 @@ of archives.")
(define-public lunzip (define-public lunzip
(package (package
(name "lunzip") (name "lunzip")
(version "1.12") (version "1.13")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://savannah/lzip/lunzip/" (uri (string-append "mirror://savannah/lzip/lunzip/"
"lunzip-" version ".tar.gz")) "lunzip-" version ".tar.gz"))
(sha256 (sha256
(base32 "1liaynyy3qcs29hfk1pnb7i9r1mnmpw557j5v356qsv6qnm4lnz5")))) (base32 "153qa674rlbw812fb7h8rfzdw4hvr6vgkjl1c0yfplj7p4h86z9w"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -1980,14 +1981,14 @@ Lunzip is intended to be fully compatible with the regular lzip package.")
(define-public clzip (define-public clzip
(package (package
(name "clzip") (name "clzip")
(version "1.12") (version "1.13")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://savannah/lzip/clzip/" (uri (string-append "mirror://savannah/lzip/clzip/"
"clzip-" version ".tar.gz")) "clzip-" version ".tar.gz"))
(sha256 (sha256
(base32 "1s7yidqvmxi61hh569h5aci816l6qkffjgx0zx57qyyq0qq2pjgw")))) (base32 "0ypagygbnq4ppqyg7sj4816x5c1w579883m2nsq0zxbb0gszpjbs"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -2006,14 +2007,14 @@ Clzip is intended to be fully compatible with the regular lzip package.")
(define-public lzlib (define-public lzlib
(package (package
(name "lzlib") (name "lzlib")
(version "1.12") (version "1.13")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://savannah/lzip/lzlib/" (uri (string-append "mirror://savannah/lzip/lzlib/"
"lzlib-" version ".tar.gz")) "lzlib-" version ".tar.gz"))
(sha256 (sha256
(base32 "1c9pwd6by8is4z8bs6j306jyy6pgm2dvsn4fr7fg2b5m5qj88pcf")))) (base32 "107vkzfgvb21cqq4gmxyfn97l4s2c0b3i14k9rkv594b2krmiax1"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -2033,14 +2034,14 @@ corrupted input.")
(define-public plzip (define-public plzip
(package (package
(name "plzip") (name "plzip")
(version "1.9") (version "1.10")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://savannah/lzip/plzip/" (uri (string-append "mirror://savannah/lzip/plzip/"
"plzip-" version ".tar.gz")) "plzip-" version ".tar.gz"))
(sha256 (sha256
(base32 "19zinpx7hssl6r3vilpvq2s7wha3545xan8b0vcvsxnyipdx3n0l")))) (base32 "16408n8z21hfxp0qnx3hh1d0c47g8z9i3vflbgbrmf6qcn1abyj3"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
(list lzlib)) (list lzlib))
@ -2299,7 +2300,7 @@ reading from and writing to ZIP archives.")
(package (package
(inherit quazip-0) (inherit quazip-0)
(name "quazip") (name "quazip")
(version "1.2") (version "1.3")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -2308,7 +2309,7 @@ reading from and writing to ZIP archives.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1dwld7jxhjz9l33lrqwvklazdy7ygi6n1m4ry1n1sk5dnschrhby")))))) (base32 "0njgbdm3dm5p7xic5mhppbqsl36zn83zz0xfsfh624hlk0ff7n0a"))))))
(define-public zchunk (define-public zchunk
(package (package
@ -2625,7 +2626,7 @@ to their original, binary CD format.")
(define-public libdeflate (define-public libdeflate
(package (package
(name "libdeflate") (name "libdeflate")
(version "1.8") (version "1.10")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -2634,7 +2635,7 @@ to their original, binary CD format.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0nw1zhr2s6ffcc3s0n5wsshvjb6pmybwapagli135zzn2fx1pdiz")))) "0v5qh1cz787xj86l15x6brkkaw0jbxhqj5f85275q0l945qazvwm"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:make-flags `(#:make-flags
@ -2642,6 +2643,10 @@ to their original, binary CD format.")
(string-append "PREFIX=" (assoc-ref %outputs "out"))) (string-append "PREFIX=" (assoc-ref %outputs "out")))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'skip-static-library-installation
(lambda _
(substitute* "Makefile"
(("install .*\\$\\(STATIC_LIB\\).*") ""))))
(delete 'configure)))) (delete 'configure))))
(inputs (inputs
(list zlib)) (list zlib))
@ -2689,7 +2694,7 @@ can append files to the end of such compressed archives.")
(define-public libcbor (define-public libcbor
(package (package
(name "libcbor") (name "libcbor")
(version "0.8.0") (version "0.9.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -2697,7 +2702,7 @@ can append files to the end of such compressed archives.")
(url "https://github.com/PJK/libcbor") (url "https://github.com/PJK/libcbor")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (base32 "01dv4vxcmbvpphqy16vqiwh25wx11x630js5wfnx7cryarsh9ld7")))) (sha256 (base32 "1n9fx5i81wr9j18bhz74wclfkwqf1k3piq6lzngvkmq04krzi7ss"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:configure-flags '(#:configure-flags
@ -2711,8 +2716,8 @@ can append files to the end of such compressed archives.")
(string-append "-DCMAKE_INSTALL_RPATH=" lib))))) (string-append "-DCMAKE_INSTALL_RPATH=" lib)))))
(synopsis "The C library for parsing and generating CBOR") (synopsis "The C library for parsing and generating CBOR")
(description (description
"The Concise Binary Object Representation (CBOR) is a data format whose "@acronym{CBOR, The Concise Binary Object Representation} is a data format
design goals include the possibility of extremely small code size, fairly whose design goals include the possibility of extremely small code size, fairly
small message size, and extensibility without the need for version small message size, and extensibility without the need for version
negotiation. These design goals make it different from earlier binary negotiation. These design goals make it different from earlier binary
serializations such as ASN.1 and MessagePack.") serializations such as ASN.1 and MessagePack.")

6
gnu/packages/containers.scm
View file

@ -47,10 +47,10 @@
#:use-module (gnu packages web)) #:use-module (gnu packages web))
(define-public crun (define-public crun
(let ((commit "8e5757a4e68590326dafe8a8b1b4a584b10a1370")) (let ((commit "c381048530aa750495cf502ddb7181f2ded5b400"))
(package (package
(name "crun") (name "crun")
(version "1.3") (version "1.4.5")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -59,7 +59,7 @@
(commit commit) (commit commit)
(recursive? #t))) (recursive? #t)))
(sha256 (sha256
(base32 "01yiss2d57kwlxb7zlqzjwlg9fyaf19yjngd1mw9n4hxls3dfj3k")) (base32 "0x2xmr5sv9ivvcv5fl5jjk4kq9b3n97s5hsqiqfwl4rz8qcz4xk1"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments

4
gnu/packages/coq.scm
View file

@ -52,7 +52,7 @@
(define-public coq-core (define-public coq-core
(package (package
(name "coq-core") (name "coq-core")
(version "8.15.0") (version "8.15.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -62,7 +62,7 @@
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0473mmc4wv8zbbcbvqqn0z9gz9y8gf4w2q6j6h50lx0jphpg2n8z")) "04csl4fvl41hizn95c4j9gxkl28495fzqdgm83ss67s5jvbfczvs"))
(patches (search-patches "coq-fix-envvars.patch")))) (patches (search-patches "coq-fix-envvars.patch"))))
(native-search-paths (native-search-paths
(list (search-path-specification (list (search-path-specification

104
gnu/packages/cpp.scm
View file

@ -1064,7 +1064,7 @@ parsers according to a Parsing Expression Grammar (PEG).")
(define-public cxxopts (define-public cxxopts
(package (package
(name "cxxopts") (name "cxxopts")
(version "2.2.1") (version "3.0.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -1073,7 +1073,7 @@ parsers according to a Parsing Expression Grammar (PEG).")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0d3y747lsh1wkalc39nxd088rbypxigm991lk3j91zpn56whrpha")))) "08x7j168l1xwj0r3rv89cgghmfhsx98lpq35r3vkh504m1pd55a6"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(synopsis "Lightweight C++ command line option parser") (synopsis "Lightweight C++ command line option parser")
(description (description
@ -1085,7 +1085,7 @@ standard GNU style syntax for options.")
(define-public folly (define-public folly
(package (package
(name "folly") (name "folly")
(version "2021.10.04.00") (version "2022.04.11.00")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -1094,7 +1094,7 @@ standard GNU style syntax for options.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1h7apl42idymqra0xgw7s5ys3dxrqd8gq0f99g048k4g5fxl64s9")))) "03c1my66xncn8yvgih4kc7j83ckmjbi2w29hdb28j30ixbn0bsjg"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(;; Tests must be explicitly enabled '(;; Tests must be explicitly enabled
@ -1157,57 +1157,55 @@ of C++14 components that complements @code{std} and Boost.")
(("ENABLE_TESTS") "FALSE"))))))) (("ENABLE_TESTS") "FALSE")))))))
(home-page "https://pocoproject.org/") (home-page "https://pocoproject.org/")
(synopsis "Portable C++ components") (synopsis "Portable C++ components")
(description "A collection of libraries intended to be useful for building (description "This package provides a collection of C++ libraries intended
network-based applications.") to be useful for building network-based applications.")
(license license:boost1.0))) (license license:boost1.0)))
(define-public aws-crt-cpp (define-public aws-crt-cpp
(let* ((commit "b6d311d76b504bf8ace5134d3fca0e672c36c9c3") (package
(revision "1")) (name "aws-crt-cpp")
(package ;; Update only when updating aws-sdk-cpp, and when updating also update
(name "aws-crt-cpp") ;; versions of library dependencies linked from from
; Update only when updating aws-sdk-cpp, and when updating also update ;; https://github.com/awslabs/aws-crt-cpp/tree/{aws-crt-cpp commit}/crt
; versions of library dependencies linked from from (version "0.17.27")
; https://github.com/awslabs/aws-crt-cpp/tree/{aws-crt-cpp commit}/crt (source (origin
(version (git-version "0.17.1" revision commit)) (method git-fetch)
(source (origin (uri (git-reference
(method git-fetch) (url "https://github.com/awslabs/aws-crt-cpp")
(uri (git-reference (commit (string-append "v" version))))
(url "https://github.com/awslabs/aws-crt-cpp") (file-name (git-file-name name version))
(commit commit))) (sha256
(file-name (git-file-name name version)) (base32
(sha256 "14g8pn7yii1klby7phcw08qnld1qv11vwmbdz8cs3mlpqahxrh4i"))))
(base32 (build-system cmake-build-system)
"1n0nlbz91j3ycwwrh9652f0h5qr2sj5b1l0i5sg40ajzs7wvzd32")))) (arguments
(build-system cmake-build-system) '(#:configure-flags
(arguments (list "-DBUILD_DEPS=OFF"
'(#:configure-flags "-DBUILD_SHARED_LIBS=ON"
(list "-DBUILD_DEPS=OFF" (string-append "-DCMAKE_PREFIX_PATH="
"-DBUILD_SHARED_LIBS=ON" (assoc-ref %build-inputs "aws-c-common"))
(string-append "-DCMAKE_PREFIX_PATH=" "-DENABLE_NET_TESTS=OFF")))
(assoc-ref %build-inputs "aws-c-common")) (propagated-inputs
"-DENABLE_NET_TESTS=OFF"))) (list aws-c-auth
(propagated-inputs aws-c-cal
(list aws-c-auth aws-c-event-stream
aws-c-cal aws-c-http
aws-c-event-stream aws-c-mqtt
aws-c-http aws-c-s3))
aws-c-mqtt (synopsis "C++ wrapper for Amazon Web Services C libraries")
aws-c-s3)) (description "The AWS Common Runtime (CRT) library provides a C++ wrapper
(synopsis "C++ wrapper for Amazon Web Services C libraries")
(description "The AWS Common Runtime (CRT) library provides a C++ wrapper
implementation for the following @acronym{AWS,Amazon Web Services} C libraries: implementation for the following @acronym{AWS,Amazon Web Services} C libraries:
aws-c-auth, aws-c-cal, aws-c-common, aws-c-compression, aws-c-event-stream, aws-c-auth, aws-c-cal, aws-c-common, aws-c-compression, aws-c-event-stream,
aws-c-http, aws-c-io, aws-c-mqtt, aws-checksums, and s2n.") aws-c-http, aws-c-io, aws-c-mqtt, aws-checksums, and s2n.")
(home-page "https://github.com/awslabs/aws-crt-cpp") (home-page "https://github.com/awslabs/aws-crt-cpp")
(license license:asl2.0)))) (license license:asl2.0)))
(define-public aws-sdk-cpp (define-public aws-sdk-cpp
(package (package
(name "aws-sdk-cpp") (name "aws-sdk-cpp")
; When updating also check for a tagged update to aws-crt-cpp from ; When updating also check for a tagged update to aws-crt-cpp from
; https://github.com/aws/aws-sdk-cpp/tree/main/crt ; https://github.com/aws/aws-sdk-cpp/tree/main/crt
(version "1.9.136") (version "1.9.236")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -1216,7 +1214,7 @@ aws-c-http, aws-c-io, aws-c-mqtt, aws-checksums, and s2n.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0ap7g7nmbnrcajy3b788bnpqd87dwmg83dhll1q8qzli04bcg47i")))) "13qhxsbfn81r7lg382wb4d3xfc4a287ikww5i7whddk5yz0j8384"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(;; Tests are run during the build phase. '(;; Tests are run during the build phase.
@ -1229,7 +1227,7 @@ aws-c-http, aws-c-io, aws-c-mqtt, aws-checksums, and s2n.")
(propagated-inputs (propagated-inputs
(list aws-crt-cpp)) (list aws-crt-cpp))
(inputs (inputs
(list curl openssl pulseaudio zlib)) (list curl pulseaudio zlib))
(synopsis "Amazon Web Services SDK for C++") (synopsis "Amazon Web Services SDK for C++")
(description (description
"The AWS SDK for C++ provides a C++11 interface to the @acronym{AWS,Amazon "The AWS SDK for C++ provides a C++11 interface to the @acronym{AWS,Amazon
@ -1294,11 +1292,19 @@ provides a number of utilities to make coding with expected cleaner.")
`(#:configure-flags '("-Dbenchmarks=false") `(#:configure-flags '("-Dbenchmarks=false")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
,@(if (%current-target-system)
`(;; boost is a test dependency. We don't run tests when
;; cross-compiling. Disable all targets that depend on it.
(add-after 'unpack 'do-not-check-for-boost
(lambda _
(substitute* "meson.build"
(("unit_test_framework = [^\n]*" all)
"unit_test_framework = disabler()")))))
'())
(replace 'check (replace 'check
(lambda* (#:key tests? #:allow-other-keys) (lambda* (#:key tests? #:allow-other-keys)
(when tests? (when tests?
(lambda _ (invoke "./tests"))))
(invoke "make" "run_tests")))))
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(copy-recursively "../source/include/atomic_queue" (copy-recursively "../source/include/atomic_queue"
@ -1385,7 +1391,7 @@ feature set with a simple and intuitive interface.")
(define-public caf (define-public caf
(package (package
(name "caf") (name "caf")
(version "0.18.5") (version "0.18.6")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -1394,7 +1400,7 @@ feature set with a simple and intuitive interface.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"04b4kjisb5wzq6pilh8xzbxn7qcjgppl8k65hfv0zi0ja8fyp1xk")))) "055y82044djphpwbazaxsvmb66c2xfdi8vyny8pzdxkdgxfh0vq1"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:configure-flags '(#:configure-flags

1517
gnu/packages/cran.scm
View file

File diff suppressed because it is too large Load diff

831
gnu/packages/crates-io.scm
View file

File diff suppressed because it is too large Load diff

7
gnu/packages/cross-base.scm
View file

@ -30,6 +30,7 @@
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages hurd) #:use-module (gnu packages hurd)
#:use-module (gnu packages mingw) #:use-module (gnu packages mingw)
#:use-module (guix platform)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix utils) #:use-module (guix utils)
@ -241,6 +242,9 @@ target that libc."
(append (append
(origin-patches (package-source xgcc)) (origin-patches (package-source xgcc))
(append (cond (append (cond
((version>=? (package-version xgcc) "12.0")
(search-patches "gcc-12-cross-environment-variables.patch"
"gcc-cross-gxx-include-dir.patch"))
((version>=? (package-version xgcc) "10.0") ((version>=? (package-version xgcc) "10.0")
(search-patches "gcc-10-cross-environment-variables.patch" (search-patches "gcc-10-cross-environment-variables.patch"
"gcc-cross-gxx-include-dir.patch")) "gcc-cross-gxx-include-dir.patch"))
@ -345,7 +349,8 @@ target that libc."
`(modify-phases ,phases `(modify-phases ,phases
(replace 'build (replace 'build
(lambda _ (lambda _
(setenv "ARCH" ,(system->linux-architecture target)) (setenv "ARCH" ,(platform-linux-architecture
(lookup-platform-by-target target)))
(format #t "`ARCH' set to `~a' (cross compiling)~%" (format #t "`ARCH' set to `~a' (cross compiling)~%"
(getenv "ARCH")) (getenv "ARCH"))

138
gnu/packages/crypto.scm
View file

@ -1,9 +1,9 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 David Thompson <davet@gnu.org> ;;; Copyright © 2014 David Thompson <davet@gnu.org>
;;; Copyright © 2015, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2017, 2018, 2019, 2022 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2017, 2018, 2019, 2021 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016, 2017, 2018, 2019, 2021 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox> ;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox>
;;; Copyright © 2016–2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2016–2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016, 2017 Nikita <nikita@n0.is> ;;; Copyright © 2016, 2017 Nikita <nikita@n0.is>
;;; Copyright © 2016, 2017, 2019, 2020 Eric Bavier <bavier@posteo.net> ;;; Copyright © 2016, 2017, 2019, 2020 Eric Bavier <bavier@posteo.net>
;;; Copyright © 2017 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2017 Pierre Langlois <pierre.langlois@gmx.com>
@ -23,6 +23,7 @@
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be> ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2021, 2022 Brendan Tildesley <mail@brendan.scot> ;;; Copyright © 2021, 2022 Brendan Tildesley <mail@brendan.scot>
;;; Copyright © 2022 Allan Adair <allan@adair.no> ;;; Copyright © 2022 Allan Adair <allan@adair.no>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -397,6 +398,11 @@ the wrong hands.")
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(delete 'configure) ; no configure script (delete 'configure) ; no configure script
(add-after 'unpack 'avoid-embedding-timestamp
;; Do not embed build timestamp
(lambda _
(substitute* "Makefile"
(("shell date") "shell true"))))
(add-after 'install 'install:static (add-after 'install 'install:static
(lambda _ (lambda _
(with-directory-excursion #$output (with-directory-excursion #$output
@ -580,7 +586,7 @@ attacks than alternative functions such as @code{PBKDF2} or @code{bcrypt}.")
(define-public libscrypt (define-public libscrypt
(package (package
(name "libscrypt") (name "libscrypt")
(version "1.21") (version "1.22")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -589,22 +595,20 @@ attacks than alternative functions such as @code{PBKDF2} or @code{bcrypt}.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32 "10dinz1zx8zfm81ra16s20izpm7f7j414n4i3fkdf40vbl5slra1"))))
"1d76ys6cp7fi4ng1w3mz2l0p9dbr7ljbk33dcywyimzjz8bahdng"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs (list "out" "static")) (outputs (list "out" "static"))
(arguments (arguments
`(#:make-flags (list (string-append "PREFIX=" %output) (list #:make-flags
,(string-append "CC=" (cc-for-target))) #~(list (string-append "PREFIX=" #$output)
#:phases (string-append "CC=" #$(cc-for-target)))
(modify-phases %standard-phases #:phases
(delete 'configure) ; no configure script #~(modify-phases %standard-phases
(add-after 'install 'install:static (delete 'configure) ; no configure script
(lambda* (#:key outputs #:allow-other-keys) (add-after 'install 'install:static
(let* ((out (assoc-ref outputs "out")) (lambda _
(lib (string-append out "/lib"))) (install-file "libscrypt.a"
(install-file "libscrypt.a" lib) (string-append #$output:static "/lib")))))))
#t))))))
(home-page "https://lolware.net/libscrypt.html") (home-page "https://lolware.net/libscrypt.html")
(synopsis "Password hashing library") (synopsis "Password hashing library")
(description "@code{libscrypt} implements @code{scrypt} key derivation (description "@code{libscrypt} implements @code{scrypt} key derivation
@ -948,48 +952,44 @@ SHA256, SHA512, SHA3, AICH, ED2K, Tiger, DC++ TTH, BitTorrent BTIH, GOST R
(define-public botan (define-public botan
(package (package
(name "botan") (name "botan")
(version "2.18.2") (version "2.19.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://botan.randombit.net/releases/" (uri (string-append "https://botan.randombit.net/releases/"
"Botan-" version ".tar.xz")) "Botan-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0zih8agygp39ff0dwi3fv8y7dnnzpz3y86kcgjbhzlxry49kn6jl")))) "0q2mzzg0a40prp9gwjk7d9fn8kwj6z2x6h6mzlm0hr6sxz7h0vp2"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (list
(modify-phases %standard-phases #:phases
(replace 'configure #~(modify-phases %standard-phases
(lambda* (#:key inputs outputs #:allow-other-keys) (replace 'configure
(let* ((out (assoc-ref %outputs "out")) (lambda* (#:key inputs outputs #:allow-other-keys)
(lib (string-append out "/lib"))) ;; Upstream tests and benchmarks with -O3.
;; Upstream tests and benchmarks with -O3. (setenv "CXXFLAGS" "-O3")
(setenv "CXXFLAGS" "-O3") (invoke "python" "./configure.py"
(invoke "python" "./configure.py" (string-append "--prefix=" #$output)
(string-append "--prefix=" out) "--disable-static"
"--disable-static"
;; Otherwise, the `botan` executable cannot find ;; Otherwise, the `botan` executable cannot find
;; libbotan. ;; libbotan.
(string-append "--ldflags=-Wl,-rpath=" lib) (string-append "--ldflags=-Wl,-rpath=" #$output "/lib")
"--with-os-feature=getentropy" "--with-os-feature=getentropy"
"--with-rst2man" "--with-rst2man"
;; Recommended by upstream ;; Recommended by upstream
"--with-zlib" "--with-bzip2" "--with-sqlite3")))) "--with-zlib" "--with-bzip2" "--with-sqlite3")))
(add-before 'check 'library-path-for-tests (add-before 'check 'library-path-for-tests
(lambda _ (setenv "LD_LIBRARY_PATH" (getcwd)))) (lambda _ (setenv "LD_LIBRARY_PATH" (getcwd))))
(replace 'check (replace 'check
(lambda* (#:key tests? #:allow-other-keys) (lambda* (#:key tests? #:allow-other-keys)
(if tests? (when tests?
(invoke "./botan-test"))))))) (invoke "./botan-test")))))))
(native-inputs (native-inputs (list python-wrapper python-docutils))
`(("python" ,python-wrapper) (inputs (list sqlite bzip2 zlib))
("python-docutils" ,python-docutils)))
(inputs
(list sqlite bzip2 zlib))
(synopsis "Cryptographic library in C++11") (synopsis "Cryptographic library in C++11")
(description "Botan is a cryptography library, written in C++11, offering (description "Botan is a cryptography library, written in C++11, offering
the tools necessary to implement a range of practical systems, such as TLS/DTLS, the tools necessary to implement a range of practical systems, such as TLS/DTLS,
@ -1546,8 +1546,6 @@ structure. However CryFS is not considered stable yet by the developers.")
(define-public rust-blake3-0.3 (define-public rust-blake3-0.3
(package (package
(name "rust-blake3") (name "rust-blake3")
;; Version 1 requires Rust >= 1.51.
;; <https://github.com/BLAKE3-team/BLAKE3/releases/tag/1.0.0>
(version "0.3.8") (version "0.3.8")
(source (source
(origin (origin
@ -1577,6 +1575,48 @@ SHA-3, and BLAKE2.")
;; program provided by this package. ;; program provided by this package.
(license (list license:cc0 license:asl2.0)))) (license (list license:cc0 license:asl2.0))))
(define-public rust-blake3-1
(package
(name "rust-blake3")
(version "1.0.0")
;; The crate does not include the reference_impl directory.
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/BLAKE3-team/BLAKE3")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"09xi7rjyi5hgxyfpias485x5argwqygvfl9sggiw221qjdfxpbdn"))))
(build-system cargo-build-system)
(arguments
(list
#:cargo-inputs
`(("rust-arrayref" ,rust-arrayref-0.3)
("rust-arrayvec" ,rust-arrayvec-0.7)
("rust-cc" ,rust-cc-1)
("rust-cfg-if" ,rust-cfg-if-1)
("rust-constant-time-eq" ,rust-constant-time-eq-0.1)
("rust-crypto-mac" ,rust-crypto-mac-0.11)
("rust-digest" ,rust-digest-0.9)
("rust-rayon" ,rust-rayon-1))
#:cargo-development-inputs
`(("rust-cc" ,rust-cc-1)
("rust-hex" ,rust-hex-0.4)
("rust-page-size" ,rust-page-size-0.4)
("rust-rand" ,rust-rand-0.8)
("rust-rand-chacha" ,rust-rand-chacha-0.3))))
(home-page "https://github.com/BLAKE3-team/BLAKE3")
(synopsis "BLAKE3 hash function Rust implementation")
(description "This crate provides the official Rust implementation of the
BLAKE3 cryptographic hash function. BLAKE3 is faster than MD5, SHA-1, SHA-2,
SHA-3, and BLAKE2.")
;; Users may choose between these two licenses when redistributing the
;; program provided by this package.
(license (list license:cc0 license:asl2.0))))
(define-public b3sum (define-public b3sum
(package (package
(name "b3sum") (name "b3sum")

75
gnu/packages/cups.scm
View file

@ -5,7 +5,7 @@
;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org> ;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2017 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017–2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; ;;;
@ -55,6 +55,7 @@
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix gexp)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix utils) #:use-module (guix utils)
@ -707,8 +708,7 @@ should only be used as part of the Guix cups-pk-helper service.")
(search-patches "foomatic-filters-CVE-2015-8327.patch" (search-patches "foomatic-filters-CVE-2015-8327.patch"
"foomatic-filters-CVE-2015-8560.patch")))) "foomatic-filters-CVE-2015-8560.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(home-page (home-page "https://openprinting.github.io/projects/02-foomatic/")
"https://wiki.linuxfoundation.org/openprinting/database/foomatic")
(native-inputs (native-inputs
(list perl pkg-config)) (list perl pkg-config))
(inputs (inputs
@ -846,7 +846,7 @@ HP@tie{}LaserJet, and possibly other printers. See @file{README} for details.")
(define-public epson-inkjet-printer-escpr (define-public epson-inkjet-printer-escpr
(package (package
(name "epson-inkjet-printer-escpr") (name "epson-inkjet-printer-escpr")
(version "1.7.17") (version "1.7.18")
;; XXX: This currently works. But it will break as soon as a newer ;; XXX: This currently works. But it will break as soon as a newer
;; version is available since the URLs for older versions are not ;; version is available since the URLs for older versions are not
;; preserved. An alternative source will be added as soon as ;; preserved. An alternative source will be added as soon as
@ -854,54 +854,49 @@ HP@tie{}LaserJet, and possibly other printers. See @file{README} for details.")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download3.ebz.epson.net/dsc/f/03/00/12/99/" (uri (string-append "https://download3.ebz.epson.net/dsc/f/03/00/13/43/"
"78/73605b3f8aac63694fdabee6bd43389731696cd9/" "81/cbdd80826424935cef20d16be8ee5851388977a7/"
"epson-inkjet-printer-escpr-1.7.17-1lsb3.2.tar.gz")) "epson-inkjet-printer-escpr-1.7.18-1lsb3.2.tar.gz"))
(sha256 (sha256
(base32 "1d7ckrl5kya98h27mx4pgnaz5sbrsd5vhwc8kva9nfah9wsga4wg")))) (base32 "06pa47rl1gy19bg3fsp4a4y9vdy4ya2maajm14n791ivhf2hcwyh"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:modules (list #:modules
((srfi srfi-26) `((srfi srfi-26)
,@%gnu-build-system-modules) ,@%gnu-build-system-modules)
#:configure-flags #:configure-flags
`("--disable-static" #~(list "--disable-static"
,(string-append "--prefix=" (string-append "--prefix=" #$output)
(assoc-ref %outputs "out")) (string-append "--with-cupsfilterdir=" #$output "/lib/cups/filter")
,(string-append "--with-cupsfilterdir=" (string-append "--with-cupsppddir=" #$output "/share/cups/model"))
(assoc-ref %outputs "out") "/lib/cups/filter") #:phases
,(string-append "--with-cupsppddir=" #~(modify-phases %standard-phases
(assoc-ref %outputs "out") "/share/cups/model")) (add-after 'unpack 'patch-autotools-version-requirement
#:phases (lambda _
(modify-phases %standard-phases (substitute* "aclocal.m4"
(add-after 'unpack 'patch-autotools-version-requirement (("1\\.15")
(lambda _ #$(package-version automake)))
(substitute* "aclocal.m4" (substitute* "configure"
(("1\\.15") (("^(ACLOCAL=).*" _ match)
,(package-version automake))) (string-append match "aclocal"))
(substitute* "configure" (("^(AUTOMAKE=).*" _ match)
(("^(ACLOCAL=).*" _ match) (string-append match "automake")))))
(string-append match "aclocal")) (add-after 'install 'compress-PPDs
(("^(AUTOMAKE=).*" _ match) (lambda _
(string-append match "automake"))) (with-directory-excursion #$output
#t)) (for-each (cut invoke "gzip" "-9" <>)
(add-after 'install 'compress-PPDs (find-files "share/cups" "\\.ppd$"))))))))
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(with-directory-excursion out
(for-each (cut invoke "gzip" "-9" <>)
(find-files "share/cups" "\\.ppd$")))))))))
(native-inputs (native-inputs
(list autoconf automake)) (list autoconf automake))
(inputs (inputs
`(("cups" ,cups-minimal))) (list cups-minimal))
(synopsis "ESC/P-R printer driver") (synopsis "ESC/P-R printer driver")
(description (description
"This package provides a filter for @acronym{CUPS, the Common UNIX Printing "This package provides a filter for @acronym{CUPS, the Common UNIX Printing
System} that offers high-quality printing with Seiko@tie{}Epson color ink jet System} that offers high-quality printing with Seiko@tie{}Epson color ink jet
printers. It can be used only with printers that support the Epson@tie{}ESC/P-R printers. It can be used only with printers that support the Epson@tie{}ESC/P-R
language.") language.")
(home-page "http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX") (home-page "https://download.ebz.epson.net/dsc/search/01/search/?OSC=LX")
(license license:gpl2+))) (license license:gpl2+)))
(define-public splix (define-public splix

40
gnu/packages/curl.scm
View file

@ -41,6 +41,7 @@
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system go) #:use-module (guix build-system go)
#:use-module (guix build-system meson) #:use-module (guix build-system meson)
#:use-module ((guix search-paths) #:select ($SSL_CERT_DIR $SSL_CERT_FILE))
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
@ -82,15 +83,8 @@
("python" ,python-minimal-wrapper))) ("python" ,python-minimal-wrapper)))
(native-search-paths (native-search-paths
;; These variables are introduced by curl-use-ssl-cert-env.patch. ;; These variables are introduced by curl-use-ssl-cert-env.patch.
(list (search-path-specification (list $SSL_CERT_DIR
(variable "SSL_CERT_DIR") $SSL_CERT_FILE
(separator #f) ;single entry
(files '("etc/ssl/certs")))
(search-path-specification
(variable "SSL_CERT_FILE")
(file-type 'regular)
(separator #f) ;single entry
(files '("etc/ssl/certs/ca-certificates.crt")))
;; Note: This search path is respected by the `curl` command-line ;; Note: This search path is respected by the `curl` command-line
;; tool only. Patching libcurl to read it too would bring no ;; tool only. Patching libcurl to read it too would bring no
;; advantages and require maintaining a more complex patch. ;; advantages and require maintaining a more complex patch.
@ -362,3 +356,31 @@ curl to obtain exactly that HTTP request.")
(description "Coeurl is a simple library to do HTTP requests (description "Coeurl is a simple library to do HTTP requests
asynchronously via cURL in C++.") asynchronously via cURL in C++.")
(license license:expat))) (license license:expat)))
(define-public curlie
(package
(name "curlie")
(version "1.6.9")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rs/curlie")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1b94wfliivfq06i5sf664nhmp3v1k0lpz33cv9lyk6s59awb2hnw"))))
(build-system go-build-system)
(arguments
`(#:import-path "github.com/rs/curlie"))
(inputs
(list curl go-golang-org-x-crypto go-golang-org-x-sys))
(home-page "https://curlie.io")
(synopsis "The power of curl, the ease of use of httpie")
(description "If you like the interface of HTTPie but miss the features of
curl, curlie is what you are searching for. Curlie is a frontend to
@code{curl} that adds the ease of use of @code{httpie}, without compromising
on features and performance. All @code{curl} options are exposed with syntax
sugar and output formatting inspired from @code{httpie}.")
(license license:expat)))

2
gnu/packages/cybersecurity.scm
View file

@ -112,7 +112,7 @@ Refresh}in-DRAM mitigations effectively and as such can trigger bit flips.")
(build-system python-build-system) (build-system python-build-system)
(propagated-inputs (propagated-inputs
(list python-capstone)) (list python-capstone))
(home-page "http://shell-storm.org/project/ROPgadget/") (home-page "https://shell-storm.org/project/ROPgadget/")
(synopsis "Semiautomatic return oriented programming") (synopsis "Semiautomatic return oriented programming")
(description (description
"This tool lets you search for @acronym{ROP, Return Oriented Programming} "This tool lets you search for @acronym{ROP, Return Oriented Programming}

420
gnu/packages/databases.scm
View file

@ -23,7 +23,7 @@
;;; Copyright © 2017 Jelle Licht <jlicht@fsfe.org> ;;; Copyright © 2017 Jelle Licht <jlicht@fsfe.org>
;;; Copyright © 2017 Adriano Peluso <catonano@gmail.com> ;;; Copyright © 2017 Adriano Peluso <catonano@gmail.com>
;;; Copyright © 2017, 2021 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2017, 2021 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017–2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017, 2018 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2017, 2018 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2017, 2018 Ben Woodcroft <donttrustben@gmail.com> ;;; Copyright © 2017, 2018 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
@ -102,6 +102,7 @@
#:use-module (gnu packages gnome) #:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg) #:use-module (gnu packages gnupg)
#:use-module (gnu packages golang) #:use-module (gnu packages golang)
#:use-module (gnu packages gperf)
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
#:use-module (gnu packages guile) #:use-module (gnu packages guile)
#:use-module (gnu packages icu4c) #:use-module (gnu packages icu4c)
@ -178,47 +179,6 @@
#:use-module (srfi srfi-26) #:use-module (srfi srfi-26)
#:use-module (ice-9 match)) #:use-module (ice-9 match))
(define-public 4store
(package
(name "4store")
(version "1.1.6")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/4store/4store")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1kzdfmwpzy64cgqlkcz5v4klwx99w0jk7afckyf7yqbqb4rydmpk"))
(patches (search-patches "4store-unset-preprocessor-directive.patch"
"4store-fix-buildsystem.patch"))))
(build-system gnu-build-system)
(native-inputs
(list perl
python-2
autoconf
automake
gettext-minimal
libtool
`(,pcre "bin") ;for 'pcre-config'
pkg-config))
(inputs
(list glib
rasqal
libxml2
raptor2
readline
avahi
cyrus-sasl
openssl
`(,util-linux "lib")))
;; http://www.4store.org has been down for a while now.
(home-page "https://github.com/4store/4store")
(synopsis "Clustered RDF storage and query engine")
(description "4store is a RDF/SPARQL store written in C, supporting
either single machines or networked clusters.")
(license license:gpl3+)))
(define-public ephemeralpg (define-public ephemeralpg
(package (package
(name "ephemeralpg") (name "ephemeralpg")
@ -517,14 +477,14 @@ mapping from string keys to string values.")
(define-public memcached (define-public memcached
(package (package
(name "memcached") (name "memcached")
(version "1.6.13") (version "1.6.15")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"https://memcached.org/files/memcached-" version ".tar.gz")) "https://memcached.org/files/memcached-" version ".tar.gz"))
(sha256 (sha256
(base32 "1m5mhw9ybb8qcyi6hb5kwpqanqmlnz27r54ccabc4y7nhpfvl6mx")))) (base32 "05fmds73hr71bha9gszjfp02lgyacqfyyhkgl6xysy4kchyvwyld"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
(list libevent cyrus-sasl)) (list libevent cyrus-sasl))
@ -690,13 +650,13 @@ replacement for the code@{python-memcached} library.")
(define-public litecli (define-public litecli
(package (package
(name "litecli") (name "litecli")
(version "1.6.0") (version "1.8.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "litecli" version)) (uri (pypi-uri "litecli" version))
(sha256 (sha256
(base32 "1yb706mgzizzijm1k0fbny98jf58qh5q6f2870rbplxlfla4w9sd")))) (base32 "0ghh8hq5bw3y2ybiy4ibbdfz55jxvilg1s6zmhxmqikhg5s95xh2"))))
(build-system python-build-system) (build-system python-build-system)
(propagated-inputs (propagated-inputs
(list python-cli-helpers (list python-cli-helpers
@ -769,22 +729,16 @@ autocompletion and syntax highlighting.")
(define-public mycli (define-public mycli
(package (package
(name "mycli") (name "mycli")
(version "1.24.1") (version "1.25.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "mycli" version)) (uri (pypi-uri "mycli" version))
(sha256 (sha256
(base32 "0rij9nw20zhqr7cqnkm8daw8b1wdc9zb6ny1ji9qz5557nz9i3bl")))) (base32 "0231v7f6q84mjmi1h0ni3s55m2g8p5d7x5q49bgkxlaz2bc2xwgy"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
'(#:tests? #f ; tests expect a running MySQL '(#:tests? #f)) ; tests expect a running MySQL
#:phases (modify-phases %standard-phases
(add-after 'unpack 'loosen-requirements
(lambda _
;; Permit newer versions of sqlparse.
(substitute* "setup.py"
(("<0\\.4\\.0") "<0.5.0")))))))
(propagated-inputs (propagated-inputs
(list python-cli-helpers (list python-cli-helpers
python-click python-click
@ -1377,6 +1331,13 @@ pictures, sounds, or video.")
"src/loader/CMakeLists.txt") "src/loader/CMakeLists.txt")
(("\\$\\{PG_PKGLIBDIR\\}") (("\\$\\{PG_PKGLIBDIR\\}")
(string-append #$output "/lib"))))) (string-append #$output "/lib")))))
(add-after 'unpack 'remove-kernel-version
;; Do not embed the running kernel version for reproducible
;; builds
(lambda _
(substitute* "src/config.h.in"
(("BUILD_OS_VERSION ..CMAKE_SYSTEM_VERSION.")
"BUILD_OS_VERSION \""))))
;; Run the tests after install to make it easier to create the ;; Run the tests after install to make it easier to create the
;; required PostgreSQL+TimescaleDB filesystem union. ;; required PostgreSQL+TimescaleDB filesystem union.
(delete 'check) (delete 'check)
@ -1511,9 +1472,6 @@ CSV, DB3, iXF, SQLite, MS-SQL or MySQL to PostgreSQL.")
Most public APIs are compatible with @command{mysqlclient} and MySQLdb.") Most public APIs are compatible with @command{mysqlclient} and MySQLdb.")
(license license:expat))) (license license:expat)))
(define-public python2-pymysql
(package-with-python2 python-pymysql))
(define-public qdbm (define-public qdbm
(package (package
(name "qdbm") (name "qdbm")
@ -1545,30 +1503,33 @@ organized in a hash table or B+ tree.")
(define-public recutils (define-public recutils
(package (package
(name "recutils") (name "recutils")
(version "1.8") (version "1.9")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/recutils/recutils-" (uri (string-append "mirror://gnu/recutils/recutils-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"14xiln4immfsw8isnvwvq0h23f6z0wilpgsc4qzabnrzb5lsx3nz")))) "03kf91f20brn2ffljfjzirxh5xj99m1mvvspcx2lph9000mmj0b3"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments
(arguments '(#:configure-flags (list #:configure-flags
(list (string-append "--with-bash-headers=" '(list "--disable-static"
(assoc-ref %build-inputs "bash:include") (string-append "--with-bash-headers="
"/include/bash")))) (dirname (search-input-directory
%build-inputs
(native-inputs `(("bc" ,bc) "include/bash"))))))
("bash:include" ,bash "include") (native-inputs
("check" ,check-0.14) ;; XXX Without labels, the default 'configure phase picks the wrong "bash".
("pkg-config" ,pkg-config))) `(("bc" ,bc)
("bash:include" ,bash "include")
;; TODO: Add more optional inputs. ("check" ,check-0.14)
(inputs `(("curl" ,curl) ("pkg-config" ,pkg-config)))
("libgcrypt" ,libgcrypt) (inputs
("libuuid" ,util-linux "lib"))) ;; TODO: Add more optional inputs.
(list curl
libgcrypt
`(,util-linux "lib")))
(synopsis "Manipulate plain text files as databases") (synopsis "Manipulate plain text files as databases")
(description (description
"GNU Recutils is a set of tools and libraries for creating and "GNU Recutils is a set of tools and libraries for creating and
@ -1582,14 +1543,14 @@ types are supported, as is encryption.")
(define-public emacs-rec-mode (define-public emacs-rec-mode
(package (package
(name "emacs-rec-mode") (name "emacs-rec-mode")
(version "1.8.2") (version "1.8.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/" (uri (string-append "https://elpa.gnu.org/packages/"
"rec-mode-" version ".tar")) "rec-mode-" version ".tar"))
(sha256 (sha256
(base32 (base32
"06mjj1la2v8zdhsflj3mwcp7qnkj7gxzm8wbk2pli1h8vnq2zvd0")) "0lkmvvdj4xx3qhxqggizrcdawav0accyrza2wmhfdq88g2zh5575"))
(snippet '(begin (delete-file "rec-mode.info"))))) (snippet '(begin (delete-file "rec-mode.info")))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments (arguments
@ -1600,7 +1561,7 @@ types are supported, as is encryption.")
(invoke "makeinfo" "--no-split" (invoke "makeinfo" "--no-split"
"-o" "rec-mode.info" "rec-mode.texi")))))) "-o" "rec-mode.info" "rec-mode.texi"))))))
(native-inputs (native-inputs
`(("texinfo" ,texinfo))) (list texinfo))
(home-page "https://www.gnu.org/software/recutils/") (home-page "https://www.gnu.org/software/recutils/")
(synopsis "Emacs mode for working with recutils database files") (synopsis "Emacs mode for working with recutils database files")
(description "This package provides an Emacs major mode @code{rec-mode} (description "This package provides an Emacs major mode @code{rec-mode}
@ -2773,29 +2734,20 @@ semantics.")
(define-public libpqxx (define-public libpqxx
(package (package
(name "libpqxx") (name "libpqxx")
(version "4.0.1") (version "7.7.3")
(source (origin (source (origin
(method url-fetch) (method git-fetch)
(uri (string-append (uri (git-reference
"http://pqxx.org/download/software/libpqxx/" (url "https://github.com/jtv/libpqxx")
name "-" version ".tar.gz")) (commit version)))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0f6wxspp6rx12fkasanb0z2g2gc8dhcfwnxagx8wwqbpg6ifsz09")))) "1mrhsih5bhiin0l3c4vp22l9p7c5035m0vvqpx18c0407fkzc7hp"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs (list gcc-11 python-wrapper))
`(("python" ,python-2)))
(inputs (list postgresql)) (inputs (list postgresql))
(arguments (arguments '(#:tests? #f)) ;tests require a running PostgreSQL server
`(#:tests? #f ; # FAIL: 1
#:phases
(modify-phases %standard-phases
(add-before 'configure 'fix-sed-command
(lambda _
;; Newer sed versions error out if double brackets are not used.
(substitute* "configure"
(("\\[:space:\\]") "[[:space:]]"))
#t)))))
(synopsis "C++ connector for PostgreSQL") (synopsis "C++ connector for PostgreSQL")
(description (description
"Libpqxx is a C++ library to enable user programs to communicate with the "Libpqxx is a C++ library to enable user programs to communicate with the
@ -2859,9 +2811,6 @@ support for sqlite, mysql and postgresql. If you already have a database, you
can autogenerate peewee models using @code{pwiz}, a model generator.") can autogenerate peewee models using @code{pwiz}, a model generator.")
(license license:expat))) (license license:expat)))
(define-public python2-peewee
(package-with-python2 python-peewee))
(define-public python-pypika-tortoise (define-public python-pypika-tortoise
(package (package
(name "python-pypika-tortoise") (name "python-pypika-tortoise")
@ -3077,9 +3026,6 @@ development.")
for ODBC.") for ODBC.")
(license (license:x11-style "file://LICENSE.TXT")))) (license (license:x11-style "file://LICENSE.TXT"))))
(define-public python2-pyodbc-c
(package-with-python2 python-pyodbc-c))
(define-public python-pyodbc (define-public python-pyodbc
(package (package
(name "python-pyodbc") (name "python-pyodbc")
@ -3102,9 +3048,6 @@ for ODBC.")
for ODBC.") for ODBC.")
(license (license:x11-style "file:///LICENSE.TXT")))) (license (license:x11-style "file:///LICENSE.TXT"))))
(define-public python2-pyodbc
(package-with-python2 python-pyodbc))
(define-public mdbtools (define-public mdbtools
(package (package
(name "mdbtools") (name "mdbtools")
@ -3209,52 +3152,33 @@ Memory-Mapped Database} (LMDB), a high-performance key-value store.")
;; but not actually needed on platforms currently supported by Guix. ;; but not actually needed on platforms currently supported by Guix.
license:bsd-3)))) license:bsd-3))))
(define-public python-orator
(package
(name "python-orator")
(version "0.9.9")
(source (origin
(method url-fetch)
(uri (pypi-uri "orator" version))
(sha256
(base32
"0mbgybz63ryhr9p1f4glnls5c57jp6il3dw0kf97f3pj80687rvg"))))
(build-system python-build-system)
;; FIXME: Tests are not distributed with PyPI, and the repository
;; does not contain setup.py. How to test?
(arguments '(#:tests? #f))
(propagated-inputs
(list python-backpack
python-blinker
python-cleo
python-faker
python-inflection
python-lazy-object-proxy
python-pendulum
python-pyaml
python-pygments
python-pyyaml
python-simplejson
python-six
python-wrapt))
(home-page "https://orator-orm.com/")
(synopsis "ActiveRecord ORM for Python")
(description
"Orator provides a simple ActiveRecord-like Object Relational Mapping
implementation for Python.")
(license license:expat)))
(define-public virtuoso-ose (define-public virtuoso-ose
(package (package
(name "virtuoso-ose") (name "virtuoso-ose")
(version "7.2.6") (version "7.2.7")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/virtuoso/virtuoso/" version "/" (uri (string-append "mirror://sourceforge/virtuoso/virtuoso/" version "/"
"virtuoso-opensource-" version ".tar.gz")) "virtuoso-opensource-" version ".tar.gz"))
(sha256 (sha256
(base32 "0ly7s7a3w2a2zhhi9rq9k2qlnzapqbbc1rcdqb3zqqpgg81krz9q")))) (base32 "1853ln0smiilf3pni70gq6nmi9ps039cy44g6b5i9d2z1n9hnj02"))
(patches (search-patches "virtuoso-ose-remove-pre-built-jar-files.patch"))
(modules '((guix build utils)))
;; This snippet removes pre-built Java archives.
(snippet
'(for-each delete-file-recursively
(list "binsrc/hibernate"
"binsrc/jena"
"binsrc/jena2"
"binsrc/jena3"
"binsrc/jena4"
"binsrc/rdf4j"
"binsrc/sesame"
"binsrc/sesame2"
"binsrc/sesame3"
"binsrc/sesame4"
"libsrc/JDBCDriverType4")))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; Tests require a network connection. `(#:tests? #f ; Tests require a network connection.
@ -3265,6 +3189,40 @@ implementation for Python.")
"--enable-static=no") "--enable-static=no")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'bootstrap
(lambda _
(invoke "sh" "autogen.sh")))
(add-after 'unpack 'avoid-embedding-kernel-and-timestamps
;; For a reproducible build, avoid embedding the kernel version and
;; timestamps.
(lambda _
(substitute*
(list "bin/makever"
"appsrc/ODS-Polls/make_vad.sh"
"appsrc/ODS-Blog/make_vad.sh"
"appsrc/ODS-Community/make_vad.sh"
"appsrc/ODS-Framework/make_vad.sh"
"appsrc/ODS-Framework/oauth/make_vad.sh"
"appsrc/ODS-WebMail/make_vad.sh"
"appsrc/ODS-Calendar/make_vad.sh"
"appsrc/ODS-Gallery/make_vad.sh"
"appsrc/ODS-Briefcase/make_vad.sh"
"appsrc/ODS-FeedManager/make_vad.sh"
"appsrc/ODS-Bookmark/make_vad.sh"
"appsrc/ODS-Addressbook/make_vad.sh"
"binsrc/dbpedia/make_vad.sh"
"binsrc/samples/demo/make_vad.sh"
"binsrc/samples/demo/mkdoc.sh"
"binsrc/samples/sparql_demo/make_vad.sh"
"binsrc/bpel/make_vad.sh"
"binsrc/fct/make_vad.sh"
"binsrc/rdf_mappers/make_vad.sh"
"binsrc/isparql/make_vad.sh"
"binsrc/conductor/mkvad.sh")
(("^UNAME_SYSTEM=.*") "UNAME_SYSTEM=unknown\n")
(("^UNAME_RELEASE=.*") "UNAME_RELEASE=unknown\n")
(("^PACKDATE=.*") "PACKDATE=2012-04-18\n")
(("^DATE=.*") "DATE=2012-04-18\n"))))
;; Even with "--enable-static=no", "libvirtuoso-t.a" is left in ;; Even with "--enable-static=no", "libvirtuoso-t.a" is left in
;; the build output. The following phase removes it. ;; the build output. The following phase removes it.
(add-after 'install 'remove-static-libs (add-after 'install 'remove-static-libs
@ -3274,6 +3232,8 @@ implementation for Python.")
(delete-file (string-append lib "/" file))) (delete-file (string-append lib "/" file)))
'("libvirtuoso-t.a" '("libvirtuoso-t.a"
"libvirtuoso-t.la")))))))) "libvirtuoso-t.la"))))))))
(native-inputs
(list autoconf automake bison flex gperf libtool))
(inputs (inputs
(list openssl net-tools readline zlib)) (list openssl net-tools readline zlib))
(home-page "http://vos.openlinksw.com/owiki/wiki/VOS/") (home-page "http://vos.openlinksw.com/owiki/wiki/VOS/")
@ -3310,56 +3270,34 @@ local Cassandra clusters. It creates, launches and removes Cassandra clusters
on localhost.") on localhost.")
(license license:asl2.0))) (license license:asl2.0)))
(define-public python2-ccm
(package-with-python2 python-ccm))
(define-public python2-pysqlite
(package
(name "python2-pysqlite")
(version "2.8.3")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pysqlite" version))
(sha256
(base32
"1424gwq9sil2ffmnizk60q36vydkv8rxs6m7xs987kz8cdc37lqp"))))
(build-system python-build-system)
(inputs
(list sqlite))
(arguments
`(#:python ,python-2 ; incompatible with Python 3
#:tests? #f)) ; no test target
(home-page "https://github.com/ghaering/pysqlite")
(synopsis "SQLite bindings for Python")
(description
"Pysqlite provides SQLite bindings for Python that comply to the
Database API 2.0T.")
(license license:zlib)))
(define-public python-sqlalchemy (define-public python-sqlalchemy
(package (package
(name "python-sqlalchemy") (name "python-sqlalchemy")
(version "1.4.31") (version "1.4.35")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "SQLAlchemy" version)) (uri (pypi-uri "SQLAlchemy" version))
(sha256 (sha256
(base32 "06448s883bb8fgca33bn0pfaj15la0g4cax2mmx482kqwp8mjasq")))) (base32 "1ddab00d5mpzg25r1qxccma2zb551hhmymsy1ycp6r6w04xq3z1g"))))
(build-system python-build-system) (build-system python-build-system)
(native-inputs (native-inputs
(list python-cython ; for C extensions (list python-cython ; for C extensions
python-pytest python-mock)) ; for tests python-pytest python-mock python-pytest-xdist)) ; for tests
(propagated-inputs (propagated-inputs
(list python-greenlet)) (list python-greenlet))
(arguments (arguments
`(#:phases (list
(modify-phases %standard-phases #:phases
(replace 'check #~(modify-phases %standard-phases
(lambda* (#:key tests? #:allow-other-keys) (replace 'check
(when tests? (lambda* (#:key tests? #:allow-other-keys)
(invoke "py.test"))))))) (when tests?
(invoke "pytest" "-vv"
"-n" (number->string (parallel-job-count))
;; The memory usage tests are very expensive and run in
;; sequence; skip them.
"-k" "not test_memusage.py")))))))
(home-page "https://www.sqlalchemy.org") (home-page "https://www.sqlalchemy.org")
(synopsis "Database abstraction library") (synopsis "Database abstraction library")
(description (description
@ -3370,9 +3308,6 @@ designed for efficient and high-performing database access, adapted into a
simple and Pythonic domain language.") simple and Pythonic domain language.")
(license license:x11))) (license license:x11)))
(define-public python2-sqlalchemy
(package-with-python2 python-sqlalchemy))
(define-public python-sqlalchemy-stubs (define-public python-sqlalchemy-stubs
(package (package
(name "python-sqlalchemy-stubs") (name "python-sqlalchemy-stubs")
@ -3531,17 +3466,8 @@ value in database is immediately visible to other processes accessing the same
database. Concurrency is possible because the values are stored in separate database. Concurrency is possible because the values are stored in separate
files. Hence the “database” is a directory where all files are governed by files. Hence the “database” is a directory where all files are governed by
PickleShare.") PickleShare.")
(properties `((python2-variant . ,(delay python2-pickleshare))))
(license license:expat))) (license license:expat)))
(define-public python2-pickleshare
(let ((pickleshare (package-with-python2
(strip-python2-variant python-pickleshare))))
(package (inherit pickleshare)
(propagated-inputs (modify-inputs (package-propagated-inputs
pickleshare)
(prepend python2-pathlib2))))))
(define-public python-apsw (define-public python-apsw
(package (package
(name "python-apsw") (name "python-apsw")
@ -3585,9 +3511,6 @@ pysqlite it focuses on being a minimal layer over SQLite attempting just to
translate the complete SQLite API into Python.") translate the complete SQLite API into Python.")
(license license:zlib))) (license license:zlib)))
(define-public python2-apsw
(package-with-python2 python-apsw))
(define-public python-aiosqlite (define-public python-aiosqlite
(package (package
(name "python-aiosqlite") (name "python-aiosqlite")
@ -3621,47 +3544,28 @@ async versions of all the standard connection and cursor methods, and context
managers for automatically closing connections.") managers for automatically closing connections.")
(license license:expat))) (license license:expat)))
(define-public python2-neo4j-driver (define-public python-databases
(package (package
(name "python2-neo4j-driver") (name "python-databases")
;; NOTE: When upgrading to 1.5.0, please add a python3 variant. (version "0.5.5")
(version "1.4.0") (source
(source (origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "neo4j-driver" version)) (uri (pypi-uri "databases" version))
(sha256 (sha256
(base32 (base32 "0dzb998kg35xmd50ih168320vih2w3ich798r8fc4lf9q4bb1ih2"))))
"011r1vh182p8mm83d8dz9rfnc3l7rf7fd00cyrbyfzi71jmc4g98"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (propagated-inputs
`(#:python ,python-2)) (list python-aiosqlite
(home-page "https://neo4j.com/developer/python/") python-aiopg
(synopsis "Neo4j driver code written in Python") python-aiomysql
(description "This package provides the Neo4j Python driver that connects python-asyncpg
to the database using Neo4j's binary protocol. It aims to be minimal, while python-asyncmy
being idiomatic to Python.") python-sqlalchemy))
(license license:asl2.0))) (home-page "https://github.com/encode/databases")
(synopsis "Async database support for Python.")
(define-public python2-py2neo (description "This package implements async database support for Python.")
(package (license license:bsd-3)))
(name "python2-py2neo")
(version "3.1.2")
(source (origin
(method url-fetch)
(uri (pypi-uri "py2neo" version))
(sha256
(base32
"1f1q95vqcvlc3nsc33p841swnjdcjazddlq2dzi3qfnjqjrajxw1"))))
(build-system python-build-system)
(arguments
`(#:python ,python-2))
(home-page "https://py2neo.org")
(synopsis "Library and toolkit for working with Neo4j in Python")
(description "This package provides a client library and toolkit for
working with Neo4j from within Python applications and from the command
line. The core library has no external dependencies and has been carefully
designed to be easy and intuitive to use.")
(license license:asl2.0)))
(define-public python-psycopg2 (define-public python-psycopg2
(package (package
@ -3899,26 +3803,58 @@ for Python. The design goals are:
parsing code in hiredis. It primarily speeds up parsing of multi bulk replies.") parsing code in hiredis. It primarily speeds up parsing of multi bulk replies.")
(license license:bsd-3))) (license license:bsd-3)))
(define-public python2-hiredis (define-public python-aioredis
(package-with-python2 python-hiredis)) (package
(name "python-aioredis")
(version "2.0.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "aioredis" version))
(sha256
(base32 "13nrkk45az6qdiwfpbw80ls6bfip0i27qlkh9gsp2b9zk6pim9ga"))))
(build-system python-build-system)
(arguments
(list #:phases #~(modify-phases %standard-phases
(add-before 'check 'start-redis
(lambda _
(invoke "redis-server" "--daemonize" "yes")))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "pytest" "-vv")))))))
(native-inputs
(list python-pytest
python-pytest-asyncio
python-uvloop
redis))
(propagated-inputs
(list python-async-timeout
python-hiredis
python-typing-extensions))
(home-page "https://github.com/aio-libs/aioredis-py")
(synopsis "Redis support for Python's @code{asyncio} module")
(description "This package provides Redis support for the Python
@code{asyncio} (PEP 3156) module.")
(license license:expat)))
(define-public python-fakeredis (define-public python-fakeredis
(package (package
(name "python-fakeredis") (name "python-fakeredis")
(version "1.7.0") (version "1.7.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "fakeredis" version)) (uri (pypi-uri "fakeredis" version))
(sha256 (sha256
(base32 (base32
"0wacd3f558vzsrpdvgvdwy9pp6crxf8hxblz30zbsv1k63j15gf9")))) "1v68my2v7fg44zwky3k5d52nn1bi0szpgdslghrpa2ifnjhlnb3w"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
;; no tests ;; no tests
`(#:tests? #f)) `(#:tests? #f))
(propagated-inputs (propagated-inputs
(list python-packaging python-redis python-sortedcontainers)) (list python-aioredis python-packaging python-redis python-sortedcontainers))
(home-page "https://github.com/jamesls/fakeredis") (home-page "https://github.com/jamesls/fakeredis")
(synopsis "Fake implementation of redis API for testing purposes") (synopsis "Fake implementation of redis API for testing purposes")
(description (description
@ -3953,9 +3889,6 @@ reasonable substitute.")
"This package provides a Python interface to the Redis key-value store.") "This package provides a Python interface to the Redis key-value store.")
(license license:expat))) (license license:expat)))
(define-public python2-redis
(package-with-python2 python-redis))
(define-public python-rq (define-public python-rq
(package (package
(name "python-rq") (name "python-rq")
@ -4053,9 +3986,6 @@ is designed to have a low barrier to entry.")
Redis protocol.") Redis protocol.")
(license license:bsd-2))) (license license:bsd-2)))
(define-public python2-trollius-redis
(package-with-python2 python-trollius-redis))
(define-public python-sqlparse (define-public python-sqlparse
(package (package
(name "python-sqlparse") (name "python-sqlparse")
@ -4141,7 +4071,7 @@ the SQL language using a syntax that reflects the resulting query.")
(define-public apache-arrow (define-public apache-arrow
(package (package
(name "apache-arrow") (name "apache-arrow")
(version "7.0.0") (version "8.0.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -4151,7 +4081,7 @@ the SQL language using a syntax that reflects the resulting query.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"19xx6mlddca79q6d3wga574m4y32ixmxx2rmk6j3f22i5c37mjzw")))) "1gwiflk72pq1krc0sjzabypmh7slfyf7ak71fiypy3xgzw8a777c"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f `(#:tests? #f

6
gnu/packages/datastructures.scm
View file

@ -2,7 +2,7 @@
;;; Copyright © 2015, 2016, 2018, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2016, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2017, 2019–2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2016, 2017, 2019–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Meiyo Peng <meiyo.peng@gmail.com> ;;; Copyright © 2018 Meiyo Peng <meiyo.peng@gmail.com>
;;; Copyright © 2019, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2019, 2020, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2020 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2020 Marius Bakke <marius@gnu.org> ;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
;;; ;;;
@ -155,7 +155,7 @@ synchronisation library. It provides read-side access that scales linearly
with the number of cores. liburcu-cds provides efficient data structures with the number of cores. liburcu-cds provides efficient data structures
based on RCU and lock-free algorithms. These structures include hash tables, based on RCU and lock-free algorithms. These structures include hash tables,
queues, stacks, and doubly-linked lists.") queues, stacks, and doubly-linked lists.")
(license license:lgpl2.1+))) (license (list license:lgpl2.1 license:expat))))
(define-public uthash (define-public uthash
(package (package
@ -266,7 +266,7 @@ to the structure and choosing one or more fields to act as the key.")
Cflags: -I${includedir}~%" Cflags: -I${includedir}~%"
out ,version))) out ,version)))
#t)))))) #t))))))
(native-inputs (propagated-inputs
(list libdivsufsort)) (list libdivsufsort))
(home-page "https://github.com/simongog/sdsl-lite") (home-page "https://github.com/simongog/sdsl-lite")
(synopsis "Succinct data structure library") (synopsis "Succinct data structure library")

12
gnu/packages/dav.scm
View file

@ -4,6 +4,7 @@
;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Vinicius Monego <monego@posteo.net> ;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2021 Tanguy Le Carrour <tanguy@bioneland.org> ;;; Copyright © 2021 Tanguy Le Carrour <tanguy@bioneland.org>
;;; Copyright © 2022 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -40,18 +41,23 @@
(define-public radicale (define-public radicale
(package (package
(name "radicale") (name "radicale")
(version "3.0.6") (version "3.1.5")
(source (source
(origin (origin
;; There are no tests in the PyPI tarball. ;; There are no tests in the PyPI tarball.
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/Kozea/Radicale") (url "https://github.com/Kozea/Radicale")
(commit version))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1xlsvrmx6jhi71j6j8z9sli5vwxasivzjyqf8zq8r0l5p7350clf")))) (base32 "0wg0dg5bq221c6mj6fq53x82w0hb5hyyi8dqxkf6qnhf99bx8qrw"))))
(build-system python-build-system) (build-system python-build-system)
(arguments
(list
;; TODO: enable again when https://github.com/Kozea/Radicale/issues/1184
;; is fixed
#:tests? #f))
(native-inputs (native-inputs
(list python-pytest (list python-pytest
python-pytest-cov python-pytest-cov

313
gnu/packages/debian.scm
View file

@ -22,21 +22,27 @@
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix gexp)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system trivial) #:use-module (guix build-system trivial)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
#:use-module (gnu packages backup) #:use-module (gnu packages backup)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages bash)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages crypto) #:use-module (gnu packages crypto)
#:use-module (gnu packages dbm) #:use-module (gnu packages dbm)
#:use-module (gnu packages gettext) #:use-module (gnu packages gettext)
#:use-module (gnu packages gnupg) #:use-module (gnu packages gnupg)
#:use-module (gnu packages guile)
#:use-module (gnu packages linux)
#:use-module (gnu packages man)
#:use-module (gnu packages ncurses) #:use-module (gnu packages ncurses)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages wget)) #:use-module (gnu packages wget)
#:use-module (srfi srfi-26))
(define-public debian-archive-keyring (define-public debian-archive-keyring
(package (package
@ -200,62 +206,60 @@ contains the archive keys used for that.")
(base32 "0hfx6k86kby4xf0xqskpllq00g159j4khh66hfi6dhcdb91dgyd7")))) (base32 "0hfx6k86kby4xf0xqskpllq00g159j4khh66hfi6dhcdb91dgyd7"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases (list
(modify-phases %standard-phases #:phases
(delete 'configure) #~(modify-phases %standard-phases
(add-after 'unpack 'patch-source (delete 'configure)
(lambda* (#:key inputs outputs #:allow-other-keys) (add-after 'unpack 'patch-source
(let ((out (assoc-ref outputs "out")) (lambda* (#:key inputs outputs #:allow-other-keys)
(tzdata (assoc-ref inputs "tzdata")) (let ((debian #$(this-package-input "debian-archive-keyring"))
(debian (assoc-ref inputs "debian-keyring")) (ubuntu #$(this-package-input "ubuntu-keyring")))
(ubuntu (assoc-ref inputs "ubuntu-keyring"))) (substitute* "Makefile"
(substitute* "Makefile" (("/usr") "")
(("/usr") "") (("-o root -g root") "")
(("-o root -g root") "") (("chown root.*") "\n"))
(("chown root.*") "\n")) (substitute* '("scripts/etch"
(substitute* '("scripts/etch" "scripts/potato"
"scripts/potato" "scripts/sarge"
"scripts/sarge" "scripts/sid"
"scripts/sid" "scripts/woody"
"scripts/woody" "scripts/woody.buildd")
"scripts/woody.buildd") (("/usr") debian))
(("/usr") debian)) (substitute* "scripts/gutsy"
(substitute* "scripts/gutsy" (("/usr") ubuntu))
(("/usr") ubuntu)) (substitute* "debootstrap"
(substitute* "debootstrap" (("=/usr") (string-append "=" #$output))
(("=/usr") (string-append "=" out))) (("/usr/bin/dpkg") (search-input-file inputs "/bin/dpkg")))
;; Ensure PATH works both in guix and within the debian chroot ;; Ensure PATH works both in guix and within the debian chroot
;; workaround for: https://bugs.debian.org/929889 ;; workaround for: https://bugs.debian.org/929889
(substitute* "functions" (substitute* "functions"
(("PATH=/sbin:/usr/sbin:/bin:/usr/bin") (("PATH=/sbin:/usr/sbin:/bin:/usr/bin")
"PATH=$PATH:/sbin:/usr/sbin:/bin:/usr/bin")) "PATH=$PATH:/sbin:/usr/sbin:/bin:/usr/bin"))
(substitute* (find-files "scripts" ".") (substitute* (find-files "scripts")
(("/usr/share/zoneinfo") (string-append tzdata "/share/zoneinfo"))) (("/usr/share/zoneinfo")
#t))) (search-input-directory inputs "/share/zoneinfo"))))))
(add-after 'install 'install-man-file (add-after 'install 'install-man-file
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(install-file "debootstrap.8" (install-file "debootstrap.8"
(string-append out "/share/man/man8")) (string-append #$output "/share/man/man8"))))
#t))) (add-after 'install 'wrap-executable
(add-after 'install 'wrap-executable (lambda* (#:key outputs #:allow-other-keys)
(lambda* (#:key outputs #:allow-other-keys) (let ((debootstrap (string-append #$output "/sbin/debootstrap"))
(let ((debootstrap (string-append (assoc-ref outputs "out") (path (getenv "PATH")))
"/sbin/debootstrap")) (wrap-program debootstrap
(path (getenv "PATH"))) `("PATH" ":" prefix (,path)))))))
(wrap-program debootstrap #:make-flags #~(list (string-append "DESTDIR=" #$output))
`("PATH" ":" prefix (,path))) #:tests? #f)) ; no tests
#t))))
#:make-flags (list (string-append "DESTDIR=" (assoc-ref %outputs "out")))
#:tests? #f)) ; no tests
(inputs (inputs
`(("debian-keyring" ,debian-archive-keyring) (list debian-archive-keyring
("ubuntu-keyring" ,ubuntu-keyring) ubuntu-keyring
("tzdata" ,tzdata) bash-minimal
dpkg
tzdata
;; Called at run-time from various places, needs to be in PATH. ;; Called at run-time from various places, needs to be in PATH.
("gnupg" ,gnupg) gnupg
("wget" ,wget))) wget))
(native-inputs (native-inputs
(list perl)) (list perl))
(home-page "https://tracker.debian.org/pkg/debootstrap") (home-page "https://tracker.debian.org/pkg/debootstrap")
@ -335,7 +339,7 @@ other apt sources typically provided by open source developers.")
(define-public dpkg (define-public dpkg
(package (package
(name "dpkg") (name "dpkg")
(version "1.21.0") (version "1.21.8")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -344,14 +348,14 @@ other apt sources typically provided by open source developers.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0g33cyd0qbyfdrphcw8m8ikj2hxqpjbyxbhvnp751515c8hgc4rx")))) (base32 "1whb78pywdlm4v1ablgvvplqjn15b6qrwqkj0pihw5j77aakyz2s"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'bootstrap 'patch-version (add-before 'bootstrap 'patch-version
(lambda _ (lambda _
(patch-shebang "get-version") (patch-shebang "build-aux/get-version")
(with-output-to-file ".dist-version" (with-output-to-file ".dist-version"
(lambda () (display ,version))))) (lambda () (display ,version)))))
(add-after 'unpack 'set-perl-libdir (add-after 'unpack 'set-perl-libdir
@ -361,16 +365,51 @@ other apt sources typically provided by open source developers.")
(setenv "PERL_LIBDIR" (setenv "PERL_LIBDIR"
(string-append out (string-append out
"/lib/perl5/site_perl/" "/lib/perl5/site_perl/"
,(package-version perl))))))))) ,(package-version perl))))))
(add-after 'install 'wrap-scripts
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(with-directory-excursion (string-append out "/bin")
(for-each
(lambda (file)
(wrap-script file
;; Make sure all perl scripts in "bin" find the
;; required Perl modules at runtime.
`("PERL5LIB" ":" prefix
(,(string-append out
"/lib/perl5/site_perl")
,(getenv "PERL5LIB")))
;; DPKG perl modules always expect dpkg to be installed.
;; Work around this by adding dpkg to the path of the scripts.
`("PATH" ":" prefix (,(string-append out "/bin")))))
(list "dpkg-architecture"
"dpkg-buildflags"
"dpkg-buildpackage"
"dpkg-checkbuilddeps"
"dpkg-distaddfile"
"dpkg-genbuildinfo"
"dpkg-genchanges"
"dpkg-gencontrol"
"dpkg-gensymbols"
"dpkg-mergechangelogs"
"dpkg-name"
"dpkg-parsechangelog"
"dpkg-scanpackages"
"dpkg-scansources"
"dpkg-shlibdeps"
"dpkg-source"
"dpkg-vendor")))))))))
(native-inputs (native-inputs
`(("autoconf" ,autoconf) (list autoconf
("automake" ,automake) automake
("gettext" ,gettext-minimal) gettext-minimal
("libtool" ,libtool) gnupg ; to run t/Dpkg_OpenPGP.t
("pkg-config" ,pkg-config) libtool
("perl-io-string" ,perl-io-string))) pkg-config
perl-io-string))
(inputs (inputs
(list bzip2 (list bzip2
guile-3.0 ; for wrap-script
libmd libmd
ncurses ncurses
perl perl
@ -382,6 +421,152 @@ other apt sources typically provided by open source developers.")
handling the installation and removal of Debian software packages.") handling the installation and removal of Debian software packages.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public pbuilder
(package
(name "pbuilder")
(version "0.231")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://salsa.debian.org/pbuilder-team/pbuilder.git/")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0z6f1fgcrkfql9ayc3d0nxra2y6cn91xd5lvr0hd8gdlp9xdvxbc"))))
(build-system gnu-build-system)
(arguments
(list
#:modules `((guix build gnu-build-system)
(guix build utils)
(srfi srfi-26))
#:phases
#~(modify-phases %standard-phases
(delete 'configure) ; no configure script
(add-after 'unpack 'patch-source
(lambda* (#:key inputs outputs #:allow-other-keys)
;; Documentation requires tldp-one-page.xsl
(substitute* "Makefile"
((".*-C Documentation.*") ""))
;; Don't create #$output/var/cache/pbuilder/...
(substitute* '("Makefile"
"pbuildd/Makefile")
((".*/var/cache/pbuilder.*") ""))
;; Find the correct fallback location.
(substitute* '("pbuilder-checkparams"
"pbuilder-loadconfig"
"pbuilder-satisfydepends-apt"
"pbuilder-satisfydepends-aptitude"
"pbuilder-satisfydepends-classic"
"t/test_pbuilder-satisfydepends-classic")
(("\\$PBUILDER_ROOT(/usr)?") #$output))
;; Some hardcoded paths
(substitute* '("debuild-pbuilder"
"pbuilder"
"pbuilder-buildpackage"
"pbuilderrc"
"pdebuild"
"pdebuild-checkparams"
"pdebuild-internal")
(("/usr/lib/pbuilder")
(string-append #$output "/lib/pbuilder")))
(substitute* "pbuildd/buildd-config.sh"
(("/usr/share/doc/pbuilder")
(string-append #$output "/share/doc/pbuilder")))
(substitute* "pbuilder-unshare-wrapper"
(("/(s)?bin/ifconfig") "ifconfig")
(("/(s)?bin/ip") (search-input-file inputs "/sbin/ip")))
(substitute* "Documentation/Makefile"
(("/usr") ""))
;; Ensure PATH works both in Guix and within the Debian chroot.
(substitute* "pbuilderrc"
(("PATH=\"/usr/sbin:/usr/bin:/sbin:/bin")
"PATH=\"$PATH:/usr/sbin:/usr/bin:/sbin:/bin"))))
(add-after 'install 'create-etc-pbuilderrc
(lambda* (#:key outputs #:allow-other-keys)
(with-output-to-file (string-append #$output "/etc/pbuilderrc")
(lambda ()
(format #t "# A couple of presets to make this work more smoothly.~@
MIRRORSITE=\"http://deb.debian.org/debian\"~@
if [ -r /run/setuid-programs/sudo ]; then~@
PBUILDERROOTCMD=\"/run/setuid-programs/sudo -E\"~@
fi~@
PBUILDERSATISFYDEPENDSCMD=\"~a/lib/pbuilder/pbuilder-satisfydepends-apt\"~%"
#$output)))))
(add-after 'install 'install-manpages
(lambda* (#:key outputs #:allow-other-keys)
(let ((man (string-append #$output "/share/man/")))
(install-file "debuild-pbuilder.1" (string-append man "man1"))
(install-file "pdebuild.1" (string-append man "man1"))
(install-file "pbuilder.8" (string-append man "man8"))
(install-file "pbuilderrc.5" (string-append man "man5")))))
(add-after 'install 'wrap-programs
(lambda* (#:key inputs outputs #:allow-other-keys)
(for-each
(lambda (file)
(wrap-script file
`("PATH" ":" prefix
,(map (compose dirname (cut search-input-file inputs <>))
(list "/bin/cut"
"/bin/dpkg"
"/bin/grep"
"/bin/perl"
"/bin/sed"
"/bin/which"
"/sbin/debootstrap")))))
(cons*
(string-append #$output "/bin/pdebuild")
(string-append #$output "/sbin/pbuilder")
(find-files (string-append #$output "/lib/pbuilder"))))))
;; Move the 'check phase to after 'install.
(delete 'check)
(add-after 'validate-runpath 'check
(assoc-ref %standard-phases 'check)))
#:make-flags
;; No PREFIX, use DESTDIR instead.
#~(list (string-append "DESTDIR=" #$output)
(string-append "SYSCONFDIR=" #$output "/etc")
(string-append "BINDIR=" #$output "/bin")
(string-append "PKGLIBDIR=" #$output "/lib/pbuilder")
(string-append "SBINDIR=" #$output "/sbin")
(string-append "PKGDATADIR=" #$output "/share/pbuilder")
(string-append "EXAMPLEDIR=" #$output "/share/doc/pbuilder/examples")
"PBUILDDDIR=/share/doc/pbuilder/examples/pbuildd/")))
(inputs
(list dpkg
debootstrap
grep
guile-3.0 ; for wrap-script
iproute
perl
which))
(native-inputs
(list man-db
util-linux))
(home-page "https://pbuilder-team.pages.debian.net/pbuilder/")
(synopsis "Personal package builder for Debian packages")
(description
"@code{pbuilder} is a personal package builder for Debian packages.
@itemize
@item@code{pbuilder} constructs a chroot system, and builds a package inside the
chroot. It is an ideal system to use to check that a package has correct
build-dependencies. It uses @code{apt} extensively, and a local mirror, or a
fast connection to a Debian mirror is ideal, but not necessary.
@item@code{pbuilder create} uses debootstrap to create a chroot image.
@item@code{pbuilder update} updates the image to the current state of
testing/unstable/whatever.
@item@code{pbuilder build} takes a @code{*.dsc} file and builds a binary in the
chroot image.
@item@code{pdebuild} is a wrapper for Debian Developers, to allow running
@code{pbuilder} just like @code{debuild}, as a normal user.
@end itemize")
(license license:gpl2+)))
(define-public reprepro (define-public reprepro
(package (package
(name "reprepro") (name "reprepro")

106
gnu/packages/dezyne.scm Normal file
View file

@ -0,0 +1,106 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
;;; GNU Guix is free software; you can redistribute it and/or modify it
;;; under the terms of the GNU General Public License as published by
;;; the Free Software Foundation; either version 3 of the License, or (at
;;; your option) any later version.
;;;
;;; GNU Guix is distributed in the hope that it will be useful, but
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;;; GNU General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages dezyne)
#:use-module (guix build-system gnu)
#:use-module (guix download)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix gexp)
#:use-module (guix packages)
#:use-module (gnu packages base)
#:use-module (gnu packages bash)
#:use-module (gnu packages guile)
#:use-module (gnu packages maths)
#:use-module (gnu packages pkg-config))
(define-public dezyne
(package
(name "dezyne")
(version "2.15.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://dezyne.org/download/dezyne/"
name "-" version ".tar.gz"))
(sha256
(base32 "0yid2a9xvp4hc7fry07zp0q2hva89czri6i1m2d1n22srh7r0my6"))))
(inputs (list bash-minimal
guile-3.0-latest
guile-json-4
guile-readline
mcrl2-minimal
sed))
(native-inputs (list guile-3.0-latest pkg-config))
(build-system gnu-build-system)
(arguments
(list
#:modules `((ice-9 popen)
,@%gnu-build-system-modules)
#:phases
#~(modify-phases %standard-phases
(add-before 'configure 'setenv
(lambda _
(setenv "GUILE_AUTO_COMPILE" "0")))
(add-after 'install 'install-readmes
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(base (string-append #$name "-" #$version))
(doc (string-append out "/share/doc/" base)))
(mkdir-p doc)
(copy-file "NEWS" (string-append doc "/NEWS")))))
(add-after 'install 'wrap-binaries
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bash (assoc-ref %build-inputs "bash-minimal"))
(guile (assoc-ref %build-inputs "guile"))
(json (assoc-ref %build-inputs "guile-json"))
(mcrl2 (assoc-ref %build-inputs "mcrl2-minimal"))
(readline (assoc-ref %build-inputs "guile-readline"))
(sed (assoc-ref %build-inputs "sed"))
(effective (read
(open-pipe* OPEN_READ
"guile" "-c"
"(write (effective-version))")))
(path (list (string-append bash "/bin")
(string-append guile "/bin")
(string-append mcrl2 "/bin")
(string-append sed "/bin")))
(scm-dir (string-append "/share/guile/site/" effective))
(scm-path
(list (string-append out scm-dir)
(string-append json scm-dir)
(string-append readline scm-dir)))
(go-dir (string-append "/lib/guile/" effective
"/site-ccache/"))
(go-path (list (string-append out go-dir)
(string-append json go-dir)
(string-append readline go-dir))))
(wrap-program (string-append out "/bin/dzn")
`("PATH" ":" prefix ,path)
`("GUILE_AUTO_COMPILE" ":" = ("0"))
`("GUILE_LOAD_PATH" ":" prefix ,scm-path)
`("GUILE_LOAD_COMPILED_PATH" ":" prefix ,go-path))))))))
(synopsis "Programming language with verifyable formal semantics")
(description "Dezyne is a programming language and a set of tools to
specify, validate, verify, simulate, document, and implement concurrent
control software for embedded and cyber-physical systems. The Dezyne language
has formal semantics expressed in @url{https://mcrl2.org,mCRL2}.")
(home-page "https://dezyne.org")
(license (list license:agpl3+ ;Dezyne itself
license:lgpl3+ ;Dezyne runtime library
license:cc0)))) ;Code snippets, images, test data

36
gnu/packages/dico.scm
View file

@ -3,6 +3,7 @@
;;; Copyright © 2016, 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018, 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -41,12 +42,12 @@
(name "dico") (name "dico")
(version "2.11") (version "2.11")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/dico/dico-" (uri (string-append "mirror://gnu/dico/dico-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0nic4mggc0yhms130k7x4qp5k9c42fwg6n8hmk5cmynh6gi9h7xc")))) "0nic4mggc0yhms130k7x4qp5k9c42fwg6n8hmk5cmynh6gi9h7xc"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:configure-flags (list (string-append "--with-guile-site-dir=" %output '(#:configure-flags (list (string-append "--with-guile-site-dir=" %output
@ -59,23 +60,22 @@
;; Guile is too talkative, which disturbs the test ;; Guile is too talkative, which disturbs the test
;; infrastructure. Gag it. ;; infrastructure. Gag it.
(setenv "GUILE_AUTO_COMPILE" "0") (setenv "GUILE_AUTO_COMPILE" "0")
(setenv "GUILE_WARN_DEPRECATED" "no") (setenv "GUILE_WARN_DEPRECATED" "no")))
#t))
(replace 'check (replace 'check
(lambda _ (lambda _
;; Test '71: append + dooffs + env' fails if $V is not 2. ;; Test '71: append + dooffs + env' fails if $V is not 2.
(invoke "make" "check" "V=2")))))) (invoke "make" "check" "V=2"))))))
(native-inputs (list groff)) (native-inputs (list groff))
(inputs (inputs
`(("m4" ,m4) ;used at run time (list m4 ;used at run time
("pcre" ,pcre) pcre
("python" ,python-2) python-wrapper
("guile" ,guile-2.2) guile-2.2
("gsasl" ,gsasl) gsasl
("readline" ,readline) readline
("zlib" ,zlib) zlib
("wordnet" ,wordnet) wordnet
("libltdl" ,libltdl))) libltdl))
(home-page "https://www.gnu.org/software/dico/") (home-page "https://www.gnu.org/software/dico/")
(synopsis "Implementation of DICT server (RFC 2229)") (synopsis "Implementation of DICT server (RFC 2229)")
(description (description
@ -84,4 +84,4 @@ RFC 2229 (DICT Server). It is able to access any database available,
regardless of format, thanks to its modular structure. New modules may be regardless of format, thanks to its modular structure. New modules may be
written in C, Guile or Python. Dico also includes a command-line client, written in C, Guile or Python. Dico also includes a command-line client,
which may be used to query remote dictionary databases.") which may be used to query remote dictionary databases.")
(license gpl3+))) (license gpl3+)))

37
gnu/packages/diffoscope.scm
View file

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2017, 2021 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017, 2021 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017–2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2018 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2018, 2019 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2018, 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2019 Vagrant Cascadian <vagrant@reproducible-builds.org> ;;; Copyright © 2019 Vagrant Cascadian <vagrant@reproducible-builds.org>
@ -73,7 +73,7 @@
(define-public diffoscope (define-public diffoscope
(package (package
(name "diffoscope") (name "diffoscope")
(version "207") (version "215")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -82,7 +82,7 @@
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0djpkq9fpw8dpiqaghbbg5dshl27xgkqrifalx9nq87dix5c1y6d")) (base32 "16pyqbyrfsxjnpmr9913x2brz3mxplhz62rxwix1c0p7afwjw835"))
(patches (patches
(search-patches "diffoscope-fix-llvm-test.patch")))) (search-patches "diffoscope-fix-llvm-test.patch"))))
(build-system python-build-system) (build-system python-build-system)
@ -97,19 +97,19 @@
(add-after 'unpack 'embed-tool-references (add-after 'unpack 'embed-tool-references
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "diffoscope/comparators/utils/compare.py" (substitute* "diffoscope/comparators/utils/compare.py"
(("\\['xxd',") (("\\[\"xxd\",")
(string-append "['" (which "xxd") "',"))) (string-append "[\"" (which "xxd") "\",")))
(substitute* "diffoscope/comparators/elf.py" (substitute* "diffoscope/diff.py"
(("@tool_required\\('readelf'\\)") "") (("@tool_required\\(\"diff\"\\)") "")
(("get_tool_name\\('readelf'\\)") (("get_tool_name\\(\"diff\"\\)")
(string-append "'" (which "readelf") "'"))) (string-append "get_tool_name(\"" (which "diff") "\")")))
(substitute* "diffoscope/comparators/directory.py" (substitute* "diffoscope/comparators/directory.py"
(("@tool_required\\('stat'\\)") "") (("@tool_required\\(\"stat\"\\)") "")
(("@tool_required\\('getfacl'\\)") "") (("@tool_required\\(\"getfacl\"\\)") "")
(("\\['stat',") (("\\[\"stat\",")
(string-append "['" (which "stat") "',")) (string-append "[\"" (which "stat") "\","))
(("\\['getfacl',") (("\\[\"getfacl\",")
(string-append "['" (which "getfacl") "',"))))) (string-append "[\"" (which "getfacl") "\",")))))
(add-after 'build 'build-man-page (add-after 'build 'build-man-page
(lambda* (#:key (make-flags '()) #:allow-other-keys) (lambda* (#:key (make-flags '()) #:allow-other-keys)
(apply invoke "make" "-C" "doc" make-flags))) (apply invoke "make" "-C" "doc" make-flags)))
@ -146,7 +146,8 @@
python-magic python-magic
python-tlsh python-tlsh
acl ;for getfacl acl ;for getfacl
colordiff coreutils ;for stat
diffutils ;for diff
xxd)) xxd))
(native-inputs (native-inputs
(append (append
@ -233,7 +234,7 @@ install.")
(define-public reprotest (define-public reprotest
(package (package
(name "reprotest") (name "reprotest")
(version "0.7.18") (version "0.7.20")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -243,7 +244,7 @@ install.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"19lwsxq53isgfkvlxvxqqmbjfcim3lhcxwk7m9ddfjiynhq74949")))) "0c3nyiha9gh1xzl0dn9ji2yqa8y06d83v84pz0dqanihm40ljjsm"))))
(inputs (inputs
(list python-debian python-distro python-libarchive-c python-rstr)) (list python-debian python-distro python-libarchive-c python-rstr))
(native-inputs (native-inputs

118
gnu/packages/disk.scm
View file

@ -2,7 +2,7 @@
;;; Copyright © 2012, 2013 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2012, 2013 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2015 Mathieu Lirzin <mthl@gnu.org> ;;; Copyright © 2015 Mathieu Lirzin <mthl@gnu.org>
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016, 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2016, 2018–2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2016 Roel Janssen <roel@gnu.org> ;;; Copyright © 2016 Roel Janssen <roel@gnu.org>
@ -22,7 +22,7 @@
;;; Copyright © 2021 Mathieu Othacehe <othacehe@gnu.org> ;;; Copyright © 2021 Mathieu Othacehe <othacehe@gnu.org>
;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re> ;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2021 Justin Veilleux <terramorpha@cock.li> ;;; Copyright © 2021 Justin Veilleux <terramorpha@cock.li>
;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2022 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -236,6 +236,45 @@ tmpfs/ramfs filesystems.")
(define-public parted (define-public parted
(package (package
(name "parted") (name "parted")
(version "3.5")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/parted/parted-"
version ".tar.xz"))
(sha256
(base32
"18h51i3x5cbqhlj5rm23m9sfw63gaaby5czln5w6qpqj3ifdsf29"))))
(build-system gnu-build-system)
(arguments
(list #:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'fix-locales-and-python
(lambda _
(substitute* "tests/t0251-gpt-unicode.sh"
(("C.UTF-8") "en_US.utf8")) ;not in Glibc locales
(substitute* "tests/msdos-overlap"
(("/usr/bin/python") (which "python"))))))))
(inputs
(list lvm2 readline
`(,util-linux "lib")))
(native-inputs
(list gettext-minimal
;; For the tests.
e2fsprogs
perl
python-wrapper
util-linux))
(home-page "https://www.gnu.org/software/parted/")
(synopsis "Disk partition editor")
(description
"GNU Parted is a package for creating and manipulating disk partition
tables. It includes a library and command-line utility.")
(license license:gpl3+)))
(define-public parted-3.4
(package
(inherit parted)
(version "3.4") (version "3.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
@ -243,35 +282,7 @@ tmpfs/ramfs filesystems.")
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0hjkv84x1bs2qqyx1fnzjqyyqrhv7kpdbq9bgydmi99d8wi80ag1")))) "0hjkv84x1bs2qqyx1fnzjqyyqrhv7kpdbq9bgydmi99d8wi80ag1"))))))
(build-system gnu-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-locales-and-python
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "tests/t0251-gpt-unicode.sh"
(("C.UTF-8") "en_US.utf8")) ;not in Glibc locales
(substitute* "tests/msdos-overlap"
(("/usr/bin/python") (which "python")))
#t)))))
(inputs
(list lvm2 readline
`(,util-linux "lib")))
(native-inputs
`(("gettext" ,gettext-minimal)
;; For the tests.
("e2fsprogs" ,e2fsprogs)
("perl" ,perl)
("python-wrapper" ,python-wrapper)
("util-linux" ,util-linux)))
(home-page "https://www.gnu.org/software/parted/")
(synopsis "Disk partition editor")
(description
"GNU Parted is a package for creating and manipulating disk partition
tables. It includes a library and command-line utility.")
(license license:gpl3+)))
(define-public fdisk (define-public fdisk
(package (package
@ -367,20 +378,15 @@ output without any plausibility checks.")
(define-public gptfdisk (define-public gptfdisk
(package (package
(name "gptfdisk") (name "gptfdisk")
(version "1.0.8") (version "1.0.9")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/gptfdisk/gptfdisk/" (uri (string-append "mirror://sourceforge/gptfdisk/gptfdisk/"
version "/gptfdisk-" version ".tar.gz")) version "/gptfdisk-" version ".tar.gz"))
(sha256 (sha256
(base32 "1py6klp1b7rni1qjj110snyyxafhx092carlii5vrnh4y1b9ilcm")))) (base32 "1hjh5m77fmfq5m44yy61kchv7mbfgx026aw3jy5qxszsjckavzns"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs
`(("gettext" ,gettext-minimal)
("ncurses" ,ncurses)
("popt" ,popt)
("util-linux" ,util-linux "lib"))) ;libuuid
(arguments (arguments
`(#:test-target "test" `(#:test-target "test"
#:phases #:phases
@ -388,8 +394,7 @@ output without any plausibility checks.")
(add-after 'unpack 'fix-include-directory (add-after 'unpack 'fix-include-directory
(lambda _ (lambda _
(substitute* "gptcurses.cc" (substitute* "gptcurses.cc"
(("ncursesw/ncurses.h") "ncurses.h")) (("ncursesw/ncurses.h") "ncurses.h"))))
#t))
(delete 'configure) ; no configure script (delete 'configure) ; no configure script
(replace 'install (replace 'install
;; There's no ‘make install’ target. ;; There's no ‘make install’ target.
@ -405,6 +410,12 @@ output without any plausibility checks.")
(install-file "fixparts.8" man) (install-file "fixparts.8" man)
(install-file "gdisk.8" man) (install-file "gdisk.8" man)
(install-file "sgdisk.8" man))))))) (install-file "sgdisk.8" man)))))))
(native-inputs
(list gettext-minimal))
(inputs
(list ncurses
popt
`(,util-linux "lib"))) ;libuuid
(home-page "https://www.rodsbooks.com/gdisk/") (home-page "https://www.rodsbooks.com/gdisk/")
(synopsis "Low-level GPT disk partitioning and formatting") (synopsis "Low-level GPT disk partitioning and formatting")
(description "GPT fdisk (aka gdisk) is a text-mode partitioning tool that (description "GPT fdisk (aka gdisk) is a text-mode partitioning tool that
@ -416,14 +427,14 @@ scheme.")
(define-public ddrescue (define-public ddrescue
(package (package
(name "ddrescue") (name "ddrescue")
(version "1.25") (version "1.26")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/ddrescue/ddrescue-" (uri (string-append "mirror://gnu/ddrescue/ddrescue-"
version ".tar.lz")) version ".tar.lz"))
(sha256 (sha256
(base32 "0qqh38izl5ppap9a5izf3hijh94k65s3zbfkczd4b7x04syqwlyf")))) (base32 "07smgh9f2p90zgyyrddzjwaz0v8glh5d95qiv7yhv0frj0xcs4z5"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags (list (string-append "CXX=" ,(cxx-for-target))))) `(#:configure-flags (list (string-append "CXX=" ,(cxx-for-target)))))
@ -977,7 +988,7 @@ to create devices with respective mappings for the ATARAID sets discovered.")
(define-public libblockdev (define-public libblockdev
(package (package
(name "libblockdev") (name "libblockdev")
(version "2.26") (version "2.27")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/storaged-project/" (uri (string-append "https://github.com/storaged-project/"
@ -985,7 +996,7 @@ to create devices with respective mappings for the ATARAID sets discovered.")
version "-1/libblockdev-" version ".tar.gz")) version "-1/libblockdev-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0sg068jb87ljhn8yazrqxi6ri10ic2sh1lp6ikd2nqxc6l5y3h64")))) "05rm9h8v30rahr245jcw6if6b5g16mb5hnz7wl1shzip0wky3k3d"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -996,10 +1007,10 @@ to create devices with respective mappings for the ATARAID sets discovered.")
(substitute* "src/lib/blockdev.c" (substitute* "src/lib/blockdev.c"
(("/etc/libblockdev/conf.d/" path) (string-append out path))))))))) (("/etc/libblockdev/conf.d/" path) (string-append out path)))))))))
(native-inputs (native-inputs
`(("gobject-introspection" ,gobject-introspection) (list gobject-introspection
("pkg-config" ,pkg-config) pkg-config
("python" ,python-wrapper) python-wrapper
("util-linux" ,util-linux))) util-linux))
(inputs (inputs
(list btrfs-progs (list btrfs-progs
cryptsetup cryptsetup
@ -1098,7 +1109,7 @@ on your file system and offers to remove it. @command{rmlint} can find:
(define-public lf (define-public lf
(package (package
(name "lf") (name "lf")
(version "25") (version "27")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -1107,14 +1118,11 @@ on your file system and offers to remove it. @command{rmlint} can find:
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"014cybng6hc9y3ma74hpc1ac3rkz4ydflx8jbmvx81rdd08rzwz7")))) "1piym8za0iw2s8yryh39y072f90mzisv89ffvn1jzb71f71mbfqa"))))
(build-system go-build-system) (build-system go-build-system)
(native-inputs (native-inputs
`(("go-github.com-mattn-go-runewidth" ,go-github.com-mattn-go-runewidth) (list go-github.com-mattn-go-runewidth go-golang-org-x-term
("go-github.com-nsf-termbox-go" ,go-github.com-nsf-termbox-go) go-gopkg-in-djherbis-times-v1 go-github-com-gdamore-tcell-v2))
("go-golang-org-x-term" ,go-golang-org-x-term)
("go-gopkg-in-djherbis-times-v1" ,go-gopkg-in-djherbis-times-v1)
("go-github-com-gdamore-tcell-v2" ,go-github-com-gdamore-tcell-v2)))
(arguments (arguments
`(#:import-path "github.com/gokcehan/lf")) `(#:import-path "github.com/gokcehan/lf"))
(home-page "https://github.com/gokcehan/lf") (home-page "https://github.com/gokcehan/lf")

143
gnu/packages/display-managers.scm
View file

@ -12,6 +12,7 @@
;;; Copyright © 2021 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2021 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 Petr Hodina <phodina@protonmail.com> ;;; Copyright © 2021 Petr Hodina <phodina@protonmail.com>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -41,7 +42,9 @@
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages autotools)
#:use-module (gnu packages admin) #:use-module (gnu packages admin)
#:use-module (gnu packages base)
#:use-module (gnu packages bash) #:use-module (gnu packages bash)
#:use-module (gnu packages fontutils) #:use-module (gnu packages fontutils)
#:use-module (gnu packages freedesktop) #:use-module (gnu packages freedesktop)
@ -252,70 +255,86 @@ experience for your users, your family and yourself")
(license license:gpl3+))) (license license:gpl3+)))
(define-public lightdm (define-public lightdm
(package ;; Use the latest commit, as the current official release doesn't build with
(name "lightdm") ;; glib >= 2.33.
(version "1.30.0") (let ((revision "0")
(source (origin (commit "b7fc3214cbaed09c73e963847443a0d648dfd896"))
(method url-fetch) (package
(uri (string-append (name "lightdm")
"https://github.com/CanonicalLtd/lightdm/releases/download/" (version (git-version "1.30.0" revision commit))
version "/lightdm-" version ".tar.xz")) (source (origin
(sha256 (method git-fetch)
(base32 (uri (git-reference
"158zb2d0v1309a8v19hh32y4yj3v6yg4yg6m0l7v59d3a2b7f651")))) (url "https://github.com/canonical/lightdm")
(build-system gnu-build-system) (commit commit)))
(arguments (file-name (git-file-name name version))
'(#:parallel-tests? #f ; fails when run in parallel (sha256
#:configure-flags (base32
(list "--localstatedir=/var") "0378jacazpmdgdjkiilk3mbikz3iysb4s9q40hg9zv4yngwsix1m"))))
#:phases (build-system gnu-build-system)
(modify-phases %standard-phases (arguments
(add-after 'unpack 'fix-paths '(#:parallel-tests? #f ; fails when run in parallel
(lambda _ #:configure-flags
(substitute* "src/shared-data-manager.c" (list "--localstatedir=/var"
(("/bin/rm") (which "rm"))) ;; Otherwise the test suite fails on such a warning.
(substitute* '("data/users.conf" "CFLAGS=-Wno-error=missing-prototypes")
"common/user-list.c") #:phases
(("/bin/false") (which "false")) (modify-phases %standard-phases
(("/usr/sbin/nologin") (which "nologin"))) (add-after 'unpack 'fix-paths
(substitute* "src/seat.c" (lambda* (#:key inputs #:allow-other-keys)
(("/bin/sh") (which "sh"))) (substitute* "src/shared-data-manager.c"
#t)) (("/bin/rm")
(add-before 'check 'pre-check (search-input-file inputs "bin/rm")))
;; Run test-suite under a dbus session. (substitute* '("data/users.conf"
(lambda* (#:key inputs #:allow-other-keys) "common/user-list.c")
(wrap-program "tests/src/test-python-greeter" (("/bin/false")
`("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))) (search-input-file inputs "bin/false"))
`("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH")))) (("/usr/sbin/nologin")
(search-input-file inputs "sbin/nologin")))
(substitute* "src/seat.c"
(("/bin/sh")
(search-input-file inputs "bin/sh")))))
(add-before 'check 'pre-check
;; Run test-suite under a dbus session.
(lambda _
(wrap-program "tests/src/test-python-greeter"
`("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH")))
`("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH"))))
;; Avoid printing locale warnings, which trip up the text ;; Avoid printing locale warnings, which trip up the text
;; matching tests. ;; matching tests.
(unsetenv "LC_ALL") (unsetenv "LC_ALL"))))))
#t))))) (inputs
(inputs (list audit
(list audit coreutils ;for cross-compilation
linux-pam linux-pam
shadow ;for sbin/nologin shadow ;for sbin/nologin
libgcrypt libgcrypt
libxcb)) libxcb))
(native-inputs (native-inputs
`(("gobject-introspection" ,gobject-introspection) (list autoconf
("pkg-config" ,pkg-config) automake
("itstool" ,itstool) gobject-introspection
("intltool" ,intltool) gtk-doc
("vala" ,vala) ;for Vala bindings pkg-config
;; For tests itstool
("dbus" ,dbus) intltool
("python" ,python-2) libtool
("python-pygobject" ,python2-pygobject))) vala ;for Vala bindings
;; Required by liblightdm-gobject-1.pc. ;; For tests
(propagated-inputs dbus
(list glib libx11 libxklavier)) ;; python-wrapper
(home-page "https://www.freedesktop.org/wiki/Software/LightDM/") ;; python-pygobject
(synopsis "Lightweight display manager") which
(description "The Light Display Manager (LightDM) is a cross-desktop yelp-tools))
;; Required by liblightdm-gobject-1.pc.
(propagated-inputs
(list glib libx11 libxklavier))
(home-page "https://www.freedesktop.org/wiki/Software/LightDM/")
(synopsis "Lightweight display manager")
(description "The Light Display Manager (LightDM) is a cross-desktop
display manager which supports different greeters.") display manager which supports different greeters.")
(license license:gpl3+))) (license license:gpl3+))))
(define-public lightdm-gtk-greeter (define-public lightdm-gtk-greeter
(package (package

31
gnu/packages/django.scm
View file

@ -9,6 +9,7 @@
;;; Copyright © 2020, 2021, 2022 Marius Bakke <marius@gnu.org> ;;; Copyright © 2020, 2021, 2022 Marius Bakke <marius@gnu.org>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Luis Felipe López Acevedo <luis.felipe.la@protonmail.com> ;;; Copyright © 2021 Luis Felipe López Acevedo <luis.felipe.la@protonmail.com>
;;; Copyright © 2022 Pradana Aumars <paumars@courrier.dev>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -53,13 +54,13 @@
(define-public python-django-4.0 (define-public python-django-4.0
(package (package
(name "python-django") (name "python-django")
(version "4.0.2") (version "4.0.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "Django" version)) (uri (pypi-uri "Django" version))
(sha256 (sha256
(base32 (base32
"0jlmxylag7dah9jl3wm2swnn9kbisx1gqnddfbh5kjifn67va3qi")))) "1da0vy3nas2m2j50dc5c3s1nv529lagg4c04riipah94hn2pg0af"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
'(#:phases '(#:phases
@ -140,29 +141,45 @@ to the @dfn{don't repeat yourself} (DRY) principle.")
(define-public python-django-3.2 (define-public python-django-3.2
(package (package
(inherit python-django-4.0) (inherit python-django-4.0)
(version "3.2.12") (version "3.2.13")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "Django" version)) (uri (pypi-uri "Django" version))
(sha256 (sha256
(base32 (base32
"1qj1kvb6mk2f4b33n4n5l4rh5kqllrk2v0v076crxr83ay9ycwlp")))) "1dn4irl4m21skcqb2mbj55vgryqfqk6wqa8s1c7bmxlv19x4k4vd"))))
(native-search-paths '()) ;no need for TZDIR (native-search-paths '()) ;no need for TZDIR
(propagated-inputs (propagated-inputs
(modify-inputs (package-propagated-inputs python-django-4.0) (modify-inputs (package-propagated-inputs python-django-4.0)
;; Django 4.0 deprecated pytz in favor of Pythons built-in zoneinfo. ;; Django 4.0 deprecated pytz in favor of Pythons built-in zoneinfo.
(append python-pytz))))) (append python-pytz)))))
(define-public python-django-2.2 ;; archivebox requires django>=3.1.3,<3.2
(define-public python-django-3.1.14
(package (package
(inherit python-django-3.2) (inherit python-django-3.2)
(version "2.2.27") (version "3.1.14")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "Django" version)) (uri (pypi-uri "Django" version))
(sha256 (sha256
(base32 (base32
"04y9knxd8v9jn54ws5rbdwxyq5im69kx009s7gl62axzn1371qqy")))) "0ix3v2wlnplv78zxjrlw8z3hiap2d5mxvk0ny2fc65526shsb93j"))))
(propagated-inputs
(modify-inputs (package-propagated-inputs python-django-3.2)
;; Django 4.0 deprecated pytz in favor of Pythons built-in zoneinfo.
(append python-pytz)))))
(define-public python-django-2.2
(package
(inherit python-django-3.2)
(version "2.2.28")
(source (origin
(method url-fetch)
(uri (pypi-uri "Django" version))
(sha256
(base32
"04vl7aivsshzsnn547lm4jdinr67afhdspc40f0c06xzmxbvc002"))))
(native-inputs (native-inputs
(modify-inputs (package-native-inputs python-django-3.2) (modify-inputs (package-native-inputs python-django-3.2)
(prepend ;; 2.2 requires Selenium for the test suite. (prepend ;; 2.2 requires Selenium for the test suite.

355
gnu/packages/djvu.scm
View file

@ -3,6 +3,7 @@
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020, 2021 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2020, 2021 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -24,6 +25,7 @@
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix gexp)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system python) #:use-module (guix build-system python)
@ -149,19 +151,17 @@ a continuous layout.")
(sha256 (sha256
(base32 "0c595yziz81c9izf9s5sskd00qmgz2n1hp2vdcgg0dx81g3xfidb")))) (base32 "0c595yziz81c9izf9s5sskd00qmgz2n1hp2vdcgg0dx81g3xfidb"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs (list gettext-minimal pkg-config))
`(("gettext" ,gettext-minimal)
("pkg-config" ,pkg-config)
("python2" ,python-2)
("python2-nose" ,python2-nose)))
(inputs (inputs
`(("djvulibre" ,djvulibre) (list djvulibre
("exiv2" ,exiv2) exiv2
("graphicsmagick" ,graphicsmagick) graphicsmagick
("poppler" ,poppler) poppler
("util-linux-lib" ,util-linux "lib"))) ; for libuuid poppler-data
`(,util-linux "lib"))) ;for libuuid
(arguments (arguments
`(#:test-target "test" `(#:test-target "test"
#:tests? #f ;requires Python 2
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'fix-tests (add-after 'unpack 'fix-tests
@ -289,193 +289,158 @@ and white.")
(home-page "https://sourceforge.net/projects/minidjvu/") (home-page "https://sourceforge.net/projects/minidjvu/")
(license license:gpl2))) (license license:gpl2)))
(define-public djvusmooth
(package
(name "djvusmooth")
(version "0.3")
(source
(origin
(method url-fetch)
(uri (string-append
"https://github.com/jwilk/djvusmooth/releases/download/" version
"/djvusmooth-" version ".tar.gz"))
(sha256
(base32 "0z403cklvxzz0qaczgv83ax0nknrd9h8micp04j9kjfdxk2sgval"))))
(build-system python-build-system)
(inputs
(list djvulibre python2-djvulibre python2-subprocess32
python2-wxpython))
(arguments
`(#:python ,python-2
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-paths
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "lib/djvused.py"
(("djvused_path = 'djvused'")
(string-append "djvused_path = '"
(assoc-ref inputs "djvulibre")
"/bin/djvused'"))))))))
(synopsis "Graphical editor for DjVu documents")
(description
"@code{djvusmooth} is a graphical editor for DjVu_ documents.
It is able to:
@itemize
@item edit document metadata,
@item edit document outline (bookmarks),
@item add, remove or edit hyperlinks,
@item correct occasional errors in the hidden text layer.
@end itemize\n")
(home-page "https://jwilk.net/software/djvusmooth")
(license license:gpl2)))
(define-public didjvu (define-public didjvu
(package (let ((revision "0")
(name "didjvu") (commit "c792d61e85fbe5b6e678bc7d686b0208717c587b"))
(version "0.9") (package
(source (name "didjvu")
(origin (version (git-version "0.9" revision commit))
(method url-fetch) (source (origin
(uri (string-append (method git-fetch)
"https://github.com/jwilk/didjvu/releases/download/" version (uri (git-reference
"/didjvu-" version ".tar.gz")) (url "https://github.com/FriedrichFroebel/didjvu")
(sha256 (commit commit)))
(base32 "0xyrnk8d2khi7q1zr28gjkjq6frz4mkb5jdl8821yzf12k7c8pbv")))) (file-name (git-file-name name version))
(build-system gnu-build-system) (sha256
(native-inputs (base32
(list python2-nose)) "09lwfwirmfl93062i2rvdcrgwp9fj95ny07059bxq7dl6z0z35qj"))))
(inputs (build-system gnu-build-system)
`(("djvulibre" ,djvulibre) (arguments
("minidjvu" ,minidjvu) `(#:modules ((guix build gnu-build-system)
("python" ,python-2) ((guix build python-build-system) #:prefix python:)
("python2-gamera" ,python2-gamera) (guix build utils))
("python2-pillow" ,python2-pillow))) #:imported-modules (,@%gnu-build-system-modules
(arguments (guix build python-build-system))
`(#:modules ((guix build gnu-build-system) #:test-target "test"
((guix build python-build-system) #:prefix python:) #:phases
(guix build utils)) (modify-phases %standard-phases
#:imported-modules (,@%gnu-build-system-modules (delete 'configure)
(guix build python-build-system)) (add-before 'check 'disable-failing-test
#:test-target "test" (lambda _
#:phases (substitute* "tests/test_ipc.py"
(modify-phases %standard-phases ;; test_wait_signal gets stuck forever
(delete 'configure) (("yield self\\._test_signal, name")
(add-before 'check 'disable-failing-test "return True")
(lambda _ ;; test_path fails to find a file it should have created
(substitute* "tests/test_ipc.py" (("path = os\\.getenv\\('PATH'\\)\\.split\\(':'\\)")
;; test_wait_signal gets stuck forever "return True"))
(("yield self\\._test_signal, name") (substitute* "tests/test_timestamp.py"
"return True") ;; test_timezones fails with:
;; test_path fails to find a file it should have created ;; '2009-12-18T21:25:14Z' != '2009-12-18T22:25:14+01:00'
(("path = os\\.getenv\\('PATH'\\)\\.split\\(':'\\)") (("@fork_isolation")
"return True")) "return True"))))
(substitute* "tests/test_timestamp.py" (replace 'install
;; test_timezones fails with: (lambda* (#:key outputs #:allow-other-keys)
;; '2009-12-18T21:25:14Z' != '2009-12-18T22:25:14+01:00' (let ((out (assoc-ref outputs "out")))
(("@fork_isolation") (invoke "make"
"return True")))) "DESTDIR="
(replace 'install (string-append "PREFIX=" out)
(lambda* (#:key outputs #:allow-other-keys) "install"))))
(let ((out (assoc-ref outputs "out"))) (add-after 'install 'wrap-python
(invoke "make" (assoc-ref python:%standard-phases 'wrap))
"DESTDIR=" (add-after 'wrap-python 'wrap-path
(string-append "PREFIX=" out) (lambda* (#:key inputs outputs #:allow-other-keys)
"install")))) (let ((out (assoc-ref outputs "out"))
(add-after 'install 'wrap-python (djvulibre (assoc-ref inputs "djvulibre")))
(assoc-ref python:%standard-phases 'wrap)) (wrap-program (string-append out "/bin/didjvu")
(add-after 'wrap-python 'wrap-path `("PATH" ":" prefix (,(string-append djvulibre "/bin"))))))))))
(lambda* (#:key inputs outputs #:allow-other-keys) (native-inputs (list python-nose))
(let ((out (assoc-ref outputs "out")) (inputs
(djvulibre (assoc-ref inputs "djvulibre"))) (list djvulibre
(wrap-program (string-append out "/bin/didjvu") minidjvu
`("PATH" ":" prefix (,(string-append djvulibre "/bin")))))))))) python-gamera
(synopsis "DjVu encoder with foreground/background separation") python-pillow
(description python-wrapper))
"@code{didjvu} uses the @code{Gamera} framework to separate the foreground (synopsis "DjVu encoder with foreground/background separation")
(description
"@code{didjvu} uses the @code{Gamera} framework to separate the foreground
and background layers of images, which can then be encoded into a DjVu file.") and background layers of images, which can then be encoded into a DjVu file.")
(home-page "https://jwilk.net/software/didjvu") (home-page "https://jwilk.net/software/didjvu")
(license license:gpl2))) (license license:gpl2))))
(define-public ocrodjvu (define-public ocrodjvu
(package (let ((revision "0")
(name "ocrodjvu") (commit "0dd3364462fc77d5674b4457fcc8230835323c30"))
(version "0.12") (package
(source (name "ocrodjvu")
(origin (version (git-version "0.12" revision commit))
(method url-fetch) (source (origin
(uri (string-append (method git-fetch)
"https://github.com/jwilk/ocrodjvu/releases/download/" version (uri (git-reference
"/ocrodjvu-" version ".tar.xz")) ;; Use the following fork repository, as upstream
(sha256 ;; doesn't seem too concerned with Python 3
(base32 "09w9rqr7z2jd5kwp178zz2yrsc82mxs7gksipg92znxzgzhmw2ng")))) ;; compatibility.
(build-system gnu-build-system) (url "https://github.com/rmast/ocrodjvu")
(native-inputs (commit commit)))
(list libxml2 python2-nose python2-pillow)) (file-name (git-file-name name version))
(inputs (sha256
`(("djvulibre" ,djvulibre) (base32
("ocrad" ,ocrad) "0x64hg9ysrk8sismxb4jgk0sq7r9j90v2i9765xhmxpiy6f0lpni"))))
("python" ,python-2) (build-system gnu-build-system)
("python2-djvulibre" ,python2-djvulibre) (native-inputs
("python2-html5lib" ,python2-html5lib) (list libxml2 python-nose python-pillow))
("python2-lxml" ,python2-lxml) (inputs
("python2-pyicu" ,python2-pyicu) (list djvulibre
("python2-subprocess32" ,python2-subprocess32) ocrad
("tesseract-ocr" ,tesseract-ocr))) python-djvulibre
(arguments python-future
`(#:modules ((guix build gnu-build-system) python-html5lib
((guix build python-build-system) #:prefix python:) python-lxml
(guix build utils)) python-pyicu
#:imported-modules (,@%gnu-build-system-modules python-regex
(guix build python-build-system)) python-wrapper
#:test-target "test" tesseract-ocr))
#:phases (arguments
(modify-phases %standard-phases (list
(delete 'configure) #:modules '((guix build gnu-build-system)
(add-before 'check 'disable-failing-test ((guix build python-build-system) #:prefix python:)
(lambda _ (guix build utils))
(substitute* "tests/test_ipc.py" #:imported-modules `(,@%gnu-build-system-modules
;; test_wait_signal gets stuck forever (guix build python-build-system))
(("yield self\\._test_signal, name") #:test-target "test"
"return True") #:phases
;; test_path fails to find a file it should have created #~(modify-phases %standard-phases
(("path = os\\.getenv\\('PATH'\\)\\.split\\(':'\\)") (delete 'configure)
"return True")) (add-before 'check 'disable-failing-test
;; Disable tests with tesseract. They can't work without (lambda _
;; the language files that must downloaded by the final user (substitute* "tests/test_ipc.py"
;; as they are not packaged in Guix. ;; test_wait_signal gets stuck forever
(substitute* "tests/ocrodjvu/test.py" (("yield self\\._test_signal, name")
(("engines = stdout\\.getvalue\\(\\)\\.splitlines\\(\\)") "return True")
"engines = ['ocrad']")) ;; test_path fails to find a file it should have created
(substitute* "tests/ocrodjvu/test_integration.py" (("path = os\\.getenv\\('PATH'\\)\\.split\\(':'\\)")
(("engines = 'tesseract', 'cuneiform', 'gocr', 'ocrad'") "return True"))
"engines = 'ocrad'")))) ;; Disable tests with tesseract. They can't work without
(replace 'install ;; the language files that must downloaded by the final user
(lambda* (#:key outputs #:allow-other-keys) ;; as they are not packaged in Guix.
(let ((out (assoc-ref outputs "out"))) (substitute* "tests/ocrodjvu/test.py"
(invoke "make" (("engines = stdout\\.getvalue\\(\\)\\.splitlines\\(\\)")
"DESTDIR=" "engines = ['ocrad']"))
(string-append "PREFIX=" out) (substitute* "tests/ocrodjvu/test_integration.py"
"install")))) (("engines = 'tesseract', 'cuneiform', 'gocr', 'ocrad'")
(add-after 'install 'wrap-python "engines = 'ocrad'"))))
(assoc-ref python:%standard-phases 'wrap)) (replace 'install
(add-after 'wrap-python 'wrap-path (lambda _
(lambda* (#:key inputs outputs #:allow-other-keys) (invoke "make" "install"
(let ((out (assoc-ref outputs "out")) "DESTDIR=" (string-append "PREFIX=" #$output))))
(djvulibre (assoc-ref inputs "djvulibre")) (add-after 'install 'wrap-python
(ocrad (assoc-ref inputs "ocrad")) (assoc-ref python:%standard-phases 'wrap))
(tesseract (assoc-ref inputs "tesseract-ocr"))) (add-after 'wrap-python 'wrap-path
(for-each (lambda (file) (lambda* (#:key outputs #:allow-other-keys)
(wrap-program (string-append out "/bin/" file) (for-each (lambda (file)
`("PATH" ":" prefix (wrap-program (search-input-file outputs file)
(,(string-append djvulibre "/bin:" `("PATH" ":" prefix
ocrad "/bin:" (,(string-append
tesseract "/bin"))))) #$(this-package-input "djvulibre") "/bin:"
'("djvu2hocr" #$(this-package-input "ocrad") "/bin:"
"hocr2djvused" #$(this-package-input "tesseract-ocr")
"ocrodjvu")))))))) "/bin")))))
(synopsis "Program to perform OCR on DjVu files") '("bin/djvu2hocr"
(description "bin/hocr2djvused"
"@code{ocrodjvu} is a wrapper for OCR systems, that allows you to perform "bin/ocrodjvu")))))))
(synopsis "Program to perform OCR on DjVu files")
(description
"@code{ocrodjvu} is a wrapper for OCR systems, that allows you to perform
OCR on DjVu files.") OCR on DjVu files.")
(home-page "https://jwilk.net/software/ocrodjvu") (home-page "https://jwilk.net/software/ocrodjvu")
(license license:gpl2))) (license license:gpl2))))

15
gnu/packages/dns.scm
View file

@ -5,7 +5,7 @@
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 John Darrington <jmd@gnu.org> ;;; Copyright © 2016 John Darrington <jmd@gnu.org>
;;; Copyright © 2016 Nikita <nikita@n0.is> ;;; Copyright © 2016 Nikita <nikita@n0.is>
;;; Copyright © 2016–2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2016–2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016, 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2016, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Vasile Dumitrascu <va511e@yahoo.com> ;;; Copyright © 2017 Vasile Dumitrascu <va511e@yahoo.com>
;;; Copyright © 2017 Gregor Giesen <giesen@zaehlwerk.net> ;;; Copyright © 2017 Gregor Giesen <giesen@zaehlwerk.net>
@ -309,6 +309,7 @@ prompt the user with the option to go with insecure DNS only.")
(modify-phases %standard-phases (delete 'configure)) (modify-phases %standard-phases (delete 'configure))
#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
(string-append "CC=" ,(cc-for-target)) (string-append "CC=" ,(cc-for-target))
(string-append "PKG_CONFIG=" ,(pkg-config-for-target))
"COPTS=\"-DHAVE_DBUS\"") "COPTS=\"-DHAVE_DBUS\"")
#:tests? #f)) ; no ‘check’ target #:tests? #f)) ; no ‘check’ target
(home-page "http://www.thekelleys.org.uk/dnsmasq/doc.html") (home-page "http://www.thekelleys.org.uk/dnsmasq/doc.html")
@ -332,14 +333,14 @@ and BOOTP/TFTP for network booting of diskless machines.")
;; When updating, check whether isc-dhcp's bundled copy should be as well. ;; When updating, check whether isc-dhcp's bundled copy should be as well.
;; The BIND release notes are available here: ;; The BIND release notes are available here:
;; https://www.isc.org/bind/ ;; https://www.isc.org/bind/
(version "9.16.27") (version "9.16.29")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://ftp.isc.org/isc/bind9/" version (uri (string-append "https://ftp.isc.org/isc/bind9/" version
"/bind-" version ".tar.xz")) "/bind-" version ".tar.xz"))
(sha256 (sha256
(base32 "0rpmighbbim9wi24p2bg814x5z20xkvv5y6nfnfh30ac22pjm44h")) (base32 "0rklj342khnycs462nd3k35yymsdv6ibv352jv1nymmxxfc8yh68"))
(patches (patches
(search-patches "bind-re-add-attr-constructor-priority.patch")))) (search-patches "bind-re-add-attr-constructor-priority.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
@ -543,14 +544,14 @@ asynchronous fashion.")
(define-public nsd (define-public nsd
(package (package
(name "nsd") (name "nsd")
(version "4.3.9") (version "4.4.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.nlnetlabs.nl/downloads/nsd/nsd-" (uri (string-append "https://www.nlnetlabs.nl/downloads/nsd/nsd-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 "13ay2gr7ln8gl09wdqnxkrdxi51jaqsbn54yh82vvv49jbq4j5ak")))) (base32 "0dl8iriy0mscppfa6ar5qcglgvxw87140abwxyksak1lk7fnzkfg"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -870,7 +871,7 @@ Extensions} (DNSSEC).")
(define-public knot (define-public knot
(package (package
(name "knot") (name "knot")
(version "3.1.6") (version "3.1.8")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -879,7 +880,7 @@ Extensions} (DNSSEC).")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0rwcp55fvmm0vhad1368knfn0ri642sigh8nykvvikdlx06d21cj")) (base32 "0v3rh27qnyihdqp5nm8bnn9xd5rl2fbwhj4cmdpc8ik4qs21xyf4"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin

2
gnu/packages/docker.scm
View file

@ -122,7 +122,7 @@ client.")
python-docopt python-docopt
python-dotenv python-dotenv
python-jsonschema python-jsonschema
python-pyyaml python-pyyaml-5
python-requests python-requests
python-six python-six
python-texttable python-texttable

Some files were not shown because too many files have changed in this diff Show more