me/guix
Archived
1
0
Fork 0
Code Activity

Merge branch 'master' into staging

Browse source
This commit is contained in:
Marius Bakke 2022-07-13 23:34:58 +02:00
commit 4442a5db77
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
269 changed files with 222132 additions and 156422 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
.dir-locals.el
View file

@ -118,9 +118,11 @@
(eval . (put 'munless 'scheme-indent-function 1)) (eval . (put 'munless 'scheme-indent-function 1))
(eval . (put 'mlet* 'scheme-indent-function 2)) (eval . (put 'mlet* 'scheme-indent-function 2))
(eval . (put 'mlet 'scheme-indent-function 2)) (eval . (put 'mlet 'scheme-indent-function 2))
(eval . (put 'mparameterize 'scheme-indent-function 2))
(eval . (put 'run-with-store 'scheme-indent-function 1)) (eval . (put 'run-with-store 'scheme-indent-function 1))
(eval . (put 'run-with-state 'scheme-indent-function 1)) (eval . (put 'run-with-state 'scheme-indent-function 1))
(eval . (put 'wrap-program 'scheme-indent-function 1)) (eval . (put 'wrap-program 'scheme-indent-function 1))
(eval . (put 'wrap-script 'scheme-indent-function 1))
(eval . (put 'with-imported-modules 'scheme-indent-function 1)) (eval . (put 'with-imported-modules 'scheme-indent-function 1))
(eval . (put 'with-extensions 'scheme-indent-function 1)) (eval . (put 'with-extensions 'scheme-indent-function 1))
(eval . (put 'with-parameters 'scheme-indent-function 1)) (eval . (put 'with-parameters 'scheme-indent-function 1))
@ -155,7 +157,31 @@
;; preceding symbol is one of these. ;; preceding symbol is one of these.
(eval . (modify-syntax-entry ?~ "'")) (eval . (modify-syntax-entry ?~ "'"))
(eval . (modify-syntax-entry ?$ "'")) (eval . (modify-syntax-entry ?$ "'"))
(eval . (modify-syntax-entry ?+ "'")))) (eval . (modify-syntax-entry ?+ "'"))
;; Emacs 28 changed the behavior of 'lisp-fill-paragraph', which causes the
;; first line of package descriptions to extrude past 'fill-column', and
;; somehow that is deemed more correct upstream (see:
;; https://issues.guix.gnu.org/56197).
(eval . (progn
(require 'lisp-mode)
(defun emacs27-lisp-fill-paragraph (&optional justify)
(interactive "P")
(or (fill-comment-paragraph justify)
(let ((paragraph-start
(concat paragraph-start
"\\|\\s-*\\([(;\"]\\|\\s-:\\|`(\\|#'(\\)"))
(paragraph-separate
(concat paragraph-separate "\\|\\s-*\".*[,\\.]$"))
(fill-column (if (and (integerp emacs-lisp-docstring-fill-column)
(derived-mode-p 'emacs-lisp-mode))
emacs-lisp-docstring-fill-column
fill-column)))
(fill-paragraph justify))
;; Never return nil.
t))
(setq-local fill-paragraph-function #'emacs27-lisp-fill-paragraph)))))
(emacs-lisp-mode . ((indent-tabs-mode . nil))) (emacs-lisp-mode . ((indent-tabs-mode . nil)))
(texinfo-mode . ((indent-tabs-mode . nil) (texinfo-mode . ((indent-tabs-mode . nil)
(fill-column . 72)))) (fill-column . 72))))

1
.gitignore vendored
View file

@ -68,6 +68,7 @@
/doc/version.texi /doc/version.texi
/doc/version-*.texi /doc/version-*.texi
/etc/committer.scm /etc/committer.scm
/etc/teams.scm
/etc/gnu-store.mount /etc/gnu-store.mount
/etc/guix-daemon.cil /etc/guix-daemon.cil
/etc/guix-daemon.conf /etc/guix-daemon.conf

9
Makefile.am
View file

@ -395,10 +395,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.17-arm.conf \ gnu/packages/aux-files/linux-libre/5.18-arm.conf \
gnu/packages/aux-files/linux-libre/5.17-arm64.conf \ gnu/packages/aux-files/linux-libre/5.18-arm64.conf \
gnu/packages/aux-files/linux-libre/5.17-i686.conf \ gnu/packages/aux-files/linux-libre/5.18-i686.conf \
gnu/packages/aux-files/linux-libre/5.17-x86_64.conf \ gnu/packages/aux-files/linux-libre/5.18-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 \
@ -667,6 +667,7 @@ EXTRA_DIST += \
etc/release-manifest.scm \ etc/release-manifest.scm \
etc/source-manifest.scm \ etc/source-manifest.scm \
etc/system-tests.scm \ etc/system-tests.scm \
etc/time-travel-manifest.scm \
etc/historical-authorizations \ etc/historical-authorizations \
build-aux/build-self.scm \ build-aux/build-self.scm \
build-aux/compile-all.scm \ build-aux/compile-all.scm \

1
configure.ac
View file

@ -274,6 +274,7 @@ AC_CONFIG_FILES([Makefile
guix/config.scm]) guix/config.scm])
AC_CONFIG_FILES([etc/committer.scm], [chmod +x etc/committer.scm]) AC_CONFIG_FILES([etc/committer.scm], [chmod +x etc/committer.scm])
AC_CONFIG_FILES([etc/teams.scm], [chmod +x etc/teams.scm])
AC_CONFIG_FILES([test-env:build-aux/test-env.in], [chmod +x test-env]) AC_CONFIG_FILES([test-env:build-aux/test-env.in], [chmod +x test-env])
AC_CONFIG_FILES([pre-inst-env:build-aux/pre-inst-env.in], AC_CONFIG_FILES([pre-inst-env:build-aux/pre-inst-env.in],
[chmod +x pre-inst-env]) [chmod +x pre-inst-env])

54
doc/contributing.texi
View file

@ -29,6 +29,7 @@ choice.
* Tracking Bugs and Patches:: Keeping it all organized. * Tracking Bugs and Patches:: Keeping it all organized.
* Commit Access:: Pushing to the official repository. * Commit Access:: Pushing to the official repository.
* Updating the Guix Package:: Updating the Guix package definition. * Updating the Guix Package:: Updating the Guix package definition.
* Writing Documentation:: Improving documentation in GNU Guix.
* Translating Guix:: Make Guix speak your native language. * Translating Guix:: Make Guix speak your native language.
@end menu @end menu
@ -664,7 +665,7 @@ hyperlinks (@pxref{Overview,,, texinfo, GNU Texinfo}). However you
should be careful when using some characters for example @samp{@@} and should be careful when using some characters for example @samp{@@} and
curly braces which are the basic special characters in Texinfo curly braces which are the basic special characters in Texinfo
(@pxref{Special Characters,,, texinfo, GNU Texinfo}). User interfaces (@pxref{Special Characters,,, texinfo, GNU Texinfo}). User interfaces
such as @command{guix package --show} take care of rendering it such as @command{guix show} take care of rendering it
appropriately. appropriately.
Synopses and descriptions are translated by volunteers Synopses and descriptions are translated by volunteers
@ -1118,11 +1119,11 @@ Development is done using the Git distributed version control system.
Thus, access to the repository is not strictly necessary. We welcome Thus, access to the repository is not strictly necessary. We welcome
contributions in the form of patches as produced by @code{git contributions in the form of patches as produced by @code{git
format-patch} sent to the @email{guix-patches@@gnu.org} mailing list format-patch} sent to the @email{guix-patches@@gnu.org} mailing list
(@pxref{submitting patches,, Submitting patches to a project, git, Git (@pxref{Submitting patches to a project,,, git, Git User Manual}).
User Manual}). Contributors are encouraged to take a moment to set some Contributors are encouraged to take a moment to set some Git repository
Git repository options (@pxref{Configuring Git}) first, which can options (@pxref{Configuring Git}) first, which can improve the
improve the readability of patches. Seasoned Guix developers may also readability of patches. Seasoned Guix developers may also want to look
want to look at the section on commit access (@pxref{Commit Access}). at the section on commit access (@pxref{Commit Access}).
This mailing list is backed by a Debbugs instance, which allows us to This mailing list is backed by a Debbugs instance, which allows us to
keep track of submissions (@pxref{Tracking Bugs and Patches}). Each keep track of submissions (@pxref{Tracking Bugs and Patches}). Each
@ -1779,6 +1780,47 @@ This check can be disabled, @emph{at your own peril}, by setting the
this variable is set, the updated package source is also added to the this variable is set, the updated package source is also added to the
store. This is used as part of the release process of Guix. store. This is used as part of the release process of Guix.
@cindex documentation
@node Writing Documentation
@section Writing Documentation
Guix is documented using the Texinfo system. If you are not yet
familiar with it, we accept contributions for documentation in most
formats. That includes plain text, Markdown, Org, etc.
Documentation contributions can be sent to
@email{guix-patches@@gnu.org}. Prepend @samp{[DOCUMENTATION]} to the
subject.
When you need to make more than a simple addition to the documentation,
we prefer that you send a proper patch as opposed to sending an email
as described above. @xref{Submitting Patches} for more information on
how to send your patches.
To modify the documentation, you need to edit @file{doc/guix.texi} and
@file{doc/contributing.texi} (which contains this documentation
section), or @file{doc/guix-cookbook.texi} for the cookbook. If
you compiled the Guix repository before, you will have
many more @file{.texi} files that are translations of these
documents. Do not modify them, the translation is managed through
@uref{https://translate.fedoraproject.org/projects/guix, Weblate}.
@xref{Translating Guix} for more information.
To render documentation, you must first make sure that you ran
@command{./configure} in your source tree (@pxref{Running Guix Before
It Is Installed}). After that you can run one of the following
commands:
@itemize
@item @samp{make doc/guix.info} to compile the Info manual.
You can check it with @command{info doc/guix.info}.
@item @samp{make doc/guix.html} to compile the HTML version.
You can point your browser to the relevant file in the
@file{doc/guix.html} directory.
@item @samp{make doc/guix-cookbook.info} for the cookbook Info manual.
@item @samp{make doc/guix-cookbook.html} for the cookbook HTML version.
@end itemize
@cindex translation @cindex translation
@cindex l10n @cindex l10n
@cindex i18n @cindex i18n

51
doc/guix-cookbook.texi
View file

@ -122,7 +122,7 @@ language, install it with @code{guix install guile} and start a
@dfn{REPL}---short for @uref{https://en.wikipedia.org/wiki/Read%E2%80%93eval%E2%80%93print_loop, @dfn{REPL}---short for @uref{https://en.wikipedia.org/wiki/Read%E2%80%93eval%E2%80%93print_loop,
@dfn{read-eval-print loop}}---by running @code{guile} from the command line. @dfn{read-eval-print loop}}---by running @code{guile} from the command line.
Alternatively you can also run @code{guix environment --ad-hoc guile -- guile} Alternatively you can also run @code{guix shell guile -- guile}
if you'd rather not have Guile installed in your user profile. if you'd rather not have Guile installed in your user profile.
In the following examples, lines show what you would type at the REPL; In the following examples, lines show what you would type at the REPL;
@ -284,24 +284,41 @@ depends on the @code{(guix store)} module and it exports two variables,
@code{ruby-build} and @code{ruby-build-system}. @code{ruby-build} and @code{ruby-build-system}.
@end itemize @end itemize
For a more detailed introduction, check out @quotation Going further
@uref{http://www.troubleshooters.com/codecorn/scheme_guile/hello.htm, Scheme Scheme is a language that has been widely used to teach programming and
at a Glance}, by Steve Litt. you'll find plenty of material using it as a vehicle. Here's a
selection of documents to learn more about Scheme:
One of the reference Scheme books is the seminal ``Structure and @itemize
Interpretation of Computer Programs'', by Harold Abelson and Gerald Jay @item
Sussman, with Julie Sussman. You'll find a @uref{https://spritely.institute/static/papers/scheme-primer.html, @i{A
@uref{https://mitpress.mit.edu/sites/default/files/sicp/index.html, free copy Scheme Primer}}, by Christine Lemmer-Webber and the Spritely Institute.
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/, @item
videos of the lectures by the authors}. The book is available in Texinfo @uref{http://www.troubleshooters.com/codecorn/scheme_guile/hello.htm,
format as the @code{sicp} Guix package. Go ahead, run @code{guix install @i{Scheme at a Glance}}, by Steve Litt.
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 @item
available}. @uref{https://mitpress.mit.edu/sites/default/files/sicp/index.html,
@i{Structure and Interpretation of Computer Programs}}, by Harold
Abelson and Gerald Jay Sussman, with Julie Sussman. Colloquially known
as ``SICP'', this book is a reference.
You can also install it and read it from your computer:
@example
guix install sicp info-reader
info sicp
@end example
An @uref{https://sarabander.github.io/sicp/, unofficial ebook} is also
available.
@end itemize
You'll find more books, tutorials and other resources at You'll find more books, tutorials and other resources at
@url{https://schemers.org/}. @url{https://schemers.org/}.
@end quotation
@c ********************************************************************* @c *********************************************************************
@ -1600,7 +1617,7 @@ letting you know what you're missing. If the file is blank then you're
missing everything. The next step is to run: missing everything. The next step is to run:
@example shell @example shell
guix environment linux-libre -- make localmodconfig guix shell -D linux-libre -- make localmodconfig
@end example @end example
and note the output. Do note that the @file{.config} file is still empty. and note the output. Do note that the @file{.config} file is still empty.
@ -2787,7 +2804,7 @@ Maybe a dependency from our manifest has been updated; or we may have run
garbage-collected. garbage-collected.
@item @item
Eventually, we set to work on that project again, so we run @code{guix environment Eventually, we set to work on that project again, so we run @code{guix shell
-m manifest.scm}. But now we have to wait for Guix to build and install -m manifest.scm}. But now we have to wait for Guix to build and install
stuff! stuff!
@end enumerate @end enumerate

252
doc/guix.texi
View file

@ -30,7 +30,7 @@ Copyright @copyright{} 2015, 2016 Mathieu Lirzin@*
Copyright @copyright{} 2014 Pierre-Antoine Rault@* Copyright @copyright{} 2014 Pierre-Antoine Rault@*
Copyright @copyright{} 2015 Taylan Ulrich Bayırlı/Kammer@* Copyright @copyright{} 2015 Taylan Ulrich Bayırlı/Kammer@*
Copyright @copyright{} 2015, 2016, 2017, 2019, 2020, 2021 Leo Famulari@* Copyright @copyright{} 2015, 2016, 2017, 2019, 2020, 2021 Leo Famulari@*
Copyright @copyright{} 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ricardo Wurmus@* Copyright @copyright{} 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Ricardo Wurmus@*
Copyright @copyright{} 2016 Ben Woodcroft@* Copyright @copyright{} 2016 Ben Woodcroft@*
Copyright @copyright{} 2016, 2017, 2018, 2021 Chris Marusich@* Copyright @copyright{} 2016, 2017, 2018, 2021 Chris Marusich@*
Copyright @copyright{} 2016, 2017, 2018, 2019, 2020, 2021, 2022 Efraim Flashner@* Copyright @copyright{} 2016, 2017, 2018, 2019, 2020, 2021, 2022 Efraim Flashner@*
@ -105,6 +105,7 @@ Copyright @copyright{} 2022 Aleksandr Vityazev@*
Copyright @copyright{} 2022 Philip M@sup{c}Grath@* Copyright @copyright{} 2022 Philip M@sup{c}Grath@*
Copyright @copyright{} 2022 Karl Hallsby@* Copyright @copyright{} 2022 Karl Hallsby@*
Copyright @copyright{} 2022 Justin Veilleux@* Copyright @copyright{} 2022 Justin Veilleux@*
Copyright @copyright{} 2022 Reily Siegel@*
Permission is granted to copy, distribute and/or modify this document Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or under the terms of the GNU Free Documentation License, Version 1.3 or
@ -682,6 +683,20 @@ chmod +x guix-install.sh
./guix-install.sh ./guix-install.sh
@end example @end example
If you're running Debian or a derivative such as Ubuntu, you can instead
install the package (it might be a version older than @value{VERSION}
but you can update it afterwards by running @samp{guix pull}):
@example
sudo apt install guix
@end example
Likewise on openSUSE:
@example
sudo zypper install guix
@end example
When you're done, @pxref{Application Setup} for extra configuration you When you're done, @pxref{Application Setup} for extra configuration you
might need, and @ref{Getting Started} for your first steps! might need, and @ref{Getting Started} for your first steps!
@end quotation @end quotation
@ -7379,8 +7394,25 @@ The build system that should be used to build the package (@pxref{Build
Systems}). Systems}).
@item @code{arguments} (default: @code{'()}) @item @code{arguments} (default: @code{'()})
The arguments that should be passed to the build system. This is a The arguments that should be passed to the build system (@pxref{Build
list, typically containing sequential keyword-value pairs. Systems}). This is a list, typically containing sequential
keyword-value pairs, as in this example:
@lisp
(package
(name "example")
;; several fields omitted
(arguments
(list #:tests? #f ;skip tests
#:make-flags #~'("VERBOSE=1") ;pass flags to 'make'
#:configure-flags #~'("--enable-frobbing"))))
@end lisp
The exact set of supported keywords depends on the build system
(@pxref{Build Systems}), but you will find that almost all of them honor
@code{#:configure-flags}, @code{#:make-flags}, @code{#:tests?}, and
@code{#:phases}. The @code{#:phases} keyword in particular lets you
modify the set of build phases for your package (@pxref{Build Phases}).
@item @code{inputs} (default: @code{'()}) @item @code{inputs} (default: @code{'()})
@itemx @code{native-inputs} (default: @code{'()}) @itemx @code{native-inputs} (default: @code{'()})
@ -8493,14 +8525,8 @@ the number specified as the @option{--cores} option of
This Boolean, @code{#t} by default, determines whether to ``validate'' This Boolean, @code{#t} by default, determines whether to ``validate''
the @code{RUNPATH} of ELF binaries (@code{.so} shared libraries as well the @code{RUNPATH} of ELF binaries (@code{.so} shared libraries as well
as executables) previously installed by the @code{install} phase. as executables) previously installed by the @code{install} phase.
@xref{phase-validate-runpath, the @code{validate-runpath} phase}, for
This validation step consists in making sure that all the shared details.
libraries needed by an ELF binary, which are listed as
@code{DT_NEEDED} entries in its @code{PT_DYNAMIC} segment, appear in the
@code{DT_RUNPATH} entry of that binary. In other words, it ensures that
running or using those binaries will not result in a ``file not found''
error at run time. @xref{Options, @option{-rpath},, ld, The GNU
Linker}, for more information on @code{RUNPATH}.
@item #:substitutable? @item #:substitutable?
This Boolean, @code{#t} by default, tells whether the package outputs This Boolean, @code{#t} by default, tells whether the package outputs
@ -9579,6 +9605,21 @@ Patch shebangs on the installed executable files.
Strip debugging symbols from ELF files (unless @code{#:strip-binaries?} Strip debugging symbols from ELF files (unless @code{#:strip-binaries?}
is false), copying them to the @code{debug} output when available is false), copying them to the @code{debug} output when available
(@pxref{Installing Debugging Files}). (@pxref{Installing Debugging Files}).
@cindex RUNPATH, validation
@anchor{phase-validate-runpath}
@item validate-runpath
Validate the @code{RUNPATH} of ELF binaries, unless
@code{#:validate-runpath?} is false (@pxref{Build Systems}).
This validation step consists in making sure that all the shared
libraries needed by an ELF binary, which are listed as @code{DT_NEEDED}
entries in its @code{PT_DYNAMIC} segment, appear in the
@code{DT_RUNPATH} entry of that binary. In other words, it ensures that
running or using those binaries will not result in a ``file not found''
error at run time. @xref{Options, @option{-rpath},, ld, The GNU
Linker}, for more information on @code{RUNPATH}.
@end table @end table
Other build systems have similar phases, with some variations. For Other build systems have similar phases, with some variations. For
@ -9704,8 +9745,7 @@ phase before the @code{build} phase, called
(substitute* "Makefile" (substitute* "Makefile"
(("PREFIX =.*") (("PREFIX =.*")
(string-append "PREFIX = " (string-append "PREFIX = "
out "\n"))) out "\n")))))))))))
#true))))))))
@end lisp @end lisp
The new phase that is inserted is written as an anonymous procedure, The new phase that is inserted is written as an anonymous procedure,
@ -13963,6 +14003,10 @@ The @option{--input-simplification} option described below provides
fine-grain control over when inputs should be simplified. fine-grain control over when inputs should be simplified.
@end table @end table
@item --list-stylings
@itemx -l
List and describe the available styling rules and exit.
@item --load-path=@var{directory} @item --load-path=@var{directory}
@itemx -L @var{directory} @itemx -L @var{directory}
Add @var{directory} to the front of the package module search path Add @var{directory} to the front of the package module search path
@ -14911,9 +14955,11 @@ any given store item.
The command output looks like this: The command output looks like this:
@smallexample @smallexample
$ guix challenge --substitute-urls="https://@value{SUBSTITUTE-SERVER-1} https://guix.example.org" $ guix challenge \
updating list of substitutes from 'https://@value{SUBSTITUTE-SERVER-1}'... 100.0% --substitute-urls="https://@value{SUBSTITUTE-SERVER-1} https://guix.example.org" \
updating list of substitutes from 'https://guix.example.org'... 100.0% openssl git pius coreutils grep
updating substitutes from 'https://@value{SUBSTITUTE-SERVER-1}'... 100.0%
updating substitutes from 'https://guix.example.org'... 100.0%
/gnu/store/@dots{}-openssl-1.0.2d contents differ: /gnu/store/@dots{}-openssl-1.0.2d contents differ:
local hash: 0725l22r5jnzazaacncwsvp9kgf42266ayyp814v7djxs7nk963q local hash: 0725l22r5jnzazaacncwsvp9kgf42266ayyp814v7djxs7nk963q
https://@value{SUBSTITUTE-SERVER-1}/nar/@dots{}-openssl-1.0.2d: 0725l22r5jnzazaacncwsvp9kgf42266ayyp814v7djxs7nk963q https://@value{SUBSTITUTE-SERVER-1}/nar/@dots{}-openssl-1.0.2d: 0725l22r5jnzazaacncwsvp9kgf42266ayyp814v7djxs7nk963q
@ -14938,18 +14984,20 @@ updating list of substitutes from 'https://guix.example.org'... 100.0%
@dots{} @dots{}
6,406 store items were analyzed: 5 store items were analyzed:
- 4,749 (74.1%) were identical - 2 (40.0%) were identical
- 525 (8.2%) differed - 3 (60.0%) differed
- 1,132 (17.7%) were inconclusive - 0 (0.0%) were inconclusive
@end smallexample @end smallexample
@noindent @noindent
In this example, @command{guix challenge} first scans the store to In this example, @command{guix challenge} queries all the substitute
determine the set of locally-built derivations---as opposed to store servers for each of the fives packages specified on the command line.
items that were downloaded from a substitute server---and then queries It then reports those store items for which the servers obtained a
all the substitute servers. It then reports those store items for which result different from the local build (if it exists) and/or different
the servers obtained a result different from the local build. from one another; here, the @samp{local hash} lines indicate that a
local build result was available for each of these packages and shows
its hash.
@cindex non-determinism, in package builds @cindex non-determinism, in package builds
As an example, @code{guix.example.org} always gets a different answer. As an example, @code{guix.example.org} always gets a different answer.
@ -15005,19 +15053,21 @@ whether @code{@value{SUBSTITUTE-SERVER-1}} and other substitute servers obtain t
same build result as you did with: same build result as you did with:
@example @example
$ guix challenge @var{package} guix challenge @var{package}
@end example @end example
@noindent
where @var{package} is a package specification such as
@code{guile@@2.0} or @code{glibc:debug}.
The general syntax is: The general syntax is:
@example @example
guix challenge @var{options} [@var{packages}@dots{}] guix challenge @var{options} @var{argument}@dots{}
@end example @end example
@noindent
where @var{argument} is a package specification such as
@code{guile@@2.0} or @code{glibc:debug} or, alternatively, a store file
name as returned, for example, by @command{guix build} or @command{guix
gc --list-live}.
When a difference is found between the hash of a locally-built item and When a difference is found between the hash of a locally-built item and
that of a server-provided substitute, or among substitutes provided by that of a server-provided substitute, or among substitutes provided by
different servers, the command displays it as in the example above and different servers, the command displays it as in the example above and
@ -15200,7 +15250,7 @@ Here's a sample run:
$ guix weather --substitute-urls=https://guix.example.org $ guix weather --substitute-urls=https://guix.example.org
computing 5,872 package derivations for x86_64-linux... computing 5,872 package derivations for x86_64-linux...
looking for 6,128 store items on https://guix.example.org.. looking for 6,128 store items on https://guix.example.org..
updating list of substitutes from 'https://guix.example.org'... 100.0% updating substitutes from 'https://guix.example.org'... 100.0%
https://guix.example.org https://guix.example.org
43.4% substitutes available (2,658 out of 6,128) 43.4% substitutes available (2,658 out of 6,128)
7,032.5 MiB of nars (compressed) 7,032.5 MiB of nars (compressed)
@ -15821,6 +15871,11 @@ file, the @command{guix system reconfigure my-system-config.scm} command
instantiates that configuration, and makes it the default GRUB boot instantiates that configuration, and makes it the default GRUB boot
entry (@pxref{Invoking guix system}). entry (@pxref{Invoking guix system}).
@quotation Note
We recommend that you keep this @file{my-system-config.scm} file safe
and under version control to easily track changes to your configuration.
@end quotation
The normal way to change the system configuration is by updating this The normal way to change the system configuration is by updating this
file and re-running @command{guix system reconfigure}. One should never file and re-running @command{guix system reconfigure}. One should never
have to touch files in @file{/etc} or to run commands that modify the have to touch files in @file{/etc} or to run commands that modify the
@ -18665,6 +18720,75 @@ String or gexp denoting the corresponding mcron job schedule
@end table @end table
@end deftp @end deftp
@cindex logging, anonymization
@subheading Anonip Service
Anonip is a privacy filter that removes IP address from web server logs.
This service creates a FIFO and filters any written lines with anonip
before writing the filtered log to a target file.
The following example sets up the FIFO
@file{/var/run/anonip/https.access.log} and writes the filtered log file
@file{/var/log/anonip/https.access.log}.
@lisp
(service anonip-service-type
(anonip-configuration
(input "/var/run/anonip/https.access.log")
(output "/var/log/anonip/https.access.log")))
@end lisp
Configure your web server to write its logs to the FIFO at
@file{/var/run/anonip/https.access.log} and collect the anonymized log
file at @file{/var/web-logs/https.access.log}.
@deftp {Data Type} anonip-configuration
This data type represents the configuration of anonip.
It has the following parameters:
@table @asis
@item @code{anonip} (default: @code{anonip})
The anonip package to use.
@item @code{input}
The file name of the input log file to process. The service creates a
FIFO of this name. The web server should write its logs to this FIFO.
@item @code{output}
The file name of the processed log file.
@end table
The following optional settings may be provided:
@table @asis
@item @code{skip-private?}
When @code{#true} do not mask addresses in private ranges.
@item @code{column}
A 1-based indexed column number. Assume IP address is in the specified
column (default is 1).
@item @code{replacement}
Replacement string in case address parsing fails, e.g. @code{"0.0.0.0"}.
@item @code{ipv4mask}
Number of bits to mask in IPv4 addresses.
@item @code{ipv6mask}
Number of bits to mask in IPv6 addresses.
@item @code{increment}
Increment the IP address by the given number. By default this is zero.
@item @code{delimiter}
Log delimiter string.
@item @code{regex}
Regular expression for detecting IP addresses. Use this instead of @code{column}.
@end table
@end deftp
@node Networking Setup @node Networking Setup
@subsection Networking Setup @subsection Networking Setup
@ -18690,7 +18814,7 @@ starting with static network configuration.
This is the type for statically-configured network interfaces. Its This is the type for statically-configured network interfaces. Its
value must be a list of @code{static-networking} records. Each of them value must be a list of @code{static-networking} records. Each of them
declares a set of @dfn{addresses}, @dfn{routes}, and @dfn{links}, as declares a set of @dfn{addresses}, @dfn{routes}, and @dfn{links}, as
show below. shown below.
@cindex network interface controller (NIC) @cindex network interface controller (NIC)
@cindex NIC, networking interface controller @cindex NIC, networking interface controller
@ -21096,9 +21220,11 @@ You can do that directly, like this (you need to use the
(list cups-filters epson-inkjet-printer-escpr hplip-minimal)))) (list cups-filters epson-inkjet-printer-escpr hplip-minimal))))
@end lisp @end lisp
Note: If you wish to use the Qt5 based GUI which comes with the hplip @quotation Note
If you wish to use the Qt5 based GUI which comes with the hplip
package then it is suggested that you install the @code{hplip} package, package then it is suggested that you install the @code{hplip} package,
either in your OS configuration file or as your user. either in your OS configuration file or as your user.
@end quotation
The available configuration parameters follow. Each parameter The available configuration parameters follow. Each parameter
definition is preceded by its type; for example, @samp{string-list foo} definition is preceded by its type; for example, @samp{string-list foo}
@ -25579,13 +25705,15 @@ example if you want your users to have addresses like
@samp{"john.smith@@example.com"} then you need to add a host @samp{"john.smith@@example.com"} then you need to add a host
@samp{"example.com"}. All options in this list will apply only to this host. @samp{"example.com"}. All options in this list will apply only to this host.
Note: the name @emph{virtual} host is used in configuration to avoid confusion with @quotation Note
The name @emph{virtual} host is used in configuration to avoid confusion with
the actual physical host that Prosody is installed on. A single Prosody the actual physical host that Prosody is installed on. A single Prosody
instance can serve many domains, each one defined as a VirtualHost entry in instance can serve many domains, each one defined as a VirtualHost entry in
Prosody's configuration. Conversely a server that hosts a single domain would Prosody's configuration. Conversely a server that hosts a single domain would
have just one VirtualHost entry. have just one VirtualHost entry.
See @url{https://prosody.im/doc/configure#virtual_host_settings}. See @url{https://prosody.im/doc/configure#virtual_host_settings}.
@end quotation
Available @code{virtualhost-configuration} fields are: Available @code{virtualhost-configuration} fields are:
@ -26186,8 +26314,10 @@ After setting this option, it is recommend that you inspect your Mumble
server log to ensure that Mumble is using the cipher suites that you server log to ensure that Mumble is using the cipher suites that you
expected it to. expected it to.
Note: Changing this option may impact the backwards compatibility of your @quotation Note
Changing this option may impact the backwards compatibility of your
Mumble-Server server, and can remove the ability for older Mumble clients to be able to connect to it. Mumble-Server server, and can remove the ability for older Mumble clients to be able to connect to it.
@end quotation
@item @code{public-registration} (default: @code{#f}) @item @code{public-registration} (default: @code{#f})
Must be a @code{<mumble-server-public-registration-configuration>} Must be a @code{<mumble-server-public-registration-configuration>}
@ -28490,6 +28620,9 @@ prefix @samp{unix:}. For addresses using an IP address or domain name,
the default port is 80, and a different port can be specified the default port is 80, and a different port can be specified
explicitly. explicitly.
@item @code{extra-content}
A string or list of strings to add to the upstream block.
@end table @end table
@end deftp @end deftp
@ -35065,6 +35198,11 @@ allocation plan in the database.
An association list of hooks. These provide a way to execute arbitrary An association list of hooks. These provide a way to execute arbitrary
code upon certain events, like a build result being processed. code upon certain events, like a build result being processed.
@item @code{parallel-hooks} (default: @var{'()})
Hooks can be configured to run in parallel. This parameter is an
association list of hooks to do in parallel, where the key is the symbol
for the hook and the value is the number of threads to run.
@item @code{guile} (default: @code{guile-3.0-latest}) @item @code{guile} (default: @code{guile-3.0-latest})
The Guile package with which to run the Guix Build Coordinator. The Guile package with which to run the Guix Build Coordinator.
@ -37562,6 +37700,10 @@ $ guix system extension-graph @var{file} | xdot -
shows the extension relations among services. shows the extension relations among services.
@quotation Note
The @command{dot} program is provided by the @code{graphviz} package.
@end quotation
@anchor{system-shepherd-graph} @anchor{system-shepherd-graph}
@item shepherd-graph @item shepherd-graph
Emit to standard output the @dfn{dependency Emit to standard output the @dfn{dependency
@ -38886,12 +39028,6 @@ Return a G-expression that contains the values corresponding to the
disk by using something like @code{mixed-text-file}. disk by using something like @code{mixed-text-file}.
@end deffn @end deffn
@deffn {Scheme Procedure} validate-configuration @var{configuration}
@var{fields}
Type-check @var{fields}, a list of field names of @var{configuration}, a
configuration record created by @code{define-configuration}.
@end deffn
@deffn {Scheme Procedure} empty-serializer @var{field-name} @var{value} @deffn {Scheme Procedure} empty-serializer @var{field-name} @var{value}
A serializer that just returns an empty string. The A serializer that just returns an empty string. The
@code{serialize-package} procedure is an alias for this. @code{serialize-package} procedure is an alias for this.
@ -39298,6 +39434,7 @@ services)}.
* Shepherd: Shepherd Home Service. Managing User's Daemons. * Shepherd: Shepherd Home Service. Managing User's Daemons.
* SSH: Secure Shell. Setting up the secure shell client. * SSH: Secure Shell. Setting up the secure shell client.
* Desktop: Desktop Home Services. Services for graphical environments. * Desktop: Desktop Home Services. Services for graphical environments.
* Guix: Guix Home Services. Services for Guix.
@end menu @end menu
@c In addition to that Home Services can provide @c In addition to that Home Services can provide
@ -39938,6 +40075,37 @@ format.
@end deftp @end deftp
@node Guix Home Services
@subsection Guix Home Services
The @code{(gnu home services guix)} module provides services for
user-specific Guix configuration.
@defvr {Scheme Variable} home-channels-service-type
This is the service type for managing
@file{$XDG_CONFIG_HOME/guix/channels.scm}, the file that controls the
channels received on @command{guix pull} (@pxref{Channels}). Its
associated value is a list of @code{channel} records, defined in the
@code{(guix channels)} module.
Generally, it is better to extend this service than to directly
configure it, as its default value is the default guix channel(s)
defined by @code{%default-channels}. If you configure this service
directly, be sure to include a guix channel. @xref{Specifying
Additional Channels} and @ref{Using a Custom Guix Channel} for more
details.
A typical extension for adding a channel might look like this:
@lisp
(simple-service 'variant-packages-service
home-channels-service-type
(list
(channel
(name 'variant-packages)
(url "https://example.org/variant-packages.git")))
@end lisp
@end defvr
@node Invoking guix home @node Invoking guix home
@section Invoking @code{guix home} @section Invoking @code{guix home}

16
etc/guix-install.sh
View file

@ -504,6 +504,16 @@ sys_create_init_profile()
# This will not take effect until the next shell or desktop session! # This will not take effect until the next shell or desktop session!
[ -d "/etc/profile.d" ] || mkdir /etc/profile.d # Just in case [ -d "/etc/profile.d" ] || mkdir /etc/profile.d # Just in case
cat <<"EOF" > /etc/profile.d/guix.sh cat <<"EOF" > /etc/profile.d/guix.sh
# Explicitly initialize XDG base directory variables to ease compatibility
# with Guix System: see <https://issues.guix.gnu.org/56050#3>.
export XDG_DATA_HOME="${XDG_DATA_HOME:-$HOME/.local/share}"
export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
export XDG_STATE_HOME="${XDG_STATE_HOME:-$HOME/.local/state}"
export XDG_DATA_DIRS="${XDG_DATA_DIRS:-/usr/local/share/:/usr/share/}"
export XDG_CONFIG_DIRS="${XDG_CONFIG_DIRS:-/etc/xdg}"
export XDG_CACHE_HOME="${XDG_CACHE_HOME:-$HOME/.cache}"
# no default for XDG_RUNTIME_DIR (depends on foreign distro for semantics)
# _GUIX_PROFILE: `guix pull` profile # _GUIX_PROFILE: `guix pull` profile
_GUIX_PROFILE="$HOME/.config/guix/current" _GUIX_PROFILE="$HOME/.config/guix/current"
export PATH="$_GUIX_PROFILE/bin${PATH:+:}$PATH" export PATH="$_GUIX_PROFILE/bin${PATH:+:}$PATH"
@ -514,7 +524,9 @@ export PATH="$_GUIX_PROFILE/bin${PATH:+:}$PATH"
export INFOPATH="$_GUIX_PROFILE/share/info:$INFOPATH" export INFOPATH="$_GUIX_PROFILE/share/info:$INFOPATH"
# GUIX_PROFILE: User's default profile # GUIX_PROFILE: User's default profile
GUIX_PROFILE="$HOME/.guix-profile" # Prefer the one from 'guix home' if it exists.
GUIX_PROFILE="$HOME/.guix-home/profile"
[ -L $GUIX_PROFILE ] || GUIX_PROFILE="$HOME/.guix-profile"
[ -L $GUIX_PROFILE ] || return [ -L $GUIX_PROFILE ] || return
GUIX_LOCPATH="$GUIX_PROFILE/lib/locale" GUIX_LOCPATH="$GUIX_PROFILE/lib/locale"
export GUIX_LOCPATH export GUIX_LOCPATH
@ -522,7 +534,7 @@ export GUIX_LOCPATH
[ -f "$GUIX_PROFILE/etc/profile" ] && . "$GUIX_PROFILE/etc/profile" [ -f "$GUIX_PROFILE/etc/profile" ] && . "$GUIX_PROFILE/etc/profile"
# set XDG_DATA_DIRS to include Guix installations # set XDG_DATA_DIRS to include Guix installations
export XDG_DATA_DIRS="$GUIX_PROFILE/share:${XDG_DATA_DIRS:-/usr/local/share/:/usr/share/}" export XDG_DATA_DIRS="$GUIX_PROFILE/share:$XDG_DATA_DIRS"
EOF EOF
} }

10
etc/news.scm
View file

@ -25,6 +25,16 @@
(channel-news (channel-news
(version 0) (version 0)
(entry (commit "2ec7ab2610eb67e26dab52b671eb29e46f64ea0f")
(title
(en "Linux-libre kernel updated to 5.18")
(de "Linux-libre-Kernel wird auf 5.18 aktualisiert"))
(body
(en "The default version of the linux-libre kernel has been
updated to the 5.18 release series.")
(de "Der standardmäßig verwendete @code{linux-libre}-Kernel basiert
jetzt auf der 5.18-Versionsreihe.")))
(entry (commit "bdf422176739b473add66eb8cac9fdd8c654f794") (entry (commit "bdf422176739b473add66eb8cac9fdd8c654f794")
(title (title
(en "@option{-L} option of @command{guix refresh} repurposed") (en "@option{-L} option of @command{guix refresh} repurposed")

15
etc/system-tests.scm
View file

@ -43,21 +43,6 @@ 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."

310
etc/teams.scm.in Normal file
View file

@ -0,0 +1,310 @@
#!@GUILE@ \
--no-auto-compile -s
!#
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2022 Ricardo Wurmus <rekado@elephly.net>
;;;
;;; 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/>.
;;; Commentary:
;; This code defines development teams and team members.
;;; Code:
(use-modules (srfi srfi-1)
(srfi srfi-9)
(ice-9 format)
(ice-9 match)
(guix ui))
(define-record-type <team>
(make-team id name description members)
team?
(id team-id)
(name team-name)
(description team-description)
(members team-members set-team-members!))
(define-record-type <person>
(make-person name email)
person?
(name person-name)
(email person-email))
(define* (person name #:optional email)
(make-person name email))
(define* (team id #:key name description (members '()))
(make-team id
(or name (symbol->string id))
description
members))
(define %teams
(make-hash-table))
(define-syntax define-team
(lambda (x)
(syntax-case x ()
((_ id value)
#`(begin
(define-public id value)
(hash-set! %teams 'id id))))))
(define-syntax-rule (define-member person teams ...)
(let ((p person))
(for-each (lambda (team-id)
(let ((team
(hash-ref %teams team-id
(lambda ()
(error (format #false
"Unknown team ~a for ~a~%"
team-id p))))))
(set-team-members!
team (cons p (team-members team)))))
(quote (teams ...)))))
(define-team python
(team 'python
#:name "Python team"
#:description
"Python, Python packages, the \"pypi\" importer, and the python-build-system."))
(define-team haskell
(team 'haskell
#:name "Haskell team"
#:description
"GHC, Hugs, Haskell packages, the \"hackage\" and \"stackage\" importers, and
the haskell-build-system."))
(define-team r
(team 'r
#:name "R team"
#:description
"The R language, CRAN and Bioconductor repositories, the \"cran\" importer,
and the r-build-system."))
(define-team julia
(team 'julia
#:name "Julia team"
#:description
"The Julia language, Julia packages, and the julia-build-system."))
(define-team ocaml
(team 'ocaml
#:name "OCaml and Dune team"
#:description
"The OCaml language, the Dune build system, OCaml packages, the \"opam\"
importer, and the ocaml-build-system."))
(define-team java
(team 'java
#:name "Java and Maven team"
#:description
"The JDK and JRE, the Maven build system, Java packages, the ant-build-system,
and the maven-build-system."))
(define-team science
(team 'science
#:name "Science team"))
(define-team emacs
(team 'emacs
#:name "Emacs team"))
(define-team lisp
(team 'lisp
#:name "Lisp team"))
(define-team ruby
(team 'ruby
#:name "Ruby team"))
(define-team go
(team 'go
#:name "Go team"))
(define-team embedded-bootstrap
(team 'embedded-bootstrap
#:name "Embedded / Bootstrap"))
(define-team rust
(team 'rust
#:name "Rust"))
(define-team kernel
(team 'kernel
#:name "Linux-libre kernel team"))
(define-team core
(team 'core
#:name "Core / Tools / Internals"))
(define-team games
(team 'games
#:name "Games and Videos"))
(define-team translations
(team 'translations
#:name "Translations"))
(define-team installer
(team 'installer
#:name "Installer script and system installer"))
(define-team home
(team 'home
#:name "Team for \"guix home\""))
(define-team mentors
(team 'mentors
#:name "Mentors"
#:description
"A group of mentors who chaperone contributions by newcomers."))
(define-team mozilla
(team 'mozilla
#:name "Mozilla"
"Taking care about Icecat and Icedove, built from Mozilla Firefox
and Thunderbird."))
(define-member (person "Thiago Jung Bauermann"
"bauermann@kolabnow.com")
embedded-bootstrap translations)
(define-member (person "Lars-Dominik Braun"
"lars@6xq.net")
python haskell)
(define-member (person "Jonathan Brielmaier"
"jonathan.brielmaier@web.de")
mozilla)
(define-member (person "Ludovic Courtès"
"ludo@gnu.org")
core home embedded-bootstrap mentors)
(define-member (person "Andreas Enge"
"andreas@enge.fr")
science)
(define-member (person "Björn Höfling"
"bjoern.hoefling@bjoernhoefling.de")
java)
(define-member (person "Leo Famulari"
"leo@famulari.name")
kernel)
(define-member (person "Efraim Flashner"
"efraim@flashner.co.il")
embedded-bootstrap julia rust science)
(define-member (person "jgart"
"jgart@dismail.de")
python lisp mentors)
(define-member (person "Julien Lepiller"
"julien@lepiller.eu")
java ocaml translations)
(define-member (person "Florian Pelz"
"pelzflorian@pelzflorian.de")
translations)
(define-member (person "Liliana Marie Prikler"
"liliana.prikler@gmail.com")
emacs games)
(define-member (person "Ricardo Wurmus"
"rekado@elephly.net")
r core mentors)
(define-member (person "Christopher Baines"
"mail@cbaines.net")
core mentors ruby)
(define (find-team name)
(or (hash-ref %teams (string->symbol name))
(error (format #false
"no such team: ~a~%" name))))
(define (cc . teams)
"Return arguments for `git send-email' to notify the members of the given
TEAMS when a patch is received by Debbugs."
(format #true
"~{--add-header=\"X-Debbugs-Cc: ~a\"~^ ~}"
(map person-email
(delete-duplicates (append-map team-members teams) equal?))))
(define* (list-members team #:optional port (prefix ""))
"Print the members of the given TEAM."
(define port* (or port (current-output-port)))
(for-each
(lambda (member)
(format port*
"~a~a <~a>~%"
prefix
(person-name member)
(person-email member)))
(team-members team)))
(define (list-teams)
"Print all teams and their members."
(define port* (current-output-port))
(define width* (%text-width))
(hash-for-each
(lambda (key team)
(format port*
"\
id: ~a
name: ~a
description: ~a
members:
"
(team-id team)
(team-name team)
(or (and=> (team-description team)
(lambda (text)
(string->recutils
(fill-paragraph text width*
(string-length "description: ")))))
"<none>"))
(list-members team port* "+ ")
(newline))
%teams))
(define (main . args)
(match args
(("cc" . team-names)
(apply cc (map find-team team-names)))
(("list-teams" . args)
(list-teams))
(("list-members" . team-names)
(for-each
(lambda (team-name)
(list-members (find-team team-name)))
team-names))
(anything
(format (current-error-port)
"Usage: etc/teams.scm <command> [<args>]~%"))))
(apply main (cdr (command-line)))

84
etc/time-travel-manifest.scm Normal file
View file

@ -0,0 +1,84 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2022 Ludovic Courtès <ludo@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/>.
;;; This file returns a manifest containing entries to build past Guix
;;; releases from the current Guix, as per 'guix time-machine'.
(use-modules (srfi srfi-9) (ice-9 match)
(guix channels) (guix gexp)
((guix store) #:select (%store-monad))
((guix monads) #:select (mparameterize return))
((guix git) #:select (%repository-cache-directory))
((guix build utils) #:select (mkdir-p)))
;; Representation of the latest channels. This type exists just so we can
;; refer to such records in a gexp.
(define-record-type <guix-instance>
(guix-instance channels)
guix-instance?
(channels guix-instance-channels))
(define-gexp-compiler (guix-instance-compiler (instance <guix-instance>)
system target)
(match instance
(($ <guix-instance> channels)
;; When this manifest is evaluated by Cuirass, make sure it does not
;; fiddle with the cached checkout that Cuirass is also using since
;; concurrent accesses are unsafe.
(mparameterize %store-monad ((%repository-cache-directory
(string-append (%repository-cache-directory)
"/time-travel")))
(return (mkdir-p (%repository-cache-directory)))
(latest-channel-derivation channels)))))
(define (guix-instance->manifest-entry instance)
"Return a manifest entry for INSTANCE."
(define (shorten commit)
(string-take commit 7))
(manifest-entry
(name "guix")
(version (string-join (map (compose shorten channel-commit)
(guix-instance-channels instance))
"-"))
(item instance)))
(define (commit->guix-instance commit)
"Return a Guix instance for COMMIT."
(guix-instance (list (channel
(inherit %default-guix-channel)
(commit commit)))))
(define %release-commits
;; Release commits: the list of version/commit pairs.
'(("1.3.0" . "a0178d34f582b50e9bdbb0403943129ae5b560ff")
("1.2.0" . "a099685659b4bfa6b3218f84953cbb7ff9e88063")
("1.1.0" . "d62c9b2671be55ae0305bebfda17b595f33797f2")
("1.0.1" . "d68de958b60426798ed62797ff7c96c327a672ac")
("1.0.0" . "6298c3ffd9654d3231a6f25390b056483e8f407c")
("0.16.0" . "4a0b87f0ec5b6c2dcf82b372dd20ca7ea6acdd9c")))
(manifest
(map (match-lambda
((version . commit)
(let ((entry (guix-instance->manifest-entry
(commit->guix-instance commit))))
(manifest-entry
(inherit entry)
(version version)))))
%release-commits))

32
gnu/bootloader/grub.scm
View file

@ -8,6 +8,7 @@
;;; 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> ;;; Copyright © 2022 Karl Hallsby <karl@hallsby.com>
;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -57,6 +58,7 @@
grub-bootloader grub-bootloader
grub-efi-bootloader grub-efi-bootloader
grub-efi-removable-bootloader grub-efi-removable-bootloader
grub-efi32-bootloader
grub-efi-netboot-bootloader grub-efi-netboot-bootloader
grub-mkrescue-bootloader grub-mkrescue-bootloader
grub-minimal-bootloader grub-minimal-bootloader
@ -636,6 +638,29 @@ fi~%"))))
"--bootloader-id=Guix" "--bootloader-id=Guix"
"--efi-directory" target-esp))))) "--efi-directory" target-esp)))))
(define install-grub-efi32
#~(lambda (bootloader efi-dir mount-point)
;; 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
"--bootloader-id=Guix"
(cond ((target-x86?) "--target=i386-efi")
((target-arm?) "--target=arm-efi"))
"--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."
@ -768,6 +793,13 @@ considered for security aspects."
(name 'grub-efi-removable-bootloader) (name 'grub-efi-removable-bootloader)
(installer install-grub-efi-removable))) (installer install-grub-efi-removable)))
(define grub-efi32-bootloader
(bootloader
(inherit grub-efi-bootloader)
(installer install-grub-efi32)
(name 'grub-efi32)
(package grub-efi32)))
(define grub-efi-netboot-bootloader (define grub-efi-netboot-bootloader
(bootloader (bootloader
(inherit grub-efi-bootloader) (inherit grub-efi-bootloader)

37
gnu/build/bootloader.scm
View file

@ -1,6 +1,8 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
;;; Copyright © 2022 Timothy Sample <samplet@ngyro.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -54,8 +56,12 @@
;;; EFI bootloader. ;;; EFI bootloader.
;;; ;;;
(define (install-efi grub grub-config esp) (define* (install-efi grub grub-config esp #:key targets)
"Write a self-contained GRUB EFI loader to the mounted ESP using GRUB-CONFIG." "Write a self-contained GRUB EFI loader to the mounted ESP using
GRUB-CONFIG.
If TARGETS is set, use its car as the GRUB image format and its cdr as
the output filename. Otherwise, use defaults for the host platform."
(let* ((system %host-type) (let* ((system %host-type)
;; Hard code the output location to a well-known path recognized by ;; Hard code the output location to a well-known path recognized by
;; compliant firmware. See "3.5.1.1 Removable Media Boot Behaviour": ;; compliant firmware. See "3.5.1.1 Removable Media Boot Behaviour":
@ -63,14 +69,15 @@
(grub-mkstandalone (string-append grub "/bin/grub-mkstandalone")) (grub-mkstandalone (string-append grub "/bin/grub-mkstandalone"))
(efi-directory (string-append esp "/EFI/BOOT")) (efi-directory (string-append esp "/EFI/BOOT"))
;; Map grub target names to boot file names. ;; Map grub target names to boot file names.
(efi-targets (cond ((string-prefix? "x86_64" system) (efi-targets (or targets
'("x86_64-efi" . "BOOTX64.EFI")) (cond ((string-prefix? "x86_64" system)
((string-prefix? "i686" system) '("x86_64-efi" . "BOOTX64.EFI"))
'("i386-efi" . "BOOTIA32.EFI")) ((string-prefix? "i686" system)
((string-prefix? "armhf" system) '("i386-efi" . "BOOTIA32.EFI"))
'("arm-efi" . "BOOTARM.EFI")) ((string-prefix? "armhf" system)
((string-prefix? "aarch64" system) '("arm-efi" . "BOOTARM.EFI"))
'("arm64-efi" . "BOOTAA64.EFI"))))) ((string-prefix? "aarch64" system)
'("arm64-efi" . "BOOTAA64.EFI"))))))
;; grub-mkstandalone requires a TMPDIR to prepare the firmware image. ;; grub-mkstandalone requires a TMPDIR to prepare the firmware image.
(setenv "TMPDIR" esp) (setenv "TMPDIR" esp)
@ -81,9 +88,12 @@
;; Graft the configuration file onto the image. ;; Graft the configuration file onto the image.
(string-append "boot/grub/grub.cfg=" grub-config)))) (string-append "boot/grub/grub.cfg=" grub-config))))
(define (install-efi-loader grub-efi esp) (define* (install-efi-loader grub-efi esp #:key targets)
"Install in ESP directory the given GRUB-EFI bootloader. Configure it to "Install in ESP directory the given GRUB-EFI bootloader. Configure it to
load the Grub bootloader located in the 'Guix_image' root partition." load the Grub bootloader located in the 'Guix_image' root partition.
If TARGETS is set, use its car as the GRUB image format and its cdr as
the output filename. Otherwise, use defaults for the host platform."
(let ((grub-config "grub.cfg")) (let ((grub-config "grub.cfg"))
(call-with-output-file grub-config (call-with-output-file grub-config
(lambda (port) (lambda (port)
@ -97,5 +107,6 @@ load the Grub bootloader located in the 'Guix_image' root partition."
insmod part_gpt~@ insmod part_gpt~@
search --set=root --label Guix_image~@ search --set=root --label Guix_image~@
configfile /boot/grub/grub.cfg~%"))) configfile /boot/grub/grub.cfg~%")))
(install-efi grub-efi grub-config esp) (install-efi grub-efi grub-config esp #:targets targets)
(delete-file grub-config))) (delete-file grub-config)))

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

@ -52,6 +52,8 @@
read-partition-uuid read-partition-uuid
read-luks-partition-uuid read-luks-partition-uuid
cleanly-unmounted-ext2?
bind-mount bind-mount
system*/tty system*/tty
@ -193,6 +195,23 @@ NUL terminator, return the size of the bytevector."
if DEVICE does not contain an ext2 file system." if DEVICE does not contain an ext2 file system."
(read-superblock device 1024 264 ext2-superblock?)) (read-superblock device 1024 264 ext2-superblock?))
(define (ext2-superblock-cleanly-unmounted? sblock)
"Return true if SBLOCK denotes a file system that was cleanly unmounted,
false otherwise."
(define EXT2_VALID_FS 1) ;cleanly unmounted
(define EXT2_ERROR_FS 2) ;errors detected
(define EXT3_FEATURE_INCOMPAT_RECOVER #x0004) ;journal needs recovery
(let ((state (bytevector-u16-ref sblock 58 %ext2-endianness)))
(cond ((= state EXT2_VALID_FS)
(let ((incompatible-features
(bytevector-u32-ref sblock 96 %ext2-endianness)))
(zero? (logand incompatible-features
EXT3_FEATURE_INCOMPAT_RECOVER))))
((= state EXT2_ERROR_FS) #f)
(else (error "invalid ext2 superblock state" state)))))
(define (ext2-superblock-uuid sblock) (define (ext2-superblock-uuid sblock)
"Return the UUID of ext2 superblock SBLOCK as a 16-byte bytevector." "Return the UUID of ext2 superblock SBLOCK as a 16-byte bytevector."
(sub-bytevector sblock 104 16)) (sub-bytevector sblock 104 16))
@ -220,6 +239,11 @@ errors. Otherwise, fix only those considered safe to repair automatically."
(2 'reboot-required) (2 'reboot-required)
(_ 'fatal-error))) (_ 'fatal-error)))
(define (cleanly-unmounted-ext2? device) ;convenience procedure
"Return true if DEVICE is an ext2 file system and if it was cleanly
unmounted."
(ext2-superblock-cleanly-unmounted? (read-ext2-superblock device)))
;;; ;;;
;;; Linux swap. ;;; Linux swap.

14
gnu/build/image.scm
View file

@ -6,6 +6,7 @@
;;; 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> ;;; Copyright © 2022 Pavel Shlyak <p.shlyak@pantherx.org>
;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -27,6 +28,7 @@
#:use-module (guix build syscalls) #:use-module (guix build syscalls)
#:use-module (guix build utils) #:use-module (guix build utils)
#:use-module (guix store database) #:use-module (guix store database)
#:use-module (guix utils)
#:use-module (gnu build bootloader) #:use-module (gnu build bootloader)
#:use-module (gnu build install) #:use-module (gnu build install)
#:use-module (gnu build linux-boot) #:use-module (gnu build linux-boot)
@ -41,6 +43,7 @@
convert-disk-image convert-disk-image
genimage genimage
initialize-efi-partition initialize-efi-partition
initialize-efi32-partition
initialize-root-partition initialize-root-partition
make-iso9660-image)) make-iso9660-image))
@ -169,6 +172,17 @@ produced by #:references-graphs. Pass WAL-MODE? to call-with-database."
"Install in ROOT directory, an EFI loader using GRUB-EFI." "Install in ROOT directory, an EFI loader using GRUB-EFI."
(install-efi-loader grub-efi root)) (install-efi-loader grub-efi root))
(define* (initialize-efi32-partition root
#:key
grub-efi32
#:allow-other-keys)
"Install in ROOT directory, an EFI 32bit loader using GRUB-EFI32."
(install-efi-loader grub-efi32 root
#:targets (cond ((target-x86?)
'("i386-efi" . "BOOTIA32.EFI"))
((target-arm?)
'("arm-efi" . "BOOTARM.EFI")))))
(define* (initialize-root-partition root (define* (initialize-root-partition root
#:key #:key
bootcfg bootcfg

44
gnu/home/services/guix.scm Normal file
View file

@ -0,0 +1,44 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2022 Reily Siegel <mail@reilysiegel.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 home services guix)
#:use-module (gnu home services)
#:use-module (guix channels)
#:use-module (guix gexp)
#:use-module (ice-9 pretty-print)
#:use-module (srfi srfi-1)
#:export (home-channels-service-type))
(define (channels-xdg-files channels)
`(("guix/channels.scm"
,(plain-file
"channels.scm"
(call-with-output-string
(lambda (port)
(pretty-print (cons 'list (map channel->code channels)) port)))))))
(define home-channels-service-type
(service-type
(name 'home-channels)
(default-value %default-channels)
(compose concatenate)
(extend append)
(extensions
(list (service-extension home-xdg-configuration-files-service-type
channels-xdg-files)))
(description "Manages the per-user Guix channels specification.")))

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

@ -555,9 +555,9 @@ with text blocks from other extensions and the base service."))
((key . #f) ((key . #f)
"") "")
((key . #t) ((key . #t)
#~(string-append "set " #$key "\n")) #~(string-append "set -x " #$key "\n"))
((key . value) ((key . value)
#~(string-append "set " #$key " " #$value "\n"))) #~(string-append "set -x " #$key " " #$value "\n")))
val))) val)))
(define-configuration home-fish-configuration (define-configuration home-fish-configuration

30
gnu/image.scm
View file

@ -19,6 +19,10 @@
(define-module (gnu image) (define-module (gnu image)
#:use-module (guix platform) #:use-module (guix platform)
#:use-module (guix records) #:use-module (guix records)
#:use-module (guix diagnostics)
#:use-module (guix i18n)
#:use-module (srfi srfi-34)
#:use-module (srfi srfi-35)
#:export (partition #:export (partition
partition? partition?
partition-device partition-device
@ -70,19 +74,38 @@
(label partition-label (default #f)) (label partition-label (default #f))
(uuid partition-uuid (default #f)) (uuid partition-uuid (default #f))
(flags partition-flags (default '())) (flags partition-flags (default '()))
(initializer partition-initializer (default #f))) (initializer partition-initializer (default #f))) ;gexp | #f
;;; ;;;
;;; Image record. ;;; Image record.
;;; ;;;
(define-syntax-rule (define-set-sanitizer name field set)
"Define NAME as a procedure or macro that raises an error if passed a value
that is not in SET, mentioning FIELD in the error message."
(define-with-syntax-properties (name (value properties))
(unless (memq value 'set)
(raise
(make-compound-condition
(condition
(&error-location
(location (source-properties->location properties))))
(formatted-message (G_ "~s: invalid '~a' value") value 'field))))
value))
(define-set-sanitizer validate-image-format format
(disk-image compressed-qcow2 docker iso9660))
(define-set-sanitizer validate-partition-table-type partition-table-type
(mbr gpt))
(define-record-type* <image> (define-record-type* <image>
image make-image image make-image
image? image?
(name image-name ;symbol (name image-name ;symbol
(default #f)) (default #f))
(format image-format) ;symbol (format image-format ;symbol
(sanitize validate-image-format))
(platform image-platform ;<platform> (platform image-platform ;<platform>
(default #f)) (default #f))
(size image-size ;size in bytes as integer (size image-size ;size in bytes as integer
@ -90,7 +113,8 @@
(operating-system image-operating-system ;<operating-system> (operating-system image-operating-system ;<operating-system>
(default #f)) (default #f))
(partition-table-type image-partition-table-type ; 'mbr or 'gpt (partition-table-type image-partition-table-type ; 'mbr or 'gpt
(default 'mbr)) (default 'mbr)
(sanitize validate-partition-table-type))
(partitions image-partitions ;list of <partition> (partitions image-partitions ;list of <partition>
(default '())) (default '()))
(compression? image-compression? ;boolean (compression? image-compression? ;boolean

15
gnu/local.mk
View file

@ -83,6 +83,7 @@ GNU_SYSTEM_MODULES = \
%D%/home/services/desktop.scm \ %D%/home/services/desktop.scm \
%D%/home/services/symlink-manager.scm \ %D%/home/services/symlink-manager.scm \
%D%/home/services/fontutils.scm \ %D%/home/services/fontutils.scm \
%D%/home/services/guix.scm \
%D%/home/services/shells.scm \ %D%/home/services/shells.scm \
%D%/home/services/shepherd.scm \ %D%/home/services/shepherd.scm \
%D%/home/services/ssh.scm \ %D%/home/services/ssh.scm \
@ -955,6 +956,7 @@ dist_patch_DATA = \
%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 \
%D%/packages/patches/clang-runtime-3.5-libsanitizer-mode-field.patch \ %D%/packages/patches/clang-runtime-3.5-libsanitizer-mode-field.patch \
%D%/packages/patches/clang-runtime-3.7-fix-build-with-python3.patch \
%D%/packages/patches/clang-runtime-3.9-libsanitizer-mode-field.patch \ %D%/packages/patches/clang-runtime-3.9-libsanitizer-mode-field.patch \
%D%/packages/patches/clang-runtime-3.8-libsanitizer-mode-field.patch \ %D%/packages/patches/clang-runtime-3.8-libsanitizer-mode-field.patch \
%D%/packages/patches/classpath-aarch64-support.patch \ %D%/packages/patches/classpath-aarch64-support.patch \
@ -977,6 +979,7 @@ dist_patch_DATA = \
%D%/packages/patches/crda-optional-gcrypt.patch \ %D%/packages/patches/crda-optional-gcrypt.patch \
%D%/packages/patches/clucene-contribs-lib.patch \ %D%/packages/patches/clucene-contribs-lib.patch \
%D%/packages/patches/cube-nocheck.patch \ %D%/packages/patches/cube-nocheck.patch \
%D%/packages/patches/curl-easy-lock.patch \
%D%/packages/patches/curl-use-ssl-cert-env.patch \ %D%/packages/patches/curl-use-ssl-cert-env.patch \
%D%/packages/patches/cursynth-wave-rand.patch \ %D%/packages/patches/cursynth-wave-rand.patch \
%D%/packages/patches/cvs-CVE-2017-12836.patch \ %D%/packages/patches/cvs-CVE-2017-12836.patch \
@ -1004,7 +1007,6 @@ dist_patch_DATA = \
%D%/packages/patches/docbook-xsl-support-old-url.patch \ %D%/packages/patches/docbook-xsl-support-old-url.patch \
%D%/packages/patches/doc++-include-directives.patch \ %D%/packages/patches/doc++-include-directives.patch \
%D%/packages/patches/doc++-segfault-fix.patch \ %D%/packages/patches/doc++-segfault-fix.patch \
%D%/packages/patches/docker-fix-tests.patch \
%D%/packages/patches/dovecot-trees-support-dovecot-2.3.patch \ %D%/packages/patches/dovecot-trees-support-dovecot-2.3.patch \
%D%/packages/patches/dstat-fix-crash-when-specifying-delay.patch \ %D%/packages/patches/dstat-fix-crash-when-specifying-delay.patch \
%D%/packages/patches/dstat-skip-devices-without-io.patch \ %D%/packages/patches/dstat-skip-devices-without-io.patch \
@ -1031,7 +1033,6 @@ dist_patch_DATA = \
%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-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-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-lispy-fix-thread-last-test.patch \
%D%/packages/patches/emacs-source-date-epoch.patch \ %D%/packages/patches/emacs-source-date-epoch.patch \
@ -1451,6 +1452,8 @@ dist_patch_DATA = \
%D%/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch \ %D%/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch \
%D%/packages/patches/llvm-3.5-fix-clang-build-with-gcc5.patch \ %D%/packages/patches/llvm-3.5-fix-clang-build-with-gcc5.patch \
%D%/packages/patches/llvm-3.6-fix-build-with-gcc-10.patch \ %D%/packages/patches/llvm-3.6-fix-build-with-gcc-10.patch \
%D%/packages/patches/llvm-3.x.1-fix-build-with-gcc.patch \
%D%/packages/patches/llvm-8-fix-build-with-gcc-10.patch \
%D%/packages/patches/llvm-9-fix-bitcast-miscompilation.patch \ %D%/packages/patches/llvm-9-fix-bitcast-miscompilation.patch \
%D%/packages/patches/llvm-9-fix-lpad-miscompilation.patch \ %D%/packages/patches/llvm-9-fix-lpad-miscompilation.patch \
%D%/packages/patches/llvm-9-fix-scev-miscompilation.patch \ %D%/packages/patches/llvm-9-fix-scev-miscompilation.patch \
@ -1481,6 +1484,8 @@ dist_patch_DATA = \
%D%/packages/patches/maxima-defsystem-mkdir.patch \ %D%/packages/patches/maxima-defsystem-mkdir.patch \
%D%/packages/patches/maven-generate-component-xml.patch \ %D%/packages/patches/maven-generate-component-xml.patch \
%D%/packages/patches/maven-generate-javax-inject-named.patch \ %D%/packages/patches/maven-generate-javax-inject-named.patch \
%D%/packages/patches/mcrl2-fix-1687.patch \
%D%/packages/patches/mcrl2-fix-counterexample.patch \
%D%/packages/patches/mcrypt-CVE-2012-4409.patch \ %D%/packages/patches/mcrypt-CVE-2012-4409.patch \
%D%/packages/patches/mcrypt-CVE-2012-4426.patch \ %D%/packages/patches/mcrypt-CVE-2012-4426.patch \
%D%/packages/patches/mcrypt-CVE-2012-4527.patch \ %D%/packages/patches/mcrypt-CVE-2012-4527.patch \
@ -1493,6 +1498,7 @@ dist_patch_DATA = \
%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/mia-fix-boost-headers.patch \ %D%/packages/patches/mia-fix-boost-headers.patch \
%D%/packages/patches/mia-vtk9.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 \
@ -1589,9 +1595,9 @@ dist_patch_DATA = \
%D%/packages/patches/password-store-tree-compat.patch \ %D%/packages/patches/password-store-tree-compat.patch \
%D%/packages/patches/pciutils-hurd-configure.patch \ %D%/packages/patches/pciutils-hurd-configure.patch \
%D%/packages/patches/pciutils-hurd-fix.patch \ %D%/packages/patches/pciutils-hurd-fix.patch \
%D%/packages/patches/pitivi-fix-build-with-meson-0.60.patch \
%D%/packages/patches/pjproject-install-libpjsua2.patch \ %D%/packages/patches/pjproject-install-libpjsua2.patch \
%D%/packages/patches/plasma-framework-fix-KF5PlasmaMacros.cmake.patch \ %D%/packages/patches/plasma-framework-fix-KF5PlasmaMacros.cmake.patch \
%D%/packages/patches/pokerth-boost.patch \
%D%/packages/patches/ppsspp-disable-upgrade-and-gold.patch \ %D%/packages/patches/ppsspp-disable-upgrade-and-gold.patch \
%D%/packages/patches/pthreadpool-system-libraries.patch \ %D%/packages/patches/pthreadpool-system-libraries.patch \
%D%/packages/patches/python-chai-drop-python2.patch \ %D%/packages/patches/python-chai-drop-python2.patch \
@ -1837,6 +1843,7 @@ dist_patch_DATA = \
%D%/packages/patches/tar-remove-wholesparse-check.patch \ %D%/packages/patches/tar-remove-wholesparse-check.patch \
%D%/packages/patches/tar-skip-unreliable-tests.patch \ %D%/packages/patches/tar-skip-unreliable-tests.patch \
%D%/packages/patches/tbb-fix-test-on-aarch64.patch \ %D%/packages/patches/tbb-fix-test-on-aarch64.patch \
%D%/packages/patches/tbb-other-arches.patch \
%D%/packages/patches/tclxml-3.2-install.patch \ %D%/packages/patches/tclxml-3.2-install.patch \
%D%/packages/patches/tcsh-fix-autotest.patch \ %D%/packages/patches/tcsh-fix-autotest.patch \
%D%/packages/patches/teensy-loader-cli-help.patch \ %D%/packages/patches/teensy-loader-cli-help.patch \
@ -1948,8 +1955,6 @@ dist_patch_DATA = \
%D%/packages/patches/x265-arm-flags.patch \ %D%/packages/patches/x265-arm-flags.patch \
%D%/packages/patches/xdg-desktop-portal-wlr-harcoded-length.patch\ %D%/packages/patches/xdg-desktop-portal-wlr-harcoded-length.patch\
%D%/packages/patches/xf86-video-ark-remove-mibstore.patch \ %D%/packages/patches/xf86-video-ark-remove-mibstore.patch \
%D%/packages/patches/xf86-video-mach64-bool-to-boolean.patch \
%D%/packages/patches/xf86-video-mach64-glibc-2.20.patch \
%D%/packages/patches/xf86-video-nouveau-fixup-ABI.patch \ %D%/packages/patches/xf86-video-nouveau-fixup-ABI.patch \
%D%/packages/patches/xf86-video-qxl-fix-build.patch \ %D%/packages/patches/xf86-video-qxl-fix-build.patch \
%D%/packages/patches/xf86-video-savage-xorg-compat.patch \ %D%/packages/patches/xf86-video-savage-xorg-compat.patch \

18
gnu/packages/admin.scm
View file

@ -328,7 +328,18 @@ interface and is based on GNU Guile.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0l2arn6gsyw88xk9phxnyplvv1mn8sqp3ipgyyb0nszdzvxlgd36")))) "0l2arn6gsyw88xk9phxnyplvv1mn8sqp3ipgyyb0nszdzvxlgd36"))
(modules '((guix build utils)))
(snippet
;; Avoid continuation barriers so (@ (fibers) sleep) can be
;; called from a service's 'stop' method
'(substitute* "modules/shepherd/service.scm"
(("call-with-blocked-asyncs") ;in 'stop' method
"(lambda (thunk) (thunk))")
(("\\(for-each-service\n") ;in 'shutdown-services'
"((lambda (proc)
(for-each proc
(fold-services cons '())))\n")))))
(arguments (arguments
(list #:configure-flags #~'("--localstatedir=/var") (list #:configure-flags #~'("--localstatedir=/var")
#:make-flags #~'("GUILE_AUTO_COMPILE=0") #:make-flags #~'("GUILE_AUTO_COMPILE=0")
@ -1156,8 +1167,7 @@ IPv6, proxies, and Unix sockets.")
(lambda _ (lambda _
;; These #defines aren't well-documented and, e.g., POWER was ;; These #defines aren't well-documented and, e.g., POWER was
;; not actually tested on every possible TARGET-POWERPC?. ;; not actually tested on every possible TARGET-POWERPC?.
(let* ((system #$(cond ((target-x86-32?) "X86") (let* ((system #$(cond ((target-x86?) "X86")
((target-x86-64?) "X86")
((target-arm?) "ARM") ((target-arm?) "ARM")
((target-powerpc?) "POWER") ((target-powerpc?) "POWER")
(else "CROSS_FINGERS")))) (else "CROSS_FINGERS"))))
@ -2134,7 +2144,7 @@ command.")
(native-inputs (native-inputs
;; For icons. ;; For icons.
(modify-inputs (package-native-inputs wpa-supplicant) (modify-inputs (package-native-inputs wpa-supplicant)
(prepend imagemagick inkscape))) (prepend imagemagick inkscape/stable)))
(arguments (arguments
`(#:phases (modify-phases %standard-phases `(#:phases (modify-phases %standard-phases
(add-after 'unpack 'chdir (add-after 'unpack 'chdir

149
gnu/packages/astronomy.scm
View file

@ -26,18 +26,15 @@
;;; 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 astronomy) (define-module (gnu packages astronomy)
#:use-module (guix packages)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix utils)
#:use-module (gnu packages)
#:use-module (gnu packages algebra) #:use-module (gnu packages algebra)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
#:use-module (gnu packages bison)
#:use-module (gnu packages boost) #:use-module (gnu packages boost)
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages curl) #:use-module (gnu packages curl)
#:use-module (gnu packages flex)
#:use-module (gnu packages fontutils) #:use-module (gnu packages fontutils)
#:use-module (gnu packages gcc) #:use-module (gnu packages gcc)
#:use-module (gnu packages gettext) #:use-module (gnu packages gettext)
@ -49,16 +46,20 @@
#:use-module (gnu packages libusb) #:use-module (gnu packages libusb)
#:use-module (gnu packages lua) #:use-module (gnu packages lua)
#:use-module (gnu packages maths) #:use-module (gnu packages maths)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages netpbm) #:use-module (gnu packages netpbm)
#: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 pretty-print) #:use-module (gnu packages pretty-print)
#:use-module (gnu packages python)
#:use-module (gnu packages python-build)
#:use-module (gnu packages python-check) #:use-module (gnu packages python-check)
#:use-module (gnu packages python-crypto) #:use-module (gnu packages python-crypto)
#:use-module (gnu packages python-science) #:use-module (gnu packages python-science)
#:use-module (gnu packages python-web) #:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz) #:use-module (gnu packages python-xyz)
#:use-module (gnu packages qt) #:use-module (gnu packages qt)
#:use-module (gnu packages readline)
#:use-module (gnu packages time) #:use-module (gnu packages time)
#:use-module (gnu packages version-control) #:use-module (gnu packages version-control)
#:use-module (gnu packages video) #:use-module (gnu packages video)
@ -66,9 +67,15 @@
#:use-module (gnu packages xiph) #:use-module (gnu packages xiph)
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module (gnu packages xorg) #:use-module (gnu packages xorg)
#:use-module (gnu packages)
#: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 python)
#:use-module (guix download)
#:use-module (guix gexp)
#:use-module (guix git-download)
#:use-module (guix packages)
#:use-module (guix utils)
#:use-module (ice-9 match) #:use-module (ice-9 match)
#:use-module (srfi srfi-1)) #:use-module (srfi srfi-1))
@ -107,6 +114,93 @@ moment, supported SPICE files are:
@end itemize\n") @end itemize\n")
(license license:cecill))) (license license:cecill)))
(define-public casacore
(package
(name "casacore")
(version "3.4.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/casacore/casacore")
(commit (string-append "v" version))))
(sha256
(base32
"05ar5gykgh4dm826xplj5ri5rw7znhxrvin2l67a3mjwfys7r2a0"))
(file-name (git-file-name name version))))
(build-system cmake-build-system)
(arguments
(list
;; Note: There are multiple failures in
;; tests which require additional measures data. They are
;; distributed via FTP without any license:
;; ftp://ftp.astron.nl/outgoing/Measures/
;; TODO: Check how to fix tests.
#:tests? #f
#:parallel-build? #t
#:configure-flags
#~(list "-DBUILD_PYTHON3=ON"
"-DBUILD_PYTHON=OFF"
"-DBUILD_TESTING=TRUE"
"-DUSE_HDF5=ON"
"-DUSE_OPENMP=OFF"
"-DUSE_THREADS=ON"
(string-append "-DDATA_DIR=" #$output "/data")
(string-append "-DPYTHON3_EXECUTABLE="
#$(this-package-input "python") "/bin")
(string-append "-DPYTHON3_INCLUDE_DIR="
#$(this-package-input "python") "/include")
(string-append "-DPYTHON3_LIBRARY="
#$(this-package-input "python") "/lib"))
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'set-env
(lambda _
(setenv "HOME" "/tmp")))
(add-after 'unpack 'use-absolute-rm
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "casa/OS/test/tFile.run"
(("/bin/rm")
(search-input-file inputs "/bin/rm")))))
(add-after 'unpack 'use-absolute-python3
(lambda _
(substitute* "build-tools/casacore_floatcheck"
(("#!/usr/bin/env python")
(string-append "#!" (which "python3"))))))
;; NOTE: (Sharlatan-20220611T200837+0100): Workaround for casacore
;; tests stuck with missing "qsub" issue.
;; https://github.com/casacore/casacore/issues/1122
(add-after 'unpack 'patch-pre-test-checks
(lambda _
(substitute* "build-tools/casacore_assay"
(("QSUBP=.*$") "QSUBP=\n")
(("YODP=.*$") "YODP=\n")))))))
(native-inputs
(list bison
boost
flex
readline))
(inputs
(list cfitsio
fftw
fftwf
gfortran
hdf5
lapack
ncurses
openblas
python
python-numpy
wcslib))
(home-page "http://casacore.github.io/casacore/")
(synopsis "Suite of C++ libraries for radio astronomy data processing")
(description
"The casacore package contains the core libraries of the old
AIPS++/CASA (Common Astronomy Software Application) package. This split was
made to get a better separation of core libraries and applications.
@url{https://casa.nrao.edu/, CASA} is now built on top of Casacore.")
(license license:gpl2+)))
(define-public cfitsio (define-public cfitsio
(package (package
(name "cfitsio") (name "cfitsio")
@ -824,6 +918,51 @@ astronomy and astrophysics.")
to access online Astronomical data. Each web service has its own sub-package.") to access online Astronomical data. Each web service has its own sub-package.")
(license license:bsd-3))) (license license:bsd-3)))
(define-public python-cdflib
(package
(name "python-cdflib")
(version "0.4.4")
(source
(origin
(method git-fetch) ; no tests in pypi archive
(uri (git-reference
(url "https://github.com/MAVENSDC/cdflib")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1h7750xvr6qbhnl2w3bhccs3pwp3hci3624pvvxym0yjinmskjlz"))))
(build-system python-build-system)
(arguments
(list #:phases
#~(modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(setenv "HOME" (getcwd))
(invoke "pytest" "-vv" "tests")))))))
(propagated-inputs
(list python-attrs python-numpy))
(native-inputs
(list python-astropy
python-hypothesis
python-pytest
python-pytest-cov
python-pytest-remotedata
python-xarray))
(home-page "https://github.com/MAVENSDC/cdflib")
(synopsis "Python library to deal with NASA's CDF astronmical data format")
(description "This package provides a Python CDF reader toolkit
It provides the following functionality:
@itemize
@item Ability to read variables and attributes from CDF files
@item Writes CDF version 3 files
@item Can convert between CDF time types (EPOCH/EPOCH16/TT2000) to other common
time formats
@item Can convert CDF files into XArray Dataset objects and vice versa,
attempting to maintain ISTP compliance
@end itemize\n")
(license license:expat)))
(define-public python-photutils (define-public python-photutils
(package (package
(name "python-photutils") (name "python-photutils")

180
gnu/packages/audio.scm
View file

@ -37,6 +37,7 @@
;;; Copyright © 2021 jgart <jgart@dismail.de> ;;; Copyright © 2021 jgart <jgart@dismail.de>
;;; Copyright © 2021 Aleksandr Vityazev <avityazev@posteo.org> ;;; Copyright © 2021 Aleksandr Vityazev <avityazev@posteo.org>
;;; Copyright © 2022 Arjan Adriaanse <arjan@adriaan.se> ;;; Copyright © 2022 Arjan Adriaanse <arjan@adriaan.se>
;;; Copyright © 2022 Juliana Sims <jtsims@protonmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -1158,7 +1159,7 @@ envelope follower, distortion effects, tape effects and more.")
(define-public snapcast (define-public snapcast
(package (package
(name "snapcast") (name "snapcast")
(version "0.24.0") (version "0.26.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -1167,7 +1168,7 @@ envelope follower, distortion effects, tape effects and more.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"13yz8alplnqwkcns3mcli01qbyy6l3h62xx0v71ygcrz371l4g9g")))) "091gf3k1xv3k0m0kf2apr9bwiifw2czjcksd3vzwy544sfgrya08"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:tests? #f)) ; no included tests '(#:tests? #f)) ; no included tests
@ -1914,10 +1915,44 @@ also play midifiles using a Soundfont.")
"Faust is a programming language for realtime audio signal processing.") "Faust is a programming language for realtime audio signal processing.")
(license license:gpl2+))) (license license:gpl2+)))
;; This version is needed to build older synths that require the lv2synth.cpp
;; architecture file, such as sorcer.
(define-public faust-0.9.67
(package
(inherit faust)
(name "faust")
(version "0.9.67")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/grame-cncm/faust")
(commit (string-append "v"
(string-map (lambda (c)
(if (char=? c #\.) #\- c))
version)))))
(file-name (git-file-name name version))
(sha256
(base32
"0856x666s6ymzk8v15f9gy402dbr8c9v2s40hyfadhraqljmqrm0"))
(snippet
;; Remove prebuilt library
'(delete-file "architecture/android/libs/armeabi-v7a/libfaust_dsp.so"))))
(build-system gnu-build-system)
(arguments
(list
#:make-flags
#~(list (string-append "prefix=" #$output))
#:tests? #f
#:phases
'(modify-phases %standard-phases
;; no "configure" script
(delete 'configure))))
(native-inputs (list unzip))))
(define-public faust-2 (define-public faust-2
(package (package
(inherit faust) (inherit faust)
(version "2.5.23") (version "2.41.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/grame-cncm/faust/" (uri (string-append "https://github.com/grame-cncm/faust/"
@ -1925,15 +1960,29 @@ also play midifiles using a Soundfont.")
"/faust-" version ".tar.gz")) "/faust-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1yz5jnr76hh7rmxkpdi7gyrw1wp4gyqfpq8zyl97qdi5ga5gjznq")))) "0gk8ifxrbykq7ay0nvjns8fjryhp0wfhv5npgrl8xpgw9wfmw53j"))))
(build-system gnu-build-system) (build-system cmake-build-system)
(arguments (arguments
(substitute-keyword-arguments (package-arguments faust) `(#:tests? #f ; no tests
((#:make-flags flags) #:phases
`(list (string-append "prefix=" (assoc-ref %outputs "out")) (modify-phases %standard-phases
"world")))) ;; The upstream package uses make to run cmake during the build stage.
;; Here we ignore the Makefile and call cmake directly.
(replace 'configure
(lambda _
(chdir "build")
(invoke "cmake" "-C" "backends/all.cmake"
(string-append "-DCMAKE_INSTALL_PREFIX="
(assoc-ref %outputs "out")))))
;; The sound2faust tool would be built in the Makefile's "world" target
(add-after 'install 'sound2faust
(lambda _
(chdir "../tools/sound2faust")
(setenv "PREFIX" (assoc-ref %outputs "out"))
(invoke "make")
(invoke "make" "install"))))))
(native-inputs (native-inputs
`(("llvm" ,llvm-3.8) `(("llvm" ,llvm)
("which" ,which) ("which" ,which)
("xxd" ,xxd) ("xxd" ,xxd)
("ctags" ,emacs-minimal) ; for ctags ("ctags" ,emacs-minimal) ; for ctags
@ -2748,6 +2797,38 @@ add functionality to support the needs of increasingly powerful audio
software.") software.")
(license license:isc))) (license license:isc)))
(define-public ttl2c
(package
(name "ttl2c")
(version "1.0.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/lvtk/ttl2c")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0aybx8i5i0sridi9130a3937xgmfmjkk8m48f9whvhlhbzwy3xbl"))))
(build-system waf-build-system)
(arguments
(list
#:tests? #false ;no check target
#:phases
`(modify-phases %standard-phases
(add-before 'configure 'setup-waf
(lambda* (#:key inputs #:allow-other-keys)
(let ((waf (assoc-ref inputs "python-waf")))
(copy-file (string-append waf "/bin/waf") "waf")))))))
(inputs (list boost))
(native-inputs (list python-waf))
(home-page "https://github.com/lvtk/ttl2c")
(synopsis "Turtle to C header conversion utility for LV2 plugins")
(description
"This package provides a conversion utility for LV2 Plugin developers to
generate C headers from Turtle files.")
(license license:gpl3+)))
(define-public lv2-mda-piano (define-public lv2-mda-piano
(package (package
(name "lv2-mda-piano") (name "lv2-mda-piano")
@ -2771,7 +2852,7 @@ software.")
(inputs (inputs
(list lv2 lvtk)) (list lv2 lvtk))
(native-inputs (native-inputs
(list pkg-config)) (list pkg-config ttl2c))
(native-search-paths (native-search-paths
(list (search-path-specification (list (search-path-specification
(variable "LV2_PATH") (variable "LV2_PATH")
@ -2794,14 +2875,14 @@ software.")
(synopsis "LV2 port of the mda EPiano plugin") (synopsis "LV2 port of the mda EPiano plugin")
(description "An LV2 port of the mda EPiano VSTi."))) (description "An LV2 port of the mda EPiano VSTi.")))
(define-public lvtk (define-public lvtk-2
;; Use the latest commit, as the latest release was made in 2014 and depends ;; Use the latest commit, as the latest release was made in 2014 and depends
;; on Python 2. ;; on Python 2.
(let ((commit "a73feabe772f9650aa071e6a4df660e549ab7c48") (let ((commit "a73feabe772f9650aa071e6a4df660e549ab7c48")
(revision "0")) (revision "0"))
(package (package
(name "lvtk") (name "lvtk")
(version (git-version "1.2.0" revision commit)) (version (git-version "2" revision commit))
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -2823,6 +2904,49 @@ extensions into easy to use C++ classes. It is the successor of
lv2-c++-tools.") lv2-c++-tools.")
(license license:isc)))) (license license:isc))))
(define-public lvtk-1
;; Use the latest commit, as the latest release was made in 2014 and depends
;; on Python 2.
(let ((commit "23dd99531d88d7821b69f6f0d60516ef322a6729")
(revision "0"))
(package
(name "lvtk")
(version (git-version "1.2.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/lvtk/lvtk")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0iw7skvsn3whw69dhcxbbdns7mssaf6z6iyzxjav53607ibyfr8d"))))
(build-system waf-build-system)
(arguments
(list
#:tests? #false ;no check target
#:configure-flags
#~(list (string-append "--boost-includes="
#$(this-package-input "boost")
"/include"))
#:phases
`(modify-phases %standard-phases
(add-before 'configure 'setup-waf
(lambda* (#:key inputs #:allow-other-keys)
(let ((waf (assoc-ref inputs "python-waf")))
(copy-file (string-append waf "/bin/waf") "waf")))))))
(inputs (list boost gtkmm lv2))
(native-inputs (list pkg-config python-waf))
(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
lv2-c++-tools.")
(license license:isc))))
(define-public lvtk lvtk-1)
(define-public openal (define-public openal
(package (package
(name "openal") (name "openal")
@ -5713,3 +5837,33 @@ source and extracts a 24-bit high resolution WAV file. It handles both DST
and DSD streams.") and DSD streams.")
(home-page "https://tari.in/www/software/odio-sacd/") (home-page "https://tari.in/www/software/odio-sacd/")
(license license:gpl3+))) (license license:gpl3+)))
(define-public qpwgraph
(package
(name "qpwgraph")
(version "0.3.2")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.freedesktop.org/rncbc/qpwgraph")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1zja4klvzbfwi14ihiahl8zm869h0c1yrpfkzvixxjcps372hh07"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f)) ;; no tests
(inputs (list alsa-lib
pipewire-0.3
;; qtsvg is still on version 5; use qtbase-5 to match
qtbase-5
qtsvg))
(native-inputs (list pkg-config))
(synopsis "PipeWire graph manager")
(description
"qpwgraph is a graph manager dedicated to PipeWire, using the Qt C++
framework. It provides a visual interface to audio and video connections
managed by PipeWire.")
(home-page "https://gitlab.freedesktop.org/rncbc/qpwgraph")
(license license:gpl2)))

12
gnu/packages/autotools.scm
View file

@ -519,18 +519,6 @@ 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"))

2
gnu/packages/aux-files/linux-libre/5.10-arm64.conf
View file

@ -5848,7 +5848,7 @@ CONFIG_DRM_AMD_DC=y
CONFIG_DRM_AMD_DC_SI=y CONFIG_DRM_AMD_DC_SI=y
# end of Display Engine Configuration # end of Display Engine Configuration
# CONFIG_HSA_AMD is not set CONFIG_HSA_AMD=y
CONFIG_DRM_NOUVEAU=m CONFIG_DRM_NOUVEAU=m
# CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set # CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set
CONFIG_NOUVEAU_PLATFORM_DRIVER=y CONFIG_NOUVEAU_PLATFORM_DRIVER=y

2
gnu/packages/aux-files/linux-libre/5.10-x86_64.conf
View file

@ -6304,7 +6304,7 @@ CONFIG_DRM_AMD_DC_SI=y
# CONFIG_DEBUG_KERNEL_DC is not set # CONFIG_DEBUG_KERNEL_DC is not set
# end of Display Engine Configuration # end of Display Engine Configuration
# CONFIG_HSA_AMD is not set CONFIG_HSA_AMD=y
CONFIG_DRM_NOUVEAU=m CONFIG_DRM_NOUVEAU=m
# CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set # CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set
CONFIG_NOUVEAU_DEBUG=5 CONFIG_NOUVEAU_DEBUG=5

2
gnu/packages/aux-files/linux-libre/5.15-arm64.conf
View file

@ -6100,7 +6100,7 @@ CONFIG_DRM_AMD_DC=y
CONFIG_DRM_AMD_DC_SI=y CONFIG_DRM_AMD_DC_SI=y
# end of Display Engine Configuration # end of Display Engine Configuration
# CONFIG_HSA_AMD is not set CONFIG_HSA_AMD=y
CONFIG_DRM_NOUVEAU=m CONFIG_DRM_NOUVEAU=m
# CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set # CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set
CONFIG_NOUVEAU_PLATFORM_DRIVER=y CONFIG_NOUVEAU_PLATFORM_DRIVER=y

2
gnu/packages/aux-files/linux-libre/5.15-x86_64.conf
View file

@ -6482,7 +6482,7 @@ CONFIG_DRM_AMD_DC_DCN=y
CONFIG_DRM_AMD_SECURE_DISPLAY=y CONFIG_DRM_AMD_SECURE_DISPLAY=y
# end of Display Engine Configuration # end of Display Engine Configuration
# CONFIG_HSA_AMD is not set CONFIG_HSA_AMD=y
CONFIG_DRM_NOUVEAU=m CONFIG_DRM_NOUVEAU=m
# CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set # CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set
CONFIG_NOUVEAU_DEBUG=5 CONFIG_NOUVEAU_DEBUG=5

941
gnu/packages/aux-files/linux-libre/5.17-arm.conf → gnu/packages/aux-files/linux-libre/5.18-arm.conf
View file

File diff suppressed because it is too large Load diff

1029
gnu/packages/aux-files/linux-libre/5.17-arm64.conf → gnu/packages/aux-files/linux-libre/5.18-arm64.conf
View file

File diff suppressed because it is too large Load diff

961
gnu/packages/aux-files/linux-libre/5.17-i686.conf → gnu/packages/aux-files/linux-libre/5.18-i686.conf
View file

File diff suppressed because it is too large Load diff

985
gnu/packages/aux-files/linux-libre/5.17-x86_64.conf → gnu/packages/aux-files/linux-libre/5.18-x86_64.conf
View file

File diff suppressed because it is too large Load diff

2
gnu/packages/aux-files/linux-libre/5.4-arm64.conf
View file

@ -5523,7 +5523,7 @@ CONFIG_DRM_AMD_DC=y
# CONFIG_DEBUG_KERNEL_DC is not set # CONFIG_DEBUG_KERNEL_DC is not set
# end of Display Engine Configuration # end of Display Engine Configuration
# CONFIG_HSA_AMD is not set CONFIG_HSA_AMD=y
CONFIG_DRM_NOUVEAU=m CONFIG_DRM_NOUVEAU=m
# CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set # CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set
CONFIG_NOUVEAU_PLATFORM_DRIVER=y CONFIG_NOUVEAU_PLATFORM_DRIVER=y

2
gnu/packages/aux-files/linux-libre/5.4-x86_64.conf
View file

@ -6108,7 +6108,7 @@ CONFIG_DRM_AMD_DC_DSC_SUPPORT=y
# CONFIG_DEBUG_KERNEL_DC is not set # CONFIG_DEBUG_KERNEL_DC is not set
# end of Display Engine Configuration # end of Display Engine Configuration
# CONFIG_HSA_AMD is not set CONFIG_HSA_AMD=y
CONFIG_DRM_NOUVEAU=m CONFIG_DRM_NOUVEAU=m
# CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set # CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set
CONFIG_NOUVEAU_DEBUG=5 CONFIG_NOUVEAU_DEBUG=5

3
gnu/packages/backup.scm
View file

@ -86,6 +86,7 @@
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages protobuf) #:use-module (gnu packages protobuf)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages python-build)
#:use-module (gnu packages python-check) #:use-module (gnu packages python-check)
#:use-module (gnu packages python-crypto) #:use-module (gnu packages python-crypto)
#:use-module (gnu packages python-web) #:use-module (gnu packages python-web)
@ -1198,7 +1199,7 @@ additional snapshots).")
uthash uthash
zlib)) zlib))
(native-inputs (native-inputs
(list autoconf automake check-0.14 pkg-config)) (list autoconf automake check pkg-config))
(home-page "https://burp.grke.org") (home-page "https://burp.grke.org")
(synopsis "Differential backup and restore") (synopsis "Differential backup and restore")
(description "Burp is a network backup and restore program. It attempts (description "Burp is a network backup and restore program. It attempts

6
gnu/packages/benchmark.scm
View file

@ -55,6 +55,7 @@
#:use-module (gnu packages php) #:use-module (gnu packages php)
#: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-build)
#:use-module (gnu packages python-science) #:use-module (gnu packages python-science)
#:use-module (gnu packages python-web) #:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz) #:use-module (gnu packages python-xyz)
@ -62,10 +63,11 @@
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module (ice-9 match)) #:use-module (ice-9 match))
;; Lazily resolve the gcc-toolchain to avoid a circular dependency. ;; Lazily resolve the gcc-toolchain to avoid a circular dependency. Always
;; use the latest available toolchain to avoid conflicts in user profiles.
(define gcc-toolchain* (define gcc-toolchain*
(delay (module-ref (resolve-interface '(gnu packages commencement)) (delay (module-ref (resolve-interface '(gnu packages commencement))
'gcc-toolchain))) 'gcc-toolchain-12)))
(define-public fio (define-public fio
(package (package

335
gnu/packages/bioconductor.scm
View file

@ -1987,6 +1987,112 @@ using the linear model features implemented in limma. Standard Bioconductor
objects are used so that other packages could be used as well.") objects are used so that other packages could be used as well.")
(license license:gpl3))) (license license:gpl3)))
(define-public r-amountain
(package
(name "r-amountain")
(version "1.22.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "AMOUNTAIN" version))
(sha256
(base32
"0vdfabsrisdd7qq28f5ivd0v8zz49szqn677i5lhwnlaix220c54"))))
(properties `((upstream-name . "AMOUNTAIN")))
(build-system r-build-system)
(inputs (list gsl))
(native-inputs (list r-knitr))
(home-page "https://bioconductor.org/packages/AMOUNTAIN")
(synopsis "Modules for multilayer weighted gene co-expression networks")
(description
"This package provides a pure data-driven gene network, @dfn{WGCN}(weighted
gene co-expression network) could be constructed only from expression profile.
Different layers in such networks may represent different time points, multiple
conditions or various species. @code{AMOUNTAIN} aims to search active modules
in multi-layer WGCN using a continuous optimization approach.")
(license license:gpl2+)))
(define-public r-amaretto
(package
(name "r-amaretto")
(version "1.12.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "AMARETTO" version))
(sha256
(base32
"111dk19b9910icksyr592cvhc5gwvgknr5q4887j9yxbajd7hcmx"))))
(properties `((upstream-name . "AMARETTO")))
(build-system r-build-system)
(propagated-inputs
(list r-biocfilecache
r-callr
r-circlize
r-complexheatmap
r-curatedtcgadata
r-doparallel
r-dplyr
r-dt
r-foreach
r-ggplot2
r-glmnet
r-gridextra
r-httr
r-impute
r-knitr
r-limma
r-matrix
r-matrixstats
r-multiassayexperiment
r-rcpp
r-readr
r-reshape2
r-rmarkdown
r-tibble))
(native-inputs (list r-knitr))
(home-page "https://bioconductor.org/packages/AMARETTO")
(synopsis "Regulatory network inference and driver gene evaluation")
(description
"This package @code{AMARETTO} represents an algorithm that integrates copy
number, DNA methylation and gene expression data to identify a set of driver
genes by analyzing cancer samples and connects them to clusters of co-expressed
genes, which we define as modules. @code{AMARETTO} can be applied in a pancancer
setting to identify cancer driver genes and their modules on multiple cancer
sites. @code{AMARETTO} captures modules enriched in angiogenesis, cell cycle
and EMT, and modules that accurately predict survival and molecular subtypes.
This allows @code{AMARETTO} to identify novel cancer driver genes directing
canonical cancer pathways.")
(license license:asl2.0)))
(define-public r-anaquin
(package
(name "r-anaquin")
(version "2.20.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "Anaquin" version))
(sha256
(base32
"1jgpnls2djl1yzvnk64qc83mljmlci7wflwkza3wr0sv6r47b0dd"))))
(properties `((upstream-name . "Anaquin")))
(build-system r-build-system)
(propagated-inputs
(list r-deseq2
r-ggplot2
r-knitr
r-locfit
r-plyr
r-qvalue
r-rocr))
(native-inputs (list r-knitr))
(home-page "https://www.sequinstandards.com/")
(synopsis "Statistical analysis of sequins")
(description
"The project is intended to support the use of @dfn{sequins}(synthetic
sequencing spike-in controls) owned and made available by the Garvan Institute
of Medical Research. The goal is to provide a standard open source library for
quantitative analysis, modelling and visualization of spike-in controls.")
(license license:bsd-3)))
(define-public r-aneufinder (define-public r-aneufinder
(package (package
(name "r-aneufinder") (name "r-aneufinder")
@ -2029,6 +2135,94 @@ calling, plotting, export and analysis from whole-genome single cell
sequencing data.") sequencing data.")
(license license:artistic2.0))) (license license:artistic2.0)))
(define-public r-anf
(package
(name "r-anf")
(version "1.18.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "ANF" version))
(sha256
(base32
"1fa2pbdapymrpz01ws0m2fbzf11d723x6rbsys29v06is57f5lpj"))))
(properties `((upstream-name . "ANF")))
(build-system r-build-system)
(propagated-inputs
(list r-biobase
r-igraph
r-mass
r-rcolorbrewer
r-survival))
(native-inputs (list r-knitr))
(home-page "https://bioconductor.org/packages/ANF")
(synopsis "Affinity network fusion for complex patient clustering")
(description
"The package @dfn{ANF}(Affinity Network Fusion) provides methods for affinity
matrix construction and fusion as well as spectral clustering. This package is
used for complex patient clustering by integrating multi-omic data through affinity
network fusion.")
(license license:gpl3)))
(define-public r-annmap
(package
(name "r-annmap")
(version "1.38.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "annmap" version))
(sha256
(base32
"0ywqbb8jia7rrkzcsf6a11kqf8dnx96z8n8xw7067mahycykbixv"))))
(properties `((upstream-name . "annmap")))
(build-system r-build-system)
(propagated-inputs
(list r-biobase
r-biocgenerics
r-dbi
r-digest
r-genefilter
r-genomicranges
r-iranges
r-lattice
r-rmysql
r-rsamtools))
(home-page "https://github.com/cruk-mi/annmap")
(synopsis
"Genome annotation and visualisation for Affymetrix arrays and NGS analysis")
(description
"This package @code{annmap} provides annotation mappings for Affymetrix exon
arrays and coordinate based queries to support deep sequencing data analysis.
Database access is hidden behind the API which provides a set of functions such
as @code{genesInRange()}, @code{geneToExon()}, @code{exonDetails()}, etc.
Functions to plot gene architecture and BAM file data are also provided.")
(license license:gpl2)))
(define-public r-antiprofiles
(package
(name "r-antiprofiles")
(version "1.36.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "antiProfiles" version))
(sha256
(base32
"1277kg5xpyb2yriyjy18p437q5lj22h4al7z7pygkzxzywxv9g40"))))
(properties `((upstream-name . "antiProfiles")))
(build-system r-build-system)
(propagated-inputs
(list r-locfit
r-matrixstats))
(home-page "https://github.com/HCBravoLab/antiProfiles")
(synopsis "Implementation of gene expression anti-profiles")
(description
"This package implements the gene expression anti-profiles method.
Anti-profiles are a new approach for developing cancer genomic signatures that
specifically take advantage of gene expression heterogeneity. They explicitly
model increased gene expression variability in cancer to define robust and
reproducible gene expression signatures capable of accurately distinguishing
tumor samples from healthy controls.")
(license license:artistic2.0)))
(define-public r-biocversion (define-public r-biocversion
(package (package
(name "r-biocversion") (name "r-biocversion")
@ -3660,6 +3854,50 @@ originally made available by Holmes, Harris, and Quince, 2012, PLoS ONE 7(2):
1-15.") 1-15.")
(license license:lgpl3))) (license license:lgpl3)))
(define-public r-dittoseq
(package
(name "r-dittoseq")
(version "1.8.1")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "dittoSeq" version))
(sha256
(base32
"0vi0hcyffaxp6yxsrq95bdlrhr85dvbqm9c7rg6a6blkfgwhlzb4"))))
(properties `((upstream-name . "dittoSeq")))
(build-system r-build-system)
(propagated-inputs
(list r-colorspace
r-cowplot
r-ggplot2
r-ggrepel
r-ggridges
r-gridextra
r-pheatmap
r-reshape2
r-s4vectors
r-singlecellexperiment
r-summarizedexperiment))
(native-inputs (list r-knitr))
(home-page "https://bioconductor.org/packages/dittoSeq")
(synopsis "Single-cell and bulk RNA sequencing visualization")
(description
"This package provides a universal, user friendly, single-cell and bulk RNA
sequencing visualization toolkit that allows highly customizable creation of
color blindness friendly, publication-quality figures. dittoSeq accepts both
SingleCellExperiment (SCE) and Seurat objects, as well as the import and
usage, via conversion to an SCE, of SummarizedExperiment or DGEList bulk data.
Visualizations include dimensionality reduction plots, heatmaps, scatterplots,
percent composition or expression across groups, and more. Customizations
range from size and title adjustments to automatic generation of annotations
for heatmaps, overlay of trajectory analysis onto any dimensionality reduciton
plot, hidden data overlay upon cursor hovering via ggplotly conversion, and
many more. All with simple, discrete inputs. Color blindness friendliness is
powered by legend adjustments (enlarged keys), and by allowing the use of
shapes or letter-overlay in addition to the carefully selected
code{dittoColors()}.")
(license license:expat)))
(define-public r-edaseq (define-public r-edaseq
(package (package
(name "r-edaseq") (name "r-edaseq")
@ -3728,14 +3966,14 @@ CAGE.")
(define-public r-ensembldb (define-public r-ensembldb
(package (package
(name "r-ensembldb") (name "r-ensembldb")
(version "2.20.1") (version "2.20.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "ensembldb" version)) (uri (bioconductor-uri "ensembldb" version))
(sha256 (sha256
(base32 (base32
"183rs74ngfvn9xz36csch495pqaash90yhhikm73m7b2bc37ziwz")))) "12n21dcimdhgyjzk33m6xbv0m9ihgyzcf66vr1jr5ycv3rq2s7xc"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
(list r-annotationdbi (list r-annotationdbi
@ -4282,13 +4520,13 @@ Binomial data via estimation of latent structure in the natural parameter.")
(define-public r-limma (define-public r-limma
(package (package
(name "r-limma") (name "r-limma")
(version "3.52.1") (version "3.52.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "limma" version)) (uri (bioconductor-uri "limma" version))
(sha256 (sha256
(base32 (base32
"193l3z2jv0kr91nl4r64p3jzb2rai9k8akx1zw7303nsnwpiiaay")))) "0m8p8pqmf48f2zdf3qs66hmychbc58g2hfg1wyxzsv180m6xkk65"))))
(build-system r-build-system) (build-system r-build-system)
(home-page "http://bioinf.wehi.edu.au/limma") (home-page "http://bioinf.wehi.edu.au/limma")
(synopsis "Package for linear models for microarray and RNA-seq data") (synopsis "Package for linear models for microarray and RNA-seq data")
@ -4605,14 +4843,14 @@ previously been used in XCMS.")
(define-public r-organismdbi (define-public r-organismdbi
(package (package
(name "r-organismdbi") (name "r-organismdbi")
(version "1.38.0") (version "1.38.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "OrganismDbi" version)) (uri (bioconductor-uri "OrganismDbi" version))
(sha256 (sha256
(base32 (base32
"1xklaiyd4mv9sf9211flq1s68fhdn53y2i4l1k2ib39a4l6y9cyr")))) "0mxnxj8x4hc21psz39mf7qwvh1fsn6qyjgl5qffk1xxmasf69619"))))
(properties `((upstream-name . "OrganismDbi"))) (properties `((upstream-name . "OrganismDbi")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -4976,14 +5214,14 @@ tab-delimited (tabix) files.")
(define-public r-restfulr (define-public r-restfulr
(package (package
(name "r-restfulr") (name "r-restfulr")
(version "0.0.14") (version "0.0.15")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "restfulr" version)) (uri (cran-uri "restfulr" version))
(sha256 (sha256
(base32 (base32
"1sdlz8zl4xvd7cpn1gm86q7jv9v7561gg4wk6y7zybiw37pxghq6")))) "14p6h0gjknqy5z2fprxw7waf4p0cd2qmp18s7qig4ylqn8gqzzs0"))))
(properties `((upstream-name . "restfulr"))) (properties `((upstream-name . "restfulr")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -4997,13 +5235,13 @@ tab-delimited (tabix) files.")
(define-public r-rtracklayer (define-public r-rtracklayer
(package (package
(name "r-rtracklayer") (name "r-rtracklayer")
(version "1.56.0") (version "1.56.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "rtracklayer" version)) (uri (bioconductor-uri "rtracklayer" version))
(sha256 (sha256
(base32 (base32
"1d9sak1xrrkcvj0q3vnp6w2k0nx2k2ajhsbq0dyb4nhcghp5w8fd")))) "10qy9s6253mgj871qfqn03i8yw10mz7id4cxfyf67qxczz2xmjls"))))
(build-system r-build-system) (build-system r-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -5289,14 +5527,14 @@ ungapped alignment formats.")
(define-public r-simplifyenrichment (define-public r-simplifyenrichment
(package (package
(name "r-simplifyenrichment") (name "r-simplifyenrichment")
(version "1.6.0") (version "1.6.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "simplifyEnrichment" version)) (uri (bioconductor-uri "simplifyEnrichment" version))
(sha256 (sha256
(base32 (base32
"1g3kfa17p60jkk4l34vc5hdq83w082qsxbjvpqw7r9rdd8d79z2q")))) "0qblgdxmr7zc981529cca3ykakql618q1im6gaxw8pwws5jgpyk6"))))
(properties (properties
`((upstream-name . "simplifyEnrichment"))) `((upstream-name . "simplifyEnrichment")))
(build-system r-build-system) (build-system r-build-system)
@ -5953,13 +6191,13 @@ libraries for systems that do not have these available via other means.")
(define-public r-zellkonverter (define-public r-zellkonverter
(package (package
(name "r-zellkonverter") (name "r-zellkonverter")
(version "1.6.2") (version "1.6.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "zellkonverter" version)) (uri (bioconductor-uri "zellkonverter" version))
(sha256 (sha256
(base32 "0s1n3impm4k55pac8mr18czylsc30yqcvdfdki4sawk74b2rkx8c")))) (base32 "0l6v7a2zyxpq2w3vm85z439ldi3ld3pkc3wx95a1vxzbr31cpdzz"))))
(properties `((upstream-name . "zellkonverter"))) (properties `((upstream-name . "zellkonverter")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -6481,13 +6719,13 @@ enrichedGO (addGeneIDs).")
(define-public r-matrixgenerics (define-public r-matrixgenerics
(package (package
(name "r-matrixgenerics") (name "r-matrixgenerics")
(version "1.8.0") (version "1.8.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "MatrixGenerics" version)) (uri (bioconductor-uri "MatrixGenerics" version))
(sha256 (sha256
(base32 (base32
"0s7s39v9lqniirjgp8lbmffw0c8rsp6bndgzy1zlyh5vivfih0f5")))) "1liblnpziyyjxzrhdd5d89ilvfqqhbl87h3hsmdm0kwnmc73r37f"))))
(properties (properties
`((upstream-name . "MatrixGenerics"))) `((upstream-name . "MatrixGenerics")))
(build-system r-build-system) (build-system r-build-system)
@ -7618,14 +7856,14 @@ multiplication and calculation of row/column sums or means.")
(define-public r-batchelor (define-public r-batchelor
(package (package
(name "r-batchelor") (name "r-batchelor")
(version "1.12.1") (version "1.12.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "batchelor" version)) (uri (bioconductor-uri "batchelor" version))
(sha256 (sha256
(base32 (base32
"1zyvjr9nwfh0cdqk4kwmr30yhh05picyab1hpnpn737xvn525jfi")))) "00ix3hvhgalxg63qnynv2waa273jk336lg47k72qwxfzimsxfjxc"))))
(properties `((upstream-name . "batchelor"))) (properties `((upstream-name . "batchelor")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -8368,17 +8606,22 @@ are standardized and usable by the accompanying mutossGUI package.")
(define-public r-metap (define-public r-metap
(package (package
(name "r-metap") (name "r-metap")
(version "1.3") (version "1.8")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "metap" version)) (uri (cran-uri "metap" version))
(sha256 (sha256
(base32 (base32
"1jmmmmjiklaxfl604hwqil193ydaghvd5jv8xsr4bx3pzn5i9kvz")))) "0asmypxfxly4xmcjf3yzid5zqlzg88z0brij2splfk4avsl035gf"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
(list r-lattice r-mutoss r-rdpack r-tfisher)) (list r-lattice
r-mathjaxr
r-mutoss
r-qqconf
r-rdpack
r-tfisher))
(home-page "http://www.dewey.myzen.co.uk/meta/meta.html") (home-page "http://www.dewey.myzen.co.uk/meta/meta.html")
(synopsis "Meta-analysis of significance values") (synopsis "Meta-analysis of significance values")
(description (description
@ -8743,14 +8986,14 @@ All the visualization methods are developed based on ggplot2 graphics.")
(define-public r-clusterprofiler (define-public r-clusterprofiler
(package (package
(name "r-clusterprofiler") (name "r-clusterprofiler")
(version "4.4.2") (version "4.4.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "clusterProfiler" version)) (uri (bioconductor-uri "clusterProfiler" version))
(sha256 (sha256
(base32 (base32
"07fbc3d06990qy1qcaqqgm5ma2l0h08bwfkqrnlfd9f2xcppdywd")))) "0k5jhry0j6wa7779n3hrw4ld4bvyahpgpbwi2a0g704m3dd3mqp5"))))
(properties (properties
`((upstream-name . "clusterProfiler"))) `((upstream-name . "clusterProfiler")))
(build-system r-build-system) (build-system r-build-system)
@ -9290,14 +9533,14 @@ type and symbol colors.")
(define-public r-genomicscores (define-public r-genomicscores
(package (package
(name "r-genomicscores") (name "r-genomicscores")
(version "2.8.0") (version "2.8.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "GenomicScores" version)) (uri (bioconductor-uri "GenomicScores" version))
(sha256 (sha256
(base32 (base32
"0zq9k4189dlc14f9rknsc1ffhpjzb2f4fzdaszfdbnd4rr43b79i")))) "12rcxw69an1d5q7ar58xy8s871l47imw2nm08j054ivxslx8597j"))))
(properties `((upstream-name . "GenomicScores"))) (properties `((upstream-name . "GenomicScores")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -9311,6 +9554,7 @@ type and symbol colors.")
r-genomeinfodb r-genomeinfodb
r-genomicranges r-genomicranges
r-hdf5array r-hdf5array
r-httr
r-iranges r-iranges
r-rhdf5 r-rhdf5
r-s4vectors r-s4vectors
@ -10705,17 +10949,20 @@ packages.")
(define-public r-ropls (define-public r-ropls
(package (package
(name "r-ropls") (name "r-ropls")
(version "1.28.0") (version "1.28.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "ropls" version)) (uri (bioconductor-uri "ropls" version))
(sha256 (sha256
(base32 (base32
"1i9g32mjknrd2lbz2nisc7nr0gk9byx9aik1i7xdwmq4ndxf8rf7")))) "07gpx15r8c3wljiwxnff2zp7wxbhzz9r7njk8zg8hpy2q5qm3i6c"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
(list r-biobase r-multidataset)) (list r-biobase
r-multiassayexperiment
r-multidataset
r-summarizedexperiment))
(native-inputs (native-inputs
(list r-knitr)) ; for vignettes (list r-knitr)) ; for vignettes
(home-page "https://dx.doi.org/10.1021/acs.jproteome.5b00354") (home-page "https://dx.doi.org/10.1021/acs.jproteome.5b00354")
@ -10742,17 +10989,23 @@ coefficients).")
(define-public r-biosigner (define-public r-biosigner
(package (package
(name "r-biosigner") (name "r-biosigner")
(version "1.24.0") (version "1.24.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "biosigner" version)) (uri (bioconductor-uri "biosigner" version))
(sha256 (sha256
(base32 (base32
"11w28nlz0f06idbna5k9xs891w516401l1zab5gg7s0z3xxaki4f")))) "0vdv2by3qv7y8vzr8qgg7apwwgsa0fhlfrhzns7g3nas7883c89m"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
(list r-biobase r-e1071 r-multidataset r-randomforest r-ropls)) (list r-biobase
r-e1071
r-multiassayexperiment
r-multidataset
r-randomforest
r-ropls
r-summarizedexperiment))
(native-inputs (native-inputs
(list r-knitr)) (list r-knitr))
(home-page "https://bioconductor.org/packages/biosigner/") (home-page "https://bioconductor.org/packages/biosigner/")
@ -10812,14 +11065,14 @@ annotations.")
(define-public r-rsubread (define-public r-rsubread
(package (package
(name "r-rsubread") (name "r-rsubread")
(version "2.10.2") (version "2.10.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "Rsubread" version)) (uri (bioconductor-uri "Rsubread" version))
(sha256 (sha256
(base32 (base32
"1pvyx8nxv10s816hgxrnw60hp9rlqjdgjq3ajpzqxgxmmlhnk0v0")))) "155h25gbagqns7wpriil17li0jkdd1z1pcz0dlnikdqj4saf97rl"))))
(properties `((upstream-name . "Rsubread"))) (properties `((upstream-name . "Rsubread")))
(build-system r-build-system) (build-system r-build-system)
(inputs (list zlib)) (inputs (list zlib))
@ -14679,14 +14932,14 @@ by Ernst and Kellis.")
(define-public r-ggbio (define-public r-ggbio
(package (package
(name "r-ggbio") (name "r-ggbio")
(version "1.44.0") (version "1.44.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "ggbio" version)) (uri (bioconductor-uri "ggbio" version))
(sha256 (sha256
(base32 (base32
"1lvms07ba99nzf10gpn50wjca84nj5jrb6902z069p2bfi4xyd27")))) "0iyhjalwq1jmldpn20iv8l2kmz6sm20ddry2yz2zn7yq0wszp3vg"))))
(build-system r-build-system) (build-system r-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -15363,14 +15616,14 @@ all RNA-Seq libraries of each species integrated in Bgee.")
(define-public r-bgeedb (define-public r-bgeedb
(package (package
(name "r-bgeedb") (name "r-bgeedb")
(version "2.22.0") (version "2.22.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "BgeeDB" version)) (uri (bioconductor-uri "BgeeDB" version))
(sha256 (sha256
(base32 (base32
"093zk43x8i9ajaqsdhndkyal3dizllr3g85ziavb3k73dzvarzsc")))) "1f6lrazaibbz21sqvj59rq6ps9m1riw2y0kyidbn29mxf4ibwh3k"))))
(properties `((upstream-name . "BgeeDB"))) (properties `((upstream-name . "BgeeDB")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -15832,14 +16085,14 @@ scoring subnetwork.")
(define-public r-bionetstat (define-public r-bionetstat
(package (package
(name "r-bionetstat") (name "r-bionetstat")
(version "1.16.0") (version "1.16.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "BioNetStat" version)) (uri (bioconductor-uri "BioNetStat" version))
(sha256 (sha256
(base32 (base32
"0f387j35lj32ryiw48jz8gc08al2lmmv9zvbbgyjq9wmqlca3dfb")))) "0zs6pymvxb95sji0rnnzaz3whj7hsvj2kl4n4gzj7w1q0prbfpb2"))))
(properties `((upstream-name . "BioNetStat"))) (properties `((upstream-name . "BioNetStat")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -16169,13 +16422,13 @@ estimates, etc.")
(define-public r-tcgabiolinks (define-public r-tcgabiolinks
(package (package
(name "r-tcgabiolinks") (name "r-tcgabiolinks")
(version "2.24.1") (version "2.24.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "TCGAbiolinks" version)) (uri (bioconductor-uri "TCGAbiolinks" version))
(sha256 (sha256
(base32 "0kw4lrg8xm0ipj7f7h1rwfj7a8mknkril1pn05x08mx13f7p5p14")))) (base32 "0visvfhzaf0p1rb5vjkmw1c91zfxpks8nl9nbl9xlnpm8lkmmkms"))))
(properties `((upstream-name . "TCGAbiolinks"))) (properties `((upstream-name . "TCGAbiolinks")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs

174
gnu/packages/bioinformatics.scm
View file

@ -806,6 +806,44 @@ input/output delimiter. When the new functionality is not used, bioawk is
intended to behave exactly the same as the original BWK awk.") intended to behave exactly the same as the original BWK awk.")
(license license:x11))) (license license:x11)))
(define-public python-cellbender
(package
(name "python-cellbender")
(version "0.2.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/broadinstitute/CellBender")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1zav2q8nnss80i25y06fccagkvrqsy7lpylsl4dxv4qkj8p4fnv3"))))
(build-system python-build-system)
(arguments
(list #:tests? #false)) ;there are none
(propagated-inputs
(list python-anndata
python-matplotlib
python-numpy
python-pandas
python-pyro-ppl
python-scikit-learn
python-scipy
python-sphinx
python-sphinx-argparse
python-sphinx-autodoc-typehints
python-sphinx-rtd-theme
python-sphinxcontrib-programoutput
python-tables))
(home-page "https://cellbender.rtfd.io/")
(synopsis "Eliminate technical artifacts from single-cell RNA-seq data")
(description
"CellBender is a software package for eliminating technical artifacts
from high-throughput single-cell RNA sequencing (scRNA-seq) data.")
(license license:bsd-3)))
(define-public python-htsget (define-public python-htsget
(package (package
(name "python-htsget") (name "python-htsget")
@ -7167,6 +7205,64 @@ sequence.")
auROC analysis.") auROC analysis.")
(license license:gpl3)))) (license license:gpl3))))
(define-public r-sccustomize
(let ((commit "8414d1f5fb32277855b0619191a568932b7baeb0")
(revision "1"))
(package
(name "r-sccustomize")
(version (git-version "0.7.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/samuel-marsh/scCustomize")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1wcgfq7lx83a2kf8pjbw524gdvxf351n08cwd5wzmmy57kf4knbj"))))
(properties `((upstream-name . "scCustomize")))
(build-system r-build-system)
(propagated-inputs
(list r-circlize
r-colorway
r-cowplot
r-data-table
r-dittoseq
r-dplyr
r-forcats
r-ggbeeswarm
r-ggplot2
r-ggprism
r-ggpubr
r-ggrastr
r-ggrepel
r-glue
r-janitor
r-magrittr
r-matrix
r-paletteer
r-patchwork
r-pbapply
r-purrr
r-remotes
r-scales
r-scattermore
r-seurat
r-seuratobject
r-stringi
r-stringr
r-tibble
r-tidyr
r-tidyselect
r-viridis))
(native-inputs (list r-knitr))
(home-page "https://github.com/samuel-marsh/scCustomize")
(synopsis "Custom visualization and analyses of single-cell sequencing")
(description
"This is a collection of functions created and/or curated to aid in the
visualization and analysis of single-cell data using R.")
(license license:gpl3+))))
(define-public r-snapatac (define-public r-snapatac
(package (package
(name "r-snapatac") (name "r-snapatac")
@ -13520,6 +13616,53 @@ transcription factors, gene regulatory networks and cell types from
single-cell RNA-seq data.") single-cell RNA-seq data.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public python-ikarus
(package
(name "python-ikarus")
(version "0.0.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "ikarus" version))
(sha256
(base32
"086czpvj4yafz4vrq5rx2gy0bj2l8nzwnkk0gw8qvy4w133xjysy"))))
(build-system python-build-system)
(arguments
`(#:tests? #false
#:phases
(modify-phases %standard-phases
;; See https://github.com/BIMSBbioinfo/ikarus/issues/12
(add-after 'unpack 'fix-issue-12
(lambda _
(substitute* "ikarus/classifier.py"
(("pyscenic.genesig") "ctxcore.genesig"))))
;; Numba needs a writable dir to cache functions.
(add-before 'check 'set-numba-cache-dir
(lambda _
(setenv "NUMBA_CACHE_DIR" "/tmp"))))))
(propagated-inputs
(list python-numpy
python-pandas
python-scipy
python-scanpy
python-anndata
python-ctxcore ;because of issue 12
pyscenic))
(home-page "https://github.com/BIMSBbioinfo/ikarus")
(synopsis "Machine learning classifier of tumor cells")
(description
"ikarus is a stepwise machine learning pipeline that tries to cope with a task
of distinguishing tumor cells from normal cells. Leveraging multiple
annotated single cell datasets it can be used to define a gene set specific to
tumor cells. First, the latter gene set is used to rank cells and then to
train a logistic classifier for the robust classification of tumor and normal
cells. Finally, sensitivity is increased by propagating the cell labels based
on a custom cell-cell network. ikarus is tested on multiple single cell
datasets to ascertain that it achieves high sensitivity and specificity in
multiple experimental contexts.")
(license license:expat)))
(define-public vbz-compression (define-public vbz-compression
(package (package
(name "vbz-compression") (name "vbz-compression")
@ -14459,7 +14602,7 @@ The output is in SAM format.")
(propagated-inputs (propagated-inputs
(list libxml2)) (list libxml2))
(native-inputs (native-inputs
(list check-0.14 swig)) (list check swig))
(home-page "http://sbml.org/Software/libSBML") (home-page "http://sbml.org/Software/libSBML")
(synopsis "Process SBML files and data streams") (synopsis "Process SBML files and data streams")
(description "LibSBML is a library to help you read, write, manipulate, (description "LibSBML is a library to help you read, write, manipulate,
@ -15734,6 +15877,35 @@ workflows from concise descriptions in ccwl. It is implemented as an
language.") language.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public hh-suite
(package
(name "hh-suite")
(version "3.3.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/soedinglab/hh-suite")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1bcmzg0ii6nkda2xm5jdddbwkgsag7k38j20af0c9chr2mbxwx4d"))
(modules '((guix build utils)))
(snippet
'(delete-file-recursively "lib/simde"))))
(build-system cmake-build-system)
(arguments '(#:tests? #false)) ;no test target
(inputs
(list openmpi simde))
(native-inputs
(list perl pkg-config xxd))
(home-page "https://bmcbioinformatics.biomedcentral.com/articles/10.1186/s12859-019-3019-7")
(synopsis "Remote protein homology detection suite")
(description "The HH-suite is a software package for sensitive protein sequence searching
based on the pairwise alignment of hidden Markov models (HMMs).")
(license license:gpl3+)))
(define-public wfmash (define-public wfmash
(package (package
(name "wfmash") (name "wfmash")

13
gnu/packages/bootloaders.scm
View file

@ -15,6 +15,7 @@
;;; Copyright © 2020, 2021 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2020, 2021 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2021 Vincent Legoll <vincent.legoll@gmail.com> ;;; Copyright © 2021 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re> ;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -332,6 +333,18 @@ menu to select one of the installed operating systems.")
"/bin/mcopy\""))) "/bin/mcopy\"")))
#t)))))))))) #t))))))))))
(define-public grub-efi32
(package
(inherit grub-efi)
(name "grub-efi32")
(synopsis "GRand Unified Boot loader (UEFI 32bit version)")
(arguments
`(,@(substitute-keyword-arguments (package-arguments grub-efi)
((#:configure-flags flags
''()) `(cons* ,(cond ((target-x86?) "--target=i386")
((target-arm?) "--target=arm"))
,flags)))))))
;; Because grub searches hardcoded paths it's easiest to just build grub ;; Because grub searches hardcoded paths it's easiest to just build grub
;; again to make it find both grub-pc and grub-efi. There is a command ;; again to make it find both grub-pc and grub-efi. There is a command
;; line argument which allows you to specify ONE platform - but ;; line argument which allows you to specify ONE platform - but

159
gnu/packages/c.scm
View file

@ -14,6 +14,7 @@
;;; Copyright © 2021 David Dashyan <mail@davie.li> ;;; Copyright © 2021 David Dashyan <mail@davie.li>
;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com> ;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com>
;;; Copyright © 2022 (unmatched parenthesis <paren@disroot.org> ;;; Copyright © 2022 (unmatched parenthesis <paren@disroot.org>
;;; Copyright © 2022 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -48,6 +49,7 @@
#:use-module (gnu packages bison) #:use-module (gnu packages bison)
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages flex) #:use-module (gnu packages flex)
#:use-module (gnu packages gcc)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages texinfo) #:use-module (gnu packages texinfo)
#:use-module (gnu packages guile) #:use-module (gnu packages guile)
@ -63,6 +65,52 @@
#:use-module (gnu packages web) #:use-module (gnu packages web)
#:use-module (gnu packages xml)) #:use-module (gnu packages xml))
(define-public cproc
(let ((commit "70fe9ef1810cc6c05bde9eb0970363c35fa7e802")
(revision "1"))
(package
(name "cproc")
(version (git-version "0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://git.sr.ht/~mcf/cproc")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "1qmgzll7z7mn587azkj4cizyyd8ii6iznfxpc66ja08140sbn9yx"))))
(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
(replace 'configure
(lambda* (#:key inputs #:allow-other-keys)
(let ((gcc-lib (assoc-ref inputs "gcc:lib"))
(host-system #$(nix-system->gnu-triplet
(%current-system)))
(target-system #$(nix-system->gnu-triplet
(or (%current-target-system)
(%current-system)))))
(invoke "./configure"
(string-append "--prefix=" #$output)
(string-append "--host=" host-system)
(string-append "--target=" target-system)
(string-append "--with-ld=" #$(ld-for-target))
(string-append "--with-gcc-libdir=" gcc-lib))))))))
(inputs `(("qbe" ,qbe)
("gcc:lib" ,gcc "lib")))
(supported-systems (list "x86_64-linux" "aarch64-linux"))
(synopsis "Simple C11 compiler backed by QBE")
(description "@code{cproc} is a C compiler using QBE as a backend,
supporting most of C11 along with some GCC and C2x extensions.")
(home-page "https://sr.ht/~mcf/cproc")
(license license:expat))))
(define-public tcc (define-public tcc
(package (package
(name "tcc") ;aka. "tinycc" (name "tcc") ;aka. "tinycc"
@ -147,44 +195,38 @@ compiler while still keeping it small, simple, fast and understandable.")
(license (list license:bsd-2 license:bsd-3)))) (license (list license:bsd-2 license:bsd-3))))
(define-public qbe (define-public qbe
(let ((commit "2caa26e388b1c904d2f12fb09f84df7e761d8331") (package
(revision "1")) (name "qbe")
(package (version "1.0")
(name "qbe") (source (origin
(version (git-version "0.0" revision commit)) (method git-fetch)
(source (origin (uri (git-reference
(method git-fetch) (url "git://c9x.me/qbe")
(uri (git-reference (commit (string-append "v" version))))
(url "git://c9x.me/qbe") (file-name (git-file-name name version))
(commit commit))) (sha256
(file-name (git-file-name name version)) (base32
(sha256 "0qx4a3fjjrp2m4dsn19rpbjf89k9w7w7l09s96jx8vv15vzsdgis"))))
(base32 (build-system gnu-build-system)
"1gv03ym0gqrl4wkbhysa82025xwrkr1fg44z814b6vnggwlqgljc")))) (arguments
(build-system gnu-build-system) (list #:make-flags
(arguments #~(list (string-append "CC=" #$(cc-for-target))
(list #:make-flags (string-append "PREFIX=" #$output))
#~(list (string-append "CC=" #$(cc-for-target)) #:phases
(string-append "PREFIX=" #$output)) #~(modify-phases %standard-phases
#:phases (add-after 'unpack 'allow-cross-compilation
#~(modify-phases %standard-phases (lambda _
(add-after 'unpack 'allow-cross-compilation (substitute* "Makefile"
(lambda _ (("`uname -m`") #$(or (%current-target-system)
(substitute* "Makefile" (%current-system))))))
(("`uname -m`") #$(or (%current-target-system) (delete 'configure))))
(%current-system)))))) (supported-systems (list "x86_64-linux" "aarch64-linux" "riscv64-linux"))
(add-after 'allow-cross-compilation 'use-$CC-for-tests (synopsis "Simple compiler backend")
(lambda _ (description
(substitute* "tools/test.sh" "QBE is a small compiler backend using an SSA-based intermediate
(("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.") language as input.")
(home-page "https://c9x.me/compile/") (home-page "https://c9x.me/compile/")
(license license:expat)))) (license license:expat)))
(define-public python-pcpp (define-public python-pcpp
(package (package
@ -311,6 +353,11 @@ Its three main components are:
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
(list autoconf automake libtool pkg-config check)) (list autoconf automake libtool pkg-config check))
(native-search-paths
(list
(search-path-specification
(variable "C_INCLUDE_PATH")
(files '("include")))))
(synopsis "Thin wrapper over POSIX syscalls") (synopsis "Thin wrapper over POSIX syscalls")
(description (description
"The purpose of libfixposix is to offer replacements for parts of POSIX "The purpose of libfixposix is to offer replacements for parts of POSIX
@ -1134,3 +1181,41 @@ performance concurrent systems developed in C99+.")
C and C++. The functions it provides are like those from the C header C and C++. The functions it provides are like those from the C header
string.h, but with a utf8* prefix instead of the str* prefix.") string.h, but with a utf8* prefix instead of the str* prefix.")
(license license:unlicense)))) (license license:unlicense))))
(define-public utest-h
;; The latest commit is used as there is no release.
(let ((commit "54458e248f875f1a51f0af8bec8ca6ae7761b9d1")
(revision "0"))
(package
(name "utest-h")
(version (git-version "0.0.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/sheredom/utest.h")
(commit commit)))
(file-name (git-file-name "utest.h" version))
(sha256
(base32
"1ikl5jwmjdw1mblqyl2kvnqwkjgaz78c1h7mjcfmzjc0d3h8kh44"))))
(build-system cmake-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
(delete 'build)
(delete 'configure)
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(with-directory-excursion "test"
(invoke "cmake" ".")
(invoke "make")))))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(install-file "utest.h"
(string-append out "/include"))))))))
(home-page "https://www.duskborn.com/utest_h/")
(synopsis "Single-header unit testing framework for C and C++")
(description
"This package provides a header-only unit testing library for C/C++.")
(license license:unlicense))))

1
gnu/packages/calendar.scm
View file

@ -50,6 +50,7 @@
#: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 python) #:use-module (gnu packages python)
#:use-module (gnu packages python-build)
#:use-module (gnu packages python-xyz) #:use-module (gnu packages python-xyz)
#:use-module (gnu packages qt) #:use-module (gnu packages qt)
#:use-module (gnu packages sphinx) #:use-module (gnu packages sphinx)

6
gnu/packages/check.scm
View file

@ -7,7 +7,7 @@
;;; Copyright © 2015, 2017 Cyril Roelandt <tipecaml@gmail.com> ;;; Copyright © 2015, 2017 Cyril Roelandt <tipecaml@gmail.com>
;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch> ;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015, 2016, 2018, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015, 2016, 2018-2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016 Christine Lemmer-Webber <cwebber@dustycloud.org> ;;; Copyright © 2016 Christine Lemmer-Webber <cwebber@dustycloud.org>
;;; Copyright © 2016, 2017 Danny Milosavljevic <dannym+a@scratchpost.org> ;;; Copyright © 2016, 2017 Danny Milosavljevic <dannym+a@scratchpost.org>
@ -2068,14 +2068,14 @@ programs, something like CSmith, a random generator of C programs.")
(define-public python-lit (define-public python-lit
(package (package
(name "python-lit") (name "python-lit")
(version "12.0.1") (version "14.0.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "lit" version)) (uri (pypi-uri "lit" version))
(sha256 (sha256
(base32 (base32
"01yggsb73s2gbq36xwifxl6k5ll5lkss5rwz59k9h3jnbnn7m5fj")))) "162x7pddwl395c3mdb0mfn3f5z24x1jz6g27x303lfxpzidnn4m4"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases `(#:phases

8
gnu/packages/chromium.scm
View file

@ -316,7 +316,7 @@
;; 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 "103.0.5060.53") (define %chromium-version "103.0.5060.114")
(define %ungoogled-revision (string-append %chromium-version "-1")) (define %ungoogled-revision (string-append %chromium-version "-1"))
(define %debian-revision "debian/102.0.5005.61-1") (define %debian-revision "debian/102.0.5005.61-1")
@ -328,7 +328,7 @@
(file-name (git-file-name "ungoogled-chromium" %ungoogled-revision)) (file-name (git-file-name "ungoogled-chromium" %ungoogled-revision))
(sha256 (sha256
(base32 (base32
"1g5ciwzrhg9g13gvhrwqf19djk9jhj1d6nx2f6a8d5ch1mhi2z8s")))) "11i7d480q21vcd9p14rc7rb408xwlg2nkj88dq0sfj2rz60lzy0a"))))
(define %debian-origin (define %debian-origin
(origin (origin
@ -477,7 +477,7 @@
%chromium-version ".tar.xz")) %chromium-version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"00di0nw6h3kb0qp2wp3ny3zsar1ayn1lyx5zr28dl1h5cwaaxjqf")) "0rarcd2q1ggl10cw3vwjk7j9aka7i129a0qv8qr7751vy083as3p"))
(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)
@ -886,7 +886,7 @@
gdk-pixbuf gdk-pixbuf
glib glib
gtk+ gtk+
harfbuzz-3.0 harfbuzz-3
icu4c-71 icu4c-71
jsoncpp jsoncpp
lcms lcms

4
gnu/packages/code.scm
View file

@ -390,7 +390,7 @@ features that are not supported by the standard @code{stdio} implementation.")
(define-public universal-ctags (define-public universal-ctags
(package (package
(name "universal-ctags") (name "universal-ctags")
(version "5.9.20220605.0") (version "5.9.20220626.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -400,7 +400,7 @@ features that are not supported by the standard @code{stdio} implementation.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0mri7m2qsw5pyq1ajapawvxn2cdrzg1vi4w2bdq0z4ws4q03lj7k")) "1x5kqqznlbndwln8g0kcxnla6b94i7x7cd63ba2sj0fzzms5gx24"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin

4
gnu/packages/compression.scm
View file

@ -1915,14 +1915,14 @@ timestamps in the file header with a fixed time (1 January 2008).
(define-public libzip (define-public libzip
(package (package
(name "libzip") (name "libzip")
(version "1.8.0") (version "1.9.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"https://libzip.org/download/libzip-" version ".tar.xz")) "https://libzip.org/download/libzip-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0zn9vaiwy2izj8cnm8i7c2mbdn38n328grqb8f07x55s4kd3nxph")))) "0dsrpb1faywhm0j8akx21gp7cn99wpz3h543jw8r7p5jnx99hgn9"))))
(native-inputs (native-inputs
(list perl pkg-config)) (list perl pkg-config))
(inputs (inputs

38
gnu/packages/connman.scm
View file

@ -24,6 +24,7 @@
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix gexp)
#:use-module (guix licenses) #:use-module (guix licenses)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (gnu packages) #:use-module (gnu packages)
@ -55,19 +56,30 @@
(base32 "12g5ilcnymx6i45z3359yds3cgd2dfqjyncfm92hqlymzps41yvr")))) (base32 "12g5ilcnymx6i45z3359yds3cgd2dfqjyncfm92hqlymzps41yvr"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags (list #:configure-flags
(list "--enable-nmcompat" #~(list "--enable-nmcompat"
"--enable-polkit" ; Polkit doesn't need to be present at build time. ;; PolKit doesn't need to be present at build time.
"--enable-iwd" "--enable-polkit"
"--enable-openconnect" "--enable-iwd"
"--enable-openvpn" "--enable-l2tp"
"--enable-vpnc" "--enable-openconnect"
"--enable-l2tp" "--enable-openvpn"
"--localstatedir=/var" "--enable-vpnc"
(string-append "--localstatedir=/var"
"--with-dbusconfdir=" (assoc-ref %outputs "out") "/etc") (string-append "--with-l2tp="
(string-append #$(this-package-input "xl2tpd")
"--with-dbusdatadir=" (assoc-ref %outputs "out") "/share")))) "/sbin/xl2tpd")
(string-append "--with-openconnect="
#$(this-package-input "openconnect")
"/sbin/openconnect")
(string-append "--with-openvpn="
#$(this-package-input "openvpn")
"/sbin/openvpn")
(string-append "--with-vpnc="
#$(this-package-input "vpnc")
"/sbin/vpnc")
(string-append "--with-dbusconfdir=" #$output "/etc")
(string-append "--with-dbusdatadir=" #$output "/share"))))
(native-inputs (native-inputs
(list pkg-config (list pkg-config
python-wrapper)) python-wrapper))

4
gnu/packages/cpp.scm
View file

@ -406,7 +406,7 @@ combination of these streams.")
(define-public xsimd (define-public xsimd
(package (package
(name "xsimd") (name "xsimd")
(version "8.0.5") (version "8.1.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -414,7 +414,7 @@ combination of these streams.")
(url "https://github.com/QuantStack/xsimd") (url "https://github.com/QuantStack/xsimd")
(commit version))) (commit version)))
(sha256 (sha256
(base32 "0fph1gzrj13knfkl3fvg098ccvqkbzs0jb8n323m7pnxajpzhzij")) (base32 "16b9fdvhhsbs93llbzccgpxjdkj8kfvac3wx0b30i306k5f3maq2"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments

637
gnu/packages/cran.scm
View file

File diff suppressed because it is too large Load diff

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

@ -30501,6 +30501,32 @@ kernel32.")
(description "This package provides a kqueue interface for BSDs.") (description "This package provides a kqueue interface for BSDs.")
(license license:expat))) (license license:expat)))
(define-public rust-kstring-2
(package
(name "rust-kstring")
(version "2.0.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "kstring" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "0isp7kmk4q0qxpcd877q77ykgb3ryfbmj18djmnwv8c210sncc7c"))))
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t ; Uses unstable features.
#:cargo-inputs
(("rust-document-features" ,rust-document-features-0.2)
("rust-serde" ,rust-serde-1)
("rust-static-assertions" ,rust-static-assertions-1))
#:cargo-development-inputs
(("rust-criterion" ,rust-criterion-0.3)
("rust-proptest" ,rust-proptest-1))))
(home-page "https://github.com/cobalt-org/kstring")
(synopsis "String optimized for map keys")
(description "Key String provides a Rust package optimized for map keys.")
(license (list license:expat license:asl2.0))))
(define-public rust-kstring-1 (define-public rust-kstring-1
(package (package
(name "rust-kstring") (name "rust-kstring")
@ -32249,6 +32275,31 @@ pseudo-random text.")
(license (list license:asl2.0 (license (list license:asl2.0
license:expat)))) license:expat))))
(define-public rust-libtest-mimic-0.3
(package
(name "rust-libtest-mimic")
(version "0.3.0")
(source (origin
(method url-fetch)
(uri (crate-uri "libtest-mimic" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"1bp2jllwpciljr14g6s9bk4835g46kszgrjwi66vxxsk3ynbi9q8"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-crossbeam-channel" ,rust-crossbeam-channel-0.4)
("rust-rayon" ,rust-rayon-1)
("rust-structopt" ,rust-structopt-0.3)
("rust-termcolor" ,rust-termcolor-1))))
(home-page "https://github.com/LukasKalbertodt/libtest-mimic")
(synopsis "Tools for writing a test harness")
(description
"Write your own test harness that looks and behaves like the built-in test
harness used by @code{rustc --test}.")
(license (list license:expat license:asl2.0))))
(define-public rust-lmdb-rkv-0.14 (define-public rust-lmdb-rkv-0.14
(package (package
(name "rust-lmdb-rkv") (name "rust-lmdb-rkv")
@ -44455,6 +44506,31 @@ particularly useful for printing structured recursive data like trees.")
(("rust-termcolor" ,rust-termcolor-0.3) (("rust-termcolor" ,rust-termcolor-0.3)
("rust-typed-arena" ,rust-typed-arena-1)))))) ("rust-typed-arena" ,rust-typed-arena-1))))))
(define-public rust-pretty-assertions-1
(package
(name "rust-pretty-assertions")
(version "1.2.1")
(source (origin
(method url-fetch)
(uri (crate-uri "pretty_assertions" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0qrmkdwqn56af498vi8zjyq44wzcyvj5ic1dv54d01s2r6d9i7y8"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-ansi-term" ,rust-ansi-term-0.12)
("rust-ctor" ,rust-ctor-0.1)
("rust-diff" ,rust-diff-0.1)
("rust-output-vt100" ,rust-output-vt100-0.1))))
(home-page "https://github.com/colin-kiegel/rust-pretty-assertions")
(synopsis "Drop-in replacements for assert_eq! and assert_ne!")
(description
"Overwrite @code{assert_eq!} and @code{assert_ne!} with drop-in
replacements, adding colorful diffs.")
(license (list license:expat license:asl2.0))))
(define-public rust-pretty-assertions-0.7 (define-public rust-pretty-assertions-0.7
(package (package
(name "rust-pretty-assertions") (name "rust-pretty-assertions")
@ -56347,6 +56423,31 @@ CPUs, as well as raw interfaces to platform-specific instructions.
extensions.") extensions.")
(license (list license:expat license:asl2.0)))) (license (list license:expat license:asl2.0))))
(define-public rust-similar-2
(package
(name "rust-similar")
(version "2.1.0")
(source (origin
(method url-fetch)
(uri (crate-uri "similar" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"1lw33na01r35h09s47jqhjgz3m29wapl20f6ybsla5d1cfgrf91f"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-bstr" ,rust-bstr-0.2)
("rust-serde" ,rust-serde-1)
("rust-unicode-segmentation" ,rust-unicode-segmentation-1))
#:cargo-development-inputs
(("rust-insta" ,rust-insta-1)
("rust-console" ,rust-console-0.14))))
(home-page "https://github.com/mitsuhiko/similar")
(synopsis "Diff library for Rust")
(description "This package provides a diff library for Rust.")
(license license:asl2.0)))
(define-public rust-similar-1 (define-public rust-similar-1
(package (package
(name "rust-similar") (name "rust-similar")
@ -57514,6 +57615,78 @@ algorithm. Includes streaming compression and decompression.")
("rust-lazy-static" ,rust-lazy-static-1) ("rust-lazy-static" ,rust-lazy-static-1)
("rust-snappy-cpp" ,rust-snappy-cpp-0.1)))))) ("rust-snappy-cpp" ,rust-snappy-cpp-0.1))))))
(define-public rust-snapbox-macros-0.2
(package
(name "rust-snapbox-macros")
(version "0.2.1")
(source (origin
(method url-fetch)
(uri (crate-uri "snapbox-macros" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0c79lnjcs9yp62y665swv5y5y6088qc256bfr3s7xcnb0izfl7f0"))))
(build-system cargo-build-system)
(home-page "https://github.com/assert-rs/trycmd/tree/main/crates/snapbox")
(synopsis "Snapshot testing toolbox")
(description
"snapbox is a snapshot-testing toolbox that is ready to use for verifying
output from
@itemize
@item Function return values
@item CLI stdout/stderr
@item Filesystem changes
@end itemize
It is also flexible enough to build your own test harness like @code{trycmd}.")
(license (list license:expat license:asl2.0))))
(define-public rust-snapbox-0.2
(package
(name "rust-snapbox")
(version "0.2.10")
(source (origin
(method url-fetch)
(uri (crate-uri "snapbox" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"14zxmsi4k9a9vgp9vs1q62ff1k57p26rwp5xs6f9bdijl9fisykn"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-backtrace" ,rust-backtrace-0.3)
("rust-concolor" ,rust-concolor-0.0.8)
("rust-content-inspector" ,rust-content-inspector-0.2)
("rust-document-features" ,rust-document-features-0.2)
("rust-dunce" ,rust-dunce-1)
("rust-filetime" ,rust-filetime-0.2)
("rust-ignore" ,rust-ignore-0.4)
("rust-libtest-mimic" ,rust-libtest-mimic-0.3)
("rust-normalize-line-endings" ,rust-normalize-line-endings-0.3)
("rust-os-pipe" ,rust-os-pipe-1)
("rust-similar" ,rust-similar-2)
("rust-snapbox-macros" ,rust-snapbox-macros-0.2)
("rust-tempfile" ,rust-tempfile-3)
("rust-wait-timeout" ,rust-wait-timeout-0.2)
("rust-walkdir" ,rust-walkdir-2)
("rust-yansi" ,rust-yansi-0.5))))
(home-page "https://github.com/assert-rs/trycmd/tree/main/crates/snapbox")
(synopsis "Snapshot testing toolbox")
(description
"snapbox is a snapshot-testing toolbox that is ready to use for verifying
output from
@itemize
@item Function return values
@item CLI stdout/stderr
@item Filesystem changes
@end itemize
It is also flexible enough to build your own test harness like @code{trycmd}.")
(license (list license:expat license:asl2.0))))
(define-public rust-snappy-cpp-0.1 (define-public rust-snappy-cpp-0.1
(package (package
(name "rust-snappy-cpp") (name "rust-snappy-cpp")
@ -65185,6 +65358,36 @@ serializing Rust structures.")
(license (list license:asl2.0 (license (list license:asl2.0
license:expat)))) license:expat))))
(define-public rust-toml-edit-0.14
(package
(name "rust-toml-edit")
(version "0.14.3")
(source
(origin
(method url-fetch)
(uri (crate-uri "toml_edit" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "01g772nkn5lmzaayssjd83rs3ri9ivny8r3wz2b3df1isrgkg65s"))))
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
#:cargo-inputs
(("rust-combine" ,rust-combine-4)
("rust-indexmap" ,rust-indexmap-1)
("rust-itertools" ,rust-itertools-0.10)
("rust-kstring" ,rust-kstring-2)
("rust-serde" ,rust-serde-1))
#:cargo-development-inputs
(("rust-criterion" ,rust-criterion-0.3)
("rust-pretty-assertions" ,rust-pretty-assertions-1)
("rust-snapbox" ,rust-snapbox-0.2))))
(home-page "https://github.com/ordian/toml_edit")
(synopsis "Yet another format-preserving TOML parser.")
(description "This package provides yet another format-preserving TOML
parser.")
(license (list license:expat license:asl2.0))))
(define-public rust-toml-edit-0.3 (define-public rust-toml-edit-0.3
(package (package
(name "rust-toml-edit") (name "rust-toml-edit")
@ -66883,6 +67086,38 @@ the Trust-DNS client to use rustls for TLS.")
"Test harness for ui tests of compiler diagnostics.") "Test harness for ui tests of compiler diagnostics.")
(license (list license:expat license:asl2.0)))) (license (list license:expat license:asl2.0))))
(define-public rust-trycmd-0.13
(package
(name "rust-trycmd")
(version "0.13.4")
(source (origin
(method url-fetch)
(uri (crate-uri "trycmd" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"04wzh907rkxac5kxlai0s630qh9z122w2m1s2x14d46c4r8iid7z"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-escargot" ,rust-escargot-0.5)
("rust-glob" ,rust-glob-0.3)
("rust-humantime" ,rust-humantime-2)
("rust-humantime-serde" ,rust-humantime-serde-1)
("rust-rayon" ,rust-rayon-1)
("rust-schemars" ,rust-schemars-0.8)
("rust-serde" ,rust-serde-1)
("rust-serde-json" ,rust-serde-json-1)
("rust-shlex" ,rust-shlex-1)
("rust-snapbox" ,rust-snapbox-0.2)
("rust-toml-edit" ,rust-toml-edit-0.14))))
(home-page "https://github.com/assert-rs/trycmd")
(synopsis "Snapshot testing for a herd of CLI tests")
(description
"trycmd is a test harness that will enumerate test case files and run them to
verify the results, taking inspiration from @code{trybuild} and @code{cram}.")
(license (list license:expat license:asl2.0))))
(define-public rust-ttf-parser-0.12 (define-public rust-ttf-parser-0.12
(package (package
(name "rust-ttf-parser") (name "rust-ttf-parser")

37
gnu/packages/curl.scm
View file

@ -2,9 +2,9 @@
;;; Copyright © 2013, 2014, 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013, 2014, 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Tomáš Čech <sleep_walker@suse.cz> ;;; Copyright © 2015 Tomáš Čech <sleep_walker@suse.cz>
;;; Copyright © 2015, 2020, 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015, 2020, 2021, 2022 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017, 2019 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016, 2017, 2019 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017, 2019, 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017, 2019, 2020, 2022 Marius Bakke <marius@gnu.org>
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Roel Janssen <roel@gnu.org> ;;; Copyright © 2018 Roel Janssen <roel@gnu.org>
@ -33,6 +33,7 @@
(define-module (gnu packages curl) (define-module (gnu packages curl)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages) #:use-module (guix packages)
#: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 utils) #:use-module (guix utils)
@ -63,9 +64,10 @@
(package (package
(name "curl") (name "curl")
(version "7.79.1") (version "7.79.1")
(replacement curl-7.84.0)
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://curl.haxx.se/download/curl-" (uri (string-append "https://curl.se/download/curl-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
@ -139,6 +141,35 @@ tunneling, and so on.")
"See COPYING in the distribution.")) "See COPYING in the distribution."))
(home-page "https://curl.haxx.se/"))) (home-page "https://curl.haxx.se/")))
;; Replacement package with fixes for multiple vulnerabilities.
;; See <https://curl.se/docs/security.html>.
(define curl-7.84.0
(package
(inherit curl)
(version "7.84.0")
(source (origin
(inherit (package-source curl))
(uri (string-append "https://curl.se/download/curl-"
version ".tar.xz"))
(sha256
(base32
"1f2xgj0wvys9xw50h7vcbaraavjr9rxx9n06x2xfbgs7ym1qn49d"))
(patches (append (origin-patches (package-source curl))
(search-patches "curl-easy-lock.patch")))))
(arguments (substitute-keyword-arguments (package-arguments curl)
((#:phases phases)
(cond
((not (target-64bit?))
#~(modify-phases #$phases
(add-after 'unpack 'tweak-lib3026-test
(lambda _
;; Have that test create a hundred threads, not a
;; thousand.
(substitute* "tests/libtest/lib3026.c"
(("NUM_THREADS .*$")
"NUM_THREADS 100\n"))))))
(else phases)))))))
(define-public curl-minimal (define-public curl-minimal
(deprecated-package "curl-minimal" curl)) (deprecated-package "curl-minimal" curl))

49
gnu/packages/databases.scm
View file

@ -57,6 +57,7 @@
;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com> ;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com>
;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com> ;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com>
;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re> ;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2022 muradm <mail@muradm.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -131,6 +132,7 @@
#:use-module (gnu packages popt) #:use-module (gnu packages popt)
#:use-module (gnu packages protobuf) #:use-module (gnu packages protobuf)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages python-build)
#:use-module (gnu packages python-check) #:use-module (gnu packages python-check)
#:use-module (gnu packages python-crypto) #:use-module (gnu packages python-crypto)
#:use-module (gnu packages python-science) #:use-module (gnu packages python-science)
@ -146,6 +148,7 @@
#:use-module (gnu packages sphinx) #:use-module (gnu packages sphinx)
#:use-module (gnu packages ssh) #:use-module (gnu packages ssh)
#:use-module (gnu packages sqlite) #:use-module (gnu packages sqlite)
#:use-module (gnu packages syncthing) ;for go-github-com-lib-pq
#:use-module (gnu packages tcl) #:use-module (gnu packages tcl)
#:use-module (gnu packages terminals) #:use-module (gnu packages terminals)
#:use-module (gnu packages texinfo) #:use-module (gnu packages texinfo)
@ -650,13 +653,13 @@ replacement for the code@{python-memcached} library.")
(define-public litecli (define-public litecli
(package (package
(name "litecli") (name "litecli")
(version "1.8.0") (version "1.9.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "litecli" version)) (uri (pypi-uri "litecli" version))
(sha256 (sha256
(base32 "0ghh8hq5bw3y2ybiy4ibbdfz55jxvilg1s6zmhxmqikhg5s95xh2")))) (base32 "1897divrdqlhl1p5jvvm29rg3d99f48s58na7hgdzm1x13x2rbr1"))))
(build-system python-build-system) (build-system python-build-system)
(propagated-inputs (propagated-inputs
(list python-cli-helpers (list python-cli-helpers
@ -1398,7 +1401,7 @@ PostgreSQL extension, providing automatic partitioning across time and space
(define-public pgloader (define-public pgloader
(package (package
(name "pgloader") (name "pgloader")
(version "3.6.3") (version "3.6.4")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -1406,7 +1409,7 @@ PostgreSQL extension, providing automatic partitioning across time and space
(url "https://github.com/dimitri/pgloader") (url "https://github.com/dimitri/pgloader")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(sha256 (sha256
(base32 "147dcf0rmi94p95dvifx8qy7602fvs041dv9wlg3q31ly13agwb5")) (base32 "05lpa0r5l7pvx97ljfb0cryxz11krczbb86gi1i1ixp0h9bvqw2a"))
(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
@ -1549,7 +1552,7 @@ organized in a hash table or B+ tree.")
;; XXX Without labels, the default 'configure phase picks the wrong "bash". ;; XXX Without labels, the default 'configure phase picks the wrong "bash".
`(("bc" ,bc) `(("bc" ,bc)
("bash:include" ,bash "include") ("bash:include" ,bash "include")
("check" ,check-0.14) ("check" ,check)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(inputs (inputs
;; TODO: Add more optional inputs. ;; TODO: Add more optional inputs.
@ -1569,14 +1572,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.3") (version "1.9.0")
(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
"0lkmvvdj4xx3qhxqggizrcdawav0accyrza2wmhfdq88g2zh5575")) "1w1q6kh567fd8xismq9i6wr1y893lypd30l452yvydi1qjiq1n6x"))
(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
@ -4760,3 +4763,35 @@ create design, and edit database file compatible with SQLite.")
;; dual license ;; dual license
(list license:gpl3+ (list license:gpl3+
license:mpl2.0)))) license:mpl2.0))))
(define-public sqls
(package
(name "sqls")
(version "0.2.18")
(home-page "https://github.com/lighttiger2505/sqls")
(source (origin
(method git-fetch)
(uri (git-reference
(url home-page)
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"13837v27avdp2nls3vyy7ml12nj7rxragchwf92adn10ffp4aj6c"))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/lighttiger2505/sqls"))
(inputs (list go-github-com-go-sql-driver-mysql
go-github-com-lib-pq
go-github-com-mattn-go-sqlite3
go-github-com-olekukonko-tablewriter
go-github-com-pkg-errors
go-github-com-sourcegraph-jsonrpc2
go-golang-org-x-crypto
go-github.com-mattn-go-runewidth
go-golang-org-x-xerrors
go-gopkg-in-yaml-v2))
(synopsis "SQL language server written in Go")
(description
"This package implements the @acronym{LSP, Language Server Protocol} for SQL.")
(license license:expat)))

7
gnu/packages/dav.scm
View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015, 2016, 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2015, 2016, 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2018, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018, 2019, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; 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>
@ -30,6 +30,7 @@
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages python-build)
#:use-module (gnu packages python-check) #:use-module (gnu packages python-check)
#:use-module (gnu packages python-crypto) #:use-module (gnu packages python-crypto)
#:use-module (gnu packages python-web) #:use-module (gnu packages python-web)
@ -41,7 +42,7 @@
(define-public radicale (define-public radicale
(package (package
(name "radicale") (name "radicale")
(version "3.1.5") (version "3.1.7")
(source (source
(origin (origin
;; There are no tests in the PyPI tarball. ;; There are no tests in the PyPI tarball.
@ -51,7 +52,7 @@
(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 "0wg0dg5bq221c6mj6fq53x82w0hb5hyyi8dqxkf6qnhf99bx8qrw")))) (base32 "1mv1w9qazbis9ir5shr1ybsfn4cxd3rmxa3ns6kbk23yramlzwhg"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
(list (list

4
gnu/packages/dezyne.scm
View file

@ -31,14 +31,14 @@
(define-public dezyne (define-public dezyne
(package (package
(name "dezyne") (name "dezyne")
(version "2.15.2") (version "2.15.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://dezyne.org/download/dezyne/" (uri (string-append "https://dezyne.org/download/dezyne/"
name "-" version ".tar.gz")) name "-" version ".tar.gz"))
(sha256 (sha256
(base32 "0yy4cmpxhw4z82bc1mvxyic4fnmb9a1d3w8fijvk1y2kqx2fiq6f")))) (base32 "0d0jnnb3pgmspsz5qbgf33wsav5yp8wb45igns1sfinaz743n870"))))
(inputs (list bash-minimal (inputs (list bash-minimal
guile-3.0-latest guile-3.0-latest
guile-json-4 guile-json-4

4
gnu/packages/diffoscope.scm
View file

@ -74,7 +74,7 @@
(define-public diffoscope (define-public diffoscope
(package (package
(name "diffoscope") (name "diffoscope")
(version "216") (version "217")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -83,7 +83,7 @@
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "066w4mcrjvymwii5j5hylcslpz18wgd5afl11z1n3588j8c1zw15")) (base32 "0vbyg8lm5ddrdkhahcs70rhdmz42blppzliryghxcyyxs7g3gzq5"))
(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)

8
gnu/packages/django.scm
View file

@ -54,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.4") (version "4.0.6")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "Django" version)) (uri (pypi-uri "Django" version))
(sha256 (sha256
(base32 (base32
"1da0vy3nas2m2j50dc5c3s1nv529lagg4c04riipah94hn2pg0af")))) "1bn3lg68r2bz6rzwnd7y2sin6fi9vahdqdsmamrx6zw2yqzpjym6"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
'(#:phases '(#:phases
@ -141,13 +141,13 @@ 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.13") (version "3.2.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
"1dn4irl4m21skcqb2mbj55vgryqfqk6wqa8s1c7bmxlv19x4k4vd")))) "1krg0bfd78mnqly1gzbprssz3bz6xryc2fig0x75la2vifx84wb7"))))
(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)

433
gnu/packages/dlang.scm
View file

@ -3,10 +3,12 @@
;;; Copyright © 2015, 2018 Pjotr Prins <pjotr.guix@thebird.nl> ;;; Copyright © 2015, 2018 Pjotr Prins <pjotr.guix@thebird.nl>
;;; Copyright © 2017 Frederick Muriithi <fredmanglis@gmail.com> ;;; Copyright © 2017 Frederick Muriithi <fredmanglis@gmail.com>
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2019, 2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Guy Fleury Iteriteka <gfleury@disroot.org> ;;; Copyright © 2020 Guy Fleury Iteriteka <gfleury@disroot.org>
;;; Copyright © 2021, 2022 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2022 ( <paren@disroot.org>
;;; Copyright © 2022 Esther Flashner <esther@flashner.co.il>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -28,19 +30,23 @@
#:use-module (guix packages) #:use-module (guix packages)
#: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 utils) #:use-module (guix utils)
#:use-module ((guix build utils) #:hide (delete which)) #:use-module ((guix build utils) #:hide (delete which))
#: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 copy)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages curl) #:use-module (gnu packages curl)
#:use-module (gnu packages gcc)
#:use-module (gnu packages gdb) #:use-module (gnu packages gdb)
#:use-module (gnu packages libedit) #:use-module (gnu packages libedit)
#:use-module (gnu packages llvm) #:use-module (gnu packages llvm)
#:use-module (gnu packages ninja) #:use-module (gnu packages ninja)
#:use-module (gnu packages perl)
#: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-xyz) #:use-module (gnu packages python-xyz)
@ -48,224 +54,101 @@
#:use-module (gnu packages xorg) #:use-module (gnu packages xorg)
#:use-module (srfi srfi-1)) #:use-module (srfi srfi-1))
(define-public rdmd (define-public d-tools
(package (package
(name "rdmd") (name "d-tools")
(version "2.077.1") (version "2.100.0")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/dlang/tools/archive/v" version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0c8w373rv6iz3xfid94w40ncv2lr2ncxi662qsr4lda4aghczmq7"))))
(build-system gnu-build-system)
(arguments
'(#:phases
(modify-phases %standard-phases
(delete 'configure)
(delete 'check) ; There is no Makefile, so there's no 'make check'.
(replace
'build
(lambda _
(invoke "ldc2" "rdmd.d")))
(replace
'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((bin (string-append (assoc-ref outputs "out") "/bin")))
(install-file "rdmd" bin)))))))
(native-inputs
(list ldc))
(home-page "https://github.com/D-Programming-Language/tools/")
(synopsis "Specialized equivalent to 'make' for the D language")
(description
"rdmd is a companion to the dmd compiler that simplifies the typical
edit-compile-link-run or edit-make-run cycle to a rapid edit-run cycle. Like
make and other tools, rdmd uses the relative dates of the files involved to
minimize the amount of work necessary. Unlike make, rdmd tracks dependencies
and freshness without requiring additional information from the user.")
(license license:boost1.0)))
;;; The 0.17.6 version is the last release to support being bootstrapped
;;; without a D compiler (requiring only a C++ compiler).
;;; TODO: Bootstrap ldc from GDC (the D frontend for GCC).
(define ldc-bootstrap-0.17
(package
(name "ldc")
(version "0.17.6")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/ldc-developers/ldc") (url "https://github.com/dlang/tools")
(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 "1q6hm4fkrcwys83x0p4kfg9xrc1b9g2qicqif2zy5z4nsfsb5vgs")))) (base32 "1jbn0hyskv4ykcckw0iganpyrm0bq2lggswspw21r4hgnxkmjbyw"))))
(build-system cmake-build-system) (build-system gnu-build-system)
(supported-systems '("x86_64-linux" "i686-linux"
"armhf-linux" "aarch64-linux"))
(properties
;; Some of the tests take a very long time on ARMv7. See
;; <https://lists.gnu.org/archive/html/guix-devel/2018-02/msg00312.html>.
`((max-silent-time . ,(* 3600 3))))
(arguments (arguments
`(#:tests? #f ;requires obsolete python-lit test dependency (list #:phases
,@(if (target-aarch64?) #~(modify-phases %standard-phases
'(#:system "armhf-linux") (delete 'configure)
'()) (replace 'build
#:phases (lambda _
(modify-phases %standard-phases (mkdir-p "bin")
(add-after 'unpack 'unpack-submodule-sources (setenv "CC" #$(cc-for-target))
(lambda* (#:key inputs #:allow-other-keys) (setenv "LD" #$(ld-for-target))
(let ((unpack (lambda (input target) (invoke "ldc2" "rdmd.d" "--of" "bin/rdmd")
(let ((source (assoc-ref inputs input))) (apply invoke "ldc2" "--of=bin/dustmite"
;; Git checkouts are directories as long as (find-files "DustMite" ".*\\.d"))))
;; there are no patches; tarballs otherwise. (replace 'check
(if (file-is-directory? source) (lambda* (#:key tests? #:allow-other-keys)
(copy-recursively source target) (when tests?
(with-directory-excursion target (invoke "bin/rdmd" "rdmd_test.d" "bin/rdmd"
(invoke "tar" "xvf" source "--rdmd-default-compiler" "ldmd2"))))
"--strip-components=1"))))))) (replace 'install
(unpack "phobos-src" "runtime/phobos") (lambda* (#:key outputs #:allow-other-keys)
(unpack "druntime-src" "runtime/druntime") (let* ((out (assoc-ref outputs "out"))
(unpack "dmd-testsuite-src" "tests/d2/dmd-testsuite")))) (bin (string-append out "/bin"))
(add-after 'unpack-submodule-sources 'patch-paths (man (string-append out "/man")))
(lambda* (#:key inputs #:allow-other-keys) (for-each delete-file (find-files "bin" "\\.o$"))
(substitute* "runtime/phobos/std/process.d" (copy-recursively "bin" bin)
(("/bin/sh") (which "sh")) (copy-recursively "man" man)))))))
(("echo") (which "echo")))
(substitute* "runtime/phobos/std/datetime.d"
(("/usr/share/zoneinfo/")
(string-append (assoc-ref inputs "tzdata") "/share/zoneinfo"))
(("tzName == \"[+]VERSION\"")
"(tzName == \"+VERSION\" || \
std.algorithm.endsWith(tzName, \"/leapseconds\"))")))))))
(inputs
`(("libconfig" ,libconfig)
("libedit" ,libedit)
("tzdata" ,tzdata)
("zlib" ,zlib)))
(native-inputs (native-inputs
`(("llvm" ,llvm-6) (list ldc
("python-wrapper" ,python-wrapper) (module-ref (resolve-interface
("unzip" ,unzip) '(gnu packages commencement))
("phobos-src" 'ld-gold-wrapper)))
,(origin (home-page "https://github.com/dlang/tools")
(method git-fetch) (synopsis "Useful D-related tools")
(uri (git-reference
(url "https://github.com/ldc-developers/phobos")
(commit (string-append "ldc-v" version))))
(file-name (git-file-name "phobos" version))
(sha256
(base32 "15jzs38wanks2jfp2izzl7zqrp4c8ai54ppsgm8ws86p3sbbkmj8"))))
("druntime-src"
,(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/ldc-developers/druntime")
(commit (string-append "ldc-v" version))))
(file-name (git-file-name "druntime" version))
(sha256
(base32 "00wr2kiggwnd8h7by51fhj1xc65hv1ysip5gbgdbkfar58p2d0bb"))))
("dmd-testsuite-src"
,(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/ldc-developers/dmd-testsuite")
(commit (string-append "ldc-v" version))))
(file-name (git-file-name "dmd-testsuite" version))
(sha256
(base32 "1d1c0979wbippldrkjf7szyj4n87hxz8dwqg1r5b3aai37g9kcky"))))))
(home-page "http://wiki.dlang.org/LDC")
(synopsis "LLVM-based compiler for the D programming language")
(description (description
"LDC is an LLVM compiler for the D programming language. It is based on "@code{d-tools} provides two useful tools for the D language: @code{rdmd},
the latest DMD compiler that was written in C and is used for which runs D source files as scripts, and @code{dustmite}, which reduces D code
bootstrapping more recent compilers written in D.") to a minimal test case.")
;; Most of the code is released under BSD-3, except for code originally (license license:boost1.0)))
;; written for GDC, which is released under GPLv2+, and the DMD frontend,
;; which is released under the "Boost Software License version 1.0".
(license (list license:bsd-3
license:gpl2+
license:boost1.0))))
;;; This is the last version that supports being built with 32 bit machines (define-public gdmd
;;; from 0.17. (let ((commit "ff2c97a47408fb71c18a2d453294d18808a97cc5")
(define ldc-bootstrap-1.12 (revision "1"))
(package (package
(inherit ldc-bootstrap-0.17) (name "gdmd")
(version "1.12.0") (version (git-version "0.1.0" revision commit))
(source (source
(origin (origin
(method url-fetch) (method git-fetch)
;; The official release include the matching source code releases of (uri (git-reference
;; phobos, druntime and dmd-testsuite. (url "https://github.com/D-Programming-GDC/gdmd")
(uri (string-append "https://github.com/ldc-developers/ldc/releases" (commit commit)))
"/download/v" version "/ldc-" version "-src.tar.gz")) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1fdma1w8j37wkr0pqdar11slkk36qymamxnk6d9k8ybhjmxaaawm")))) (base32 "0pd70clk70069xcjysaas7zszzmigrcw1zl2xxv8kzdg7y7xrzvm"))))
(arguments (build-system copy-build-system)
(substitute-keyword-arguments (package-arguments ldc-bootstrap-0.17) (arguments
((#:build-type _ #f) "Release") (list
((#:configure-flags _ #f) #:install-plan
`(list "-GNinja")) #~'(("dmd-script" "bin/gdmd")
((#:make-flags _ #f) ;used as build targets ("dmd-script.1" "share/man/man1/gdmd.1"))
`(list "all")) #:phases
((#:tests? _) #f) #~(modify-phases %standard-phases
((#:phases phases) (add-after 'unpack 'adjust-gdc-location
`(modify-phases ,phases (lambda* (#:key inputs #:allow-other-keys)
(delete 'unpack-submodule-sources) (substitute* "dmd-script"
(replace 'patch-paths (("my \\$gdc_dir.*")
(lambda* (#:key inputs #:allow-other-keys) (string-append "my $gdc_dir = \""
(substitute* '("runtime/phobos/std/process.d") (dirname (search-input-file inputs "/bin/gdc"))
(("/bin/sh") (which "sh")) "\";\n"))))))))
(("echo") (which "echo"))))) (inputs
(replace 'build (list gdc-10 perl))
;; Building with Make would result in "make: *** [Makefile:166: (home-page "https://github.com/D-Programming-GDC/gdmd")
;; all] Error 2". (synopsis "DMD-like wrapper for GDC")
(lambda* (#:key make-flags parallel-tests? #:allow-other-keys) (description "This package provides a DMD-like wrapper for the
(let ((job-count (number->string (or (and parallel-tests? @acronym{GNU D Compiler,GDC}.")
(parallel-job-count)) (license license:gpl3+))))
1))))
(apply invoke "cmake" "--build" "." "-j" job-count
"--target" make-flags))))
(replace 'install
(lambda _
(invoke "cmake" "--install" ".")))))))
(native-inputs
;; Importing (gnu packages commencement) would introduce a cycle.
`(("ld-gold-wrapper" ,(module-ref (resolve-interface
'(gnu packages commencement))
'ld-gold-wrapper))
("llvm" ,llvm-6)
("ldc" ,ldc-bootstrap-0.17)
("ninja" ,ninja)
("python-wrapper" ,python-wrapper)
("unzip" ,unzip)))))
;;; For 32 bits systems, 1.12 cannot build 1.27 directly, so we need another ;; We use GDC, the D frontend for GCC, to bootstrap ldc. We then use
;;; hop. ;; ldc to bootstrap itself so that no reference remains to GDC.
(define ldc-bootstrap-1.24 (define ldc-bootstrap
(package (package
(inherit ldc-bootstrap-1.12) (name "ldc")
(version "1.24.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/ldc-developers/ldc/releases"
"/download/v" version "/ldc-" version "-src.tar.gz"))
(sha256
(base32 "0g5svf55i0kq55q49awmwqj9qi1n907cyrn1vjdjgs8nx6nn35gx"))))
(native-inputs
(fold alist-replace
(package-native-inputs ldc-bootstrap-1.12)
'("ldc" "llvm")
`((,ldc-bootstrap-1.12) (,llvm-11))))))
(define ldc-bootstrap-1.27
(package
(inherit ldc-bootstrap-1.24)
(version "1.27.1") (version "1.27.1")
(source (source
(origin (origin
@ -274,24 +157,78 @@ bootstrapping more recent compilers written in D.")
"/download/v" version "/ldc-" version "-src.tar.gz")) "/download/v" version "/ldc-" version "-src.tar.gz"))
(sha256 (sha256
(base32 "1775001ba6n8w46ln530kb5r66vs935ingnppgddq8wqnc0gbj4k")))) (base32 "1775001ba6n8w46ln530kb5r66vs935ingnppgddq8wqnc0gbj4k"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ;skip in the bootstrap
#:build-type "Release"
#:configure-flags
(list "-GNinja")
#:make-flags ;used as build targets
(list "all")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-paths
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "runtime/phobos/std/process.d"
(("/bin/sh") (which "sh"))
(("echo") (which "echo")))))
(replace 'build
;; Building with Make would result in "make: *** [Makefile:166:
;; all] Error 2".
(lambda* (#:key make-flags parallel-tests? #:allow-other-keys)
(let ((job-count (number->string (or (and parallel-tests?
(parallel-job-count))
1))))
(apply invoke "cmake" "--build" "." "-j" job-count
"--target" make-flags))))
(replace 'install
(lambda _
(invoke "cmake" "--install" "."))))))
(inputs
`(("libconfig" ,libconfig)
("libedit" ,libedit)
("tzdata" ,tzdata)
("zlib" ,zlib)))
(native-inputs (native-inputs
(fold alist-replace ;; Importing (gnu packages commencement) would introduce a cycle.
(package-native-inputs ldc-bootstrap-1.24) `(("ld-gold-wrapper" ,(module-ref (resolve-interface
'("ldc" "llvm") '(gnu packages commencement))
`((,ldc-bootstrap-1.24) (,llvm-11)))))) 'ld-gold-wrapper))
("llvm" ,llvm-11)
("ldc" ,gdmd)
("ninja" ,ninja)
("python-wrapper" ,python-wrapper)
("unzip" ,unzip)))
(home-page "http://wiki.dlang.org/LDC")
(synopsis "LLVM-based compiler for the D programming language")
(description
"LDC is an LLVM compiler for the D programming language. It is based on
the latest DMD compiler that was written in C and is used for
bootstrapping more recent compilers written in D.")
(properties
;; Some of the tests take a very long time on ARMv7. See
;; <https://lists.gnu.org/archive/html/guix-devel/2018-02/msg00312.html>.
`((max-silent-time . ,(* 3600 3))))
;; Most of the code is released under BSD-3, except for code originally
;; written for GDC, which is released under GPLv2+, and the DMD frontend,
;; which is released under the "Boost Software License version 1.0".
(license (list license:bsd-3
license:gpl2+
license:boost1.0))))
(define-public ldc (define-public ldc
(package (package
(inherit ldc-bootstrap-1.27) (inherit ldc-bootstrap)
(arguments (arguments
(substitute-keyword-arguments (package-arguments ldc-bootstrap-1.27) (substitute-keyword-arguments (package-arguments ldc-bootstrap)
((#:make-flags _ #f) ((#:make-flags _ #f)
'(list "all" '(list "all"
;; Also build the test runner binaries. ;; Also build the test runner binaries.
"ldc2-unittest" "all-test-runners")) "ldc2-unittest" "all-test-runners"))
((#:configure-flags flags) ((#:configure-flags flags)
`(,@flags "-DBUILD_SHARED_LIBS=ON" `(,@flags "-DBUILD_SHARED_LIBS=ON"
"-DLDC_LINK_MANUALLY=OFF")) "-DLDC_LINK_MANUALLY=OFF"
"-DLDC_DYNAMIC_COMPILE=OFF"))
((#:tests? _) #t) ((#:tests? _) #t)
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases `(modify-phases ,phases
@ -312,7 +249,8 @@ bootstrapping more recent compilers written in D.")
system))))) system)))))
(matches ("x86_64" => "x86_64") (matches ("x86_64" => "x86_64")
("i686" => "i386") ("i686" => "i386")
("armhf" => "armhf")))) ("armhf" => "armhf")
("aarch64" => "aarch64"))))
;; Coax LLVM into agreeing with Clang about system target ;; Coax LLVM into agreeing with Clang about system target
;; naming. ;; naming.
(substitute* "driver/linker-gcc.cpp" (substitute* "driver/linker-gcc.cpp"
@ -362,30 +300,28 @@ bootstrapping more recent compilers written in D.")
(substitute* "runtime/druntime/test/exceptions/Makefile" (substitute* "runtime/druntime/test/exceptions/Makefile"
((".*TESTS\\+=rt_trap_exceptions_drt_gdb.*") ((".*TESTS\\+=rt_trap_exceptions_drt_gdb.*")
"")) ""))
;; The following tests fail on the supported 32 bit systems, ;; The following tests fail on some systems, not all of
;; which are not tested upstream. ;; which are tested upstream.
(with-directory-excursion "tests" (with-directory-excursion "tests"
(let ((system ,(or (%current-target-system) (cond
(%current-system)))) (,(or (target-x86-32?)
(when (or (string-prefix? "armhf" system ) (target-arm32?))
(string-prefix? "i686" system ))
(for-each delete-file (for-each delete-file
'("PGO/profile_rt_calls.d" '("PGO/profile_rt_calls.d"
"codegen/mangling.d" "codegen/mangling.d"
"debuginfo/print_gdb.d"
"dynamiccompile/bind.d"
"dynamiccompile/bind_bool.d"
"dynamiccompile/bind_func_opt.d"
"dynamiccompile/bind_nested_opt.d"
"dynamiccompile/bind_opt.d"
"dynamiccompile/compiler_context.d"
"dynamiccompile/compiler_context_parallel.d"
"instrument/xray_check_pipeline.d" "instrument/xray_check_pipeline.d"
"instrument/xray_link.d" "instrument/xray_link.d"
"instrument/xray_simple_execution.d" "instrument/xray_simple_execution.d"
"sanitizers/msan_noerror.d" "sanitizers/msan_noerror.d"
"sanitizers/msan_uninitialized.d" "sanitizers/msan_uninitialized.d"
"d2/dmd-testsuite/runnable_cxx/cppa.d"))))))) "d2/dmd-testsuite/runnable_cxx/cppa.d")))
(,(target-aarch64?)
(for-each delete-file
'("d2/dmd-testsuite/runnable/ldc_cabi1.d"
"sanitizers/fuzz_basic.d"
"sanitizers/msan_noerror.d"
"sanitizers/msan_uninitialized.d")))
(#t '())))))
(add-before 'configure 'set-cc-and-cxx-to-use-clang (add-before 'configure 'set-cc-and-cxx-to-use-clang
;; The tests require to be built with Clang; build everything ;; The tests require to be built with Clang; build everything
;; with it, for simplicity. ;; with it, for simplicity.
@ -418,15 +354,15 @@ integration tests...\n")
"-E" "dmd-testsuite|lit-tests|ldc2-unittest"))))))))) "-E" "dmd-testsuite|lit-tests|ldc2-unittest")))))))))
(native-inputs (native-inputs
(append (delete "llvm" (append (delete "llvm"
(alist-replace "ldc" (list ldc-bootstrap-1.27) (alist-replace "ldc" (list ldc-bootstrap)
(package-native-inputs ldc-bootstrap-1.27))) (package-native-inputs ldc-bootstrap)))
`(("clang" ,clang-11) ;propagates llvm and clang-runtime `(("clang" ,clang-11) ;propagates llvm and clang-runtime
("python-lit" ,python-lit)))))) ("python-lit" ,python-lit))))))
(define-public dub (define-public dub
(package (package
(name "dub") (name "dub")
(version "1.7.2") (version "1.23.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -435,26 +371,31 @@ integration tests...\n")
(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 "073ibvgm1gphcqs1yjrav9ryp677nh3b194nxmvicwgvdc0sb6w9")))) (base32 "06a4whsl1m600k096nwif83n7za3vr7pj1xwapncy5fcad1gmady"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; it would have tested itself by installing some packages (vibe etc) (list #:tests? #f ; tests try to install packages
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(delete 'configure) ; no configure script (delete 'configure) ; no configure script
(replace 'build (replace 'build
(lambda _ (lambda _
(invoke "./build.sh"))) (setenv "CC" #$(cc-for-target))
(replace 'install (setenv "LD" #$(ld-for-target))
(lambda* (#:key outputs #:allow-other-keys) (invoke "./build.d")))
(let* ((out (assoc-ref outputs "out")) (replace 'install
(bin (string-append out "/bin"))) (lambda* (#:key outputs #:allow-other-keys)
(install-file "bin/dub" bin) (let* ((out (assoc-ref outputs "out"))
#t)))))) (bin (string-append out "/bin")))
(install-file "bin/dub" bin)))))))
(inputs (inputs
(list curl)) (list curl))
(native-inputs (native-inputs
(list ldc)) (list d-tools
ldc
(module-ref (resolve-interface
'(gnu packages commencement))
'ld-gold-wrapper)))
(home-page "https://code.dlang.org/getting_started") (home-page "https://code.dlang.org/getting_started")
(synopsis "Package and build manager for D projects") (synopsis "Package and build manager for D projects")
(description (description

52
gnu/packages/docbook.scm
View file

@ -476,37 +476,37 @@ the in DocBook SGML DTDs.")
;; TODO: Add xfig/transfig for fig2dev utility ;; TODO: Add xfig/transfig for fig2dev utility
(inputs (inputs
`(("texlive" ,(texlive-updmap.cfg (list texlive-amsfonts `(("texlive" ,(texlive-updmap.cfg (list texlive-amsfonts
texlive-latex-anysize texlive-latex-anysize
texlive-latex-appendix texlive-latex-appendix
texlive-latex-bookmark texlive-latex-bookmark
texlive-latex-changebar texlive-latex-changebar
texlive-latex-colortbl texlive-latex-colortbl
texlive-latex-fancybox texlive-latex-fancybox
texlive-latex-fancyhdr texlive-latex-fancyhdr
texlive-latex-fancyvrb texlive-latex-fancyvrb
texlive-latex-float texlive-latex-float
texlive-latex-footmisc texlive-latex-footmisc
texlive-hyperref texlive-hyperref
texlive-latex-jknapltx texlive-latex-jknapltx
;; TODO: Use non-deprecated name on ;; TODO: Use non-deprecated name on
;; next rebuild cycle. ;; next rebuild cycle.
texlive-latex-listings texlive-latex-listings
texlive-latex-multirow texlive-latex-multirow
texlive-latex-overpic texlive-latex-overpic
texlive-latex-pdfpages texlive-latex-pdfpages
texlive-latex-refcount texlive-latex-refcount
texlive-latex-subfigure texlive-latex-subfigure
texlive-latex-titlesec texlive-latex-titlesec
texlive-wasysym texlive-wasysym
texlive-fonts-rsfs texlive-fonts-rsfs
texlive-stmaryrd texlive-stmaryrd
texlive-generic-iftex))) texlive-generic-iftex)))
("imagemagick" ,imagemagick) ;for convert ("imagemagick" ,imagemagick) ;for convert
("inkscape" ,inkscape) ;for svg conversion ("inkscape" ,inkscape/stable) ;for svg conversion
("docbook" ,docbook-xml) ("docbook" ,docbook-xml)
("libxslt" ,libxslt))) ;for xsltproc ("libxslt" ,libxslt))) ;for xsltproc
(arguments (arguments

657
gnu/packages/docker.scm
View file

@ -7,6 +7,7 @@
;;; Copyright © 2020 Katherine Cox-Buday <cox.katherine.e@gmail.com> ;;; Copyright © 2020 Katherine Cox-Buday <cox.katherine.e@gmail.com>
;;; Copyright © 2020 Jesse Dowell <jessedowell@gmail.com> ;;; Copyright © 2020 Jesse Dowell <jessedowell@gmail.com>
;;; Copyright © 2021 Oleg Pykhalov <go.wigust@gmail.com> ;;; Copyright © 2021 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2022 Pierre Langlois <pierre.langlois@gmx.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -28,6 +29,7 @@
#:use-module (gnu packages) #:use-module (gnu packages)
#: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 cmake) #:use-module (guix build-system cmake)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
@ -52,7 +54,7 @@
;; Note - when changing Docker versions it is important to update the versions ;; Note - when changing Docker versions it is important to update the versions
;; of several associated packages (docker-libnetwork and go-sctp). ;; of several associated packages (docker-libnetwork and go-sctp).
(define %docker-version "19.03.15") (define %docker-version "20.10.17")
(define-public python-docker (define-public python-docker
(package (package
@ -173,7 +175,7 @@ Python without keeping their credentials in a Docker configuration file.")
(define-public containerd (define-public containerd
(package (package
(name "containerd") (name "containerd")
(version "1.4.4") (version "1.6.6")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -182,51 +184,58 @@ Python without keeping their credentials in a Docker configuration file.")
(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 "0qjbfj1dw6pykxhh8zahcxlgpyjzgnrngk5vjaf34akwyan8nrxb")))) (base32 "1vsl747i3wyy68j4lp4nprwxadbyga8qxlrk892afcd2990zp5mr"))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
(let ((make-flags (list (string-append "VERSION=" version) (let ((make-flags #~(list (string-append "VERSION=" #$version)
"REVISION=0"))) (string-append "DESTDIR=" #$output)
`(#:import-path "github.com/containerd/containerd" "PREFIX="
#:phases "REVISION=0")))
(modify-phases %standard-phases (list
(add-after 'chdir 'patch-paths #:import-path "github.com/containerd/containerd"
(lambda* (#:key inputs import-path outputs #:allow-other-keys) #:phases
(with-directory-excursion (string-append "src/" import-path) #~(modify-phases %standard-phases
(substitute* "runtime/v1/linux/runtime.go" (add-after 'unpack 'patch-paths
(("defaultRuntime[ \t]*=.*") (lambda* (#:key inputs import-path outputs #:allow-other-keys)
(string-append "defaultRuntime = \"" (with-directory-excursion (string-append "src/" import-path)
(assoc-ref inputs "runc") (substitute* "runtime/v1/linux/runtime.go"
"/sbin/runc\"\n")) (("defaultRuntime[ \t]*=.*")
(("defaultShim[ \t]*=.*") (string-append "defaultRuntime = \""
(string-append "defaultShim = \"" (search-input-file inputs "/sbin/runc")
(assoc-ref outputs "out") "\"\n"))
"/bin/containerd-shim\"\n"))) (("defaultShim[ \t]*=.*")
(substitute* "vendor/github.com/containerd/go-runc/runc.go" (string-append "defaultShim = \""
(("DefaultCommand[ \t]*=.*") (assoc-ref outputs "out")
(string-append "DefaultCommand = \"" "/bin/containerd-shim\"\n")))
(assoc-ref inputs "runc") (substitute* "pkg/cri/config/config_unix.go"
"/sbin/runc\"\n"))) (("DefaultRuntimeName: \"runc\"")
(substitute* "vendor/github.com/containerd/continuity/testutil\ (string-append "DefaultRuntimeName: \""
(search-input-file inputs "/sbin/runc")
"\"")))
(substitute* "vendor/github.com/containerd/go-runc/runc.go"
(("DefaultCommand[ \t]*=.*")
(string-append "DefaultCommand = \""
(search-input-file inputs "/sbin/runc")
"\"\n")))
(substitute* "vendor/github.com/containerd/continuity/testutil\
/loopback/loopback_linux.go" /loopback/loopback_linux.go"
(("exec\\.Command\\(\"losetup\"") (("exec\\.Command\\(\"losetup\"")
(string-append "exec.Command(\"" (string-append "exec.Command(\""
(assoc-ref inputs "util-linux") (search-input-file inputs "/sbin/losetup")
"/sbin/losetup\""))) "\"")))
(substitute* "archive/compression/compression.go" (substitute* "archive/compression/compression.go"
(("exec\\.LookPath\\(\"unpigz\"\\)") (("exec\\.LookPath\\(\"unpigz\"\\)")
(string-append "\"" (assoc-ref inputs "pigz") (string-append "\""
"/bin/unpigz\", error(nil)")))))) (search-input-file inputs "/bin/unpigz")
(replace 'build "\", error(nil)"))))))
(lambda* (#:key import-path #:allow-other-keys) (replace 'build
(with-directory-excursion (string-append "src/" import-path) (lambda* (#:key import-path #:allow-other-keys)
(apply invoke "make" ',make-flags)))) (with-directory-excursion (string-append "src/" import-path)
(replace 'install (apply invoke "make" #$make-flags))))
(lambda* (#:key import-path outputs #:allow-other-keys) (replace 'install
(with-directory-excursion (string-append "src/" import-path) (lambda* (#:key import-path #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))) (with-directory-excursion (string-append "src/" import-path)
(apply invoke "make" (string-append "DESTDIR=" out) "install" (apply invoke "make" "install" #$make-flags))))))))
',make-flags)))))))))
(inputs (inputs
(list btrfs-progs libseccomp pigz runc util-linux)) (list btrfs-progs libseccomp pigz runc util-linux))
(native-inputs (native-inputs
@ -243,11 +252,10 @@ network attachments.")
;;; anyway, as it needs many dependencies that aren't being satisfied. ;;; anyway, as it needs many dependencies that aren't being satisfied.
(define docker-libnetwork (define docker-libnetwork
;; There are no recent release for libnetwork, so choose the last commit of ;; There are no recent release for libnetwork, so choose the last commit of
;; the branch that Docker uses, as can be seen in the Docker source file ;; the branch that Docker uses, as can be seen in the 'vendor.conf' Docker
;; 'hack/dockerfile/install/proxy.installer'. NOTE - It is important that ;; source file. NOTE - It is important that this version is kept in sync
;; this version is kept in sync with the version of Docker being used. ;; with the version of Docker being used.
;; This commit is the "bump_19.03" branch, as mentioned in Docker's vendor.conf. (let ((commit "f6ccccb1c082a432c2a5814aaedaca56af33d9ea")
(let ((commit "55e924b8a84231a065879156c0de95aefc5f5435")
(version (version-major+minor %docker-version)) (version (version-major+minor %docker-version))
(revision "1")) (revision "1"))
(package (package
@ -262,12 +270,10 @@ network attachments.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"19syb3scwiykn44gqfaqrgqv8a0df4ps0ykf3za9xkjc5cyi99mp")) "0nxpr0h0smv4n641g41vxibr5r85ixfcvs9cp3c4fc7zvrhjc49s"))
;; Delete bundled ("vendored") free software source code. ;; Delete bundled ("vendored") free software source code.
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet '(begin (snippet '(delete-file-recursively "vendor"))))
(delete-file-recursively "vendor")
#t))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
`(#:import-path "github.com/moby/libnetwork/")) `(#:import-path "github.com/moby/libnetwork/"))
@ -315,278 +321,269 @@ built-in registry server of Docker.")
(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 "0419iha9zmwlhzhnbfxlsa13vgd04yifnsr8qqnj2ks5dxrcajl8")) (base32 "0hn7fg717rggwk6dbicrwa7aglqp7dp0jp5rvn6p9gfcnrp2w97d"))))
(patches
(search-patches "docker-fix-tests.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:modules (list
((guix build gnu-build-system) #:modules
'((guix build gnu-build-system)
((guix build go-build-system) #:prefix go:) ((guix build go-build-system) #:prefix go:)
(guix build union) (guix build union)
(guix build utils)) (guix build utils))
#:imported-modules #:imported-modules
(,@%gnu-build-system-modules `(,@%gnu-build-system-modules
(guix build union) (guix build union)
(guix build go-build-system)) (guix build go-build-system))
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'patch-paths (add-after 'unpack 'patch-paths
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "builder/builder-next/executor_unix.go" (substitute* "builder/builder-next/executor_unix.go"
(("CommandCandidates:.*runc.*") (("CommandCandidates:.*runc.*")
(string-append "CommandCandidates: []string{\"" (string-append "CommandCandidates: []string{\""
(assoc-ref inputs "runc") (search-input-file inputs "/sbin/runc")
"/sbin/runc\"},\n"))) "\"},\n")))
(substitute* "vendor/github.com/containerd/go-runc/runc.go" (substitute* "vendor/github.com/containerd/go-runc/runc.go"
(("DefaultCommand = .*") (("DefaultCommand = .*")
(string-append "DefaultCommand = \"" (string-append "DefaultCommand = \""
(assoc-ref inputs "runc") (search-input-file inputs "/sbin/runc")
"/sbin/runc\"\n"))) "\"\n")))
(substitute* "vendor/github.com/containerd/containerd/runtime/v1/linux/runtime.go" (substitute* "vendor/github.com/containerd/containerd/\
(("defaultRuntime[ \t]*=.*") runtime/v1/linux/runtime.go"
(string-append "defaultRuntime = \"" (("defaultRuntime[ \t]*=.*")
(assoc-ref inputs "runc") (string-append "defaultRuntime = \""
"/sbin/runc\"\n")) (search-input-file inputs "/sbin/runc")
(("defaultShim[ \t]*=.*") "\"\n"))
(string-append "defaultShim = \"" (("defaultShim[ \t]*=.*")
(assoc-ref inputs "containerd") (string-append "defaultShim = \""
"/bin/containerd-shim\"\n"))) (search-input-file inputs "/bin/containerd-shim")
(substitute* "daemon/daemon_unix.go" "\"\n")))
(("DefaultShimBinary = .*") (substitute* "daemon/daemon_unix.go"
(string-append "DefaultShimBinary = \"" (("DefaultShimBinary = .*")
(assoc-ref inputs "containerd") (string-append "DefaultShimBinary = \""
"/bin/containerd-shim\"\n")) (search-input-file inputs "/bin/containerd-shim")
(("DefaultRuntimeBinary = .*") "\"\n"))
(string-append "DefaultRuntimeBinary = \"" (("DefaultRuntimeBinary = .*")
(assoc-ref inputs "runc") (string-append "DefaultRuntimeBinary = \""
"/sbin/runc\"\n")) (search-input-file inputs "/sbin/runc")
(("DefaultRuntimeName = .*") "\"\n")))
(string-append "DefaultRuntimeName = \"" (substitute* "daemon/runtime_unix.go"
(assoc-ref inputs "runc") (("defaultRuntimeName = .*")
"/sbin/runc\"\n"))) (string-append "defaultRuntimeName = \""
(substitute* "daemon/config/config.go" (search-input-file inputs "/sbin/runc")
(("StockRuntimeName = .*") "\"\n")))
(string-append "StockRuntimeName = \"" (substitute* "daemon/config/config.go"
(assoc-ref inputs "runc") (("StockRuntimeName = .*")
"/sbin/runc\"\n")) (string-append "StockRuntimeName = \""
(("DefaultInitBinary = .*") (search-input-file inputs "/sbin/runc")
(string-append "DefaultInitBinary = \"" "\"\n"))
(assoc-ref inputs "tini") (("DefaultInitBinary = .*")
"/bin/tini-static\"\n"))) (string-append "DefaultInitBinary = \""
(substitute* "daemon/config/config_common_unix_test.go" (search-input-file inputs "/bin/tini-static")
(("expectedInitPath: \"docker-init\"") "\"\n")))
(string-append "expectedInitPath: \"" (substitute* "daemon/config/config_common_unix_test.go"
(assoc-ref inputs "tini") (("expectedInitPath: \"docker-init\"")
"/bin/tini-static\""))) (string-append "expectedInitPath: \""
(substitute* "vendor/github.com/moby/buildkit/executor/runcexecutor/executor.go" (search-input-file inputs "/bin/tini-static")
(("var defaultCommandCandidates = .*") "\"")))
(string-append "var defaultCommandCandidates = []string{\"" (substitute* "vendor/github.com/moby/buildkit/executor/\
(assoc-ref inputs "runc") "/sbin/runc\"}"))) runcexecutor/executor.go"
(substitute* "vendor/github.com/docker/libnetwork/portmapper/proxy.go" (("var defaultCommandCandidates = .*")
(("var userlandProxyCommandName = .*") (string-append "var defaultCommandCandidates = []string{\""
(string-append "var userlandProxyCommandName = \"" (search-input-file inputs "/sbin/runc") "\"}")))
(assoc-ref inputs "docker-proxy") (substitute* "vendor/github.com/docker/libnetwork/portmapper/proxy.go"
"/bin/proxy\"\n"))) (("var userlandProxyCommandName = .*")
(substitute* "pkg/archive/archive.go" (string-append "var userlandProxyCommandName = \""
(("string\\{\"xz") (search-input-file inputs "/bin/proxy")
(string-append "string{\"" (assoc-ref inputs "xz") "/bin/xz"))) "\"\n")))
;; TODO: Remove when Docker proper uses v1.14.x to build (substitute* "pkg/archive/archive.go"
(substitute* "registry/resumable/resumablerequestreader_test.go" (("string\\{\"xz")
(("I%27m%20not%20an%20url" all) (string-append "string{\"" (search-input-file inputs "/bin/xz"))))
(string-append "\"" all "\"")))
;; TODO: Remove when Docker proper uses v1.14.x to build
(substitute* "vendor/gotest.tools/x/subtest/context.go"
(("func \\(tc \\*testcase\\) Cleanup\\(" all)
(string-append all "func()"))
(("tc\\.Cleanup\\(" all)
(string-append all "nil")))
(let ((source-files (filter (lambda (name) (let ((source-files (filter (lambda (name)
(not (string-contains name "test"))) (not (string-contains name "test")))
(find-files "." "\\.go$")))) (find-files "." "\\.go$"))))
(let-syntax ((substitute-LookPath* (let-syntax ((substitute-LookPath*
(syntax-rules () (syntax-rules ()
((_ (source-text package relative-path) ...) ((_ (source-text path) ...)
(substitute* source-files (substitute* source-files
(((string-append "\\<exec\\.LookPath\\(\"" (((string-append "\\<exec\\.LookPath\\(\""
source-text source-text
"\")")) "\")"))
(string-append "\"" (string-append "\""
(assoc-ref inputs package) (search-input-file inputs path)
"/" relative-path "\", error(nil)")) ...))))
"\", error(nil)")) ...)))) (substitute-Command*
(substitute-Command* (syntax-rules ()
(syntax-rules () ((_ (source-text path) ...)
((_ (source-text package relative-path) ...) (substitute* source-files
(substitute* source-files (((string-append "\\<(re)?exec\\.Command\\(\""
(((string-append "\\<(re)?exec\\.Command\\(\"" source-text
source-text "\"") _ re?)
"\"") _ re?) (string-append (if re? re? "")
(string-append (if re? re? "") "exec.Command(\""
"exec.Command(\"" (search-input-file inputs path)
(assoc-ref inputs package) "\"")) ...)))))
"/" relative-path (substitute-LookPath*
"\"")) ...))))) ("containerd" "/bin/containerd")
(substitute-LookPath* ("ps" "/bin/ps")
("containerd" "containerd" "bin/containerd") ("mkfs.xfs" "/sbin/mkfs.xfs")
("ps" "procps" "bin/ps") ("lvmdiskscan" "/sbin/lvmdiskscan")
("mkfs.xfs" "xfsprogs" "bin/mkfs.xfs") ("pvdisplay" "/sbin/pvdisplay")
("lvmdiskscan" "lvm2" "sbin/lvmdiskscan") ("blkid" "/sbin/blkid")
("pvdisplay" "lvm2" "sbin/pvdisplay") ("unpigz" "/bin/unpigz")
("blkid" "util-linux" "sbin/blkid") ("iptables" "/sbin/iptables")
("unpigz" "pigz" "bin/unpigz") ("ip6tables" "/sbin/ip6tables")
("iptables" "iptables" "sbin/iptables") ("iptables-legacy" "/sbin/iptables")
("iptables-legacy" "iptables" "sbin/iptables") ("ip" "/sbin/ip"))
("ip" "iproute2" "sbin/ip"))
(substitute-Command* (substitute-Command*
("modprobe" "kmod" "bin/modprobe") ("modprobe" "/bin/modprobe")
("pvcreate" "lvm2" "sbin/pvcreate") ("pvcreate" "/sbin/pvcreate")
("vgcreate" "lvm2" "sbin/vgcreate") ("vgcreate" "/sbin/vgcreate")
("lvcreate" "lvm2" "sbin/lvcreate") ("lvcreate" "/sbin/lvcreate")
("lvconvert" "lvm2" "sbin/lvconvert") ("lvconvert" "/sbin/lvconvert")
("lvchange" "lvm2" "sbin/lvchange") ("lvchange" "/sbin/lvchange")
("mkfs.xfs" "xfsprogs" "sbin/mkfs.xfs") ("mkfs.xfs" "/sbin/mkfs.xfs")
("xfs_growfs" "xfsprogs" "sbin/xfs_growfs") ("xfs_growfs" "/sbin/xfs_growfs")
("mkfs.ext4" "e2fsprogs" "sbin/mkfs.ext4") ("mkfs.ext4" "/sbin/mkfs.ext4")
("tune2fs" "e2fsprogs" "sbin/tune2fs") ("tune2fs" "/sbin/tune2fs")
("blkid" "util-linux" "sbin/blkid") ("blkid" "/sbin/blkid")
("resize2fs" "e2fsprogs" "sbin/resize2fs") ("resize2fs" "/sbin/resize2fs")
("ps" "procps" "bin/ps") ("ps" "/bin/ps")
("losetup" "util-linux" "sbin/losetup") ("losetup" "/sbin/losetup")
("uname" "coreutils" "bin/uname") ("uname" "/bin/uname")
("dbus-launch" "dbus" "bin/dbus-launch") ("dbus-launch" "/bin/dbus-launch")
("git" "git" "bin/git"))) ("git" "/bin/git")))
;; docker-mountfrom ?? ;; docker-mountfrom ??
;; docker ;; docker
;; docker-untar ?? ;; docker-untar ??
;; docker-applyLayer ?? ;; docker-applyLayer ??
;; /usr/bin/uname ;; /usr/bin/uname
;; grep ;; grep
;; apparmor_parser ;; apparmor_parser
;; Make compilation fail when, in future versions, Docker ;; Make compilation fail when, in future versions, Docker
;; invokes other programs we don't know about and thus don't ;; invokes other programs we don't know about and thus don't
;; substitute. ;; substitute.
(substitute* source-files (substitute* source-files
;; Search for Java in PATH. ;; Search for Java in PATH.
(("\\<exec\\.Command\\(\"java\"") (("\\<exec\\.Command\\(\"java\"")
"xxec.Command(\"java\"") "xxec.Command(\"java\"")
;; Search for AUFS in PATH (mainline Linux doesn't support it). ;; Search for AUFS in PATH (mainline Linux doesn't support it).
(("\\<exec\\.Command\\(\"auplink\"") (("\\<exec\\.Command\\(\"auplink\"")
"xxec.Command(\"auplink\"") "xxec.Command(\"auplink\"")
;; Fail on other unsubstituted commands. ;; Fail on other unsubstituted commands.
(("\\<exec\\.Command\\(\"([a-zA-Z0-9][a-zA-Z0-9_-]*)\"" (("\\<exec\\.Command\\(\"([a-zA-Z0-9][a-zA-Z0-9_-]*)\""
_ executable) _ executable)
(string-append "exec.Guix_doesnt_want_Command(\"" (string-append "exec.Guix_doesnt_want_Command(\""
executable "\"")) executable "\""))
(("\\<xxec\\.Command") (("\\<xxec\\.Command")
"exec.Command") "exec.Command")
;; Search for ZFS in PATH. ;; Search for ZFS in PATH.
(("\\<LookPath\\(\"zfs\"\\)") "LooxPath(\"zfs\")") (("\\<LookPath\\(\"zfs\"\\)") "LooxPath(\"zfs\")")
;; Fail on other unsubstituted LookPaths. ;; Do not fail when buildkit-qemu-<target> isn't found.
(("\\<LookPath\\(\"") "Guix_doesnt_want_LookPath\\(\"") ;; FIXME: We might need to package buildkit and docker's
(("\\<LooxPath") "LookPath"))) ;; buildx plugin, to support qemu-based docker containers.
#t)) (("\\<LookPath\\(\"buildkit-qemu-\"") "LooxPath(\"buildkit-qemu-\"")
(add-after 'patch-paths 'delete-failing-tests ;; Fail on other unsubstituted LookPaths.
(lambda _ (("\\<LookPath\\(\"") "Guix_doesnt_want_LookPath\\(\"")
;; Needs internet access. (("\\<LooxPath") "LookPath")))))
(delete-file "builder/remotecontext/git/gitutils_test.go") (add-after 'patch-paths 'delete-failing-tests
;; Permission denied. (lambda _
(delete-file "daemon/graphdriver/devmapper/devmapper_test.go") ;; Needs internet access.
;; Operation not permitted (idtools.MkdirAllAndChown). (delete-file "builder/remotecontext/git/gitutils_test.go")
(delete-file "daemon/graphdriver/vfs/vfs_test.go") ;; Permission denied.
;; Timeouts after 5 min. (delete-file "daemon/graphdriver/devmapper/devmapper_test.go")
(delete-file "plugin/manager_linux_test.go") ;; Operation not permitted (idtools.MkdirAllAndChown).
;; Operation not permitted. (delete-file "daemon/graphdriver/vfs/vfs_test.go")
(delete-file "daemon/graphdriver/aufs/aufs_test.go") ;; Timeouts after 5 min.
(delete-file "daemon/graphdriver/btrfs/btrfs_test.go") (delete-file "plugin/manager_linux_test.go")
(delete-file "daemon/graphdriver/overlay/overlay_test.go") ;; Operation not permitted.
(delete-file "daemon/graphdriver/overlay2/overlay_test.go") (delete-file "daemon/graphdriver/aufs/aufs_test.go")
(delete-file "pkg/chrootarchive/archive_unix_test.go") (delete-file "daemon/graphdriver/btrfs/btrfs_test.go")
(delete-file "daemon/container_unix_test.go") (delete-file "daemon/graphdriver/overlay/overlay_test.go")
;; This file uses cgroups and /proc. (delete-file "daemon/graphdriver/overlay2/overlay_test.go")
(delete-file "pkg/sysinfo/sysinfo_linux_test.go") (delete-file "pkg/chrootarchive/archive_unix_test.go")
;; This file uses cgroups. (delete-file "daemon/container_unix_test.go")
(delete-file "runconfig/config_test.go") ;; This file uses cgroups and /proc.
;; This file uses /var. (delete-file "pkg/sysinfo/sysinfo_linux_test.go")
(delete-file "daemon/oci_linux_test.go") ;; This file uses cgroups.
;; Signal tests fail in bizarre ways (delete-file "runconfig/config_test.go")
(delete-file "pkg/signal/signal_linux_test.go") ;; This file uses /var.
#t)) (delete-file "daemon/oci_linux_test.go")
(replace 'configure ;; Signal tests fail in bizarre ways
(lambda _ (delete-file "pkg/signal/signal_linux_test.go")))
(setenv "DOCKER_BUILDTAGS" "seccomp") (replace 'configure
(setenv "DOCKER_GITCOMMIT" (string-append "v" ,%docker-version)) (lambda _
(setenv "VERSION" (string-append ,%docker-version "-ce")) (setenv "DOCKER_BUILDTAGS" "seccomp")
;; Automatically use bundled dependencies. (setenv "DOCKER_GITCOMMIT" (string-append "v" #$%docker-version))
;; TODO: Unbundle - see file "vendor.conf". (setenv "VERSION" (string-append #$%docker-version "-ce"))
(setenv "AUTO_GOPATH" "1") ;; Automatically use bundled dependencies.
;; Respectively, strip the symbol table and debug ;; TODO: Unbundle - see file "vendor.conf".
;; information, and the DWARF symbol table. (setenv "AUTO_GOPATH" "1")
(setenv "LDFLAGS" "-s -w") ;; Respectively, strip the symbol table and debug
;; Make build faster ;; information, and the DWARF symbol table.
(setenv "GOCACHE" "/tmp") (setenv "LDFLAGS" "-s -w")
#t)) ;; Make build faster
(add-before 'build 'setup-go-environment (setenv "GOCACHE" "/tmp")))
(assoc-ref go:%standard-phases 'setup-go-environment)) (add-before 'build 'setup-go-environment
(replace 'build (assoc-ref go:%standard-phases 'setup-go-environment))
(lambda _ (replace 'build
;; Our LD doesn't like the statically linked relocatable things (lambda _
;; that go produces, so install the dynamic version of ;; Our LD doesn't like the statically linked relocatable things
;; dockerd instead. ;; that go produces, so install the dynamic version of
(invoke "hack/make.sh" "dynbinary"))) ;; dockerd instead.
(replace 'check (invoke "hack/make.sh" "dynbinary")))
(lambda _ (replace 'check
;; The build process generated a file because the environment (lambda* (#:key tests? #:allow-other-keys)
;; variable "AUTO_GOPATH" was set. Use it. (when tests?
(setenv "GOPATH" (string-append (getcwd) "/.gopath")) ;; The build process generated a file because the environment
;; ".gopath/src/github.com/docker/docker" is a link to the current ;; variable "AUTO_GOPATH" was set. Use it.
;; directory and chdir would canonicalize to that. (setenv "GOPATH" (string-append (getcwd) "/.gopath"))
;; But go needs to have the uncanonicalized directory name, so ;; ".gopath/src/github.com/docker/docker" is a link to the current
;; store that. ;; directory and chdir would canonicalize to that.
(setenv "PWD" (string-append (getcwd) ;; But go needs to have the uncanonicalized directory name, so
"/.gopath/src/github.com/docker/docker")) ;; store that.
(with-directory-excursion ".gopath/src/github.com/docker/docker" (setenv "PWD" (string-append
(invoke "hack/test/unit")) (getcwd) "/.gopath/src/github.com/docker/docker"))
(setenv "PWD" #f) (with-directory-excursion ".gopath/src/github.com/docker/docker"
#t)) (invoke "hack/test/unit"))
(replace 'install (setenv "PWD" #f))))
(lambda* (#:key outputs #:allow-other-keys) (replace 'install
(let* ((out (assoc-ref outputs "out")) (lambda* (#:key outputs #:allow-other-keys)
(out-bin (string-append out "/bin"))) (let* ((out (assoc-ref outputs "out"))
(install-file "bundles/dynbinary-daemon/dockerd" out-bin) (out-bin (string-append out "/bin")))
(install-file (string-append "bundles/dynbinary-daemon/dockerd-" (install-file "bundles/dynbinary-daemon/dockerd" out-bin)
(getenv "VERSION")) (install-file (string-append "bundles/dynbinary-daemon/dockerd-"
out-bin) (getenv "VERSION"))
#t))) out-bin))))
(add-after 'install 'remove-go-references (add-after 'install 'remove-go-references
(assoc-ref go:%standard-phases 'remove-go-references))))) (assoc-ref go:%standard-phases 'remove-go-references)))))
(inputs (inputs
`(("btrfs-progs" ,btrfs-progs) (list btrfs-progs
("containerd" ,containerd) ; for containerd-shim containerd ; for containerd-shim
("coreutils" ,coreutils) coreutils
("dbus" ,dbus) dbus
("docker-proxy" ,docker-libnetwork-cmd-proxy) docker-libnetwork-cmd-proxy
("e2fsprogs" ,e2fsprogs) e2fsprogs
("git" ,git) git
("iproute2" ,iproute) iproute
("iptables" ,iptables) iptables
("kmod" ,kmod) kmod
("libseccomp" ,libseccomp) libseccomp
("pigz" ,pigz) pigz
("procps" ,procps) procps
("runc" ,runc) runc
("util-linux" ,util-linux) util-linux
("lvm2" ,lvm2) lvm2
("tini" ,tini) tini
("xfsprogs" ,xfsprogs) xfsprogs
("xz" ,xz))) xz))
(native-inputs (native-inputs
(list eudev ; TODO: Should be propagated by lvm2 (.pc -> .pc) (list eudev ; TODO: Should be propagated by lvm2 (.pc -> .pc)
go-1.14 gotestsum pkg-config)) go gotestsum pkg-config))
(synopsis "Docker container component library, and daemon") (synopsis "Container component library and daemon")
(description "This package provides a framework to assemble specialized (description "This package provides a framework to assemble specialized
container systems. It includes components for orchestration, image container systems. It includes components for orchestration, image
management, secret management, configuration management, networking, management, secret management, configuration management, networking,
@ -600,13 +597,13 @@ provisioning etc.")
(version %docker-version) (version %docker-version)
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/docker/cli") (url "https://github.com/docker/cli")
(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 "1asapjj8brvbkd5irgdq82fx1ihrc14qaq30jxvjwflfm5yb7lv0")))) (base32 "0ksicj4iqvgp9jabd4xmhkf3vax6dwn4f5dsr73bdqj4mf3ahav0"))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
`(#:import-path "github.com/docker/cli" `(#:import-path "github.com/docker/cli"
@ -626,21 +623,20 @@ provisioning etc.")
;; Make build reproducible. ;; Make build reproducible.
(setenv "BUILDTIME" "1970-01-01 00:00:01.000000000+00:00") (setenv "BUILDTIME" "1970-01-01 00:00:01.000000000+00:00")
(symlink "src/github.com/docker/cli/scripts" "./scripts") (symlink "src/github.com/docker/cli/scripts" "./scripts")
(symlink "src/github.com/docker/cli/docker.Makefile" "./docker.Makefile") (symlink "src/github.com/docker/cli/docker.Makefile" "./docker.Makefile")))
#t))
(replace 'build (replace 'build
(lambda _ (lambda _
(invoke "./scripts/build/dynbinary"))) (setenv "GO_LINKMODE" "dynamic")
(invoke "./scripts/build/binary")))
(replace 'check (replace 'check
(lambda* (#:key make-flags tests? #:allow-other-keys) (lambda* (#:key make-flags tests? #:allow-other-keys)
(setenv "PATH" (string-append (getcwd) "/build:" (getenv "PATH"))) (setenv "PATH" (string-append (getcwd) "/build:" (getenv "PATH")))
(if tests? (when tests?
;; Use the newly-built docker client for the tests. ;; Use the newly-built docker client for the tests.
(with-directory-excursion "src/github.com/docker/cli" (with-directory-excursion "src/github.com/docker/cli"
;; TODO: Run test-e2e as well? ;; TODO: Run test-e2e as well?
(apply invoke "make" "-f" "docker.Makefile" "test-unit" (apply invoke "make" "-f" "docker.Makefile" "test-unit"
(or make-flags '()))) (or make-flags '()))))))
#t)))
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
@ -653,8 +649,7 @@ provisioning etc.")
(string-append etc "/fish/completions")) (string-append etc "/fish/completions"))
(install-file "zsh/_docker" (install-file "zsh/_docker"
(string-append etc "/zsh/site-functions"))) (string-append etc "/zsh/site-functions")))
(install-file "build/docker" out-bin) (install-file "build/docker" out-bin)))))))
#t))))))
(native-inputs (native-inputs
(list go libltdl pkg-config)) (list go libltdl pkg-config))
(synopsis "Command line interface to Docker") (synopsis "Command line interface to Docker")

2
gnu/packages/electronics.scm
View file

@ -112,7 +112,7 @@ to take care of the OS-specific details when writing software that uses serial p
"/share/doc/libsigrokdecode")) "/share/doc/libsigrokdecode"))
#t))))) #t)))))
(native-inputs (native-inputs
(list check-0.14 doxygen graphviz pkg-config automake autoconf)) (list check doxygen graphviz pkg-config automake autoconf))
;; libsigrokdecode.pc lists "python" in Requires.private, and "glib" in Requires. ;; libsigrokdecode.pc lists "python" in Requires.private, and "glib" in Requires.
(propagated-inputs (propagated-inputs
(list glib python)) (list glib python))

1177
gnu/packages/emacs-xyz.scm
View file

File diff suppressed because it is too large Load diff

2
gnu/packages/embedded.scm
View file

@ -659,7 +659,7 @@ with a layered architecture of JTAG interface and TAP support.")
(sha256 (sha256
(base32 (base32
"0w0dff3s7wv2d9m78a4jhckiik58q38wx6wpbba5hzbs4yxz35ck")) "0w0dff3s7wv2d9m78a4jhckiik58q38wx6wpbba5hzbs4yxz35ck"))
(patch-flags (list "-p1" "--directory=binutils")))) (patches '())))
(arguments (arguments
`(;; FIXME: For some reason there are many test failures. It's not `(;; FIXME: For some reason there are many test failures. It's not
;; obvious how to fix the failures. ;; obvious how to fix the failures.

8
gnu/packages/emulators.scm
View file

@ -773,7 +773,7 @@ and Game Boy Color games.")
(define-public sameboy (define-public sameboy
(package (package
(name "sameboy") (name "sameboy")
(version "0.14.7") (version "0.15")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -782,7 +782,7 @@ and Game Boy Color games.")
(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 "1r391jdh0gjnx8bwmr63dcdmq58lpm162mng2ncrx53ydbb13xxf")))) (base32 "0rhl9khc5pxbikjsq4aha5cpqfxf3bnxalc94idd4haw0zf892q9"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
(list rgbds pkg-config)) (list rgbds pkg-config))
@ -1712,7 +1712,7 @@ This is a part of the TiLP project.")
(define-public mame (define-public mame
(package (package
(name "mame") (name "mame")
(version "0.241") (version "0.245")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -1721,7 +1721,7 @@ This is a part of the TiLP project.")
(commit (apply string-append "mame" (string-split version #\.))))) (commit (apply string-append "mame" (string-split version #\.)))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "13bm81qyzvpllzmrak5nb87cdyyvsv4hcnznnrz4jyx1bd8ky6ap")) (base32 "1w34hcvnibnz0xaydh2kdciffng07zins9lnrv041fmzlk4318qb"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Remove bundled libraries. ;; Remove bundled libraries.

95
gnu/packages/engineering.scm
View file

@ -34,6 +34,7 @@
;;; Copyright © 2022 Konstantinos Agiannis <agiannis.kon@gmail.com> ;;; Copyright © 2022 Konstantinos Agiannis <agiannis.kon@gmail.com>
;;; Copyright © 2022 Greg Hogan <code@greghogan.com> ;;; Copyright © 2022 Greg Hogan <code@greghogan.com>
;;; Copyright © 2022 Artyom V. Poptsov <poptsov.artyom@gmail.com> ;;; Copyright © 2022 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -1864,12 +1865,20 @@ an embedded event driven algorithm.")
(name "trilinos-serial-xyce") (name "trilinos-serial-xyce")
(version "12.12.1") (version "12.12.1")
(source (source
(origin (method url-fetch) (origin
(uri (string-append "https://trilinos.org/oldsite/download/files/trilinos-" (method git-fetch)
version "-Source.tar.gz")) (uri (git-reference
(sha256 (url "https://github.com/trilinos/Trilinos")
(base32 (commit (string-append "trilinos-release-"
"1zgrcksrcbmyy79mbdv0j4j4sh0chpigxk8vcrrwgaxyxwxxhrvw")))) (string-map (lambda (chr)
(case chr
((#\.) #\-)
(else chr)))
version)))))
(file-name (git-file-name name version))
(sha256
(base32
"1smz3wlpfyjn0czmpl8bj4hw33p1zi9nnfygpsx7jl1523nypa1n"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:out-of-source? #t `(#:out-of-source? #t
@ -1881,8 +1890,7 @@ an embedded event driven algorithm.")
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(delete-file-recursively (delete-file-recursively
(string-append (assoc-ref outputs "out") (string-append (assoc-ref outputs "out")
"/lib/cmake/tribits")) "/lib/cmake/tribits")))))
#t)))
#:configure-flags #:configure-flags
(list "-DCMAKE_CXX_FLAGS=-O3 -fPIC" (list "-DCMAKE_CXX_FLAGS=-O3 -fPIC"
"-DCMAKE_C_FLAGS=-O3 -fPIC" "-DCMAKE_C_FLAGS=-O3 -fPIC"
@ -1910,13 +1918,8 @@ an embedded event driven algorithm.")
"-DTPL_ENABLE_UMFPACK=ON" "-DTPL_ENABLE_UMFPACK=ON"
"-DTPL_ENABLE_BLAS=ON" "-DTPL_ENABLE_BLAS=ON"
"-DTPL_ENABLE_LAPACK=ON"))) "-DTPL_ENABLE_LAPACK=ON")))
(native-inputs (native-inputs (list gfortran swig))
`(("fortran" ,gfortran) (inputs (list boost lapack suitesparse))
("swig" ,swig)))
(inputs
`(("boost" ,boost)
("lapack" ,lapack)
("suitesparse" ,suitesparse)))
(home-page "https://trilinos.org") (home-page "https://trilinos.org")
(synopsis "Engineering and scientific problems algorithms") (synopsis "Engineering and scientific problems algorithms")
(description (description
@ -3688,3 +3691,65 @@ hierarchical and parametric design. It can generate VHDL, Verilog or Spice
netlists from the drawn schematic, allowing the simulation of the circuit.") netlists from the drawn schematic, allowing the simulation of the circuit.")
(home-page "https://xschem.sourceforge.io/stefan/index.html") (home-page "https://xschem.sourceforge.io/stefan/index.html")
(license license:gpl2+)))) (license license:gpl2+))))
(define-public candle
;; The latest tagged version 1.2b fails on the build stage due to
;; non-supported g++ flags so we need to use the latest commit from the
;; 'master' branch in the repository.
(let ((commit "3f763bcde1195e23ba119a5b3c70d7c889881019")
(revision "1"))
(package
(name "candle")
(version (git-version "1.2b" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Denvi/Candle")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"08rqhl6a5a8s67a8yl16944zgcsnnb08xfv4klzyqwlvaqgfp783"))))
(build-system gnu-build-system)
(native-inputs (list qttools))
(inputs (list qtbase-5 qtserialport))
(arguments
(list #:tests? #f ; no tests.
#:phases #~(modify-phases %standard-phases
(add-after 'unpack 'fix-sources
(lambda _
(substitute* (find-files "." ".*\\.h")
(("const char\\* what\\(\\) const override")
"const char* what() const noexcept override"))))
(add-after 'unpack 'fix-application-settings-path
(lambda _
(substitute* "src/frmmain.cpp"
(("\
qApp->applicationDirPath\\(\\) \\+ \"\\/settings\\.ini\"")
"QDir::homePath() + \"/.config/candle.ini\""))))
(replace 'configure
(lambda _
(chdir "src")
(invoke "qmake"
(string-append "QMAKE_CC="
#$(cc-for-target)))))
(replace 'install
(lambda _
(install-file "Candle"
(string-append #$output "/bin")))))))
(home-page "https://github.com/Denvi/Candle")
(synopsis "GRBL controller with G-Code visualizer")
(description
"Candle is a GRBL controller application with a visualizer for G-Code,
the @acronym{CNC, computer numerical control} programming language.
Supported functions include:
@itemize
@item Controlling GRBL-based cnc-machine via console commands, buttons on
form, numpad.
@item Monitoring CNC-machine state.
@item Loading, editing, saving and sending of G-code files to CNC-machine.
@item Visualizing G-code files.
@end itemize")
(license license:gpl3+))))

2
gnu/packages/enlightenment.scm
View file

@ -465,7 +465,7 @@ Libraries stack (eo, evas, ecore, edje, emotion, ethumb and elementary).")
(lambda _ (setenv "HOME" "/tmp") #t))) (lambda _ (setenv "HOME" "/tmp") #t)))
#:tests? #f)) ; tests require running dbus service #:tests? #f)) ; tests require running dbus service
(native-inputs (native-inputs
`(("check" ,check-0.14) `(("check" ,check)
("gettext" ,gettext-minimal) ("gettext" ,gettext-minimal)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(inputs (inputs

30
gnu/packages/file-systems.scm
View file

@ -3,7 +3,7 @@
;;; Copyright © 2017 Gábor Boskovits <boskovits@gmail.com> ;;; Copyright © 2017 Gábor Boskovits <boskovits@gmail.com>
;;; Copyright © 2017, 2018, 2021 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017, 2018, 2021 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018 Leo Famulari <leo@famulari.name> ;;; Copyright © 2018 Leo Famulari <leo@famulari.name>
;;; Copyright © 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2019-2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org> ;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
;;; Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com> ;;; Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com>
;;; Copyright © 2021 raid5atemyhomework <raid5atemyhomework@protonmail.com> ;;; Copyright © 2021 raid5atemyhomework <raid5atemyhomework@protonmail.com>
@ -428,7 +428,9 @@ from a mounted file system.")
"INITRAMFS_DIR=$(PREFIX)/share/initramfs-tools" "INITRAMFS_DIR=$(PREFIX)/share/initramfs-tools"
(string-append "CC=" #$(cc-for-target)) (string-append "CC=" #$(cc-for-target))
(string-append "PKG_CONFIG=" #$(pkg-config-for-target)) (string-append "PKG_CONFIG=" #$(pkg-config-for-target))
"PYTEST=pytest") (string-append "PYTEST_CMD="
#$(this-package-native-input "python-pytest")
"/bin/pytest"))
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(delete 'configure) ; no configure script (delete 'configure) ; no configure script
@ -444,16 +446,18 @@ from a mounted file system.")
,(list (string-append #$output "/sbin") ,(list (string-append #$output "/sbin")
(string-append #$coreutils-minimal "/bin") (string-append #$coreutils-minimal "/bin")
(string-append #$gawk "/bin") (string-append #$gawk "/bin")
(string-append #$util-linux "/bin")))))))) (string-append #$util-linux "/bin"))))))))))
#:tests? #f)) ; XXX 6 valgrind tests fail
(native-inputs (native-inputs
(list pkg-config (append
;; For tests. (list pkg-config
python-pytest ;; For tests.
valgrind python-pytest)
;; For generating documentation with rst2man. (if (member (%current-system) (package-supported-systems valgrind))
python (list valgrind)
python-docutils)) '())
;; For generating documentation with rst2man.
(list python
python-docutils)))
(inputs (inputs
(list eudev (list eudev
keyutils keyutils
@ -1146,7 +1150,7 @@ with the included @command{xfstests-check} helper.")
(define-public zfs (define-public zfs
(package (package
(name "zfs") (name "zfs")
(version "2.1.4") (version "2.1.5")
(outputs '("out" "module" "src")) (outputs '("out" "module" "src"))
(source (source
(origin (origin
@ -1155,7 +1159,7 @@ with the included @command{xfstests-check} helper.")
"/download/zfs-" version "/download/zfs-" version
"/zfs-" version ".tar.gz")) "/zfs-" version ".tar.gz"))
(sha256 (sha256
(base32 "1xmcy4f0damf1pkb1sy1339ir1jkky0dwzd8vhwgc1pqjgac0liv")))) (base32 "0371j5k28cymqngfl76dfxzggvdf8n0ssij37350gzs4bhg084qr"))))
(build-system linux-module-build-system) (build-system linux-module-build-system)
(arguments (arguments
(list (list

4
gnu/packages/firmware.scm
View file

@ -225,7 +225,7 @@ broadband modem as found, for example, on PinePhone.")
(define* (make-opensbi-package platform name #:optional (arch "riscv64")) (define* (make-opensbi-package platform name #:optional (arch "riscv64"))
(package (package
(name name) (name name)
(version "1.0") (version "1.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -234,7 +234,7 @@ broadband modem as found, for example, on PinePhone.")
(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 "0srqkhd9b1mq4qkqk31dlrzy4mhljr49bzjxm0saylsbwhgxq31s")))) (base32 "0xlnhl965286kvizyjm571qbhj3l5n71a02dmbmgxzcqapzgi9wk"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(,@(if (and (not (string-prefix? "riscv64" (%current-system))) `(,@(if (and (not (string-prefix? "riscv64" (%current-system)))

75
gnu/packages/fonts.scm
View file

@ -49,6 +49,7 @@
;;; Copyright © 2022 Jai Vetrivelan <jaivetrivelan@gmail.com> ;;; Copyright © 2022 Jai Vetrivelan <jaivetrivelan@gmail.com>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Liliana Marie Prikler <liliana.prikler@gmail.com> ;;; Copyright © 2021 Liliana Marie Prikler <liliana.prikler@gmail.com>
;;; Copyright © 2022 Jose G Perez Taveras <josegpt27@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -91,6 +92,26 @@
#:use-module (gnu packages python-xyz) #:use-module (gnu packages python-xyz)
#:use-module (gnu packages xorg)) #:use-module (gnu packages xorg))
(define-public font-artifika
(package
(name "font-artifika")
(version "1.102")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/cyrealtype/Artifika")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0nwjm44nys1qz3wyg0mm15gdjpz641xpmsz00n6m8065xrw86q7i"))))
(build-system font-build-system)
(home-page "https://github.com/cyrealtype/Artifika")
(synopsis "Upright italic font")
(description "Artifika is an upright italic font for fashionable display
titling.")
(license license:silofl1.1)))
(define-public font-ibm-plex (define-public font-ibm-plex
(package (package
(name "font-ibm-plex") (name "font-ibm-plex")
@ -212,43 +233,31 @@ Cyrillic, Canadian Syllabics and most Latin based languages are supported.")
(version "0.303") (version "0.303")
(source (source
(origin (origin
(method url-fetch/zipbomb) (method git-fetch)
(uri (string-append "https://gitlab.gnome.org/GNOME/cantarell-fonts/-/" (uri (git-reference
"jobs/1515399/artifacts/download")) (url "https://gitlab.gnome.org/GNOME/cantarell-fonts")
(file-name (string-append name "-" version "-static")) (commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 "1dz551xrrhx6l40j57ksk2alllrihghg4947z1r88dpcq3snpn1s")))) (base32
(build-system font-build-system) "1d1ay0fdqchk0wa5yqxis2c98imvzsbbd2kjv0x8sk4fm419847b"))))
(build-system meson-build-system)
(arguments (arguments
`(#:phases (list #:configure-flags #~(list "-Dbuildstatics=true")))
(modify-phases %standard-phases
(add-after 'unpack 'unpack-source
;; The actual OTF fonts are prebuilt (building them requires at least
;; the currently unpackaged psautohint and its numerous dependencies;
;; TODO), but unpack the source so that COPYING is installed later.
(lambda* (#:key outputs #:allow-other-keys)
(invoke "tar" "--strip-components=1" "-xvf"
(string-append "build/meson-dist/cantarell-fonts-"
,version ".tar.xz"))))
(add-after 'unpack 'unpack-variable-font
(lambda* (#:key inputs #:allow-other-keys)
(let ((variable-font (assoc-ref inputs "variable-font")))
(copy-recursively (string-append variable-font "/prebuilt")
".")))))))
(native-inputs (native-inputs
`(("variable-font" (list gettext-minimal
,(origin psautohint
(method url-fetch/zipbomb) python
(uri (string-append "https://gitlab.gnome.org/GNOME/cantarell-fonts/-/" python-cffsubr
"jobs/1515398/artifacts/download")) python-fontmath
(file-name (string-append name "-" version "-variable")) python-statmake
(sha256 python-ufo2ft))
(base32 "0z93pbkxidsx3y98rsl2jm2qpvxv5pj0w870xhnsciglw6pc9a9i"))))
("unzip" ,unzip)))
(home-page "https://wiki.gnome.org/Projects/CantarellFonts") (home-page "https://wiki.gnome.org/Projects/CantarellFonts")
(synopsis "Cantarell sans-serif typeface") (synopsis "Cantarell sans-serif typeface")
(description "The Cantarell font family is a contemporary Humanist (description "The Cantarell font family is a contemporary Humanist
sans-serif designed for on-screen reading. It is used by GNOME@tie{}3.") sans-serif designed for on-screen reading. It is used by GNOME@tie{}3.
This package contains both the non-variable as well as the variable versions
of the font.")
(license license:silofl1.1))) (license license:silofl1.1)))
(define-public font-lato (define-public font-lato
@ -2194,14 +2203,14 @@ always uses Farsi digits, and does not include Latin glyphs from Roboto.
(define-public font-victor-mono (define-public font-victor-mono
(package (package
(name "font-victor-mono") (name "font-victor-mono")
(version "1.4.2") (version "1.5.3")
(source (origin (source (origin
(method url-fetch/zipbomb) (method url-fetch/zipbomb)
(uri (string-append (uri (string-append
"https://github.com/rubjo/victor-mono/raw/v" "https://github.com/rubjo/victor-mono/raw/v"
version version
"/public/VictorMonoAll.zip")) "/public/VictorMonoAll.zip"))
(sha256 "01260vja0d22mcvkzspf0xnl7b851r0265arqkm12q1vagzyxvkm"))) (sha256 "1axiwxz8l46cc60jfp2la8a9qpj866236lz3dc5l6m35r9as56l3")))
(build-system font-build-system) (build-system font-build-system)
(synopsis "Font with support for italics and ligatures") (synopsis "Font with support for italics and ligatures")
(description "Victor Mono is an open-source monospaced font with (description "Victor Mono is an open-source monospaced font with

73
gnu/packages/fontutils.scm
View file

@ -1396,6 +1396,79 @@ generate bitmaps.")
`(("python" ,python-2) `(("python" ,python-2)
,@(alist-delete "python" (package-inputs fontforge)))))) ,@(alist-delete "python" (package-inputs fontforge))))))
(define-public python-statmake
(package
(name "python-statmake")
(version "0.5.1")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/daltonmaag/statmake")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0qavzspxhwnaayj5mxq6ncjjziggabxj157ls04h2rdrpq167706"))))
(build-system python-build-system)
(arguments
(list
#:phases
#~(modify-phases %standard-phases
;; XXX: PEP 517 manual build copied from python-isort.
(add-after 'unpack 'adjust-for-older-attrs
;; Our older attrs package is using the 'attr' rather than 'attrs'
;; namespace.
;; TODO: Remove after python-attrs is updated to >= 21.4.0.
(lambda _
(substitute* "pyproject.toml"
(("attrs = \">=21.3\"")
"attrs = \">=21.2\""))
(substitute* (find-files "." "\\.py$")
(("from attrs\\b")
"from attr")
(("import attrs")
"import attr")
(("@attrs")
"@attr")
(("\\battrs\\.")
"attr."))))
(replace 'build
(lambda _
(invoke "python" "-m" "build" "--wheel" "--no-isolation" ".")))
(replace 'install
(lambda _
(let ((whl (car (find-files "dist" "\\.whl$"))))
(invoke "pip" "--no-cache-dir" "--no-input"
"install" "--no-deps" "--prefix" #$output whl))))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "pytest" "-vv" "tests"
;;"-n" (number->string (parallel-job-count))
;; This test requires orjson, which needs the maturin
;; build system and new Rust dependencies.
;;"--ignore" "tests/test_preconf.py"
)))))))
(native-inputs
(list python-poetry-core
python-pypa-build
python-pytest
python-ufo2ft))
(propagated-inputs
(list python-attrs
python-cattrs
python-fonttools))
(home-page "https://github.com/daltonmaag/statmake")
(synopsis "Apply OpenType STAT information to a variable font")
(description
"@command{statmake} takes a user-written Stylespace that defines
@url{https://docs.microsoft.com/en-us/typography/opentype/spec/stat, OpenType
STAT information} for an entire font family and then (potentially subsets and)
applies it to a specific variable font. This spares users from having to deal
with @url{https://github.com/fonttools/fonttools/, raw TTX dumps} and juggling
with @samp{nameIDs}.")
(license license:expat)))
(define-public python-ufolib2 (define-public python-ufolib2
(package (package
(name "python-ufolib2") (name "python-ufolib2")

8
gnu/packages/ftp.scm
View file

@ -177,14 +177,14 @@ as required.")
(define-public libfilezilla (define-public libfilezilla
(package (package
(name "libfilezilla") (name "libfilezilla")
(version "0.36.0") (version "0.37.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.filezilla-project.org/" (uri (string-append "https://download.filezilla-project.org/"
"libfilezilla/libfilezilla-" version ".tar.bz2")) "libfilezilla/libfilezilla-" version ".tar.bz2"))
(sha256 (sha256
(base32 "0wm8acwbrsblilfwj5asxr26gy8grg175j91df1bryz7xlc1q9y0")))) (base32 "1mg2zqmpkkcimx6kq3a1ab26v515zzxw2s8rwhmajsv4cgp404g5"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -217,14 +217,14 @@ output.
(define-public filezilla (define-public filezilla
(package (package
(name "filezilla") (name "filezilla")
(version "3.58.0") (version "3.60.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.filezilla-project.org/client/" (uri (string-append "https://download.filezilla-project.org/client/"
"FileZilla_" version "_src.tar.bz2")) "FileZilla_" version "_src.tar.bz2"))
(sha256 (sha256
(base32 "122x72rvd178y2rffvidyvzr33kf325q2rk4l2x44xqzw1r7zznh")))) (base32 "1bv643abf8jai552j9fqcl4i54h1yrs5hgn6w0w1ibwccdinryc1"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
;; Don't let filezilla phone home to check for updates. ;; Don't let filezilla phone home to check for updates.

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

@ -1209,24 +1209,25 @@ to create fully featured games and multimedia programs in the python language.")
license:lgpl2.1+)))) license:lgpl2.1+))))
(define-public python-pygame-sdl2 (define-public python-pygame-sdl2
;; Using latest git commit as of 2022-06-17, because there is no tagged
;; release for renpy 8.
;; Revert back to URLs once renpy 8 is released!
(let ((real-version "2.1.0") (let ((real-version "2.1.0")
;;(renpy-version "8.0.0") (renpy-version "8.0.0"))
(commit "1705c6e3004dcb1daf859560bcd52eb093e97d45"))
(package (package
(inherit python-pygame) (inherit python-pygame)
(name "python-pygame-sdl2") (name "python-pygame-sdl2")
(version (git-version real-version "0" commit)) (version (string-append real-version "-for-renpy-" renpy-version))
(source (source
(origin (origin
(method git-fetch) (method url-fetch)
(uri (git-reference (uri (string-append "https://www.renpy.org/dl/" renpy-version
(url "https://github.com/renpy/pygame_sdl2") "/pygame_sdl2-" version ".tar.gz"))
(commit commit))) (sha256 (base32 "0majf64pdfba5byjlv41pgsdmwvy09hw3m7143jz3kc1wjd2gaw8"))
(file-name (git-file-name name version)) (modules '((guix build utils)))
(sha256 (base32 "1g0arhpd59zypspk36sgajf1kzavppfkv766vifvxar60968rrjn")))) (snippet
'(begin
;; drop generated sources
(delete-file-recursively "gen")
(delete-file-recursively "gen3")
(delete-file-recursively "gen-static")))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:tests? #f ; tests require pygame to be installed first `(#:tests? #f ; tests require pygame to be installed first
@ -1257,21 +1258,16 @@ While it aims to be used as a drop-in replacement, it appears to be
developed mainly for Ren'py.") developed mainly for Ren'py.")
(license (list license:lgpl2.1 license:zlib))))) (license (list license:lgpl2.1 license:zlib)))))
;; Using nightly from 2022-06-16.
;; Revert back to URLs once renpy 8 is released!
(define %renpy-commit "3e854bc7cb1642ca18b061a0c6e349f168965c43")
(define-public python-renpy (define-public python-renpy
(package (package
(name "python-renpy") (name "python-renpy")
(version (git-version "7.99.99" "0" %renpy-commit)) (version "8.0.0")
(source (source
(origin (origin
(method git-fetch) (method url-fetch)
(uri (git-reference (uri (string-append "https://www.renpy.org/dl/" version
(url "https://github.com/renpy/renpy") "/renpy-" version "-source.tar.bz2"))
(commit %renpy-commit))) (sha256 (base32 "09z3r16j4cxddkb50ghmi4xp0s05s15q4pzdmfajy85ignwqhjdi"))
(file-name (git-file-name name version))
(sha256 (base32 "11g7hqhw4gbkx5ib2wsawrznmjbn8r9zkgf2sg39z56h96y8wfbn"))
(modules '((guix build utils))) (modules '((guix build utils)))
(patches (patches
(search-patches (search-patches
@ -1280,7 +1276,10 @@ developed mainly for Ren'py.")
'(with-directory-excursion "module" '(with-directory-excursion "module"
;; drop fribidi sources ;; drop fribidi sources
(delete-file-recursively "fribidi-src") (delete-file-recursively "fribidi-src")
#t)))) ;; drop _renpytfd, as there are missing sources
(substitute* "setup.py"
(("cython\\(\"_renpytfd\"" all)
(string-append "pass # " all)))))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:tests? #f ; Ren'py doesn't seem to package tests `(#:tests? #f ; Ren'py doesn't seem to package tests
@ -1432,6 +1431,8 @@ are only used to bootstrap it.")
(string-append out "/share/renpy/common")) (string-append out "/share/renpy/common"))
(copy-recursively "gui" (copy-recursively "gui"
(string-append out "/share/renpy/gui")) (string-append out "/share/renpy/gui"))
(copy-recursively "sdk-fonts"
(string-append out "/share/renpy/sdk-fonts"))
(mkdir-p (string-append out "/bin")) (mkdir-p (string-append out "/bin"))
(copy-file #$(local-file (search-auxiliary-file "renpy/renpy.in")) (copy-file #$(local-file (search-auxiliary-file "renpy/renpy.in"))

104
gnu/packages/games.scm
View file

@ -72,6 +72,7 @@
;;; Copyright © 2022 Roman Riabenko <roman@riabenko.com> ;;; Copyright © 2022 Roman Riabenko <roman@riabenko.com>
;;; Copyright © 2022 zamfofex <zamfofex@twdb.moe> ;;; Copyright © 2022 zamfofex <zamfofex@twdb.moe>
;;; Copyright © 2022 Gabriel Arazas <foo.dogsquared@gmail.com> ;;; Copyright © 2022 Gabriel Arazas <foo.dogsquared@gmail.com>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -1009,7 +1010,7 @@ allows users to brew while offline.")
(define-public corsix-th (define-public corsix-th
(package (package
(name "corsix-th") (name "corsix-th")
(version "0.65.1") (version "0.66")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -1018,7 +1019,7 @@ allows users to brew while offline.")
(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 "0hw92ln9jm9v55drmbfqjng58yshgwfpv7fqynryrg3gvg8zhbvh")))) (base32 "0sgsvhqgiq6v1v5am7ghja8blhlrj0y1arvq6xq1j5fwa7c59ihs"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -8033,14 +8034,17 @@ ncurses for text display.")
(define-public naev (define-public naev
(package (package
(name "naev") (name "naev")
(version "0.9.2") (version "0.9.3")
(source (source
(origin (origin
(method url-fetch) (method git-fetch)
(uri (string-append "https://github.com/naev/naev/releases/download/v" (uri (git-reference
version "/naev-" version "-source.tar.xz")) (url "https://github.com/naev/naev")
(commit (string-append "v" version))
(recursive? #t))) ; for game data
(file-name (git-file-name name version))
(sha256 (sha256
(base32 "1p6424n2rgrlb0h71gvww40vxs1h583d9im8bzgmv6dhgclbg0nl")))) (base32 "0hvgxzvph9s5gdzlj5kjnz2d2j7bi8s11k7i6540837mnppah18j"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
;; XXX: Do not add debugging symbols, which cause the build to fail. ;; XXX: Do not add debugging symbols, which cause the build to fail.
@ -8079,8 +8083,7 @@ of lore accompanying everything from planets to equipment.")
license:public-domain license:public-domain
license:expat ;edtaa3func.c license:expat ;edtaa3func.c
license:bsd-2 ;distance_field.c license:bsd-2 ;distance_field.c
license:bsd-3 ;perlin.c license:bsd-3)))) ;perlin.c
))))
(define-public frotz-dumb-terminal (define-public frotz-dumb-terminal
(package (package
@ -12246,53 +12249,48 @@ game.") ;thanks to Debian for description
(delete-file-recursively "src/third_party/websocketpp") (delete-file-recursively "src/third_party/websocketpp")
(substitute* "pokerth_lib.pro" (substitute* "pokerth_lib.pro"
(("src/third_party/websocketpp") (("src/third_party/websocketpp")
"")) ""))))
#t)))) (patches (search-patches "pokerth-boost.patch"))))
(build-system qt-build-system) (build-system qt-build-system)
(inputs (inputs
`(("boost" ,boost) (list boost
("curl" ,curl) curl
("gsasl" ,gsasl) gsasl
("libgcrypt" ,libgcrypt) libgcrypt
("libircclient" ,libircclient) libircclient
("protobuf" ,protobuf-2) ; remove package when no longer needed protobuf-2 ;remove package when no longer needed
("qtbase" ,qtbase-5) qtbase-5
("sdl" ,(sdl-union (list sdl sdl-mixer))) (sdl-union (list sdl sdl-mixer))
("sqlite" ,sqlite) sqlite
("tinyxml" ,tinyxml) tinyxml
("websocketpp" ,websocketpp) websocketpp
("zlib" ,zlib))) zlib))
(arguments (arguments
`(#:tests? #f ; No test suite (list
#:phases #:tests? #f ; No test suite
(modify-phases %standard-phases #:phases
(add-after 'unpack 'fix-paths #~(modify-phases %standard-phases
(lambda* (#:key inputs #:allow-other-keys) (add-after 'unpack 'fix-paths
(substitute* (find-files "." "\\.pro$") (lambda* (#:key inputs #:allow-other-keys)
(("/opt/gsasl") (substitute* (find-files "." "\\.pro$")
(assoc-ref inputs "gsasl")) (("LIB_DIRS =")
(("\\$\\$\\{PREFIX\\}/include/libircclient") (string-append "LIB_DIRS = "
(search-input-directory inputs "/include/libircclient")) #$(this-package-input "boost") "/lib")))))
(("LIB_DIRS =") (add-after 'unpack 'fix-build
(string-append "LIB_DIRS = " (lambda _
(assoc-ref inputs "boost") "/lib"))) ;; Fixes for Boost versions >= 1.66.
#t)) (substitute* '("src/net/common/clientthread.cpp"
(add-after 'unpack 'fix-build "src/net/serveraccepthelper.h")
(lambda _ (("boost::asio::socket_base::non_blocking_io command\\(true\\);")
;; Fixes for Boost versions >= 1.66. "")
(substitute* '("src/net/common/clientthread.cpp" (("newSock->io_control\\(command\\);")
"src/net/serveraccepthelper.h") "newSock->non_blocking(true);")
(("boost::asio::socket_base::non_blocking_io command\\(true\\);") (("acceptedSocket->io_control\\(command\\);")
"") "acceptedSocket->non_blocking(true);"))))
(("newSock->io_control\\(command\\);") (replace 'configure
"newSock->non_blocking(true);") (lambda _
(("acceptedSocket->io_control\\(command\\);") (invoke "qmake" "pokerth.pro" "CONFIG+=client"
"acceptedSocket->non_blocking(true);")) (string-append "PREFIX=" #$output)))))))
#t))
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys)
(invoke "qmake" "pokerth.pro" "CONFIG+=client"
(string-append "PREFIX=" (assoc-ref outputs "out"))))))))
(home-page "https://www.pokerth.net") (home-page "https://www.pokerth.net")
(synopsis "Texas holdem poker game") (synopsis "Texas holdem poker game")
(description (description

130
gnu/packages/gawk.scm
View file

@ -3,6 +3,7 @@
;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 Marius Bakke <marius@gnu.org> ;;; Copyright © 2021 Marius Bakke <marius@gnu.org>
;;; Copyright © 2022 Paul A. Patience <paul@apatience.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -20,12 +21,18 @@
;;; 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 gawk) (define-module (gnu packages gawk)
#:use-module (guix licenses) #:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages base)
#:use-module (gnu packages bash) #:use-module (gnu packages bash)
#:use-module (gnu packages gcc)
#:use-module (gnu packages libsigsegv) #:use-module (gnu packages libsigsegv)
#:use-module (gnu packages multiprecision)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix utils)
#:use-module (guix build-system copy)
#:use-module (guix build-system gnu)) #:use-module (guix build-system gnu))
(define-public gawk (define-public gawk
@ -93,7 +100,43 @@
language for the easy manipulation of formatted text, such as tables of data. language for the easy manipulation of formatted text, such as tables of data.
Gawk features many extensions beyond the traditional implementation, Gawk features many extensions beyond the traditional implementation,
including network access, sorting, and large libraries.") including network access, sorting, and large libraries.")
(license gpl3+))) (license license:gpl3+)))
;; Separate from gawk to facilitate bootstrapping.
(define-public gawk-mpfr
(package/inherit gawk
(name "gawk-mpfr")
(inputs
(modify-inputs (package-inputs gawk)
(prepend mpfr)))))
;; Suffixed with -next because, similarly to Emacs, development versions are
;; numbered x.y.60+z, and also there are no tagged versions of egawk yet.
;; (However, though egawk's --version lists 5.1.60, it is actually forked from
;; a development version of gawk 5.1.1.)
(define-public egawk-next
(let ((commit "f00e74ffc73f6ba6fe74fb7a26319770b8c3792c")
(revision "0"))
(package
(inherit gawk-mpfr)
(name "egawk-next")
(version (git-version "5.1.60" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://www.kylheku.com/git/egawk")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "0bmfbw6k1aiyiardnk7ha5zlpkvavj013mm4n7wwj2vdcgrs6p1f"))))
(home-page "https://www.kylheku.com/cgit/egawk/")
(synopsis "Enhanced GNU Awk")
(description
"@command{egawk} is Enhanced GNU Awk. It is a fork of GNU Awk with
some enhancements designed and implemented by Kaz Kylheku. In particular,
Enhanced GNU Awk provides the @code{@@let} statement for declaring
block-scoped lexical variables."))))
(define-public mawk (define-public mawk
(package (package
@ -120,4 +163,85 @@ including network access, sorting, and large libraries.")
"@command{mawk} is an interpreter for the Awk programming language. "@command{mawk} is an interpreter for the Awk programming language.
This version aims to be smaller and faster than GNU Awk, at the expense This version aims to be smaller and faster than GNU Awk, at the expense
of fewer features and extensions.") of fewer features and extensions.")
(license gpl2))) ;version 2 only (license license:gpl2))) ;version 2 only
(define-public cppawk
(package
(name "cppawk")
(version "20220703")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://www.kylheku.com/git/cppawk")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0b09757q81sz4gn62k3mv5bgllyb2v5m64346s8fc99mqqif70cx"))))
(build-system copy-build-system)
(arguments
`(#:install-plan '(("bin/cppawk" "bin/cppawk")
("share/cppawk/include" "share/cppawk/include")
("./" "share/man/man1" #:include-regexp (".*\\.1$")))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-paths
(lambda _
(substitute* "bin/cppawk"
(("/bin/bash") (which "bash"))
(("dirname") (which "dirname"))
(("mktemp") (which "mktemp"))
;; Extra space to prevent matching Awk's printf.
(("printf ") (string-append (which "printf") " "))
(("rm -f") (string-append (which "rm") " -f"))
(("prepro=cpp") (string-append "prepro=" (which "cpp")))
(("sed -e") (string-append (which "sed") " -e")))))
(add-after 'fix-paths 'fix-awk-paths
(lambda _
(substitute* "bin/cppawk"
(("awk=gawk") (string-append "awk=" (which "gawk")))
(("awk '") (string-append (which "gawk") " '")))))
(add-after 'build 'check
(lambda _
(invoke "./runtests"))))))
(native-inputs
;; For tests
(list mawk))
(inputs
(list coreutils ; For dirname, mktemp, printf, rm
gawk-mpfr ; Default variant, but supports others
gcc ; For cpp
sed))
(home-page "https://www.kylheku.com/cgit/cppawk/")
(synopsis "Wrapper script that adds C preprocessing to Awk")
(description
"@command{cppawk} is a shell script that invokes the C preprocessor
(@command{cpp}) on Awk code and calls Awk (by default GNU Awk) on the result.
@command{cppawk} understands the basic Awk options like @option{-F} and
@option{-v}, and also understands common @command{cpp} options like
@option{-I} and @option{-Dmacro=value}.
@command{cppawk} has no dependencies beyond Awk, @command{cpp}, @command{sed}
and some GNU core utilities (including @command{printf}). Preprocessed
programs can be captured and transferred to systems that have Awk but not
@command{cpp} or @command{cppawk}.")
(license license:bsd-2)))
(define-public cppawk-egawk
(package/inherit cppawk
(name "cppawk-egawk")
(arguments
(substitute-keyword-arguments (package-arguments cppawk)
((#:phases phases)
`(modify-phases ,phases
(replace 'fix-awk-paths
(lambda _
(substitute* "bin/cppawk"
(("awk=gawk") (string-append "awk=" (which "egawk")))
(("awk '") (string-append (which "egawk") " '")))))))))
(inputs
(modify-inputs (package-inputs cppawk)
(delete "gawk-mpfr")
(prepend egawk-next)))
(synopsis "cppawk that calls Enhanced GNU Awk by default")))

16
gnu/packages/gcc.scm
View file

@ -1101,6 +1101,14 @@ provides the GNU compiler for the Go programming language."))
(custom-gcc gcc-10 "gcc-objc" '("objc") (custom-gcc gcc-10 "gcc-objc" '("objc")
%objc-search-paths)) %objc-search-paths))
(define-public gcc-objc-11
(custom-gcc gcc-11 "gcc-objc" '("objc")
%objc-search-paths))
(define-public gcc-objc-12
(custom-gcc gcc-12 "gcc-objc" '("objc")
%objc-search-paths))
(define-public gcc-objc gcc-objc-10) (define-public gcc-objc gcc-objc-10)
(define %objc++-search-paths (define %objc++-search-paths
@ -1143,6 +1151,14 @@ provides the GNU compiler for the Go programming language."))
(custom-gcc gcc-10 "gcc-objc++" '("obj-c++") (custom-gcc gcc-10 "gcc-objc++" '("obj-c++")
%objc++-search-paths)) %objc++-search-paths))
(define-public gcc-objc++-11
(custom-gcc gcc-11 "gcc-objc++" '("obj-c++")
%objc++-search-paths))
(define-public gcc-objc++-12
(custom-gcc gcc-12 "gcc-objc++" '("obj-c++")
%objc++-search-paths))
(define-public gcc-objc++ gcc-objc++-10) (define-public gcc-objc++ gcc-objc++-10)
(define (make-libstdc++-doc gcc) (define (make-libstdc++-doc gcc)

82
gnu/packages/geo.scm
View file

@ -18,6 +18,7 @@
;;; Copyright © 2021 Vinicius Monego <monego@posteo.net> ;;; Copyright © 2021 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2021 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2021 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2021 Nikolay Korotkiy <sikmir@disroot.org> ;;; Copyright © 2021 Nikolay Korotkiy <sikmir@disroot.org>
;;; Copyright © 2022 Roman Scherer <roman.scherer@burningswell.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -45,6 +46,7 @@
#:use-module (guix build-system qt) #:use-module (guix build-system qt)
#:use-module (guix build-system scons) #:use-module (guix build-system scons)
#:use-module (guix build-system r) #:use-module (guix build-system r)
#: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 svn-download) #:use-module (guix svn-download)
@ -113,12 +115,42 @@
#:use-module (gnu packages sqlite) #:use-module (gnu packages sqlite)
#:use-module (gnu packages textutils) #:use-module (gnu packages textutils)
#:use-module (gnu packages time) #:use-module (gnu packages time)
#:use-module (gnu packages tls)
#:use-module (gnu packages web) #:use-module (gnu packages web)
#:use-module (gnu packages webkit) #:use-module (gnu packages webkit)
#:use-module (gnu packages wxwidgets) #:use-module (gnu packages wxwidgets)
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module (gnu packages xorg)) #:use-module (gnu packages xorg))
(define-public cdo
(package
(name "cdo")
(version "2.0.5")
(source (origin
(method url-fetch)
(uri (string-append
"https://code.mpimet.mpg.de/attachments/download/26823/cdo-"
version ".tar.gz"))
(sha256
(base32
"1khdbd5cmnn7qm6hcqg4md5wbq14fs6brrns8b3g18diqgqvpvpd"))))
(build-system gnu-build-system)
(arguments
(list #:configure-flags
#~(list (string-append "--with-netcdf="
#$(this-package-input "netcdf")))))
(inputs
(list netcdf))
(native-inputs
(list pkg-config))
(home-page "https://code.mpimet.mpg.de/projects/cdo")
(synopsis "Climate data operators")
(description "@acronym{CDO, Climate Data Operators} is a collection of command-line
operators to manipulate and analyse climate and NWP model data. Supported
data formats are GRIB 1/2, netCDF 3/4, SERVICE, EXTRA and IEG. There are more
than 600 operators available.")
(license license:bsd-3)))
(define-public memphis (define-public memphis
(package (package
(name "memphis") (name "memphis")
@ -807,7 +839,7 @@ street bearings/orientations, and speed/travel time.")
(define-public mapnik (define-public mapnik
(package (package
(name "mapnik") (name "mapnik")
(version "3.0.18") (version "3.1.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -815,7 +847,7 @@ street bearings/orientations, and speed/travel time.")
version "/mapnik-v" version ".tar.bz2")) version "/mapnik-v" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"06frcikaj2mgz3abfk5h0z4j3hbksi0zikwjngbjv4p5f3pwxf8q")))) "0qb2irykja5qhr9apz9r230pcxap9v3j85fi98mj2xd9sa163ms3"))))
(build-system scons-build-system) (build-system scons-build-system)
(inputs (inputs
(list boost (list boost
@ -832,10 +864,9 @@ street bearings/orientations, and speed/travel time.")
sqlite sqlite
zlib)) zlib))
(native-inputs (native-inputs
(list pkg-config)) (list pkg-config postgresql))
(arguments (arguments
`(#:scons ,scons-python2 `(#:scons-flags
#:scons-flags
(list "CC=gcc" (list "CC=gcc"
(string-append "PREFIX=" %output) (string-append "PREFIX=" %output)
(string-append "CUSTOM_LDFLAGS=-Wl,-rpath=" %output "/lib")))) (string-append "CUSTOM_LDFLAGS=-Wl,-rpath=" %output "/lib"))))
@ -914,7 +945,7 @@ development.")
(define-public gdal (define-public gdal
(package (package
(name "gdal") (name "gdal")
(version "3.3.3") (version "3.5.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -922,7 +953,7 @@ development.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0nk09lws1hk873yn5f4wzqfvr82gm4hw3gq8w9g1h0kvf6j5x4i8")) "0h7dgjx8nk3dd17wwqm2yjnaqciyrd2mz9gcjswpcnmap09wbzrs"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
`(begin `(begin
@ -937,36 +968,15 @@ development.")
"frmts/gtiff/libgeotiff" "frmts/gtiff/libgeotiff"
"frmts/zlib" "frmts/zlib"
"ogr/ogrsf_frmts/geojson/libjson")))))) "ogr/ogrsf_frmts/geojson/libjson"))))))
(build-system gnu-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f `(#:tests? #f
#:configure-flags #:configure-flags
(let-syntax ((with (syntax-rules () (list "-DGDAL_USE_INTERNAL_LIBS=WHEN_NO_EXTERNAL"
((_ option input) "-DGDAL_USE_JPEG12_INTERNAL=OFF")))
(string-append option "="
(assoc-ref %build-inputs input))))))
(list
;; TODO: --with-pcidsk, --with-pcraster
(with "--with-freexl" "freexl")
(with "--with-libjson-c" "json-c")
(with "--with-png" "libpng")
(with "--with-webp" "libwebp")
(with "--with-gif" "giflib")
(with "--with-jpeg" "libjpeg-turbo")
(with "--with-libtiff" "libtiff")
(with "--with-geotiff" "libgeotiff")
(with "--with-libz" "zlib")
(with "--with-expat" "expat")
(with "--with-sqlite3" "sqlite")
"--with-pcre"))
#:phases
(modify-phases %standard-phases
(add-before 'build 'fix-path
(lambda _
(substitute* "frmts/mrf/mrf_band.cpp"
(("\"../zlib/zlib.h\"") "<zlib.h>")))))))
(inputs (inputs
(list expat (list curl
expat
freexl freexl
geos geos
giflib giflib
@ -977,9 +987,11 @@ development.")
libtiff libtiff
libwebp libwebp
netcdf netcdf
pcre openssl
pcre2
postgresql ; libpq postgresql ; libpq
proj proj
qhull
sqlite sqlite
zlib)) zlib))
(native-inputs (native-inputs
@ -1147,6 +1159,7 @@ Shapely capabilities
json-c json-c
libjpeg-turbo libjpeg-turbo
libxml2 libxml2
openssl
pcre pcre
postgresql postgresql
protobuf-c protobuf-c
@ -2485,6 +2498,7 @@ growing set of geoscientific methods.")
"PyQgsProviderConnectionSpatialite" "PyQgsProviderConnectionSpatialite"
"PyQgsPythonProvider" "PyQgsPythonProvider"
"PyQgsRasterLayer" "PyQgsRasterLayer"
"PyQgsRasterResampler"
"PyQgsRulebasedRenderer" "PyQgsRulebasedRenderer"
"PyQgsSelectiveMasking" "PyQgsSelectiveMasking"
"PyQgsSettings" "PyQgsSettings"

2
gnu/packages/glib.scm
View file

@ -620,7 +620,7 @@ The intltool collection can be used to do these things:
(wrap-program prog (wrap-program prog
`("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH")))) `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH"))))
#t)))))) #t))))))
(home-page "http://www.itstool.org") (home-page "https://itstool.org")
(synopsis "Tool to translate XML documents with PO files") (synopsis "Tool to translate XML documents with PO files")
(description (description
"ITS Tool allows you to translate your XML documents with PO files, using "ITS Tool allows you to translate your XML documents with PO files, using

99
gnu/packages/gnome-xyz.scm
View file

@ -17,6 +17,7 @@
;;; Copyright © 2021 Attila Lendvai <attila@lendvai.name> ;;; Copyright © 2021 Attila Lendvai <attila@lendvai.name>
;;; Copyright © 2021 Charles Jackson <charles.b.jackson@protonmail.com> ;;; Copyright © 2021 Charles Jackson <charles.b.jackson@protonmail.com>
;;; Copyright © 2022 Eric Bavier <bavier@posteo.net> ;;; Copyright © 2022 Eric Bavier <bavier@posteo.net>
;;; Copyright © 2022 Sughosha <sughosha@proton.me>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -985,6 +986,102 @@ animation of closing windowed applications.")
GNOME Shell, including the top panel, dash and overview.") GNOME Shell, including the top panel, dash and overview.")
(license license:gpl3))) (license license:gpl3)))
(define-public gnome-shell-extension-radio
(package
(name "gnome-shell-extension-radio")
(version "19")
(source (origin
(method git-fetch)
(uri (git-reference
(url
"https://github.com/hslbck/gnome-shell-extension-radio")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1qsi6c57hxh4jqdw18knm06601lhag6jdbvzg0r79aa9572zy8a0"))))
(build-system copy-build-system)
(arguments
(list
#:install-plan #~'(("radio@hslbck.gmail.com"
"/share/gnome-shell/extensions/"))
#:phases
#~(modify-phases %standard-phases
(add-before 'install 'glib-compile-schemas
(lambda _
(invoke "glib-compile-schemas"
"radio@hslbck.gmail.com/schemas"))))))
(native-inputs (list `(,glib "bin")))
(home-page "https://github.com/hslbck/gnome-shell-extension-radio")
(synopsis "Internet radio for GNOME Shell")
(description "This extension implements an internet radio player
directly inside GNOME Shell. It can manage stations and play streams.")
(license license:gpl3+)))
(define-public gnome-shell-extension-sound-output-device-chooser
(package
(name "gnome-shell-extension-sound-output-device-chooser")
(version "43")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/kgshank/gse-sound-output-device-chooser")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"1qk6ypyqbv8zwwlky6cgk9hgp1zh32jmzw4wza200g4v94ifkwm9"))))
(build-system gnu-build-system)
(arguments
(list
#:tests? #f ; no check target
#:make-flags #~(list (string-append "INSTALL_DIR="
#$output
"/share/gnome-shell/extensions"))
#:phases
#~(modify-phases %standard-phases (delete 'configure))))
(native-inputs (list gettext-minimal `(,glib "bin")))
(inputs (list python))
(home-page
"https://extensions.gnome.org/extension/906/sound-output-device-chooser")
(synopsis "Sound output chooser for GNOME Shell")
(description "This extension shows a list of sound output and input devices
in the status menu below the volume slider. Various active ports like HDMI,
Speakers etc. of the same device are also displayed for selection.")
(license license:gpl3+)))
(define-public gnome-shell-extension-transparent-window
(let ((commit "cc9bc70c192dd565fa6f1d1b28d9a20f99684f2a")
(revision "45"))
(package
(name "gnome-shell-extension-transparent-window")
(version (git-version "0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url (string-append "https://github.com/pbxqdown/"
"gnome-shell-extension-transparent-window"))
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1f9iqqjpmmylqz0ws8cy5rs475bwzi7jy44q9ip44ig2acz2wxzp"))))
(build-system copy-build-system)
(arguments
(list
#:install-plan
#~'(("."
#$(string-append "/share/gnome-shell/extensions"
"/transparent-window@pbxqdown.github.com")))))
(home-page
"https://github.com/pbxqdown/gnome-shell-extension-transparent-window")
(synopsis "Change the opacity of windows in GNOME Shell")
(description "This extension adds keybindings to change the opacity
of windows.")
(license license:expat))))
(define-public arc-theme (define-public arc-theme
(package (package
(name "arc-theme") (name "arc-theme")
@ -1012,7 +1109,7 @@ GNOME Shell, including the top panel, dash and overview.")
(list `(,glib "bin") ; for glib-compile-resources (list `(,glib "bin") ; for glib-compile-resources
gnome-shell gnome-shell
gtk+ gtk+
inkscape inkscape/stable
optipng optipng
pkg-config pkg-config
sassc/libsass-3.5)) sassc/libsass-3.5))

478
gnu/packages/gnome.scm
View file

@ -11,7 +11,7 @@
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015, 2016, 2017, 2018, 2021 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015, 2016, 2017, 2018, 2021 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 David Thompson <davet@gnu.org> ;;; Copyright © 2015 David Thompson <davet@gnu.org>
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015-2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017, 2018 Rene Saavedra <pacoon@protonmail.com> ;;; Copyright © 2016, 2017, 2018 Rene Saavedra <pacoon@protonmail.com>
;;; Copyright © 2016 Jochem Raat <jchmrt@riseup.net> ;;; Copyright © 2016 Jochem Raat <jchmrt@riseup.net>
;;; Copyright © 2016, 2017, 2019 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2016, 2017, 2019 Kei Kebreau <kkebreau@posteo.net>
@ -1584,15 +1584,15 @@ sharing to the masses.")
(define-public sushi (define-public sushi
(package (package
(name "sushi") (name "sushi")
(version "3.38.1") (version "42.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/" (version-major version) "/"
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1sc8i0vrw6bn43rklnwp2fl1gq0r0xfd3bszcqxd0a2mh46d3rpk")))) "0848gidl0ab8i5pa70mv8jzchmd9kqa8sn1lg977hyasyixdpn25"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:glib-or-gtk? #t `(#:glib-or-gtk? #t
@ -1608,27 +1608,28 @@ sharing to the masses.")
`("GI_TYPELIB_PATH" suffix `("GI_TYPELIB_PATH" suffix
(,(getenv "GI_TYPELIB_PATH")))))))))) (,(getenv "GI_TYPELIB_PATH"))))))))))
(native-inputs (native-inputs
`(("glib:bin" ,glib "bin") (list `(,glib "bin")
("gettext" ,gettext-minimal) gettext-minimal
("gobject-introspection" ,gobject-introspection) gobject-introspection
("pkg-config" ,pkg-config))) pkg-config))
(inputs (inputs
`(("clutter" ,clutter) (list bash-minimal
("clutter-gst" ,clutter-gst) clutter
("clutter-gtk" ,clutter-gtk) clutter-gst
("evince" ,evince) ; For file previewing. clutter-gtk
("freetype" ,freetype) evince ; For file previewing.
("gdk-pixbuf" ,gdk-pixbuf) freetype
("gjs" ,gjs) gdk-pixbuf
("gst-plugins-base" ,gst-plugins-base) gjs
("gstreamer" ,gstreamer) gst-plugins-base
("gtksourceview" ,gtksourceview) gstreamer
("harfbuzz" ,harfbuzz) gtksourceview
("libepoxy" ,libepoxy) harfbuzz
("libmusicbrainz" ,libmusicbrainz) libepoxy
("libxml2" ,libxml2) libmusicbrainz
("neon" ,neon) libxml2
("webkitgtk" ,webkitgtk-with-libsoup2))) neon
webkitgtk))
(synopsis "File previewer for the GNOME desktop") (synopsis "File previewer for the GNOME desktop")
(description "Sushi is a DBus-activated service that allows applications (description "Sushi is a DBus-activated service that allows applications
to preview files on the GNOME desktop.") to preview files on the GNOME desktop.")
@ -1765,14 +1766,14 @@ configuration files for the GNOME menu, as well as a simple menu editor.")
(define-public deja-dup (define-public deja-dup
(package (package
(name "deja-dup") (name "deja-dup")
(version "42.8") (version "43.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://gitlab.gnome.org/World/deja-dup/-/archive/" (uri (string-append "https://gitlab.gnome.org/World/deja-dup/-/archive/"
version "/deja-dup-" version ".tar.bz2")) version "/deja-dup-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"0d1jnlxpk52x56aqxz1g2xb4y4sm24h08p2di8mc1k8n8b52rpi4")))) "1mr2g009w0zm5rj8dg1k77c7zdwylih2yszm8vh8wkw6al6bzfh3"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:glib-or-gtk? #t `(#:glib-or-gtk? #t
@ -1786,7 +1787,7 @@ configuration files for the GNOME menu, as well as a simple menu editor.")
(add-after 'unpack 'patch-paths (add-after 'unpack 'patch-paths
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((python (assoc-ref inputs "python"))) (let ((python (assoc-ref inputs "python")))
(substitute* '("libdeja/tools/duplicity/DuplicityInstance.vala" (substitute* '("libdeja/duplicity/DuplicityInstance.vala"
"libdeja/tests/scripts/instance-error.test") "libdeja/tests/scripts/instance-error.test")
(("/bin/rm") (("/bin/rm")
(which "rm"))) (which "rm")))
@ -1801,14 +1802,7 @@ configuration files for the GNOME menu, as well as a simple menu editor.")
(let ((libgpg-error (assoc-ref inputs "libgpg-error"))) (let ((libgpg-error (assoc-ref inputs "libgpg-error")))
(substitute* "meson.build" (substitute* "meson.build"
(("(gpgerror_libs = ).*" _ var) (("(gpgerror_libs = ).*" _ var)
(format #f "~a '-L~a/lib -lgpg-error'\n" var libgpg-error)))) (format #f "~a '-L~a/lib -lgpg-error'\n" var libgpg-error))))))
#t))
(add-after 'unpack 'skip-gtk-update-icon-cache
;; Don't create 'icon-theme.cache'.
(lambda _
(substitute* "data/post-install.sh"
(("gtk-update-icon-cache") "true"))
#t))
(add-after 'install 'wrap-program (add-after 'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
;; Add duplicity to the search path ;; Add duplicity to the search path
@ -1817,28 +1811,30 @@ configuration files for the GNOME menu, as well as a simple menu editor.")
`("PATH" ":" prefix `("PATH" ":" prefix
(,(string-append (assoc-ref inputs "duplicity") "/bin"))))))))) (,(string-append (assoc-ref inputs "duplicity") "/bin")))))))))
(inputs (inputs
`(("bash-minimal" ,bash-minimal) (list bash-minimal
("duplicity" ,duplicity) duplicity
("gsettings-desktop-schemas" ,gsettings-desktop-schemas) gsettings-desktop-schemas
("gtk+" ,gtk+) gtk
("json-glib" ,json-glib) json-glib
("libgpg-error" ,libgpg-error) libadwaita
("libnotify" ,libnotify) libgpg-error
("libsecret" ,libsecret) libnotify
("libsoup" ,libsoup-minimal-2) libsecret
("libhandy" ,libhandy) libsoup
("packagekit" ,packagekit) libhandy
("python" ,python) packagekit
("python-pygobject" ,python-pygobject))) python
python-pygobject))
(native-inputs (native-inputs
`(("appstream-glib" ,appstream-glib) (list appstream-glib
("desktop-file-utils" ,desktop-file-utils) desktop-file-utils
("gettext" ,gettext-minimal) gettext-minimal
("glib" ,glib "bin") ; for glib-compile-schemas. `(,glib "bin") ;for glib-compile-schemas
("gobject-introspection" ,gobject-introspection) gobject-introspection
("itstool" ,itstool) `(,gtk "bin") ;for gtk-update-icon-cache
("pkg-config" ,pkg-config) itstool
("vala" ,vala))) pkg-config
vala))
(home-page "https://wiki.gnome.org/Apps/DejaDup") (home-page "https://wiki.gnome.org/Apps/DejaDup")
(synopsis "Simple backup tool, for regular encrypted backups") (synopsis "Simple backup tool, for regular encrypted backups")
(description (description
@ -4393,7 +4389,7 @@ targeting the GNOME stack simple.")
(define-public vte (define-public vte
(package (package
(name "vte") (name "vte")
(version "0.64.2") (version "0.68.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/vte/" (uri (string-append "mirror://gnome/sources/vte/"
@ -4401,21 +4397,20 @@ targeting the GNOME stack simple.")
"vte-" version ".tar.xz")) "vte-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"063ys3330cvhbz1dln9irhciavb2prw098lvhpcc2rx6cl5q4g1b")))) "0j8pvn225ybzx9p33ill838bzp8kkdn28383h0vs65m2kiwd9rqk"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:configure-flags (list #:configure-flags #~(list "-Dvapi=true"
'("-Dvapi=true" "-D_systemd=false")))
"-D_systemd=false")))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) (list pkg-config
("gettext" ,gettext-minimal) gettext-minimal
("vala" ,vala) vala
("gobject-introspection" ,gobject-introspection) gobject-introspection
("glib" ,glib "bin") ; for glib-genmarshal, etc. `(,glib "bin") ; for glib-genmarshal, etc.
("gperf" ,gperf) gperf
("python" ,python) python
("xmllint" ,libxml2))) libxml2))
(propagated-inputs (propagated-inputs
(list gtk+ ; required by vte-2.91.pc (list gtk+ ; required by vte-2.91.pc
gnutls ; ditto gnutls ; ditto
@ -6127,25 +6122,25 @@ discovery protocols.")
(define-public totem (define-public totem
(package (package
(name "totem") (name "totem")
(version "3.38.1") (version "42.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/totem/" (uri (string-append "mirror://gnome/sources/totem/"
(version-major+minor version) "/" (version-major version) "/"
"totem-" version ".tar.xz")) "totem-" version ".tar.xz"))
(sha256 (sha256
(base32 "02510lvzvxvmpcs64k6sqix8ysl7sihhhwvp0vmfv7521ryczylg")))) (base32 "1az6ay7zhz2naqrzcfldx1yv2ylw1yjx76g3mqrqppwmvcflkw2a"))))
(build-system meson-build-system) (build-system meson-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) (list pkg-config
("desktop-file-utils" ,desktop-file-utils) desktop-file-utils
("gettext" ,gettext-minimal) gettext-minimal
("gobject-introspection" ,gobject-introspection) gobject-introspection
("glib:bin" ,glib "bin") ;for 'glib-mkenums' `(,glib "bin") ;for 'glib-mkenums'
("itstool" ,itstool) itstool
("xmllint" ,libxml2) libxml2
("xorg-server" ,xorg-server-for-tests))) xorg-server-for-tests))
(propagated-inputs (propagated-inputs
(list dconf)) (list dconf))
(inputs (inputs
@ -6154,9 +6149,6 @@ discovery protocols.")
atk atk
cairo cairo
dbus-glib dbus-glib
clutter
clutter-gtk
clutter-gst
xorgproto xorgproto
libxxf86vm libxxf86vm
libxtst libxtst
@ -6165,7 +6157,7 @@ discovery protocols.")
libsoup libsoup
libpeas libpeas
librsvg librsvg
lirc libhandy
gnome-desktop gnome-desktop
gstreamer gstreamer
gst-plugins-base gst-plugins-base
@ -6179,47 +6171,41 @@ discovery protocols.")
grilo-plugins grilo-plugins
vala)) vala))
(arguments (arguments
`(#:glib-or-gtk? #t (list
#:glib-or-gtk? #t
;; Disable automatic GStreamer plugin installation via PackageKit and ;; Disable automatic GStreamer plugin installation via PackageKit and
;; all that. ;; all that.
#:configure-flags '("-D" "enable-easy-codec-installation=no" #:configure-flags #~(list "-Denable-easy-codec-installation=no"
;; Do not build .a files for the plugins, it's
;; Do not build .a files for the plugins, it's ;; completely useless. This saves 2 MiB.
;; completely useless. This saves 2 MiB. "--default-library" "shared")
"--default-library" "shared") #:phases
#:phases #~(modify-phases %standard-phases
(modify-phases %standard-phases (add-after 'unpack 'skip-gtk-update-icon-cache
(add-after 'unpack 'skip-gtk-update-icon-cache ;; Don't create 'icon-theme.cache'.
;; Don't create 'icon-theme.cache'. (lambda _
(substitute* "meson_post_install.py"
(("gtk-update-icon-cache") "true"))))
(add-before 'install 'disable-cache-generation
(lambda _ (lambda _
(substitute* "meson_post_install.py" (setenv "DESTDIR" "/")))
(("gtk-update-icon-cache") "true")) (add-before 'check 'pre-check
#t)) (lambda _
(add-before ;; Tests require a running X server.
'install 'disable-cache-generation (system "Xvfb :1 &")
(lambda _ (setenv "DISPLAY" ":1")))
(setenv "DESTDIR" "/") (add-after 'install 'wrap-totem
#t)) (lambda* (#:key inputs outputs #:allow-other-keys)
(add-before (let ((out (assoc-ref outputs "out"))
'check 'pre-check (gi-typelib-path (getenv "GI_TYPELIB_PATH"))
(lambda _ (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH"))
;; Tests require a running X server. (grl-plugin-path (getenv "GRL_PLUGIN_PATH")))
(system "Xvfb :1 &") (wrap-program (string-append out "/bin/totem")
(setenv "DISPLAY" ":1") `("GI_TYPELIB_PATH" ":" suffix (,gi-typelib-path))
#t)) `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path))
(add-after `("GRL_PLUGIN_PATH" ":" prefix (,grl-plugin-path)))
'install 'wrap-totem (wrap-program (string-append out "/bin/totem-video-thumbnailer")
(lambda* (#:key inputs outputs #:allow-other-keys) `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path)))))))))
(let ((out (assoc-ref outputs "out"))
(gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH"))
(grl-plugin-path (getenv "GRL_PLUGIN_PATH")))
(wrap-program (string-append out "/bin/totem")
`("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path))
`("GRL_PLUGIN_PATH" ":" prefix (,grl-plugin-path)))
(wrap-program (string-append out "/bin/totem-video-thumbnailer")
`("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path))))
#t)))))
(home-page "https://wiki.gnome.org/Apps/Videos") (home-page "https://wiki.gnome.org/Apps/Videos")
(synopsis "Simple media player for GNOME based on GStreamer") (synopsis "Simple media player for GNOME based on GStreamer")
(description "Totem is a simple yet featureful media player for GNOME (description "Totem is a simple yet featureful media player for GNOME
@ -6465,7 +6451,7 @@ part of udev-extras, then udev, then systemd. It's now a project on its own.")
(define-public gvfs (define-public gvfs
(package (package
(name "gvfs") (name "gvfs")
(version "1.48.1") (version "1.50.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/gvfs/" (uri (string-append "mirror://gnome/sources/gvfs/"
@ -6473,51 +6459,51 @@ part of udev-extras, then udev, then systemd. It's now a project on its own.")
"gvfs-" version ".tar.xz")) "gvfs-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1hlxl6368h6nyqp1888szxs9hnpcw98k3h23dgqi29xd38klzsmj")))) "0pmc0vda1ksm9l7v64h4bm8qnv16amb7nifgy0882hzg2n62pmq3"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:glib-or-gtk? #t (list #:glib-or-gtk? #t
#:configure-flags #:configure-flags
(list "-Dsystemduserunitdir=no" #~(list "-Dsystemduserunitdir=no"
"-Dtmpfilesdir=no" "-Dtmpfilesdir=no"
;; Otherwise, the RUNPATH will lack the final path component. ;; Otherwise, the RUNPATH will lack the final path component.
(string-append "-Dc_link_args=-Wl,-rpath=" (string-append "-Dc_link_args=-Wl,-rpath="
(assoc-ref %outputs "out") "/lib/gvfs")))) #$output "/lib/gvfs"))))
(native-inputs (native-inputs
`(("glib:bin" ,glib "bin") ;for glib-genmarshal, etc. (list `(,glib "bin") ;for glib-genmarshal, etc.
("gettext" ,gettext-minimal) gettext-minimal
("gtk-doc" ,gtk-doc/stable) gtk-doc/stable
("pkg-config" ,pkg-config) pkg-config
("xsltproc" ,libxslt))) libxslt))
(inputs (inputs
`(("avahi" ,avahi) (list avahi
("docbook-xml" ,docbook-xml-4.2) docbook-xml-4.2
("docbook-xsl" ,docbook-xsl) docbook-xsl
("dbus" ,dbus) dbus
("elogind" ,elogind) elogind
("fuse" ,fuse-3) fuse-3
("gcr" ,gcr) gcr
("glib" ,glib) glib
("gnome-online-accounts" ,gnome-online-accounts) gnome-online-accounts
("gsettings-desktop-schemas" ,gsettings-desktop-schemas) gsettings-desktop-schemas
("libarchive" ,libarchive) libarchive
("libbluray" ,libbluray) libbluray
("libcap" ,libcap) libcap
("libcdio-paranoia" ,libcdio-paranoia) libcdio-paranoia
("libgcrypt" ,libgcrypt) libgcrypt
("libgdata" ,libgdata) libgdata
("libgphoto2" ,libgphoto2) libgphoto2
("libgudev" ,libgudev) libgudev
("libimobiledevice" ,libimobiledevice) libimobiledevice
("libmtp" ,libmtp) libmtp
("libnfs" ,libnfs) libnfs
("libsecret" ,libsecret) libsecret
("libsmbclient" ,samba) samba
("libsoup" ,libsoup) libsoup
("libxml2" ,libxml2) libxml2
("openssh" ,openssh) openssh
("polkit" ,polkit) polkit
("udisks" ,udisks))) udisks))
(home-page "https://wiki.gnome.org/gvfs/") (home-page "https://wiki.gnome.org/gvfs/")
(synopsis "Userspace virtual file system for GIO") (synopsis "Userspace virtual file system for GIO")
(description (description
@ -8372,7 +8358,7 @@ logo='~a'~%" icon))))))
("xmllint" ,libxml2))) ("xmllint" ,libxml2)))
(inputs (inputs
(list accountsservice (list accountsservice
check-0.14 ;for testing check ;for testing
elogind elogind
eudev eudev
gnome-session gnome-session
@ -8808,7 +8794,7 @@ easy, safe, and automatic.")
(define-public tracker (define-public tracker
(package (package
(name "tracker") (name "tracker")
(version "3.1.2") (version "3.3.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/tracker/" (uri (string-append "mirror://gnome/sources/tracker/"
@ -8816,7 +8802,7 @@ easy, safe, and automatic.")
"tracker-" version ".tar.xz")) "tracker-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"13zcc07wd51sz7kglk3xbjrsq7d835cxfr7iwjr7nn2xcri8jdns")))) "1lkf353xvwc0hfyi03aq2qjikx3zmva7r56nxiavy7kqjyygbmjs"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:glib-or-gtk? #t `(#:glib-or-gtk? #t
@ -8847,28 +8833,31 @@ easy, safe, and automatic.")
(invoke "dbus-run-session" "--" "meson" "test" (invoke "dbus-run-session" "--" "meson" "test"
"--print-errorlogs"))))))) "--print-errorlogs")))))))
(native-inputs (native-inputs
`(("glib:bin" ,glib "bin") (list `(,glib "bin")
("gobject-introspection" ,gobject-introspection) gobject-introspection
("docbook-xsl" ,docbook-xsl) docbook-xsl
("docbook-xml-4.5" ,docbook-xml) docbook-xml
("gsettings-desktop-schemas" ,gsettings-desktop-schemas) gsettings-desktop-schemas
("asciidoc" ,asciidoc) asciidoc
("xsltproc" ,libxslt) libxslt
("cmake-minimal" ,cmake-minimal) cmake-minimal
("python-pygobject" ,python-pygobject) python-pygobject
("gtk-doc" ,gtk-doc/stable) gtk-doc/stable
("intltool" ,intltool) intltool
("dbus" ,dbus) dbus
("pkg-config" ,pkg-config) pkg-config
("python" ,python) python
("vala" ,vala))) vala))
(inputs (inputs
`(("dbus" ,dbus) (list dbus
("sqlite" ,sqlite) libsoup))
("libxml2" ,libxml2) (propagated-inputs
("icu4c" ,icu4c) ; libunistring gets miner-miner-fs test to fail. ;; These are in Requires or Requires.private of tracker-sparql-3.0.pc.
("json-glib" ,json-glib) (list glib
("libsoup" ,libsoup-minimal-2))) ; tracker-miners requires the same version. icu4c ;libunistring gets miner-miner-fs test to fail
json-glib
libxml2
sqlite))
(synopsis "Metadata database, indexer and search tool") (synopsis "Metadata database, indexer and search tool")
(home-page "https://wiki.gnome.org/Projects/Tracker") (home-page "https://wiki.gnome.org/Projects/Tracker")
(description (description
@ -8901,7 +8890,7 @@ endpoint and it understands SPARQL.")
(define-public tracker-miners (define-public tracker-miners
(package (package
(name "tracker-miners") (name "tracker-miners")
(version "3.1.2") (version "3.3.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/tracker-miners/" (uri (string-append "mirror://gnome/sources/tracker-miners/"
@ -8909,12 +8898,12 @@ endpoint and it understands SPARQL.")
"/tracker-miners-" version ".tar.xz")) "/tracker-miners-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0fpd69lgm8cckbamcf9c2q57glxf0s3jcfwkq8p3s4lfsvdclmd0")))) "151w6ljq1gk9idqfq9qs3w16vms91jnxy59c9kx6jaf0fb9cdp9y"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:glib-or-gtk? #t `(#:glib-or-gtk? #t
#:configure-flags #:configure-flags
(list "-Dminer_rss=false" ; libgrss is required. (list "-Dminer_rss=false" ; libgrss is required.
;; Ensure the RUNPATH contains all installed library locations. ;; Ensure the RUNPATH contains all installed library locations.
(string-append "-Dc_link_args=-Wl,-rpath=" (string-append "-Dc_link_args=-Wl,-rpath="
(assoc-ref %outputs "out") (assoc-ref %outputs "out")
@ -8946,58 +8935,62 @@ endpoint and it understands SPARQL.")
"foreach example_name: []")) "foreach example_name: []"))
;; Disable this test that is failing randomly: ;; Disable this test that is failing randomly:
;; https://gitlab.gnome.org/GNOME/tracker-miners/-/issues/170. ;; https://gitlab.gnome.org/GNOME/tracker-miners/-/issues/170.
(substitute* "tests/libtracker-miner/meson.build" (substitute* "tests/libtracker-miner/meson.build"
(("'miner-fs'.*") (("'miner-fs'.*")
"")))) ""))))
(replace 'check (replace 'check
(lambda* (#:key tests? #:allow-other-keys) (lambda* (#:key tests? #:allow-other-keys)
(when tests? (when tests?
;; Some tests expect to write to $HOME. ;; Some tests expect to write to $HOME.
(setenv "HOME" "/tmp") (setenv "HOME" "/tmp")
(setenv "LANG" "en_US.UTF-8") (setenv "LANG" "en_US.UTF-8")
(invoke "dbus-run-session" "--" "meson" "test" (invoke "dbus-run-session" "--" "meson" "test"
"--print-errorlogs"))))))) "--print-errorlogs"
;; Do not run the slow test, which fail (see:
;; https://gitlab.gnome.org/GNOME/tracker-miners
;; /-/issues/226).
"--no-suite" "slow")))))))
(native-inputs (native-inputs
`(("dbus" ,dbus) (list dbus
("intltool" ,intltool) intltool
("glib:bin" ,glib "bin") `(,glib "bin")
("docbook-xsl" ,docbook-xsl) docbook-xsl
("docbook-xml-4.5" ,docbook-xml) docbook-xml
("gsettings-desktop-schemas" ,gsettings-desktop-schemas) gsettings-desktop-schemas
("asciidoc" ,asciidoc) asciidoc
("xsltproc" ,libxslt) libxslt
("gobject-introspection" ,gobject-introspection) gobject-introspection
("pkg-config" ,pkg-config) pkg-config
("python-pygobject" ,python-pygobject))) python-pygobject))
(inputs (inputs
`(("exempi" ,exempi) (list exempi
("ffmpeg" ,ffmpeg) ffmpeg
("flac" ,flac) flac
("giflib" ,giflib) giflib
("glib" ,glib) glib
("gstreamer" ,gstreamer) gstreamer
("icu4c" ,icu4c) icu4c
("json-glib" ,json-glib) json-glib
("libcue" ,libcue) libcue
("libexif" ,libexif) libexif
("libgsf" ,libgsf) libgsf
("libgxps" ,libgxps) libgxps
("libiptcdata" ,libiptcdata) libiptcdata
("libjpeg" ,libjpeg-turbo) libjpeg-turbo
("libosinfo" ,libosinfo) libosinfo
("libpng" ,libpng) libpng
("libseccomp" ,libseccomp) libseccomp
("libsoup" ,libsoup-minimal-2) ; because tracker requires this version. libsoup
("libtiff" ,libtiff) libtiff
("libvorbis" ,libvorbis) libvorbis
("libxml2" ,libxml2) libxml2
("poppler" ,poppler) poppler
("shared-mime-info" ,shared-mime-info) shared-mime-info
("taglib" ,taglib) taglib
("totem-pl-parser" ,totem-pl-parser) totem-pl-parser
("tracker" ,tracker) tracker
("upower" ,upower) upower
("zlib" ,zlib))) zlib))
(synopsis "Metadata database, indexer and search tool") (synopsis "Metadata database, indexer and search tool")
(home-page "https://wiki.gnome.org/Projects/Tracker") (home-page "https://wiki.gnome.org/Projects/Tracker")
(description (description
@ -11947,7 +11940,10 @@ It uses pandoc as back-end for parsing Markdown.")
(arguments (arguments
`(#:configure-flags `(#:configure-flags
(list "-Dsystemd=false" (list "-Dsystemd=false"
"-Dlogind-provider=elogind") "-Dlogind-provider=elogind"
,@(if (not (package? (this-package-native-input "valgrind")))
`("-Dtests=false") ; Some tests still run.
`()))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'install 'wrap (add-after 'install 'wrap
@ -11967,7 +11963,11 @@ It uses pandoc as back-end for parsing Markdown.")
python-wrap) python-wrap)
#t)))))) #t))))))
(native-inputs (native-inputs
(list check pkg-config swig valgrind)) (append
(list check pkg-config swig)
(if (member (%current-system) (package-supported-systems valgrind))
(list valgrind)
'())))
(inputs (inputs
`(("glib" ,glib) `(("glib" ,glib)
("json-glib" ,json-glib) ("json-glib" ,json-glib)
@ -12605,7 +12605,9 @@ Document Analysis and Recognition program.")
("xvfb" ,xorg-server-for-tests) ("xvfb" ,xorg-server-for-tests)
("gettext" ,gettext-minimal))) ("gettext" ,gettext-minimal)))
(inputs (inputs
(list gtk gobject-introspection libportal)) (list gobject-introspection libportal))
(propagated-inputs
(list gtk)) ;libadwaita-1.pc 'Requires' it
(home-page "https://gnome.pages.gitlab.gnome.org/libadwaita/") (home-page "https://gnome.pages.gitlab.gnome.org/libadwaita/")
(synopsis "Building blocks for GNOME applications") (synopsis "Building blocks for GNOME applications")
(description (description

20
gnu/packages/gnuzilla.scm
View file

@ -371,8 +371,8 @@ in C/C++.")
;; XXXX: Workaround 'snippet' limitations. ;; XXXX: Workaround 'snippet' limitations.
(define computed-origin-method (@@ (guix packages) computed-origin-method)) (define computed-origin-method (@@ (guix packages) computed-origin-method))
(define %icecat-version "91.10.0-guix0-preview1") (define %icecat-version "91.11.0-guix0-preview1")
(define %icecat-build-id "20220531000000") ;must be of the form YYYYMMDDhhmmss (define %icecat-build-id "20220628000000") ;must be of the form YYYYMMDDhhmmss
;; 'icecat-source' is a "computed" origin that generates an IceCat tarball ;; 'icecat-source' is a "computed" origin that generates an IceCat tarball
;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat' ;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat'
@ -394,11 +394,11 @@ in C/C++.")
"firefox-" upstream-firefox-version ".source.tar.xz")) "firefox-" upstream-firefox-version ".source.tar.xz"))
(sha256 (sha256
(base32 (base32
"1fz11rmbb0qjcp84wz7hmq7wy1zh9bk6vk47xwhrinmmifrqqnl2")))) "1905595fsydd8q4bqxsp5gb4h9s47qjj90wjrqv4ky8yxs9bx6z5"))))
(upstream-icecat-base-version "91.10.0") ; maybe older than base-version (upstream-icecat-base-version "91.11.0") ; maybe older than base-version
;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version)) ;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version))
(gnuzilla-commit "4c39c619daf344f36962d958d809f6d42d3fce4e") (gnuzilla-commit "65a61287a5142a9403ec00d973cb5e5d658a3c71")
(gnuzilla-source (gnuzilla-source
(origin (origin
(method git-fetch) (method git-fetch)
@ -410,7 +410,7 @@ in C/C++.")
(string-take gnuzilla-commit 8))) (string-take gnuzilla-commit 8)))
(sha256 (sha256
(base32 (base32
"1fizsq0dphm40nj6vnvjp87v34iyg78gllv3jp5ssn43ln4jiyb7")))) "02mg7vg0bv5lxkdg86z18mf43rx7sh5i2w69lnirr8zqcrr5yd48"))))
;; 'search-patch' returns either a valid file name or #f, so wrap it ;; 'search-patch' returns either a valid file name or #f, so wrap it
;; in 'assume-valid-file-name' to avoid 'local-file' warnings. ;; in 'assume-valid-file-name' to avoid 'local-file' warnings.
@ -977,11 +977,11 @@ standards of the IceCat project.")
(cpe-version . ,(first (string-split version #\-))))))) (cpe-version . ,(first (string-split version #\-)))))))
;; Update this together with icecat! ;; Update this together with icecat!
(define %icedove-build-id "20220531000000") ;must be of the form YYYYMMDDhhmmss (define %icedove-build-id "20220624000000") ;must be of the form YYYYMMDDhhmmss
(define-public icedove (define-public icedove
(package (package
(name "icedove") (name "icedove")
(version "91.10.0") (version "91.11.0")
(source icecat-source) (source icecat-source)
(properties (properties
`((cpe-name . "thunderbird_esr"))) `((cpe-name . "thunderbird_esr")))
@ -1260,7 +1260,7 @@ standards of the IceCat project.")
;; in the Thunderbird release tarball. We don't use the release ;; in the Thunderbird release tarball. We don't use the release
;; tarball because it duplicates the Icecat sources and only adds the ;; tarball because it duplicates the Icecat sources and only adds the
;; "comm" directory, which is provided by this repository. ;; "comm" directory, which is provided by this repository.
,(let ((changeset "4a4b901410a9055d078d0cdd7c62b2b5d56ffbad")) ,(let ((changeset "da48e7ecf800ec7761a3b6e0ca81e0c90adc30f7"))
(origin (origin
(method hg-fetch) (method hg-fetch)
(uri (hg-reference (uri (hg-reference
@ -1269,7 +1269,7 @@ standards of the IceCat project.")
(file-name (string-append "thunderbird-" version "-checkout")) (file-name (string-append "thunderbird-" version "-checkout"))
(sha256 (sha256
(base32 (base32
"0i2wpi08jfksqqc0j6q362nyk3zmlqd5ds2w7mm74infvrw6fzzq"))))) "0lg8z0zk05w8jah364lm7vkc95j1nkg93gf46byz0kd4nslg05nx")))))
("cargo" ,rust "cargo") ("cargo" ,rust "cargo")
("clang" ,clang) ("clang" ,clang)
("llvm" ,llvm) ("llvm" ,llvm)

52
gnu/packages/golang.scm
View file

@ -34,6 +34,7 @@
;;; Copyright © 2021 Philip McGrath <philip@philipmcgrath.com> ;;; Copyright © 2021 Philip McGrath <philip@philipmcgrath.com>
;;; Copyright © 2021 Lu Hui <luhux76@gmail.com> ;;; Copyright © 2021 Lu Hui <luhux76@gmail.com>
;;; Copyright © 2022 Pier-Hugues Pellerin <phpellerin@gmail.com> ;;; Copyright © 2022 Pier-Hugues Pellerin <phpellerin@gmail.com>
;;; Copyright © 2022 muradm <mail@muradm.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -627,7 +628,7 @@ in the style of communicating sequential processes (@dfn{CSP}).")
(package (package
(inherit go-1.16) (inherit go-1.16)
(name "go") (name "go")
(version "1.17.9") (version "1.17.11")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -637,7 +638,7 @@ in the style of communicating sequential processes (@dfn{CSP}).")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"02l6gxn738kam1niy2nl2wpsbzl4x87h2wik6hd3py19kq4z2flw")))) "11wy6092qm7v0n10cjkyp49sbchqazi3vnij8k2sq7k7jaj63z5p"))))
(outputs '("out" "tests")) ; 'tests' contains distribution tests. (outputs '("out" "tests")) ; 'tests' contains distribution tests.
(arguments (arguments
`(#:modules ((ice-9 match) `(#:modules ((ice-9 match)
@ -9843,3 +9844,50 @@ Jsonnet} data templating language in Go. It is a feature-complete,
production-ready implementation, compatible with the original Jsonnet C++ production-ready implementation, compatible with the original Jsonnet C++
implementation.") implementation.")
(license license:asl2.0))) (license license:asl2.0)))
(define-public go-github-com-gorilla-websocket
(package
(name "go-github-com-gorilla-websocket")
(version "1.5.0")
(home-page "https://github.com/gorilla/websocket")
(source (origin
(method git-fetch)
(uri (git-reference
(url home-page)
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1xrr6snvs9g1nzxxg05w4i4pq6k1xjljl5mvavd838qc468n118i"))))
(build-system go-build-system)
(arguments
`(#:import-path "github.com/gorilla/websocket"))
(synopsis "Fast WebSocket implementation for Go")
(description "Gorilla WebSocket is a Go implementation of the WebSocket protocol.")
(license license:bsd-2)))
(define-public go-github-com-sourcegraph-jsonrpc2
(package
(name "go-github-com-sourcegraph-jsonrpc2")
(version "0.1.0")
(home-page "https://github.com/sourcegraph/jsonrpc2")
(source (origin
(method git-fetch)
(uri (git-reference
(url home-page)
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1dk0w32k96vxrwnmm24wqx337dn8ylch65qwrbc3wh7whw2xx71q"))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/sourcegraph/jsonrpc2"))
(propagated-inputs
(list
go-github-com-daviddengcn-go-colortext
go-github-com-motemen-go-colorine
go-github-com-gorilla-websocket))
(synopsis "Provides a client and server implementation of JSON-RPC 2.0")
(description
"Package jsonrpc2 provides a Go implementation of JSON-RPC 2.0.")
(license license:expat)))

4
gnu/packages/graph.scm
View file

@ -616,7 +616,7 @@ transformed into common image formats for display or printing.")
(define-public python-graph-tool (define-public python-graph-tool
(package (package
(name "python-graph-tool") (name "python-graph-tool")
(version "2.43") (version "2.45")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -624,7 +624,7 @@ transformed into common image formats for display or printing.")
version ".tar.bz2")) version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"0v58in4rwk9fhjarjw6xfxpx5zz2z13sy3yvd14b5kr0884yw6sz")))) "0s46qqg454kwq2px7x1a4ckryclkxnrz1r7gj6bv40nsrynafbgr"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:imported-modules (,@%gnu-build-system-modules `(#:imported-modules (,@%gnu-build-system-modules

66
gnu/packages/graphics.scm
View file

@ -30,6 +30,7 @@
;;; Copyright © 2022 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2022 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2022 John Kehayias <john.kehayias@protonmail.com> ;;; Copyright © 2022 John Kehayias <john.kehayias@protonmail.com>
;;; Copyright © 2022 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2022 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2022 Tobias Kortkamp <tobias.kortkamp@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -2054,3 +2055,68 @@ and build scripts for the OpenXR loader.")
such as VR and AR on mobile, PC/desktop, and any other device. Monado aims to be such as VR and AR on mobile, PC/desktop, and any other device. Monado aims to be
a complete and conforming implementation of the OpenXR API made by Khronos.") a complete and conforming implementation of the OpenXR API made by Khronos.")
(license license:boost1.0))) (license license:boost1.0)))
(define-public azpainter
(package
(name "azpainter")
(version "3.0.5")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.com/azelpg/azpainter")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1iplp3p8pw9q44kb43hrk89sv2aff6bdy9fk58j2v6k5lqbk6kvf"))))
(build-system gnu-build-system) ;actually a home grown build system
(arguments
(list #:tests? #f
#:phases
#~(modify-phases %standard-phases
(replace 'configure
(lambda _
(invoke "./configure"
(string-append "--prefix="
#$output))))
(replace 'build
(lambda* (#:key parallel-build? #:allow-other-keys)
(let ((job-count (if parallel-build?
(number->string (parallel-job-count))
"1")))
(invoke "ninja" "-j" job-count "-C" "build"))))
(add-before 'install 'disable-cache-generation
(lambda _
(setenv "DESTDIR" "/") #t))
(replace 'install
(lambda _
(invoke "ninja" "-C" "build" "install"))))))
(inputs (list fontconfig
freetype
libjpeg-turbo
libpng
libtiff
libwebp
libx11
libxcursor
libxext
libxi
zlib))
(native-inputs (list ninja pkg-config))
(home-page "http://azsky2.html.xdomain.jp/soft/azpainter.html")
(synopsis "Paint software for editing illustrations and images")
(description
"AzPainter is a lightweight full color painting application for editing
illustrations and images.
Features include:
@itemize
@item Layers
@item Many artistic filters
@item Good range of selection tools
@item Pen pressure support with automatic brush size adjustment
@item Support for 16-bit color images with transparency (RGBA)
@item Support for image formats like PSD, PNG, JPEG, TIFF, WebP
@end itemize
")
(license license:gpl3+)))

197
gnu/packages/gtk.scm
View file

@ -279,10 +279,10 @@ output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.")
"See 'COPYING' in the distribution.")) "See 'COPYING' in the distribution."))
(home-page "https://www.freedesktop.org/wiki/Software/HarfBuzz/"))) (home-page "https://www.freedesktop.org/wiki/Software/HarfBuzz/")))
(define-public harfbuzz-3.0 (define-public harfbuzz-3
(package (package
(inherit harfbuzz) (inherit harfbuzz)
(version "3.0.0") (version "3.4.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/harfbuzz/harfbuzz" (uri (string-append "https://github.com/harfbuzz/harfbuzz"
@ -290,7 +290,20 @@ output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.")
"/harfbuzz-" version ".tar.xz")) "/harfbuzz-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1ngk8vn06rryx3s4v5pbl91bw1j1pd4431n77rw3j5a533hhwsq3")))))) "0lprrl8iih8ji1n17xwm5llz05a1hv4g04b7a3y229dq9myahn3i"))))))
(define-public harfbuzz-4
(package
(inherit harfbuzz)
(version "4.3.0")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/harfbuzz/harfbuzz"
"/releases/download/" version
"/harfbuzz-" version ".tar.xz"))
(sha256
(base32
"0c5mzwgz43d37h75p4b6cgjg4v24jdd96i7gjpgxirn8qks2i5m4"))))))
(define-public libdatrie (define-public libdatrie
(package (package
@ -455,6 +468,29 @@ handling for GTK+-2.x.")
(("test-layout\\$\\(EXEEXT\\)") "")) (("test-layout\\$\\(EXEEXT\\)") ""))
#t))))))) #t)))))))
(define-public pango-1.90
(package
(inherit pango)
(name "pango")
(version "1.90.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/pango/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(patches (search-patches "pango-skip-libthai-test.patch"))
(sha256
(base32
"1zqif72jxa819bwi4jv2vgac574qas3w37f7qvn8l31rm1jgjf7i"))
(modules '((guix build utils)))
(snippet
#~(begin
(substitute* "pango/pangocairo-font.c"
(("cairo_user_font_face_set_render_color_glyph_func")
"cairo_user_font_face_set_render_glyph_func"))))))
(inputs (modify-inputs (package-inputs pango)
(prepend harfbuzz-4)))))
(define-public pangox-compat (define-public pangox-compat
(package (package
(name "pangox-compat") (name "pangox-compat")
@ -683,6 +719,7 @@ highlighting and other features typical of a source code editor.")
(list ;; Required by gdk-pixbuf-2.0.pc (list ;; Required by gdk-pixbuf-2.0.pc
glib glib
;; Required by gdk-pixbuf-xlib-2.0.pc ;; Required by gdk-pixbuf-xlib-2.0.pc
;; TODO: Remove on core-updates.
libx11 libx11
;; Used for testing and required at runtime. ;; Used for testing and required at runtime.
shared-mime-info)) shared-mime-info))
@ -717,6 +754,34 @@ scaled, composited, modified, saved, or rendered.")
(home-page "https://wiki.gnome.org/Projects/GdkPixbuf") (home-page "https://wiki.gnome.org/Projects/GdkPixbuf")
(license license:lgpl2.1+))) (license license:lgpl2.1+)))
(define-public gdk-pixbuf-xlib
(package
(name "gdk-pixbuf-xlib")
(version "2.40.2")
(source (origin
(method git-fetch)
(uri (git-reference
(url
"https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib.git")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"1vwnvqxap3r9zw932jwasazy9sxw49j78x2g650xkn70iili90bg"))))
(build-system meson-build-system)
(arguments
'(#:configure-flags '("-Dgtk_doc=true")))
(native-inputs (list pkg-config gtk-doc/stable))
(inputs (list gdk-pixbuf libx11))
(synopsis "Deprecated Xlib integration for GdkPixbuf")
(description
"GdkPixbuf-Xlib contains the deprecated API for integrating GdkPixbuf with
Xlib data types. This library was originally shipped by gdk-pixbuf, and has
since been moved out of the original repository. No newly written code should
ever use this library.")
(home-page "https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib")
(license license:lgpl2.1+)))
;;; A minimal variant used to prevent a cycle with Inkscape. ;;; A minimal variant used to prevent a cycle with Inkscape.
(define-public at-spi2-core-minimal (define-public at-spi2-core-minimal
(hidden-package (hidden-package
@ -1078,7 +1143,7 @@ application suites.")
(define-public gtk (define-public gtk
(package (package
(name "gtk") (name "gtk")
(version "4.6.1") (version "4.6.6")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -1086,7 +1151,7 @@ application suites.")
(version-major+minor version) "/" (version-major+minor version) "/"
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 "0pzcs24j67f90kjcp6apgn6rffynxksjm1m7d3an7kdv3k90hmfq")) (base32 "0w5fb4grgmb6nhf2glq2y5xqnc9y4v3lm0s9xnbw5xv96p8y9gvv"))
(patches (patches
(search-patches "gtk4-respect-GUIX_GTK4_PATH.patch")))) (search-patches "gtk4-respect-GUIX_GTK4_PATH.patch"))))
(build-system meson-build-system) (build-system meson-build-system)
@ -1097,10 +1162,10 @@ application suites.")
((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)) ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:))
#:configure-flags #:configure-flags
(list (list
"-Dbroadway-backend=true" ;for broadway display-backend "-Dbroadway-backend=true" ;for broadway display-backend
"-Dcloudproviders=enabled" ;for cloud-providers support "-Dcloudproviders=enabled" ;for cloud-providers support
"-Dtracker=enabled" ;for filechooser search support "-Dtracker=enabled" ;for filechooser search support
"-Dcolord=enabled" ;for color printing support "-Dcolord=enabled" ;for color printing support
,@(if (%current-target-system) ,@(if (%current-target-system)
;; If true, gtkdoc-scangobj will try to execute a ;; If true, gtkdoc-scangobj will try to execute a
;; cross-compiled binary. ;; cross-compiled binary.
@ -1138,9 +1203,13 @@ application suites.")
(substitute* (find-files "testsuite" "meson.build") (substitute* (find-files "testsuite" "meson.build")
(("[ \t]*'empty-text.node',") "") (("[ \t]*'empty-text.node',") "")
(("[ \t]*'testswitch.node',") "") (("[ \t]*'testswitch.node',") "")
(("[ \t]*'widgetfactory.node',") "")) (("[ \t]*'widgetfactory.node',") "")
;; The unaligned-offscreen test fails for unknown reasons, also
;; on different distributions (see:
;; https://gitlab.gnome.org/GNOME/gtk/-/issues/4889).
((" 'unaligned-offscreen',") ""))
(substitute* "testsuite/reftests/meson.build" (substitute* "testsuite/reftests/meson.build"
(("[ \t]*'label-wrap-justify.ui',") "")) )) (("[ \t]*'label-wrap-justify.ui',") ""))))
(add-before 'build 'set-cache (add-before 'build 'set-cache
(lambda _ (lambda _
(setenv "XDG_CACHE_HOME" (getcwd)))) (setenv "XDG_CACHE_HOME" (getcwd))))
@ -1187,72 +1256,72 @@ application suites.")
(string-append out "/share/doc") (string-append out "/share/doc")
(string-append doc "/share/doc")))))))) (string-append doc "/share/doc"))))))))
(native-inputs (native-inputs
`(("docbook-xml-4.3" ,docbook-xml-4.3) (list docbook-xml-4.3
("docbook-xsl" ,docbook-xsl) docbook-xsl
("gettext-minimal" ,gettext-minimal) gettext-minimal
("glib:bin" ,glib "bin") `(,glib "bin")
("gobject-introspection" ,gobject-introspection) ;for building introspection data gobject-introspection ;for building introspection data
("graphene" ,graphene) graphene
("gtk-doc" ,gtk-doc) ;for building documentation gtk-doc ;for building documentation
("intltool" ,intltool) intltool
("libxslt" ,libxslt) ;for building man-pages libxslt ;for building man-pages
("pkg-config" ,pkg-config) pkg-config
("python-pygobject" ,python-pygobject) python-pygobject
;; These python modules are required for building documentation. ;; These python modules are required for building documentation.
("python-docutils" ,python-docutils) python-docutils
("python-jinja2" ,python-jinja2) python-jinja2
("python-markdown" ,python-markdown) python-markdown
("python-markupsafe" ,python-markupsafe) python-markupsafe
("python-pygments" ,python-pygments) python-pygments
("python-toml" ,python-toml) python-toml
("python-typogrify" ,python-typogrify) python-typogrify
("sassc" ,sassc) ;for building themes sassc ;for building themes
("tzdata" ,tzdata-for-tests) tzdata-for-tests
("vala" ,vala) vala
("xorg-server-for-tests" ,xorg-server-for-tests))) xorg-server-for-tests))
(inputs (inputs
(list colord ;for color printing support (list colord ;for color printing support
cups ;for CUPS print-backend cups ;for CUPS print-backend
ffmpeg ;for ffmpeg media-backend ffmpeg ;for ffmpeg media-backend
fribidi fribidi
gstreamer ;for gstreamer media-backend gstreamer ;for gstreamer media-backend
gst-plugins-bad ;provides gstreamer-player gst-plugins-bad ;provides gstreamer-player
gst-plugins-base ;provides gstreamer-gl gst-plugins-base ;provides gstreamer-gl
harfbuzz harfbuzz
iso-codes iso-codes
json-glib json-glib
libcloudproviders ;for cloud-providers support libcloudproviders ;for cloud-providers support
libjpeg-turbo libjpeg-turbo
libpng libpng
librsvg librsvg
libtiff libtiff
python python
rest rest
tracker)) ;for filechooser search support tracker)) ;for filechooser search support
(propagated-inputs (propagated-inputs
;; Following dependencies are referenced in .pc files. ;; Following dependencies are referenced in .pc files.
`(("cairo" ,cairo) (list cairo
("fontconfig" ,fontconfig) fontconfig
("librsvg" ,librsvg) librsvg
("glib" ,glib) glib
("graphene" ,graphene) graphene
("libepoxy" ,libepoxy) libepoxy
("libx11" ,libx11) ;for x11 display-backend libx11 ;for x11 display-backend
("libxcomposite" ,libxcomposite) libxcomposite
("libxcursor" ,libxcursor) libxcursor
("libxdamage" ,libxdamage) libxdamage
("libxext" ,libxext) libxext
("libxfixes" ,libxfixes) libxfixes
("libxi" ,libxi) libxi
("libxinerama" ,libxinerama) ;for xinerama support libxinerama ;for xinerama support
("libxkbcommon" ,libxkbcommon) libxkbcommon
("libxrandr" ,libxrandr) libxrandr
("libxrender" ,libxrender) libxrender
("pango" ,pango-next) pango-next
("vulkan-headers" ,vulkan-headers) vulkan-headers
("vulkan-loader" ,vulkan-loader) ;for vulkan graphics API support vulkan-loader ;for vulkan graphics API support
("wayland" ,wayland) ;for wayland display-backend wayland ;for wayland display-backend
("wayland-protocols" ,wayland-protocols))) wayland-protocols))
(native-search-paths (native-search-paths
(list (list
(search-path-specification (search-path-specification

98
gnu/packages/guile-xyz.scm
View file

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012-2022 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012-2022 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015, 2017 Christine Lemmer-Webber <cwebber@dustycloud.org> ;;; Copyright © 2015, 2017, 2022 Christine Lemmer-Webber <cwebber@dustycloud.org>
;;; Copyright © 2016 Alex Sassmannshausen <alex@pompo.co> ;;; Copyright © 2016 Alex Sassmannshausen <alex@pompo.co>
;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021, 2022 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021, 2022 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 Erik Edrosa <erik.edrosa@gmail.com> ;;; Copyright © 2016 Erik Edrosa <erik.edrosa@gmail.com>
@ -496,34 +496,31 @@ and then run @command{scm example.scm}.")
,@(package-arguments guile2.0-bash))))) ,@(package-arguments guile2.0-bash)))))
(define-public guile-8sync (define-public guile-8sync
(package (let ((commit "183b4f02e68279d4984e79b79e06bfcf1861fcbf") (revision "0"))
(name "guile-8sync") (package
(version "0.4.2") (name "guile-8sync")
(source (origin (version (git-version "0.4.2" revision commit))
(method url-fetch) (source (origin
(uri (string-append "mirror://gnu/8sync/8sync-" version (method git-fetch)
".tar.gz")) (uri (git-reference
(sha256 (commit commit)
(base32 (url "https://git.savannah.gnu.org/git/8sync.git")))
"031wm13srak3wsnll7j2mbbi29g1pcm4swdb71ds9yn567pn20qw")))) (sha256
(build-system gnu-build-system) (base32
(native-inputs (list autoconf automake guile-2.2 pkg-config texinfo)) "0r22kxasv1zqnf1ykzyx6c226qxn1wgjb1gc54526bid24x508ij"))
(arguments (file-name (git-file-name name version))))
`(#:phases (modify-phases %standard-phases (build-system gnu-build-system)
(add-before 'configure 'setenv (native-inputs (list autoconf automake guile-3.0 pkg-config texinfo))
(lambda _ (arguments
;; quiet warnings (list #:make-flags
(setenv "GUILE_AUTO_COMPILE" "0") #~(list "GUILE_AUTO_COMPILE=0")))
#t))))) (home-page "https://gnu.org/s/8sync/")
(home-page "https://gnu.org/s/8sync/") (synopsis "Asynchronous actor model library for Guile")
(synopsis "Asynchronous actor model library for Guile") (description
(description "GNU 8sync (pronounced \"eight-sync\") is an asynchronous programming
"GNU 8sync (pronounced \"eight-sync\") is an asynchronous programming library for GNU Guile based on the actor model.")
library for GNU Guile based on the actor model. (properties '((upstream-name . "8sync")))
(license license:lgpl3+))))
Note that 8sync is only available for Guile 2.2.")
(properties '((upstream-name . "8sync")))
(license license:lgpl3+)))
(define-public guile-daemon (define-public guile-daemon
(package (package
@ -5103,3 +5100,46 @@ Protocol (TAP). It comes with an experimental harness (tap-harness).")
termios API is used. GNU Guile doesn't have an interface for that built in. termios API is used. GNU Guile doesn't have an interface for that built in.
This module implements this interface by use of Guile's dynamic FFI.") This module implements this interface by use of Guile's dynamic FFI.")
(license license:bsd-2))) (license license:bsd-2)))
(define-public guile-goblins
(package
(name "guile-goblins")
(version "0.8")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.com/spritely/guile-goblins/")
(commit (string-append "v" version))))
(file-name (string-append name "-" version))
(sha256
(base32
"1mmyykh79jwhrfgnhhw94aw7a8m6qw249kj7k60ynj16mcfm5iyy"))))
(build-system gnu-build-system)
(arguments
(list #:make-flags
#~(list "GUILE_AUTO_COMPILE=0")))
(native-inputs
(list autoconf automake pkg-config texinfo))
(inputs (list guile-3.0))
(propagated-inputs
(list guile-fibers guile-gcrypt))
(home-page "https://spritely.institute/goblins")
(synopsis "Distributed programming environment for Guile")
;; In guile-goblins 0.9, OCapN support will be added (it already
;; exists in racket-goblins). At that point we should add the
;; following to this description:
;;
;; Goblins allows for cooperation between networked programs
;; in a mutually suspicious network through OCapN, the Object
;; Capability Network. This includes collaboration across
;; runtimes; for instance, programs written in the Guile and Racket
;; versions of Goblins are able to speak to each other.
(description
"@code{guile-goblins} is the Guile version of
@url{https://spritely.institute/goblins, Spritely Goblins},
a transactional, distributed programming environment following object
capability security designs. Goblins is a general toolkit, and also
the core layer of Spritely's work to support healthy distributed
networked communities.")
(license license:asl2.0)))

4
gnu/packages/guile.scm
View file

@ -665,14 +665,14 @@ specification. These are the main features:
(package (package
(inherit guile-json-3) (inherit guile-json-3)
(name "guile-json") (name "guile-json")
(version "4.5.2") (version "4.7.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://savannah/guile-json/guile-json-" (uri (string-append "mirror://savannah/guile-json/guile-json-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0cqr0ljqmzlc2bwrapcsmcgxg147h66mcxf23824ri5i6vn4dc0s")))))) "0hv8jjb6wdhvfrprwdi36125sci1ip4zfflv79hqlz7nh0irld65"))))))
(define-public guile2.2-json (define-public guile2.2-json
(package-for-guile-2.2 guile-json-4)) (package-for-guile-2.2 guile-json-4))

29
gnu/packages/hardware.scm
View file

@ -84,6 +84,7 @@
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module (gnu packages xorg) #:use-module (gnu packages xorg)
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system meson) #:use-module (guix build-system meson)
#:use-module (guix build-system perl) #:use-module (guix build-system perl)
@ -598,8 +599,36 @@ human-readable format and checks if it conforms to the standards.")
(sha256 (sha256
(base32 "0hm86d51kj5r3yxq4c23aa57cs8igz3wrkbjn20z4frx75rpf46m")))) (base32 "0hm86d51kj5r3yxq4c23aa57cs8igz3wrkbjn20z4frx75rpf46m"))))
(build-system python-build-system) (build-system python-build-system)
(arguments
(list
#:imported-modules `(,@%python-build-system-modules
,@%glib-or-gtk-build-system-modules)
#:modules '(((guix build glib-or-gtk-build-system) #:prefix glib:)
(guix build python-build-system)
(guix build utils))
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file
(assoc-ref glib:%standard-phases
'generate-gdk-pixbuf-loaders-cache-file))
(add-after 'install 'glib-or-gtk-compile-schemas
(assoc-ref glib:%standard-phases 'glib-or-gtk-compile-schemas))
(add-after 'install 'glib-or-gtk-wrap
(assoc-ref glib:%standard-phases 'glib-or-gtk-wrap))
(add-after 'glib-or-gtk-wrap 'wrap-more
(lambda* (#:key inputs outputs #:allow-other-keys)
(wrap-script (search-input-file outputs "bin/h-client")
;; Wrap GI_TYPELIB_PATH to avoid the error "ValueError:
;; Namespace GdkPixbuf not available".
`("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))
`("PATH" = (,(dirname (search-input-file
inputs "sbin/lspci"))
,(dirname (search-input-file
inputs "bin/lsusb"))))))))))
(inputs (inputs
(list gdk-pixbuf (list gdk-pixbuf
gobject-introspection ;for GI_TYPELIB_PATH
guile-3.0
gtk+ gtk+
pciutils pciutils
python-pycurl python-pycurl

4
gnu/packages/haskell-apps.scm
View file

@ -304,14 +304,14 @@ to @code{cabal repl}).")
(define-public git-annex (define-public git-annex
(package (package
(name "git-annex") (name "git-annex")
(version "10.20220525") (version "10.20220624")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/" (uri (string-append "https://hackage.haskell.org/package/"
"git-annex/git-annex-" version ".tar.gz")) "git-annex/git-annex-" version ".tar.gz"))
(sha256 (sha256
(base32 "1nrwa4qm3xkr11x0b0c1mx052zhd7lz9w97xf0ycdkhsyc6vbiy6")))) (base32 "0a17ph8w620fmbwhm4yhdz2pwp0z8g5d4qsw2bg8k1par2n8rnmz"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags

60
gnu/packages/ibus.scm
View file

@ -9,6 +9,8 @@
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2021 Felix Gruber <felgru@posteo.net> ;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
;;; Copyright © 2021 Songlin Jiang <hollowman@hollowman.ml> ;;; Copyright © 2021 Songlin Jiang <hollowman@hollowman.ml>
;;; Copyright © 2021 Taiju HIGASHI <higashi@taiju.info>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -28,6 +30,7 @@
(define-module (gnu packages ibus) (define-module (gnu packages ibus)
#:use-module (guix licenses) #:use-module (guix licenses)
#:use-module (guix packages) #:use-module (guix packages)
#: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 build-system cmake) #:use-module (guix build-system cmake)
@ -307,7 +310,7 @@ Chinese pinyin input methods.")
(define-public ibus-anthy (define-public ibus-anthy
(package (package
(name "ibus-anthy") (name "ibus-anthy")
(version "1.5.9") (version "1.5.14")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -315,34 +318,41 @@ Chinese pinyin input methods.")
version "/ibus-anthy-" version ".tar.gz")) version "/ibus-anthy-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1y8sf837rmp662bv6zakny0xcm7c9c5qda7f9kq9riv9ywpcbw6x")))) "16vd0k8wm13s38869jqs3dnwmjvywgn0snnpyi41m28binhlssf8"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:configure-flags (list
;; Use absolute exec path in the anthy.xml. #:configure-flags
(list (string-append "--libexecdir=" %output "/libexec")) ;; Use absolute exec path in the anthy.xml.
#:phases #~(list (string-append "--libexecdir=" #$output "/libexec"))
(modify-phases %standard-phases ;; The test suite fails (see:
(add-after 'install 'wrap-programs ;; https://github.com/ibus/ibus-anthy/issues/28).
(lambda* (#:key outputs #:allow-other-keys) #:tests? #f
(let ((out (assoc-ref outputs "out"))) #:phases
(for-each #~(modify-phases %standard-phases
(lambda (prog) (add-after 'install 'wrap-programs
(wrap-program (string-append out "/libexec/" prog) (lambda* (#:key inputs #:allow-other-keys)
`("GUIX_PYTHONPATH" ":" prefix (for-each
(,(getenv "GUIX_PYTHONPATH"))) (lambda (prog)
`("GI_TYPELIB_PATH" ":" prefix (wrap-program (string-append #$output "/libexec/" prog)
(,(getenv "GI_TYPELIB_PATH") `("GUIX_PYTHONPATH" ":" prefix
,(string-append out "/lib/girepository-1.0"))))) (,(getenv "GUIX_PYTHONPATH")))
'("ibus-engine-anthy" "ibus-setup-anthy")) `("GI_TYPELIB_PATH" ":" prefix
#t)))))) (,(getenv "GI_TYPELIB_PATH")
,(string-append #$output "/lib/girepository-1.0")))))
'("ibus-engine-anthy" "ibus-setup-anthy")))))))
(native-inputs (native-inputs
`(("gettext" ,gettext-minimal) (list gettext-minimal
("intltool" ,intltool) `(,glib "bin")
("pkg-config" ,pkg-config) intltool
("python" ,python))) pkg-config
python))
(inputs (inputs
(list anthy gtk+ ibus gobject-introspection python-pygobject)) (list anthy
gtk+
ibus
gobject-introspection
python-pygobject))
(synopsis "Anthy Japanese language input method for IBus") (synopsis "Anthy Japanese language input method for IBus")
(description "IBus-Anthy is an engine for the input bus \"IBus\"). It (description "IBus-Anthy is an engine for the input bus \"IBus\"). It
adds the Anthy Japanese language input method to IBus. Because most graphical adds the Anthy Japanese language input method to IBus. Because most graphical

18
gnu/packages/icu4c.scm
View file

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015, 2016 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015, 2016 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016, 2017, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2020, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019, 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2019, 2020 Marius Bakke <mbakke@fastmail.com>
@ -136,7 +136,21 @@ C/C++ part.")
"-src.tgz")) "-src.tgz"))
(sha256 (sha256
(base32 (base32
"1m9zgkaf5lyh65nyc6n0n5bs2f5k53nnj1ih6nskpwbvq4l5884d")))))) "1m9zgkaf5lyh65nyc6n0n5bs2f5k53nnj1ih6nskpwbvq4l5884d"))))
(arguments
(if (target-riscv64?)
(substitute-keyword-arguments (package-arguments icu4c)
((#:phases phases)
`(modify-phases ,phases
(replace 'disable-failing-test
;; It is unknown why these tests are failing.
(lambda _
(substitute* "source/test/cintltst/ucptrietest.c"
((".*addTest.*") ""))
(substitute* "source/test/intltest/numbertest_api.cpp"
(("(TESTCASE_AUTO\\(unitUsage\\));" all)
(string-append "//" all))))))))
(package-arguments icu4c)))))
(define-public icu4c-67 (define-public icu4c-67
(package (package

10
gnu/packages/image-processing.scm
View file

@ -13,7 +13,7 @@
;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2020 Brendan Tildesley <mail@brendan.scot> ;;; Copyright © 2020 Brendan Tildesley <mail@brendan.scot>
;;; Copyright © 2021 Oleh Malyi <astroclubzp@gmail.com> ;;; Copyright © 2021 Oleh Malyi <astroclubzp@gmail.com>
;;; Copyright © 2021 Felix Gruber <felgru@posteo.net> ;;; Copyright © 2021, 2022 Felix Gruber <felgru@posteo.net>
;;; Copyright © 2021 Andy Tai <atai@atai.org> ;;; Copyright © 2021 Andy Tai <atai@atai.org>
;;; Copyright © 2021 Ekaitz Zarraga <ekaitz@elenq.tech> ;;; Copyright © 2021 Ekaitz Zarraga <ekaitz@elenq.tech>
;;; Copyright © 2021 Paul Garlick <pgarlick@tourbillion-technology.com> ;;; Copyright © 2021 Paul Garlick <pgarlick@tourbillion-technology.com>
@ -194,7 +194,8 @@ licences similar to the Modified BSD licence."))))
(sha256 (sha256
(base32 (base32
"0qpcd3n26q52dpyibm11f5l6cgscdr54p2jish39gc3p1f5h3ws1")) "0qpcd3n26q52dpyibm11f5l6cgscdr54p2jish39gc3p1f5h3ws1"))
(patches (search-patches "mia-fix-boost-headers.patch")))) (patches (search-patches "mia-fix-boost-headers.patch"
"mia-vtk9.patch"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -221,10 +222,7 @@ licences similar to the Modified BSD licence."))))
nlopt nlopt
openexr-2 openexr-2
python-lxml python-lxml
;; The build fails when using the regular VTK (currently at version vtk))
;; 9), with error "addons/vtk/vtkvf.cc:23:10: fatal error:
;; vtkStructuredPointsReader.h: No such file or directory".
vtk-7))
(native-inputs (native-inputs
(list pkg-config (list pkg-config
python-wrapper)) python-wrapper))

13
gnu/packages/image.scm
View file

@ -852,19 +852,6 @@ JPEG 2000 Reference Software.")
(home-page "https://github.com/uclouvain/openjpeg") (home-page "https://github.com/uclouvain/openjpeg")
(license license:bsd-2))) (license license:bsd-2)))
(define-public openjpeg-1
(package (inherit openjpeg)
(name "openjpeg")
(version "1.5.2")
(source
(origin
(method url-fetch)
(uri
(string-append "mirror://sourceforge/openjpeg.mirror/" version "/"
name "-" version ".tar.gz"))
(sha256
(base32 "11waq9w215zvzxrpv40afyd18qf79mxc28fda80bm3ax98cpppqm"))))))
(define-public giflib (define-public giflib
(package (package
(name "giflib") (name "giflib")

388
gnu/packages/inkscape.scm
View file

@ -4,7 +4,7 @@
;;; Copyright © 2016, 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016, 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017, 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 Boris A. Dekshteyn <boris.dekshteyn@gmail.com> ;;; Copyright © 2020 Boris A. Dekshteyn <boris.dekshteyn@gmail.com>
;;; Copyright © 2020 Ekaitz Zarraga <ekaitz@elenq.tech> ;;; Copyright © 2020 Ekaitz Zarraga <ekaitz@elenq.tech>
;;; ;;;
@ -31,6 +31,7 @@
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages aspell) #:use-module (gnu packages aspell)
#:use-module (gnu packages bash)
#:use-module (gnu packages bdw-gc) #:use-module (gnu packages bdw-gc)
#:use-module (gnu packages boost) #:use-module (gnu packages boost)
#:use-module (gnu packages check) #:use-module (gnu packages check)
@ -50,55 +51,59 @@
#:use-module (gnu packages ghostscript) #:use-module (gnu packages ghostscript)
#:use-module (gnu packages fontutils) #:use-module (gnu packages fontutils)
#:use-module (gnu packages image) #:use-module (gnu packages image)
#:use-module (gnu packages pkg-config)) #:use-module (gnu packages pkg-config)
#:use-module (srfi srfi-1))
(define-public inkscape ;;; A variant of Inkscape intended to be bumped only on core-updates, to avoid
(package ;;; rebuilding 2k+ packages through dblatex.
(name "inkscape") (define-public inkscape/stable
(version "1.1.1") (hidden-package
(source (package
(origin (name "inkscape")
(method url-fetch) (version "1.1.1")
(uri (string-append "https://media.inkscape.org/dl/" (source
"resources/file/" (origin
"inkscape-" version ".tar.xz")) (method url-fetch)
(sha256 (uri (string-append "https://media.inkscape.org/dl/"
(base32 "1bvqg5xfs3m6r7qfdhmgzwhd1hx8wvg3nhvhmalwzcdm6ffhpjmf")) "resources/file/"
(modules '((guix build utils) "inkscape-" version ".tar.xz"))
(ice-9 format))) (sha256
(snippet (base32 "1bvqg5xfs3m6r7qfdhmgzwhd1hx8wvg3nhvhmalwzcdm6ffhpjmf"))
'(begin (modules '((guix build utils)
(let-syntax (ice-9 format)))
;; XXX: The build system doesn't currently support using (snippet
;; system libraries over bundled ones (see: '(begin
;; https://gitlab.com/inkscape/inkscape/issues/876). (let-syntax
((unbundle ;; XXX: The build system doesn't currently support using
(syntax-rules () ;; system libraries over bundled ones (see:
((_ (name source-dir use-pkg-config?) ...) ;; https://gitlab.com/inkscape/inkscape/issues/876).
(begin ((unbundle
;; Delete bundled source directories. (syntax-rules ()
(delete-file-recursively source-dir) ... ((_ (name source-dir use-pkg-config?) ...)
(substitute* '("src/CMakeLists.txt" (begin
"src/3rdparty/CMakeLists.txt") ;; Delete bundled source directories.
(((string-append ".*add_subdirectory\\(" (delete-file-recursively source-dir) ...
(basename source-dir) "\\).*")) (substitute* '("src/CMakeLists.txt"
"") ...) "src/3rdparty/CMakeLists.txt")
;; Remove bundled entries from INKSCAPE_TARGET_LIBS. (((string-append ".*add_subdirectory\\("
(substitute* "src/CMakeLists.txt" (basename source-dir) "\\).*"))
(((string-append name "_LIB.*")) "") ...) "") ...)
;; Register the external libraries, so that their ;; Remove bundled entries from INKSCAPE_TARGET_LIBS.
;; headers are added to INKSCAPE_INCS_SYS and their (substitute* "src/CMakeLists.txt"
;; shared libraries added to INKSCAPE_LIBS. (((string-append name "_LIB.*")) "") ...)
(if use-pkg-config? ;; Register the external libraries, so that their
(let* ((width (string-length "pkg_check_modules(")) ;; headers are added to INKSCAPE_INCS_SYS and their
(indent (string-join (make-list width " ") ""))) ;; shared libraries added to INKSCAPE_LIBS.
(substitute* "CMakeScripts/DefineDependsandFlags.cmake" (if use-pkg-config?
(("^pkg_check_modules\\(INKSCAPE_DEP REQUIRED.*" start) (let* ((width (string-length "pkg_check_modules("))
(string-append start (indent (string-join (make-list width " ") "")))
(format #f "~a~a~%" indent name))))) (substitute* "CMakeScripts/DefineDependsandFlags.cmake"
(substitute* "CMakeScripts/DefineDependsandFlags.cmake" (("^pkg_check_modules\\(INKSCAPE_DEP REQUIRED.*" start)
(("^find_package\\(Iconv REQUIRED\\).*" start) (string-append start
(string-append (format #f " (format #f "~a~a~%" indent name)))))
(substitute* "CMakeScripts/DefineDependsandFlags.cmake"
(("^find_package\\(Iconv REQUIRED\\).*" start)
(string-append (format #f "
find_path(~a_INCLUDE_DIR NAMES ~:*~a/~:*~a.h ~:*~a.h) find_path(~a_INCLUDE_DIR NAMES ~:*~a/~:*~a.h ~:*~a.h)
if(NOT ~:*~a_INCLUDE_DIR) if(NOT ~:*~a_INCLUDE_DIR)
message(FATAL_ERROR \"~:*~a headers not found\") message(FATAL_ERROR \"~:*~a headers not found\")
@ -112,125 +117,170 @@ if(NOT ~:*~a_LIB)
else() else()
list(APPEND INKSCAPE_LIBS ~:*~a_LIB) list(APPEND INKSCAPE_LIBS ~:*~a_LIB)
endif()~%~%" endif()~%~%"
name) name)
start)))) ... start)))) ...
;; Fix the references to the headers of the ;; Fix the references to the headers of the
;; unbundled libraries. ;; unbundled libraries.
(substitute* (find-files "." "\\.h$|\\.cpp$") (substitute* (find-files "." "\\.h$|\\.cpp$")
(((string-append "#include (\"|<)3rdparty/" (((string-append "#include (\"|<)3rdparty/"
(basename source-dir)) _ quote) (basename source-dir)) _ quote)
(string-append "#include " quote (string-append "#include " quote
(basename source-dir))) (basename source-dir)))
...)))))) ...))))))
(unbundle ("2geom" "src/3rdparty/2geom" #t) (unbundle ("2geom" "src/3rdparty/2geom" #t)
;; libcroco cannot be unbundled as it is heavily ;; libcroco cannot be unbundled as it is heavily
;; modified (see: ;; modified (see:
;; https://gitlab.com/inkscape/inkscape/issues/876#note_276114904). ;; https://gitlab.com/inkscape/inkscape/issues/876#note_276114904).
;; ("croco" "src/3rdparty/libcroco" #t) ;; ("croco" "src/3rdparty/libcroco" #t)
;; FIXME: Unbundle the following libraries once they ;; FIXME: Unbundle the following libraries once they
;; have been packaged. ;; have been packaged.
;; ("cola" "src/3rdparty/adaptagrams/libcola") ;; ("cola" "src/3rdparty/adaptagrams/libcola")
;; ("avoid" "src/3rdparty/adaptagrams/libavoid") ;; ("avoid" "src/3rdparty/adaptagrams/libavoid")
;; ("vpsc" "src/3rdparty/adaptagrams/libvpsc") ;; ("vpsc" "src/3rdparty/adaptagrams/libvpsc")
;; libuemf cannot be unbundled as it slightly modified ;; libuemf cannot be unbundled as it slightly modified
;; from upstream (see: ;; from upstream (see:
;; https://gitlab.com/inkscape/inkscape/issues/973). ;; https://gitlab.com/inkscape/inkscape/issues/973).
;; ("uemf" "src/3rdparty/libuemf" #f) ;; ("uemf" "src/3rdparty/libuemf" #f)
;; FIXME: libdepixelize upstream is ancient and doesn't ;; FIXME: libdepixelize upstream is ancient and doesn't
;; build with a recent lib2geom ;; build with a recent lib2geom
;; (see: https://bugs.launchpad.net/libdepixelize/+bug/1862458). ;; (see: https://bugs.launchpad.net/libdepixelize/+bug/1862458).
;;("depixelize" "src/3rdparty/libdepixelize") ;;("depixelize" "src/3rdparty/libdepixelize")
("autotrace" "src/3rdparty/autotrace" #t))) ("autotrace" "src/3rdparty/autotrace" #t)))
;; Lift the requirement on the double-conversion library, as ;; Lift the requirement on the double-conversion library, as
;; it is only needed by lib2geom, which is now unbundled. ;; it is only needed by lib2geom, which is now unbundled.
(substitute* "CMakeScripts/DefineDependsandFlags.cmake" (substitute* "CMakeScripts/DefineDependsandFlags.cmake"
((".*find_package\\(DoubleConversion.*") "")))))) ((".*find_package\\(DoubleConversion.*") ""))))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:test-target "check" ;otherwise some test binaries are missing `(#:test-target "check" ;otherwise some test binaries are missing
#:imported-modules (,@%cmake-build-system-modules #:imported-modules (,@%cmake-build-system-modules
(guix build glib-or-gtk-build-system)) (guix build glib-or-gtk-build-system))
#:modules ((guix build cmake-build-system) #:modules ((guix build cmake-build-system)
((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
(guix build utils)) (guix build utils))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file (add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file
(assoc-ref glib-or-gtk:%standard-phases (assoc-ref glib-or-gtk:%standard-phases
'generate-gdk-pixbuf-loaders-cache-file)) 'generate-gdk-pixbuf-loaders-cache-file))
(add-after 'unpack 'patch-icon-cache-generator (add-after 'unpack 'patch-icon-cache-generator
(lambda _ (lambda _
(substitute* "share/icons/application/CMakeLists.txt" (substitute* "share/icons/application/CMakeLists.txt"
(("gtk-update-icon-cache") "true")))) (("gtk-update-icon-cache") "true"))))
(add-after 'unpack 'disable-latex-export-tests (add-after 'unpack 'disable-latex-export-tests
;; FIXME: For some reason the test.pdf_tex file generated by the ;; FIXME: For some reason the test.pdf_tex file generated by the
;; "--export-latex" lacks "some text" in its content when run in ;; "--export-latex" lacks "some text" in its content when run in
;; the build environment. Skip the related tests. ;; the build environment. Skip the related tests.
(lambda _ (lambda _
(substitute* "testfiles/cli_tests/CMakeLists.txt" (substitute* "testfiles/cli_tests/CMakeLists.txt"
(("add_cli_test\\(export-latex") (("add_cli_test\\(export-latex")
"message(TEST_DISABLED: export-latex")))) "message(TEST_DISABLED: export-latex"))))
(add-after 'unpack 'set-home (add-after 'unpack 'set-home
;; Mute Inkscape warnings during tests. ;; Mute Inkscape warnings during tests.
(lambda _ (lambda _
(setenv "HOME" (getcwd)))) (setenv "HOME" (getcwd))))
;; Move the check phase after the install phase, as when run in the ;; Move the check phase after the install phase, as when run in the
;; tests, Inkscape relies on files that are not yet installed, such ;; tests, Inkscape relies on files that are not yet installed, such
;; as the "share/inkscape/ui/units.xml" file. ;; as the "share/inkscape/ui/units.xml" file.
(delete 'check) (delete 'check)
(add-after 'install 'check (add-after 'install 'check
(assoc-ref %standard-phases 'check)) (assoc-ref %standard-phases 'check))
(add-after 'install 'glib-or-gtk-compile-schemas (add-after 'install 'glib-or-gtk-compile-schemas
(assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas))
(add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap
(assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)) (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))
(add-after 'install 'wrap-program (add-after 'install 'wrap-program
;; Ensure Python is available at runtime. ;; Ensure Python is available at runtime.
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(wrap-program (string-append out "/bin/inkscape") (wrap-program (string-append out "/bin/inkscape")
`("GUIX_PYTHONPATH" ":" prefix `("GUIX_PYTHONPATH" ":" prefix
(,(getenv "GUIX_PYTHONPATH")))))))))) (,(getenv "GUIX_PYTHONPATH"))))))))))
(inputs (inputs
`(("aspell" ,aspell) `(("aspell" ,aspell)
("autotrace" ,autotrace) ("autotrace" ,autotrace)
("gdl" ,gdl-minimal) ("gdl" ,gdl-minimal)
("gtkmm" ,gtkmm-3) ("gtkmm" ,gtkmm-3)
("gtk" ,gtk+) ("gtk" ,gtk+)
("gtkspell3" ,gtkspell3) ("gtkspell3" ,gtkspell3)
("gsl" ,gsl) ("gsl" ,gsl)
("poppler" ,poppler) ("poppler" ,poppler)
("lib2geom" ,lib2geom) ("lib2geom" ,lib2geom)
("libjpeg" ,libjpeg-turbo) ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng) ("libpng" ,libpng)
("libxml2" ,libxml2) ("libxml2" ,libxml2)
("libxslt" ,libxslt) ("libxslt" ,libxslt)
("libgc" ,libgc) ("libgc" ,libgc)
("libsoup" ,libsoup-minimal-2) ("libsoup" ,libsoup-minimal-2)
("libcdr" ,libcdr) ("libcdr" ,libcdr)
("libvisio" ,libvisio) ("libvisio" ,libvisio)
("libwpd" ,libwpd) ("libwpd" ,libwpd)
("libwpg" ,libwpg) ("libwpg" ,libwpg)
("freetype" ,freetype) ("freetype" ,freetype)
("popt" ,popt) ("popt" ,popt)
("potrace" ,potrace) ("potrace" ,potrace)
("lcms" ,lcms) ("lcms" ,lcms)
("boost" ,boost) ("boost" ,boost)
("python" ,python-wrapper) ("python" ,python-wrapper)
("python-scour" ,python-scour) ("python-scour" ,python-scour)
("python-pyserial" ,python-pyserial) ("python-pyserial" ,python-pyserial)
("python-numpy" ,python-numpy) ("python-numpy" ,python-numpy)
("python-lxml" ,python-lxml))) ("python-lxml" ,python-lxml)))
(native-inputs (native-inputs
(list imagemagick ;for tests (list imagemagick ;for tests
intltool intltool
`(,glib "bin") `(,glib "bin")
googletest googletest
perl perl
pkg-config)) pkg-config))
(home-page "https://inkscape.org/") (home-page "https://inkscape.org/")
(synopsis "Vector graphics editor") (synopsis "Vector graphics editor")
(description "Inkscape is a vector graphics editor. What sets Inkscape (description "Inkscape is a vector graphics editor. What sets Inkscape
apart is its use of Scalable Vector Graphics (SVG), an XML-based W3C standard, apart is its use of Scalable Vector Graphics (SVG), an XML-based W3C standard,
as the native format.") as the native format.")
(license license:gpl3+))) ;see the file COPYING (license license:gpl3+)))) ;see the file COPYING
(define-public inkscape
(package
(inherit inkscape/stable)
(name "inkscape")
(version "1.2")
(source
(origin
(inherit (package-source inkscape/stable))
(method url-fetch)
(uri (string-append "https://media.inkscape.org/dl/"
"resources/file/"
"inkscape-" version ".tar.xz"))
(sha256
(base32 "1bg6rlflzhq726kpcwazfscm02liammjvzpyxmj5d52l4la336wd"))))
(build-system cmake-build-system)
(arguments
(substitute-keyword-arguments (package-arguments inkscape/stable)
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'disable-problematic-tests
;; The UnionOutside and UnionOutsideSwap tests fail, comparing
;; e.g. the result "M 0 1.5 V 0 H 2 V 2 H 0.5 V 2.5 H 0 V 2 V 1.5 H
;; 0.5 V 2 z" to the expected string "M 0 0 V 1.5 V 2 V 2.5 H 0.5 V
;; 2 H 2 V 0 z" (see:
;; https://gitlab.com/inkscape/inkscape/-/issues/3689).
(lambda _
(substitute* "testfiles/src/path-boolop-test.cpp"
(("PathBoolopTest, UnionOutside(Swap)?.*" all)
(string-append all " GTEST_SKIP();\n")))))
(replace 'wrap-program
;; Ensure Python is available at runtime.
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(wrap-program (string-append out "/bin/inkscape")
`("GUIX_PYTHONPATH" prefix
(,(getenv "GUIX_PYTHONPATH")))
;; Wrapping GDK_PIXBUF_MODULE_FILE allows Inkscape to load
;; its own icons in pure environments.
`("GDK_PIXBUF_MODULE_FILE" =
(,(getenv "GDK_PIXBUF_MODULE_FILE")))))))))))
(inputs (modify-inputs (package-inputs inkscape/stable)
(append bash-minimal
librsvg))) ;for the pixbuf loader
(properties (alist-delete 'hidden? (package-properties inkscape/stable)))))

42
gnu/packages/java.scm
View file

@ -7905,6 +7905,40 @@ Commons CLI supports different types of options:
@item long options with single hyphen (ie. ant -projecthelp) @item long options with single hyphen (ie. ant -projecthelp)
@end itemize @end itemize
This is a part of the Apache Commons Project.")
(license license:asl2.0)))
(define-public java-commons-text
(package
(name "java-commons-text")
(version "1.9")
(source (origin
(method url-fetch)
(uri (string-append "mirror://apache/commons/text/source/"
"commons-text-" version "-src.tar.gz"))
(sha256
(base32
"1k99ib2dxlqxb5y94kpzf4ix8xgxz1j3n9kq3ddssqqcccsp5ik2"))))
(build-system ant-build-system)
(arguments
(list #:jar-name "java-commons-text.jar"
#:source-dir "src/main/java"
#:test-dir "src/test"
#:tests? #f ; Tests require JUnit5.
#:phases
#~(modify-phases %standard-phases
(replace 'install
(install-from-pom "pom.xml")))))
(inputs
(list java-commons-io))
(propagated-inputs
(list java-commons-lang3
apache-commons-parent-pom-51))
(home-page "https://commons.apache.org/text/")
(synopsis "Library focused on algorithms working on strings")
(description "Apache Commons Text is a library focused on algorithms
working on strings.
This is a part of the Apache Commons Project.") This is a part of the Apache Commons Project.")
(license license:asl2.0))) (license license:asl2.0)))
@ -13677,7 +13711,7 @@ network protocols, and core version control algorithms.")
(define-public abcl (define-public abcl
(package (package
(name "abcl") (name "abcl")
(version "1.8.0") (version "1.9.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -13685,7 +13719,7 @@ network protocols, and core version control algorithms.")
version "/abcl-src-" version ".tar.gz")) version "/abcl-src-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0zr5mmqyj484vza089l8vc88d07g0m8ymxzglvar3ydwyvi1x1qx")) "0scqq5c7201xhp0g6i4y3m2nrk6l5any1nisiscbsd48ya25qax1"))
(patches (patches
(search-patches (search-patches
"abcl-fix-build-xml.patch")))) "abcl-fix-build-xml.patch"))))
@ -13732,6 +13766,10 @@ Lisp language featuring both an interpreter and a compiler, running in the
JVM. It supports JSR-223 (Java scripting API): it can be a scripting engine JVM. It supports JSR-223 (Java scripting API): it can be a scripting engine
in any Java application. Additionally, it can be used to implement (parts of) in any Java application. Additionally, it can be used to implement (parts of)
the application using Java to Lisp integration APIs.") the application using Java to Lisp integration APIs.")
(native-search-paths
(list (search-path-specification
(variable "XDG_DATA_DIRS")
(files '("share")))))
(license (list license:gpl2+ (license (list license:gpl2+
;; named-readtables is released under 3 clause BSD ;; named-readtables is released under 3 clause BSD
license:bsd-3 license:bsd-3

103
gnu/packages/julia-xyz.scm
View file

@ -1119,6 +1119,49 @@ both the 256 color and 24 bit true color extensions, and the different text
styles available to terminals.") styles available to terminals.")
(license license:expat))) (license license:expat)))
(define-public julia-csv
(package
(name "julia-csv")
(version "0.10.4")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/JuliaData/CSV.jl")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "15kjh5wa6ravb10n9n9bsh7ggmarqmw8s57p35l4b3dqk9d8qafh"))))
(build-system julia-build-system)
(arguments
(list #:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'fix-reference-to-cat
(lambda _
(substitute* "test/basics.jl"
;; XXXX: Test fail to read using CVS.Chunk; raising:
;; ArgumentError: unable to iterate chunks from input file source
;; Disable and the two tests using it.
(("chunks = CSV.Chunks") "# chunks = CSV.Chunks")
(("@test sum\\(length, chunks\\) == 10000")
"# @test sum(length, chunks) == 10000")
(("@test Tables.partitions\\(chunks\\) === chunks")
"# @test Tables.partitions(chunks) === chunks")))))))
(propagated-inputs
(list julia-codeczlib
julia-filepathsbase
julia-inlinestrings
julia-parsers
julia-pooledarrays
julia-sentinelarrays
julia-tables
julia-weakrefstrings))
(home-page "https://github.com/JuliaData/CSV.jl")
(synopsis "Fast and flexible delimited-file reader/writer")
(description "This package provides reader/writer for delimited text data,
as comma-delimited (csv), tab-delimited (tsv), or otherwise.")
(license license:expat)))
(define-public julia-dataapi (define-public julia-dataapi
(package (package
(name "julia-dataapi") (name "julia-dataapi")
@ -2847,6 +2890,32 @@ negative infinity in Julia.")
interfaces with @file{.ini} files.") interfaces with @file{.ini} files.")
(license license:expat))) (license license:expat)))
(define-public julia-inlinestrings
(package
(name "julia-inlinestrings")
(version "1.1.3")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/JuliaStrings/InlineStrings.jl")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1dcdpxlphjliqlnkcri7mhg9bqqzpsdj80h9gkw8xhzr3ls473zr"))))
(build-system julia-build-system)
(propagated-inputs
(list julia-parsers))
(home-page "https://github.com/JuliaStrings/InlineStrings.jl")
(synopsis "Fixed-width string types")
(description "This package provides a set of custom string types of
various fixed sizes. Each inline string is a custom primitive type and can
benefit from being stack friendly by avoiding allocations/heap tracking in the
GC. When used in an array, the elements are able to be stored inline since
each one has a fixed size. Currently support inline strings from 1 byte up to
255 bytes.")
(license license:expat)))
(define-public julia-interpolations (define-public julia-interpolations
(package (package
(name "julia-interpolations") (name "julia-interpolations")
@ -3086,7 +3155,7 @@ extensions to the iterator interface.")
(define-public julia-json (define-public julia-json
(package (package
(name "julia-json") (name "julia-json")
(version "0.21.1") (version "0.21.3")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -3095,7 +3164,7 @@ extensions to the iterator interface.")
(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 "1f9k613kbknmp4fgjxvjaw4d5sfbx8a5hmcszmp1w9rqfqngjx9m")))) (base32 "1l2p852sxq6h5fif3dqshvbw17gb06jmq2nkr88spvp7s0n0nslz"))))
(build-system julia-build-system) (build-system julia-build-system)
(propagated-inputs (propagated-inputs
(list julia-datastructures (list julia-datastructures
@ -3946,7 +4015,7 @@ performance critical code.")
(define-public julia-parsers (define-public julia-parsers
(package (package
(name "julia-parsers") (name "julia-parsers")
(version "1.1.0") (version "2.2.4")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -3955,7 +4024,7 @@ performance critical code.")
(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 "1gz3drd5334xrbx2ms33hiifkd0q1in4ywc92xvrkq3xgzdjqjdk")))) (base32 "09v2x9yd1wdp74hzsf6218dpamlf2hb5nkmixqb4bc53ll8hpw4i"))))
(build-system julia-build-system) (build-system julia-build-system)
(home-page "https://github.com/JuliaData/Parsers.jl") (home-page "https://github.com/JuliaData/Parsers.jl")
(synopsis "Fast parsing machinery for basic types in Julia") (synopsis "Fast parsing machinery for basic types in Julia")
@ -4771,6 +4840,27 @@ user-friendly, scratch spaces should, in general, not be used for a storing
files that the user must interact with through a file browser.") files that the user must interact with through a file browser.")
(license license:expat))) (license license:expat)))
(define-public julia-sentinelarrays
(package
(name "julia-sentinelarrays")
(version "1.3.13")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/JuliaData/SentinelArrays.jl")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1h3vpz7xskbf2a60imdg0irwh9bybkahjpnb6b3wyk0j9a97nqkr"))))
(build-system julia-build-system)
(home-page "https://github.com/JuliaData/SentinelArrays.jl")
(synopsis "Array types using sentinel values")
(description "This package provides @code{SentinelArray{T}} that wraps an
@code{AbstractArray} of type @code{T}, and accepts a sentinel and value
argument.")
(license license:expat)))
(define-public julia-showoff (define-public julia-showoff
(package (package
(name "julia-showoff") (name "julia-showoff")
@ -5625,7 +5715,7 @@ useful in order to support @code{VersionNumber} comparisons applied to
(define-public julia-weakrefstrings (define-public julia-weakrefstrings
(package (package
(name "julia-weakrefstrings") (name "julia-weakrefstrings")
(version "1.1.0") (version "1.4.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -5634,10 +5724,11 @@ useful in order to support @code{VersionNumber} comparisons applied to
(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 "14h1vdnc3rx87w6v2rr59lgb4kai2hd1wzqpxhmzsi8karg2z219")))) (base32 "1ca94bpsjqrap2y9wlixspnisfkcms7aax0kpv7yn0v2vs9481wk"))))
(build-system julia-build-system) (build-system julia-build-system)
(propagated-inputs (propagated-inputs
(list julia-dataapi (list julia-dataapi
julia-inlinestrings
julia-parsers)) julia-parsers))
(home-page "https://github.com/JuliaData/WeakRefStrings.jl") (home-page "https://github.com/JuliaData/WeakRefStrings.jl")
(synopsis "Efficient string representation and transfer in Julia") (synopsis "Efficient string representation and transfer in Julia")

40
gnu/packages/jupyter.scm
View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019, 2022 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2019, 2022 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2021 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2021, 2022 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2021 Hugo Lecomte <hugo.lecomte@inria.fr> ;;; Copyright © 2021 Hugo Lecomte <hugo.lecomte@inria.fr>
;;; Copyright © 2022 Marius Bakke <marius@gnu.org> ;;; Copyright © 2022 Marius Bakke <marius@gnu.org>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
@ -521,6 +521,44 @@ nbshow present a single notebook in a terminal-friendly way
@end table") @end table")
(license license:bsd-3))) (license license:bsd-3)))
(define-public python-nbstripout
(package
(name "python-nbstripout")
(version "0.5.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "nbstripout" version))
(sha256
(base32
"1n57nvxsc94gz9w8ymi83bjkfhfwkpmx4y14m6gjrmlqd49m1aw6"))))
(build-system python-build-system)
(arguments
'(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'delete-bad-tests
(lambda _
;; These tests use git and hg, and they are sensitive to the
;; exact printed output.
(for-each delete-file (list "tests/test-git.t"
"tests/test-hg.t"
"tests/test-status.t"
"tests/test-uninstall.t"))))
(add-before 'check 'set-CRAMSHELL
(lambda _
(setenv "CRAMSHELL" (which "bash")))))))
(propagated-inputs (list python-nbformat))
(native-inputs
(list python-pytest
python-pytest-cram
python-pytest-flake8
python-pytest-runner))
(home-page "https://github.com/kynan/nbstripout")
(synopsis "Strips outputs from Jupyter and IPython notebooks")
(description
"This package opens a notebook, strips its output, and writes the outputless
version to the original file.")
(license license:expat)))
(define-public repo2docker (define-public repo2docker
(package (package
(name "repo2docker") (name "repo2docker")

29
gnu/packages/kde-plasma.scm
View file

@ -31,11 +31,14 @@
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages freedesktop) #:use-module (gnu packages freedesktop)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
#:use-module (gnu packages gtk)
#:use-module (gnu packages kde-frameworks) #:use-module (gnu packages kde-frameworks)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages qt) #:use-module (gnu packages qt)
#:use-module (gnu packages xorg)) #:use-module (gnu packages xorg)
#:use-module (gnu packages web))
(define-public breeze (define-public breeze
(package (package
@ -83,6 +86,30 @@
the Plasma Desktop. Breeze is the default theme for the KDE Plasma desktop.") the Plasma Desktop. Breeze is the default theme for the KDE Plasma desktop.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public breeze-gtk
(package
(name "breeze-gtk")
(version "5.19.5")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/plasma/"
version "/" name
"-" version ".tar.xz"))
(sha256
(base32
"1j2nq9yw1ragmgwrz9f6ca4ifpi86qv1bbprdgd2qm2yh7vb44sj"))))
(build-system qt-build-system)
(arguments
'(#:tests? #f)) ;no 'test' target
(native-inputs (list breeze extra-cmake-modules sassc python
python-pycairo))
(home-page "https://invent.kde.org/plasma/breeze")
(synopsis "Default KDE Plasma theme (GTK+ port)")
(description "GTK+ port of the Breeze visual style for the Plasma Desktop.
Breeze is the default theme for the KDE Plasma desktop.")
(license (list license:bsd-3 ;cmake/FindSass.cmake
license:lgpl2.1+)))) ;<all other files>
(define-public kdecoration (define-public kdecoration
(package (package
(name "kdecoration") (name "kdecoration")

4
gnu/packages/kde.scm
View file

@ -479,7 +479,7 @@ expression library, that is used in Krita.")
(define-public krita (define-public krita
(package (package
(name "krita") (name "krita")
(version "5.0.2") (version "5.0.8")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -487,7 +487,7 @@ expression library, that is used in Krita.")
"mirror://kde/stable/krita/" version "/krita-" version "mirror://kde/stable/krita/" version "/krita-" version
".tar.gz")) ".tar.gz"))
(sha256 (sha256
(base32 "1gww95fyd5r3x2260j2ls7d8fp4rsfxnwdqai2j7fjahxg3iyxg6")))) (base32 "0iaypyv21zxvhr989r9j9nlhx642jc89xphz1qaw9q1y0yjiy7gd"))))
(build-system qt-build-system) (build-system qt-build-system)
(arguments (arguments
`(#:tests? #f `(#:tests? #f

1
gnu/packages/license.scm
View file

@ -25,6 +25,7 @@
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages perl-check) #:use-module (gnu packages perl-check)
#:use-module (gnu packages python-build)
#:use-module (gnu packages python-web) #:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz) #:use-module (gnu packages python-xyz)
#:use-module (guix build-system perl) #:use-module (guix build-system perl)

181
gnu/packages/linux.scm
View file

@ -352,25 +352,26 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
;; The current "stable" kernels. That is, the most recently released major ;; The current "stable" kernels. That is, the most recently released major
;; versions that are still supported upstream. ;; versions that are still supported upstream.
(define-public linux-libre-5.17-version "5.17.15") (define-public linux-libre-5.18-version "5.18.10")
(define-public linux-libre-5.17-gnu-revision "gnu") (define-public linux-libre-5.18-gnu-revision "gnu")
(define deblob-scripts-5.17 (define deblob-scripts-5.18
(linux-libre-deblob-scripts (linux-libre-deblob-scripts
linux-libre-5.17-version linux-libre-5.18-version
linux-libre-5.17-gnu-revision linux-libre-5.18-gnu-revision
(base32 "08ip5g827f30qzb3j2l19zkbdqv00sij46nbrjg75h5kkasdbfgr") (base32 "09aikdhij4d89wqd8mmkdr0nrfwqz6dx3n74qm6wx815rfngd2dz")
(base32 "1654fibbwnbcgnikn1qqa5igd2j90kslbb3pshph5wpj052cvgjy"))) (base32 "0vjpn8iw9yg39sr6jfhzyvivf159h9zfgnjamwa283zfll0h0a53")))
(define-public linux-libre-5.17-pristine-source (define-public linux-libre-5.18-pristine-source
(let ((version linux-libre-5.17-version) (let ((version linux-libre-5.18-version)
(hash (base32 "0a5n1lb43nhnhwjwclkk3dqp2nxsx5ny7zfl8idvzshf94m9472a"))) (hash (base32 "1qyyfdfp8qn8a6brgly0h72jvz9s0wp2pjyrcpknzvmqvc0kv7pr")))
(make-linux-libre-source version (make-linux-libre-source version
(%upstream-linux-source version hash) (%upstream-linux-source version hash)
deblob-scripts-5.17))) deblob-scripts-5.18)))
;; The "longterm" kernels — the older releases with long-term upstream support. ;; The "longterm" kernels — the older releases with long-term upstream support.
;; Here are the support timelines: ;; Here are the support timelines:
;; <https://www.kernel.org/category/releases.html> ;; <https://www.kernel.org/category/releases.html>
(define-public linux-libre-5.15-version "5.15.49") (define-public linux-libre-5.15-version "5.15.53")
(define-public linux-libre-5.15-gnu-revision "gnu") (define-public linux-libre-5.15-gnu-revision "gnu")
(define deblob-scripts-5.15 (define deblob-scripts-5.15
(linux-libre-deblob-scripts (linux-libre-deblob-scripts
@ -380,12 +381,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "129qlhwdv2mfb85gbvq03kkbdfp73b444rryr4rrbvi0jmq4cp24"))) (base32 "129qlhwdv2mfb85gbvq03kkbdfp73b444rryr4rrbvi0jmq4cp24")))
(define-public linux-libre-5.15-pristine-source (define-public linux-libre-5.15-pristine-source
(let ((version linux-libre-5.15-version) (let ((version linux-libre-5.15-version)
(hash (base32 "1p2r02h2z0j34hpkp3kr4741pr15ii72b94zllravx27pa9phj9j"))) (hash (base32 "01vvyw6sjkkjs7l4cy04yv19d9f3wmpy5gqfm763y7q58dr73apk")))
(make-linux-libre-source version (make-linux-libre-source version
(%upstream-linux-source version hash) (%upstream-linux-source version hash)
deblob-scripts-5.15))) deblob-scripts-5.15)))
(define-public linux-libre-5.10-version "5.10.124") (define-public linux-libre-5.10-version "5.10.129")
(define-public linux-libre-5.10-gnu-revision "gnu1") (define-public linux-libre-5.10-gnu-revision "gnu1")
(define deblob-scripts-5.10 (define deblob-scripts-5.10
(linux-libre-deblob-scripts (linux-libre-deblob-scripts
@ -395,12 +396,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "1981axxswghza3iadp94q54y8w30h9w9vyq4cbjiiv9alvbv0pb8"))) (base32 "1981axxswghza3iadp94q54y8w30h9w9vyq4cbjiiv9alvbv0pb8")))
(define-public linux-libre-5.10-pristine-source (define-public linux-libre-5.10-pristine-source
(let ((version linux-libre-5.10-version) (let ((version linux-libre-5.10-version)
(hash (base32 "0yz3yw02b6b1sq800r46x5b3dagswb6z4clrfq485c4669sb2ipc"))) (hash (base32 "1zlw89m7wpy02rnk8mizng43i77hrkwzl280sivqz1c05c2jzrxa")))
(make-linux-libre-source version (make-linux-libre-source version
(%upstream-linux-source version hash) (%upstream-linux-source version hash)
deblob-scripts-5.10))) deblob-scripts-5.10)))
(define-public linux-libre-5.4-version "5.4.200") (define-public linux-libre-5.4-version "5.4.204")
(define-public linux-libre-5.4-gnu-revision "gnu1") (define-public linux-libre-5.4-gnu-revision "gnu1")
(define deblob-scripts-5.4 (define deblob-scripts-5.4
(linux-libre-deblob-scripts (linux-libre-deblob-scripts
@ -410,12 +411,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "1vnjbdyssa7dwyjl9kg35alwvf7yh597cl74yr1wy2gk5bc9paw6"))) (base32 "1vnjbdyssa7dwyjl9kg35alwvf7yh597cl74yr1wy2gk5bc9paw6")))
(define-public linux-libre-5.4-pristine-source (define-public linux-libre-5.4-pristine-source
(let ((version linux-libre-5.4-version) (let ((version linux-libre-5.4-version)
(hash (base32 "1f15al9g4cd17fm43im5rqqrbz1cqhz2hq5ycpqvwa02pydprsga"))) (hash (base32 "0ivsfdw55mysihylk5n46r7limf1rqddipap17mkfnyq345b3hgx")))
(make-linux-libre-source version (make-linux-libre-source version
(%upstream-linux-source version hash) (%upstream-linux-source version hash)
deblob-scripts-5.4))) deblob-scripts-5.4)))
(define-public linux-libre-4.19-version "4.19.248") (define-public linux-libre-4.19-version "4.19.251")
(define-public linux-libre-4.19-gnu-revision "gnu1") (define-public linux-libre-4.19-gnu-revision "gnu1")
(define deblob-scripts-4.19 (define deblob-scripts-4.19
(linux-libre-deblob-scripts (linux-libre-deblob-scripts
@ -425,12 +426,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "00i91lx938nqlgy63hiricqd0fnbbf26vgya9c5lb7m1f4x324im"))) (base32 "00i91lx938nqlgy63hiricqd0fnbbf26vgya9c5lb7m1f4x324im")))
(define-public linux-libre-4.19-pristine-source (define-public linux-libre-4.19-pristine-source
(let ((version linux-libre-4.19-version) (let ((version linux-libre-4.19-version)
(hash (base32 "0cdflfk6l13slw1cawpkhpjzbbnffcbyffrh29p9jg73pdqx23y4"))) (hash (base32 "1x6ag81wzcynfa4l819mamk9k11fxgq5m1gain93avparjnwi1rp")))
(make-linux-libre-source version (make-linux-libre-source version
(%upstream-linux-source version hash) (%upstream-linux-source version hash)
deblob-scripts-4.19))) deblob-scripts-4.19)))
(define-public linux-libre-4.14-version "4.14.284") (define-public linux-libre-4.14-version "4.14.287")
(define-public linux-libre-4.14-gnu-revision "gnu1") (define-public linux-libre-4.14-gnu-revision "gnu1")
(define deblob-scripts-4.14 (define deblob-scripts-4.14
(linux-libre-deblob-scripts (linux-libre-deblob-scripts
@ -440,12 +441,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "00i91lx938nqlgy63hiricqd0fnbbf26vgya9c5lb7m1f4x324im"))) (base32 "00i91lx938nqlgy63hiricqd0fnbbf26vgya9c5lb7m1f4x324im")))
(define-public linux-libre-4.14-pristine-source (define-public linux-libre-4.14-pristine-source
(let ((version linux-libre-4.14-version) (let ((version linux-libre-4.14-version)
(hash (base32 "1f7bidisa6b4ff0mgn66h1nmf94j5mcx4wnkwnd9f49im6hcqllq"))) (hash (base32 "05pnz2wch5b430j82sjqhxyfbpln4p1569avj2qkk62x4164kdbq")))
(make-linux-libre-source version (make-linux-libre-source version
(%upstream-linux-source version hash) (%upstream-linux-source version hash)
deblob-scripts-4.14))) deblob-scripts-4.14)))
(define-public linux-libre-4.9-version "4.9.319") (define-public linux-libre-4.9-version "4.9.322")
(define-public linux-libre-4.9-gnu-revision "gnu1") (define-public linux-libre-4.9-gnu-revision "gnu1")
(define deblob-scripts-4.9 (define deblob-scripts-4.9
(linux-libre-deblob-scripts (linux-libre-deblob-scripts
@ -455,7 +456,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "0bib3641dbcqdkx3anna3caxnsg3nw9cnmhcklq0s93g3m57041h"))) (base32 "0bib3641dbcqdkx3anna3caxnsg3nw9cnmhcklq0s93g3m57041h")))
(define-public linux-libre-4.9-pristine-source (define-public linux-libre-4.9-pristine-source
(let ((version linux-libre-4.9-version) (let ((version linux-libre-4.9-version)
(hash (base32 "11242bn95k51knm9da7xk7r10vk7iji06wix1cq4g5nzldrfp9sp"))) (hash (base32 "02g4lkiq6y5i6vrrk2i9h6dxka6mfjpk9dz3517adw5qf79ph6b2")))
(make-linux-libre-source version (make-linux-libre-source version
(%upstream-linux-source version hash) (%upstream-linux-source version hash)
deblob-scripts-4.9))) deblob-scripts-4.9)))
@ -488,8 +489,8 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(patches (append (origin-patches source) (patches (append (origin-patches source)
patches)))) patches))))
(define-public linux-libre-5.17-source (define-public linux-libre-5.18-source
(source-with-patches linux-libre-5.17-pristine-source (source-with-patches linux-libre-5.18-pristine-source
(list %boot-logo-patch (list %boot-logo-patch
%linux-libre-arm-export-__sync_icache_dcache-patch))) %linux-libre-arm-export-__sync_icache_dcache-patch)))
@ -602,10 +603,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(description "Headers of the Linux-Libre kernel.") (description "Headers of the Linux-Libre kernel.")
(license license:gpl2))) (license license:gpl2)))
(define-public linux-libre-headers-5.17 (define-public linux-libre-headers-5.18
(make-linux-libre-headers* linux-libre-5.17-version (make-linux-libre-headers* linux-libre-5.18-version
linux-libre-5.17-gnu-revision linux-libre-5.18-gnu-revision
linux-libre-5.17-source)) linux-libre-5.18-source))
(define-public linux-libre-headers-5.15 (define-public linux-libre-headers-5.15
(make-linux-libre-headers* linux-libre-5.15-version (make-linux-libre-headers* linux-libre-5.15-version
@ -923,18 +924,18 @@ It has been modified to remove all non-free binary blobs.")
;;; Generic kernel packages. ;;; Generic kernel packages.
;;; ;;;
(define-public linux-libre-5.17 (define-public linux-libre-5.18
(make-linux-libre* linux-libre-5.17-version (make-linux-libre* linux-libre-5.18-version
linux-libre-5.17-gnu-revision linux-libre-5.18-gnu-revision
linux-libre-5.17-source linux-libre-5.18-source
'("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux" "riscv64-linux") '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux" "riscv64-linux")
#:configuration-file kernel-config)) #:configuration-file kernel-config))
(define-public linux-libre-version linux-libre-5.17-version) (define-public linux-libre-version linux-libre-5.18-version)
(define-public linux-libre-gnu-revision linux-libre-5.17-gnu-revision) (define-public linux-libre-gnu-revision linux-libre-5.18-gnu-revision)
(define-public linux-libre-pristine-source linux-libre-5.17-pristine-source) (define-public linux-libre-pristine-source linux-libre-5.18-pristine-source)
(define-public linux-libre-source linux-libre-5.17-source) (define-public linux-libre-source linux-libre-5.18-source)
(define-public linux-libre linux-libre-5.17) (define-public linux-libre linux-libre-5.18)
(define-public linux-libre-5.15 (define-public linux-libre-5.15
(make-linux-libre* linux-libre-5.15-version (make-linux-libre* linux-libre-5.15-version
@ -1159,9 +1160,9 @@ It has been modified to remove all non-free binary blobs.")
(define-public linux-libre-with-bpf (define-public linux-libre-with-bpf
(let ((base-linux-libre (let ((base-linux-libre
(make-linux-libre* (make-linux-libre*
linux-libre-5.17-version linux-libre-5.18-version
linux-libre-5.17-gnu-revision linux-libre-5.18-gnu-revision
linux-libre-5.17-source linux-libre-5.18-source
'("x86_64-linux" "i686-linux" "armhf-linux" '("x86_64-linux" "i686-linux" "armhf-linux"
"aarch64-linux" "riscv64-linux") "aarch64-linux" "riscv64-linux")
#:extra-version "bpf" #:extra-version "bpf"
@ -1342,8 +1343,8 @@ and the notification, WiFi, and Bluetooth LED.")
(license license:gpl2))) (license license:gpl2)))
(define-public rtl8821ce-linux-module (define-public rtl8821ce-linux-module
(let ((commit "dce62b9bbb7c76339b514153fcebb3a19bafdcc7") (let ((commit "be733dc86781c68571650b395dd0fa6b53c0a039")
(revision "5")) (revision "6"))
(package (package
(name "rtl8821ce-linux-module") (name "rtl8821ce-linux-module")
(version (git-version "0.0.0" revision commit)) (version (git-version "0.0.0" revision commit))
@ -1356,7 +1357,7 @@ and the notification, WiFi, and Bluetooth LED.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0s5v6z4x7xdgr5qm4q7dr9nd5c8qy28jaw0p78hxji3m8if56vka")))) "00sd7s0582b9jcpfgy0fw6418dwg700mfyizkfr22jf2x140iy70"))))
(build-system linux-module-build-system) (build-system linux-module-build-system)
(arguments (arguments
(list #:make-flags (list #:make-flags
@ -1383,8 +1384,8 @@ network adapters.")
(license license:gpl2)))) (license license:gpl2))))
(define-public rtl8812au-aircrack-ng-linux-module (define-public rtl8812au-aircrack-ng-linux-module
(let ((commit "37e27f9165300c89607144b646545fac576ec510") (let ((commit "6d0d9fb56d4d918012a5c7a030b9233cad039cdd")
(revision "7")) (revision "8"))
(package (package
(inherit rtl8821ce-linux-module) (inherit rtl8821ce-linux-module)
(name "rtl8812au-aircrack-ng-linux-module") (name "rtl8812au-aircrack-ng-linux-module")
@ -1397,7 +1398,7 @@ network adapters.")
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "09n814pa6i0b0xkgssymcmbcdic05y9z5bsr6sxjfs40wawsk6af")) (base32 "012asiy43ik13kl9p97sscdsqq5jihq73s4ws3g5wqqczqcgrsvc"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
#~(begin #~(begin
@ -3536,13 +3537,12 @@ compressed, transparent to other programs, without decompressing them.")
"1xngddsph43bxljywahi9d44fxr022slsap4hh91w8xnq54d2sw2")))) "1xngddsph43bxljywahi9d44fxr022slsap4hh91w8xnq54d2sw2"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(;; There's a 'test' target, but it requires NUMA support in the kernel `(,@(if (target-riscv64?)
`(#:make-flags (list "LDFLAGS=-latomic"))
'())
;; There's a 'test' target, but it requires NUMA support in the kernel
;; to run, which we can't assume to have. ;; to run, which we can't assume to have.
#:tests? #f)) #:tests? #f))
;; NUMA is apparently not supported on armhf, see
;; http://www.spinics.net/lists/linux-numa/msg01157.html
(supported-systems (delete "armhf-linux" %supported-systems))
(home-page "https://github.com/numactl/numactl") (home-page "https://github.com/numactl/numactl")
(synopsis "Tools for non-uniform memory access (NUMA) machines") (synopsis "Tools for non-uniform memory access (NUMA) machines")
(description (description
@ -7133,7 +7133,7 @@ every time the power supply source is changed.")
(define-public tlpui (define-public tlpui
(package (package
(name "tlpui") (name "tlpui")
(version "1.5.0") (version "1.5.0-1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -7142,45 +7142,46 @@ every time the power supply source is changed.")
(commit (string-append "tlpui-" version)))) (commit (string-append "tlpui-" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0ca18hazxksx516nkh28f6rd0l1039nkn7mszqfy68c461061q1h")))) (base32 "16a6x733szsggn23ns7bj3gpvb80675plh96v4llrz0s8p3h47pg"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases (list
(modify-phases %standard-phases #:phases
(add-after 'unpack 'patch-setup.py #~(modify-phases %standard-phases
;; Install data_files to $out/share instead of /usr/share. (add-after 'unpack 'patch-setup.py
(lambda _ ;; Install data_files to $out/share instead of /usr/share.
(substitute* "setup.py" (lambda _
(("/usr/") "")))) (substitute* "setup.py"
(add-after 'unpack 'use-tlp-input (("/usr/") ""))))
;; Hard-code tlp-stat filename to avoid propagating "tlp". (add-after 'unpack 'use-tlp-input
(lambda* (#:key inputs #:allow-other-keys) ;; Hard-code tlp-stat filename to avoid propagating "tlp".
(let ((tlp-stat (search-input-file inputs "/bin/tlp-stat"))) (lambda* (#:key inputs #:allow-other-keys)
(with-directory-excursion "tlpui" (let ((tlp-stat (search-input-file inputs "/bin/tlp-stat")))
(substitute* '("file.py" "settingshelper.py" "statui.py") (with-directory-excursion "tlpui"
(("which\\(\"tlp-stat\"\\)") (substitute* '("file.py" "settingshelper.py" "statui.py")
(string-append "'" tlp-stat "'")) (("which\\(\"tlp-stat\"\\)")
(("\"tlp-stat\"") (string-append "'" tlp-stat "'"))
(string-append "'" tlp-stat "'"))))))) (("\"tlp-stat\"")
(add-before 'check 'fix-home-directory (string-append "'" tlp-stat "'")))))))
(lambda _ (add-before 'check 'fix-home-directory
;; Tests fail with "Permission denied: (lambda _
;; '/homeless-shelter'". ;; Tests fail with "Permission denied:
(setenv "HOME" "/tmp"))) ;; '/homeless-shelter'".
;; `sanity-check' phase errors out with the following (setenv "HOME" "/tmp")))
;; messages: "Unable to init server: Could not connect: ;; `sanity-check' phase errors out with the following
;; Connection refused" and "Error: cannot read user ;; messages: "Unable to init server: Could not connect:
;; configuration from /etc/tlp.conf or /etc/default/tlp". ;; Connection refused" and "Error: cannot read user
(delete 'sanity-check) ;; configuration from /etc/tlp.conf or /etc/default/tlp".
(replace 'check (delete 'sanity-check)
(lambda _ (replace 'check
(invoke "python" "-m" "discover"))) (lambda* (#:key tests? #:allow-other-keys)
(add-after 'install 'wrap-gi-python (when tests?
(lambda* (#:key outputs #:allow-other-keys) (invoke "python" "-m" "discover"))))
(let ((out (assoc-ref outputs "out")) (add-after 'install 'wrap-gi-python
(gi-typelib-path (getenv "GI_TYPELIB_PATH"))) (lambda _
(wrap-program (string-append out "/bin/tlpui") (let ((gi-typelib-path (getenv "GI_TYPELIB_PATH")))
`("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))))))) (wrap-program (string-append #$output "/bin/tlpui")
`("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))))))))
(native-inputs (native-inputs
(list `(,glib "bin") gobject-introspection python-discover)) (list `(,glib "bin") gobject-introspection python-discover))
(inputs (inputs

30
gnu/packages/lisp-check.scm
View file

@ -607,8 +607,8 @@ by Chris Riesbeck.")
(sbcl-package->cl-source-package sbcl-nst)) (sbcl-package->cl-source-package sbcl-nst))
(define-public sbcl-parachute (define-public sbcl-parachute
(let ((commit "ca04dd8e43010a6dfffa26dbe1d62af86008d666") (let ((commit "86563473dc23fb1277d35a3ad2c911a6c8e5b0da")
(revision "0")) (revision "1"))
(package (package
(name "sbcl-parachute") (name "sbcl-parachute")
(version (git-version "1.1.1" revision commit)) (version (git-version "1.1.1" revision commit))
@ -622,7 +622,7 @@ by Chris Riesbeck.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1mvsm3r0r6a2bg75nw0q7n9vlby3ch45qjl7hnb5k1z2n5x5lh60")))) "026crl465xqh3fnskfd4c1sxa9c33dfy702cf3l5apbjyj1dg20n"))))
(build-system asdf-build-system/sbcl) (build-system asdf-build-system/sbcl)
(inputs (inputs
(list sbcl-documentation-utils sbcl-form-fiddle)) (list sbcl-documentation-utils sbcl-form-fiddle))
@ -695,7 +695,13 @@ advantages of @command{prove} are:
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1l0lfl7cdnr2qf4zh38hi4llxg22c49zkm639bdkmvlkzwj3ndwf")))) (base32 "1l0lfl7cdnr2qf4zh38hi4llxg22c49zkm639bdkmvlkzwj3ndwf"))
(modules '((guix build utils)))
(snippet
;; The useless bundled debian folder drags `make' into the closure.
`(begin
(delete-file-recursively "debian")
#t))))
(build-system asdf-build-system/sbcl) (build-system asdf-build-system/sbcl)
(home-page "http://quickdocs.org/ptester/") (home-page "http://quickdocs.org/ptester/")
(synopsis "Portable test harness package") (synopsis "Portable test harness package")
@ -755,7 +761,13 @@ This is intended to be a successor of Prove.")
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "13si2rrxaagbr0bkvg6sqicxxpyshabx6ad6byc9n2ik5ysna69b")))) (base32 "13si2rrxaagbr0bkvg6sqicxxpyshabx6ad6byc9n2ik5ysna69b"))
(modules '((guix build utils)))
(snippet
;; The useless bundled debian folder drags `make' into the closure.
`(begin
(delete-file-recursively "debian")
#t))))
(build-system asdf-build-system/sbcl) (build-system asdf-build-system/sbcl)
(synopsis "MIT Regression Tester") (synopsis "MIT Regression Tester")
(description (description
@ -929,7 +941,13 @@ parameterization.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0argfmp9nghs4sihyj3f8ch9qfib2b7ll07v5m9ziajgzsfl5xw3")))) "0argfmp9nghs4sihyj3f8ch9qfib2b7ll07v5m9ziajgzsfl5xw3"))
(modules '((guix build utils)))
(snippet
;; The useless bundled debian folder drags `make' into the closure.
`(begin
(delete-file-recursively "debian")
#t))))
(build-system asdf-build-system/sbcl) (build-system asdf-build-system/sbcl)
(arguments (arguments
'(#:phases '(#:phases

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

File diff suppressed because it is too large Load diff

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