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

Merge branch 'master' into staging

Browse source
This commit is contained in:
Leo Famulari 2021-01-25 15:21:09 -05:00
commit 68dd78e2e4
No known key found for this signature in database
GPG key ID: 2646FA30BACA7F08
177 changed files with 7933 additions and 2629 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Makefile.am
View file

@ -103,6 +103,7 @@ MODULES = \
guix/profiles.scm \ guix/profiles.scm \
guix/serialization.scm \ guix/serialization.scm \
guix/nar.scm \ guix/nar.scm \
guix/narinfo.scm \
guix/derivations.scm \ guix/derivations.scm \
guix/grafts.scm \ guix/grafts.scm \
guix/repl.scm \ guix/repl.scm \
@ -987,7 +988,7 @@ download-po.$(1):
fi ; \ fi ; \
for lang in $$$$LINGUAS; do \ for lang in $$$$LINGUAS; do \
if wget -nv -O "$(top_srcdir)/$(2)/$(3)$$$$lang.po.tmp" \ if wget -nv -O "$(top_srcdir)/$(2)/$(3)$$$$lang.po.tmp" \
"https://translationproject.org/latest/$(1)/$$$$lang.po" ; \ "https://translate.fedoraproject.org/api/translations/guix/$(1)/$$$$lang/file/" ; \
then \ then \
mv "$(top_srcdir)/$(2)/$(3)$$$$lang.po"{.tmp,} ; \ mv "$(top_srcdir)/$(2)/$(3)$$$$lang.po"{.tmp,} ; \
else \ else \
@ -999,11 +1000,12 @@ download-po.$(1):
endef endef
$(eval $(call make-download-po-rule,documentation-cookbook,po/doc,guix-cookbook.))
$(eval $(call make-download-po-rule,documentation-manual,po/doc,guix-manual.))
$(eval $(call make-download-po-rule,guix,po/guix)) $(eval $(call make-download-po-rule,guix,po/guix))
$(eval $(call make-download-po-rule,guix-packages,po/packages)) $(eval $(call make-download-po-rule,packages,po/packages))
$(eval $(call make-download-po-rule,guix-manual,po/doc,guix-manual.))
download-po: $(foreach domain,guix guix-packages guix-manual,download-po.$(domain)) download-po: $(foreach domain,guix packages documentation-manual documentation-cookbook,download-po.$(domain))
.PHONY: download-po .PHONY: download-po
## -------------- ## ## -------------- ##

4
doc/contributing.texi
View file

@ -593,8 +593,8 @@ such as @command{guix package --show} take care of rendering it
appropriately. appropriately.
Synopses and descriptions are translated by volunteers Synopses and descriptions are translated by volunteers
@uref{https://translationproject.org/domain/guix-packages.html, at the @uref{https://translate.fedoraproject.org/projects/guix/packages, at
Translation Project} so that as many users as possible can read them in Weblate} so that as many users as possible can read them in
their native language. User interfaces search them and display them in their native language. User interfaces search them and display them in
the language specified by the current locale. the language specified by the current locale.

217
doc/guix-cookbook.texi
View file

@ -57,8 +57,9 @@ its API, and related concepts.
@c how to join your own translation team and how to report issues with the @c how to join your own translation team and how to report issues with the
@c translation. @c translation.
If you would like to translate this document in your native language, consider If you would like to translate this document in your native language, consider
joining the @uref{https://translationproject.org/domain/guix-cookbook.html, joining
Translation Project}. @uref{https://translate.fedoraproject.org/projects/guix/documentation-cookbook,
Weblate}.
@menu @menu
* Scheme tutorials:: Meet your new favorite language! * Scheme tutorials:: Meet your new favorite language!
@ -1353,6 +1354,7 @@ reference.
@menu @menu
* Customizing the Kernel:: Creating and using a custom Linux kernel on Guix System. * Customizing the Kernel:: Creating and using a custom Linux kernel on Guix System.
* Guix System Image API:: Customizing images to target specific platforms.
* Connecting to Wireguard VPN:: Connecting to a Wireguard VPN. * Connecting to Wireguard VPN:: Connecting to a Wireguard VPN.
* Customizing a Window Manager:: Handle customization of a Window manager on Guix System. * Customizing a Window Manager:: Handle customization of a Window manager on Guix System.
* Running Guix on a Linode Server:: Running Guix on a Linode Server * Running Guix on a Linode Server:: Running Guix on a Linode Server
@ -1601,6 +1603,217 @@ likely that you'll need to modify the initrd on a machine using a custom
kernel, since certain modules which are expected to be built may not be kernel, since certain modules which are expected to be built may not be
available for inclusion into the initrd. available for inclusion into the initrd.
@node Guix System Image API
@section Guix System Image API
Historically, Guix System is centered around an @code{operating-system}
structure. This structure contains various fields ranging from the
bootloader and kernel declaration to the services to install.
Depending on the target machine, that can go from a standard
@code{x86_64} machine to a small ARM single board computer such as the
Pine64, the image constraints can vary a lot. The hardware
manufacturers will impose different image formats with various partition
sizes and offsets.
To create images suitable for all those machines, a new abstraction is
necessary: that's the goal of the @code{image} record. This record
contains all the required information to be transformed into a
standalone image, that can be directly booted on any target machine.
@lisp
(define-record-type* <image>
image make-image
image?
(name image-name ;symbol
(default #f))
(format image-format) ;symbol
(target image-target
(default #f))
(size image-size ;size in bytes as integer
(default 'guess))
(operating-system image-operating-system ;<operating-system>
(default #f))
(partitions image-partitions ;list of <partition>
(default '()))
(compression? image-compression? ;boolean
(default #t))
(volatile-root? image-volatile-root? ;boolean
(default #t))
(substitutable? image-substitutable? ;boolean
(default #t)))
@end lisp
This record contains the operating-system to instantiate. The
@code{format} field defines the image type and can be @code{efi-raw},
@code{qcow2} or @code{iso9660} for instance. In the future, it could be
extended to @code{docker} or other image types.
A new directory in the Guix sources is dedicated to images definition. For now
there are four files:
@itemize @bullet
@item @file{gnu/system/images/hurd.scm}
@item @file{gnu/system/images/pine64.scm}
@item @file{gnu/system/images/novena.scm}
@item @file{gnu/system/images/pinebook-pro.scm}
@end itemize
Let's have a look to @file{pine64.scm}. It contains the
@code{pine64-barebones-os} variable which is a minimal definition of an
operating-system dedicated to the @b{Pine A64 LTS} board.
@lisp
(define pine64-barebones-os
(operating-system
(host-name "vignemale")
(timezone "Europe/Paris")
(locale "en_US.utf8")
(bootloader (bootloader-configuration
(bootloader u-boot-pine64-lts-bootloader)
(target "/dev/vda")))
(initrd-modules '())
(kernel linux-libre-arm64-generic)
(file-systems (cons (file-system
(device (file-system-label "my-root"))
(mount-point "/")
(type "ext4"))
%base-file-systems))
(services (cons (service agetty-service-type
(agetty-configuration
(extra-options '("-L")) ; no carrier detect
(baud-rate "115200")
(term "vt100")
(tty "ttyS0")))
%base-services))))
@end lisp
The @code{kernel} and @code{bootloader} fields are pointing to packages
dedicated to this board.
Right below, the @code{pine64-image-type} variable is also defined.
@lisp
(define pine64-image-type
(image-type
(name 'pine64-raw)
(constructor (cut image-with-os arm64-disk-image <>))))
@end lisp
It's using a record we haven't talked about yet, the @code{image-type} record,
defined this way:
@lisp
(define-record-type* <image-type>
image-type make-image-type
image-type?
(name image-type-name) ;symbol
(constructor image-type-constructor)) ;<operating-system> -> <image>
@end lisp
The main purpose of this record is to associate a name to a procedure
transforming an @code{operating-system} to an image. To understand why
it is necessary, let's have a look to the command producing an image
from an @code{operating-system} configuration file:
@example
guix system image my-os.scm
@end example
This command expects an @code{operating-system} configuration but how
should we indicate that we want an image targeting a Pine64 board? We
need to provide an extra information, the @code{image-type}, by passing
the @code{--image-type} or @code{-t} flag, this way:
@example
guix system image --image-type=pine64-raw my-os.scm
@end example
This @code{image-type} parameter points to the @code{pine64-image-type}
defined above. Hence, the @code{operating-system} declared in
@code{my-os.scm} will be applied the @code{(cut image-with-os
arm64-disk-image <>)} procedure to turn it into an image.
The resulting image looks like:
@lisp
(image
(format 'disk-image)
(target "aarch64-linux-gnu")
(operating-system my-os)
(partitions
(list (partition
(inherit root-partition)
(offset root-offset)))))
@end lisp
which is the aggregation of the @code{operating-system} defined in
@code{my-os.scm} to the @code{arm64-disk-image} record.
But enough Scheme madness. What does this image API bring to the Guix user?
One can run:
@example
mathieu@@cervin:~$ guix system --list-image-types
The available image types are:
- pinebook-pro-raw
- pine64-raw
- novena-raw
- hurd-raw
- hurd-qcow2
- qcow2
- uncompressed-iso9660
- efi-raw
- arm64-raw
- arm32-raw
- iso9660
@end example
and by writing an @code{operating-system} file based on
@code{pine64-barebones-os}, you can customize your image to your
preferences in a file (@file{my-pine-os.scm}) like this:
@lisp
(use-modules (gnu services linux)
(gnu system images pine64))
(let ((base-os pine64-barebones-os))
(operating-system
(inherit base-os)
(timezone "America/Indiana/Indianapolis")
(services
(cons
(service earlyoom-service-type
(earlyoom-configuration
(prefer-regexp "icecat|chromium")))
(operating-system-user-services base-os)))))
@end lisp
run:
@example
guix system image --image-type=pine64-raw my-pine-os.scm
@end example
or,
@example
guix system image --image-type=hurd-raw my-hurd-os.scm
@end example
to get an image that can be written directly to a hard drive and booted
from.
Without changing anything to @code{my-hurd-os.scm}, calling:
@example
guix system image --image-type=hurd-qcow2 my-hurd-os.scm
@end example
will instead produce a Hurd QEMU image.
@node Connecting to Wireguard VPN @node Connecting to Wireguard VPN
@section Connecting to Wireguard VPN @section Connecting to Wireguard VPN

340
doc/guix.texi
View file

@ -55,7 +55,7 @@ Copyright @copyright{} 2017 Andy Wingo@*
Copyright @copyright{} 2017, 2018, 2019, 2020 Arun Isaac@* Copyright @copyright{} 2017, 2018, 2019, 2020 Arun Isaac@*
Copyright @copyright{} 2017 nee@* Copyright @copyright{} 2017 nee@*
Copyright @copyright{} 2018 Rutger Helling@* Copyright @copyright{} 2018 Rutger Helling@*
Copyright @copyright{} 2018 Oleg Pykhalov@* Copyright @copyright{} 2018, 2021 Oleg Pykhalov@*
Copyright @copyright{} 2018 Mike Gerwitz@* Copyright @copyright{} 2018 Mike Gerwitz@*
Copyright @copyright{} 2018 Pierre-Antoine Rouby@* Copyright @copyright{} 2018 Pierre-Antoine Rouby@*
Copyright @copyright{} 2018, 2019 Gábor Boskovits@* Copyright @copyright{} 2018, 2019 Gábor Boskovits@*
@ -142,9 +142,9 @@ GNU Guix参考手册}), French (@pxref{Top,,, guix.fr, Manuel de référence de
Guix}), German (@pxref{Top,,, guix.de, Referenzhandbuch zu GNU Guix}), Guix}), German (@pxref{Top,,, guix.de, Referenzhandbuch zu GNU Guix}),
Spanish (@pxref{Top,,, guix.es, Manual de referencia de GNU Guix}), and Spanish (@pxref{Top,,, guix.es, Manual de referencia de GNU Guix}), and
Russian (@pxref{Top,,, guix.ru, Руководство GNU Guix}). If you Russian (@pxref{Top,,, guix.ru, Руководство GNU Guix}). If you
would like to translate it in your native language, consider joining the would like to translate it in your native language, consider joining
@uref{https://translationproject.org/domain/guix-manual.html, Translation @uref{https://translate.fedoraproject.org/projects/guix/documentation-manual,
Project}. Weblate}.
@menu @menu
* Introduction:: What is Guix about? * Introduction:: What is Guix about?
@ -851,6 +851,11 @@ Support for build offloading (@pxref{Daemon Offload Setup}) and
@uref{https://github.com/artyom-poptsov/guile-ssh, Guile-SSH}, @uref{https://github.com/artyom-poptsov/guile-ssh, Guile-SSH},
version 0.13.0 or later. version 0.13.0 or later.
@item
@uref{https://notabug.org/guile-zstd/guile-zstd, Guile-zstd}, for zstd
compression and decompression in @command{guix publish} and for
substitutes (@pxref{Invoking guix publish}).
@item @item
@uref{https://ngyro.com/software/guile-semver.html, Guile-Semver} for @uref{https://ngyro.com/software/guile-semver.html, Guile-Semver} for
the @code{crate} importer (@pxref{Invoking guix import}). the @code{crate} importer (@pxref{Invoking guix import}).
@ -1743,7 +1748,7 @@ $ export GUIX_LOCPATH=$HOME/.guix-profile/lib/locale
Note that the @code{glibc-locales} package contains data for all the Note that the @code{glibc-locales} package contains data for all the
locales supported by the GNU@tie{}libc and weighs in at around locales supported by the GNU@tie{}libc and weighs in at around
917@tie{}MiB. Alternatively, the @code{glibc-utf8-locales} is smaller but 917@tie{}MiB@. Alternatively, the @code{glibc-utf8-locales} is smaller but
limited to a few UTF-8 locales. limited to a few UTF-8 locales.
The @env{GUIX_LOCPATH} variable plays a role similar to @env{LOCPATH} The @env{GUIX_LOCPATH} variable plays a role similar to @env{LOCPATH}
@ -2132,7 +2137,7 @@ Access to @file{/dev/srX} usually requires root privileges.
@unnumberedsubsec Booting @unnumberedsubsec Booting
Once this is done, you should be able to reboot the system and boot from Once this is done, you should be able to reboot the system and boot from
the USB stick or DVD. The latter usually requires you to get in the the USB stick or DVD@. The latter usually requires you to get in the
BIOS or UEFI boot menu, where you can choose to boot from the USB stick. BIOS or UEFI boot menu, where you can choose to boot from the USB stick.
In order to boot from Libreboot, switch to the command mode by pressing In order to boot from Libreboot, switch to the command mode by pressing
the @kbd{c} key and type @command{search_grub usb}. the @kbd{c} key and type @command{search_grub usb}.
@ -2656,7 +2661,7 @@ The installation image described above was built using the @command{guix
system} command, specifically: system} command, specifically:
@example @example
guix system disk-image -t iso9660 gnu/system/install.scm guix system image -t iso9660 gnu/system/install.scm
@end example @end example
Have a look at @file{gnu/system/install.scm} in the source tree, Have a look at @file{gnu/system/install.scm} in the source tree,
@ -2673,7 +2678,7 @@ If you build a disk image and the bootloader is not available otherwise
includes the bootloader, specifically: includes the bootloader, specifically:
@example @example
guix system disk-image --system=armhf-linux -e '((@@ (gnu system install) os-with-u-boot) (@@ (gnu system install) installation-os) "A20-OLinuXino-Lime2")' guix system image --system=armhf-linux -e '((@@ (gnu system install) os-with-u-boot) (@@ (gnu system install) installation-os) "A20-OLinuXino-Lime2")'
@end example @end example
@code{A20-OLinuXino-Lime2} is the name of the board. If you specify an invalid @code{A20-OLinuXino-Lime2} is the name of the board. If you specify an invalid
@ -3077,7 +3082,7 @@ shells get all the right environment variable definitions:
@example @example
GUIX_PROFILE="$HOME/.guix-profile" ; \ GUIX_PROFILE="$HOME/.guix-profile" ; \
source "$HOME/.guix-profile/etc/profile" source "$GUIX_PROFILE/etc/profile"
@end example @end example
In a multi-user setup, user profiles are stored in a place registered as In a multi-user setup, user profiles are stored in a place registered as
@ -3571,11 +3576,8 @@ Consequently, this command must be used with care.
Finally, since @command{guix package} may actually start build Finally, since @command{guix package} may actually start build
processes, it supports all the common build options (@pxref{Common Build processes, it supports all the common build options (@pxref{Common Build
Options}). It also supports package transformation options, such as Options}). It also supports package transformation options, such as
@option{--with-source} (@pxref{Package Transformation Options}). @option{--with-source}, and preserves them across upgrades
However, note that package transformations are lost when upgrading; to (@pxref{Package Transformation Options}).
preserve transformations across upgrades, you should define your own
package variant in a Guile module and add it to @env{GUIX_PACKAGE_PATH}
(@pxref{Defining Packages}).
@node Substitutes @node Substitutes
@section Substitutes @section Substitutes
@ -3843,7 +3845,7 @@ authenticating bindings between domain names and public keys).
@vindex http_proxy @vindex http_proxy
@vindex https_proxy @vindex https_proxy
Substitutes are downloaded over HTTP or HTTPS. The @env{http_proxy} and Substitutes are downloaded over HTTP or HTTPS@. The @env{http_proxy} and
@env{https_proxy} environment variables can be set in the environment of @env{https_proxy} environment variables can be set in the environment of
@command{guix-daemon} and are honored for downloads of substitutes. @command{guix-daemon} and are honored for downloads of substitutes.
Note that the value of those environment variables in the environment Note that the value of those environment variables in the environment
@ -5311,7 +5313,7 @@ repository in the @file{.guix-channel} file, like so:
This allows @command{guix pull} to determine whether it is pulling code This allows @command{guix pull} to determine whether it is pulling code
from a mirror of the channel; when that is the case, it warns the user from a mirror of the channel; when that is the case, it warns the user
that the mirror might be stale and displays the primary URL. That way, that the mirror might be stale and displays the primary URL@. That way,
users cannot be tricked into fetching code from a stale mirror that does users cannot be tricked into fetching code from a stale mirror that does
not receive security updates. not receive security updates.
@ -6713,7 +6715,7 @@ values are: a URL represented as a string, or a list thereof.
@cindex fixed-output derivations, for download @cindex fixed-output derivations, for download
@item @code{method} @item @code{method}
A monadic procedure that handles the given URI. The procedure must A monadic procedure that handles the given URI@. The procedure must
accept at least three arguments: the value of the @code{uri} field and accept at least three arguments: the value of the @code{uri} field and
the hash algorithm and hash value specified by the @code{hash} field. the hash algorithm and hash value specified by the @code{hash} field.
It must return a store item or a derivation in the store monad It must return a store item or a derivation in the store monad
@ -7285,7 +7287,7 @@ definition facility for Common Lisp programs and libraries.
The @code{asdf-build-system/source} system installs the packages in The @code{asdf-build-system/source} system installs the packages in
source form, and can be loaded using any common lisp implementation, via source form, and can be loaded using any common lisp implementation, via
ASDF. The others, such as @code{asdf-build-system/sbcl}, install binary ASDF@. The others, such as @code{asdf-build-system/sbcl}, install binary
systems in the format which a particular implementation understands. systems in the format which a particular implementation understands.
These build systems can also be used to produce executable programs, or These build systems can also be used to produce executable programs, or
lisp images which contain a set of packages pre-loaded. lisp images which contain a set of packages pre-loaded.
@ -8577,7 +8579,7 @@ instruct it to listen for TCP connections (@pxref{Invoking guix-daemon,
@item ssh @item ssh
@cindex SSH access to build daemons @cindex SSH access to build daemons
These URIs allow you to connect to a remote daemon over SSH. This These URIs allow you to connect to a remote daemon over SSH@. This
feature requires Guile-SSH (@pxref{Requirements}) and a working feature requires Guile-SSH (@pxref{Requirements}) and a working
@command{guile} binary in @env{PATH} on the destination machine. It @command{guile} binary in @env{PATH} on the destination machine. It
supports public key and GSSAPI authentication. A typical URL might look supports public key and GSSAPI authentication. A typical URL might look
@ -10302,7 +10304,7 @@ guix build --with-c-toolchain=hwloc=clang-toolchain \
@quotation Note @quotation Note
There can be application binary interface (ABI) incompatibilities among There can be application binary interface (ABI) incompatibilities among
tool chains. This is particularly true of the C++ standard library and tool chains. This is particularly true of the C++ standard library and
run-time support libraries such as that of OpenMP. By rebuilding all run-time support libraries such as that of OpenMP@. By rebuilding all
dependents with the same tool chain, @option{--with-c-toolchain} minimizes dependents with the same tool chain, @option{--with-c-toolchain} minimizes
the risks of incompatibility but cannot entirely eliminate them. Choose the risks of incompatibility but cannot entirely eliminate them. Choose
@var{package} wisely. @var{package} wisely.
@ -10376,6 +10378,37 @@ guix build coreutils --with-patch=glibc=./glibc-frob.patch
In this example, glibc itself as well as everything that leads to In this example, glibc itself as well as everything that leads to
Coreutils in the dependency graph is rebuilt. Coreutils in the dependency graph is rebuilt.
@cindex upstream, latest version
@item --with-latest=@var{package}
So you like living on the bleeding edge? This option is for you! It
replaces occurrences of @var{package} in the dependency graph with its
latest upstream version, as reported by @command{guix refresh}
(@pxref{Invoking guix refresh}).
It does so by determining the latest upstream release of @var{package}
(if possible), downloading it, and authenticating it @emph{if} it comes
with an OpenPGP signature.
As an example, the command below builds Guix against the latest version
of Guile-JSON:
@example
guix build guix --with-latest=guile-json
@end example
There are limitations. First, in cases where the tool cannot or does
not know how to authenticate source code, you are at risk of running
malicious code; a warning is emitted in this case. Second, this option
simply changes the source used in the existing package definitions,
which is not always sufficient: there might be additional dependencies
that need to be added, patches to apply, and more generally the quality
assurance work that Guix developers normally do will be missing.
You've been warned! In all the other cases, it's a snappy way to stay
on top. We encourage you to submit patches updating the actual package
definitions once you have successfully tested an upgrade
(@pxref{Contributing}).
@cindex test suite, skipping @cindex test suite, skipping
@item --without-tests=@var{package} @item --without-tests=@var{package}
Build @var{package} without running its tests. This can be useful in Build @var{package} without running its tests. This can be useful in
@ -11694,7 +11727,7 @@ Identify inputs that should most likely be native inputs.
Probe @code{home-page} and @code{source} URLs and report those that are Probe @code{home-page} and @code{source} URLs and report those that are
invalid. Suggest a @code{mirror://} URL when applicable. If the invalid. Suggest a @code{mirror://} URL when applicable. If the
@code{source} URL redirects to a GitHub URL, recommend usage of the GitHub @code{source} URL redirects to a GitHub URL, recommend usage of the GitHub
URL. Check that the source file name is meaningful, e.g.@: is not just a URL@. Check that the source file name is meaningful, e.g.@: is not just a
version number or ``git-checkout'', without a declared @code{file-name} version number or ``git-checkout'', without a declared @code{file-name}
(@pxref{origin Reference}). (@pxref{origin Reference}).
@ -11988,7 +12021,7 @@ the command-line tools.
Packages and their dependencies form a @dfn{graph}, specifically a Packages and their dependencies form a @dfn{graph}, specifically a
directed acyclic graph (DAG). It can quickly become difficult to have a directed acyclic graph (DAG). It can quickly become difficult to have a
mental model of the package DAG, so the @command{guix graph} command mental model of the package DAG, so the @command{guix graph} command
provides a visual representation of the DAG. By default, provides a visual representation of the DAG@. By default,
@command{guix graph} emits a DAG representation in the input format of @command{guix graph} emits a DAG representation in the input format of
@uref{https://www.graphviz.org/, Graphviz}, so its output can be passed @uref{https://www.graphviz.org/, Graphviz}, so its output can be passed
directly to the @command{dot} command of Graphviz. It can also emit an directly to the @command{dot} command of Graphviz. It can also emit an
@ -12348,17 +12381,23 @@ server socket is open and the signing key has been read.
@item --compression[=@var{method}[:@var{level}]] @item --compression[=@var{method}[:@var{level}]]
@itemx -C [@var{method}[:@var{level}]] @itemx -C [@var{method}[:@var{level}]]
Compress data using the given @var{method} and @var{level}. @var{method} is Compress data using the given @var{method} and @var{level}. @var{method} is
one of @code{lzip} and @code{gzip}; when @var{method} is omitted, @code{gzip} one of @code{lzip}, @code{zstd}, and @code{gzip}; when @var{method} is
is used. omitted, @code{gzip} is used.
When @var{level} is zero, disable compression. The range 1 to 9 corresponds When @var{level} is zero, disable compression. The range 1 to 9 corresponds
to different compression levels: 1 is the fastest, and 9 is the best to different compression levels: 1 is the fastest, and 9 is the best
(CPU-intensive). The default is 3. (CPU-intensive). The default is 3.
Usually, @code{lzip} compresses noticeably better than @code{gzip} for a small Usually, @code{lzip} compresses noticeably better than @code{gzip} for a
increase in CPU usage; see small increase in CPU usage; see
@uref{https://nongnu.org/lzip/lzip_benchmark.html,benchmarks on the lzip Web @uref{https://nongnu.org/lzip/lzip_benchmark.html,benchmarks on the lzip
page}. Web page}. However, @code{lzip} achieves low decompression throughput
(on the order of 50@tie{}MiB/s on modern hardware), which can be a
bottleneck for someone who downloads over a fast network connection.
The compression ratio of @code{zstd} is between that of @code{lzip} and
that of @code{gzip}; its main advantage is a
@uref{https://facebook.github.io/zstd/,high decompression speed}.
Unless @option{--cache} is used, compression occurs on the fly and Unless @option{--cache} is used, compression occurs on the fly and
the compressed streams are not the compressed streams are not
@ -12917,8 +12956,9 @@ updating substitutes from '@value{SUBSTITUTE-URL}'... 100.0%
@end example @end example
What this example shows is that @code{kcoreaddons} and presumably the 58 What this example shows is that @code{kcoreaddons} and presumably the 58
packages that depend on it have no substitutes at @code{ci.guix.info}; packages that depend on it have no substitutes at
likewise for @code{qgpgme} and the 46 packages that depend on it. @code{@value{SUBSTITUTE-SERVER}}; likewise for @code{qgpgme} and the 46
packages that depend on it.
If you are a Guix developer, or if you are taking care of this build farm, If you are a Guix developer, or if you are taking care of this build farm,
you'll probably want to have a closer look at these packages: they may simply you'll probably want to have a closer look at these packages: they may simply
@ -13421,7 +13461,7 @@ Manual}). Here are some examples:
@table @code @table @code
@item (list (uuid "4dab5feb-d176-45de-b287-9b0a6e4c01cb")) @item (list (uuid "4dab5feb-d176-45de-b287-9b0a6e4c01cb"))
Use the swap partition with the given UUID. You can learn the UUID of a Use the swap partition with the given UUID@. You can learn the UUID of a
Linux swap partition by running @command{swaplabel @var{device}}, where Linux swap partition by running @command{swaplabel @var{device}}, where
@var{device} is the @file{/dev} file name of that partition. @var{device} is the @file{/dev} file name of that partition.
@ -15399,7 +15439,9 @@ at level 7 and gzip at level 9, write:
@end lisp @end lisp
Level 9 achieves the best compression ratio at the expense of increased CPU Level 9 achieves the best compression ratio at the expense of increased CPU
usage, whereas level 1 achieves fast compression. usage, whereas level 1 achieves fast compression. @xref{Invoking guix
publish}, for more information on the available compression methods and
the tradeoffs involved.
An empty list disables compression altogether. An empty list disables compression altogether.
@ -15851,8 +15893,9 @@ The ModemManager package to use.
@defvr {Scheme Variable} usb-modeswitch-service-type @defvr {Scheme Variable} usb-modeswitch-service-type
This is the service type for the This is the service type for the
@uref{https://www.draisberghof.de/usb_modeswitch/, USB_ModeSwitch} service. The @uref{https://www.draisberghof.de/usb_modeswitch/, USB_ModeSwitch}
value for this service type is a @code{usb-modeswitch-configuration} record. service. The value for this service type is
a @code{usb-modeswitch-configuration} record.
When plugged in, some USB modems (and other USB devices) initially present When plugged in, some USB modems (and other USB devices) initially present
themselves as a read-only storage medium and not as a modem. They need to be themselves as a read-only storage medium and not as a modem. They need to be
@ -16231,8 +16274,7 @@ clock synchronized with that of the given servers.
(listen-on '("127.0.0.1" "::1")) (listen-on '("127.0.0.1" "::1"))
(sensor '("udcf0 correction 70000")) (sensor '("udcf0 correction 70000"))
(constraint-from '("www.gnu.org")) (constraint-from '("www.gnu.org"))
(constraints-from '("https://www.google.com/")) (constraints-from '("https://www.google.com/"))))
(allow-large-adjustment? #t)))
@end lisp @end lisp
@end deffn @end deffn
@ -16270,9 +16312,6 @@ a constraint.
As with constraint from, specify a list of URLs, IP addresses or hostnames of As with constraint from, specify a list of URLs, IP addresses or hostnames of
HTTPS servers to provide a constraint. Should the hostname resolve to multiple HTTPS servers to provide a constraint. Should the hostname resolve to multiple
IP addresses, @code{ntpd} will calculate a median constraint from all of them. IP addresses, @code{ntpd} will calculate a median constraint from all of them.
@item @code{allow-large-adjustment?} (default: @code{#f})
Determines if @code{ntpd} is allowed to make an initial adjustment of more
than 180 seconds.
@end table @end table
@end deftp @end deftp
@ -16506,6 +16545,55 @@ Group name or group ID that will be used when accessing the module.
@end table @end table
@end deftp @end deftp
The @code{(gnu services syncthing)} module provides the following services:
@cindex syncthing
You might want a syncthing daemon if you have files between two or more
computers and want to sync them in real time, safely protected from
prying eyes.
@deffn {Scheme Variable} syncthing-service-type
This is the service type for the @uref{https://syncthing.net/,
syncthing} daemon, The value for this service type is a
@command{syncthing-configuration} record as in this example:
@lisp
(service syncthing-service-type
(syncthing-configuration (user "alice")))
@end lisp
See below for details about @code{syncthing-configuration}.
@deftp {Data Type} syncthing-configuration
Data type representing the configuration for @code{syncthing-service-type}.
@table @asis
@item @code{syncthing} (default: @var{syncthing})
@code{syncthing} package to use.
@item @code{arguments} (default: @var{'()})
List of command-line arguments passing to @code{syncthing} binary.
@item @code{logflags} (default: @var{0})
Sum of loging flags, see
@uref{https://docs.syncthing.net/users/syncthing.html#cmdoption-logflags, Syncthing documentation logflags}.
@item @code{user} (default: @var{#f})
The user as which the Syncthing service is to be run.
This assumes that the specified user exists.
@item @code{group} (default: @var{"users"})
The group as which the Syncthing service is to be run.
This assumes that the specified group exists.
@item @code{home} (default: @var{#f})
Common configuration and data directory. The default configuration
directory is @file{$HOME} of the specified Syncthing @code{user}.
@end table
@end deftp
@end deffn
Furthermore, @code{(gnu services ssh)} provides the following services. Furthermore, @code{(gnu services ssh)} provides the following services.
@cindex SSH @cindex SSH
@cindex SSH server @cindex SSH server
@ -17157,6 +17245,58 @@ address, delete everything except these options:
@end table @end table
@end deftp @end deftp
@cindex keepalived
@deffn {Scheme Variable} keepalived-service-type
This is the type for the @uref{https://www.keepalived.org/, Keepalived}
routing software, @command{keepalived}. Its value must be an
@code{keepalived-configuration} record as in this example for master
machine:
@lisp
(service keepalived-service-type
(keepalived-configuration
(config-file (local-file "keepalived-master.conf"))))
@end lisp
where @file{keepalived-master.conf}:
@example
vrrp_instance my-group @{
state MASTER
interface enp9s0
virtual_router_id 100
priority 100
unicast_peer @{ 10.0.0.2 @}
virtual_ipaddress @{
10.0.0.4/24
@}
@}
@end example
and for backup machine:
@lisp
(service keepalived-service-type
(keepalived-configuration
(config-file (local-file "keepalived-backup.conf"))))
@end lisp
where @file{keepalived-backup.conf}:
@example
vrrp_instance my-group @{
state BACKUP
interface enp9s0
virtual_router_id 100
priority 99
unicast_peer @{ 10.0.0.3 @}
virtual_ipaddress @{
10.0.0.4/24
@}
@}
@end example
@end deffn
@node Unattended Upgrades @node Unattended Upgrades
@subsection Unattended Upgrades @subsection Unattended Upgrades
@ -17597,7 +17737,7 @@ auto-login session.
@deftp {Data Type} xorg-configuration @deftp {Data Type} xorg-configuration
This data type represents the configuration of the Xorg graphical display This data type represents the configuration of the Xorg graphical display
server. Note that there is no Xorg service; instead, the X server is started server. Note that there is no Xorg service; instead, the X server is started
by a ``display manager'' such as GDM, SDDM, and SLiM. Thus, the configuration by a ``display manager'' such as GDM, SDDM, and SLiM@. Thus, the configuration
of these display managers aggregates an @code{xorg-configuration} record. of these display managers aggregates an @code{xorg-configuration} record.
@table @asis @table @asis
@ -17738,7 +17878,7 @@ Available @code{cups-configuration} fields are:
The CUPS package. The CUPS package.
@end deftypevr @end deftypevr
@deftypevr {@code{cups-configuration} parameter} package-list extensions (default: @code{(list epson-inkjet-printer-escpr hplip-minimal foomatic-filters splix)}) @deftypevr {@code{cups-configuration} parameter} package-list extensions (default: @code{(list brlaser cups-filters epson-inkjet-printer-escpr foomatic-filters hplip-minimal splix)})
Drivers and other extensions to the CUPS package. Drivers and other extensions to the CUPS package.
@end deftypevr @end deftypevr
@ -18586,7 +18726,7 @@ The desktop environments in Guix use the Xorg display server by
default. If you'd like to use the newer display server protocol default. If you'd like to use the newer display server protocol
called Wayland, you need to use the @code{sddm-service} instead of called Wayland, you need to use the @code{sddm-service} instead of
GDM as the graphical login manager. You should then GDM as the graphical login manager. You should then
select the ``GNOME (Wayland)'' session in SDDM. Alternatively you can select the ``GNOME (Wayland)'' session in SDDM@. Alternatively you can
also try starting GNOME on Wayland manually from a TTY with the also try starting GNOME on Wayland manually from a TTY with the
command ``XDG_SESSION_TYPE=wayland exec dbus-run-session command ``XDG_SESSION_TYPE=wayland exec dbus-run-session
gnome-session``. Currently only GNOME has support for Wayland. gnome-session``. Currently only GNOME has support for Wayland.
@ -19200,7 +19340,7 @@ Port on which PostgreSQL should listen.
Locale to use as the default when creating the database cluster. Locale to use as the default when creating the database cluster.
@item @code{config-file} (default: @code{(postgresql-config-file)}) @item @code{config-file} (default: @code{(postgresql-config-file)})
The configuration file to use when running PostgreSQL. The default The configuration file to use when running PostgreSQL@. The default
behaviour uses the postgresql-config-file record with the default values behaviour uses the postgresql-config-file record with the default values
for the fields. for the fields.
@ -19253,7 +19393,7 @@ required to add extensions provided by other packages.
@deftp {Data Type} postgresql-config-file @deftp {Data Type} postgresql-config-file
Data type representing the PostgreSQL configuration file. As shown in Data type representing the PostgreSQL configuration file. As shown in
the following example, this can be used to customize the configuration the following example, this can be used to customize the configuration
of PostgreSQL. Note that you can use any G-expression or filename in of PostgreSQL@. Note that you can use any G-expression or filename in
place of this record, if you already have a configuration file you'd place of this record, if you already have a configuration file you'd
like to use for example. like to use for example.
@ -19280,7 +19420,7 @@ host all all ::1/128 md5"))
@table @asis @table @asis
@item @code{log-destination} (default: @code{"syslog"}) @item @code{log-destination} (default: @code{"syslog"})
The logging method to use for PostgreSQL. Multiple values are accepted, The logging method to use for PostgreSQL@. Multiple values are accepted,
separated by commas. separated by commas.
@item @code{hba-file} (default: @code{%default-postgres-hba}) @item @code{hba-file} (default: @code{%default-postgres-hba})
@ -20206,7 +20346,7 @@ could allow a user to delete others' mailboxes, or @code{ln -s
@deftypevr {@code{dovecot-configuration} parameter} boolean mail-full-filesystem-access? @deftypevr {@code{dovecot-configuration} parameter} boolean mail-full-filesystem-access?
Allow full file system access to clients. There's no access checks Allow full file system access to clients. There's no access checks
other than what the operating system does for the active UID/GID. It other than what the operating system does for the active UID/GID@. It
works with both maildir and mboxes, allowing you to prefix mailboxes works with both maildir and mboxes, allowing you to prefix mailboxes
names with e.g.@: @file{/path/} or @file{~user/}. names with e.g.@: @file{/path/} or @file{~user/}.
Defaults to @samp{#f}. Defaults to @samp{#f}.
@ -20239,14 +20379,14 @@ Defaults to @samp{"optimized"}.
@end deftypevr @end deftypevr
@deftypevr {@code{dovecot-configuration} parameter} boolean mail-nfs-storage? @deftypevr {@code{dovecot-configuration} parameter} boolean mail-nfs-storage?
Mail storage exists in NFS. Set this to yes to make Dovecot flush Mail storage exists in NFS@. Set this to yes to make Dovecot flush
NFS caches whenever needed. If you're using only a single mail server NFS caches whenever needed. If you're using only a single mail server
this isn't needed. this isn't needed.
Defaults to @samp{#f}. Defaults to @samp{#f}.
@end deftypevr @end deftypevr
@deftypevr {@code{dovecot-configuration} parameter} boolean mail-nfs-index? @deftypevr {@code{dovecot-configuration} parameter} boolean mail-nfs-index?
Mail index files also exist in NFS. Setting this to yes requires Mail index files also exist in NFS@. Setting this to yes requires
@samp{mmap-disable? #t} and @samp{fsync-disable? #f}. @samp{mmap-disable? #t} and @samp{fsync-disable? #f}.
Defaults to @samp{#f}. Defaults to @samp{#f}.
@end deftypevr @end deftypevr
@ -20353,9 +20493,9 @@ Defaults to @samp{"30 secs"}.
@end deftypevr @end deftypevr
@deftypevr {@code{dovecot-configuration} parameter} boolean mail-save-crlf? @deftypevr {@code{dovecot-configuration} parameter} boolean mail-save-crlf?
Save mails with CR+LF instead of plain LF. This makes sending those Save mails with CR+LF instead of plain LF@. This makes sending those
mails take less CPU, especially with sendfile() syscall with Linux and mails take less CPU, especially with sendfile() syscall with Linux and
FreeBSD. But it also creates a bit more disk I/O which may just make it FreeBSD@. But it also creates a bit more disk I/O which may just make it
slower. Also note that if other software reads the mboxes/maildirs, slower. Also note that if other software reads the mboxes/maildirs,
they may handle the extra CRs wrong and cause problems. they may handle the extra CRs wrong and cause problems.
Defaults to @samp{#f}. Defaults to @samp{#f}.
@ -21419,7 +21559,7 @@ A list of verification options (these mostly map to OpenSSL's
@end deftypevr @end deftypevr
@deftypevr {@code{ssl-configuration} parameter} maybe-string-list options @deftypevr {@code{ssl-configuration} parameter} maybe-string-list options
A list of general options relating to SSL/TLS. These map to OpenSSL's A list of general options relating to SSL/TLS@. These map to OpenSSL's
@code{set_options()}. For a full list of options available in LuaSec, see the @code{set_options()}. For a full list of options available in LuaSec, see the
LuaSec source. LuaSec source.
@end deftypevr @end deftypevr
@ -21484,7 +21624,7 @@ Defaults to @samp{#f}.
@deftypevr {@code{prosody-configuration} parameter} string-list s2s-insecure-domains @deftypevr {@code{prosody-configuration} parameter} string-list s2s-insecure-domains
Many servers don't support encryption or have invalid or self-signed Many servers don't support encryption or have invalid or self-signed
certificates. You can list domains here that will not be required to certificates. You can list domains here that will not be required to
authenticate using certificates. They will be authenticated using DNS. See authenticate using certificates. They will be authenticated using DNS@. See
@url{https://prosody.im/doc/s2s#security}. @url{https://prosody.im/doc/s2s#security}.
Defaults to @samp{()}. Defaults to @samp{()}.
@end deftypevr @end deftypevr
@ -22097,7 +22237,7 @@ Bind the web interface to the specified port.
Bind the web interface to the specified address. Bind the web interface to the specified address.
@item @code{base} (default: @code{"/"}) @item @code{base} (default: @code{"/"})
Specify the path of the base URL. This can be useful if Specify the path of the base URL@. This can be useful if
@command{darkstat} is accessed via a reverse proxy. @command{darkstat} is accessed via a reverse proxy.
@end table @end table
@ -22661,7 +22801,7 @@ Defaults to @samp{"nslcd"}.
@deftypevr {@code{nslcd-configuration} parameter} log-option log @deftypevr {@code{nslcd-configuration} parameter} log-option log
This option controls the way logging is done via a list containing This option controls the way logging is done via a list containing
SCHEME and LEVEL. The SCHEME argument may either be the symbols SCHEME and LEVEL@. The SCHEME argument may either be the symbols
@samp{none} or @samp{syslog}, or an absolute file name. The LEVEL @samp{none} or @samp{syslog}, or an absolute file name. The LEVEL
argument is optional and specifies the log level. The log level may be argument is optional and specifies the log level. The log level may be
one of the following symbols: @samp{crit}, @samp{error}, @samp{warning}, one of the following symbols: @samp{crit}, @samp{error}, @samp{warning},
@ -24201,7 +24341,7 @@ first securely generates a key on the server. It then makes a request
to the Let's Encrypt certificate authority (CA) to sign the key. The CA to the Let's Encrypt certificate authority (CA) to sign the key. The CA
checks that the request originates from the host in question by using a checks that the request originates from the host in question by using a
challenge-response protocol, requiring the server to provide its challenge-response protocol, requiring the server to provide its
response over HTTP. If that protocol completes successfully, the CA response over HTTP@. If that protocol completes successfully, the CA
signs the key, resulting in a certificate. That certificate is valid signs the key, resulting in a certificate. That certificate is valid
for a limited period of time, and therefore to continue to provide TLS for a limited period of time, and therefore to continue to provide TLS
services, the server needs to periodically ask the CA to renew its services, the server needs to periodically ask the CA to renew its
@ -24460,7 +24600,7 @@ must match a key ID defined in a @code{knot-key-configuration}. No key means
that a key is not require to match that ACL. that a key is not require to match that ACL.
@item @code{action} (default: @code{'()}) @item @code{action} (default: @code{'()})
An ordered list of actions that are permitted or forbidden by this ACL. Possible An ordered list of actions that are permitted or forbidden by this ACL@. Possible
values are lists of zero or more elements from @code{'transfer}, @code{'notify} values are lists of zero or more elements from @code{'transfer}, @code{'notify}
and @code{'update}. and @code{'update}.
@ -24571,7 +24711,7 @@ An optional port can be given with the @@ separator. For instance:
@item @code{via} (default: @code{'()}) @item @code{via} (default: @code{'()})
An ordered list of source IP addresses. An empty list will have Knot choose An ordered list of source IP addresses. An empty list will have Knot choose
an appropriate source IP. An optional port can be given with the @@ separator. an appropriate source IP@. An optional port can be given with the @@ separator.
The default is to choose at random. The default is to choose at random.
@item @code{key} (default: @code{#f}) @item @code{key} (default: @code{#f})
@ -24640,11 +24780,11 @@ When @code{#t}, use the Single-Type Signing Scheme.
An algorithm of signing keys and issued signatures. An algorithm of signing keys and issued signatures.
@item @code{ksk-size} (default: @code{256}) @item @code{ksk-size} (default: @code{256})
The length of the KSK. Note that this value is correct for the default The length of the KSK@. Note that this value is correct for the default
algorithm, but would be unsecure for other algorithms. algorithm, but would be unsecure for other algorithms.
@item @code{zsk-size} (default: @code{256}) @item @code{zsk-size} (default: @code{256})
The length of the ZSK. Note that this value is correct for the default The length of the ZSK@. Note that this value is correct for the default
algorithm, but would be unsecure for other algorithms. algorithm, but would be unsecure for other algorithms.
@item @code{dnskey-ttl} (default: @code{'default}) @item @code{dnskey-ttl} (default: @code{'default})
@ -24970,9 +25110,9 @@ If set, fixes the dynamical ports (one per client) to the given range
@item @code{tftp-root} (default: @code{/var/empty,lo}) @item @code{tftp-root} (default: @code{/var/empty,lo})
Look for files to transfer using TFTP relative to the given directory. Look for files to transfer using TFTP relative to the given directory.
When this is set, TFTP paths which include ".." are rejected, to stop clients When this is set, TFTP paths which include @samp{..} are rejected, to stop clients
getting outside the specified root. Absolute paths (starting with /) are getting outside the specified root. Absolute paths (starting with @samp{/}) are
allowed, but they must be within the tftp-root. If the optional interface allowed, but they must be within the TFTP-root. If the optional interface
argument is given, the directory is only used for TFTP requests via that argument is given, the directory is only used for TFTP requests via that
interface. interface.
@ -24982,13 +25122,14 @@ on the end of the TFTP-root. Only valid if a TFTP root is set and the
directory exists. Defaults to adding IP address (in standard dotted-quad directory exists. Defaults to adding IP address (in standard dotted-quad
format). format).
For instance, if --tftp-root is "/tftp" and client 1.2.3.4 requests file For instance, if @option{--tftp-root} is @samp{/tftp} and client
"myfile" then the effective path will be "/tftp/1.2.3.4/myfile" if @samp{1.2.3.4} requests file @file{myfile} then the effective path will
/tftp/1.2.3.4 exists or /tftp/myfile otherwise. When "=mac" is specified be @file{/tftp/1.2.3.4/myfile} if @file{/tftp/1.2.3.4} exists or
it will append the MAC address instead, using lowercase zero padded digits @file{/tftp/myfile} otherwise. When @samp{=mac} is specified it will
separated by dashes, e.g.: 01-02-03-04-aa-bb Note that resolving MAC append the MAC address instead, using lowercase zero padded digits
addresses is only possible if the client is in the local network or obtained separated by dashes, e.g.: @samp{01-02-03-04-aa-bb}. Note that
a DHCP lease from dnsmasq. resolving MAC addresses is only possible if the client is in the local
network or obtained a DHCP lease from dnsmasq.
@end table @end table
@end deftp @end deftp
@ -25109,7 +25250,7 @@ Defaults to @samp{()}.
The @code{(gnu services vpn)} module provides services related to The @code{(gnu services vpn)} module provides services related to
@dfn{virtual private networks} (VPNs). It provides a @emph{client} service for @dfn{virtual private networks} (VPNs). It provides a @emph{client} service for
your machine to connect to a VPN, and a @emph{server} service for your machine your machine to connect to a VPN, and a @emph{server} service for your machine
to host a VPN. Both services use @uref{https://openvpn.net/, OpenVPN}. to host a VPN@. Both services use @uref{https://openvpn.net/, OpenVPN}.
@deffn {Scheme Procedure} openvpn-client-service @ @deffn {Scheme Procedure} openvpn-client-service @
[#:config (openvpn-client-configuration)] [#:config (openvpn-client-configuration)]
@ -26031,7 +26172,7 @@ Defaults to @samp{disabled}.
@end deftypevr @end deftypevr
@deftypevr {@code{tlp-configuration} parameter} string energy-perf-policy-on-ac @deftypevr {@code{tlp-configuration} parameter} string energy-perf-policy-on-ac
Set CPU performance versus energy saving policy on AC. Alternatives are Set CPU performance versus energy saving policy on AC@. Alternatives are
performance, normal, powersave. performance, normal, powersave.
Defaults to @samp{"performance"}. Defaults to @samp{"performance"}.
@ -26964,7 +27105,7 @@ Defaults to @samp{#f}.
@end deftypevr @end deftypevr
@deftypevr {@code{libvirt-configuration} parameter} optional-string host-uuid @deftypevr {@code{libvirt-configuration} parameter} optional-string host-uuid
Host UUID. UUID must not have all digits be the same. Host UUID@. UUID must not have all digits be the same.
Defaults to @samp{""}. Defaults to @samp{""}.
@ -27221,7 +27362,7 @@ This is the configuration for the @code{qemu-binfmt} service.
The list of emulated QEMU platforms. Each item must be a @dfn{platform The list of emulated QEMU platforms. Each item must be a @dfn{platform
object} as returned by @code{lookup-qemu-platforms} (see below). object} as returned by @code{lookup-qemu-platforms} (see below).
@item @code{guix-support?} (default: @code{#f}) @item @code{guix-support?} (default: @code{#t})
When it is true, QEMU and all its dependencies are added to the build When it is true, QEMU and all its dependencies are added to the build
environment of @command{guix-daemon} (@pxref{Invoking guix-daemon, environment of @command{guix-daemon} (@pxref{Invoking guix-daemon,
@option{--chroot-directory} option}). This allows the @code{binfmt_misc} @option{--chroot-directory} option}). This allows the @code{binfmt_misc}
@ -27246,10 +27387,14 @@ guix build -s armhf-linux inkscape
@noindent @noindent
and it will build Inkscape for ARMv7 @emph{as if it were a native and it will build Inkscape for ARMv7 @emph{as if it were a native
build}, transparently using QEMU to emulate the ARMv7 CPU. Pretty handy build}, transparently using QEMU to emulate the ARMv7 CPU@. Pretty handy
if you'd like to test a package build for an architecture you don't have if you'd like to test a package build for an architecture you don't have
access to! access to!
When @code{guix-support?} is set to @code{#f}, programs for other
architectures can still be executed transparently, but invoking commands
like @command{guix build -s armhf-linux @dots{}} will fail.
@item @code{qemu} (default: @code{qemu}) @item @code{qemu} (default: @code{qemu})
The QEMU package to use. The QEMU package to use.
@end table @end table
@ -28236,7 +28381,7 @@ serve the default @file{/srv/git} over HTTPS might be:
This example assumes that you are using Let's Encrypt to get your TLS This example assumes that you are using Let's Encrypt to get your TLS
certificate. @xref{Certificate Services}. The default @code{certbot} certificate. @xref{Certificate Services}. The default @code{certbot}
service will redirect all HTTP traffic on @code{git.my-host.org} to service will redirect all HTTP traffic on @code{git.my-host.org} to
HTTPS. You will also need to add an @code{fcgiwrap} proxy to your HTTPS@. You will also need to add an @code{fcgiwrap} proxy to your
system services. @xref{Web Services}. system services. @xref{Web Services}.
@end deffn @end deffn
@ -29273,8 +29418,8 @@ A value like @code{#o0027} will give read access to the group used by Gitolite
like cgit or gitweb. like cgit or gitweb.
@item @code{git-config-keys} (default: @code{""}) @item @code{git-config-keys} (default: @code{""})
Gitolite allows you to set git config values using the @samp{config} keyword. This Gitolite allows you to set git config values using the @samp{config}
setting allows control over the config keys to accept. keyword. This setting allows control over the config keys to accept.
@item @code{roles} (default: @code{'(("READERS" . 1) ("WRITERS" . ))}) @item @code{roles} (default: @code{'(("READERS" . 1) ("WRITERS" . ))})
Set the role names allowed to be used by users running the perms command. Set the role names allowed to be used by users running the perms command.
@ -30489,7 +30634,7 @@ system databases.
@itemx rpc @itemx rpc
@itemx services @itemx services
@itemx shadow @itemx shadow
The system databases handled by the NSS. Each of these fields must be a The system databases handled by the NSS@. Each of these fields must be a
list of @code{<name-service>} objects (see below). list of @code{<name-service>} objects (see below).
@end table @end table
@end deftp @end deftp
@ -30640,7 +30785,8 @@ the root file system specified on the kernel command line via @option{--root}.
@var{linux-modules} is a list of kernel modules to be loaded at boot time. @var{linux-modules} is a list of kernel modules to be loaded at boot time.
@var{mapped-devices} is a list of device mappings to realize before @var{mapped-devices} is a list of device mappings to realize before
@var{file-systems} are mounted (@pxref{Mapped Devices}). @var{file-systems} are mounted (@pxref{Mapped Devices}).
@var{helper-packages} is a list of packages to be copied in the initrd. It may @var{helper-packages} is a list of packages to be copied in the initrd.
It may
include @code{e2fsck/static} or other packages needed by the initrd to check include @code{e2fsck/static} or other packages needed by the initrd to check
the root file system. the root file system.
@ -30746,7 +30892,7 @@ in ``legacy'' BIOS mode.
@vindex grub-efi-netboot-bootloader @vindex grub-efi-netboot-bootloader
@code{grub-efi-netboot-bootloader} allows you to boot your system over network @code{grub-efi-netboot-bootloader} allows you to boot your system over network
through TFTP. In combination with an NFS root file system this allows you to through TFTP@. In combination with an NFS root file system this allows you to
build a diskless Guix system. build a diskless Guix system.
The installation of the @code{grub-efi-netboot-bootloader} generates the content The installation of the @code{grub-efi-netboot-bootloader} generates the content
@ -30783,7 +30929,7 @@ TFTP, for example by copying them into the TFTP root directory at @code{target}.
It is important to note that symlinks pointing outside the TFTP root directory It is important to note that symlinks pointing outside the TFTP root directory
may need to be allowed in the configuration of your TFTP server. Further the may need to be allowed in the configuration of your TFTP server. Further the
store link exposes the whole store through TFTP. Both points need to be store link exposes the whole store through TFTP@. Both points need to be
considered carefully for security aspects. considered carefully for security aspects.
Beside the @code{grub-efi-netboot-bootloader}, the already mentioned TFTP and Beside the @code{grub-efi-netboot-bootloader}, the already mentioned TFTP and
@ -31275,7 +31421,7 @@ size of the image.
@cindex System images, creation in various formats @cindex System images, creation in various formats
@cindex Creating system images in various formats @cindex Creating system images in various formats
@item vm-image @item vm-image
@itemx disk-image @itemx image
@itemx docker-image @itemx docker-image
Return a virtual machine, disk image, or Docker image of the operating Return a virtual machine, disk image, or Docker image of the operating
system declared in @var{file} that stands alone. By default, system declared in @var{file} that stands alone. By default,
@ -31285,21 +31431,21 @@ a value. Docker images are built to contain exactly what they need, so
the @option{--image-size} option is ignored in the case of the @option{--image-size} option is ignored in the case of
@code{docker-image}. @code{docker-image}.
@cindex disk-image, creating disk images @cindex image, creating disk images
The @code{disk-image} command can produce various image types. The The @code{image} command can produce various image types. The
image type can be selected using the @option{--image-type} option. It image type can be selected using the @option{--image-type} option. It
defaults to @code{raw}. When its value is @code{iso9660}, the defaults to @code{efi-raw}. When its value is @code{iso9660}, the
@option{--label} option can be used to specify a volume ID with @option{--label} option can be used to specify a volume ID with
@code{disk-image}. By default, the root file system of a disk image is @code{image}. By default, the root file system of a disk image is
mounted non-volatile; the @option{--volatile} option can be provided to mounted non-volatile; the @option{--volatile} option can be provided to
make it volatile instead. When using @code{disk-image}, the bootloader make it volatile instead. When using @code{image}, the bootloader
installed on the generated image is taken from the provided installed on the generated image is taken from the provided
@code{operating-system} definition. The following example demonstrates @code{operating-system} definition. The following example demonstrates
how to generate an image that uses the @code{grub-efi-bootloader} how to generate an image that uses the @code{grub-efi-bootloader}
bootloader and boot it with QEMU: bootloader and boot it with QEMU:
@example @example
image=$(guix system disk-image --image-type=qcow2 \ image=$(guix system image --image-type=qcow2 \
gnu/system/examples/lightweight-desktop.tmpl) gnu/system/examples/lightweight-desktop.tmpl)
cp $image /tmp/my-image.qcow2 cp $image /tmp/my-image.qcow2
chmod +w /tmp/my-image.qcow2 chmod +w /tmp/my-image.qcow2
@ -31307,13 +31453,13 @@ qemu-system-x86_64 -enable-kvm -hda /tmp/my-image.qcow2 -m 1000 \
-bios $(guix build ovmf)/share/firmware/ovmf_x64.bin -bios $(guix build ovmf)/share/firmware/ovmf_x64.bin
@end example @end example
When using the @code{raw} image type, a raw disk image is produced; it When using the @code{efi-raw} image type, a raw disk image is produced;
can be copied as is to a USB stick, for instance. Assuming it can be copied as is to a USB stick, for instance. Assuming
@code{/dev/sdc} is the device corresponding to a USB stick, one can copy @code{/dev/sdc} is the device corresponding to a USB stick, one can copy
the image to it using the following command: the image to it using the following command:
@example @example
# dd if=$(guix system disk-image my-os.scm) of=/dev/sdc status=progress # dd if=$(guix system image my-os.scm) of=/dev/sdc status=progress
@end example @end example
The @code{--list-image-types} command lists all the available image The @code{--list-image-types} command lists all the available image
@ -31433,10 +31579,10 @@ of the image.
@item --image-type=@var{type} @item --image-type=@var{type}
@itemx -t @var{type} @itemx -t @var{type}
For the @code{disk-image} action, create an image with given @var{type}. For the @code{image} action, create an image with given @var{type}.
When this option is omitted, @command{guix system} uses the @code{raw} When this option is omitted, @command{guix system} uses the
image type. @code{efi-raw} image type.
@cindex ISO-9660 format @cindex ISO-9660 format
@cindex CD image format @cindex CD image format
@ -31445,7 +31591,7 @@ image type.
for burning on CDs and DVDs. for burning on CDs and DVDs.
@item --image-size=@var{size} @item --image-size=@var{size}
For the @code{vm-image} and @code{disk-image} actions, create an image For the @code{vm-image} and @code{image} actions, create an image
of the given @var{size}. @var{size} may be a number of bytes, or it may of the given @var{size}. @var{size} may be a number of bytes, or it may
include a unit as a suffix (@pxref{Block size, size specifications,, include a unit as a suffix (@pxref{Block size, size specifications,,
coreutils, GNU Coreutils}). coreutils, GNU Coreutils}).
@ -31900,7 +32046,7 @@ connect pass the @command{-spice port=5930,disable-ticketing} flag to
@command{qemu}. See previous section for further information on how to do this. @command{qemu}. See previous section for further information on how to do this.
Spice also allows you to do some nice stuff like share your clipboard with your Spice also allows you to do some nice stuff like share your clipboard with your
VM. To enable that you'll also have to pass the following flags to @command{qemu}: VM@. To enable that you'll also have to pass the following flags to @command{qemu}:
@example @example
-device virtio-serial-pci,id=virtio-serial0,max_ports=16,bus=pci.0,addr=0x5 -device virtio-serial-pci,id=virtio-serial0,max_ports=16,bus=pci.0,addr=0x5
@ -32652,7 +32798,7 @@ missing.
The problem with debugging information is that is takes up a fair amount The problem with debugging information is that is takes up a fair amount
of disk space. For example, debugging information for the GNU C Library of disk space. For example, debugging information for the GNU C Library
weighs in at more than 60 MiB. Thus, as a user, keeping all the weighs in at more than 60 MiB@. Thus, as a user, keeping all the
debugging info of all the installed programs is usually not an option. debugging info of all the installed programs is usually not an option.
Yet, space savings should not come at the cost of an impediment to Yet, space savings should not come at the cost of an impediment to
debugging---especially in the GNU system, which should make it easier debugging---especially in the GNU system, which should make it easier

102
etc/news.scm
View file

@ -1,11 +1,11 @@
;; GNU Guix news, for use by 'guix pull'. ;; GNU Guix news, for use by 'guix pull'.
;; ;;
;; Copyright © 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;; Copyright © 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;; Copyright © 2019, 2020 Miguel Ángel Arruga Vivas <rosen644835@gmail.com> ;; Copyright © 2019, 2020 Miguel Ángel Arruga Vivas <rosen644835@gmail.com>
;; Copyright © 2019, 2020 Konrad Hinsen <konrad.hinsen@fastmail.net> ;; Copyright © 2019, 2020 Konrad Hinsen <konrad.hinsen@fastmail.net>
;; Copyright © 2019, 2020 Julien Lepiller <julien@lepiller.eu> ;; Copyright © 2019, 2020 Julien Lepiller <julien@lepiller.eu>
;; Copyright © 2019, 2020 Florian Pelz <pelzflorian@pelzflorian.de> ;; Copyright © 2019, 2020, 2021 Florian Pelz <pelzflorian@pelzflorian.de>
;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com> ;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com> ;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
@ -18,6 +18,104 @@
(channel-news (channel-news
(version 0) (version 0)
(entry (commit "9ab817b2a4601b4a6755983590ed7d93ebdc8d09")
(title (en "New @option{--with-latest} package transformation option")
(de "Neue Paketumwandlungsoption @option{--with-latest}")
(fr "Nouvelle option de transformation @option{--with-latest}"))
(body
(en "The new @option{--with-latest} package transformation option
gets the latest release of a package, as would be identified by @command{guix
refresh}, and uses it instead of the currently-packaged version. For example,
to install the latest release of GNOME Weather linked against the latest
version of libgweather, run:
@example
guix install gnome-weather \\
--with-latest=gnome-weather --with-latest=libgweather
@end example
Run @command{info \"(guix) Package Transformation Options\"} for more info.")
(de "Mit der neuen Paketumwandlungsoption @option{--with-latest} wird
die neueste Veröffentlichung für ein Paket verwendet. Diese wird wie bei
@command{guix refresh} bestimmt und anstelle der zurzeit im Paket festgelegten
Version verwendet. Um zum Beispiel die neuste Veröffentlichung von GNOME
Weather gebunden an die neuste Version von libgweather zu installieren, führen
Sie dies aus:
@example
guix install gnome-weather \\
--with-latest=gnome-weather --with-latest=libgweather
@end example
Führen Sie für mehr Informationen @command{info \"(guix.de)
Paketumwandlungsoptionen\"} aus.")
(fr "La nouvelle option de transformation de paquets
@option{--with-latest} récupère la dernière version d'un logiciel telle
qu'elle serait trouvée par @command{guix refresh} et l'utilise à la place la
version actuellement fournie par le paquet. Par exemple, pour installer la
dernière version de GNOME Weather, elle-même compilée avec la dernière version
de libgweather, on lancera :
@example
guix install gnome-weather \\
--with-latest=gnome-weather --with-latest=libgweather
@end example
Voir @command{info \"(guix.fr) Options de transformation de paquets\"} pour
plus de détails.")))
(entry (commit "a879e35116043d5daf3d9d175b697d10b9177fd5")
(title (en "Substitutes can now be compressed with zstd")
(de "Substitute können nun mit zstd komprimiert werden")
(fr "Les substituts peuvent maintenant être compressés avec zstd"))
(body
(en "The @command{guix publish} command now supports substitute
compression with zstd and @command{guix-daemon} can now fetch and decompress
them.
The advantage of zstd over the other options is its high compression and
decompression throughput, with good compression ratios (not as good as lzip,
but slightly better than gzip). Its high decompression throughput makes it a
good choice in situations where substitute downloads would otherwise be
CPU-bound, typically when having a high-speed connection to the substitute
server. Run @command{info \"(guix) Invoking guix publish\"} for more info.
To be able to fetch zstd-compressed substitutes (if the substitute servers you
chose provide them), you need to upgrade your daemon. Run @command{info
\"(guix) Upgrading Guix\"} to learn how to do it.")
(de "Mit dem Befehl @command{guix publish} können Sie jetzt auch
Substitute mit zstd komprimieren und @command{guix-daemon} kann sie laden und
dekomprimieren.
zstd bietet gegenüber den anderen Optionen einen hohen Durchsatz bei
Kompression und Dekompression mit guten Kompressionsverhältnissen (nicht so
gut wie lzip, aber etwas besser als gzip). Wegen des hohen Durchsatzes bei
der Dekompression ist zstd eine gute Wahl, wenn beim Herunterladen von
Substituten ansonsten der Engpass bei der Prozessorleistung läge, etwa weil
eine schnelle Netzwerkverbindung zum Substitutserver besteht. Führen Sie für
mehr Informationen @command{info \"(guix.de) Aufruf von guix publish\"} aus.
Um zstd-komprimierte Substitute benutzen zu können (wenn der Substitutserver
sie anbietet), müssen Sie Ihren Daemon aktualisieren. Führen Sie
@command{info \"(guix.de) Aktualisieren von Guix\"} aus, um zu erfahren, wie
Sie ihn aktualisieren.")
(fr "La commande @command{guix publish} peut maintenant compresser
les substituts avec zstd et @command{guix-daemon} est capable de les récupérer
et de les décompresser.
L'avantage de zstd par rapport aux autres méthodes est son haut débit en
compression et décompression, avec un taux de compression correct (pas aussi
bon que lzip, mais légèrement meilleur que gzip). Sa vitesse de décompression
en fait un bon choix dans les situations où le temps de téléchargement des
substituts se retrouve sinon limité par le temps de calcul comme c'est le cas
lorsqu'on bénéficie d'une connexion rapide au serveur de substitut. Lancer
@command{info \"(guix.fr) Invoquer guix publish\"} pour plus d'informations.
Pour pouvoir télécharger des substituts compressés avec zstd (si les serveurs
de substituts choisis les fournissent), il faudra d'abord mettre à jour le
démon. Lancer @command{info \"(guix.fr) Mettre à niveau Guix\"} pour voir
comment faire.")))
(entry (commit "e38d90d497e19e00263fa28961c688a433154386") (entry (commit "e38d90d497e19e00263fa28961c688a433154386")
(title (en "New @option{--with-patch} package transformation option") (title (en "New @option{--with-patch} package transformation option")
(de "Neue Paketumwandlungsoption @option{--with-patch}") (de "Neue Paketumwandlungsoption @option{--with-patch}")

24
gnu/bootloader/grub.scm
View file

@ -168,15 +168,14 @@ STORE-DEVICE designates the device holding the store, and STORE-MOUNT-POINT is
its mount point; these are used to determine where the background image and its mount point; these are used to determine where the background image and
fonts must be searched for. STORE-DIRECTORY-PREFIX is a directory prefix to fonts must be searched for. STORE-DIRECTORY-PREFIX is a directory prefix to
prepend to any store file name." prepend to any store file name."
(define (setup-gfxterm config font-file) (define (setup-gfxterm config)
(if (memq 'gfxterm (bootloader-configuration-terminal-outputs config)) (if (memq 'gfxterm (bootloader-configuration-terminal-outputs config))
#~(format #f " #~(format #f "
if loadfont ~a; then if loadfont unicode; then
set gfxmode=~a set gfxmode=~a
insmod all_video insmod all_video
insmod gfxterm insmod gfxterm
fi~%" fi~%"
#+font-file
#$(string-join #$(string-join
(grub-theme-gfxmode (bootloader-theme config)) (grub-theme-gfxmode (bootloader-theme config))
";")) ";"))
@ -188,13 +187,6 @@ fi~%"
(string-append (symbol->string (assoc-ref colors 'fg)) "/" (string-append (symbol->string (assoc-ref colors 'fg)) "/"
(symbol->string (assoc-ref colors 'bg))))) (symbol->string (assoc-ref colors 'bg)))))
(define font-file
(let* ((bootloader (bootloader-configuration-bootloader config))
(grub (bootloader-package bootloader)))
(normalize-file (file-append grub "/share/grub/unicode.pf2")
store-mount-point
store-directory-prefix)))
(define image (define image
(normalize-file (grub-background-image config) (normalize-file (grub-background-image config)
store-mount-point store-mount-point
@ -216,8 +208,8 @@ else
set menu_color_normal=cyan/blue set menu_color_normal=cyan/blue
set menu_color_highlight=white/blue set menu_color_highlight=white/blue
fi~%" fi~%"
#$(grub-root-search store-device font-file) #$(grub-root-search store-device image)
#$(setup-gfxterm config font-file) #$(setup-gfxterm config)
#$(grub-setup-io config) #$(grub-setup-io config)
#$image #$image
@ -545,9 +537,13 @@ fi~%"))))
(invoke/quiet grub "--no-floppy" "--target=i386-pc" (invoke/quiet grub "--no-floppy" "--target=i386-pc"
"--boot-directory" install-dir "--boot-directory" install-dir
device)) device))
;; When creating a disk-image, only install GRUB modules. ;; When creating a disk-image, only install a font and GRUB modules.
(let* ((fonts (string-append install-dir "/grub/fonts")))
(mkdir-p fonts)
(copy-file (string-append bootloader "/share/grub/unicode.pf2")
(string-append fonts "/unicode.pf2"))
(copy-recursively (string-append bootloader "/lib/") (copy-recursively (string-append bootloader "/lib/")
install-dir))))) install-dir))))))
(define install-grub-disk-image (define install-grub-disk-image
#~(lambda (bootloader root-index image) #~(lambda (bootloader root-index image)

2
gnu/installer.scm
View file

@ -187,7 +187,7 @@ selected keymap."
(lambda (models layouts) (lambda (models layouts)
((installer-keymap-page current-installer) ((installer-keymap-page current-installer)
layouts '#$context))))) layouts '#$context)))))
(#$apply-keymap result) (and result (#$apply-keymap result))
result))) result)))
(define (installer-steps) (define (installer-steps)

21
gnu/installer/newt/keymap.scm
View file

@ -56,7 +56,7 @@ different layout at any time from the parameters menu.")))
(else (G_ "Exit"))) (else (G_ "Exit")))
#:button-callback-procedure #:button-callback-procedure
(case context (case context
((param) (const #t)) ((param) (const #f))
(else (else
(lambda _ (lambda _
(raise (raise
@ -183,7 +183,9 @@ options."
(compute (compute
(lambda (result _) (lambda (result _)
(let* ((layout (result-step result 'layout)) (let* ((layout (result-step result 'layout))
(variants (x11-keymap-layout-variants layout))) (variants (if layout
(x11-keymap-layout-variants layout)
'())))
;; Return #f if the layout does not have any variant. ;; Return #f if the layout does not have any variant.
(and (not (null? variants)) (and (not (null? variants))
(run-variant-page (run-variant-page
@ -196,16 +198,19 @@ options."
(gettext (x11-keymap-layout-description layout) (gettext (x11-keymap-layout-description layout)
"xkeyboard-config"))))))))))) "xkeyboard-config")))))))))))
(define (format-result result) (define (format-result layout variant)
(let ((layout (x11-keymap-layout-name (let ((layout (x11-keymap-layout-name layout))
(result-step result 'layout))) (variant (and=> variant
(variant (and=> (result-step result 'variant)
(lambda (variant) (lambda (variant)
(gettext (x11-keymap-variant-name variant) (gettext (x11-keymap-variant-name variant)
"xkeyboard-config"))))) "xkeyboard-config")))))
(toggleable-latin-layout layout variant))) (toggleable-latin-layout layout variant)))
(format-result
(run-installer-steps #:steps keymap-steps))) (let* ((result (run-installer-steps #:steps keymap-steps))
(layout (result-step result 'layout))
(variant (result-step result 'variant)))
(and layout
(format-result layout variant))))
(define (keyboard-layout->configuration keymap) (define (keyboard-layout->configuration keymap)
"Return the operating system configuration snippet to install KEYMAP." "Return the operating system configuration snippet to install KEYMAP."

16
gnu/local.mk
View file

@ -10,14 +10,14 @@
# Copyright © 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net> # Copyright © 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
# Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com> # Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
# Copyright © 2016, 2017, 2018, 2019 Alex Vong <alexvong1995@gmail.com> # Copyright © 2016, 2017, 2018, 2019 Alex Vong <alexvong1995@gmail.com>
# Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il> # Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
# Copyright © 2016, 2017, 2018, 2019, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> # Copyright © 2016, 2017, 2018, 2019, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
# Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> # Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
# Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org> # Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org>
# Copyright © 2017, 2020 Mathieu Othacehe <m.othacehe@gmail.com> # Copyright © 2017, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
# Copyright © 2017, 2018, 2019 Gábor Boskovits <boskovits@gmail.com> # Copyright © 2017, 2018, 2019 Gábor Boskovits <boskovits@gmail.com>
# Copyright © 2018 Amirouche Boubekki <amirouche@hypermove.net> # Copyright © 2018 Amirouche Boubekki <amirouche@hypermove.net>
# Copyright © 2018, 2019, 2020 Oleg Pykhalov <go.wigust@gmail.com> # Copyright © 2018, 2019, 2020, 2021 Oleg Pykhalov <go.wigust@gmail.com>
# Copyright © 2018 Stefan Stefanović <stefanx2ovic@gmail.com> # Copyright © 2018 Stefan Stefanović <stefanx2ovic@gmail.com>
# Copyright © 2018, 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> # Copyright © 2018, 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
# Copyright © 2019, 2020 Guillaume Le Vaillant <glv@posteo.net> # Copyright © 2019, 2020 Guillaume Le Vaillant <glv@posteo.net>
@ -630,6 +630,7 @@ GNU_SYSTEM_MODULES = \
%D%/services/sddm.scm \ %D%/services/sddm.scm \
%D%/services/spice.scm \ %D%/services/spice.scm \
%D%/services/ssh.scm \ %D%/services/ssh.scm \
%D%/services/syncthing.scm \
%D%/services/sysctl.scm \ %D%/services/sysctl.scm \
%D%/services/telephony.scm \ %D%/services/telephony.scm \
%D%/services/version-control.scm \ %D%/services/version-control.scm \
@ -997,6 +998,7 @@ dist_patch_DATA = \
%D%/packages/patches/fpc-reproducibility.patch \ %D%/packages/patches/fpc-reproducibility.patch \
%D%/packages/patches/fplll-std-fenv.patch \ %D%/packages/patches/fplll-std-fenv.patch \
%D%/packages/patches/freedink-engine-fix-sdl-hints.patch \ %D%/packages/patches/freedink-engine-fix-sdl-hints.patch \
%D%/packages/patches/freebayes-devendor-deps.patch \
%D%/packages/patches/freeimage-unbundle.patch \ %D%/packages/patches/freeimage-unbundle.patch \
%D%/packages/patches/fuse-overlapping-headers.patch \ %D%/packages/patches/fuse-overlapping-headers.patch \
%D%/packages/patches/gajim-honour-GAJIM_PLUGIN_PATH.patch \ %D%/packages/patches/gajim-honour-GAJIM_PLUGIN_PATH.patch \
@ -1128,6 +1130,7 @@ dist_patch_DATA = \
%D%/packages/patches/gspell-dash-test.patch \ %D%/packages/patches/gspell-dash-test.patch \
%D%/packages/patches/guile-1.8-cpp-4.5.patch \ %D%/packages/patches/guile-1.8-cpp-4.5.patch \
%D%/packages/patches/guile-2.2-skip-oom-test.patch \ %D%/packages/patches/guile-2.2-skip-oom-test.patch \
%D%/packages/patches/guile-2.2-skip-so-test.patch \
%D%/packages/patches/guile-default-utf8.patch \ %D%/packages/patches/guile-default-utf8.patch \
%D%/packages/patches/guile-2.2-default-utf8.patch \ %D%/packages/patches/guile-2.2-default-utf8.patch \
%D%/packages/patches/guile-relocatable.patch \ %D%/packages/patches/guile-relocatable.patch \
@ -1178,12 +1181,14 @@ dist_patch_DATA = \
%D%/packages/patches/icu4c-CVE-2020-10531.patch \ %D%/packages/patches/icu4c-CVE-2020-10531.patch \
%D%/packages/patches/id3lib-CVE-2007-4460.patch \ %D%/packages/patches/id3lib-CVE-2007-4460.patch \
%D%/packages/patches/id3lib-UTF16-writing-bug.patch \ %D%/packages/patches/id3lib-UTF16-writing-bug.patch \
%D%/packages/patches/idris-disable-test.patch \
%D%/packages/patches/ilmbase-fix-tests.patch \ %D%/packages/patches/ilmbase-fix-tests.patch \
%D%/packages/patches/inetutils-hurd.patch \ %D%/packages/patches/inetutils-hurd.patch \
%D%/packages/patches/inkscape-poppler-0.76.patch \ %D%/packages/patches/inkscape-poppler-0.76.patch \
%D%/packages/patches/intel-xed-fix-nondeterminism.patch \ %D%/packages/patches/intel-xed-fix-nondeterminism.patch \
%D%/packages/patches/intltool-perl-compatibility.patch \ %D%/packages/patches/intltool-perl-compatibility.patch \
%D%/packages/patches/iputils-libcap-compat.patch \ %D%/packages/patches/iputils-libcap-compat.patch \
%D%/packages/patches/ipxe-reproducible-geniso.patch \
%D%/packages/patches/irrlicht-use-system-libs.patch \ %D%/packages/patches/irrlicht-use-system-libs.patch \
%D%/packages/patches/isl-0.11.1-aarch64-support.patch \ %D%/packages/patches/isl-0.11.1-aarch64-support.patch \
%D%/packages/patches/json-c-CVE-2020-12762.patch \ %D%/packages/patches/json-c-CVE-2020-12762.patch \
@ -1383,6 +1388,7 @@ dist_patch_DATA = \
%D%/packages/patches/mupen64plus-video-z64-glew-correct-path.patch \ %D%/packages/patches/mupen64plus-video-z64-glew-correct-path.patch \
%D%/packages/patches/musl-cross-locale.patch \ %D%/packages/patches/musl-cross-locale.patch \
%D%/packages/patches/mutt-store-references.patch \ %D%/packages/patches/mutt-store-references.patch \
%D%/packages/patches/mutt-CVE-2021-3181.patch \
%D%/packages/patches/m4-gnulib-libio.patch \ %D%/packages/patches/m4-gnulib-libio.patch \
%D%/packages/patches/ncompress-fix-softlinks.patch \ %D%/packages/patches/ncompress-fix-softlinks.patch \
%D%/packages/patches/netcdf-date-time.patch \ %D%/packages/patches/netcdf-date-time.patch \
@ -1491,7 +1497,6 @@ dist_patch_DATA = \
%D%/packages/patches/plib-CVE-2011-4620.patch \ %D%/packages/patches/plib-CVE-2011-4620.patch \
%D%/packages/patches/plib-CVE-2012-4552.patch \ %D%/packages/patches/plib-CVE-2012-4552.patch \
%D%/packages/patches/plotutils-spline-test.patch \ %D%/packages/patches/plotutils-spline-test.patch \
%D%/packages/patches/podofo-cmake-3.12.patch \
%D%/packages/patches/portaudio-audacity-compat.patch \ %D%/packages/patches/portaudio-audacity-compat.patch \
%D%/packages/patches/portmidi-modular-build.patch \ %D%/packages/patches/portmidi-modular-build.patch \
%D%/packages/patches/postgresql-disable-resolve_symlinks.patch \ %D%/packages/patches/postgresql-disable-resolve_symlinks.patch \
@ -1580,7 +1585,7 @@ dist_patch_DATA = \
%D%/packages/patches/readline-6.2-CVE-2014-2524.patch \ %D%/packages/patches/readline-6.2-CVE-2014-2524.patch \
%D%/packages/patches/renpy-use-system-fribidi.patch \ %D%/packages/patches/renpy-use-system-fribidi.patch \
%D%/packages/patches/reposurgeon-add-missing-docbook-files.patch \ %D%/packages/patches/reposurgeon-add-missing-docbook-files.patch \
%D%/packages/patches/r-httpuv-1.5.4-unvendor-libuv.patch \ %D%/packages/patches/r-httpuv-1.5.5-unvendor-libuv.patch \
%D%/packages/patches/ri-li-modernize_cpp.patch \ %D%/packages/patches/ri-li-modernize_cpp.patch \
%D%/packages/patches/ripperx-missing-file.patch \ %D%/packages/patches/ripperx-missing-file.patch \
%D%/packages/patches/rpcbind-CVE-2017-8779.patch \ %D%/packages/patches/rpcbind-CVE-2017-8779.patch \
@ -1667,8 +1672,10 @@ dist_patch_DATA = \
%D%/packages/patches/thefuck-test-environ.patch \ %D%/packages/patches/thefuck-test-environ.patch \
%D%/packages/patches/tidy-CVE-2015-5522+5523.patch \ %D%/packages/patches/tidy-CVE-2015-5522+5523.patch \
%D%/packages/patches/tinyxml-use-stl.patch \ %D%/packages/patches/tinyxml-use-stl.patch \
%D%/packages/patches/tipp10-disable-downloader.patch \
%D%/packages/patches/tipp10-fix-compiling.patch \ %D%/packages/patches/tipp10-fix-compiling.patch \
%D%/packages/patches/tipp10-remove-license-code.patch \ %D%/packages/patches/tipp10-remove-license-code.patch \
%D%/packages/patches/tipp10-qt5.patch \
%D%/packages/patches/tk-find-library.patch \ %D%/packages/patches/tk-find-library.patch \
%D%/packages/patches/transcode-ffmpeg.patch \ %D%/packages/patches/transcode-ffmpeg.patch \
%D%/packages/patches/transmission-honor-localedir.patch \ %D%/packages/patches/transmission-honor-localedir.patch \
@ -1703,7 +1710,6 @@ dist_patch_DATA = \
%D%/packages/patches/vboot-utils-fix-format-load-address.patch \ %D%/packages/patches/vboot-utils-fix-format-load-address.patch \
%D%/packages/patches/vboot-utils-fix-tests-show-contents.patch \ %D%/packages/patches/vboot-utils-fix-tests-show-contents.patch \
%D%/packages/patches/vboot-utils-skip-test-workbuf.patch \ %D%/packages/patches/vboot-utils-skip-test-workbuf.patch \
%D%/packages/patches/vcflib-use-shared-libraries.patch \
%D%/packages/patches/vlc-qt-5.15.patch \ %D%/packages/patches/vlc-qt-5.15.patch \
%D%/packages/patches/vigra-python-compat.patch \ %D%/packages/patches/vigra-python-compat.patch \
%D%/packages/patches/vinagre-newer-freerdp.patch \ %D%/packages/patches/vinagre-newer-freerdp.patch \

74
gnu/packages/admin.scm
View file

@ -267,7 +267,8 @@ and provides a \"top-like\" mode (monitoring).")
"0x9zr0x3xvk4qkb6jnda451d5iyrl06cz1bjzjsm0lxvjj3fabyk")))) "0x9zr0x3xvk4qkb6jnda451d5iyrl06cz1bjzjsm0lxvjj3fabyk"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:configure-flags '("--localstatedir=/var"))) '(#:configure-flags '("--localstatedir=/var")
#:make-flags '("GUILE_AUTO_COMPILE=0")))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
@ -297,7 +298,8 @@ interface and is based on GNU Guile.")
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("guile" ,guile-2.2))) ("guile" ,guile-2.2)))
(inputs (inputs
`(("guile" ,guile-2.2))))) `(("guile" ,guile-2.2)
("guile2.2-readline" ,guile2.2-readline)))))
(define-public guile3.0-shepherd (define-public guile3.0-shepherd
(deprecated-package "guile3.0-shepherd" shepherd)) (deprecated-package "guile3.0-shepherd" shepherd))
@ -307,10 +309,21 @@ interface and is based on GNU Guile.")
(inherit shepherd) (inherit shepherd)
(name "guile2.0-shepherd") (name "guile2.0-shepherd")
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("help2man" ,help2man)
("pkg-config" ,pkg-config)
("guile" ,guile-2.0))) ("guile" ,guile-2.0)))
(inputs (inputs
`(("guile" ,guile-2.0))))) `(("guile" ,guile-2.0)))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-source
(lambda _
;; (ice-9 threads) isn't available in guile-2.0
(substitute* "modules/shepherd.scm"
((".*\\(ice-9 threads\\).*") ""))
#t)))
,@(package-arguments shepherd)))))
(define-public cloud-utils (define-public cloud-utils
(package (package
@ -445,7 +458,7 @@ graphs and can export its output to different formats.")
(define-public facter (define-public facter
(package (package
(name "facter") (name "facter")
(version "4.0.47") (version "4.0.49")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -454,7 +467,7 @@ graphs and can export its output to different formats.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1zz5kk3ad1jj8y939369dfvjh7zqwpkcqzzad7yb6wp01rc5sf88")))) "0l7gic5ql5xiy5s6rb0j9ydyaal5bcxl10bx45khcgdr9zg16pb1"))))
(build-system ruby-build-system) (build-system ruby-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -516,7 +529,7 @@ or via the @code{facter} Ruby library.")
(define-public htop (define-public htop
(package (package
(name "htop") (name "htop")
(version "3.0.4") (version "3.0.5")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -524,7 +537,7 @@ or via the @code{facter} Ruby library.")
(url "https://github.com/htop-dev/htop") (url "https://github.com/htop-dev/htop")
(commit version))) (commit version)))
(sha256 (sha256
(base32 "1fckfv96vzqjs3lzy0cgwsqv5vh1sxca3fhvgskmnkvr5bq6cia9")) (base32 "10lp6cbfvigzp6pq5nwj3s3l4vs7cv92krz2r08nwrz8vl6rqdzp"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
@ -1402,7 +1415,7 @@ system administrator.")
(define-public sudo (define-public sudo
(package (package
(name "sudo") (name "sudo")
(version "1.9.4p2") (version "1.9.5p1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (uri
@ -1412,7 +1425,7 @@ system administrator.")
version ".tar.gz"))) version ".tar.gz")))
(sha256 (sha256
(base32 (base32
"0r0g8z289ipw0zpkhmm33cpfm42j01jds2q1wilhh3flg7xg2jn3")) "10kqdfbfpf3vk5ihz5gwynv4pxdf1lg6ircrlanyygb549yg7pad"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -1862,7 +1875,7 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).")
(define-public acpica (define-public acpica
(package (package
(name "acpica") (name "acpica")
(version "20201217") (version "20210105")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -1870,7 +1883,7 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"06rdpfjmij5nni1x2wi1gnalhsza5yxq1viskjm9r11wmsjnxm2a")))) "1gi7qzfywg118g5nlqn5lawxk25pg2sz01gmbz40vvmikks4ri9r"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("flex" ,flex) (native-inputs `(("flex" ,flex)
("bison" ,bison))) ("bison" ,bison)))
@ -2611,14 +2624,14 @@ done with the @code{auditctl} utility.")
(define-public nmap (define-public nmap
(package (package
(name "nmap") (name "nmap")
(version "7.91") (version "7.80")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://nmap.org/dist/nmap-" version (uri (string-append "https://nmap.org/dist/nmap-" version
".tar.bz2")) ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"001kb5xadqswyw966k2lqi6jr6zz605jpp9w4kmm272if184pk0q")) "1aizfys6l9f9grm82bk878w56mg0zpkfns3spzj157h98875mypw"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -2696,7 +2709,7 @@ advanced netcat implementation (ncat), a utility for comparing scan
results (ndiff), and a packet generation and response analysis tool (nping).") results (ndiff), and a packet generation and response analysis tool (nping).")
;; This package uses nmap's bundled versions of libdnet and liblinear, which ;; This package uses nmap's bundled versions of libdnet and liblinear, which
;; both use a 3-clause BSD license. ;; both use a 3-clause BSD license.
(license (list license:npsl license:bsd-3)))) (license (list license:nmap license:bsd-3))))
(define-public dstat (define-public dstat
(package (package
@ -3617,7 +3630,7 @@ Python loading in HPC environments.")
(let ((real-name "inxi")) (let ((real-name "inxi"))
(package (package
(name "inxi-minimal") (name "inxi-minimal")
(version "3.2.01-1") (version "3.2.02-2")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -3626,7 +3639,7 @@ Python loading in HPC environments.")
(commit version))) (commit version)))
(file-name (git-file-name real-name version)) (file-name (git-file-name real-name version))
(sha256 (sha256
(base32 "15bakrv3jzj5h88c3bd0cfhh6hb8b4hm79924k1ygn29sqzgyw65")))) (base32 "0fwx798v9kwiwkgbj97w6rjdanwf7ap65vvq1fqy7gd9x78xcxsq"))))
(build-system trivial-build-system) (build-system trivial-build-system)
(inputs (inputs
`(("bash" ,bash-minimal) `(("bash" ,bash-minimal)
@ -4306,3 +4319,30 @@ This program allows you to view and manipulate this EEPROM list.")
(home-page "https://github.com/xobs/novena-eeprom/") (home-page "https://github.com/xobs/novena-eeprom/")
(supported-systems '("armhf-linux")) (supported-systems '("armhf-linux"))
(license license:bsd-3))) (license license:bsd-3)))
(define-public lrzsz
(package
(name "lrzsz")
(version "0.12.20")
(source (origin
(method url-fetch)
(uri (string-append "https://www.ohse.de/uwe/releases/lrzsz-"
version ".tar.gz"))
(sha256
(base32
"1wcgfa9fsigf1gri74gq0pa7pyajk12m4z69x7ci9c6x9fqkd2y2"))))
(build-system gnu-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys)
(setenv "CONFIG_SHELL" (which "bash"))
(invoke "./configure"
(string-append "--prefix="
(assoc-ref outputs "out"))))))))
(synopsis "Implementation of XMODEM/YMODEM/ZMODEM transfer protocols")
(description "This package provides programs that transfer files using
the XMODEM/YMODEM/ZMODEM file transfer protocols.")
(home-page "https://ohse.de/uwe/software/lrzsz.html")
(license license:gpl2+)))

21
gnu/packages/algebra.scm
View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2013, 2015, 2017, 2018 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2015, 2017, 2018, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2014, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016, 2018, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
@ -327,8 +327,8 @@ GP2C, the GP to C compiler, translates GP scripts to PARI programs.")
(version "1.0") (version "1.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append ;; Git repo at <https://gitlab.inria.fr/cmh/cmh>.
"https://gforge.inria.fr/frs/download.php/33497/cmh-" (uri (string-append "http://www.multiprecision.org/downloads/cmh-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
@ -349,13 +349,12 @@ varieties, i.e. Jacobians of hyperelliptic curves.
It can also be used to compute theta constants at arbitrary It can also be used to compute theta constants at arbitrary
precision.") precision.")
(license license:gpl3+) (license license:gpl3+)
(home-page (home-page "http://www.multiprecision.org/cmh/home.html")))
"https://gitlab.inria.fr/cmh/cmh#cmh-computation-of-genus-2-class-polynomials")))
(define-public giac (define-public giac
(package (package
(name "giac") (name "giac")
(version "1.6.0-41") (version "1.6.0-47")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -367,7 +366,7 @@ precision.")
"~parisse/debian/dists/stable/main/source/" "~parisse/debian/dists/stable/main/source/"
"giac_" version ".tar.gz")) "giac_" version ".tar.gz"))
(sha256 (sha256
(base32 "1z5b3jm6ffxk3yvdqzwn9icbna68brkrz5kspgacq823d03jfklc")))) (base32 "15sgsr8l6njp5spagbqclqkdy3x7ra23wi6wvpc8vzlbivy3v43k"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:modules ((ice-9 ftw) `(#:modules ((ice-9 ftw)
@ -674,9 +673,11 @@ geometry and singularity theory.")
(version "7.0.4") (version "7.0.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
;; Use the ‘Latest version’ link for a stable URI across releases. (uri
(uri (string-append "https://gforge.inria.fr/frs/download.php/" (let ((hash "00c4c691a1ef8605b65bdf794a71539d"))
"latestfile/160/ecm-" version ".tar.gz")) (string-append "https://gitlab.inria.fr/zimmerma/ecm/"
"uploads/" hash "/ecm-" version
".tar.gz")))
(sha256 (base32 (sha256 (base32
"0hxs24c2m3mh0nq1zz63z3sb7dhy1rilg2s1igwwcb26x3pb7xqc")))) "0hxs24c2m3mh0nq1zz63z3sb7dhy1rilg2s1igwwcb26x3pb7xqc"))))
(build-system gnu-build-system) (build-system gnu-build-system)

4
gnu/packages/aspell.scm
View file

@ -476,14 +476,14 @@ under permissive licensing terms. See the 'Copyright' file."))))
(define-public ispell (define-public ispell
(package (package
(name "ispell") (name "ispell")
(version "3.4.01") (version "3.4.02")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.cs.hmc.edu/~geoff/tars/ispell-" (uri (string-append "https://www.cs.hmc.edu/~geoff/tars/ispell-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 "103vscg4bc7x2q84y18x1l75k54yhkw8lpza3qh8xxhcz5b0w7jb")))) (base32 "0b6rqzqjdhwf323sf1dv8qzx5pxa5asz618922r59zjp65660yb6"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:parallel-build? #f `(#:parallel-build? #f

35
gnu/packages/assembly.scm
View file

@ -2,7 +2,7 @@
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2013, 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2016, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Guy Fleury Iteriteka <hoonandon@gmail.com> ;;; Copyright © 2019 Guy Fleury Iteriteka <hoonandon@gmail.com>
;;; Copyright © 2019 Andy Tai <atai@atai.org> ;;; Copyright © 2019 Andy Tai <atai@atai.org>
@ -26,6 +26,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages assembly) (define-module (gnu packages assembly)
#:use-module (guix build-system meson)
#: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 download) #:use-module (guix download)
@ -148,6 +149,38 @@ to the clients.")
(home-page "https://www.gnu.org/software/lightning/") (home-page "https://www.gnu.org/software/lightning/")
(license license:gpl3+))) (license license:gpl3+)))
(define-public simde
(package
(name "simde")
(version "0.7.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/simd-everywhere/simde")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1xf5xfzkk9rj47cichgz5ni8xs9hbpz5p6fmxr4ij721ffd002k3"))
(modules '((guix build utils)))
(snippet
'(begin
;; Fix the version string
(substitute* "meson.build"
(("0.7.0-rc2") "0.7.0"))
#t))))
(build-system meson-build-system)
;; We really want this for the headers, and the tests require a bundled library.
(arguments '(#:configure-flags '("-Dtests=false")))
(synopsis "Implementations of SIMD instruction sets for foreign systems")
(description "The SIMDe header-only library provides fast, portable
implementations of SIMD intrinsics on hardware which doesn't natively support
them, such as calling SSE functions on ARM. There is no performance penalty if
the hardware supports the native implementation (e.g., SSE/AVX runs at full
speed on x86, NEON on ARM, etc.).")
(home-page "https://simd-everywhere.github.io/blog/")
(license license:expat)))
(define-public fasm (define-public fasm
(package (package
(name "fasm") (name "fasm")

97
gnu/packages/astronomy.scm
View file

@ -5,6 +5,7 @@
;;; Copyright © 2019 by Amar Singh <nly@disroot.org> ;;; Copyright © 2019 by Amar Singh <nly@disroot.org>
;;; Copyright © 2020 R Veera Kumar <vkor@vkten.in> ;;; Copyright © 2020 R Veera Kumar <vkor@vkten.in>
;;; Copyright © 2020 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2020 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -51,6 +52,7 @@
#: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 gnu) #:use-module (guix build-system gnu)
#:use-module (ice-9 match)
#:use-module (srfi srfi-1)) #:use-module (srfi srfi-1))
(define-public cfitsio (define-public cfitsio
@ -156,6 +158,52 @@ header.")
programs for the manipulation and analysis of astronomical data.") programs for the manipulation and analysis of astronomical data.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public sextractor
(package
(name "sextractor")
(version "2.25.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/astromatic/sextractor")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0q69n3nyal57h3ik2xirwzrxzljrwy9ivwraxzv9566vi3n4z5mw"))))
(build-system gnu-build-system)
;; NOTE: (Sharlatan-20210124T103117+0000): Building with `atlas' is failing
;; due to missing shared library which required on configure phase. Switch
;; build to use `openblas' instead. It requires FFTW with single precision
;; `fftwf'.
(arguments
`(#:configure-flags
(list
"--enable-openblas"
(string-append
"--with-openblas-libdir=" (assoc-ref %build-inputs "openblas") "/lib")
(string-append
"--with-openblas-incdir=" (assoc-ref %build-inputs "openblas") "/include")
(string-append
"--with-fftw-libdir=" (assoc-ref %build-inputs "fftw") "/lib")
(string-append
"--with-fftw-incdir=" (assoc-ref %build-inputs "fftw") "/include"))))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)))
(inputs
`(("openblas" ,openblas)
("fftw" ,fftwf)))
(home-page "http://www.astromatic.net/software/sextractor")
(synopsis "Extract catalogs of sources from astronomical images")
(description
"SExtractor is a program that builds a catalogue of objects from an
astronomical image. Although it is particularly oriented towards reduction of
large scale galaxy-survey data, it can perform reasonably well on moderately
crowded star fields.")
(license license:gpl3+)))
(define-public stellarium (define-public stellarium
(package (package
(name "stellarium") (name "stellarium")
@ -299,6 +347,55 @@ Mechanics, Astrometry and Astrodynamics library.")
(license (list license:lgpl2.0+ (license (list license:lgpl2.0+
license:gpl2+)))) ; examples/transforms.c & lntest/*.c license:gpl2+)))) ; examples/transforms.c & lntest/*.c
(define-public libpasastro
;; NOTE: (Sharlatan-20210122T215921+0000): the version tag has a build
;; error on spice which is resolved with the latest commit.
(let ((commit "e3c218d1502a18cae858c83a9a8812ab197fcb60")
(revision "1"))
(package
(name "libpasastro")
(version (git-version "1.4.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/pchev/libpasastro")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0asp2sn34nds5va2ghppwc41vb6j3d1mf049j949rgrll817kx47"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f
#:make-flags
(list
,(match (or (%current-target-system) (%current-system))
((or "aarch64-linux" "armhf-linux" "i686-linux" "x86_64-linux")
"OS_TARGET=linux")
(_ #f))
,(match (or (%current-target-system) (%current-system))
("i686-linux" "CPU_TARGET=i386")
("x86_64-linux" "CPU_TARGET=x86_64")
((or "armhf-linux" "aarch64-linux") "CPU_TARGET=armv7l")
(_ #f))
(string-append "PREFIX=" (assoc-ref %outputs "out")))
#:phases
(modify-phases %standard-phases
(delete 'configure))))
(home-page "https://github.com/pchev/libpasastro")
(synopsis "Interface to astronomy library for use from Pascal program")
(description
"This package provides shared libraries to interface Pascal program with
standard astronomy libraries:
@itemize
@item @code{libpasgetdss.so}: Interface with GetDSS to work with DSS images.
@item @code{libpasplan404.so}: Interface with Plan404 to compute planets position.
@item @code{libpaswcs.so}: Interface with libwcs to work with FITS WCS.
@item @code{libpasspice.so}: To work with NAIF/SPICE kernel.
@end itemize\n")
(license license:gpl2+))))
(define-public xplanet (define-public xplanet
(package (package
(name "xplanet") (name "xplanet")

59
gnu/packages/audio.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com> ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015 Alex Kost <alezost@gmail.com> ;;; Copyright © 2015 Alex Kost <alezost@gmail.com>
@ -4134,6 +4134,63 @@ the following features:
") ")
(license license:lgpl3+))) (license license:lgpl3+)))
(define-public lv2-speech-denoiser
(let ((commit "04cfba929630404f8d4f4ca5bac8d9b09a99152f")
(revision "1"))
(package
(name "lv2-speech-denoiser")
(version (git-version "0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/lucianodato/speech-denoiser/")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "189l6lz8sz5vr6bjyzgcsrvksl1w6crqsg0q65r94b5yjsmjnpr4"))))
(build-system meson-build-system)
(arguments
`(#:meson ,meson-0.55
;; Using a "release" build is recommended for performance
#:build-type "release"
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-meson-build
(lambda _
(substitute* "meson.build"
(("install_folder = 'sdenoise.lv2'")
"install_folder = 'lib/lv2/sdenoise.lv2'")
(("build/manifest.ttl") "../build/manifest.ttl"))
#t))
(add-after 'unpack 'build-rnnoise
(lambda _
(with-directory-excursion "rnnoise"
(let ((old-CFLAGS (getenv "CFLAGS")))
(setenv "CFLAGS" "-fvisibility=hidden -fPIC -Wl,--exclude-libs,ALL")
(setenv "CONFIG_SHELL" (which "bash"))
(invoke "autoreconf" "-vif")
(invoke "sh" "configure"
"--disable-examples"
"--disable-doc"
"--disable-shared"
"--enable-static")
(invoke "make")
(setenv "CFLAGS" old-CFLAGS))))))))
(inputs
`(("lv2" ,lv2)))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)
("pkg-config" ,pkg-config)))
(home-page "https://github.com/werman/noise-suppression-for-voice")
(synopsis "Speech denoise LV2 plugin based on Xiph's RNNoise library")
(description "RNNoise is a library that uses deep learning to apply
noise supression to audio sources with voice presence. This package provides
an LV2 audio plugin.")
(license license:lgpl3+))))
(define-public cli-visualizer (define-public cli-visualizer
(package (package
(name "cli-visualizer") (name "cli-visualizer")

49
gnu/packages/autotools.scm
View file

@ -11,6 +11,7 @@
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019 Pierre-Moana Levesque <pierre.moana.levesque@gmail.com> ;;; Copyright © 2019 Pierre-Moana Levesque <pierre.moana.levesque@gmail.com>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -38,6 +39,7 @@
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system trivial) #:use-module (guix build-system trivial)
#:use-module (ice-9 match) #:use-module (ice-9 match)
@ -491,6 +493,53 @@ 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 config
(let ((revision "1")
(commit "c8ddc8472f8efcadafc1ef53ca1d863415fddd5f"))
(package
(name "config")
(version (git-version "0.0.0" revision commit)) ;no release tag
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://git.savannah.gnu.org/git/config.git/")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0x6ycvkmmhhhag97wsf0pw8n5fvh12rjvrck90rz17my4ys16qwv"))))
(build-system gnu-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
(add-after 'unpack 'patch-/bin/sh
(lambda _
(substitute* "testsuite/config-guess.sh"
(("#!/bin/sh")
(string-append "#!" (which "sh"))))
#t))
(replace 'build
(lambda _
(invoke "make" "manpages")))
(delete 'configure)
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin"))
(man1 (string-append out "/share/man/man1")))
(install-file "config.guess" bin)
(install-file "config.sub" bin)
(install-file "doc/config.guess.1" man1)
(install-file "doc/config.sub.1" man1)
#t))))))
(native-inputs
`(("help2man" ,help2man)))
(home-page "https://savannah.gnu.org/projects/config")
(synopsis "Ubiquitious config.guess and config.sub scripts")
(description "The `config.guess' script tries to guess a canonical system triple,
and `config.sub' validates and canonicalizes. These are used as part of
configuration in nearly all GNU packages (and many others).")
(license gpl2+))))
(define-public libltdl (define-public libltdl
;; This is a libltdl package separate from the libtool package. This is ;; This is a libltdl package separate from the libtool package. This is
;; useful because, unlike libtool, it has zero extra dependencies (making it ;; useful because, unlike libtool, it has zero extra dependencies (making it

462
gnu/packages/bioinformatics.scm
View file

@ -4,14 +4,14 @@
;;; Copyright © 2015, 2016, 2018, 2019, 2020 Pjotr Prins <pjotr.guix@thebird.nl> ;;; Copyright © 2015, 2016, 2018, 2019, 2020 Pjotr Prins <pjotr.guix@thebird.nl>
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2016, 2020 Roel Janssen <roel@gnu.org> ;;; Copyright © 2016, 2020 Roel Janssen <roel@gnu.org>
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2016, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2016, 2018 Raoul Bonnal <ilpuccio.febo@gmail.com> ;;; Copyright © 2016, 2018 Raoul Bonnal <ilpuccio.febo@gmail.com>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com> ;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com>
;;; Copyright © 2018 Gábor Boskovits <boskovits@gmail.com> ;;; Copyright © 2018 Gábor Boskovits <boskovits@gmail.com>
;;; Copyright © 2018, 2019, 2020 Mădălin Ionel Patrașcu <madalinionel.patrascu@mdc-berlin.de> ;;; Copyright © 2018, 2019, 2020, 2021 Mădălin Ionel Patrașcu <madalinionel.patrascu@mdc-berlin.de>
;;; Copyright © 2019, 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2019, 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2019 Brian Leung <bkleung89@gmail.com> ;;; Copyright © 2019 Brian Leung <bkleung89@gmail.com>
;;; Copyright © 2019 Brett Gilio <brettg@gnu.org> ;;; Copyright © 2019 Brett Gilio <brettg@gnu.org>
@ -57,6 +57,7 @@
#:use-module (guix build-system trivial) #:use-module (guix build-system trivial)
#:use-module (guix deprecation) #:use-module (guix deprecation)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages assembly)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
#:use-module (gnu packages algebra) #:use-module (gnu packages algebra)
#:use-module (gnu packages base) #:use-module (gnu packages base)
@ -142,6 +143,7 @@
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module (gnu packages xorg) #:use-module (gnu packages xorg)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (srfi srfi-26)
#:use-module (ice-9 match)) #:use-module (ice-9 match))
(define-public aragorn (define-public aragorn
@ -3563,61 +3565,60 @@ comment or quality sections.")
(define-public gemma (define-public gemma
(package (package
(name "gemma") (name "gemma")
(version "0.98") (version "0.98.3")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/xiangzhou/GEMMA") (url "https://github.com/genetics-statistics/GEMMA")
(commit (string-append "v" version)))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1s3ncnbn45r2hh1cvrqky1kbqq6546biypr4f5mkw1kqlrgyh0yg")))) "1p8a7kkfn1mmrg017aziy544aha8i9h6wd1x2dk3w2794wl33qb7"))
(modules '((guix build utils)))
(snippet
'(begin
(delete-file-recursively "contrib")
#t))))
(build-system gnu-build-system)
(inputs (inputs
`(("eigen" ,eigen) `(("gsl" ,gsl)
("gfortran" ,gfortran "lib")
("gsl" ,gsl)
("lapack" ,lapack)
("openblas" ,openblas) ("openblas" ,openblas)
("zlib" ,zlib))) ("zlib" ,zlib)))
(build-system gnu-build-system) (native-inputs
`(("catch" ,catch-framework2-1)
("perl" ,perl)
("shunit2" ,shunit2)
("which" ,which)))
(arguments (arguments
`(#:make-flags `(#:phases
'(,@(match (%current-system)
("x86_64-linux"
'("FORCE_DYNAMIC=1"))
("i686-linux"
'("FORCE_DYNAMIC=1" "FORCE_32BIT=1"))
(_
'("FORCE_DYNAMIC=1" "NO_INTEL_COMPAT=1"))))
#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure) (delete 'configure)
(add-after 'unpack 'find-eigen (add-after 'unpack 'prepare-build
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; Ensure that Eigen headers can be found
(setenv "CPLUS_INCLUDE_PATH"
(string-append (assoc-ref inputs "eigen")
"/include/eigen3"))
#t))
(add-before 'build 'bin-mkdir
(lambda _
(mkdir-p "bin") (mkdir-p "bin")
(substitute* "Makefile"
(("/usr/local/opt/openblas")
(assoc-ref inputs "openblas")))
#t)) #t))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
;; 'make slow-check' expects shunit2-2.0.3.
(with-directory-excursion "test"
(invoke "./test_suite.sh"))
#t)))
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(install-file "bin/gemma" (install-file "bin/gemma"
(string-append (string-append (assoc-ref outputs "out") "/bin"))
out "/bin"))) #t)))))
#t))) (home-page "https://github.com/genetics-statistics/GEMMA")
#:tests? #f)) ; no tests included yet
(home-page "https://github.com/xiangzhou/GEMMA")
(synopsis "Tool for genome-wide efficient mixed model association") (synopsis "Tool for genome-wide efficient mixed model association")
(description (description
"Genome-wide Efficient Mixed Model Association (GEMMA) provides a "@acronym{GEMMA, Genome-wide Efficient Mixed Model Association} provides a
standard linear mixed model resolver with application in genome-wide standard linear mixed model resolver with application in @acronym{GWAS,
association studies (GWAS).") genome-wide association studies}.")
(license license:gpl3))) (license license:gpl3)))
(define-public grit (define-public grit
@ -4687,7 +4688,7 @@ sequencing tag position and orientation.")
(define-public mafft (define-public mafft
(package (package
(name "mafft") (name "mafft")
(version "7.471") (version "7.475")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -4696,7 +4697,7 @@ sequencing tag position and orientation.")
(file-name (string-append name "-" version ".tgz")) (file-name (string-append name "-" version ".tgz"))
(sha256 (sha256
(base32 (base32
"0r1973fx2scq4712zdqfy67wkzqj0c0bhrdy4jxhvq40mdxyry30")))) "0i2i2m3blh2xkbkdk48hxfssks30ny0v381gdl7zwhcvp0axs26r"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; no automated tests, though there are tests in the read me `(#:tests? #f ; no automated tests, though there are tests in the read me
@ -7073,6 +7074,55 @@ sequence.")
(supported-systems '("i686-linux" "x86_64-linux")) (supported-systems '("i686-linux" "x86_64-linux"))
(license license:bsd-3))) (license license:bsd-3)))
(define-public r-snapatac
(package
(name "r-snapatac")
(version "2.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/r3fang/SnapATAC")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "037jzlbl436fi7lkpq7d83i2vd1crnrik3vac2x6xj75dbikb2av"))))
(properties `((upstream-name . "SnapATAC")))
(build-system r-build-system)
(propagated-inputs
`(("r-bigmemory" ,r-bigmemory)
("r-doparallel" ,r-doparallel)
("r-dosnow" ,r-dosnow)
("r-edger" ,r-edger)
("r-foreach" ,r-foreach)
("r-genomicranges" ,r-genomicranges)
("r-igraph" ,r-igraph)
("r-iranges" ,r-iranges)
("r-irlba" ,r-irlba)
("r-matrix" ,r-matrix)
("r-plyr" ,r-plyr)
("r-plot3d" ,r-plot3d)
("r-rann" ,r-rann)
("r-raster" ,r-raster)
("r-rcolorbrewer" ,r-rcolorbrewer)
("r-rhdf5" ,r-rhdf5)
("r-rtsne" ,r-rtsne)
("r-scales" ,r-scales)
("r-viridis" ,r-viridis)))
(home-page "https://github.com/r3fang/SnapATAC")
(synopsis "Single nucleus analysis package for ATAC-Seq")
(description
"This package provides a fast and accurate analysis toolkit for single
cell ATAC-seq (Assay for transposase-accessible chromatin using sequencing).
Single cell ATAC-seq can resolve the heterogeneity of a complex tissue and
reveal cell-type specific regulatory landscapes. However, the exceeding data
sparsity has posed unique challenges for the data analysis. This package
@code{r-snapatac} is an end-to-end bioinformatics pipeline for analyzing large-
scale single cell ATAC-seq data which includes quality control, normalization,
clustering analysis, differential analysis, motif inference and exploration of
single cell ATAC-seq sequencing data.")
(license license:gpl3)))
(define-public r-scde (define-public r-scde
(package (package
(name "r-scde") (name "r-scde")
@ -7726,6 +7776,31 @@ BLAST, KEGG, GenBank, MEDLINE and GO.")
;; (LGPLv2.1+) and scripts in samples (which have GPL2 and GPL2+) ;; (LGPLv2.1+) and scripts in samples (which have GPL2 and GPL2+)
(license (list license:ruby license:lgpl2.1+ license:gpl2+ )))) (license (list license:ruby license:lgpl2.1+ license:gpl2+ ))))
(define-public bio-vcf
(package
(name "bio-vcf")
(version "0.9.5")
(source
(origin
(method url-fetch)
(uri (rubygems-uri "bio-vcf" version))
(sha256
(base32
"1glw5pn9s8z13spxk6yyfqaz80n9lga67f33w35nkpq9dwi2vg6g"))))
(build-system ruby-build-system)
(native-inputs
`(("ruby-cucumber" ,ruby-cucumber)))
(synopsis "Smart VCF parser DSL")
(description
"Bio-vcf provides a @acronym{DSL, domain specific language} for processing
the VCF format. Record named fields can be queried with regular expressions.
Bio-vcf is a new generation VCF parser, filter and converter. Bio-vcf is not
only very fast for genome-wide (WGS) data, it also comes with a filtering,
evaluation and rewrite language and can output any type of textual data,
including VCF header and contents in RDF and JSON.")
(home-page "https://github.com/vcflib/bio-vcf")
(license license:expat)))
(define-public r-biocviews (define-public r-biocviews
(package (package
(name "r-biocviews") (name "r-biocviews")
@ -9386,8 +9461,9 @@ group or two ChIP groups run under different conditions.")
(delete 'configure) ; There is no configure phase. (delete 'configure) ; There is no configure phase.
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((bin (string-append (assoc-ref outputs "out") "/bin"))) (let ((out (assoc-ref outputs "out")))
(install-file "filevercmp" bin) (install-file "filevercmp" (string-append out "/bin"))
(install-file "filevercmp.h" (string-append out "/include"))
#t)))))) #t))))))
(home-page "https://github.com/ekg/filevercmp") (home-page "https://github.com/ekg/filevercmp")
(synopsis "This program compares version strings") (synopsis "This program compares version strings")
@ -10514,41 +10590,20 @@ explore and perform basic analysis of single cell sequencing data coming from
droplet sequencing. It has been particularly tailored for Drop-seq.") droplet sequencing. It has been particularly tailored for Drop-seq.")
(license license:gpl3)))) (license license:gpl3))))
(define htslib-for-sambamba
(let ((commit "2f3c3ea7b301f9b45737a793c0b2dcf0240e5ee5"))
(package
(inherit htslib)
(name "htslib-for-sambamba")
(version (string-append "1.3.1-1." (string-take commit 9)))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/lomereiter/htslib")
(commit commit)))
(file-name (string-append "htslib-" version "-checkout"))
(sha256
(base32
"0g38g8s3npr0gjm9fahlbhiskyfws9l5i0x1ml3rakzj7az5l9c9"))))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
,@(package-native-inputs htslib))))))
(define-public sambamba (define-public sambamba
(package (package
(name "sambamba") (name "sambamba")
(version "0.7.1") (version "0.8.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/lomereiter/sambamba") (url "https://github.com/biod/sambamba")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (string-append name "-" version "-checkout")) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"111h05b60pj8dxbidiamy4imc92x2962b3lmb7wgysl6lx064qis")))) "07dznzl6m8k7sw84jxw2kx6i3ymrapbmcmyh0fxz8wrybhw8fmwc"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; there is no test target `(#:tests? #f ; there is no test target
@ -10558,52 +10613,30 @@ droplet sequencing. It has been particularly tailored for Drop-seq.")
(delete 'configure) (delete 'configure)
(add-after 'unpack 'fix-ldc-version (add-after 'unpack 'fix-ldc-version
(lambda _ (lambda _
(substitute* "gen_ldc_version_info.py"
(("/usr/bin/env.*") (which "python3")))
(substitute* "Makefile" (substitute* "Makefile"
;; We use ldc2 instead of ldmd2 to compile sambamba. ;; We use ldc2 instead of ldmd2 to compile sambamba.
(("\\$\\(shell which ldmd2\\)") (which "ldc2"))) (("\\$\\(shell which ldmd2\\)") (which "ldc2")))
#t)) #t))
(add-after 'unpack 'place-biod-and-undead
(lambda* (#:key inputs #:allow-other-keys)
(copy-recursively (assoc-ref inputs "biod") "BioD")
#t))
(add-after 'unpack 'unbundle-prerequisites (add-after 'unpack 'unbundle-prerequisites
(lambda _ (lambda _
(substitute* "Makefile" (substitute* "Makefile"
(("htslib/libhts.a lz4/lib/liblz4.a") (("= lz4/lib/liblz4.a") "= -L-llz4")
"-L-lhts -L-llz4") (("ldc_version_info lz4-static") "ldc_version_info"))
((" lz4-static htslib-static") ""))
#t)) #t))
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let ((bin (string-append (assoc-ref outputs "out") "/bin")))
(bin (string-append out "/bin")))
(mkdir-p bin) (mkdir-p bin)
(copy-file (string-append "bin/sambamba-" ,version) (copy-file (string-append "bin/sambamba-" ,version)
(string-append bin "/sambamba")) (string-append bin "/sambamba"))
#t)))))) #t))))))
(native-inputs (native-inputs
`(("ldc" ,ldc) `(("python" ,python)))
("rdmd" ,rdmd)
("python" ,python)
("biod"
,(let ((commit "7969eb0a847b05874e83ffddead26e193ece8101"))
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/biod/BioD")
(commit commit)))
(file-name (string-append "biod-"
(string-take commit 9)
"-checkout"))
(sha256
(base32
"0mjxsmbmv0jxl3pq21p8j5r829d648if8q58ka50b2956lc6qkpm")))))))
(inputs (inputs
`(("lz4" ,lz4) `(("ldc" ,ldc)
("htslib" ,htslib-for-sambamba))) ("lz4" ,lz4)
(home-page "https://lomereiter.github.io/sambamba/") ("zlib" ,zlib)))
(home-page "https://github.com/biod/sambamba")
(synopsis "Tools for working with SAM/BAM data") (synopsis "Tools for working with SAM/BAM data")
(description "Sambamba is a high performance modern robust and (description "Sambamba is a high performance modern robust and
fast tool (and library), written in the D programming language, for fast tool (and library), written in the D programming language, for
@ -14855,10 +14888,14 @@ some of the details of opening and jumping in tabix-indexed files.")
(delete 'configure) ; There is no configure phase. (delete 'configure) ; There is no configure phase.
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((bin (string-append (assoc-ref outputs "out") "/bin"))) (let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin"))
(include (string-append out "/include")))
;; TODO: There are Python modules for these programs too. ;; TODO: There are Python modules for these programs too.
(install-file "multichoose" bin) (install-file "multichoose" bin)
(install-file "multipermute" bin)) (install-file "multipermute" bin)
(install-file "multichoose.h" include)
(install-file "multipermute.h" include))
#t))))) #t)))))
(home-page "https://github.com/ekg/multichoose") (home-page "https://github.com/ekg/multichoose")
(synopsis "Efficient loopless multiset combination generation algorithm") (synopsis "Efficient loopless multiset combination generation algorithm")
@ -14967,32 +15004,44 @@ library automatically handles index file generation and use.")
(define-public vcflib (define-public vcflib
(package (package
(name "vcflib") (name "vcflib")
(version "1.0.1") (version "1.0.2")
(source (source
(origin (origin
(method url-fetch) (method git-fetch)
(uri (string-append "https://github.com/vcflib/vcflib/releases/" (uri (git-reference
"download/v" version (url "https://github.com/vcflib/vcflib")
"/vcflib-" version "-src.tar.gz")) (commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 "14zzrg8hg8cq9cvq2wdvp21j7nmxxkjrbagw2apd2yqv2kyx42lm")) (base32 "1k1z3876kbzifj1sqfzsf3lgb4rw779hvkg6ryxbyq5bc2paj9kh"))
(patches (search-patches "vcflib-use-shared-libraries.patch"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
`(begin '(begin
(substitute* "CMakeLists.txt"
((".*fastahack.*") "")
((".*smithwaterman.*") "")
(("(pkg_check_modules\\(TABIXPP)" text)
(string-append
"pkg_check_modules(FASTAHACK REQUIRED fastahack)\n"
"pkg_check_modules(SMITHWATERMAN REQUIRED smithwaterman)\n"
text))
(("\\$\\{TABIXPP_LIBRARIES\\}" text)
(string-append "${FASTAHACK_LIBRARIES} "
"${SMITHWATERMAN_LIBRARIES} "
text)))
(substitute* (find-files "." "\\.(h|c)(pp)?$") (substitute* (find-files "." "\\.(h|c)(pp)?$")
(("\"SmithWatermanGotoh.h\"") "<smithwaterman/SmithWatermanGotoh.h>") (("\"SmithWatermanGotoh.h\"") "<smithwaterman/SmithWatermanGotoh.h>")
(("\"convert.h\"") "<smithwaterman/convert.h>") (("\"convert.h\"") "<smithwaterman/convert.h>")
(("\"disorder.h\"") "<smithwaterman/disorder.h>") (("\"disorder.h\"") "<smithwaterman/disorder.h>")
(("\"tabix.hpp\"") "<tabix.hpp>") (("Fasta.h") "fastahack/Fasta.h"))
(("\"Fasta.h\"") "<fastahack/Fasta.h>"))
(for-each delete-file-recursively (for-each delete-file-recursively
'("fastahack" "filevercmp" "fsom" "googletest" "intervaltree" '("fastahack" "filevercmp" "fsom" "googletest" "intervaltree"
"libVCFH" "multichoose" "smithwaterman" "tabixpp")) "libVCFH" "multichoose" "smithwaterman"))
#t)))) #t))))
(build-system gnu-build-system) (build-system cmake-build-system)
(inputs (inputs
`(("htslib" ,htslib) `(("bzip2" ,bzip2)
("htslib" ,htslib)
("fastahack" ,fastahack) ("fastahack" ,fastahack)
("perl" ,perl) ("perl" ,perl)
("python" ,python) ("python" ,python)
@ -15005,22 +15054,20 @@ library automatically handles index file generation and use.")
;; Submodules. ;; Submodules.
;; This package builds against the .o files so we need to extract the source. ;; This package builds against the .o files so we need to extract the source.
("filevercmp-src" ,(package-source filevercmp)) ("filevercmp-src" ,(package-source filevercmp))
("fsom-src" ,(package-source fsom))
("intervaltree-src" ,(package-source intervaltree)) ("intervaltree-src" ,(package-source intervaltree))
("multichoose-src" ,(package-source multichoose)))) ("multichoose-src" ,(package-source multichoose))))
(arguments (arguments
`(#:tests? #f ; no tests `(#:tests? #f ; no tests
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'set-flags (add-after 'unpack 'build-shared-library
(lambda* (#:key outputs #:allow-other-keys) (lambda _
(substitute* "Makefile" (substitute* "CMakeLists.txt"
(("LDFLAGS =") (("vcflib STATIC") "vcflib SHARED"))
(string-append "LDFLAGS = -Wl,-rpath=" (substitute* "test/Makefile"
(assoc-ref outputs "out") "/lib "))) (("libvcflib.a") "libvcflib.so"))
(substitute* "filevercmp/Makefile"
(("-c") "-c -fPIC"))
#t)) #t))
(delete 'configure)
(add-after 'unpack 'unpack-submodule-sources (add-after 'unpack 'unpack-submodule-sources
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((unpack (lambda (source target) (let ((unpack (lambda (source target)
@ -15033,39 +15080,31 @@ library automatically handles index file generation and use.")
"--strip-components=1")))))) "--strip-components=1"))))))
(and (and
(unpack "filevercmp-src" "filevercmp") (unpack "filevercmp-src" "filevercmp")
(unpack "fsom-src" "fsom")
(unpack "intervaltree-src" "intervaltree") (unpack "intervaltree-src" "intervaltree")
(unpack "multichoose-src" "multichoose"))))) (unpack "multichoose-src" "multichoose"))
(replace 'install #t)))
;; This pkg-config file is provided by other distributions.
(add-after 'install 'install-pkg-config-file
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin")) (pkgconfig (string-append out "/lib/pkgconfig")))
(lib (string-append out "/lib"))) (mkdir-p pkgconfig)
(for-each (lambda (file) (with-output-to-file (string-append pkgconfig "/libvcflib.pc")
(install-file file bin))
(find-files "bin" ".*"))
(install-file "libvcflib.so" lib)
(install-file "libvcflib.a" lib)
(for-each
(lambda (file)
(install-file file (string-append out "/include")))
(find-files "include" "\\.h(pp)?$"))
(mkdir-p (string-append lib "/pkgconfig"))
(with-output-to-file (string-append lib "/pkgconfig/vcflib.pc")
(lambda _ (lambda _
(format #t "prefix=~a~@ (format #t "prefix=~a~@
exec_prefix=${prefix}~@ exec_prefix=${prefix}~@
libdir=${exec_prefix}/lib~@ libdir=${exec_prefix}/lib~@
includedir=${prefix}/include~@ includedir=${prefix}/include~@
~@ ~@
~@
Name: libvcflib~@ Name: libvcflib~@
Version: ~a~@ Version: ~a~@
Requires: smithwaterman, fastahack~@ Requires: smithwaterman, fastahack~@
Description: C++ library for parsing and manipulating VCF files~@ Description: C++ library for parsing and manipulating VCF files~@
Libs: -L${libdir} -lvcflib~@ Libs: -L${libdir} -llibvcflib~@
Cflags: -I${includedir}~%" Cflags: -I${includedir}~%"
out ,version)))) out ,version)))
#t))))) #t))))))
(home-page "https://github.com/vcflib/vcflib/") (home-page "https://github.com/vcflib/vcflib/")
(synopsis "Library for parsing and manipulating VCF files") (synopsis "Library for parsing and manipulating VCF files")
(description "Vcflib provides methods to manipulate and interpret (description "Vcflib provides methods to manipulate and interpret
@ -15076,44 +15115,41 @@ manipulations on VCF files.")
(license license:expat))) (license license:expat)))
(define-public freebayes (define-public freebayes
(let ((commit "3ce827d8ebf89bb3bdc097ee0fe7f46f9f30d5fb")
(revision "1")
(version "1.0.2"))
(package (package
(name "freebayes") (name "freebayes")
(version (git-version version revision commit)) (version "1.3.3")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/ekg/freebayes") (url "https://github.com/freebayes/freebayes")
(commit commit))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1sbzwmcbn78ybymjnhwk7qc5r912azy5vqz2y7y81616yc3ba2a2")))) (base32 "0myz3giad7jqp6ricdfnig9ymlcps2h67mlivadvx97ngagm85z8"))
(build-system gnu-build-system) (patches (search-patches "freebayes-devendor-deps.patch"))
(modules '((guix build utils)))
(snippet
'(begin
(delete-file-recursively "contrib/htslib")
#t))))
(build-system meson-build-system)
(inputs (inputs
`(("bamtools" ,bamtools) `(("fastahack" ,fastahack)
("htslib" ,htslib) ("htslib" ,htslib)
("smithwaterman" ,smithwaterman)
("tabixpp" ,tabixpp)
("vcflib" ,vcflib)
("zlib" ,zlib))) ("zlib" ,zlib)))
(native-inputs (native-inputs
`(("bc" ,bc) ; Needed for running tests. `(("bash-tap" ,bash-tap)
("samtools" ,samtools) ; Needed for running tests. ("bc" ,bc)
("parallel" ,parallel) ; Needed for running tests. ("grep" ,grep) ; Built with perl support.
("perl" ,perl) ; Needed for running tests. ("parallel" ,parallel)
("procps" ,procps) ; Needed for running tests. ("perl" ,perl)
("python" ,python-2) ; Needed for running tests. ("pkg-config" ,pkg-config)
("vcflib-src" ,(package-source vcflib)) ("samtools" ,samtools)
;; These are submodules for the vcflib version used in freebayes. ("simde" ,simde)
;; This package builds against the .o files so we need to extract the source. ;; This submodule is needed to run the tests.
("tabixpp-src" ,(package-source tabixpp))
("smithwaterman-src" ,(package-source smithwaterman))
("multichoose-src" ,(package-source multichoose))
("fsom-src" ,(package-source fsom))
("filevercmp-src" ,(package-source filevercmp))
("fastahack-src" ,(package-source fastahack))
("intervaltree-src" ,(package-source intervaltree))
;; These submodules are needed to run the tests.
("bash-tap-src" ,(package-source bash-tap))
("test-simple-bash-src" ("test-simple-bash-src"
,(origin ,(origin
(method git-fetch) (method git-fetch)
@ -15124,77 +15160,49 @@ manipulations on VCF files.")
(sha256 (sha256
(base32 "043plp6z0x9yf7mdpky1fw7zcpwn1p47px95w9mh16603zqqqpga")))))) (base32 "043plp6z0x9yf7mdpky1fw7zcpwn1p47px95w9mh16603zqqqpga"))))))
(arguments (arguments
`(#:make-flags `(#:phases
(list "CC=gcc"
(string-append "BAMTOOLS_ROOT="
(assoc-ref %build-inputs "bamtools")))
#:test-target "test"
#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure) (add-after 'unpack 'patch-source
(add-after 'unpack 'fix-tests (lambda* (#:key inputs #:allow-other-keys)
(lambda _ (let ((bash-tap (assoc-ref inputs "bash-tap")))
(substitute* "test/t/01_call_variants.t" (substitute* (find-files "test/t")
(("grep -P \"\\(\\\\t500\\$\\|\\\\t11000\\$\\|\\\\t1000\\$\\)\"") (("BASH_TAP_ROOT=bash-tap")
"grep -E ' (500|11000|1000)$'")) (string-append "BASH_TAP_ROOT=" bash-tap "/bin"))
#t)) (("bash-tap/bash-tap-bootstrap")
(string-append bash-tap "/bin/bash-tap-bootstrap"))
(("source.*bash-tap-bootstrap")
(string-append "source " bash-tap "/bin/bash-tap-bootstrap")))
(substitute* "meson.build"
;; Some inputs aren't actually needed.
((".*bamtools/src.*") "")
((".*multichoose.*") ""))
(substitute* '("src/BedReader.cpp"
"src/BedReader.h")
(("../intervaltree/IntervalTree.h") "IntervalTree.h"))
#t)))
(add-after 'unpack 'unpack-submodule-sources (add-after 'unpack 'unpack-submodule-sources
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((unpack (lambda (source target) (mkdir-p "test/test-simple-bash")
(with-directory-excursion target (copy-recursively (assoc-ref inputs "test-simple-bash-src")
(if (file-is-directory? (assoc-ref inputs source)) "test/test-simple-bash")
(copy-recursively (assoc-ref inputs source) ".")
(invoke "tar" "xvf"
(assoc-ref inputs source)
"--strip-components=1"))))))
(and
(unpack "vcflib-src" "vcflib")
(unpack "fastahack-src" "vcflib/fastahack")
(unpack "filevercmp-src" "vcflib/filevercmp")
(unpack "fsom-src" "vcflib/fsom")
(unpack "intervaltree-src" "vcflib/intervaltree")
(unpack "multichoose-src" "vcflib/multichoose")
(unpack "smithwaterman-src" "vcflib/smithwaterman")
(unpack "tabixpp-src" "vcflib/tabixpp")
(unpack "test-simple-bash-src" "test/test-simple-bash")
(unpack "bash-tap-src" "test/bash-tap")))))
(add-after 'unpack-submodule-sources 'fix-makefiles
(lambda _
;; We don't have the .git folder to get the version tag from.
(substitute* "vcflib/Makefile"
(("^GIT_VERSION.*")
(string-append "GIT_VERSION = v" ,version)))
(substitute* "src/Makefile"
(("-I\\$\\(BAMTOOLS_ROOT\\)/src")
"-I$(BAMTOOLS_ROOT)/include/bamtools"))
#t)) #t))
(add-before 'build 'build-tabixpp-and-vcflib ;; The slow tests take longer than the specified timeout.
(lambda* (#:key inputs make-flags #:allow-other-keys) ,@(if (any (cute string=? <> (%current-system))
(with-directory-excursion "vcflib" '("armhf-linux" "aarch64-linux"))
(with-directory-excursion "tabixpp" '((replace 'check
(apply invoke "make" (lambda* (#:key tests? #:allow-other-keys)
(string-append "HTS_LIB=" (when tests?
(assoc-ref inputs "htslib") (invoke "meson" "test" "--timeout-multiplier" "5"))
"/lib/libhts.a") #t)))
make-flags)) '()))))
(apply invoke "make" (home-page "https://github.com/freebayes/freebayes")
(string-append "CFLAGS=-Itabixpp")
"all"
make-flags))))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((bin (string-append (assoc-ref outputs "out") "/bin")))
(install-file "bin/freebayes" bin)
(install-file "bin/bamleftalign" bin))
#t)))))
(home-page "https://github.com/ekg/freebayes")
(synopsis "Haplotype-based variant detector") (synopsis "Haplotype-based variant detector")
(description "FreeBayes is a Bayesian genetic variant detector designed to (description "FreeBayes is a Bayesian genetic variant detector designed to
find small polymorphisms, specifically SNPs (single-nucleotide polymorphisms), find small polymorphisms, specifically SNPs (single-nucleotide polymorphisms),
indels (insertions and deletions), MNPs (multi-nucleotide polymorphisms), and indels (insertions and deletions), MNPs (multi-nucleotide polymorphisms), and
complex events (composite insertion and substitution events) smaller than the complex events (composite insertion and substitution events) smaller than the
length of a short-read sequencing alignment.") length of a short-read sequencing alignment.")
(license license:expat)))) (license license:expat)))
(define-public samblaster (define-public samblaster
(package (package

125
gnu/packages/bootloaders.scm
View file

@ -7,12 +7,14 @@
;;; Copyright © 2016, 2017 Danny Milosavljevic <dannym@scratchpost.org> ;;; Copyright © 2016, 2017 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2016, 2017 David Craven <david@craven.ch> ;;; Copyright © 2016, 2017 David Craven <david@craven.ch>
;;; Copyright © 2017, 2018, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017, 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019, 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 nee <nee@cock.li> ;;; Copyright © 2019 nee <nee@cock.li>
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de> ;;; Copyright © 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;; Copyright © 2018, 2019, 2020 Vagrant Cascadian <vagrant@debian.org> ;;; Copyright © 2018, 2019, 2020 Vagrant Cascadian <vagrant@debian.org>
;;; Copyright © 2020 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2020 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2021 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -1095,3 +1097,124 @@ systems so that they can be added to the bootloader. It also works out how to
boot existing GNU/Linux systems and detects what distribution is installed in boot existing GNU/Linux systems and detects what distribution is installed in
order to add a suitable bootloader menu entry.") order to add a suitable bootloader menu entry.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public ipxe
;; XXX: 'BUILD_TIMESTAMP' is used to automatically select the newest version
;; of iPXE if multiple iPXE drivers are loaded concurrently in a UEFI system.
;;
;; TODO: Bump this timestamp at each modifications of the package (not only
;; for updates) by running: date +%s.
(let ((timestamp "1591706427"))
(package
(name "ipxe")
(version "1.21.1")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/ipxe/ipxe")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(patches (search-patches "ipxe-reproducible-geniso.patch"))
(sha256
(base32
"1pkf1n1c0rdlzfls8fvjvi1sd9xjd9ijqlyz3wigr70ijcv6x8i9"))))
(build-system gnu-build-system)
(arguments
`(#:modules ((guix build utils)
(guix build gnu-build-system)
(guix base32)
(ice-9 string-fun)
(ice-9 regex)
(rnrs bytevectors))
#:imported-modules ((guix base32)
,@%gnu-build-system-modules)
#:make-flags
;; XXX: 'BUILD_ID' is used to determine when another ROM in the
;; system contains identical code in order to save space within the
;; legacy BIOS option ROM area, which is extremely limited in size.
;; It is supposed to be collision-free across all ROMs, to do so we
;; use the truncated output hash of the package.
(let ((build-id
(lambda (out)
(let* ((nix-store (string-append
(or (getenv "NIX_STORE") "/gnu/store")
"/"))
(filename
(string-replace-substring out nix-store ""))
(hash (match:substring (string-match "[0-9a-z]{32}"
filename)))
(bv (nix-base32-string->bytevector hash)))
(format #f "0x~x"
(bytevector-u32-ref bv 0 (endianness big))))))
(out (assoc-ref %outputs "out"))
(syslinux (assoc-ref %build-inputs "syslinux")))
(list "ECHO_E_BIN_ECHO=echo"
"ECHO_E_BIN_ECHO_E=echo -e"
;; cdrtools' mkisofs will silently ignore a missing isolinux.bin!
;; Luckily xorriso is more strict.
(string-append "ISOLINUX_BIN=" syslinux
"/share/syslinux/isolinux.bin")
(string-append "SYSLINUX_MBR_DISK_PATH=" syslinux
"/share/syslinux/isohdpfx.bin")
;; Build reproducibly.
(string-append "BUILD_ID_CMD=echo -n " (build-id out))
(string-append "BUILD_TIMESTAMP=" ,timestamp)
"everything"))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'enter-source-directory
(lambda _ (chdir "src") #t))
(add-after 'enter-source-directory 'set-options
(lambda _
(substitute* "config/general.h"
(("^//(#define PING_CMD.*)" _ uncommented) uncommented)
(("^//(#define IMAGE_TRUST_CMD.*)" _ uncommented)
uncommented)
(("^#undef.*(DOWNLOAD_PROTO_HTTPS.*)" _ option)
(string-append "#define " option))
(("^#undef.*(DOWNLOAD_PROTO_NFS.*)" _ option)
(string-append "#define " option)))
#t))
(delete 'configure) ; no configure script
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(ipxe (string-append out "/lib/ipxe"))
(exts-re
"\\.(efi|efirom|iso|kkpxe|kpxe|lkrn|mrom|pxe|rom|usb)$")
(dirs '("bin" "bin-i386-linux" "bin-x86_64-pcbios"
"bin-x86_64-efi" "bin-x86_64-linux" "bin-i386-efi"))
(files (apply append
(map (lambda (dir)
(find-files dir exts-re)) dirs))))
(for-each (lambda (file)
(let* ((subdir (dirname file))
(fn (basename file))
(tgtsubdir (cond
((string=? "bin" subdir) "")
((string-prefix? "bin-" subdir)
(string-drop subdir 4)))))
(install-file file
(string-append ipxe "/" tgtsubdir))))
files))
#t))
(add-after 'install 'leave-source-directory
(lambda _ (chdir "..") #t)))
#:tests? #f)) ; no test suite
(native-inputs
`(("perl" ,perl)
("syslinux" ,syslinux)
("xorriso" ,xorriso)))
(home-page "https://ipxe.org")
(synopsis "PXE-compliant network boot firmware")
(description "iPXE is a network boot firmware. It provides a full PXE
implementation enhanced with additional features such as booting from: a web
server via HTTP, an iSCSI SAN, a Fibre Channel SAN via FCoE, an AoE SAN, a
wireless network, a wide-area network, an Infiniband network. It allows to
control the boot process with a script. You can use iPXE to replace the
existing PXE ROM on your network card, or you can chainload into iPXE to obtain
the features of iPXE without the hassle of reflashing.")
(license license:gpl2+))))

6
gnu/packages/busybox.scm
View file

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 John Darrington <jmd@gnu.org> ;;; Copyright © 2014 John Darrington <jmd@gnu.org>
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -33,7 +33,7 @@
(define-public busybox (define-public busybox
(package (package
(name "busybox") (name "busybox")
(version "1.32.0") (version "1.32.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -41,7 +41,7 @@
version ".tar.bz2")) version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"12g63zsvzfz04wbyga8riyl8ils05riw4xf26cyiaasbs3qqfpf3")))) "1vhd59qmrdyrr1q7rvxmyl96z192mxl089hi87yl0hcp6fyw8mwx"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases '(#:phases

51
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 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015, 2016, 2018, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org> ;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
;;; Copyright © 2016, 2017 Danny Milosavljevic <dannym+a@scratchpost.org> ;;; Copyright © 2016, 2017 Danny Milosavljevic <dannym+a@scratchpost.org>
@ -288,6 +288,55 @@ unit testing. Test output is in XML for automatic testing and GUI based for
supervised tests.") supervised tests.")
(license license:lgpl2.1))) ; no copyright notices. LGPL2.1 is in the tarball (license license:lgpl2.1))) ; no copyright notices. LGPL2.1 is in the tarball
(define-public shunit2
(package
(name "shunit2")
(version "2.1.8")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/kward/shunit2")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"08vs0jjl3pfh100sjlw31x4638xj7fghr0j2g1zfikba8n1f9491"))))
(build-system gnu-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(delete 'configure) ; no configure script
(delete 'build)
(add-after 'patch-source-shebangs 'patch-more-shebangs
(lambda _
(substitute* "shunit2"
(("#! /bin/sh") (string-append "#! " (which "sh")))
(("/usr/bin/od") (which "od")))
(substitute* "test_runner"
(("/bin/sh") (which "sh"))
(("/bin/bash") (which "bash")))
#t))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
;; This test is buggy in the build container.
(delete-file "shunit2_misc_test.sh")
(invoke "sh" "test_runner"))
#t))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(install-file "shunit2"
(string-append (assoc-ref outputs "out")
"/bin"))
#t)))))
(home-page "https://github.com/kward/shunit2")
(synopsis "@code{xUnit} based unit testing for Unix shell scripts")
(description "@code{shUnit2} was originally developed to provide a
consistent testing solution for @code{log4sh}, a shell based logging framework
similar to @code{log4j}. It is designed to work in a similar manner to JUnit,
PyUnit and others.")
(license license:asl2.0)))
;; When dependent packages upgraded to use newer version of catch, this one should ;; When dependent packages upgraded to use newer version of catch, this one should
;; be removed. ;; be removed.
(define-public catch-framework (define-public catch-framework

8
gnu/packages/chromium.scm
View file

@ -302,8 +302,8 @@
(string-append "ungoogled-chromium-" category "-" name)))) (string-append "ungoogled-chromium-" category "-" name))))
(sha256 (base32 hash)))) (sha256 (base32 hash))))
(define %chromium-version "87.0.4280.88") (define %chromium-version "87.0.4280.141")
(define %ungoogled-revision "b78cb927fa8beaee0ddfb4385277edb96444c40f") (define %ungoogled-revision "483a1bae4eee601c7d0a4a63499380e40e4f8a44")
(define %debian-revision "debian/84.0.4147.105-1") (define %debian-revision "debian/84.0.4147.105-1")
(define %debian-patches (define %debian-patches
@ -321,7 +321,7 @@
(string-take %ungoogled-revision 7))) (string-take %ungoogled-revision 7)))
(sha256 (sha256
(base32 (base32
"0w2137w8hfcgl6f938hqnb4ffp33v5r8vdzxrvs814w7dszkiqgg")))) "0r09d27jrdz01rcwifchbq7ksh2bac15h8svq18jx426mr56dzla"))))
(define %guix-patches (define %guix-patches
(list (local-file (list (local-file
@ -443,7 +443,7 @@
%chromium-version ".tar.xz")) %chromium-version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1h09g9b2zxad85vd146ymvg3w2kpngpi78yig3dn1vrmhwr4aiiy")) "0x9k809m36pfirnw2vnr9pk93nxdbgrvna0xf1rs3q91zkbr2x8l"))
(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)

8
gnu/packages/compression.scm
View file

@ -1816,14 +1816,14 @@ Clzip is intended to be fully compatible with the regular lzip package.")
(define-public lzlib (define-public lzlib
(package (package
(name "lzlib") (name "lzlib")
(version "1.11") (version "1.12")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://savannah/lzip/lzlib/" (uri (string-append "mirror://savannah/lzip/lzlib/"
"lzlib-" version ".tar.gz")) "lzlib-" version ".tar.gz"))
(sha256 (sha256
(base32 "0djdj4sg33rzi4k84cygvnp09bfsv6i8wy2k7i67rayib63myp3c")))) (base32 "1c9pwd6by8is4z8bs6j306jyy6pgm2dvsn4fr7fg2b5m5qj88pcf"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -2075,13 +2075,13 @@ reading from and writing to ZIP archives. ")
(define-public zutils (define-public zutils
(package (package
(name "zutils") (name "zutils")
(version "1.9") (version "1.10")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://savannah/zutils/zutils-" version ".tar.lz")) (uri (string-append "mirror://savannah/zutils/zutils-" version ".tar.lz"))
(sha256 (sha256
(base32 "0y2wm8wqr1wi1b1fv45dn50njv4q81p6ifx0279ji1bq56qkrn2r")))) (base32 "15dimqp8zlqaaa2l46r22srp1py38mlmn69ph1j5fmrd54w43m0d"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags

22
gnu/packages/cpp.scm
View file

@ -808,3 +808,25 @@ code will be mixed in with the actual programming logic. This implementation
provides a number of utilities to make coding with expected cleaner.") provides a number of utilities to make coding with expected cleaner.")
(home-page "https://tl.tartanllama.xyz/") (home-page "https://tl.tartanllama.xyz/")
(license license:cc0))) (license license:cc0)))
(define-public magic-enum
(package
(name "magic-enum")
(version "0.7.2")
(home-page "https://github.com/Neargye/magic_enum")
(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
"07j5zdf3vkliwrcv6k663k35akn7qp23794sz2mnvkj9hbv9s8cx"))))
(build-system cmake-build-system)
(native-inputs
`(("gcc" ,gcc-9)))
(synopsis "C++17 header only library for compile time reflection of enums")
(description "Magic Enum offers static reflection of enums, with
conversions to and from strings, iteration and related functionality.")
(license license:expat)))

693
gnu/packages/cran.scm
View file

File diff suppressed because it is too large Load diff

4
gnu/packages/crates-graphics.scm
View file

@ -8,7 +8,7 @@
;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org> ;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Leo Famulari <leo@famulari.name> ;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2020 Antoine Côté <antoine.cote@posteo.net> ;;; Copyright © 2020 Antoine Côté <antoine.cote@posteo.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -62,7 +62,7 @@
("rust-line-drawing" ,rust-line-drawing-0.7) ("rust-line-drawing" ,rust-line-drawing-0.7)
("rust-rusttype" ,rust-rusttype-0.7) ("rust-rusttype" ,rust-rusttype-0.7)
("rust-walkdir" ,rust-walkdir-2) ("rust-walkdir" ,rust-walkdir-2)
("rust-xdg" ,rust-xdg-2.2) ("rust-xdg" ,rust-xdg-2)
("rust-xml-rs" ,rust-xml-rs-0.8)) ("rust-xml-rs" ,rust-xml-rs-0.8))
#:cargo-development-inputs #:cargo-development-inputs
(("rust-smithay-client-toolkit" ,rust-smithay-client-toolkit-0.4)))) (("rust-smithay-client-toolkit" ,rust-smithay-client-toolkit-0.4))))

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

File diff suppressed because it is too large Load diff

72
gnu/packages/cups.scm
View file

@ -1,11 +1,11 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2019, 2021 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015, 2016, 2017, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015, 2016, 2017, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org> ;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2017 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017–2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -47,6 +47,7 @@
#:use-module (gnu packages qt) #:use-module (gnu packages qt)
#:use-module (gnu packages scanner) #:use-module (gnu packages scanner)
#:use-module (gnu packages tls) #:use-module (gnu packages tls)
#: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 download)
@ -57,6 +58,73 @@
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (ice-9 match)) #:use-module (ice-9 match))
(define-public brlaser
(let ((commit "9d7ddda8383bfc4d205b5e1b49de2b8bcd9137f1")
(revision "1"))
(package
(name "brlaser")
(version (git-version "6" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/pdewacht/brlaser")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1drh0nk7amn9a8wykki4l9maqa4vy7vwminypfy1712alwj31nd4"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags
(list (string-append "-DCUPS_DATA_DIR="
(assoc-ref %outputs "out")
"/share/cups")
(string-append "-DCUPS_SERVER_BIN="
(assoc-ref %outputs "out")
"/lib/cups"))))
(inputs
`(("ghostscript" ,ghostscript)
("cups" ,cups)
("zlib" ,zlib)))
(home-page "https://github.com/pdewacht/brlaser")
(synopsis "Brother laser printer driver")
(description "Brlaser is a CUPS driver for Brother laser printers. This
driver is known to work with these printers:
@enumerate
@item Brother DCP-1510 series
@item Brother DCP-1600 series
@item Brother DCP-7030
@item Brother DCP-7040
@item Brother DCP-7055
@item Brother DCP-7055W
@item Brother DCP-7060D
@item Brother DCP-7065DN
@item Brother DCP-7080
@item Brother DCP-L2500D series
@item Brother DCP-L2520D series
@item Brother DCP-L2540DW series
@item Brother HL-1110 series
@item Brother HL-1200 series
@item Brother HL-2030 series
@item Brother HL-2140 series
@item Brother HL-2220 series
@item Brother HL-2270DW series
@item Brother HL-5030 series
@item Brother HL-L2300D series
@item Brother HL-L2320D series
@item Brother HL-L2340D series
@item Brother HL-L2360D series
@item Brother MFC-1910W
@item Brother MFC-7240
@item Brother MFC-7360N
@item Brother MFC-7365DN
@item Brother MFC-7840W
@item Brother MFC-L2710DW series
@item Lenovo M7605D
@end enumerate")
(license license:gpl2+))))
(define-public cups-filters (define-public cups-filters
(package (package
(name "cups-filters") (name "cups-filters")

125
gnu/packages/databases.scm
View file

@ -23,7 +23,7 @@
;;; Copyright © 2017 Jelle Licht <jlicht@fsfe.org> ;;; Copyright © 2017 Jelle Licht <jlicht@fsfe.org>
;;; Copyright © 2017 Adriano Peluso <catonano@gmail.com> ;;; Copyright © 2017 Adriano Peluso <catonano@gmail.com>
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017, 2018 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2017, 2018 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2017, 2018 Ben Woodcroft <donttrustben@gmail.com> ;;; Copyright © 2017, 2018 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
@ -46,6 +46,7 @@
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020 Vinicius Monego <monego@posteo.net> ;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -85,15 +86,16 @@
#:use-module (gnu packages gettext) #:use-module (gnu packages gettext)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
#:use-module (gnu packages gnupg) #:use-module (gnu packages gnupg)
#:use-module (gnu packages guile)
#:use-module (gnu packages time)
#:use-module (gnu packages golang) #:use-module (gnu packages golang)
#:use-module (gnu packages guile)
#:use-module (gnu packages icu4c) #:use-module (gnu packages icu4c)
#:use-module (gnu packages jemalloc) #:use-module (gnu packages jemalloc)
#:use-module (gnu packages language) #:use-module (gnu packages language)
#:use-module (gnu packages libedit) #:use-module (gnu packages libedit)
#:use-module (gnu packages libevent) #:use-module (gnu packages libevent)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages lisp)
#:use-module (gnu packages lisp-xyz)
#:use-module (gnu packages logging) #:use-module (gnu packages logging)
#:use-module (gnu packages man) #:use-module (gnu packages man)
#:use-module (gnu packages maths) #:use-module (gnu packages maths)
@ -110,8 +112,8 @@
#: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-crypto) #:use-module (gnu packages python-crypto)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-science) #:use-module (gnu packages python-science)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz) #:use-module (gnu packages python-xyz)
#:use-module (gnu packages rdf) #:use-module (gnu packages rdf)
#:use-module (gnu packages readline) #:use-module (gnu packages readline)
@ -124,6 +126,7 @@
#:use-module (gnu packages tcl) #:use-module (gnu packages tcl)
#:use-module (gnu packages terminals) #:use-module (gnu packages terminals)
#:use-module (gnu packages textutils) #:use-module (gnu packages textutils)
#:use-module (gnu packages time)
#:use-module (gnu packages tls) #:use-module (gnu packages tls)
#:use-module (gnu packages valgrind) #:use-module (gnu packages valgrind)
#:use-module (gnu packages web) #:use-module (gnu packages web)
@ -1278,6 +1281,89 @@ pictures, sounds, or video.")
(define-public postgresql postgresql-13) (define-public postgresql postgresql-13)
(define-public pgloader
(package
(name "pgloader")
(version "3.6.2")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/dimitri/pgloader")
(commit (string-append "v" version))))
(sha256
(base32 "06i1jd2za3ih5caj2b4vzlzags5j65vv8dfdbz0ggdrp40wfd5lh"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(arguments
;; NOTE: (Sharlatan-20210119T211511+0000) Tests are disabled due to being
;; dependent on Quicklisp, main build target is `pgloader-standalone' which
;; does not require Quicklisp workarounds. There is no `install' target
;; configured in Makefile.
`(#:tests? #f
#:strip-binaries? #f
#:make-flags
(list "pgloader-standalone" "BUILDAPP_SBCL=buildapp")
#:phases
(modify-phases %standard-phases
(delete 'configure)
(add-after 'unpack 'set-home
(lambda _
(setenv "HOME" "/tmp")
#t))
(add-after 'unpack 'patch-Makefile
(lambda _
(substitute* "Makefile"
(("--sbcl.*") "--sbcl $(CL) --asdf-path . \\\n"))
#t))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((bin (string-append (assoc-ref outputs "out") "/bin")))
(mkdir-p bin)
(install-file "build/bin/pgloader" bin))
#t)))))
(native-inputs
`(("buildapp" ,buildapp)
("sbcl" ,sbcl)))
(inputs
`(("alexandria" ,sbcl-alexandria)
("cl-abnf" ,sbcl-cl-abnf)
("cl-base64" ,sbcl-cl-base64)
("cl-csv" ,sbcl-cl-csv)
("cl-fad" ,sbcl-cl-fad)
("cl-log" ,sbcl-cl-log)
("cl-markdown" ,sbcl-cl-markdown)
("cl-mustache" ,sbcl-cl-mustache)
("cl-ppcre" ,sbcl-cl-ppcre)
("cl-sqlite" ,sbcl-cl-sqlite)
("closer-mop" ,sbcl-closer-mop)
("command-line-arguments" ,sbcl-command-line-arguments)
("db3" ,sbcl-db3)
("drakma" ,sbcl-drakma)
("esrap" ,sbcl-esrap)
("flexi-streams" ,sbcl-flexi-streams)
("ixf" ,sbcl-ixf)
("local-time" ,sbcl-local-time)
("lparallel" ,sbcl-lparallel)
("metabang-bind" ,sbcl-metabang-bind)
("mssql" ,sbcl-mssql)
("postmodern" ,sbcl-postmodern)
("py-configparser" ,sbcl-py-configparser)
("qmynd" ,sbcl-qmynd)
("quri" ,sbcl-quri)
("split-sequence" ,sbcl-split-sequence)
("trivial-backtrace" ,sbcl-trivial-backtrace)
("usocket" ,sbcl-usocket)
("uuid" ,sbcl-uuid)
("yason" ,sbcl-yason)
("zs3" ,sbcl-zs3)))
(home-page "https://pgloader.io/")
(synopsis "Tool to migrate data to PostgreSQL")
(description
"@code{pgloader} is a program that can load data or migrate databases from
CSV, DB3, iXF, SQLite, MS-SQL or MySQL to PostgreSQL.")
(license (license:x11-style "file://LICENSE"))))
(define-public python-pymysql (define-public python-pymysql
(package (package
(name "python-pymysql") (name "python-pymysql")
@ -2163,14 +2249,14 @@ similar to BerkeleyDB, LevelDB, etc.")
(define-public redis (define-public redis
(package (package
(name "redis") (name "redis")
(version "6.0.9") (version "6.0.10")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://download.redis.io/releases/redis-" (uri (string-append "http://download.redis.io/releases/redis-"
version".tar.gz")) version".tar.gz"))
(sha256 (sha256
(base32 (base32
"1pc6gyiylrcazlc559dp5mxqj733pk9qabnirw4ry3k23kwdqayw")) "1gc529nfh8frk4pynyjlnmzvwa0j9r5cmqwyd7537sywz6abifvr"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Delete bundled jemalloc, as the package will use the libc one ;; Delete bundled jemalloc, as the package will use the libc one
@ -2215,14 +2301,14 @@ sets, bitmaps and hyperloglogs.")
(define-public kyotocabinet (define-public kyotocabinet
(package (package
(name "kyotocabinet") (name "kyotocabinet")
(version "1.2.78") (version "1.2.79")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://fallabs.com/kyotocabinet/pkg/" (uri (string-append "https://fallabs.com/kyotocabinet/pkg/"
"kyotocabinet-" version ".tar.gz")) "kyotocabinet-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1bxkf9kmcavq9rqridb8mvmrk3hj4447ffi24m2admsbm61n6k29")))) "079ymsahlrijswgwfr2la9yw5h57l752cprhp5dz31iamsj1vyv7"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -3986,3 +4072,26 @@ The drivers officially supported by @code{libdbi} are:
PostreSQL, SQLite, ODBC and MySQL.") PostreSQL, SQLite, ODBC and MySQL.")
(home-page "http://soci.sourceforge.net/") (home-page "http://soci.sourceforge.net/")
(license license:boost1.0))) (license license:boost1.0)))
(define-public freetds
(package
(name "freetds")
(version "1.2.18")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.freetds.org/files/stable/"
"freetds-" version ".tar.gz"))
(sha256
(base32 "1hspvwxwdd1apadsy2b40dpjik8kfwcvdamvhpg3lnm15n02fb50"))))
(build-system gnu-build-system)
(arguments
;; NOTE: (Sharlatan-20210110213908+0000) some tests require DB connection,
;; disabled for now.
`(#:tests? #f))
(home-page "https://www.freetds.org/")
(synopsis "Client libraries for MS SQL and Sybase servers")
(description
"FreeTDS is an implementation of the Tabular DataStream protocol, used for
connecting to MS SQL and Sybase servers over TCP/IP.")
(license license:lgpl2.0+)))

4
gnu/packages/diffoscope.scm
View file

@ -72,7 +72,7 @@
(define-public diffoscope (define-public diffoscope
(package (package
(name "diffoscope") (name "diffoscope")
(version "162") (version "164")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -81,7 +81,7 @@
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"02wjjbmdbyqpyizw384j50bc2ar4g5m40amz9q102gqbw6sflwbf")))) "0vjxhz8p0k4y19sl1msrl8x4z3v205rlwj52k5hijv2gn9sqh795"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases (modify-phases %standard-phases `(#:phases (modify-phases %standard-phases

8
gnu/packages/disk.scm
View file

@ -304,14 +304,14 @@ tables, and it understands a variety of different formats.")
(define-public gptfdisk (define-public gptfdisk
(package (package
(name "gptfdisk") (name "gptfdisk")
(version "1.0.5") (version "1.0.6")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/gptfdisk/gptfdisk/" (uri (string-append "mirror://sourceforge/gptfdisk/gptfdisk/"
version "/gptfdisk-" version ".tar.gz")) version "/gptfdisk-" version ".tar.gz"))
(sha256 (sha256
(base32 "0bybgp30pqxb6x5krxazkq4drca0gz4inxj89fpyr204rn3kjz8f")))) (base32 "1a4c2ss6n2s6x8v11h79jykh96y46apd6i838ka0ngx58gb53ifx"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("gettext" ,gettext-minimal) `(("gettext" ,gettext-minimal)
@ -860,7 +860,7 @@ to create devices with respective mappings for the ATARAID sets discovered.")
(define-public libblockdev (define-public libblockdev
(package (package
(name "libblockdev") (name "libblockdev")
(version "2.24") (version "2.25")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/storaged-project/" (uri (string-append "https://github.com/storaged-project/"
@ -868,7 +868,7 @@ to create devices with respective mappings for the ATARAID sets discovered.")
version "-1/libblockdev-" version ".tar.gz")) version "-1/libblockdev-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0wq7624pnprvfzrf39bq1cybd9lqwawbdg5bm0cchlpgvdq7q86w")))) "0s0nazkpzpn4an00qghjkk9n7gdm5a8dqfr5hfnlk5mk5lma8njm"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases

12
gnu/packages/dns.scm
View file

@ -5,7 +5,7 @@
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 John Darrington <jmd@gnu.org> ;;; Copyright © 2016 John Darrington <jmd@gnu.org>
;;; Copyright © 2016 Nikita <nikita@n0.is> ;;; Copyright © 2016 Nikita <nikita@n0.is>
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2016–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016, 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2016, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Vasile Dumitrascu <va511e@yahoo.com> ;;; Copyright © 2017 Vasile Dumitrascu <va511e@yahoo.com>
;;; Copyright © 2017 Gregor Giesen <giesen@zaehlwerk.net> ;;; Copyright © 2017 Gregor Giesen <giesen@zaehlwerk.net>
@ -13,7 +13,7 @@
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2019 Chris Marusich <cmmarusich@gmail.com> ;;; Copyright © 2019 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2019 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2020 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2020, 2021 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2020 Leo Famulari <leo@famulari.name> ;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re> ;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
@ -277,7 +277,7 @@ prompt the user with the option to go with insecure DNS only.")
(define-public dnsmasq (define-public dnsmasq
(package (package
(name "dnsmasq") (name "dnsmasq")
(version "2.82") (version "2.83")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -285,7 +285,7 @@ prompt the user with the option to go with insecure DNS only.")
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0cn1xd1s6xs78jmrmwjnh9m6w3q38pk6dyqy2phvasqiyd33cll4")))) "1sjamz1v588qf35m8z6wcqkjk5w12bqhj7d7p48dj8jyn3lgghgz"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
@ -317,7 +317,7 @@ and BOOTP/TFTP for network booting of diskless machines.")
(package (package
(name "bind") (name "bind")
;; When updating, check whether isc-dhcp's bundled copy should be as well. ;; When updating, check whether isc-dhcp's bundled copy should be as well.
(version "9.16.10") (version "9.16.11")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -325,7 +325,7 @@ and BOOTP/TFTP for network booting of diskless machines.")
"/bind-" version ".tar.xz")) "/bind-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1cv26gzbyk3ahidr1fip0pgj28s7l52cafdqpykfc1b2kh0zqixw")))) "1hcr0q6i2mk83yi12zxjs5q21y3gx7683q99l77ibxfqsx6zc481"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs `("out" "utils")) (outputs `("out" "utils"))
(inputs (inputs

163
gnu/packages/docbook.scm
View file

@ -4,6 +4,7 @@
;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org> ;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Marius Bakke <marius@gnu.org> ;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -214,6 +215,168 @@ by no means limited to these applications.) This package provides XML DTDs.")
"This package provides XSL style sheets for DocBook.") "This package provides XSL style sheets for DocBook.")
(license (x11-style "" "See 'COPYING' file.")))) (license (x11-style "" "See 'COPYING' file."))))
(define-public docbook-dsssl
(package
(name "docbook-dsssl")
(version "1.79")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/docbook/"
name "/" version "/"
name "-" version ".tar.bz2"))
(sha256
(base32
"1g72y2yyc2k89kzs0lvrb9n7hjayw1hdskfpplpz97pf1c99wcig"))))
(build-system trivial-build-system)
(outputs '("out" "doc"))
(arguments
`(#:modules ((guix build utils))
#:builder
(begin
(use-modules (guix build utils))
(let ((source (assoc-ref %build-inputs "source"))
(dtd (string-append (assoc-ref %outputs "out")
"/sgml/dtd/docbook"))
(docbook-dsssl-doc (assoc-ref %build-inputs "docbook-dsssl-doc"))
(doc (assoc-ref %outputs "doc"))
(tar (assoc-ref %build-inputs "tar"))
(bzip2 (assoc-ref %build-inputs "bzip2")))
(setenv "PATH" (string-append tar "/bin" ":" bzip2 "/bin"))
(mkdir-p dtd)
(invoke "tar" "-xf" source "-C" dtd)
;; The doc output contains 1.4 MiB of HTML documentation.
(symlink docbook-dsssl-doc doc)))))
(inputs
`(("docbook-dsssl-doc" ,docbook-dsssl-doc)))
(native-inputs
`(("bzip2", bzip2)
("tar" ,tar)))
(home-page "https://docbook.org/")
(synopsis "DSSSL style sheets for DocBook")
(description "This package provides DSSSL style sheets for DocBook.")
(license (non-copyleft "file://README"))))
;;; Private variable, used as the 'doc' output of the docbook-dsssl package.
(define docbook-dsssl-doc
(package
(name "docbook-dsssl-doc")
(version "1.79")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/docbook/"
name "/" version "/"
name "-" version ".tar.bz2"))
(sha256
(base32
"1plp5ngc96pbna4rwglp9glcadnirbm3hlcjb4gjvq1f8biic9lz"))))
(build-system trivial-build-system)
(arguments
`(#:modules ((guix build utils))
#:builder
(begin
(use-modules (guix build utils))
(let ((source (assoc-ref %build-inputs "source"))
(docdir (string-append (assoc-ref %outputs "out")
"/share/doc/" "docbook-dsssl-" ,version))
(tar (assoc-ref %build-inputs "tar"))
(bzip2 (assoc-ref %build-inputs "bzip2")))
(setenv "PATH" (string-append tar "/bin" ":" bzip2 "/bin"))
(mkdir-p docdir)
;; Extract the "doc" subdirectory.
(invoke "tar" "-xf" source "--strip-components=2"
"--no-same-owner" "-C" docdir
(string-append "docbook-dsssl-" ,version "/doc"))))))
(native-inputs
`(("bzip2", bzip2)
("tar" ,tar)))
(home-page "https://docbook.org/")
(synopsis "DocBook DSSSL style sheets documentation")
(description "Documentation for the DocBook DSSSL style sheets.")
(license (non-copyleft "file://doc/LEGALNOTICE.htm"))))
(define-public docbook-sgml
(package
(name "docbook-sgml")
(version "4.1")
(source (origin
(method url-fetch)
(uri (string-append "https://www.oasis-open.org/docbook/sgml/"
version "/docbk41.zip"))
(sha256
(base32
"04b3gp4zkh9c5g9kvnywdkdfkcqx3kjc04j4mpkr4xk7lgqgrany"))))
(build-system trivial-build-system)
(arguments
'(#:modules ((guix build utils))
#:builder
(begin
(use-modules (guix build utils))
(let ((source (assoc-ref %build-inputs "source"))
(iso-entities-dir (string-append
(assoc-ref %build-inputs "iso-8879-entities")))
(unzip (string-append (assoc-ref %build-inputs "unzip")
"/bin/unzip"))
(dtd (string-append (assoc-ref %outputs "out")
"/sgml/dtd/docbook")))
;; Extract the sources.
(mkdir-p dtd)
(chdir dtd)
(invoke unzip source)
;; Reference the ISO 8879 character entities.
;; e.g. "iso-lat1.gml" --> "<iso-entities-dir>/ISOlat1"
(substitute* "docbook.cat"
(("(.*ISO 8879.*)\"iso-(.*)\\.gml\"" _ head name)
(string-append head "\"" iso-entities-dir "/ISO" name "\"")))))))
(native-inputs
`(("unzip" ,unzip)))
(inputs
`(("iso-8879-entities" ,iso-8879-entities)))
(home-page "https://docbook.org")
(synopsis "DocBook SGML style sheets for document authoring")
(description "This package provides SGML style sheets for DocBook.")
(license (x11-style "" "See file headers."))))
(define-public docbook-sgml-3.1
(package
(inherit docbook-sgml)
(version "3.1")
(source (origin
(method url-fetch)
(uri (string-append "https://www.oasis-open.org/docbook/sgml/"
version "/docbk31.zip"))
(sha256
(base32
"0f25ch7bywwhdxb1qa0hl28mgq1blqdap3rxzamm585rf4kis9i0"))))))
;;; Private package referenced by docbook-sgml.
(define iso-8879-entities
(package
(name "iso-8879-entities")
(version "0.0") ;no proper version
(source (origin
(method url-fetch)
(uri "http://www.oasis-open.org/cover/ISOEnts.zip")
(sha256
(base32
"1clrkaqnvc1ja4lj8blr0rdlphngkcda3snm7b9jzvcn76d3br6w"))))
(build-system trivial-build-system)
(arguments
'(#:modules ((guix build utils))
#:builder
(begin
(use-modules (guix build utils))
(let ((source (assoc-ref %build-inputs "source"))
(unzip (string-append (assoc-ref %build-inputs "unzip")
"/bin/unzip"))
(out (string-append (assoc-ref %outputs "out"))))
(invoke unzip source "-d" out)))))
(native-inputs `(("unzip" ,unzip)))
(home-page "https://www.oasis-open.org/")
(synopsis "ISO 8879 character entities")
(description "ISO 8879 character entities that are typically used in
the in DocBook SGML DTDs.")
(license (x11-style "" "See file headers."))))
(define-public dblatex (define-public dblatex
(package (package
(name "dblatex") (name "dblatex")

18
gnu/packages/education.scm
View file

@ -2,8 +2,8 @@
;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org> ;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017, 2018, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019, 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2018, 2019, 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2020 Robert Smith <robertsmith@posteo.net> ;;; Copyright © 2020 Robert Smith <robertsmith@posteo.net>
;;; Copyright © 2020 Guy Fleury Iteriteka <gfleury@disroot.org> ;;; Copyright © 2020 Guy Fleury Iteriteka <gfleury@disroot.org>
@ -230,8 +230,11 @@ Currently available boards include:
(sha256 (sha256
(base32 (base32
"0d387b404j88gsv6kv0rb7wxr23v5g5vl6s5l7602x8pxf7slbbx")) "0d387b404j88gsv6kv0rb7wxr23v5g5vl6s5l7602x8pxf7slbbx"))
;; Apply patches in the order determined by Debian
(patches (search-patches "tipp10-fix-compiling.patch" (patches (search-patches "tipp10-fix-compiling.patch"
"tipp10-remove-license-code.patch")))) "tipp10-remove-license-code.patch"
"tipp10-disable-downloader.patch"
"tipp10-qt5.patch"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f ; packages has no tests `(#:tests? #f ; packages has no tests
@ -256,8 +259,8 @@ Currently available boards include:
;; Recreate Makefile ;; Recreate Makefile
(invoke "qmake"))))))) (invoke "qmake")))))))
(inputs (inputs
`(("qt4" ,qt-4) `(("qtbase" ,qtbase)
("sqlite" ,sqlite))) ("qtmultimedia" ,qtmultimedia)))
(home-page "https://www.tipp10.com/") (home-page "https://www.tipp10.com/")
(synopsis "Touch typing tutor") (synopsis "Touch typing tutor")
(description "Tipp10 is a touch typing tutor. The ingenious thing about (description "Tipp10 is a touch typing tutor. The ingenious thing about
@ -677,15 +680,14 @@ language and very flexible regarding to new or unknown keyboard layouts.")
(define-public ktouch (define-public ktouch
(package (package
(name "ktouch") (name "ktouch")
(version "20.12.0") (version "20.12.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" (uri (string-append "mirror://kde/stable/release-service/"
version "/src/ktouch-" version ".tar.xz")) version "/src/ktouch-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32 "10lm2p8w26c9n6lhvw3301myfss0dq7hl7rawzb3hsy1lqvmvdib"))))
"1s8pcwakx94aygfyjmyps5b43j4kv6dmfw7n12japcka2yfp9bi2"))))
(build-system qt-build-system) (build-system qt-build-system)
(arguments (arguments
`(#:phases `(#:phases

41
gnu/packages/efi.scm
View file

@ -1,7 +1,8 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019 Danny Milosavljevic <dannym@scratchpost.org> ;;; Copyright © 2019 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2021 Vincent Legoll <vincent.legoll@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -61,6 +62,44 @@ environment presented by Intel's EFI.")
;; Distribution is allowed only when accepting all those licenses. ;; Distribution is allowed only when accepting all those licenses.
(license (list license:bsd-2 license:bsd-3 license:bsd-4 license:expat)))) (license (list license:bsd-2 license:bsd-3 license:bsd-4 license:expat))))
(define-public efi-analyzer
(let ((commit "77c9e3a67cd7c2fca48a4292dad25a5429872f95")
(revision "0"))
(package
(name "efi-analyzer")
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/xypron/efi_analyzer")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "1izdkzybqyvzpzqz6kx4j7y47j6aa2dsdrychzgs65466x1a4br1"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags
(list (string-append "prefix=" (assoc-ref %outputs "out")))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'support-cross-compilation
(lambda _
(substitute* "Makefile"
(("gcc") ,(cc-for-target)))
#t))
(delete 'configure)))) ; no configure script
(home-page "https://github.com/xypron/efi_analyzer")
(synopsis "Analyze EFI binaries")
(description
"The EFI Analyzer checks EFI binaries and prints out header and section
information.")
(license license:bsd-2))))
(define-public efi_analyzer
;; For a short while the package name contained an underscore.
(deprecated-package "efi_analyzer" efi-analyzer))
(define-public sbsigntools (define-public sbsigntools
(package (package
(name "sbsigntools") (name "sbsigntools")

4
gnu/packages/elf.scm
View file

@ -122,14 +122,14 @@ object or archive file), @command{eu-strip} (for discarding symbols),
(package (package
(name "libabigail") (name "libabigail")
(home-page "https://sourceware.org/libabigail/") (home-page "https://sourceware.org/libabigail/")
(version "1.7") (version "1.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://sourceware.org/pub/libabigail/" (uri (string-append "https://sourceware.org/pub/libabigail/"
"libabigail-" version ".tar.gz")) "libabigail-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0bf8w01l6wm7mm4clfg5rqi30m1ws11qqa4bp2vxghfwgi9ai8i7")))) "0p363mkgypcklgf8iylxpbdnfgqc086a6fv7n9hzrjjci45jdgqw"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags '("--disable-static" `(#:configure-flags '("--disable-static"

5
gnu/packages/elixir.scm
View file

@ -5,6 +5,7 @@
;;; Copyright © 2017 nee <nee.git@cock.li> ;;; Copyright © 2017 nee <nee.git@cock.li>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Nikita <nikita@n0.is> ;;; Copyright © 2018 Nikita <nikita@n0.is>
;;; Copyright © 2021 Oskar Köök <oskar@maatriks.ee>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -33,7 +34,7 @@
(define-public elixir (define-public elixir
(package (package
(name "elixir") (name "elixir")
(version "1.10.4") (version "1.11.3")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -42,7 +43,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 "16j4rmm3ix088fvxhvyjqf1hnfg7wiwa87gml3b2mrwirdycbinv")) (base32 "0ivah4117z75pinvb3gr22d05ihfwcdgw5zvvpv7kbgiqaj8ma8f"))
(patches (search-patches "elixir-path-length.patch")))) (patches (search-patches "elixir-path-length.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments

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

@ -31,7 +31,7 @@
;;; Copyright © 2017 Peter Mikkelsen <petermikkelsen10@gmail.com> ;;; Copyright © 2017 Peter Mikkelsen <petermikkelsen10@gmail.com>
;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Mike Gerwitz <mtg@gnu.org> ;;; Copyright © 2017 Mike Gerwitz <mtg@gnu.org>
;;; Copyright © 2017, 2018, 2019, 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2017, 2018, 2019, 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2018 Sohom Bhattacharjee <soham.bhattacharjee15@gmail.com> ;;; Copyright © 2018 Sohom Bhattacharjee <soham.bhattacharjee15@gmail.com>
;;; Copyright © 2018, 2019 Mathieu Lirzin <mthl@gnu.org> ;;; Copyright © 2018, 2019 Mathieu Lirzin <mthl@gnu.org>
;;; Copyright © 2018, 2019, 2020, 2021 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2018, 2019, 2020, 2021 Pierre Neidhardt <mail@ambrevar.xyz>
@ -41,7 +41,7 @@
;;; Copyright © 2018 Alex Branham <alex.branham@gmail.com> ;;; Copyright © 2018 Alex Branham <alex.branham@gmail.com>
;;; Copyright © 2018 Thorsten Wilms <t_w_@freenet.de> ;;; Copyright © 2018 Thorsten Wilms <t_w_@freenet.de>
;;; Copyright © 2018, 2019, 2020 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2018, 2019, 2020 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2018, 2019, 2020 Brett Gilio <brettg@gnu.org> ;;; Copyright © 2018, 2019, 2020, 2021 Brett Gilio <brettg@gnu.org>
;;; Copyright © 2019, 2020 Dimakakos Dimos <bendersteed@teknik.io> ;;; Copyright © 2019, 2020 Dimakakos Dimos <bendersteed@teknik.io>
;;; Copyright © 2019, 2020 Brian Leung <bkleung89@gmail.com> ;;; Copyright © 2019, 2020 Brian Leung <bkleung89@gmail.com>
;;; Copyright © 2019 mikadoZero <mikadozero@yandex.com> ;;; Copyright © 2019 mikadoZero <mikadozero@yandex.com>
@ -88,7 +88,8 @@
;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz> ;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz>
;;; Copyright © 2020 André A. Gomes <andremegafone@gmail.com> ;;; Copyright © 2020 André A. Gomes <andremegafone@gmail.com>
;;; Copyright © 2020 Jonathan Rostran <rostranjj@gmail.com> ;;; Copyright © 2020 Jonathan Rostran <rostranjj@gmail.com>
;;; Copyright © 2020 Noah Evans <noah@nevans.me> ;;; Copyright © 2020, 2021 Noah Evans <noah@nevans.me>
;;; Copyright © 2020 Brit Butler <brit@kingcons.io>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -130,6 +131,7 @@
#:use-module (gnu packages databases) #:use-module (gnu packages databases)
#:use-module (gnu packages dictionaries) #:use-module (gnu packages dictionaries)
#:use-module (gnu packages djvu) #:use-module (gnu packages djvu)
#:use-module (gnu packages ebook)
#:use-module (gnu packages emacs) #:use-module (gnu packages emacs)
#:use-module (gnu packages guile) #:use-module (gnu packages guile)
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
@ -1844,6 +1846,34 @@ like. It can be linked with various Emacs mail clients (Message and Mail
mode, Rmail, Gnus, MH-E, and VM). BBDB is fully customizable.") mode, Rmail, Gnus, MH-E, and VM). BBDB is fully customizable.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-counsel-bbdb
(package
(name "emacs-counsel-bbdb")
(version "20181128.1320")
(source
(origin
(method url-fetch)
(uri (string-append "https://melpa.org/packages/counsel-bbdb-"
version ".el"))
(sha256
(base32
"03g3lk8hz9a17vf5r16x054bhyk8xsbnfq0div8ig13fmhqi159q"))))
(build-system emacs-build-system)
(propagated-inputs `(("emacs-ivy" ,emacs-ivy)))
(home-page "https://github.com/redguard/counsel-bbdb")
(synopsis "Ivy interface for BBDB")
(description "This Ivy extension enables the use of @code{ivy-mode} to input
email addresses from BBDB efficiently. The main functions are:
@table @code
@item counsel-bbdb-complete-mail to input email addresses;
@item counsel-bbdb-reload' to reload contacts from BBDB database;
@item counsel-bbdb-expand-mail-alias to expand mail alias.
@end table
Since @code{counsel-bbdb} is based on @code{ivy-mode}, all Ivy key bindings
are supported. For example, after @samp{C-u M-x counsel-bbdb-complete-mail},
you can press @samp{C-M-n} to input multiple email addresses.")
(license license:gpl3+)))
(define-public emacs-bluetooth (define-public emacs-bluetooth
(package (package
(name "emacs-bluetooth") (name "emacs-bluetooth")
@ -2071,14 +2101,14 @@ as a library for other Emacs packages.")
(define-public emacs-auctex (define-public emacs-auctex
(package (package
(name "emacs-auctex") (name "emacs-auctex")
(version "13.0.3") (version "13.0.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/" (uri (string-append "https://elpa.gnu.org/packages/"
"auctex-" version ".tar")) "auctex-" version ".tar"))
(sha256 (sha256
(base32 "1ljpkr0z15fyh907jbgky238dvci5vqi3xhvslyhblhp8sg9cbsi")))) (base32 "1362dqb8mcaddda9849gqsj6rzlfq18xprddb74j02884xl7hq65"))))
(build-system emacs-build-system) (build-system emacs-build-system)
;; We use 'emacs' because AUCTeX requires dbus at compile time ;; We use 'emacs' because AUCTeX requires dbus at compile time
;; ('emacs-minimal' does not provide dbus). ;; ('emacs-minimal' does not provide dbus).
@ -2253,7 +2283,7 @@ Lock key.")
(define-public emacs-chronometrist (define-public emacs-chronometrist
(package (package
(name "emacs-chronometrist") (name "emacs-chronometrist")
(version "0.5.6") (version "0.6.3")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -2262,7 +2292,7 @@ Lock key.")
(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 "0g54pxvid1hlynlnfx99sl027q2mr2f4axsvnf0vb3v48zm0n5cw")))) (base32 "0ql72qh0bshv62nksv6awz5nqfhmgs8hkyvm7wvzfq64yrwghw50"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -4664,18 +4694,19 @@ for Flow files.")
(define-public emacs-flycheck-grammalecte (define-public emacs-flycheck-grammalecte
(package (package
(name "emacs-flycheck-grammalecte") (name "emacs-flycheck-grammalecte")
(version "1.2") (version "1.3")
(source (source
(origin (origin
(method url-fetch) (method git-fetch)
(uri (string-append "https://git.deparis.io/" (uri (git-reference
"flycheck-grammalecte/snapshot/" (url "https://git.umaneti.net/flycheck-grammalecte/")
"flycheck-grammalecte-" version ".tar.xz")) (commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 "1mzmzyik843r4j0ibpwqrxmb0g4xmirrf3lxr010bddkmmxf749a")))) (base32 "1f1gapvs9j89qr474103dqgsiyb96phlnsmq5hiv4ba242blg9lb"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments (arguments
`(#:include '("\\.(el|py)$") `(#:include (cons "\\.py$" %default-include)
#:exclude '("^test-profile.el$") #:exclude '("^test-profile.el$")
#:emacs ,emacs ;need libxml support #:emacs ,emacs ;need libxml support
#:phases #:phases
@ -4690,28 +4721,22 @@ for Flow files.")
(substitute* '("conjugueur.py" "flycheck-grammalecte.py") (substitute* '("conjugueur.py" "flycheck-grammalecte.py")
(("/usr/bin/env python3?") python3)) (("/usr/bin/env python3?") python3))
#t))) #t)))
(add-before 'build 'link-to-grammalecte (add-after 'unpack 'specify-grammalecte-location
;; XXX: The Python part of the package requires grammalecte, but (lambda* (#:key inputs #:allow-other-keys)
;; the library is not specified in PYTHONPATH, since we're not (make-file-writable "flycheck-grammalecte.el")
;; using Python build system. As a workaround, we symlink (emacs-substitute-variables "flycheck-grammalecte.el"
;; grammalecte libraries here. ("flycheck-grammalecte--grammalecte-directory"
(lambda* (#:key inputs outputs #:allow-other-keys) (string-append (assoc-ref inputs "grammalecte")
(let* ((out (assoc-ref outputs "out")) "/lib/python"
(grammalecte (assoc-ref inputs "grammalecte")) ,(version-major+minor (package-version python))
(version ,(version-major+minor (package-version python)))) "/site-packages/grammalecte")))
(with-directory-excursion #t)))))
(string-append out "/share/emacs/site-lisp")
(symlink (string-append grammalecte "/lib/"
"python" version "/site-packages/"
"grammalecte")
"grammalecte"))
#t))))))
(inputs (inputs
`(("grammalecte" ,grammalecte) `(("grammalecte" ,grammalecte)
("python" ,python))) ("python" ,python)))
(propagated-inputs (propagated-inputs
`(("emacs-flycheck" ,emacs-flycheck))) `(("emacs-flycheck" ,emacs-flycheck)))
(home-page "https://git.deparis.io/flycheck-grammalecte/") (home-page "https://git.umaneti.net/flycheck-grammalecte/")
(synopsis "Integrate Grammalecte with Flycheck") (synopsis "Integrate Grammalecte with Flycheck")
(description (description
"Integrate the French grammar and typography checker Grammalecte with "Integrate the French grammar and typography checker Grammalecte with
@ -6344,6 +6369,57 @@ drill sessions to aid in memorization. In these sessions you are shown flash
cards created in Org mode.") cards created in Org mode.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-anki-editor
;; Last release was in 2018.
(let ((commit "546774a453ef4617b1bcb0d1626e415c67cc88df")
(revision "0")
(version "0.3.3"))
(package
(name "emacs-anki-editor")
(version (git-version version revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/louietan/anki-editor")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "1if610hq5j8rbjh1caw5bwbgnsn231awwxqbpwvrh966kdxzl4qf"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-dash" ,emacs-dash)
("emacs-request" ,emacs-request)))
(home-page "https://github.com/louietan/anki-editor")
(synopsis "Minor mode for making Anki cards with Org mode")
(description
"This package is for people who use Anki as a spaced repetition system
(SRS) but would like to make cards in Org mode.")
(license license:gpl3+))))
(define-public emacs-org-mime
(package
(name "emacs-org-mime")
(version "0.2.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/org-mime/org-mime")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0vchyd80ybvr6317dwm50nxcgxfrpc0bz6259vnrh24p5sb8shbj"))))
(build-system emacs-build-system)
(home-page "http://github.com/org-mime/org-mime")
(synopsis "Send HTML email using Org mode HTML export")
(description
"This program sends HTML email using Org-mode HTML export.
This approximates a WYSiWYG HTML mail editor from within Emacs, and can be
useful for sending tables, fontified source code, and inline images in
email.")
(license license:gpl3+)))
(define-public emacs-org-superstar (define-public emacs-org-superstar
(package (package
(name "emacs-org-superstar") (name "emacs-org-superstar")
@ -6983,6 +7059,60 @@ any one of several ways: literally, as a regexp, as an initialism, in the flex
style, or as multiple word prefixes.") style, or as multiple word prefixes.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-consult
;; There are no tagged releases upstream on GitHub, instead we are using the
;; most recent commit.
(let ((commit "ef6bb73a4a46e686826968fa25169e2d59b9a087")
(revision "0"))
(package
(name "emacs-consult")
(version (git-version "0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/minad/consult")
(commit commit)))
(sha256
(base32 "00cnwg2knd820wwx6zg71rr0whpdhqm64gm3qx1mgklk79g7daih"))
(file-name (git-file-name name version))))
(build-system emacs-build-system)
(propagated-inputs `(("emacs-flycheck" ,emacs-flycheck)
("emacs-selectrum" ,emacs-selectrum)))
(home-page "https://github.com/minad/consult")
(synopsis "Consulting completing-read")
(description "This package provides various handy commands based on the
Emacs completion function completing-read, which allows to quickly select from a
list of candidates.")
(license license:gpl3+))))
(define-public emacs-marginalia
;; There are no tagged releases upstream on GitHub, instead we are using the
;; most recent commit.
(let ((commit "401993562dbf636054dd64988e44d19b5030867f")
(revision "0"))
(package
(name "emacs-marginalia")
(version (git-version "0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/minad/marginalia")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "1j0k9ija5paidj7yvbagkkayz9bjwhia9yhmd2q4490ginbbxshs"))))
(build-system emacs-build-system)
(home-page "https://github.com/minad/marginalia")
(synopsis "Marginalia in the minibuffer")
(description
"This package provides Marginalia mode which adds marginalia to the
minibuffer completions. Marginalia are marks or annotations placed at the
margin of the page of a book or in this case helpful colorful annotations
placed at the margin of the minibuffer for your completion candidates.")
(license license:gpl3+))))
(define-public emacs-smartparens (define-public emacs-smartparens
(package (package
(name "emacs-smartparens") (name "emacs-smartparens")
@ -9923,8 +10053,8 @@ extensions.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-evil-collection (define-public emacs-evil-collection
(let ((commit "8c256263ad100fecd6246c6c55cbb19dab717c39") (let ((commit "323bb7d85848a6a142ae14f39c3a073ce6423e20")
(revision "18")) (revision "19"))
(package (package
(name "emacs-evil-collection") (name "emacs-evil-collection")
(version (git-version "0.0.3" revision commit)) (version (git-version "0.0.3" revision commit))
@ -9936,7 +10066,7 @@ extensions.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0hz1yfv5g016dm99bwnibbmyhbi21qlc39ckd7p3s82az89hgf2n")))) "1pf51kj93i1k2ivkjgwcvgxj8shrl8h7rkg578jl4k4awargf0nz"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (propagated-inputs
`(("emacs-evil" ,emacs-evil) `(("emacs-evil" ,emacs-evil)
@ -9976,9 +10106,9 @@ being deleted, changed, yanked, or pasted when using evil commands")
(license license:gpl3+)))) (license license:gpl3+))))
(define-public emacs-goto-chg (define-public emacs-goto-chg
(let ((commit "1829a13026c597e358f716d2c7793202458120b5") (let ((commit "2af612153bc9f5bed135d25abe62f46ddaa9027f")
(version "1.7.3") (version "1.7.3")
(revision "1")) (revision "2"))
(package (package
(name "emacs-goto-chg") (name "emacs-goto-chg")
(version (git-version version revision commit)) (version (git-version version revision commit))
@ -9991,10 +10121,8 @@ being deleted, changed, yanked, or pasted when using evil commands")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1y603maw9xwdj3qiarmf1bp13461f9f5ackzicsbynl0i9la3qki")))) "1awmvihqgw6kspx192bcp9xp56xqbma90wlhxfxmidx3bvxghwpv"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs
`(("emacs-undo-tree" ,emacs-undo-tree)))
(home-page "https://github.com/emacs-evil/goto-chg") (home-page "https://github.com/emacs-evil/goto-chg")
(synopsis "Go to the last change in the Emacs buffer") (synopsis "Go to the last change in the Emacs buffer")
(description (description
@ -11575,14 +11703,14 @@ information via a consistent and well-integrated user interface.")
(define-public emacs-adaptive-wrap (define-public emacs-adaptive-wrap
(package (package
(name "emacs-adaptive-wrap") (name "emacs-adaptive-wrap")
(version "0.7") (version "0.8")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/" (uri (string-append "https://elpa.gnu.org/packages/"
"adaptive-wrap-" version ".el")) "adaptive-wrap-" version ".el"))
(sha256 (sha256
(base32 "10fb8gzvkbnrgzv28n1rczs03dvapr7rvi0kd73j6yf1zg2iz6qp")))) (base32 "1gs1pqzywvvw4prj63vpj8abh8h14pjky11xfl23pgpk9l3ldrb0"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://elpa.gnu.org/packages/adaptive-wrap.html") (home-page "https://elpa.gnu.org/packages/adaptive-wrap.html")
(synopsis "Smart line-wrapping with wrap-prefix") (synopsis "Smart line-wrapping with wrap-prefix")
@ -12031,14 +12159,14 @@ and cangjie.")
(define-public emacs-posframe (define-public emacs-posframe
(package (package
(name "emacs-posframe") (name "emacs-posframe")
(version "0.8.3") (version "0.8.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/" (uri (string-append "https://elpa.gnu.org/packages/"
"posframe-" version ".el")) "posframe-" version ".tar"))
(sha256 (sha256
(base32 "05m56aw2yxik0pgcvyr5c92j2mwfksxgq1syzvik6161gy8hdd0g")))) (base32 "1sn35ibp5y4y80l1xm4b8i94ld953a9gbkk99zqd9mrq9bwjyhdp"))))
(build-system emacs-build-system) (build-system emacs-build-system)
;; emacs-minimal does not include the function font-info. ;; emacs-minimal does not include the function font-info.
(arguments (arguments
@ -12766,6 +12894,29 @@ JSONRPC is a generic Remote Procedure Call protocol designed around
JSON objects.") JSON objects.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-jsonnet-mode
(package
(name "emacs-jsonnet-mode")
(version "0.1.2")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/tminor/jsonnet-mode")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0vi7415n90d1z2ww1hld0gdp6v7z4rd6f70h476dp2x4hydk293i"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-dash" ,emacs-dash)))
(home-page "https://github.com/mgyucht/jsonnet-mode")
(synopsis "Major mode for editing jsonnet files")
(description "This package provides syntax highlighting, indenting,
formatting, and utility methods for jsonnet files.")
(license license:gpl3+)))
(define-public emacs-restclient (define-public emacs-restclient
(let ((commit "ac8aad6c6b9e9d918062fa3c89c22c2f4ec48bc3") (let ((commit "ac8aad6c6b9e9d918062fa3c89c22c2f4ec48bc3")
(version "0") (version "0")
@ -12879,8 +13030,8 @@ the actual transformations.")
(license license:gpl2+)))) (license license:gpl2+))))
(define-public emacs-dired-hacks (define-public emacs-dired-hacks
(let ((commit "886befe113fae397407c804f72c45613d1d43535") (let ((commit "d1a2bda6aa8f890cb367297ed93aee6d3b5ba388")
(revision "2")) (revision "3"))
(package (package
(name "emacs-dired-hacks") (name "emacs-dired-hacks")
(version (git-version "0.0.1" revision commit)) (version (git-version "0.0.1" revision commit))
@ -12892,7 +13043,7 @@ the actual transformations.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1cvibg90ggyrivpjmcfprpi2fx7dpa68f8kzg08s88gw5ib75djl")))) "12m81a9kjhs4cyq3lym0vp5nx6z3sfnypyzrnia76x6rjvixjf6y"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (propagated-inputs
`(("emacs-dash" ,emacs-dash) `(("emacs-dash" ,emacs-dash)
@ -13512,14 +13663,14 @@ database of references on life sciences.")
(define-public emacs-websocket (define-public emacs-websocket
(package (package
(name "emacs-websocket") (name "emacs-websocket")
(version "1.13") (version "1.13.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/" (uri (string-append "https://elpa.gnu.org/packages/"
"websocket-" version ".tar")) "websocket-" version ".tar"))
(sha256 (sha256
(base32 "0jnarx53csmx5fivzp5vhvvj3m8s03zwc6hjl0spz5zb6icqclsa")))) (base32 "1x664zswas0fpml7zaj59zy97avrm49zb80zd69rlkqzz1m45psc"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://elpa.gnu.org/packages/websocket.html") (home-page "https://elpa.gnu.org/packages/websocket.html")
(synopsis "Emacs WebSocket client and server") (synopsis "Emacs WebSocket client and server")
@ -13667,6 +13818,36 @@ through them using @key{C-c C-SPC}.")
messaging service.") messaging service.")
(license license:gpl3+)))) (license license:gpl3+))))
(define-public emacs-helm-slack
(let ((commit "465f6220f3f5bee4d95492991fca1290c89534eb")
(revision "1"))
(package
(name "emacs-helm-slack")
(version (git-version "0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/yuya373/helm-slack")
(commit commit)))
(file-name (git-file-name name commit))
(sha256
(base32
"0p1s1kl8v68qjprqkf034cz911qzbqxbscqgpn0c3mbm3yfx81f7"))))
(build-system emacs-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
;; HOME needs to exist for source compilation.
(add-before 'build 'set-HOME
(lambda _ (setenv "HOME" "/tmp") #t)))))
(propagated-inputs `(("emacs-slack", emacs-slack)))
(home-page "https://github.com/yuya373/helm-slack")
(synopsis "Helm extension for emacs-slack")
(description "This package provides an helm extension for emacs-slack
Slack client.")
(license license:gpl3+))))
(define-public emacs-bash-completion (define-public emacs-bash-completion
(package (package
(name "emacs-bash-completion") (name "emacs-bash-completion")
@ -13949,7 +14130,7 @@ Features:
(define-public emacs-evil-matchit (define-public emacs-evil-matchit
(package (package
(name "emacs-evil-matchit") (name "emacs-evil-matchit")
(version "2.3.9") (version "2.3.10")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -13958,7 +14139,7 @@ Features:
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1jk5qkqz3c4fnh6d2y889k5ycz8ipbkmzk4i8bl86xv9rhis1pv9")))) (base32 "14nrc46290q54y7wv25251f2kqc0z8i9byl09xkgjijqldl9vdxa"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (propagated-inputs
`(("emacs-evil" ,emacs-evil))) `(("emacs-evil" ,emacs-evil)))
@ -16073,6 +16254,32 @@ dumb text search, @code{elisp-refs} actually parses the code, so it's never
confused by comments or @code{foo-bar} matching @code{foo}.") confused by comments or @code{foo-bar} matching @code{foo}.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-crdt
(let ((commit "44068ae505adf2c3a7bdbf6723a25fc45d6d1666")
(revision "0"))
(package
(name "emacs-crdt")
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://code.librehq.com/qhong/crdt.el")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "130fkhvi757pfnbz70g6nw2n71k89cwwx7yzvsd5v177228c8w7w"))))
(build-system emacs-build-system)
(home-page "https://code.librehq.com/qhong/crdt.el")
(synopsis "Real-time collaborative editing environment")
(description
"@code{crdt.el} is a real-time collaborative editing environment for
Emacs using Conflict-free Replicated Data Types. With it, you can share
multiple buffer in one session, and see other users’ cursor and region. It
also synchronizes Org mode folding status. It should work with all of Org
mode.")
(license license:gpl3+))))
(define-public emacs-crux (define-public emacs-crux
(let ((commit "308f17d914e2cd79cbc809de66d02b03ceb82859") (let ((commit "308f17d914e2cd79cbc809de66d02b03ceb82859")
(revision "2")) (revision "2"))
@ -18134,16 +18341,16 @@ appropriate directory if no @code{eshell} session is active.")
(define-public emacs-eshell-syntax-highlighting (define-public emacs-eshell-syntax-highlighting
(package (package
(name "emacs-eshell-syntax-highlighting") (name "emacs-eshell-syntax-highlighting")
(version "0.2") (version "0.3")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/akreisher/eshell-syntax-highlighting") (url "https://github.com/akreisher/eshell-syntax-highlighting")
(commit version))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0id27874wsb5y169030x8g1ldpa1mnskv1s2j3ygqiyh5fvpfash")))) (base32 "1fb9aa85a3hx1rcmv71j6sc3y278452p1y4dabpwy07avb6apd0p"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://github.com/akreisher/eshell-syntax-highlighting") (home-page "https://github.com/akreisher/eshell-syntax-highlighting")
(synopsis "Add syntax highlighting to Eshell") (synopsis "Add syntax highlighting to Eshell")
@ -20083,7 +20290,7 @@ correctly.")
(define-public emacs-helm-sly (define-public emacs-helm-sly
(package (package
(name "emacs-helm-sly") (name "emacs-helm-sly")
(version "0.5.1") (version "0.7.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -20092,7 +20299,7 @@ correctly.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"13s2dj09mcdwlibjlahyyq2dxjkjlpxs88dbdyvcd64249jmahsx")))) "090vq8c4scf9byn8xic71b02n4c8frhz1y1x1brxn6iar44dmzm5"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (propagated-inputs
`(("emacs-helm" ,emacs-helm) `(("emacs-helm" ,emacs-helm)
@ -20957,6 +21164,25 @@ with emacs. It displays the output of the @code{repo status} command in a
buffer and launches Magit from the status buffer for the project at point.") buffer and launches Magit from the status buffer for the project at point.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-repology
(package
(name "emacs-repology")
(version "1.0.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/"
"repology-" version ".tar"))
(sha256
(base32 "0y12496wafx95izah8vvv1x86k1m8kysm5mlhvshkp0zbpvmb5iq"))))
(build-system emacs-build-system)
(home-page "https://elpa.gnu.org/packages/repology.html")
(synopsis "Repology API access via Elisp")
(description
"This package provides tools to query Repology API (see
@url{https://repology.org/api}), process results, and display them.")
(license license:gpl3+)))
(define-public emacs-alect-themes (define-public emacs-alect-themes
(package (package
(name "emacs-alect-themes") (name "emacs-alect-themes")
@ -22583,6 +22809,21 @@ through Dash docsets.")
(sha256 (sha256
(base32 "19gc05k2p1l8wlkrqij9cw6d61hzknd6a9n64kzlpi87cpbav3lv")))) (base32 "19gc05k2p1l8wlkrqij9cw6d61hzknd6a9n64kzlpi87cpbav3lv"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments
'(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-paths
(lambda* (#:key inputs #:allow-other-keys)
(let ((calibre (assoc-ref inputs "calibre")))
(make-file-writable "calibredb-core.el")
(emacs-substitute-variables "calibredb-core.el"
("calibredb-program"
(string-append calibre "/bin/calibredb"))
("calibredb-fetch-metadata-program"
(string-append calibre "/bin/fetch-ebook-metadata"))))
#t)))))
(inputs
`(("calibre" ,calibre)))
(propagated-inputs (propagated-inputs
`(("emacs-dash" ,emacs-dash) `(("emacs-dash" ,emacs-dash)
("emacs-s" ,emacs-s) ("emacs-s" ,emacs-s)
@ -24902,7 +25143,7 @@ pattern guessed from thing under current cursor position.
(define-public emacs-helm-selector (define-public emacs-helm-selector
(package (package
(name "emacs-helm-selector") (name "emacs-helm-selector")
(version "0.5") (version "0.6.1")
(home-page "https://github.com/emacs-helm/helm-selector") (home-page "https://github.com/emacs-helm/helm-selector")
(source (source
(origin (origin
@ -24913,7 +25154,7 @@ pattern guessed from thing under current cursor position.
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1cv659sqmrvk316fp7mjc58vvbcg1j6s2q4rwgqrpbyszrxl3i63")))) "01lh1df0bnas1p7xlqc4i1jd67f8lxgq0q2zsvx10z8828i76j3v"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (propagated-inputs
`(("emacs-helm" ,emacs-helm))) `(("emacs-helm" ,emacs-helm)))
@ -25761,7 +26002,7 @@ comments or emails.")
(define-public emacs-trashed (define-public emacs-trashed
(package (package
(name "emacs-trashed") (name "emacs-trashed")
(version "1.9.0") (version "2.1.2")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -25770,7 +26011,7 @@ comments or emails.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "13grdi12iwlw4fiphdfmvclfpbr6ajlgfbfyi7v41z8k3rxz4ypz")))) (base32 "0lfza55nbb62nmr27cwpcz2ad1vm95piq4nfd8zvkwqbn6klwmm6"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://github.com/shingo256/trashed/") (home-page "https://github.com/shingo256/trashed/")
(synopsis "View and edit system trash can in Emacs") (synopsis "View and edit system trash can in Emacs")

16
gnu/packages/engineering.scm
View file

@ -15,11 +15,11 @@
;;; Copyright © 2019 Steve Sprang <scs@stevesprang.com> ;;; Copyright © 2019 Steve Sprang <scs@stevesprang.com>
;;; Copyright © 2019 John Soo <jsoo1@asu.edu> ;;; Copyright © 2019 John Soo <jsoo1@asu.edu>
;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re> ;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> ;;; Copyright © 2020,2021 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020 Ekaitz Zarraga <ekaitz@elenq.tech> ;;; Copyright © 2020 Ekaitz Zarraga <ekaitz@elenq.tech>
;;; Copyright © 2020 B. Wilson <elaexuotee@wilsonb.com> ;;; Copyright © 2020 B. Wilson <elaexuotee@wilsonb.com>
;;; Copyright © 2020 Vinicius Monego <monego@posteo.net> ;;; Copyright © 2020, 2021 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com> ;;; Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -1214,14 +1214,14 @@ use on a given system.")
(define-public libredwg (define-public libredwg
(package (package
(name "libredwg") (name "libredwg")
(version "0.11.1") (version "0.12")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/libredwg/libredwg-" (uri (string-append "mirror://gnu/libredwg/libredwg-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 "1xx6y6ckm4mzqln8y8lqf5frcn2b32ypc0d0h9dzpz6363zh7pdn")))) (base32 "0z5algzi3alq166885y0qyj2gnc7gc6vhnz7nw0kwc0d236p6md8"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags '("--disable-bindings"))) `(#:configure-flags '("--disable-bindings")))
@ -1524,7 +1524,7 @@ bindings for Python, Java, OCaml and more.")
(define-public radare2 (define-public radare2
(package (package
(name "radare2") (name "radare2")
(version "4.4.0") (version "5.0.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -1532,7 +1532,7 @@ bindings for Python, Java, OCaml and more.")
(commit version))) (commit version)))
(sha256 (sha256
(base32 (base32
"0gwdnrnk7wdgkajp2qwg4fyplh7nsbmf01bzx07px6xmiscd9z2s")) "0aa7c27kd0l55fy5qfvxqmakp4pz6240v3hn84095qmqkzcbs420"))
(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
@ -2367,7 +2367,7 @@ simulation.")
(define-public cutter (define-public cutter
(package (package
(name "cutter") (name "cutter")
(version "1.10.3") (version "1.12.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -2376,7 +2376,7 @@ simulation.")
(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 "0qj8jyij02nif4jpirl09ygwnv8a9zi3vkb5sf5s8mg7qwlpnvyk")))) (base32 "0ljj3j3apbbw628n2nyrxpbnclixx20bqjxm0xwggqzz9vywsar0"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases

13
gnu/packages/enlightenment.scm
View file

@ -198,7 +198,7 @@ removable devices or support for multimedia.")
(define-public terminology (define-public terminology
(package (package
(name "terminology") (name "terminology")
(version "1.8.1") (version "1.9.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (uri
@ -206,7 +206,7 @@ removable devices or support for multimedia.")
"terminology/terminology-" version ".tar.xz")) "terminology/terminology-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1fxqjf7g30ix4qxi6366rrax27s3maxq43z2vakwnhz4mp49m9h4")) "0v74858yvrrfy0l2pq7yn6izvqhpkb9gw2jpd3a3khjwv8kw6frz"))
(modules '((guix build utils))) (modules '((guix build utils)))
;; Remove the bundled fonts. ;; Remove the bundled fonts.
(snippet (snippet
@ -217,10 +217,11 @@ removable devices or support for multimedia.")
#t)))) #t))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:configure-flags (list "-Dtests=true" `(#:configure-flags
(string-append "-Dedje-cc=" (let ((efl (assoc-ref %build-inputs "efl")))
(assoc-ref %build-inputs "efl") (list "-Dtests=true"
"/bin/edje_cc")) (string-append "-Dedje-cc=" efl "/bin/edje_cc")
(string-append "-Deet=" efl "/bin/eet")))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'set-home-directory (add-after 'unpack 'set-home-directory

15
gnu/packages/erlang.scm
View file

@ -4,6 +4,7 @@
;;; Copyright © 2016, 2017 Pjotr Prins <pjotr.guix@thebird.nl> ;;; Copyright © 2016, 2017 Pjotr Prins <pjotr.guix@thebird.nl>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Nikita <nikita@n0.is> ;;; Copyright © 2018 Nikita <nikita@n0.is>
;;; Copyright © 2021 Oskar Köök <oskar@maatriks.ee>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -40,7 +41,7 @@
(define-public erlang (define-public erlang
(package (package
(name "erlang") (name "erlang")
(version "21.3.8.13") (version "23.2.1")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
;; The tarball from http://erlang.org/download contains many ;; The tarball from http://erlang.org/download contains many
@ -52,7 +53,7 @@
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1dj37vk712dx76y25g13na24wbpn7a5ddmlpf4n51gm10sib54wj")) "1p3lw4bcm2dph3pf1h4i0d9pzrcfr83r0iadqanxkwbmm1bl11pm"))
(patches (search-patches "erlang-man-path.patch")))) (patches (search-patches "erlang-man-path.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
@ -68,7 +69,7 @@
(version-major+minor version) ".tar.gz")) (version-major+minor version) ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0wm1dg1psv1n3gpiwyms06yhsryrnr28p455fp0l1ak8hdf4nipm")))))) "0rq0rw68f02vckgdiwmvx8bvyv00l81s27cq59i3h79j9prfal2n"))))))
(inputs (inputs
`(("ncurses" ,ncurses) `(("ncurses" ,ncurses)
("openssl" ,openssl) ("openssl" ,openssl)
@ -180,6 +181,14 @@
(lambda _ (lambda _
(invoke "./otp_build" "autoconf") (invoke "./otp_build" "autoconf")
#t)) #t))
(add-after 'autoconf 'patch-configure-script-shell
(lambda _
(substitute* "configure"
(("cmd_str=\"./configure")
(string-append "cmd_str=\""
(which "sh")
" ./configure")))
#t))
(add-after 'install 'patch-erl (add-after 'install 'patch-erl
;; This only works after install. ;; This only works after install.
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)

37
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 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018 Leo Famulari <leo@famulari.name> ;;; Copyright © 2018 Leo Famulari <leo@famulari.name>
;;; Copyright © 2019, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2019, 2020, 2021 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 raid5atemyhoemwork <raid5atemyhomework@protonmail.com> ;;; Copyright © 2021 raid5atemyhoemwork <raid5atemyhomework@protonmail.com>
@ -847,7 +847,7 @@ APFS.")
(define-public zfs (define-public zfs
(package (package
(name "zfs") (name "zfs")
(version "0.8.5") (version "2.0.1")
(outputs '("out" "module" "src")) (outputs '("out" "module" "src"))
(source (source
(origin (origin
@ -856,7 +856,7 @@ APFS.")
"/download/zfs-" version "/download/zfs-" version
"/zfs-" version ".tar.gz")) "/zfs-" version ".tar.gz"))
(sha256 (sha256
(base32 "0gfdnynmsxbhi97q73smrgmcw1k8zmlr1hgljfn38sk0kimivd6v")))) (base32 "0y3992l4nzr67q18lz1kizw0za1shvqbpmsjz9shv4frh5ihllbi"))))
(build-system linux-module-build-system) (build-system linux-module-build-system)
(arguments (arguments
`(;; The ZFS kernel module should not be downloaded since the license `(;; The ZFS kernel module should not be downloaded since the license
@ -885,19 +885,33 @@ APFS.")
(let ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out"))
(src (assoc-ref outputs "src")) (src (assoc-ref outputs "src"))
(util-linux (assoc-ref inputs "util-linux")) (util-linux (assoc-ref inputs "util-linux"))
(nfs-utils (assoc-ref inputs "nfs-utils"))) (nfs-utils (assoc-ref inputs "nfs-utils"))
(kmod (assoc-ref inputs "kmod-runtime")))
(substitute* "etc/Makefile.in"
;; This just contains an example configuration file for
;; configuring ZFS on traditional init systems, skip it
;; since we cannot use it anyway; the install target becomes
;; misdirected.
(("= default ") "= "))
(substitute* "lib/libzfs/os/linux/libzfs_util_os.c"
;; Use path to /gnu/store/*-kmod in actual path that is exec'ed.
(("\"/sbin/modprobe\"")
(string-append "\"" kmod "/bin/modprobe" "\""))
;; Just use 'modprobe' in message to user, since Guix
;; does not have a traditional /sbin/
(("'/sbin/modprobe ") "'modprobe "))
(substitute* "contrib/Makefile.in" (substitute* "contrib/Makefile.in"
;; This is not configurable nor is its hard-coded /usr prefix. ;; This is not configurable nor is its hard-coded /usr prefix.
((" initramfs") "")) ((" initramfs") ""))
(substitute* "module/zfs/zfs_ctldir.c" (substitute* "module/os/linux/zfs/zfs_ctldir.c"
(("/usr/bin/env\", \"umount") (("/usr/bin/env\", \"umount")
(string-append util-linux "/bin/umount\", \"-n")) (string-append util-linux "/bin/umount\", \"-n"))
(("/usr/bin/env\", \"mount") (("/usr/bin/env\", \"mount")
(string-append util-linux "/bin/mount\", \"-n"))) (string-append util-linux "/bin/mount\", \"-n")))
(substitute* "lib/libzfs/libzfs_mount.c" (substitute* "lib/libzfs/os/linux/libzfs_mount_os.c"
(("/bin/mount") (string-append util-linux "/bin/mount")) (("/bin/mount") (string-append util-linux "/bin/mount"))
(("/bin/umount") (string-append util-linux "/bin/umount"))) (("/bin/umount") (string-append util-linux "/bin/umount")))
(substitute* "lib/libshare/nfs.c" (substitute* "lib/libshare/os/linux/nfs.c"
(("/usr/sbin/exportfs") (("/usr/sbin/exportfs")
(string-append nfs-utils "/sbin/exportfs"))) (string-append nfs-utils "/sbin/exportfs")))
(substitute* "config/zfs-build.m4" (substitute* "config/zfs-build.m4"
@ -915,7 +929,9 @@ APFS.")
(substitute* "contrib/pyzfs/Makefile.in" (substitute* "contrib/pyzfs/Makefile.in"
((".*install-lib.*") "")) ((".*install-lib.*") ""))
(substitute* '("Makefile.am" "Makefile.in") (substitute* '("Makefile.am" "Makefile.in")
(("\\$\\(prefix)/src") (string-append src "/src")))) (("\\$\\(prefix)/src") (string-append src "/src")))
(substitute* (find-files "udev/rules.d/" ".rules.in$")
(("/sbin/modprobe") (string-append kmod "/bin/modprobe"))))
#t)) #t))
(replace 'build (replace 'build
(lambda _ (invoke "make"))) (lambda _ (invoke "make")))
@ -939,6 +955,7 @@ APFS.")
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(inputs (inputs
`(("eudev" ,eudev) `(("eudev" ,eudev)
("kmod-runtime" ,kmod)
("libaio" ,libaio) ("libaio" ,libaio)
("libtirpc" ,libtirpc) ("libtirpc" ,libtirpc)
("nfs-utils" ,nfs-utils) ("nfs-utils" ,nfs-utils)
@ -1086,14 +1103,14 @@ Dropbox API v2.")
(define-public dbxfs (define-public dbxfs
(package (package
(name "dbxfs") (name "dbxfs")
(version "1.0.48") (version "1.0.50")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "dbxfs" version)) (uri (pypi-uri "dbxfs" version))
(sha256 (sha256
(base32 (base32
"07q7dgqaqqyapjl9r4lqydflrgx4dh84c1qsb0jvfmqj3i8887ak")) "01zvk862ybz12270q0r2l1i7kdj30ib2gxrlxmwvi19b2fkf39na"))
(patches (search-patches "dbxfs-remove-sentry-sdk.patch")))) (patches (search-patches "dbxfs-remove-sentry-sdk.patch"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments

50
gnu/packages/finance.scm
View file

@ -1380,56 +1380,6 @@ following three utilities are included with the library:
@end enumerate") @end enumerate")
(license license:gpl2+))) (license license:gpl2+)))
(define-public opensp
(package
(name "opensp")
(version "1.5.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/openjade/opensp/"
version "/OpenSP-" version ".tar.gz"))
(sha256
(base32
"1khpasr6l0a8nfz6kcf3s81vgdab8fm2dj291n5r2s53k228kx2p"))))
(build-system gnu-build-system)
(native-inputs
`(("gettext" ,gettext-minimal)))
(inputs
`(("docbook-xml" ,docbook-xml-4.1.2)
("docbook-xsl" ,docbook-xsl)
("xmlto" ,xmlto)))
(arguments
`(;; TODO: Fix and enable tests.
#:tests? #f
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-docbook-paths
(lambda* (#:key inputs #:allow-other-keys)
(let ((xmldoc (string-append (assoc-ref inputs "docbook-xml")
"/xml/dtd/docbook"))
(xsldoc (string-append (assoc-ref inputs "docbook-xsl")
"/xml/xsl/docbook-xsl-"
,(package-version docbook-xsl))))
(substitute* (find-files "docsrc" "\\.xml$")
(("/usr/share/sgml/docbook/xml-dtd-4.1.2") xmldoc)
(("http://.*/docbookx\\.dtd")
(string-append xmldoc "/docbookx.dtd")))
;; Directly pass the path to the stylesheet to xmlto.
(substitute* "docsrc/Makefile.in"
(("\\$\\(XMLTO\\)")
(string-append "$(XMLTO) -x " xsldoc
"/manpages/docbook.xsl")))
#t))))))
(home-page "http://openjade.sourceforge.net/")
(synopsis "Suite of SGML/XML processing tools")
(description "OpenSP is an object-oriented toolkit for SGML parsing and
entity management.")
(license
;; expat license with added clause regarding advertising
(license:non-copyleft
"file://COPYING"
"See COPYING in the distribution."))))
(define-public bitcoin-unlimited (define-public bitcoin-unlimited
(package (package
(name "bitcoin-unlimited") (name "bitcoin-unlimited")

215
gnu/packages/games.scm
View file

@ -2,7 +2,7 @@
;;; Copyright © 2013 John Darrington <jmd@gnu.org> ;;; Copyright © 2013 John Darrington <jmd@gnu.org>
;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2014, 2016 David Thompson <dthompson2@worcester.edu> ;;; Copyright © 2014, 2016 David Thompson <dthompson2@worcester.edu>
;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Eric Bavier <bavier@posteo.net> ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Eric Bavier <bavier@posteo.net>
;;; Copyright © 2014 Cyrill Schenkel <cyrill.schenkel@gmail.com> ;;; Copyright © 2014 Cyrill Schenkel <cyrill.schenkel@gmail.com>
;;; Copyright © 2014 Sylvain Beucler <beuc@beuc.net> ;;; Copyright © 2014 Sylvain Beucler <beuc@beuc.net>
;;; Copyright © 2014, 2015, 2018, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2015, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
@ -30,7 +30,7 @@
;;; Copyright © 2017, 2019, 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017, 2019, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2017 Roel Janssen <roel@gnu.org> ;;; Copyright © 2017 Roel Janssen <roel@gnu.org>
;;; Copyright © 2017, 2018, 2019, 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2017, 2018, 2019, 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2018 okapi <okapi@firemail.cc> ;;; Copyright © 2018 okapi <okapi@firemail.cc>
;;; Copyright © 2018 Tim Gesthuizen <tim.gesthuizen@yahoo.de> ;;; Copyright © 2018 Tim Gesthuizen <tim.gesthuizen@yahoo.de>
;;; Copyright © 2018 Madalin Ionel-Patrascu <madalinionel.patrascu@mdc-berlin.de> ;;; Copyright © 2018 Madalin Ionel-Patrascu <madalinionel.patrascu@mdc-berlin.de>
@ -1360,7 +1360,7 @@ does not include game data.")
(package (package
(inherit julius) (inherit julius)
(name "augustus") (name "augustus")
(version "1.4.1a") (version "2.0.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -1369,7 +1369,7 @@ does not include game data.")
(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 "1xqv8j8jh3f13fjhyf7hk1anrn799cwwsvsd75kpl9n5yh5s1j5y")) (base32 "0czazw8mc3fbvdazs2nzvgxd1dpzjc8z5fwiv89vv4nd7laz3jkj"))
;; Remove unused bundled libraries. ;; Remove unused bundled libraries.
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
@ -2237,6 +2237,100 @@ and defeat them with your bubbles!")
;; GPL2+ is for code, CC0 is for art. ;; GPL2+ is for code, CC0 is for art.
(license (list license:gpl2+ license:cc0)))) (license (list license:gpl2+ license:cc0))))
(define-public solarus
(package
(name "solarus")
;; XXX: When updating this package, please also update hash in
;; `solarus-quest-editor' below.
(version "1.6.4")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.com/solarus-games/solarus")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1n6l91yyqjx0pz4w1lp3yybpq0fs2yjswfcm8c1wjfkxwiznbdxi"))))
(build-system cmake-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'disable-failing-tests
;; The following tests fail reporting a missing "/dev/dri"
;; file.
(lambda _
(substitute* "tests/cmake/AddTestMaps.cmake"
((".*1200_create_shader_from_source.*" all)
(string-append "#" all))
((".*1210_shader_scaling_factor.*" all)
(string-append "#" all)))
#t))
(add-before 'check 'set-home
;; Tests fail without setting the following environment
;; variables.
(lambda _
(setenv "HOME" (getcwd))
(setenv "XDG_RUNTIME_DIR" (getcwd))
#t)))))
(native-inputs
`(("pkg-config" ,pkg-config)
("qttools" ,qttools)))
(inputs
`(("glm" ,glm)
("libmodplug" ,libmodplug)
("libogg" ,libogg)
("libvorbis" ,libvorbis)
("luajit" ,luajit)
("openal" ,openal)
("physfs" ,physfs)
("qtbase" ,qtbase)
("sdl2" ,(sdl-union (list sdl2 sdl2-image sdl2-ttf)))))
(home-page "https://www.solarus-games.org/")
(synopsis "Lightweight game engine for Action-RPGs")
(description
"Solarus is a 2D game engine written in C++, that can run games
scripted in Lua. It has been designed with 16-bit classic Action-RPGs
in mind.")
;; The source code is licensed under the terms of GPL-3.0.
;; Resources are licensed under the terms of CC-BY-SA-3.0 and
;; CC-BY-SA 4.0.
(license (list license:gpl3 license:cc-by-sa3.0 license:cc-by-sa4.0))))
(define-public solarus-quest-editor
(package
(inherit solarus)
(name "solarus-quest-editor")
(version (package-version solarus))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.com/solarus-games/solarus-quest-editor")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1qbc2j9kalk7xqk9j27s7wnm5zawiyjs47xqkqphw683idmzmjzn"))))
(arguments
`(#:tests? #false ;no test
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-qt-build
;; XXX: Fix build with Qt 5.15. It has been applied upstream as
;; 81d5c7f1 and can be removed at next upgrade.
(lambda _
(substitute* "src/entities/jumper.cpp"
(("#include <QPainter>" all)
(string-append all "\n" "#include <QPainterPath>\n")))
#t)))))
(inputs
`(("solarus" ,solarus)
,@(package-inputs solarus)))
(synopsis "Create and modify quests for the Solarus engine")
(description
"Solarus Quest Editor is a graphical user interface to create and
modify quests for the Solarus engine.")))
(define-public superstarfighter (define-public superstarfighter
(package (package
(name "superstarfighter") (name "superstarfighter")
@ -2365,6 +2459,93 @@ available, as well as a single-player mode with AI-controlled ships.")
"$(call ZIP) -X")) "$(call ZIP) -X"))
#t)))) #t))))
(define-public trigger-rally
(package
(name "trigger-rally")
(version "0.6.6.1")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/trigger-rally/"
"trigger-" version "/"
"trigger-rally-" version ".tar.gz"))
(sha256
(base32
"016bc2hczqscfmngacim870hjcsmwl8r3aq8x03vpf22s49nw23z"))))
(build-system gnu-build-system)
(inputs
`(("freealut" ,freealut)
("glew" ,glew)
("glu" ,glu)
("mesa" ,mesa)
("openal" ,openal)
("physfs" ,physfs)
("sdl" ,(sdl-union (list sdl2 sdl2-image)))
("tinyxml2" ,tinyxml2)))
(arguments
`(#:make-flags (list (string-append "prefix=" %output)
"bindir=$(prefix)/bin"
"datadir=$(datarootdir)"
"OPTIMS=-Ofast")
#:tests? #f ; No tests present
#:phases
(modify-phases %standard-phases
(delete 'configure)
(add-before 'build 'cd-src
(lambda _ (chdir "src")))
(add-before 'build 'remove-timestamps
(lambda _
(substitute* (list "Trigger/menu.cpp"
"PEngine/app.cpp")
((".*__DATE__.*") ""))))
(add-before 'build 'make-verbose
(lambda _
(substitute* "GNUmakefile"
(("@\\$\\(CXX\\)") "$(CXX)"))))
(add-after 'build 'set-data-path
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(substitute* "../bin/trigger-rally.config.defs"
(("<data path=\"C:[^\"]*\"")
(string-append "<data path=\"" out "/share/trigger-rally\""))))))
(add-after 'install 'create-desktop-entry
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(apps (string-append out "/share/applications")))
(mkdir-p apps)
(with-output-to-file
(string-append apps "/trigger-rally.desktop")
(lambda ()
(format #t ; Borrowed from Debian package
"[Desktop Entry]~@
Name=Trigger Rally~@
Icon=trigger-rally~@
Comment=3D rally racing car game~@
Comment[de]=3D Rally-Autorennen~@
Comment[fr_FR]=un jeu de rally en 3D~@
Comment[ro_RO]=Un joc în 3D cu curse de raliu~@
Exec=~a/bin/trigger-rally~@
Terminal=false~@
StartupNotify=false~@
Type=Application~@
TryExec=~:*~a/bin/trigger-rally~@
Categories=Game;ArcadeGame;~@
Keywords=racing;tracks;~@
Keywords[de]=Rennstrecke;~%"
out)))))))))
(home-page "http://trigger-rally.sourceforge.net")
(synopsis "Fast-paced single-player racing game")
(description "Trigger-rally is a 3D rally simulation with great physics
for drifting on over 200 maps. Different terrain materials like dirt,
asphalt, sand, ice, etc. and various weather, light, and fog conditions give
this rally simulation the edge over many other games. You need to make it
through the maps in often tight time limits and can further improve by beating
the recorded high scores. All attached single races must be finished in time
in order to win an event, unlocking additional events and cars. Most maps are
equipped with spoken co-driver notes and co-driver icons.")
(license (list license:cc0 ;textures and audio in data.zip
license:gpl2+))))
(define-public ufo2map (define-public ufo2map
(package (package
(name "ufo2map") (name "ufo2map")
@ -6196,31 +6377,15 @@ fish. The whole game is accompanied by quiet, comforting music.")
(define-public crawl (define-public crawl
(package (package
(name "crawl") (name "crawl")
(version "0.25.0") (version "0.26.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (list (uri (string-append "https://github.com/crawl/crawl/releases/download/"
;; Older releases get moved into a versioned directory version "/stone_soup-" version "-nodeps.tar.xz"))
(string-append "http://crawl.develz.org/release/"
(version-major+minor version) "/stone_soup-"
version "-nodeps.tar.xz")
;; Only the latest release is in this directory
(string-append "http://crawl.develz.org/release/stone_soup-"
version "-nodeps.tar.xz")))
(sha256 (sha256
(base32 "0rn1wjxdqw33caiwisfypm1j8cid3c9pz01ahicl17144zs29z3d")) (base32 "1m81x1sp6p2ka5w2nib3pcw5w5iv58z41c8aqn0dayi1lb3yslfb"))
(patches (search-patches "crawl-upgrade-saves.patch")) (patches (search-patches "crawl-upgrade-saves.patch"))))
;; The 0.25.0 -nodeps.tar.xz was built from an OSX machine; normally
;; apparently it's built from a Debian machine before the Debian
;; packages are made. These ._* files are binary and have the string
;; "Mac OS X" in them... removing these seems to result in compilation
;; again.
(modules '((guix build utils)))
(snippet
'(begin
(for-each delete-file (find-files "." "^\\._"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("lua51" ,lua-5.1) `(("lua51" ,lua-5.1)

3
gnu/packages/genimage.scm
View file

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Danny Milosavljevic <dannym@scratchpost.org> ;;; Copyright © 2018 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2021 Vincent Legoll <vincent.legoll@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -47,7 +48,7 @@
(uri (git-reference (uri (git-reference
(url "https://github.com/pengutronix/genimage") (url "https://github.com/pengutronix/genimage")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (string-append name "-" version "-checkout")) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"15jmh17lvm3jw9c92bjarly7iwhmnfl322d91mprfv10ppb9ip54")) "15jmh17lvm3jw9c92bjarly7iwhmnfl322d91mprfv10ppb9ip54"))

5
gnu/packages/gl.scm
View file

@ -770,7 +770,7 @@ OpenGL.")
(define-public glfw (define-public glfw
(package (package
(name "glfw") (name "glfw")
(version "3.2.1") (version "3.3.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/glfw/glfw" (uri (string-append "https://github.com/glfw/glfw"
@ -778,7 +778,7 @@ OpenGL.")
"/glfw-" version ".zip")) "/glfw-" version ".zip"))
(sha256 (sha256
(base32 (base32
"09kk5yc1zhss9add8ryqrngrr16hdmc94rszgng135bhw09mxmdp")))) "1izgc4r0ypxwwklfzj98ab4xqsjpb1wbsfdbivvxpmr95x8km8q8"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:tests? #f ; no test target '(#:tests? #f ; no test target
@ -792,6 +792,7 @@ OpenGL.")
;; These are in 'Requires.private' of 'glfw3.pc'. ;; These are in 'Requires.private' of 'glfw3.pc'.
("libx11" ,libx11) ("libx11" ,libx11)
("libxrandr" ,libxrandr) ("libxrandr" ,libxrandr)
("libxi" ,libxi)
("libxinerama" ,libxinerama) ("libxinerama" ,libxinerama)
("libxcursor" ,libxcursor) ("libxcursor" ,libxcursor)
("libxxf86vm" ,libxxf86vm))) ("libxxf86vm" ,libxxf86vm)))

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

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019, 2020, 2021 Leo Prikler <leo.prikler@student.tugraz.at> ;;; Copyright © 2019, 2020, 2021 Leo Prikler <leo.prikler@student.tugraz.at>
;;; Copyright © 2019 Alexandros Theodotou <alex@zrythm.org> ;;; Copyright © 2019, 2021 Alexandros Theodotou <alex@zrythm.org>
;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org> ;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2020 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2020 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2020 Jack Hill <jackhill@jackhill.us> ;;; Copyright © 2020 Jack Hill <jackhill@jackhill.us>
@ -779,6 +779,55 @@ dark elements. It supports GNOME, Unity, Xfce, and Openbox.")
(define-public numix-theme (define-public numix-theme
(deprecated-package "numix-theme" numix-gtk-theme)) (deprecated-package "numix-theme" numix-gtk-theme))
(define-public markets
(package
(name "markets")
(version "0.4.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/bitstower/markets")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"1jzv74l2jkdiqy1hp0ww5yla50dmrvjw7fgkmb26ynblr1nb3rrb"))))
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'skip-gtk-update-icon-cache
;; Don't create 'icon-theme.cache'.
(lambda _
(substitute* "build-aux/meson/postinstall.py"
(("gtk-update-icon-cache") "true"))
#t))
(add-after 'unpack 'skip-update-desktop-database
;; Don't update desktop file database.
(lambda _
(substitute* "build-aux/meson/postinstall.py"
(("update-desktop-database") "true"))
#t)))))
(inputs
`(("gtk3" ,gtk+)
("gettext" ,gettext-minimal)
("libgee" ,libgee)
("libhandy0" ,libhandy-0.0)
("libsoup" ,libsoup)
("json-glib" ,json-glib)
("vala" ,vala)))
(native-inputs
`(("pkg-config" ,pkg-config)
("glib" ,glib "bin"))) ; for 'glib-compile-resources'
(home-page "https://github.com/bitstower/markets")
(synopsis "Stock, currency and cryptocurrency tracker")
(description
"Markets is a GTK application that displays financial data, helping users
track stocks, currencies and cryptocurrencies.")
(license license:gpl3)))
(define-public vala-language-server (define-public vala-language-server
(package (package
(name "vala-language-server") (name "vala-language-server")

34
gnu/packages/gnome.scm
View file

@ -51,7 +51,7 @@
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2020 Naga Malleswari <nagamalli@riseup.net> ;;; Copyright © 2020 Naga Malleswari <nagamalli@riseup.net>
;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com> ;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
;;; Copyright © 2020 Vinicius Monego <monego@posteo.net> ;;; Copyright © 2020, 2021 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re> ;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
@ -2252,6 +2252,16 @@ and keep up to date translations of documentation.")
(lambda _ (lambda _
(substitute* "meson-postinstall.sh" (substitute* "meson-postinstall.sh"
(("update-desktop-database") (which "true"))) (("update-desktop-database") (which "true")))
#t))
(add-after 'install 'patch-thumbnailer
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(substitute*
(string-append
out
"/share/thumbnailers/gnome-font-viewer.thumbnailer")
(("gnome-thumbnail-font")
(string-append out "/bin/gnome-thumbnail-font"))))
#t))))) #t)))))
(native-inputs (native-inputs
`(("gettext" ,gettext-minimal) `(("gettext" ,gettext-minimal)
@ -2841,7 +2851,7 @@ database is translated at Transifex.")
(define-public system-config-printer (define-public system-config-printer
(package (package
(name "system-config-printer") (name "system-config-printer")
(version "1.5.14") (version "1.5.15")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -2850,7 +2860,7 @@ database is translated at Transifex.")
"download/v" version "download/v" version
"/system-config-printer-" version ".tar.xz")) "/system-config-printer-" version ".tar.xz"))
(sha256 (sha256
(base32 "1l79lj44kl079sk308m42x3py1yvcxk5x5bs2vqfmqv26zm8qyqf")))) (base32 "12d6xx51vizc476zfnsga9q09nflp51ipn6y7lhi9w2v4772dlpv"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(arguments (arguments
`(#:imported-modules ((guix build python-build-system) `(#:imported-modules ((guix build python-build-system)
@ -6514,14 +6524,14 @@ almost all of them.")
(define-public eolie (define-public eolie
(package (package
(name "eolie") (name "eolie")
(version "0.9.100") (version "0.9.101")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://adishatz.org/eolie/eolie-" (uri (string-append "https://adishatz.org/eolie/eolie-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1vzhfp8j1z3jvd5ndqfyn7nqrx3zdvx9mv1byjl36nnd9g63ji62")))) "1v8n21y75abdzsnx5idyd0q6yfb6cd0sqbknlbkwh5fdgvjzyvwn"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:glib-or-gtk? #t `(#:glib-or-gtk? #t
@ -10799,13 +10809,13 @@ advanced image management tool")
(synopsis "Store and run multiple GNOME terminals in one window") (synopsis "Store and run multiple GNOME terminals in one window")
(description (description
"Terminator allows you to run multiple GNOME terminals in a grid and "Terminator allows you to run multiple GNOME terminals in a grid and
+tabs, and it supports drag and drop re-ordering of terminals.") tabs, and it supports drag and drop re-ordering of terminals.")
(license license:gpl2))) (license license:gpl2)))
(define-public libhandy (define-public libhandy
(package (package
(name "libhandy") (name "libhandy")
(version "1.0.2") (version "1.0.3")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -10814,7 +10824,7 @@ advanced image management tool")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1bmmkahshvlvpsnb7zp8bddv7i1h5k4p967n6kxh71g1vnj8x20m")))) (base32 "0flgwlm921801i3ns0dwqpnxl89f3rzn4y9h723i13bmflch3in7"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -11398,7 +11408,7 @@ and toolbars.")
(define-public setzer (define-public setzer
(package (package
(name "setzer") (name "setzer")
(version "0.3.8") (version "0.3.9")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -11407,7 +11417,7 @@ and toolbars.")
(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 "1f5qmkz4hzn54sh56z3hw8zrvg93xlz62ggzlzyg7vgsr83kpns9")))) (base32 "1qmy2bxl8x6pijjaaj91v6rqdipha6iyy0b6b9y1lk3r2p3azd42"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:glib-or-gtk? #t `(#:glib-or-gtk? #t
@ -11832,7 +11842,7 @@ integrated profiler via Sysprof, debugging support, and more.")
(define-public komikku (define-public komikku
(package (package
(name "komikku") (name "komikku")
(version "0.24.0") (version "0.25.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -11842,7 +11852,7 @@ integrated profiler via Sysprof, debugging support, and more.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"010p32zrim245y0l784yp0rasqcqlyr3lrxwl3r1876x83qhs6q3")))) "03skci66y9qqiv4bqbbc0w6d6agilwmx95cw7sribj06zcykm7m3"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:glib-or-gtk? #t `(#:glib-or-gtk? #t

79
gnu/packages/gnupg.scm
View file

@ -13,10 +13,11 @@
;;; Copyright © 2016 Troy Sankey <sankeytms@gmail.com> ;;; Copyright © 2016 Troy Sankey <sankeytms@gmail.com>
;;; Copyright © 2017, 2020 Leo Famulari <leo@famulari.name> ;;; Copyright © 2017, 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Petter <petter@mykolab.ch> ;;; Copyright © 2017 Petter <petter@mykolab.ch>
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2018, 2019 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2018 Björn Höfling <bjoern.hoefling@bjoernhoefling.de> ;;; Copyright © 2018 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2020 Fredrik Salomonsson <plattfot@posteo.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -67,6 +68,7 @@
#:use-module (gnu packages tor) #:use-module (gnu packages tor)
#:use-module (gnu packages web) #:use-module (gnu packages web)
#:use-module (gnu packages xorg) #:use-module (gnu packages xorg)
#:use-module (gnu packages xdisorg)
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
@ -355,13 +357,13 @@ libskba (working with X.509 certificates and CMS data).")
(define-public gpgme (define-public gpgme
(package (package
(name "gpgme") (name "gpgme")
(version "1.15.0") (version "1.15.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnupg/gpgme/gpgme-" version ".tar.bz2")) (uri (string-append "mirror://gnupg/gpgme/gpgme-" version ".tar.bz2"))
(sha256 (sha256
(base32 "0nqfipv5s4npfidsm1rs3kpq0r0av9bfqfd5r035jibx5k0jniqb")))) (base32 "1bg13l5s8x9p1v0jyv29n84bay27pflindpzjsc9gj7i4wdkrg7f"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("gnupg" ,gnupg))) `(("gnupg" ,gnupg)))
@ -892,6 +894,77 @@ passphrase when @code{gpg} is run and needs it.")))
@dfn{Enlightenment Foundation Libraries} (EFL) that allows users to enter a @dfn{Enlightenment Foundation Libraries} (EFL) that allows users to enter a
passphrase when @code{gpg} is run and needs it."))) passphrase when @code{gpg} is run and needs it.")))
(define-public pinentry-rofi
(package
(name "pinentry-rofi")
(version "2.0.1")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/plattfot/pinentry-rofi/")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "044bnldz7k74s873jwsjgff176l1jsvpbaka7d1wcj8b5pwqv2av"))))
(build-system gnu-build-system)
(arguments
`(#:modules
((ice-9 match)
(ice-9 ftw)
,@%gnu-build-system-modules)
#:phases
(modify-phases
%standard-phases
(add-after 'install 'hall-wrap-binaries
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((compiled-dir
(lambda (out version)
(string-append out "/lib/guile/" version "/site-ccache")))
(uncompiled-dir
(lambda (out version)
(string-append
out
"/share/guile/site"
(if (string-null? version) "" "/")
version)))
(dep-path
(lambda (env path)
(list env ":" 'prefix (list path))))
(out (assoc-ref outputs "out"))
(bin (string-append out "/bin/"))
(site (uncompiled-dir out "")))
(match (scandir site)
(("." ".." version)
(for-each
(lambda (file)
(wrap-program
(string-append bin file)
(dep-path
"PATH"
(string-append (assoc-ref inputs "rofi") "/bin"))
(dep-path
"GUILE_LOAD_PATH"
(uncompiled-dir out version))
(dep-path
"GUILE_LOAD_COMPILED_PATH"
(compiled-dir out version))))
,''("pinentry-rofi"))
#t))))))))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("pkg-config" ,pkg-config)
("texinfo" ,texinfo)))
(inputs `(("guile" ,guile-3.0)
("rofi" ,rofi)))
(synopsis "Rofi GUI for GnuPG's passphrase input")
(description "Pinentry-rofi is a simple graphical user interface for
passphrase or PIN when required by @code{gpg} or other software. It is using
the Rofi application launcher as the user interface. Which makes it combined
with @code{rofi-pass} a good front end for @code{password-store}.")
(home-page "https://github.com/plattfot/pinentry-rofi/")
(license license:gpl3+)))
(define-public pinentry (define-public pinentry
(package (inherit pinentry-gtk2) (package (inherit pinentry-gtk2)
(name "pinentry"))) (name "pinentry")))

8
gnu/packages/gnuzilla.scm
View file

@ -1305,11 +1305,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 "20201215000000") ;must be of the form YYYYMMDDhhmmss (define %icedove-build-id "20210111000000") ;must be of the form YYYYMMDDhhmmss
(define-public icedove (define-public icedove
(package (package
(name "icedove") (name "icedove")
(version "78.6.0") (version "78.6.1")
(source icecat-source) (source icecat-source)
(properties (properties
`((cpe-name . "thunderbird_esr"))) `((cpe-name . "thunderbird_esr")))
@ -1589,7 +1589,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 "18be92a3f0388fe1b69941a50cdbadbf2c95b885")) ,(let ((changeset "f99e82f3f3cae6af48006c39fceb3beeabccd6f6"))
(origin (origin
(method hg-fetch) (method hg-fetch)
(uri (hg-reference (uri (hg-reference
@ -1598,7 +1598,7 @@ standards of the IceCat project.")
(file-name (string-append "thunderbird-" version "-checkout")) (file-name (string-append "thunderbird-" version "-checkout"))
(sha256 (sha256
(base32 (base32
"1w21g19l93bcna20260cgxjsh17pznd3kdfvyrn23wjkslgpbyi3"))))) "0mrar1qsvvlcggzz54nxi70jzk19mq42585905kb5n90ikr9q2q7")))))
("autoconf" ,autoconf-2.13) ("autoconf" ,autoconf-2.13)
("cargo" ,rust-1.41 "cargo") ("cargo" ,rust-1.41 "cargo")
("clang" ,clang) ("clang" ,clang)

6
gnu/packages/gps.scm
View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2020 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2020 Guillaume Le Vaillant <glv@posteo.net>
@ -149,7 +149,7 @@ between two other data points.")
(define-public gama (define-public gama
(package (package
(name "gama") (name "gama")
(version "2.12") (version "2.13")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -157,7 +157,7 @@ between two other data points.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0zfilasalsy29b7viw0iwgnl9bkvp0l87gpxl1hx7379l8agwqyj")) "041cprbj4lfs42i7sd1c2zlx3r16g6c5shz3qls79gxb7kqflkgb"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin

39
gnu/packages/graphics.scm
View file

@ -23,6 +23,7 @@
;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org> ;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 Gabriel Arazas <foo.dogsquared@gmail.com> ;;; Copyright © 2020 Gabriel Arazas <foo.dogsquared@gmail.com>
;;; Copyright © 2021 Antoine Côté <antoine.cote@posteo.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -428,17 +429,47 @@ with the @command{autotrace} utility or as a C library, @code{libautotrace}.")
(license (list license:gpl2+ ;for the utility itself (license (list license:gpl2+ ;for the utility itself
license:lgpl2.1+))))) ;for use as a library license:lgpl2.1+))))) ;for use as a library
(define-public embree
(package
(name "embree")
(version "3.12.1")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/embree/embree")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0aznd16n7h8g3f6jcahzfp1dq4r7wayqvn03wsaskiq2dvsi4srd"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; no tests (apparently)
#:configure-flags
(list
"-DEMBREE_ISPC_SUPPORT=OFF")))
(inputs
`(("tbb" ,tbb)
("glfw" ,glfw)))
(home-page "https://www.embree.org/")
(synopsis "High performance ray tracing kernels")
(description
"Embree is a collection of high-performance ray tracing kernels.
Embree is meant to increase performance of photo-realistic rendering
applications.")
(license license:asl2.0)))
(define-public blender (define-public blender
(package (package
(name "blender") (name "blender")
(version "2.83.9") (version "2.91.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.blender.org/source/" (uri (string-append "https://download.blender.org/source/"
"blender-" version ".tar.xz")) "blender-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"106w9vi6z0gi2nbr73g8pm40w3wn7dkjcibzvvzbc786yrnzvkhb")))) "0x396lgmk0dq9115yrc36s8zwxzmjr490sr5n2y6w27y17yllyjm"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
(let ((python-version (version-major+minor (package-version python)))) (let ((python-version (version-major+minor (package-version python))))
@ -510,7 +541,8 @@ with the @command{autotrace} utility or as a C library, @code{libautotrace}.")
("python" ,python) ("python" ,python)
("python-numpy" ,python-numpy) ("python-numpy" ,python-numpy)
("tbb" ,tbb) ("tbb" ,tbb)
("zlib" ,zlib))) ("zlib" ,zlib)
("embree" ,embree)))
(home-page "https://blender.org/") (home-page "https://blender.org/")
(synopsis "3D graphics creation suite") (synopsis "3D graphics creation suite")
(description (description
@ -588,6 +620,7 @@ application can be customized via its API for Python scripting.")
`(("boost" ,boost) `(("boost" ,boost)
("jemalloc" ,jemalloc) ("jemalloc" ,jemalloc)
("libx11" ,libx11) ("libx11" ,libx11)
("opencolorio" ,opencolorio)
("openimageio" ,openimageio) ("openimageio" ,openimageio)
("openexr" ,openexr) ("openexr" ,openexr)
("ilmbase" ,ilmbase) ("ilmbase" ,ilmbase)

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

@ -82,6 +82,7 @@
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages man) #:use-module (gnu packages man)
#:use-module (gnu packages maths) #:use-module (gnu packages maths)
#:use-module (gnu packages mes)
#:use-module (gnu packages multiprecision) #:use-module (gnu packages multiprecision)
#:use-module (gnu packages ncurses) #:use-module (gnu packages ncurses)
#:use-module (gnu packages networking) #:use-module (gnu packages networking)
@ -101,6 +102,7 @@
#:use-module (gnu packages texinfo) #:use-module (gnu packages texinfo)
#:use-module (gnu packages tls) #:use-module (gnu packages tls)
#:use-module (gnu packages version-control) #:use-module (gnu packages version-control)
#:use-module (gnu packages web)
#:use-module (gnu packages webkit) #:use-module (gnu packages webkit)
#:use-module (gnu packages xdisorg) #:use-module (gnu packages xdisorg)
#:use-module (gnu packages xorg) #:use-module (gnu packages xorg)
@ -2570,8 +2572,8 @@ format is also supported.")
(deprecated-package "guile3.0-mcron" mcron)) (deprecated-package "guile3.0-mcron" mcron))
(define-public guile-picture-language (define-public guile-picture-language
(let ((commit "7e5982a2788bd79a45ad6f02db46f061f97b6e14") (let ((commit "291a746a1d3b4784d38b05239bdd7b8e796ce761")
(revision "3")) (revision "4"))
(package (package
(name "guile-picture-language") (name "guile-picture-language")
(version (git-version "0.0.1" revision commit)) (version (git-version "0.0.1" revision commit))
@ -2583,12 +2585,13 @@ format is also supported.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1y5f14cll4jx33hr43dpgrpd0yy6g0g7lim365kmgb0h0cvja80p")))) "0rnhf13ds92sbdicshy4sy4kl2kc431fy9vzm1divw974p7v57sd"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("guile" ,guile-3.0))) `(("guile" ,guile-3.0)))
(propagated-inputs (propagated-inputs
`(("guile-rsvg" ,guile-rsvg))) `(("guile-cairo" ,guile-cairo)
("guile-rsvg" ,guile-rsvg)))
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)
("automake" ,automake) ("automake" ,automake)
@ -4429,6 +4432,74 @@ including parsing and code generation.")
"Guile Shapefile is a Guile library for reading shapefiles.") "Guile Shapefile is a Guile library for reading shapefiles.")
(license license:expat))) (license license:expat)))
(define-public guile-libyaml
(let ((commit "f5d33a6880e96571d3cb079ed7755ffc156cac46")
(revision "1"))
(package
(name "guile-libyaml")
(version (git-version "0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/mwette/guile-libyaml")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"12x91983fh1j39zy7kbk19acc1rqdh8515ddx1mh7l26j04k9wgq"))))
(build-system gnu-build-system)
(arguments
`(#:modules (((guix build guile-build-system)
#:prefix guile:)
,@%gnu-build-system-modules)
#:imported-modules ((guix build guile-build-system)
,@%gnu-build-system-modules)
#:tests? #false ; there are none
#:phases
(modify-phases %standard-phases
(delete 'configure)
(add-after 'unpack 'remove-unused-files
(lambda* (#:key inputs #:allow-other-keys)
(for-each delete-file
'("guix.scm" "demo1.yml" "demo1.scm"
"yaml/libyaml.scm"
;; This file is mismatched with the generated FFI code.
"yaml/ffi-help-rt.scm"))
(copy-file (string-append (assoc-ref inputs "nyacc")
"/share/guile/site/3.0/system/ffi-help-rt.scm")
"yaml/ffi-help-rt.scm")
(substitute* "yaml/ffi-help-rt.scm"
(("system ffi-help-rt") "yaml ffi-help-rt"))
#true))
(add-before 'build 'build-ffi
(lambda* (#:key inputs #:allow-other-keys)
(invoke "guild" "compile-ffi"
"--no-exec" ; allow us to patch the generated file
"yaml/libyaml.ffi")
(substitute* "yaml/libyaml.scm"
(("system ffi-help-rt") "yaml ffi-help-rt")
(("dynamic-link \"libyaml\"")
(format #false "dynamic-link \"~a/lib/libyaml\""
(assoc-ref inputs "libyaml"))))
#true))
(replace 'build
(assoc-ref guile:%standard-phases 'build))
(delete 'install))))
(inputs
`(("guile" ,guile-3.0)
("libyaml" ,libyaml)))
(propagated-inputs
`(("guile-bytestructures" ,guile-bytestructures)))
(native-inputs
`(("nyacc" ,nyacc)))
(home-page "https://github.com/mwette/guile-libyaml")
(synopsis "Guile wrapper for libyaml")
(description
"This package provides a simple yaml module for Guile using the
ffi-helper from nyacc.")
(license license:lgpl3+))))
(define-public schmutz (define-public schmutz
(let ((commit "add24588c59552537b8f1316df99a0cdd62c221e") (let ((commit "add24588c59552537b8f1316df99a0cdd62c221e")
(revision "1")) (revision "1"))

9
gnu/packages/guile.scm
View file

@ -310,6 +310,7 @@ without requiring the source code to be rewritten.")
(define-public guile-3.0-latest (define-public guile-3.0-latest
;; TODO: Make this 'guile-3.0' on the next rebuild cycle. ;; TODO: Make this 'guile-3.0' on the next rebuild cycle.
(package-with-extra-patches
(package (package
(inherit guile-3.0) (inherit guile-3.0)
(version "3.0.5") (version "3.0.5")
@ -319,7 +320,9 @@ without requiring the source code to be rewritten.")
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1wah6fq1h8vmbpdadjych1mq8hyqkd7p015cbxm14ri37l1gnxid")))))) "1wah6fq1h8vmbpdadjych1mq8hyqkd7p015cbxm14ri37l1gnxid")))))
;; Remove on the next rebuild cycle.
(search-patches "guile-2.2-skip-so-test.patch")))
(define-public guile-next (define-public guile-next
(deprecated-package "guile-next" guile-3.0)) (deprecated-package "guile-next" guile-3.0))
@ -578,14 +581,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.4.1") (version "4.5.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
"1xq4f59rdk28xy4sdn6amy07aa19ikrk48iily3kfhwpkbg6v9jj")))))) "0iigada80cg7dl10z6ligiykci0cv9b88zmncz47nsz5g9gacdpc"))))))
(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))

12
gnu/packages/idris.scm
View file

@ -2,7 +2,7 @@
;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org> ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
;;; Copyright © 2016, 2017 David Craven <david@craven.ch> ;;; Copyright © 2016, 2017 David Craven <david@craven.ch>
;;; Copyright © 2018 Alex ter Weele <alex.ter.weele@gmail.com> ;;; Copyright © 2018 Alex ter Weele <alex.ter.weele@gmail.com>
;;; Copyright © 2019 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2019, 2021 Eric Bavier <bavier@posteo.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -38,7 +38,7 @@
(define-public idris (define-public idris
(package (package
(name "idris") (name "idris")
(version "1.3.2") (version "1.3.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -46,10 +46,12 @@
"idris-" version "/idris-" version ".tar.gz")) "idris-" version "/idris-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0wychzkg0yghd2pp8fqz78vp1ayzks191knfpl7mhh8igsmb6bc7")))) "1pachwc6msw3n1mz2z1r1w6h518w9gbhdvbaa5vi1qp3cn3wm6q4"))
(patches (search-patches "idris-disable-test.patch"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(native-inputs ;For tests (native-inputs ;For tests
`(("perl" ,perl) `(("perl" ,perl)
("ghc-cheapskate" ,ghc-cheapskate)
("ghc-tasty" ,ghc-tasty) ("ghc-tasty" ,ghc-tasty)
("ghc-tasty-golden" ,ghc-tasty-golden) ("ghc-tasty-golden" ,ghc-tasty-golden)
("ghc-tasty-rerun" ,ghc-tasty-rerun))) ("ghc-tasty-rerun" ,ghc-tasty-rerun)))
@ -98,7 +100,8 @@
(add-after 'unpack 'update-constraints (add-after 'unpack 'update-constraints
(lambda _ (lambda _
(substitute* "idris.cabal" (substitute* "idris.cabal"
(("ansi-terminal < 0\\.9") "ansi-terminal < 0.10")) (("ansi-terminal < 0\\.9") "ansi-terminal < 0.10")
(("cheapskate >= 0\\.1\\.1\\.2 && < 0\\.2") "cheapskate >= 0.1.1.1 && < 0.2"))
#t)) #t))
(add-before 'configure 'set-cc-command (add-before 'configure 'set-cc-command
(lambda _ (lambda _
@ -118,6 +121,7 @@
(add-after 'install 'check (add-after 'install 'check
(lambda* (#:key outputs #:allow-other-keys #:rest args) (lambda* (#:key outputs #:allow-other-keys #:rest args)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(chmod "test/scripts/timeout" #o755) ;must be executable
(setenv "TASTY_NUM_THREADS" (number->string (parallel-job-count))) (setenv "TASTY_NUM_THREADS" (number->string (parallel-job-count)))
(setenv "IDRIS_CC" "gcc") ;Needed for creating executables (setenv "IDRIS_CC" "gcc") ;Needed for creating executables
(setenv "PATH" (string-append out "/bin:" (getenv "PATH"))) (setenv "PATH" (string-append out "/bin:" (getenv "PATH")))

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

@ -296,7 +296,7 @@ your images. Among its features are:
(define-public catimg (define-public catimg
(package (package
(name "catimg") (name "catimg")
(version "2.6.0") (version "2.7.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -305,7 +305,7 @@ your images. Among its features are:
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0g9ywbgy162wiam9hc3yqpq5q4gyxa8fj4jskr3fdz8z8jjaabzz")))) (base32 "0a2dswbv4xddb2l2d55hc43lzvjwrjs5z9am7v6i0p0mi2fmc89s"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f ; no tests `(#:tests? #f ; no tests

4
gnu/packages/image.scm
View file

@ -1218,7 +1218,9 @@ processing and analysis library that puts its main emphasis on customizable
algorithms and data structures. It is particularly strong for algorithms and data structures. It is particularly strong for
multi-dimensional image processing.") multi-dimensional image processing.")
(license license:expat) (license license:expat)
(home-page "https://ukoethe.github.io/vigra/"))) (home-page "https://ukoethe.github.io/vigra/")
(properties '((max-silent-time . 7200))))) ;2 hours, to avoid timing out
(define-public vigra-c (define-public vigra-c
(let* ((commit "66ff4fa5a7d4a77415caa676a45c2c6ea16562e7") (let* ((commit "66ff4fa5a7d4a77415caa676a45c2c6ea16562e7")

4
gnu/packages/inkscape.scm
View file

@ -120,7 +120,7 @@ as the native format.")
(define-public inkscape-1.0 (define-public inkscape-1.0
(package (package
(name "inkscape") (name "inkscape")
(version "1.0.1") (version "1.0.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -129,7 +129,7 @@ as the native format.")
"inkscape-" version ".tar.xz")) "inkscape-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1hjp5nnyx2m3miji6q4lcb6zgbi498v641dc7apkqqvayknrb4ng")) "12krl97a00gdcxxibsb7g2lgx5458mhx2437x0hvz350242j6gns"))
(modules '((guix build utils) (modules '((guix build utils)
(ice-9 format))) (ice-9 format)))
(snippet (snippet

5
gnu/packages/java.scm
View file

@ -14,6 +14,7 @@
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org> ;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Vincent Legoll <vincent.legoll@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -13120,7 +13121,7 @@ network protocols, and core version control algorithms.")
(define-public abcl (define-public abcl
(package (package
(name "abcl") (name "abcl")
(version "1.6.0") (version "1.8.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -13128,7 +13129,7 @@ network protocols, and core version control algorithms.")
version "/abcl-src-" version ".tar.gz")) version "/abcl-src-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0hvbcsffr8n2xwdixc8wyw1bfl9fxn2gyy0c4nma7j9zbn0wwgw9")) "0zr5mmqyj484vza089l8vc88d07g0m8ymxzglvar3ydwyvi1x1qx"))
(patches (patches
(search-patches (search-patches
"abcl-fix-build-xml.patch")))) "abcl-fix-build-xml.patch"))))

7
gnu/packages/kde-frameworks.scm
View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2016, 2019, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016-2019 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2016-2019 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2016 David Craven <david@craven.ch> ;;; Copyright © 2016 David Craven <david@craven.ch>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
@ -1047,13 +1047,12 @@ integration with a custom editor as well as a ready-to-use
("wayland" ,wayland) ("wayland" ,wayland)
("wayland-protocols" ,wayland-protocols))) ("wayland-protocols" ,wayland-protocols)))
(arguments (arguments
`(#:tests? #f ; FIXME tests require weston to run `(#:phases
; weston requires wayland flags in mesa
#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'check 'check-setup (add-before 'check 'check-setup
(lambda _ (lambda _
(setenv "XDG_RUNTIME_DIR" "/tmp") (setenv "XDG_RUNTIME_DIR" "/tmp")
(setenv "QT_QPA_PLATFORM" "offscreen")
#t))))) #t)))))
(home-page "https://community.kde.org/Frameworks") (home-page "https://community.kde.org/Frameworks")
(synopsis "Qt-style API to interact with the wayland client and server") (synopsis "Qt-style API to interact with the wayland client and server")

64
gnu/packages/kde.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016, 2017, 2019, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 David Craven <david@craven.ch> ;;; Copyright © 2016 David Craven <david@craven.ch>
;;; Copyright © 2016, 2017 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2016, 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017, 2018 Mark Meyer <mark@ofosos.org> ;;; Copyright © 2017, 2018 Mark Meyer <mark@ofosos.org>
@ -714,6 +714,7 @@ different notification systems.")
("qtmultimedia" ,qtmultimedia) ("qtmultimedia" ,qtmultimedia)
("qtquickcontrols" ,qtquickcontrols) ("qtquickcontrols" ,qtquickcontrols)
("qtquickcontrols2" ,qtquickcontrols2) ("qtquickcontrols2" ,qtquickcontrols2)
("qtwayland" ,qtwayland)
("qtx11extras" ,qtx11extras))) ("qtx11extras" ,qtx11extras)))
(home-page "https://community.kde.org/KDEConnect") (home-page "https://community.kde.org/KDEConnect")
(synopsis "Enable your devices to communicate with each other") (synopsis "Enable your devices to communicate with each other")
@ -758,6 +759,40 @@ communicate with each other. Here's a few things KDE Connect can do:
charts.") charts.")
(license license:lgpl2.1+))) (license license:lgpl2.1+)))
(define-public kdf
(package
(name "kdf")
(version "20.12.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/"
version "/src/kdf-" version ".tar.xz"))
(sha256
(base32
"0ba67hs4vlb3qyvdzhnpmf8p62df12s8aqw4hzf9vnxff3qix5k1"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
("kdoctools" ,kdoctools)))
(inputs
`(("kcmutils" ,kcmutils)
("kconfigwidgets" ,kconfigwidgets)
("kcoreaddons" ,kcoreaddons)
("ki18n" ,ki18n)
("kiconthemes" ,kiconthemes)
("kio" ,kio)
("knotifications" ,knotifications)
("kwidgetsaddons" ,kwidgetsaddons)
("kxmlgui" ,kxmlgui)
("qtbase" ,qtbase)))
(home-page "https://kde.org/applications/system/kdk")
(synopsis "View Disk Usage")
(description "KDiskFree displays the available file devices (hard drive
partitions, floppy and CD drives, etc.) along with information on their
capacity, free space, type and mount point. It also allows you to mount and
unmount drives and view them in a file manager.")
(license license:gpl2+)))
(define-public kcachegrind (define-public kcachegrind
(package (package
(name "kcachegrind") (name "kcachegrind")
@ -913,6 +948,33 @@ Python, PHP, and Perl.")
a variety of formats, including PDF, PostScript, DejaVu, and EPub.") a variety of formats, including PDF, PostScript, DejaVu, and EPub.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public poxml
(package
(name "poxml")
(version "20.12.1")
(source (origin
(method url-fetch)
(uri
(string-append "mirror://kde/stable/release-service/" version
"/src/poxml-" version ".tar.xz"))
(sha256
(base32
"1smjvblx0jcv3afs2sr4qcmvhqd44iw24hvr9fppa3nxhrmjwmlk"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
("kdoctools" ,kdoctools)))
(inputs
`(("gettext" ,gettext-minimal)
("qtbase" ,qtbase)))
(home-page "https://kde.org/applications/development")
(synopsis "Tools for translating DocBook XML files with Gettext")
(description "This is a collection of tools that facilitate translating
DocBook XML files using Gettext message files (PO files). Also included are
several command-line utilities for manipulating DocBook XML files, PO files and
PO template files.")
(license license:gpl2+)))
(define-public kdegraphics-mobipocket (define-public kdegraphics-mobipocket
(package (package
(name "kdegraphics-mobipocket") (name "kdegraphics-mobipocket")

6
gnu/packages/libreoffice.scm
View file

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 John Darrington <jmd@gnu.org> ;;; Copyright © 2014 John Darrington <jmd@gnu.org>
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2016, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2018, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2017 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
@ -1085,7 +1085,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.")
(define-public libreoffice (define-public libreoffice
(package (package
(name "libreoffice") (name "libreoffice")
(version "6.4.6.2") (version "6.4.7.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -1094,7 +1094,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.")
"https://download.documentfoundation.org/libreoffice/src/" "https://download.documentfoundation.org/libreoffice/src/"
(version-prefix version 3) "/libreoffice-" version ".tar.xz")) (version-prefix version 3) "/libreoffice-" version ".tar.xz"))
(sha256 (sha256
(base32 "0k5aq1pfw2rpq28nkx6syrgwqbbdn6my9bnlqi3fn8qf572q30mb")))) (base32 "0i3654rmzs8aazj8j3dmxamilslfrki0y4sksg3n1zygc2ddfk83"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(native-inputs (native-inputs
`(("bison" ,bison) `(("bison" ,bison)

4
gnu/packages/libunwind.scm
View file

@ -28,14 +28,14 @@
(define-public libunwind (define-public libunwind
(package (package
(name "libunwind") (name "libunwind")
(version "1.3.1") (version "1.5.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://savannah/libunwind/libunwind-" (uri (string-append "mirror://savannah/libunwind/libunwind-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1y0l08k6ak1mqbfj6accf9s5686kljwgsl4vcqpxzk5n74wpm6a3")))) "05qhzcg1xag3l5m3c805np6k342gc0f3g087b7g16jidv59pccwh"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
;; FIXME: As of glibc 2.25, we get 1 out of 34 test failures (2 are ;; FIXME: As of glibc 2.25, we get 1 out of 34 test failures (2 are

4
gnu/packages/libusb.scm
View file

@ -53,7 +53,7 @@
(define-public libusb (define-public libusb
(package (package
(name "libusb") (name "libusb")
(version "1.0.23") (version "1.0.24")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -61,7 +61,7 @@
"releases/download/v" version "releases/download/v" version
"/libusb-" version ".tar.bz2")) "/libusb-" version ".tar.bz2"))
(sha256 (sha256
(base32 "13dd2a9x290d1q8nb1lqiaf36grcvns5ripk5k2xm0lajmpc04fv")))) (base32 "0amilbi5qncdnrds3ji21vbiz1wvdm1fwp5qrxnk49xkyy2jdzby"))))
(build-system gnu-build-system) (build-system gnu-build-system)
;; XXX: Enabling udev is now recommended, but eudev indirectly depends on ;; XXX: Enabling udev is now recommended, but eudev indirectly depends on

6
gnu/packages/license.scm
View file

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com> ;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2020, 2021 Michael Rohleder <mike@rohleder.de>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -169,13 +169,13 @@ belonging to various licenses.")
(define-public reuse (define-public reuse
(package (package
(name "reuse") (name "reuse")
(version "0.11.1") (version "0.12.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "reuse" version)) (uri (pypi-uri "reuse" version))
(sha256 (sha256
(base32 "09qjb4f49vr0a7zrszab8g719ilg2p6b942mr0bgyvplrjikkid5")))) (base32 "11i1xjbwbqjipzpbrbnp110zx1m49khn6dl5z3mjkjaz9kr6bl2f"))))
(build-system python-build-system) (build-system python-build-system)
(native-inputs (native-inputs
`(("python-pytest" ,python-pytest) `(("python-pytest" ,python-pytest)

71
gnu/packages/linux.scm
View file

@ -353,7 +353,7 @@ 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.10-version "5.10.6") (define-public linux-libre-5.10-version "5.10.10")
(define deblob-scripts-5.10 (define deblob-scripts-5.10
(linux-libre-deblob-scripts (linux-libre-deblob-scripts
linux-libre-5.10-version linux-libre-5.10-version
@ -361,7 +361,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "0hh27ccqimagr3aij7ygwikxw66y63sqwd0xlf49bhpjd090r9a7"))) (base32 "0hh27ccqimagr3aij7ygwikxw66y63sqwd0xlf49bhpjd090r9a7")))
(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 "02v91afra3pcwfws74wxdsm8pfc57vws659b7j6jmsxm3hnd0rvp"))) (hash (base32 "06fvgkrn9127xw9kly6l4ws3yv80q8xfqdzaam92lljim5pqdvb0")))
(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)))
@ -369,7 +369,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
;; 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.4-version "5.4.88") (define-public linux-libre-5.4-version "5.4.92")
(define deblob-scripts-5.4 (define deblob-scripts-5.4
(linux-libre-deblob-scripts (linux-libre-deblob-scripts
linux-libre-5.4-version linux-libre-5.4-version
@ -377,12 +377,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "1xghbbnaisjd0k1klbyn1p7r6r4x5a1bpmkm56a3gh2zvw4s7mj8"))) (base32 "1xghbbnaisjd0k1klbyn1p7r6r4x5a1bpmkm56a3gh2zvw4s7mj8")))
(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 "1ci432xanm7glgg05012kh43pfi4k771kzih0816y5674v0hg02b"))) (hash (base32 "1zcl4dadyfrgmx6rh0ncy403rsqb1qs092m6zr6b3i14i3wpz4y0")))
(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.166") (define-public linux-libre-4.19-version "4.19.170")
(define deblob-scripts-4.19 (define deblob-scripts-4.19
(linux-libre-deblob-scripts (linux-libre-deblob-scripts
linux-libre-4.19-version linux-libre-4.19-version
@ -390,12 +390,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "1jiaw0as1ippkrjdpd52657w5mz9qczg3y2hlra7m9k0xawwiqlf"))) (base32 "1jiaw0as1ippkrjdpd52657w5mz9qczg3y2hlra7m9k0xawwiqlf")))
(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 "03l86ykdjs5wa0n4wknpgy9dv2r6l92qfsyak373jkhs684z53mr"))) (hash (base32 "0jjvwbxpfvmzj4z6gkd2mh3kz9vh8hsgsm0013866hzgz1j043fx")))
(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.214") (define-public linux-libre-4.14-version "4.14.217")
(define deblob-scripts-4.14 (define deblob-scripts-4.14
(linux-libre-deblob-scripts (linux-libre-deblob-scripts
linux-libre-4.14-version linux-libre-4.14-version
@ -403,12 +403,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "1qij18inijj6c3ma8hv98yjagnzxdxyn134da9fd23ky8q6hbvky"))) (base32 "1qij18inijj6c3ma8hv98yjagnzxdxyn134da9fd23ky8q6hbvky")))
(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 "07ir4yw7s5c6yb3gjbgjvcqqdgpbsjxrvapgh6zs22ffd8hrchpm"))) (hash (base32 "04adj8x7p1has4mh8ygxhqgwb1i08fz9izqw1y6xj5hh8cjnm8v2")))
(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.250") (define-public linux-libre-4.9-version "4.9.253")
(define deblob-scripts-4.9 (define deblob-scripts-4.9
(linux-libre-deblob-scripts (linux-libre-deblob-scripts
linux-libre-4.9-version linux-libre-4.9-version
@ -416,12 +416,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "0fxajshb75siq39lj5h8xvhdj8lcmddkslwlyj65rhlwk6g2r4b2"))) (base32 "0fxajshb75siq39lj5h8xvhdj8lcmddkslwlyj65rhlwk6g2r4b2")))
(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 "15vizxd2i2311skjank406ny3bc30c5rz2p9jvh5xz1yv12vzgcy"))) (hash (base32 "065w35vb0qp4fvnwmcx7f92inmx64f9r04zzwcwbs0826nl52nws")))
(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)))
(define-public linux-libre-4.4-version "4.4.250") (define-public linux-libre-4.4-version "4.4.253")
(define deblob-scripts-4.4 (define deblob-scripts-4.4
(linux-libre-deblob-scripts (linux-libre-deblob-scripts
linux-libre-4.4-version linux-libre-4.4-version
@ -429,7 +429,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "0hhin1jpfkd6nwrb6xqxjzl3hdxy4pn8a15hy2d3d83yw6pflbsf"))) (base32 "0hhin1jpfkd6nwrb6xqxjzl3hdxy4pn8a15hy2d3d83yw6pflbsf")))
(define-public linux-libre-4.4-pristine-source (define-public linux-libre-4.4-pristine-source
(let ((version linux-libre-4.4-version) (let ((version linux-libre-4.4-version)
(hash (base32 "12m14j8654rawj2znkyhvcnwnf53x10zlghxd0mpl8dfzwvn2f5b"))) (hash (base32 "0nlqnfhrkaj2s582kc0wxqi0881hgp6l9z85qx4ckflc8jwrh7k6")))
(make-linux-libre-source version (make-linux-libre-source version
(%upstream-linux-source version hash) (%upstream-linux-source version hash)
deblob-scripts-4.4))) deblob-scripts-4.4)))
@ -641,6 +641,8 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration."
("CONFIG_MEMCG_KMEM" . #t) ("CONFIG_MEMCG_KMEM" . #t)
("CONFIG_CPUSETS" . #t) ("CONFIG_CPUSETS" . #t)
("CONFIG_PROC_PID_CPUSET" . #t) ("CONFIG_PROC_PID_CPUSET" . #t)
;; Allow disk encryption by default
("CONFIG_DM_CRYPT" . m)
;; Modules required for initrd: ;; Modules required for initrd:
("CONFIG_NET_9P" . m) ("CONFIG_NET_9P" . m)
("CONFIG_NET_9P_VIRTIO" . m) ("CONFIG_NET_9P_VIRTIO" . m)
@ -850,7 +852,8 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration."
(description (description
"GNU Linux-Libre is a free (as in freedom) variant of the Linux kernel. "GNU Linux-Libre is a free (as in freedom) variant of the Linux kernel.
It has been modified to remove all non-free binary blobs.") It has been modified to remove all non-free binary blobs.")
(license license:gpl2))) (license license:gpl2)
(properties '((max-silent-time . 3600))))) ;don't timeout on blob scan.
;;; ;;;
@ -2215,7 +2218,7 @@ external rate conversion.")
(define-public iptables (define-public iptables
(package (package
(name "iptables") (name "iptables")
(version "1.8.6") (version "1.8.7")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -2224,7 +2227,7 @@ external rate conversion.")
(string-append "https://www.netfilter.org/projects/iptables/" (string-append "https://www.netfilter.org/projects/iptables/"
"files/iptables-" version ".tar.bz2"))) "files/iptables-" version ".tar.bz2")))
(sha256 (sha256
(base32 "0rvp0k8a72h2snrdx48cfn75bfa0ycrd2xl3kjysbymq7q6gxx50")))) (base32 "1w6qx3sxzkv80shk21f63rq41c84irpx68k62m2cv629n1mwj2f1"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
@ -5631,7 +5634,7 @@ The collection contains a set of bandwidth and latency benchmark such as:
(package (package
(name "rng-tools") (name "rng-tools")
(home-page "https://github.com/nhorman/rng-tools") (home-page "https://github.com/nhorman/rng-tools")
(version "6.10") (version "6.11")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (url home-page) (uri (git-reference (url home-page)
@ -5639,7 +5642,7 @@ The collection contains a set of bandwidth and latency benchmark such as:
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0hbml37yxs0fs69g7f2x4ixq61z0029swy99rn7ykma9mi6b7ni9")))) "0wwvi8a8k2ahhmwln4w970b8gd3in3g13jkbsapkpnspwmlqj5xa"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(;; Disable support for various hardware entropy sources as they need `(;; Disable support for various hardware entropy sources as they need
@ -5916,20 +5919,20 @@ the default @code{nsswitch} and the experimental @code{umich_ldap}.")
(define-public mcelog (define-public mcelog
(package (package
(name "mcelog") (name "mcelog")
(version "173") (version "175")
(source (origin (source
(method url-fetch) (origin
(uri (string-append "https://git.kernel.org/cgit/utils/cpu/mce/" (method git-fetch)
"mcelog.git/snapshot/v" version ".tar.gz")) (uri (git-reference
(url "https://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32 "0vvrnjkh1jp7f6295syydg7lplqmcm8msdls3xyk8xfiz69xqdjz"))
"1a1j4lsvql3aiqbkdn10hhpvmhavhlr9qkh2scxcv1kn7rvvclih"))
(file-name (string-append name "-" version ".tar.gz"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
`(begin `(begin
;; The snapshots lack a .git directory, ;; The checkout lack a .git directory, breaking ‘git describe’.
;; breaking ‘git describe’.
(substitute* "Makefile" (substitute* "Makefile"
(("\"unknown\"") (string-append "\"v" ,version "\""))) (("\"unknown\"") (string-append "\"v" ,version "\"")))
#t)))) #t))))
@ -5938,7 +5941,7 @@ the default @code{nsswitch} and the experimental @code{umich_ldap}.")
`(#:phases (modify-phases %standard-phases `(#:phases (modify-phases %standard-phases
(delete 'configure)) ; no configure script (delete 'configure)) ; no configure script
#:make-flags (let ((out (assoc-ref %outputs "out"))) #:make-flags (let ((out (assoc-ref %outputs "out")))
(list "CC=gcc" (list (string-append "CC=" ,(cc-for-target))
(string-append "prefix=" out) (string-append "prefix=" out)
(string-append "DOCDIR=" out "/share/doc/" (string-append "DOCDIR=" out "/share/doc/"
,name "-" ,version) ,name "-" ,version)
@ -6439,14 +6442,14 @@ re-use code and to avoid re-inventing the wheel.")
(define-public libnftnl (define-public libnftnl
(package (package
(name "libnftnl") (name "libnftnl")
(version "1.1.8") (version "1.1.9")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://netfilter.org/libnftnl/" (uri (string-append "mirror://netfilter.org/libnftnl/"
"libnftnl-" version ".tar.bz2")) "libnftnl-" version ".tar.bz2"))
(sha256 (sha256
(base32 "04dp797llg3cqzivwrql30wg9mfr0ngnp0v5gs7jcdmp11dzm8q4")))) (base32 "16jbp4fs5dz2yf4c3bl1sb48x9x9wi1chv39zwmfgya1k9pimcp9"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
@ -6463,7 +6466,7 @@ used by nftables.")
(define-public nftables (define-public nftables
(package (package
(name "nftables") (name "nftables")
(version "0.9.7") (version "0.9.8")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -6472,7 +6475,7 @@ used by nftables.")
(string-append "https://www.nftables.org/projects/nftables" (string-append "https://www.nftables.org/projects/nftables"
"/files/nftables-" version ".tar.bz2"))) "/files/nftables-" version ".tar.bz2")))
(sha256 (sha256
(base32 "1c1c2475nifncv0ng8z77h2dpanlsx0bhqm15k00jb3a6a68lszy")))) (base32 "1r4g22grhd4s1918wws9vggb8821sv4kkj8197ygxr6sar301z30"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments `(#:configure-flags (arguments `(#:configure-flags
'("--disable-man-doc"))) ; FIXME: Needs docbook2x. '("--disable-man-doc"))) ; FIXME: Needs docbook2x.
@ -7862,7 +7865,7 @@ kernel side implementation.")
(define-public erofs-utils (define-public erofs-utils
(package (package
(name "erofs-utils") (name "erofs-utils")
(version "1.2") (version "1.2.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -7871,7 +7874,7 @@ kernel side implementation.")
(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 "07hvijq2hsn3gg1kb8abrfk23n83j57yx8kyv4wqgwhhvd30myjc")))) (base32 "1vb4mxsb59g29x7l22cffsqa8x743sra4j5zbmx89hjwpwm9vvcg"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("lz4" ,lz4) `(("lz4" ,lz4)

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

@ -19,8 +19,10 @@
;;; Copyright © 2020 Konrad Hinsen <konrad.hinsen@fastmail.net> ;;; Copyright © 2020 Konrad Hinsen <konrad.hinsen@fastmail.net>
;;; Copyright © 2020 Dimakis Dimakakos <me@bendersteed.tech> ;;; Copyright © 2020 Dimakis Dimakakos <me@bendersteed.tech>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com> ;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Adam Kandur <rndd@tuta.io> ;;; Copyright © 2020, 2021 Adam Kandur <rndd@tuta.io>
;;; Copyright © 2020, 2021 Sharlatan Hellseher <sharlatanus@gmail.com> ;;; Copyright © 2020, 2021 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; Copyright © 2021 Aurora <rind38@disroot.org>
;;; Copyright © 2021 Matthew Kraai <kraai@ftbfs.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -52,10 +54,12 @@
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (guix build-system asdf) #:use-module (guix build-system asdf)
#:use-module (guix build-system trivial) #:use-module (guix build-system trivial)
#:use-module (gnu packages base)
#:use-module (gnu packages c) #:use-module (gnu packages c)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages databases) #:use-module (gnu packages databases)
#:use-module (gnu packages enchant) #:use-module (gnu packages enchant)
#:use-module (gnu packages file)
#:use-module (gnu packages fonts) #:use-module (gnu packages fonts)
#:use-module (gnu packages fontutils) #:use-module (gnu packages fontutils)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
@ -456,33 +460,33 @@ compatible with ANSI-compliant Common Lisp implementations.")
(sbcl-package->ecl-package sbcl-cl-ppcre)) (sbcl-package->ecl-package sbcl-cl-ppcre))
(define-public sbcl-uax-15 (define-public sbcl-uax-15
(let ((commit "e7439a91b72f533fcf736643e3ff0677b56c2e7d")
(revision "1"))
(package (package
(name "sbcl-uax-15") (name "sbcl-uax-15")
(version (git-version "0.1" revision commit)) (version "0.1.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/sabracrolleton/uax-15") (url "https://github.com/sabracrolleton/uax-15")
(commit commit))) (commit (string-append "v" version))))
(file-name (git-file-name "uax-15" version)) (file-name (git-file-name "uax-15" version))
(sha256 (sha256
(base32 "1vf8a2aikgx0l5bsq0z9s0dw3sgx1887xhagdlf66fwffa5jskg6")))) (base32 "0p2ckw7mzxhwa9vbwj2q2dzayz9dl94d9yqd2ynp0pc5v8i0n2fr"))))
(build-system asdf-build-system/sbcl) (build-system asdf-build-system/sbcl)
(arguments
`(#:asd-systems
'("uax-15")))
(native-inputs (native-inputs
`(("fiveam" ,sbcl-fiveam))) `(("fiveam" ,sbcl-fiveam)))
(inputs (inputs
`(("cl-ppcre" ,sbcl-cl-ppcre) `(("cl-ppcre" ,sbcl-cl-ppcre)
("split-sequence" ,sbcl-split-sequence))) ("split-sequence" ,sbcl-split-sequence)))
(arguments
`(#:asd-systems '("uax-15")))
(home-page "https://github.com/sabracrolleton/uax-15") (home-page "https://github.com/sabracrolleton/uax-15")
(synopsis "Common Lisp implementation of unicode normalization functions") (synopsis "Common Lisp implementation of unicode normalization functions")
(description "This package provides supports for unicode normalization, (description
RFC8264 and RFC7564.") "This package provides supports for unicode normalization, RFC8264 and
(license license:expat)))) RFC7564.")
(license license:expat)))
(define-public cl-uax-15 (define-public cl-uax-15
(sbcl-package->cl-source-package sbcl-uax-15)) (sbcl-package->cl-source-package sbcl-uax-15))
@ -1939,6 +1943,51 @@ pretty, documentation is code.")
;; TODO: Find why the tests fail on ECL. ;; TODO: Find why the tests fail on ECL.
((#:tests? _ #f) #f)))))) ((#:tests? _ #f) #f))))))
(define-public sbcl-mssql
(let ((commit "045602a19a32254108f2b75871049293f49731eb")
(revision "1"))
(package
(name "sbcl-mssql")
(version (git-version "0.0.3" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/archimag/cl-mssql")
(commit commit)))
(file-name (git-file-name "cl-mssql" version))
(sha256
(base32 "09i50adppgc1ybm3ka9vbindhwa2x29f9n3n0jkrryymdhb8zknm"))))
(build-system asdf-build-system/sbcl)
(inputs
`(("cffi" ,sbcl-cffi)
("freetds" ,freetds)
("garbage-pools" ,sbcl-garbage-pools)
("iterate" ,sbcl-iterate)
("parse-number" ,sbcl-parse-number)))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-paths
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "src/mssql.lisp"
(("libsybdb" all)
(string-append (assoc-ref inputs "freetds") "/lib/" all)))
#t)))))
(home-page "https://github.com/archimag/cl-mssql")
(synopsis "Common Lisp library to interact with MS SQL Server databases")
(description
"@code{cl-mssql} provides an interface to connect to Microsoft SQL
server. It uses the @code{libsybdb} foreign library provided by the FreeTDS
project.")
(license license:llgpl))))
(define-public ecl-mssql
(sbcl-package->ecl-package sbcl-mssql))
(define-public cl-mssql
(sbcl-package->cl-source-package sbcl-mssql))
(define-public sbcl-lisp-unit (define-public sbcl-lisp-unit
(let ((commit "89653a232626b67400bf9a941f9b367da38d3815")) (let ((commit "89653a232626b67400bf9a941f9b367da38d3815"))
(package (package
@ -2465,7 +2514,7 @@ non-consing thread safe queues and fibonacci priority queues.")
(define-public sbcl-cffi (define-public sbcl-cffi
(package (package
(name "sbcl-cffi") (name "sbcl-cffi")
(version "0.21.0") (version "0.23.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -2474,7 +2523,7 @@ non-consing thread safe queues and fibonacci priority queues.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name "cffi-bootstrap" version)) (file-name (git-file-name "cffi-bootstrap" version))
(sha256 (sha256
(base32 "1qalargz9bhp850qv60ffwpdqi4xirzar4l3g6qcg8yc6xqf2cjk")))) (base32 "03s98imc5niwnpj3hhrafl7dmxq45g74h96sm68976k7ahi3vl5b"))))
(build-system asdf-build-system/sbcl) (build-system asdf-build-system/sbcl)
(inputs (inputs
`(("alexandria" ,sbcl-alexandria) `(("alexandria" ,sbcl-alexandria)
@ -4343,8 +4392,8 @@ Long Painful History of Time\".")
(sbcl-package->ecl-package sbcl-local-time)) (sbcl-package->ecl-package sbcl-local-time))
(define-public sbcl-trivial-mimes (define-public sbcl-trivial-mimes
(let ((commit "303f8ac0aa6ca0bc139aa3c34822e623c3723fab") (let ((commit "a741fc2f567a4f86b853fd4677d75e62c03e51d9")
(revision "1")) (revision "2"))
(package (package
(name "sbcl-trivial-mimes") (name "sbcl-trivial-mimes")
(version (git-version "1.1.0" revision commit)) (version (git-version "1.1.0" revision commit))
@ -4356,7 +4405,7 @@ Long Painful History of Time\".")
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "17jxgl47r695bvsb7wi3n2ws5rp1zzgvw0zii8cy5ggw4b4ayv6m")))) (base32 "00kcm17q5plpzdj1qwg83ldhxksilgpcdkf3m9azxcdr968xs9di"))))
(build-system asdf-build-system/sbcl) (build-system asdf-build-system/sbcl)
(native-inputs (native-inputs
`(("stefil" ,sbcl-hu.dwim.stefil))) `(("stefil" ,sbcl-hu.dwim.stefil)))
@ -4367,7 +4416,7 @@ Long Painful History of Time\".")
(description (description
"This is a teensy library that provides some functions to determine the "This is a teensy library that provides some functions to determine the
mime-type of a file.") mime-type of a file.")
(license license:artistic2.0)))) (license license:zlib))))
(define-public cl-trivial-mimes (define-public cl-trivial-mimes
(sbcl-package->cl-source-package sbcl-trivial-mimes)) (sbcl-package->cl-source-package sbcl-trivial-mimes))
@ -6032,8 +6081,8 @@ programming style and the efficiency of an iterative programming style.")
(sbcl-package->ecl-package sbcl-series)) (sbcl-package->ecl-package sbcl-series))
(define-public sbcl-periods (define-public sbcl-periods
(let ((commit "983d4a57325db3c8def942f163133cec5391ec28") (let ((commit "60383dcef88a1ac11f82804ae7a33c361dcd2949")
(revision "1")) (revision "2"))
(package (package
(name "sbcl-periods") (name "sbcl-periods")
(version (git-version "0.0.2" revision commit)) (version (git-version "0.0.2" revision commit))
@ -6046,7 +6095,7 @@ programming style and the efficiency of an iterative programming style.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0z30jr3lxz3cmi019fsl4lgcgwf0yqpn95v9zkkkwgymdrkd4lga")))) "1ym2j4an9ig2hl210jg91gpf7xfnp6mlhkw3n9kkdnwiji3ipqlk"))))
(build-system asdf-build-system/sbcl) (build-system asdf-build-system/sbcl)
(inputs (inputs
`(("local-time" ,sbcl-local-time) `(("local-time" ,sbcl-local-time)
@ -6453,8 +6502,8 @@ ability to store all Common Lisp data types into streams.")
(sbcl-package->ecl-package sbcl-cl-store)) (sbcl-package->ecl-package sbcl-cl-store))
(define-public sbcl-cl-gobject-introspection (define-public sbcl-cl-gobject-introspection
(let ((commit "7b703e2384945ea0ac39d9b766de434a08d81560") (let ((commit "d0136c8d9ade2560123af1fc55bbf70d2e3db539")
(revision "0")) (revision "1"))
(package (package
(name "sbcl-cl-gobject-introspection") (name "sbcl-cl-gobject-introspection")
(version (git-version "0.3" revision commit)) (version (git-version "0.3" revision commit))
@ -6468,7 +6517,7 @@ ability to store all Common Lisp data types into streams.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1zcqd2qj14f6b38vys8gr89s6cijsp9r8j43xa8lynilwva7bwyh")))) "0dz0r73pq7yhz2iq2jnkq977awx2zws2qfxdcy33329sys1ii32p"))))
(build-system asdf-build-system/sbcl) (build-system asdf-build-system/sbcl)
(inputs (inputs
`(("alexandria" ,sbcl-alexandria) `(("alexandria" ,sbcl-alexandria)
@ -6480,12 +6529,9 @@ ability to store all Common Lisp data types into streams.")
(native-inputs (native-inputs
`(("fiveam" ,sbcl-fiveam))) `(("fiveam" ,sbcl-fiveam)))
(arguments (arguments
;; TODO: Tests fail, see '(#:phases
;; https://github.com/andy128k/cl-gobject-introspection/issues/70.
'(#:tests? #f
#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after (quote unpack) (quote fix-paths) (add-after 'unpack 'fix-paths
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "src/init.lisp" (substitute* "src/init.lisp"
(("libgobject-2\\.0\\.so") (("libgobject-2\\.0\\.so")
@ -9124,36 +9170,52 @@ approach to templating.")
(sbcl-package->ecl-package sbcl-cl-mysql)) (sbcl-package->ecl-package sbcl-cl-mysql))
(define-public sbcl-postmodern (define-public sbcl-postmodern
(let ((commit "74469b25bbda990ec9b77e0d0eccdba0cd7e721a")
(revision "1"))
(package (package
(name "sbcl-postmodern") (name "sbcl-postmodern")
(version (git-version "1.19" revision commit)) (version "1.32.8")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/marijnh/Postmodern") (url "https://github.com/marijnh/Postmodern")
(commit commit))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0im7ymnyxjhn2w74jfg76k5gpr0gl33n31akx33hl28722ljd0hd")))) (base32 "0vr5inbr8dldf6dsl0qj3h2yrnnsayzfwxfzwkn1pk7xbns2l78q"))))
(build-system asdf-build-system/sbcl) (build-system asdf-build-system/sbcl)
(native-inputs (native-inputs
`(("fiveam" ,sbcl-fiveam))) `(("fiveam" ,sbcl-fiveam)))
(inputs (inputs
`(("alexandria" ,sbcl-alexandria) `(("alexandria" ,sbcl-alexandria)
("bordeaux-threads" ,sbcl-bordeaux-threads) ("bordeaux-threads" ,sbcl-bordeaux-threads)
("cl-base64" ,sbcl-cl-base64)
("cl-unicode" ,sbcl-cl-unicode)
("closer-mop" ,sbcl-closer-mop) ("closer-mop" ,sbcl-closer-mop)
("global-vars" ,sbcl-global-vars) ("global-vars" ,sbcl-global-vars)
("ironclad" ,sbcl-ironclad)
("local-time" ,sbcl-local-time)
("md5" ,sbcl-md5) ("md5" ,sbcl-md5)
("split-sequence" ,sbcl-split-sequence) ("split-sequence" ,sbcl-split-sequence)
("uax-15" ,sbcl-uax-15)
("usocket" ,sbcl-usocket))) ("usocket" ,sbcl-usocket)))
(arguments (arguments
;; TODO: Fix missing dependency errors for simple-date/postgres-glue, ;; TODO: (Sharlatan-20210114T171037+0000) tests still failing but on other
;; cl-postgres/tests and s-sql/tests. ;; step, some functionality in `local-time' prevents passing tests.
;; Error:
;;
;; Can't create directory
;; /gnu/store
;; /4f47agf1kyiz057ppy6x5p98i7mcbfsv-sbcl-local-time-1.0.6-2.a177eb9
;; /lib/common-lisp/sbcl/local-time/src/integration/
;;
;; NOTE: (Sharlatan-20210124T191940+0000): When set env HOME to /tmp above
;; issue is resolved but it required live test database to connect to now.
;; Keep tests switched off.
`(#:tests? #f `(#:tests? #f
#:asd-systems '("postmodern" #:asd-systems '("cl-postgres"
"s-sql"
"postmodern"
"simple-date"
"simple-date/postgres-glue"))) "simple-date/postgres-glue")))
(synopsis "Common Lisp library for interacting with PostgreSQL") (synopsis "Common Lisp library for interacting with PostgreSQL")
(description (description
@ -9167,9 +9229,27 @@ foreign libraries.
@item A syntax for mixing SQL and Lisp code. @item A syntax for mixing SQL and Lisp code.
@item Convenient support for prepared statements and stored procedures. @item Convenient support for prepared statements and stored procedures.
@item A metaclass for simple database-access objects. @item A metaclass for simple database-access objects.
@end itemize\n") @end itemize\n
This package produces 4 systems: postmodern, cl-postgres, s-sql, simple-date
@code{SIMPLE-DATE} is a very basic implementation of date and time objects, used
to support storing and retrieving time-related SQL types. It is not loaded by
default and you can use local-time (which has support for timezones) instead.
@code{S-SQL} is used to compile s-expressions to strings of SQL code, escaping
any Lisp values inside, and doing as much as possible of the work at compile
time.
@code{CL-POSTGRES} is the low-level library used for interfacing with a PostgreSQL
server over a socket.
@code{POSTMODERN} itself is a wrapper around these packages and provides higher
level functions, a very simple data access object that can be mapped directly to
database tables and some convient utilities. It then tries to put all these
things together into a convenient programming interface")
(home-page "https://marijnhaverbeke.nl/postmodern/") (home-page "https://marijnhaverbeke.nl/postmodern/")
(license license:zlib)))) (license license:zlib)))
(define-public cl-postmodern (define-public cl-postmodern
(sbcl-package->cl-source-package sbcl-postmodern)) (sbcl-package->cl-source-package sbcl-postmodern))
@ -9179,15 +9259,18 @@ foreign libraries.
(inherit (sbcl-package->ecl-package sbcl-postmodern)) (inherit (sbcl-package->ecl-package sbcl-postmodern))
(arguments (arguments
`(#:tests? #f `(#:tests? #f
#:asd-systems '("postmodern" #:asd-systems '("cl-postgres"
"s-sql"
"postmodern"
"simple-date"
"simple-date/postgres-glue") "simple-date/postgres-glue")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'fix-build (add-after 'unpack 'fix-build
(lambda _ (lambda _
(substitute* "cl-postgres.asd" (substitute* "cl-postgres.asd"
(("\\) \"usocket\"") ((":or :sbcl :allegro :ccl :clisp" all)
" :ecl) \"usocket\"")) (string-append all " :ecl")))
#t))))))) #t)))))))
(define-public sbcl-db3 (define-public sbcl-db3
@ -12113,6 +12196,77 @@ package.")
(define-public ecl-claw-support (define-public ecl-claw-support
(sbcl-package->ecl-package sbcl-claw-support)) (sbcl-package->ecl-package sbcl-claw-support))
(define-public sbcl-claw
(let ((revision "0")
(commit "3cd4a96fca95eb9e8d5d069426694669f81b2250"))
(package
(name "sbcl-claw")
(version (git-version "1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/borodust/claw")
(commit commit)))
(file-name (git-file-name "claw" version))
(sha256
(base32 "146yv0hc4hmk72562ssj2d41143pp84dcbd1h7f4nx1c7hf2bb0d"))))
(build-system asdf-build-system/sbcl)
(inputs
`(("alexandria" ,sbcl-alexandria)
("cffi" ,sbcl-cffi)
("cl-json" ,sbcl-cl-json)
("cl-ppcre" ,sbcl-cl-ppcre)
("claw-support" ,sbcl-claw-support)
("local-time" ,sbcl-local-time)
("trivial-features" ,sbcl-trivial-features)))
(home-page "https://github.com/borodust/claw")
(synopsis "Autowrapper for Common Lisp")
(description
"This is a Common Lisp autowrapping facility for quickly creating clean
and lean bindings to C libraries.")
(license license:bsd-2))))
(define-public cl-claw
(sbcl-package->cl-source-package sbcl-claw))
(define-public ecl-claw
(sbcl-package->ecl-package sbcl-claw))
(define-public sbcl-claw-utils
(let ((revision "0")
(commit "efe25016501973dc369f067a64c7d225802bc56f"))
(package
(name "sbcl-claw-utils")
;; version is not specified
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/borodust/claw-utils")
(commit commit)))
(file-name (git-file-name "claw-utils" version))
(sha256
(base32 "01df3kyf2qs3czi332dnz2s35x2j0fq46vgmsw7wjrrvnqc22mk5"))))
(build-system asdf-build-system/sbcl)
(inputs
`(("alexandria" ,sbcl-alexandria)
("cffi" ,sbcl-cffi)
("claw" ,sbcl-claw)))
(home-page "https://github.com/borodust/claw-utils")
(synopsis "Utilities for easier autowrapping")
(description
"This Common Lisp library contains various handy utilties to help
autowrapping with @code{claw}.")
(license license:expat))))
(define-public cl-claw-utils
(sbcl-package->cl-source-package sbcl-claw-utils))
(define-public ecl-claw-utils
(sbcl-package->ecl-package sbcl-claw-utils))
(define-public sbcl-array-operations (define-public sbcl-array-operations
(let ((commit "75cbc3b1adb2e3ce2109489753d0f290b071e81b") (let ((commit "75cbc3b1adb2e3ce2109489753d0f290b071e81b")
(revision "0")) (revision "0"))
@ -12967,3 +13121,531 @@ bringing dynamism to class definition.")
(define-public cl-markdown (define-public cl-markdown
(sbcl-package->cl-source-package sbcl-cl-markdown)) (sbcl-package->cl-source-package sbcl-cl-markdown))
(define-public sbcl-magicffi
(let ((commit "d88f2f280c31f639e4e05be75215d8a8dce6aef2"))
(package
(name "sbcl-magicffi")
(version (git-version "0.0.0" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/dochang/magicffi/")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "0p6ysa92fk34bhxpw7bycbfgw150fv11z9x8jr9xb4lh8cm2hvp6"))))
(build-system asdf-build-system/sbcl)
(native-inputs
`(("alexandria" ,sbcl-alexandria)))
(inputs
`(("cffi" ,sbcl-cffi)
("ppcre" ,sbcl-cl-ppcre)
("libmagic" ,file)))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-paths
(lambda* (#:key inputs #:allow-other-keys)
(let ((magic (assoc-ref inputs "libmagic")))
(substitute* "grovel.lisp"
(("/usr/include/magic.h")
(string-append magic "/include/magic.h")))
(substitute* "api.lisp"
((":default \"libmagic\"" all)
(string-append ":default \"" magic "/lib/libmagic\"")))))))))
(home-page "https://common-lisp.net/project/magicffi/")
(synopsis "Common Lisp interface to libmagic based on CFFI")
(description
"MAGICFFI is a Common Lisp CFFI interface to libmagic(3), the file type
determination library using @emph{magic} numbers.")
(license license:bsd-2))))
(define-public ecl-magicffi
(sbcl-package->ecl-package sbcl-magicffi))
(define-public cl-magicffi
(sbcl-package->cl-source-package sbcl-magicffi))
(define-public sbcl-shlex
(let ((commit "c5616dffca0d4d8ddbc1cd6f37a96d88477b2740"))
(package
(name "sbcl-shlex")
(version (git-version "0.0.0" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/ruricolist/cl-shlex")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "1nas024n4wv319bf40aal96g72bgi9nkapj2chywj2cc6r8hzkfg"))))
(build-system asdf-build-system/sbcl)
(inputs
`(("alexandria" ,sbcl-alexandria)
("serapeum" ,sbcl-serapeum)
("ppcre" ,sbcl-cl-ppcre)
("unicode" ,sbcl-cl-unicode)))
(home-page "https://github.com/ruricolist/cl-shlex")
(synopsis "Common Lisp lexical analyzer for shell-like syntaxes")
(description
"This library contains a lexer for syntaxes that use shell-like rules
for quoting and commenting. It is a port of the @code{shlex} module from Python’s
standard library.")
(license license:expat))))
(define-public ecl-shlex
(sbcl-package->ecl-package sbcl-shlex))
(define-public cl-shlex
(sbcl-package->cl-source-package sbcl-shlex))
(define-public sbcl-cmd
(let ((commit "e6a54dbf660bf229c80abc124fa47e7bb6d20c93"))
(package
(name "sbcl-cmd")
(version (git-version "0.0.1" "2" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/ruricolist/cmd/")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "1i0l8ci4cnkx84q4afmpkq51nxah24fqpi6k9kgjbxz6li3zp8hy"))))
(build-system asdf-build-system/sbcl)
(inputs
`(("alexandria" ,sbcl-alexandria)
("coreutils" ,coreutils)
("serapeum" ,sbcl-serapeum)
("shlex" ,sbcl-shlex)
("trivia" ,sbcl-trivia)))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-paths
(lambda* (#:key inputs #:allow-other-keys)
(let ((bin (string-append (assoc-ref inputs "coreutils") "/bin")))
(substitute* "cmd.lisp"
(("\"env\"") (format #f "\"~a/env\"" bin))
(("\"pwd\"") (format #f "\"~a/pwd\"" bin)))))))))
(home-page "https://github.com/ruricolist/cmd")
(synopsis "Conveniently run external programs from Common Lisp")
(description
"A utility for running external programs, built on UIOP.
Cmd is designed to be natural to use, protect against shell interpolation and
be usable from multi-threaded programs.")
(license license:expat))))
(define-public ecl-cmd
(sbcl-package->ecl-package sbcl-cmd))
(define-public cl-cmd
(sbcl-package->cl-source-package sbcl-cmd))
(define-public sbcl-ppath
(let ((commit "eb1a8173b4d1d691ea9a7699412123462f58c3ce"))
(package
(name "sbcl-ppath")
(version (git-version "0.1" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/fourier/ppath/")
(commit commit)))
(file-name (git-file-name name commit))
(sha256
(base32 "1c46q9lmzqv14z80d3fwdawgn3pn4922x31fyqvsvbcjm4hd16fb"))))
(build-system asdf-build-system/sbcl)
(inputs
`(("alexandria" ,sbcl-alexandria)
("cffi" ,sbcl-cffi)
("osicat" ,sbcl-osicat)
("ppcre" ,sbcl-cl-ppcre)
("split-sequence" ,sbcl-split-sequence)
("trivial-features" ,sbcl-trivial-features)))
(native-inputs
`(("cl-fad" ,sbcl-cl-fad)
("prove" ,sbcl-prove)))
(home-page "https://github.com/fourier/ppath")
(synopsis "Common Lisp's implementation of the Python's os.path module")
(description
"This library is a path strings manipulation library inspired by
Python's @code{os.path}. All functionality from @code{os.path} is supported on
major operation systems.
The philosophy behind is to use simple strings and \"dumb\" string
manipulation functions to handle paths and filenames. Where possible the
corresponding OS system functions are called.")
(license license:bsd-2))))
(define-public ecl-ppath
(sbcl-package->ecl-package sbcl-ppath))
(define-public cl-ppath
(sbcl-package->cl-source-package sbcl-ppath))
(define-public sbcl-trivial-escapes
(let ((commit "1eca78da2078495d09893be58c28b3aa7b8cc4d1"))
(package
(name "sbcl-trivial-escapes")
(version (git-version "1.2.0" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/williamyaoh/trivial-escapes")
(commit commit)))
(file-name (git-file-name name commit))
(sha256
(base32 "0v6h8lk17iqv1qkxgqjyzn8gi6v0hvq2vmfbb01md3zjvjqxn6lr"))))
(build-system asdf-build-system/sbcl)
(inputs
`(("named-readtables" ,sbcl-named-readtables)))
(native-inputs
`(("fiveam" ,sbcl-fiveam)))
(home-page "https://github.com/williamyaoh/trivial-escapes")
(synopsis "C-style escape directives for Common Lisp")
(description
"This Common Lisp library interprets escape characters the same way that
most other programming language do.
It provides four readtables. The default one lets you write strings like this:
@code{#\"This string has\na newline in it!\"}.")
(license license:public-domain))))
(define-public ecl-trivial-escapes
(sbcl-package->ecl-package sbcl-trivial-escapes))
(define-public cl-trivial-escapes
(sbcl-package->cl-source-package sbcl-trivial-escapes))
(define-public sbcl-cl-indentify
(let ((commit "eb770f434defa4cd41d84bca822428dfd0dbac53"))
(package
(name "sbcl-cl-indentify")
(version (git-version "0.1" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/yitzchak/cl-indentify")
(commit commit)))
(file-name (git-file-name name commit))
(sha256
(base32 "0ha36bhg474vr76vfhr13szc8cfdj1ickg92k1icz791bqaqg67p"))))
(build-system asdf-build-system/sbcl)
(inputs
`(("alexandria" ,sbcl-alexandria)
("command-line-arguments" ,sbcl-command-line-arguments)
("trivial-gray-streams" ,sbcl-trivial-gray-streams)))
(native-inputs
`(("trivial-escapes" ,sbcl-trivial-escapes)
("rove" ,sbcl-rove)))
(home-page "https://github.com/yitzchak/cl-indentify")
(synopsis "Code beautifier for Common Lisp")
(description
"A library and command line utility to automatically indent Common Lisp
source files.")
(license license:expat))))
(define-public ecl-cl-indentify
(sbcl-package->ecl-package sbcl-cl-indentify))
(define-public cl-indentify
(sbcl-package->cl-source-package sbcl-cl-indentify))
(define-public sbcl-concrete-syntax-tree
(let ((commit "abd242a59dadc5452aa9dbc1d313c83ec2c11f46"))
(package
(name "sbcl-concrete-syntax-tree")
(version (git-version "0.0.0" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/s-expressionists/Concrete-Syntax-Tree")
(commit commit)))
(file-name (git-file-name name commit))
(sha256
(base32 "1lyrglc3h1if44gxd9cwv90wa90nrdjvb7fry39b1xn8ywdfa7di"))))
(build-system asdf-build-system/sbcl)
(inputs
`(("acclimation" ,sbcl-acclimation)))
(home-page "https://github.com/s-expressionists/Concrete-Syntax-Tree")
(synopsis "Parse Common Lisp code into a concrete syntax tree")
(description
"This library is intended to solve the problem of source tracking for
Common Lisp code.
By \"source tracking\", it is meant that code elements that have a known
origin in the form of a position in a file or in an editor buffer are
associated with some kind of information about this origin.
Since the exact nature of such origin information depends on the Common Lisp
implementation and the purpose of wanting to track that origin, the library
does not impose a particular structure of this information. Instead, it
provides utilities for manipulating source code in the form of what is called
concrete syntax trees (CSTs for short) that preserve this information about
the origin.")
(license license:bsd-2))))
(define-public ecl-concrete-syntax-tree
(sbcl-package->ecl-package sbcl-concrete-syntax-tree))
(define-public cl-concrete-syntax-tree
(sbcl-package->cl-source-package sbcl-concrete-syntax-tree))
(define-public sbcl-eclector
(package
(name "sbcl-eclector")
(version "0.5.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/s-expressionists/Eclector")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0bwkla0jdp5bg0q1zca5wg22b0nbdmglgax345nrhsf8bdrh47wm"))))
(build-system asdf-build-system/sbcl)
(inputs
`(("acclimation" ,sbcl-acclimation)
("alexandria" ,sbcl-alexandria)
("closer-mop" ,sbcl-closer-mop)
("concrete-syntax-tree" ,sbcl-concrete-syntax-tree)))
(native-inputs
`(("fiveam" ,sbcl-fiveam)))
(arguments
'(#:asd-systems '("eclector"
"eclector-concrete-syntax-tree")))
(home-page "https://s-expressionists.github.io/Eclector/")
(synopsis "Highly customizable, portable Common Lisp reader")
(description
"Eclector is a portable Common Lisp reader that is highly customizable,
can recover from errors and can return concrete syntax trees.
In contrast to many other reader implementations, eclector can recover from
most errors in the input supplied to it and continue reading. This capability
is realized as a restart.
It can also produce instances of the concrete syntax tree classes provided by
the concrete syntax tree library.")
(license license:bsd-2)))
(define-public ecl-eclector
(sbcl-package->ecl-package sbcl-eclector))
(define-public cl-eclector
(sbcl-package->cl-source-package sbcl-eclector))
(define-public sbcl-jsown
(let ((commit "744c4407bef58dfa876d9da0b5c0205d869e7977"))
(package
(name "sbcl-jsown")
(version (git-version "1.0.1" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/madnificent/jsown")
(commit commit)))
(file-name (git-file-name name commit))
(sha256
(base32 "0gadvmf1d9bq35s61z76psrsnzwwk12svi66jigf491hv48wigw7"))))
(build-system asdf-build-system/sbcl)
(home-page "https://github.com/madnificent/jsown")
(synopsis "Fast JSON reader / writer library for Common Lisp")
(description
"@code{jsown} is a high performance Common Lisp JSON parser. Its aim
is to allow for the fast parsing of JSON objects in Common Lisp. Recently,
functions and macros have been added to ease the burden of writing and editing
@code{jsown} objects.
@code{jsown} allows you to parse JSON objects quickly to a modifiable Lisp
list and write them back. If you only need partial retrieval of objects,
@code{jsown} allows you to select the keys which you would like to see parsed.
@code{jsown} also has a JSON writer and some helper methods to alter the JSON
objects themselves.")
(license license:expat))))
(define-public ecl-jsown
(sbcl-package->ecl-package sbcl-jsown))
(define-public cl-jsown
(sbcl-package->cl-source-package sbcl-jsown))
(define-public sbcl-system-locale
(let ((commit "4b334bc2fa45651bcaa28ae7d9331095d6bf0a17"))
(package
(name "sbcl-system-locale")
(version (git-version "1.0.0" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Shinmera/system-locale/")
(commit commit)))
(file-name (git-file-name name commit))
(sha256
(base32 "00p5c053kmgq4ks6l9mxsqz6g3bjcybvkvj0bh3r90qgpkaawm1p"))))
(build-system asdf-build-system/sbcl)
(inputs
`(("documentation-utils" ,sbcl-documentation-utils)))
(home-page "https://shinmera.github.io/system-locale/")
(synopsis "Get the system's locale and language settings in Common Lisp")
(description
"This library retrieves locale information configured on the
system. This is helpful if you want to write applications and libraries that
display messages in the user's native language.")
(license license:zlib))))
(define-public ecl-system-locale
(sbcl-package->ecl-package sbcl-system-locale))
(define-public cl-system-locale
(sbcl-package->cl-source-package sbcl-system-locale))
(define-public sbcl-language-codes
(let ((commit "e7aa0e37cb97a3d37d6bc7316b479d01bff8f42e"))
(package
(name "sbcl-language-codes")
(version (git-version "1.0.0" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Shinmera/language-codes")
(commit commit)))
(file-name (git-file-name name commit))
(sha256
(base32 "0py176ibmsc01n5r0q1bs1ykqf5jwdbh8kx0j1a814l9y51241v0"))))
(build-system asdf-build-system/sbcl)
(inputs
`(("documentation-utils" ,sbcl-documentation-utils)))
(home-page "https://shinmera.github.io/language-codes/")
(synopsis "Map ISO language codes to language names in Common Lisp")
(description
"This is a small library providing the ISO-639 language code to
language name mapping.")
(license license:zlib))))
(define-public ecl-language-codes
(sbcl-package->ecl-package sbcl-language-codes))
(define-public cl-language-codes
(sbcl-package->cl-source-package sbcl-language-codes))
(define-public sbcl-multilang-documentation
(let ((commit "59e798a07e949e8957a20927f52aca425d84e4a0"))
(package
(name "sbcl-multilang-documentation")
(version (git-version "1.0.0" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Shinmera/multilang-documentation")
(commit commit)))
(file-name (git-file-name name commit))
(sha256
(base32 "13y5jskx8n2b7kimpfarr8v777w3b7zj5swg1b99nj3hk0843ixw"))))
(build-system asdf-build-system/sbcl)
(inputs
`(("documentation-utils" ,sbcl-documentation-utils)
("language-codes" ,sbcl-language-codes)
("system-locale" ,sbcl-system-locale)))
(home-page "https://shinmera.github.io/multilang-documentation/")
(synopsis "Add multiple languages support to Common Lisp documentation")
(description
"This library provides a drop-in replacement function for
cl:documentation that supports multiple docstrings per-language, allowing you
to write documentation that can be internationalised.")
(license license:zlib))))
(define-public ecl-multilang-documentation
(sbcl-package->ecl-package sbcl-multilang-documentation))
(define-public cl-multilang-documentation
(sbcl-package->cl-source-package sbcl-multilang-documentation))
(define-public sbcl-trivial-do
(let ((commit "03a1729f1e71bad3ebcf6cf098a0cce52dfa1163"))
(package
(name "sbcl-trivial-do")
(version (git-version "0.1" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/yitzchak/trivial-do")
(commit commit)))
(file-name (git-file-name name commit))
(sha256
(base32 "1ffva79nkicc7wc8c2ic5nayis3b2rk5sxzj74yjkymkjgbpcrgd"))))
(build-system asdf-build-system/sbcl)
(home-page "https://github.com/yitzchak/trivial-do")
(synopsis "Additional dolist style macros for Common Lisp")
(description
"Additional dolist style macros for Common Lisp, such as
@code{doalist}, @code{dohash}, @code{dolist*}, @code{doplist}, @code{doseq}
and @code{doseq*}.")
(license license:zlib))))
(define-public ecl-trivial-do
(sbcl-package->ecl-package sbcl-trivial-do))
(define-public cl-trivial-do
(sbcl-package->cl-source-package sbcl-trivial-do))
(define-public sbcl-common-lisp-jupyter
(let ((commit "61a9a8e7a18e2abd7af7c697ba5146fd19bd9d62"))
(package
(name "sbcl-common-lisp-jupyter")
(version (git-version "0.1" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/yitzchak/common-lisp-jupyter")
(commit commit)))
(file-name (git-file-name name commit))
(sha256
(base32 "0zyzl55l45w9z65ygi5pcwda5w5p1j1bb0p2zg2n5cpv8344dkh2"))))
(build-system asdf-build-system/sbcl)
(inputs
`(("alexandria" ,sbcl-alexandria)
("babel" ,sbcl-babel)
("bordeaux-threads" ,sbcl-bordeaux-threads)
("cl-base64" ,sbcl-cl-base64)
("cl-indentify" ,sbcl-cl-indentify)
("closer-mop" ,sbcl-closer-mop)
("eclector" ,sbcl-eclector)
("ironclad" ,sbcl-ironclad)
("iterate" ,sbcl-iterate)
("jsown" ,sbcl-jsown)
("multilang-documentation" ,sbcl-multilang-documentation)
("pzmq" ,sbcl-pzmq)
("puri" ,sbcl-puri)
("static-vectors" ,sbcl-static-vectors)
("trivial-do" ,sbcl-trivial-do)
("trivial-garbage" ,sbcl-trivial-garbage)
("trivial-gray-streams" ,sbcl-trivial-gray-streams)
("trivial-mimes" ,sbcl-trivial-mimes)))
(home-page "https://yitzchak.github.io/common-lisp-jupyter/")
(synopsis "Common Lisp kernel for Jupyter")
(description
"This is a Common Lisp kernel for Jupyter along with a library for
building Jupyter kernels, based on Maxima-Jupyter which was based on
@code{cl-jupyter}.")
(license license:zlib))))
(define-public ecl-common-lisp-jupyter
(sbcl-package->ecl-package sbcl-common-lisp-jupyter))
(define-public cl-common-lisp-jupyter
(sbcl-package->cl-source-package sbcl-common-lisp-jupyter))

47
gnu/packages/lisp.scm
View file

@ -17,6 +17,7 @@
;;; Copyright © 2019, 2020 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2019, 2020 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020 Zhu Zihao <all_but_last@163.com> ;;; Copyright © 2020 Zhu Zihao <all_but_last@163.com>
;;; Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -1083,7 +1084,7 @@ assembler, PEG) is less than 1MB.")
(define-public lisp-repl-core-dumper (define-public lisp-repl-core-dumper
(package (package
(name "lisp-repl-core-dumper") (name "lisp-repl-core-dumper")
(version "0.3.0") (version "0.5.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -1092,7 +1093,7 @@ assembler, PEG) is less than 1MB.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1w7x7d7bnrdj0bd04vnjy7d7sngvcx1yjr4iw429hdd9lzlg8rbg")))) (base32 "1hrilm9lxy7zdidn4wac4yfqryg3hfw0371nanhd7g9bcfjx7n1q"))))
(build-system copy-build-system) (build-system copy-build-system)
(arguments (arguments
'(#:install-plan '(#:install-plan
@ -1102,12 +1103,14 @@ assembler, PEG) is less than 1MB.")
(add-before 'install 'fix-utils-path (add-before 'install 'fix-utils-path
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let* ((coreutils (string-append (assoc-ref inputs "coreutils") "/bin/")) (let* ((coreutils (string-append (assoc-ref inputs "coreutils") "/bin/"))
(cat (string-append coreutils "cat"))
(paste (string-append coreutils "paste")) (paste (string-append coreutils "paste"))
(sort (string-append coreutils "sort")) (sort (string-append coreutils "sort"))
(basename (string-append coreutils "basename")) (basename (string-append coreutils "basename"))
(sed (string-append (assoc-ref inputs "sed") "/bin/sed"))) (sed (string-append (assoc-ref inputs "sed") "/bin/sed")))
(substitute* "lisp-repl-core-dumper" (substitute* "lisp-repl-core-dumper"
(("\\$\\(basename") (string-append "$(" basename)) (("\\$\\(basename") (string-append "$(" basename))
(("\\<cat\\>") cat)
(("\\<paste\\>") paste) (("\\<paste\\>") paste)
(("\\<sed\\>") sed) (("\\<sed\\>") sed)
(("\\<sort\\>") sort)))))))) (("\\<sort\\>") sort))))))))
@ -1126,3 +1129,43 @@ and make for REPLs that start blazing fast.
@item It allows you to include arbitrary libraries. @item It allows you to include arbitrary libraries.
@end itemize\n") @end itemize\n")
(license license:gpl3+))) (license license:gpl3+)))
(define-public buildapp
(package
(name "buildapp")
(version "1.5.6")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/xach/buildapp")
(commit (string-append "release-" version))))
(file-name (git-file-name name version))
(sha256
(base32 "020ipjfqa3l8skd97cj5kq837wgpj28ygfxnkv64cnjrlbnzh161"))))
(build-system gnu-build-system)
(native-inputs
`(("sbcl" ,sbcl)))
(arguments
`(#:tests? #f
#:make-flags
(list (string-append "DESTDIR=" (assoc-ref %outputs "out")))
#:strip-binaries? #f
#:phases
(modify-phases %standard-phases
(delete 'configure)
(add-after 'unpack 'set-home
(lambda _
(setenv "HOME" "/tmp")
#t))
(add-before 'install 'create-target-directory
(lambda* (#:key outputs #:allow-other-keys)
(let* ((bin (string-append (assoc-ref outputs "out") "/bin")))
(mkdir-p bin)
#t))))))
(home-page "https://www.xach.com/lisp/buildapp/")
(synopsis "Makes easy to build application executables with SBCL")
(description
"Buildapp is an application for SBCL or CCL that configures and saves an
executable Common Lisp image. It is similar to cl-launch and hu.dwim.build. ")
(license license:bsd-2)))

30
gnu/packages/lua.scm
View file

@ -3,7 +3,7 @@
;;; Copyright © 2014 Raimon Grau <raimonster@gmail.com> ;;; Copyright © 2014 Raimon Grau <raimonster@gmail.com>
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2014 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2016, 2017, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 doncatnip <gnopap@gmail.com> ;;; Copyright © 2016 doncatnip <gnopap@gmail.com>
;;; Copyright © 2016, 2017, 2019 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2016, 2017, 2019 Clément Lassieur <clement@lassieur.org>
@ -1066,7 +1066,7 @@ shell command executions.")
(define-public fennel (define-public fennel
(package (package
(name "fennel") (name "fennel")
(version "0.7.0") (version "0.8.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -1075,7 +1075,7 @@ shell command executions.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"17pdcwhfw754fblppw46qphnsvxrn3b7066cz54lv8c0c12iryim")) "1jng33vmnk6mi37l3x2z0plng940jpj7kz1s493ki80z3mkaxjfg"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -1083,18 +1083,36 @@ shell command executions.")
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) '(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
#:tests? #t ; even on cross-build
#:test-target "test" #:test-target "test"
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure) (delete 'configure)
(add-before 'build 'patch-lua-calls
(lambda* (#:key inputs #:allow-other-keys)
(let ((lua (string-append (assoc-ref inputs "lua") "/bin/lua")))
(setenv "LUA" lua)
(substitute* "old/launcher.lua"
(("/usr/bin/env lua") lua))
#t)))
(add-after 'build 'patch-fennel (add-after 'build 'patch-fennel
(lambda _ (lambda* (#:key inputs #:allow-other-keys)
(substitute* "fennel" (substitute* "fennel"
(("/usr/bin/env lua") (which "lua"))) (("/usr/bin/env .*lua")
(string-append (assoc-ref inputs "lua") "/bin/lua")))
#t))
(delete 'check)
(add-after 'install 'check
(assoc-ref %standard-phases 'check))
(add-after 'install 'install-manpage
(lambda* (#:key outputs #:allow-other-keys)
(install-file "fennel.1"
(string-append (assoc-ref outputs "out")
"/share/man/man1"))
#t))))) #t)))))
(inputs `(("lua" ,lua))) (inputs `(("lua" ,lua)))
(home-page "https://fennel-lang.org/") (home-page "https://fennel-lang.org/")
(synopsis "A Lisp that compiles to Lua") (synopsis "Lisp that compiles to Lua")
(description (description
"Fennel is a programming language that brings together the speed, "Fennel is a programming language that brings together the speed,
simplicity, and reach of Lua with the flexibility of a Lisp syntax and macro simplicity, and reach of Lua with the flexibility of a Lisp syntax and macro

7
gnu/packages/mail.scm
View file

@ -456,7 +456,8 @@ aliasing facilities to work just as they would on normal mail.")
(sha256 (sha256
(base32 (base32
"1m4ig69qw4g3lhm4351snmy5i0ch65fqc9vqqdybr6jy21w7w225")) "1m4ig69qw4g3lhm4351snmy5i0ch65fqc9vqqdybr6jy21w7w225"))
(patches (search-patches "mutt-store-references.patch")))) (patches (search-patches "mutt-store-references.patch"
"mutt-CVE-2021-3181.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("cyrus-sasl" ,cyrus-sasl) `(("cyrus-sasl" ,cyrus-sasl)
@ -2631,7 +2632,7 @@ converts them to maildir format directories.")
(define-public mblaze (define-public mblaze
(package (package
(name "mblaze") (name "mblaze")
(version "1.0") (version "1.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -2640,7 +2641,7 @@ converts them to maildir format directories.")
(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 "0hxy3mjjv4hg856sl1r15fdmqaw4s9c26b3lidsd5x0kpqy601ai")))) (base32 "1bir977vnqs76g8jgv1yivqw0wk2kn56l3l5r4w2ipix3fir138y"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("perl" ,perl))) `(("perl" ,perl)))

30
gnu/packages/maths.scm
View file

@ -104,6 +104,7 @@
#:use-module (gnu packages less) #:use-module (gnu packages less)
#:use-module (gnu packages lisp) #:use-module (gnu packages lisp)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages llvm)
#:use-module (gnu packages logging) #:use-module (gnu packages logging)
#:use-module (gnu packages lua) #:use-module (gnu packages lua)
#:use-module (gnu packages gnome) #:use-module (gnu packages gnome)
@ -919,14 +920,14 @@ singular value problems.")
(define-public gnuplot (define-public gnuplot
(package (package
(name "gnuplot") (name "gnuplot")
(version "5.2.7") (version "5.4.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/gnuplot/gnuplot/" (uri (string-append "mirror://sourceforge/gnuplot/gnuplot/"
version "/gnuplot-" version "/gnuplot-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 "1vglp4la40f5dpj0zdj63zprrkyjgzy068p35bz5dqxjyczm1zlp")))) (base32 "03jrqs5lvxmbbz2c4g17dn2hrxqwd3hfadk9q8wbkbkyas2h8sbb"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("readline" ,readline) (inputs `(("readline" ,readline)
("cairo" ,cairo) ("cairo" ,cairo)
@ -938,7 +939,9 @@ singular value problems.")
("texlive" ,texlive-tiny))) ("texlive" ,texlive-tiny)))
(arguments `(#:configure-flags (list (string-append (arguments `(#:configure-flags (list (string-append
"--with-texdir=" %output "--with-texdir=" %output
"/texmf-local/tex/latex/gnuplot")))) "/texmf-local/tex/latex/gnuplot"))
;; Plot on a dumb terminal during tests.
#:make-flags '("GNUTERM=dumb")))
(home-page "http://www.gnuplot.info") (home-page "http://www.gnuplot.info")
(synopsis "Command-line driven graphing utility") (synopsis "Command-line driven graphing utility")
(description "Gnuplot is a portable command-line driven graphing (description "Gnuplot is a portable command-line driven graphing
@ -3502,7 +3505,7 @@ point numbers.")
(define-public wxmaxima (define-public wxmaxima
(package (package
(name "wxmaxima") (name "wxmaxima")
(version "20.06.6") (version "20.12.2")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -3511,22 +3514,20 @@ point numbers.")
(commit (string-append "Version-" version)))) (commit (string-append "Version-" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "054f7n5kx75ng5j20rd5q27n9xxk03mrd7sbxyym1lsswzimqh4w")))) (base32 "1rxnxk7yanb9ac5pxbii6k7gg3b09pbp9rmwvsvgpbrk17mg79r9"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
`(("gettext" ,gettext-minimal) `(("gettext" ,gettext-minimal)))
("xorg-server" ,xorg-server-for-tests)))
;; TODO: Add libomp for multithreading support.
;; As of right now, enabling libomp causes the imageCells.wxm test to fail.
(inputs (inputs
`(("wxwidgets" ,wxwidgets) `(("libomp" ,libomp)
("wxwidgets" ,wxwidgets)
("maxima" ,maxima) ("maxima" ,maxima)
;; Runtime support. ;; Runtime support.
("adwaita-icon-theme" ,adwaita-icon-theme) ("adwaita-icon-theme" ,adwaita-icon-theme)
("gtk+" ,gtk+) ("gtk+" ,gtk+)
("shared-mime-info" ,shared-mime-info))) ("shared-mime-info" ,shared-mime-info)))
(arguments (arguments
`(#:test-target "test" `(#:tests? #f ; tests fail non-deterministically
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'patch-doc-path (add-after 'unpack 'patch-doc-path
@ -3537,13 +3538,6 @@ point numbers.")
(substitute* "src/Dirstructure.cpp" (substitute* "src/Dirstructure.cpp"
(("/doc/wxmaxima-\\%s") "/doc/wxmaxima")) (("/doc/wxmaxima-\\%s") "/doc/wxmaxima"))
#t)) #t))
(add-before 'check 'pre-check
(lambda _
;; Tests require a running X server.
(system "Xvfb :1 &")
(setenv "DISPLAY" ":1")
(setenv "HOME" (getcwd))
#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)
(wrap-program (string-append (assoc-ref outputs "out") (wrap-program (string-append (assoc-ref outputs "out")

6
gnu/packages/matrix.scm
View file

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020 Alex ter Weele <alex.ter.weele@gmail.com> ;;; Copyright © 2020 Alex ter Weele <alex.ter.weele@gmail.com>
;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2020, 2021 Michael Rohleder <mike@rohleder.de>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -61,13 +61,13 @@ an LDAP server.")
(define-public synapse (define-public synapse
(package (package
(name "synapse") (name "synapse")
(version "1.24.0") (version "1.25.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "matrix-synapse" version)) (uri (pypi-uri "matrix-synapse" version))
(sha256 (sha256
(base32 (base32
"0pmn8aqc7jj2xdrwljjz2vwg58hlyxp9axac471pcmg2vqais5yb")))) "0382qcsmgvg24p0xvb37kn3y1kd3bn363kblgwg58iy92df0pga4"))))
(build-system python-build-system) (build-system python-build-system)
;; TODO Run tests with ‘PYTHONPATH=. trial3 tests’. ;; TODO Run tests with ‘PYTHONPATH=. trial3 tests’.
(propagated-inputs (propagated-inputs

14
gnu/packages/messaging.scm
View file

@ -24,7 +24,7 @@
;;; Copyright © 2020 Reza Alizadeh Majd <r.majd@pantherx.org> ;;; Copyright © 2020 Reza Alizadeh Majd <r.majd@pantherx.org>
;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de> ;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;;; Copyright © 2020 Mason Hock <chaosmonk@riseup.net> ;;; Copyright © 2020 Mason Hock <chaosmonk@riseup.net>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2020, 2021 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org> ;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
;;; Copyright © 2020 Robert Karszniewicz <avoidr@posteo.de> ;;; Copyright © 2020 Robert Karszniewicz <avoidr@posteo.de>
;;; ;;;
@ -1998,7 +1998,7 @@ is also scriptable and extensible via Guile.")
(define-public libmesode (define-public libmesode
(package (package
(name "libmesode") (name "libmesode")
(version "0.9.3") (version "0.10.1")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -2007,7 +2007,7 @@ is also scriptable and extensible via Guile.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0xzfg1xx88cn36352nnjlb1p7xyw32yqkhjzq10px88iaaqz1vv0")))) "1bxnkhrypgv41qyy1n545kcggmlw1hvxnhwihijhhcf2pxd2s654"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("expat" ,expat) `(("expat" ,expat)
@ -2058,7 +2058,7 @@ are both supported).")
(define-public profanity (define-public profanity
(package (package
(name "profanity") (name "profanity")
(version "0.9.5") (version "0.10.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -2067,7 +2067,7 @@ are both supported).")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"00j9l9v62rz9hprgiy1vrz8v3v59ph18h8kskqxr31fgqvjv5xr3")))) "137z77514fgj2dk13d12g4jrn6gs5k85nwrk1r1kiv7rj0jy61aa"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -2354,7 +2354,7 @@ There is support for:
(define-public quaternion (define-public quaternion
(package (package
(name "quaternion") (name "quaternion")
(version "0.0.9.4e") (version "0.0.9.4f")
(outputs '("out" "debug")) (outputs '("out" "debug"))
(source (source
(origin (origin
@ -2364,7 +2364,7 @@ There is support for:
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0hqhg7l6wpkdbzrdjvrbqymmahziri07ba0hvbii7dd2p0h248fv")))) (base32 "1q9ddz4rs02a0w3lwrsjnh59khv38cq9f0kv09vnwvazvayn87ck"))))
(build-system qt-build-system) (build-system qt-build-system)
(inputs (inputs
`(("libqmatrixclient" ,libqmatrixclient) `(("libqmatrixclient" ,libqmatrixclient)

8
gnu/packages/mp3.scm
View file

@ -82,6 +82,10 @@
;; remove option that is not supported by gcc any more ;; remove option that is not supported by gcc any more
(substitute* "configure" ((" -fforce-mem") "")) (substitute* "configure" ((" -fforce-mem") ""))
#t)) #t))
;; Normally one should not add a pkg-config file if one is not provided
;; by upstream developers, but Audacity expects a pkg-config file for
;; this package, and other major GNU/Linux distributions already provide
;; such a file.
(add-after 'install 'install-pkg-config (add-after 'install 'install-pkg-config
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
@ -127,6 +131,10 @@ This package contains the library.")
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
;; Normally one should not add a pkg-config file if one is not provided
;; by upstream developers, but Audacity expects a pkg-config file for
;; this package, and other major GNU/Linux distributions already provide
;; such a file.
(add-after 'install 'install-pkg-config (add-after 'install 'install-pkg-config
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))

76
gnu/packages/mpd.scm
View file

@ -10,6 +10,7 @@
;;; Copyright © 2020 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2020 Lars-Dominik Braun <lars@6xq.net> ;;; Copyright © 2020 Lars-Dominik Braun <lars@6xq.net>
;;; Copyright © 2020 Simon Streit <simon@netpanic.org> ;;; Copyright © 2020 Simon Streit <simon@netpanic.org>
;;; Copyright © 2021 Noah Evans <noah@nevans.me>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -104,7 +105,7 @@ interfacing MPD in the C, C++ & Objective C languages.")
(define-public mpd (define-public mpd
(package (package
(name "mpd") (name "mpd")
(version "0.22.3") (version "0.22.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (uri
@ -113,7 +114,7 @@ interfacing MPD in the C, C++ & Objective C languages.")
"/mpd-" version ".tar.xz")) "/mpd-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1kvcarqijyw07bdqszjsn62plmncaid5az0q542p6rsygc1i501k")))) "1l4x2jrv04hp4q9gyfg79g78bk68lrd6wd3hysl6y91rln9sj7l9"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:configure-flags '("-Ddocumentation=enabled"))) `(#:configure-flags '("-Ddocumentation=enabled")))
@ -228,7 +229,7 @@ terminal using ncurses.")
(define-public ncmpcpp (define-public ncmpcpp
(package (package
(name "ncmpcpp") (name "ncmpcpp")
(version "0.9.1") (version "0.9.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (uri
@ -236,7 +237,7 @@ terminal using ncurses.")
version ".tar.bz2")) version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"0x35nd4v31sma8fliqdbn1nxpjyi8hv472318sfb3xbmr4wlm0fb")))) "06rs734n120jp51hr0fkkhxrm7zscbhpdwls0m5b5cccghazdazs"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("libmpdclient" ,libmpdclient) (inputs `(("libmpdclient" ,libmpdclient)
("boost" ,boost) ("boost" ,boost)
@ -284,20 +285,22 @@ information about tracks being played to a scrobbler, such as Libre.FM.")
(define-public python-mpd2 (define-public python-mpd2
(package (package
(name "python-mpd2") (name "python-mpd2")
(version "0.5.5") (version "3.0.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "python-mpd2" version)) (uri (pypi-uri "python-mpd2" version))
(sha256 (sha256
(base32 (base32
"0laypd7h1j14b4vrmiayqlzdsh2j5hc3zv4l0fqvbrbw9y6763ii")))) "0fxssbmnv44m03shjyvbqslc69b0160702j2s0flgvdxjggrnbjj"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
'(#:phases '(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'check (replace 'check
(lambda _ (invoke "python" "mpd_test.py")))))) (lambda _ (invoke "python" "-m" "pytest" "mpd/tests.py"))))))
(native-inputs `(("python-mock" ,python-mock))) (native-inputs
`(("python-mock" ,python-mock)
("python-pytest" ,python-pytest)))
(home-page "https://github.com/Mic92/python-mpd2") (home-page "https://github.com/Mic92/python-mpd2")
(synopsis "Python MPD client library") (synopsis "Python MPD client library")
(description "Python-mpd2 is a Python library which provides a client (description "Python-mpd2 is a Python library which provides a client
@ -310,7 +313,7 @@ interface for the Music Player Daemon.")
(define-public sonata (define-public sonata
(package (package
(name "sonata") (name "sonata")
(version "1.7b1") (version "1.7.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -319,7 +322,7 @@ interface for the Music Player Daemon.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1npbxlrg6k154qybfd250nq2p96kxdsdkj9wwnp93gljnii3g8wh")))) "0rl8w7s2asff626clzfvyz987l2k4ml5dg417mqp9v8a962q0v2x"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:modules ((guix build gnu-build-system) `(#:modules ((guix build gnu-build-system)
@ -460,3 +463,56 @@ of the music library will be created to provide a hierarchy of albums and
artists along with albumart.") artists along with albumart.")
(home-page "https://github.com/cdrummond/cantata") (home-page "https://github.com/cdrummond/cantata")
(license license:gpl3+))) (license license:gpl3+)))
(define-public mcg
(package
(name "mcg")
(version "2.1.2")
(source
(origin
(method git-fetch)
(uri
(git-reference
(url "https://gitlab.com/coderkun/mcg")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"01iqxydssxyi4s644dwl64vm7xhn0szd99hdpywbipvb7kwp5196"))))
(build-system python-build-system)
(native-inputs
`(("glib:bin" ,glib "bin")
("gobject-introspection" ,gobject-introspection)
("pkg-config" ,pkg-config)))
(inputs
`(("avahi" ,avahi)
("dconf" ,dconf)
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
("gtk+" ,gtk+)
("python-pygobject" ,python-pygobject)))
(arguments
`(#:imported-modules ((guix build glib-or-gtk-build-system)
,@%python-build-system-modules)
#:modules ((guix build python-build-system)
((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
(guix build utils))
#:phases
(modify-phases %standard-phases
(add-after 'install 'wrap-program
(lambda* (#:key outputs #:allow-other-keys)
(let ((prog (string-append (assoc-ref outputs "out")
"/bin/mcg")))
(wrap-program prog
`("PYTHONPATH" = (,(getenv "PYTHONPATH")))
`("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))
#t)))
(add-after 'wrap-program 'glib-or-gtk-wrap
(assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))))
(synopsis "Covergrid for the MPD")
(description
"mcg (CoverGrid) is a client for the Music Player Daemon (MPD), focusing
on albums instead of single tracks. It is not intended to be a replacement
for your favorite MPD client but an addition to get a better
album-experience.")
(home-page "https://gitlab.com/coderkun/mcg")
(license license:gpl3+)))

8
gnu/packages/music.scm
View file

@ -2296,7 +2296,7 @@ export.")
(define-public pd (define-public pd
(package (package
(name "pd") (name "pd")
(version "0.51-3") (version "0.51-4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (uri
@ -2304,7 +2304,7 @@ export.")
version ".src.tar.gz")) version ".src.tar.gz"))
(sha256 (sha256
(base32 (base32
"10cqg387xdpiirak5v9y1lpvcds9bpqz61znx6d1m1hb45n513aw")))) "1hgw1ciwr59f4f9s0h7c2l36wcsn3jsddhr1r9qj97vf64c1ynaj"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(let ((wish (string-append "wish" (version-major+minor (let ((wish (string-append "wish" (version-major+minor
@ -4434,7 +4434,7 @@ standalone JACK client and an LV2 plugin is also available.")
(define-public musescore (define-public musescore
(package (package
(name "musescore") (name "musescore")
(version "3.5.2") (version "3.6")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -4443,7 +4443,7 @@ standalone JACK client and an LV2 plugin is also available.")
(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 "0yzps5xxa50cr2i5iv2ycjdywd0mcrdd6hx93l4p8lfljag3w3al")) (base32 "0c9yf8irkism3ffzzpkx636wa6b1r1lgpsb2x63pr0gbi5ss5kyh"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Remove unused libraries. ;; Remove unused libraries.

4
gnu/packages/musl.scm
View file

@ -28,14 +28,14 @@
(define-public musl (define-public musl
(package (package
(name "musl") (name "musl")
(version "1.2.1") (version "1.2.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.musl-libc.org/releases/" (uri (string-append "https://www.musl-libc.org/releases/"
"musl-" version ".tar.gz")) "musl-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0jz8fzwgvfyjgxjbpw35ixdglp2apqjvp8m386f6yr4zacc6xbv8")))) "1p8r6bac64y98ln0wzmnixysckq3crca69ys7p16sy9d04i975lv"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; musl has no tests `(#:tests? #f ; musl has no tests

6
gnu/packages/nano.scm
View file

@ -2,7 +2,7 @@
;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Rene Saavedra <rennes@openmailbox.org> ;;; Copyright © 2016 Rene Saavedra <rennes@openmailbox.org>
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -30,13 +30,13 @@
(define-public nano (define-public nano
(package (package
(name "nano") (name "nano")
(version "5.4") (version "5.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/nano/nano-" version ".tar.xz")) (uri (string-append "mirror://gnu/nano/nano-" version ".tar.xz"))
(sha256 (sha256
(base32 "1sc6xl9935k9s9clkv83hapijka4qknfnj6f15c3b1i2n84396gy")))) (base32 "0jkyd3yzcidnvnj1k9bmplzlbd303x6xxblpp5np7zs1kfzq22rr"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("gettext" ,gettext-minimal) `(("gettext" ,gettext-minimal)

25
gnu/packages/networking.scm
View file

@ -913,14 +913,14 @@ transparently check connection attempts against an access control list.")
(define-public zeromq (define-public zeromq
(package (package
(name "zeromq") (name "zeromq")
(version "4.3.3") (version "4.3.4")
(source (origin (source
(origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/zeromq/libzmq/releases" (uri (string-append "https://github.com/zeromq/libzmq/releases"
"/download/v" version "/zeromq-" version ".tar.gz")) "/download/v" version "/zeromq-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32 "1rf3jmi36ms8jh2g5cvi253h43l6xdfq0r7mvp95va7mi4d014y5"))))
"18km71p77jm1w7wly2a5mxvphjb0f2l6s08cg382x55f6zdqb4lx"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments '(#:configure-flags '("--disable-static"))) (arguments '(#:configure-flags '("--disable-static")))
(home-page "https://zeromq.org") (home-page "https://zeromq.org")
@ -1664,7 +1664,7 @@ reusing frequently-requested web pages.")
(define-public bwm-ng (define-public bwm-ng
(package (package
(name "bwm-ng") (name "bwm-ng")
(version "0.6.2") (version "0.6.3")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -1673,7 +1673,7 @@ reusing frequently-requested web pages.")
(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 "0k906wb4pw3dcqpcwnni78lahzi3bva483f8c17sjykic7as4y5n")))) (base32 "1gpp2l3w479h1w5skjra5xy0gxd24kvmk6i4psbkafnv2399la4k"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -3756,14 +3756,14 @@ thousands of connections is clearly realistic with today's hardware.")
(define-public lldpd (define-public lldpd
(package (package
(name "lldpd") (name "lldpd")
(version "1.0.7") (version "1.0.8")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://media.luffy.cx/files/lldpd/lldpd-" (uri (string-append "https://media.luffy.cx/files/lldpd/lldpd-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 "1qc7k83zpcq27hpjv1lmgrj4la2zy1gspwk5jas43j49siwr3xqx")) (base32 "1vrxr8lgkw7q6ixaaili6ac7i0j0326194s498n2dxihdvkh1llq"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -3849,15 +3849,14 @@ stamps.")
(define-public nbd (define-public nbd
(package (package
(name "nbd") (name "nbd")
(version "3.20") (version "3.21")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/nbd/nbd/3.20/nbd-" version (uri (string-append "mirror://sourceforge/nbd/nbd/" version
".tar.xz")) "/nbd-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32 "1ydylvvayi4w2d08flji9q03sl7y8hn0c26vsay3nwwikprqls77"))))
"1kfnyx52nna2mnw264njk1dl2zc8m78sz031yp65mbmpi99v7qg0"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("glib" ,glib))) `(("glib" ,glib)))

4
gnu/packages/node.scm
View file

@ -8,6 +8,7 @@
;;; Copyright © 2018, 2019, 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2018, 2019, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2020 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2020 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -220,4 +221,5 @@ devices.")
`(cons* "--shared" "--without-npm" ,flags)) `(cons* "--shared" "--without-npm" ,flags))
((#:phases phases '%standard-phases) ((#:phases phases '%standard-phases)
`(modify-phases ,phases `(modify-phases ,phases
(delete 'patch-npm-shebang))))))) (delete 'patch-npm-shebang)
(delete 'patch-node-shebang)))))))

135
gnu/packages/ocaml.scm
View file

@ -18,6 +18,7 @@
;;; Copyright © 2020 Simon Tournier <zimon.toutoune@gmail.com> ;;; Copyright © 2020 Simon Tournier <zimon.toutoune@gmail.com>
;;; Copyright © 2020 divoplade <d@divoplade.fr> ;;; Copyright © 2020 divoplade <d@divoplade.fr>
;;; Copyright © 2020 pukkamustard <pukkamustard@posteo.net> ;;; Copyright © 2020 pukkamustard <pukkamustard@posteo.net>
;;; Copyright © 2021 aecepoglu <aecepoglu@fastmail.fm>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -390,6 +391,69 @@ repository-wide uninstallability checks.")
;; with static-linking exception ;; with static-linking exception
(license license:lgpl2.1+))) (license license:lgpl2.1+)))
(define-public ocaml-down
(package
(name "ocaml-down")
(version "0.0.3")
(source
(origin
(method url-fetch)
(uri (string-append "https://erratique.ch/software/down/releases/down-"
version ".tbz"))
(sha256
(base32
"1nz2f5j17frgr2vrslcz9klmi6w9sm2vqwwwpi33ngcm3rgmsrlg"))))
(build-system ocaml-build-system)
(arguments
`(#:tests? #f ;no tests
#:phases
(modify-phases %standard-phases
(delete 'configure))
#:build-flags
(list "build" "--lib-dir"
(string-append (assoc-ref %outputs "out") "/lib/ocaml/site-lib"))))
(native-inputs
`(("ocaml-findlib" ,ocaml-findlib)
("ocamlbuild" ,ocamlbuild)
("ocaml-topkg" ,ocaml-topkg)
("opam" ,opam)))
(home-page "https://erratique.ch/software/down")
(synopsis "OCaml toplevel (REPL) upgrade")
(description "Down is an unintrusive user experience upgrade for the
@command{ocaml} toplevel (REPL).
Simply load the zero dependency @code{down} library in the @command{ocaml}
toplevel and you get line edition, history, session support and identifier
completion and documentation with @command{ocp-index}.
Add this to your @file{~/.ocamlinit}:
@example
#use \"down.top\"
@end example
You may also need to add this to your @file{~/.ocamlinit} and declare
the environment variable @code{OCAML_TOPLEVEL_PATH}:
@example
let () =
try Topdirs.dir_directory (Sys.getenv \"OCAML_TOPLEVEL_PATH\")
with Not_found -> ()
@end example
OR
@example
let () = String.split_on_char ':' (Sys.getenv \"OCAMLPATH\")
|> List.filter (fun x -> Filename.check_suffix x \"/site-lib\")
|> List.map (fun x -> x ^ \"/toplevel\")
(* remove the line below if you don't want to see the text
every time you start the toplevel *)
|> List.map (fun x -> Printf.printf \"adding directory %s\\n\" x; x)
|> List.iter Topdirs.dir_directory;;
@end example")
(license license:isc)))
(define-public ocaml-opam-file-format (define-public ocaml-opam-file-format
(package (package
(name "ocaml-opam-file-format") (name "ocaml-opam-file-format")
@ -2363,6 +2427,77 @@ the JSON data format. It can process JSON text without blocking on IO and
without a complete in-memory representation of the data.") without a complete in-memory representation of the data.")
(license license:isc))) (license license:isc)))
(define-public ocaml-ocp-indent
(package
(name "ocaml-ocp-indent")
(version "1.8.2")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/OCamlPro/ocp-indent")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"1dvcl108ir9nqkk4mjm9xhhj4p9dx9bmg8bnms54fizs1x3x8ar3"))))
(build-system dune-build-system)
(arguments
`(#:test-target "tests"
#:build-flags (list "--profile=release")))
(propagated-inputs
`(("ocaml-cmdliner" ,ocaml-cmdliner)))
(home-page "https://www.typerex.org/ocp-indent.html")
(synopsis "Tool to indent OCaml programs")
(description
"Ocp-indent is based on an approximate, tolerant OCaml parser
and a simple stack machine. Presets and configuration options are available,
with the possibility to set them project-wide. It supports the most common
syntax extensions, and it is extensible for others.
This package includes:
@itemize
@item An indentor program, callable from the command-line or from within editors,
@item Bindings for popular editors,
@item A library that can be directly used by editor writers, or just for
fault-tolerant and approximate parsing.
@end itemize")
(license license:lgpl2.1)))
(define-public ocaml-ocp-index
(package
(name "ocaml-ocp-index")
(version "1.2.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/OCamlPro/ocp-index")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"08r7mxdnxmhff37fw4hmrpjgckgi5kaiiiirwp4rmdl594z0h9c8"))))
(build-system dune-build-system)
(arguments
`(#:package "ocp-index"))
(propagated-inputs
`(("ocaml-ocp-indent" ,ocaml-ocp-indent)
("ocaml-re" ,ocaml-re)
("ocaml-cmdliner" ,ocaml-cmdliner)))
(native-inputs
`(("ocaml-cppo" ,ocaml-cppo)))
(home-page "https://www.typerex.org/ocp-index.html")
(synopsis "Lightweight completion and documentation browsing for OCaml libraries")
(description "This package includes only the @code{ocp-index} library
and command-line tool.")
;; All files in libs/ are GNU lgpl2.1
;; For static linking, clause 6 of LGPL is lifted
;; All other files under GNU gpl3
(license (list license:gpl3+
license:lgpl2.1+))))
(define-public ocaml-ocurl (define-public ocaml-ocurl
(package (package
(name "ocaml-ocurl") (name "ocaml-ocurl")

4
gnu/packages/onc-rpc.scm
View file

@ -92,7 +92,7 @@ IPv4 and IPv6. ONC RPC is notably used by the network file system (NFS).")
(define-public rpcbind (define-public rpcbind
(package (package
(name "rpcbind") (name "rpcbind")
(version "0.2.4") (version "1.2.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -102,7 +102,7 @@ IPv4 and IPv6. ONC RPC is notably used by the network file system (NFS).")
(patches (search-patches "rpcbind-CVE-2017-8779.patch")) (patches (search-patches "rpcbind-CVE-2017-8779.patch"))
(sha256 (sha256
(base32 (base32
"0rjc867mdacag4yqvs827wqhkh27135rp9asj06ixhf71m9rljh7")))) "0ynszy5hpc7wbz8xngqwyhgbi9cay73y43izqhcmrcv375l61qrc"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags

51
gnu/packages/package-management.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015, 2017, 2020 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2017, 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Muriithi Frederick Muriuki <fredmanglis@gmail.com> ;;; Copyright © 2017 Muriithi Frederick Muriuki <fredmanglis@gmail.com>
;;; Copyright © 2017, 2018 Oleg Pykhalov <go.wigust@gmail.com> ;;; Copyright © 2017, 2018 Oleg Pykhalov <go.wigust@gmail.com>
@ -9,7 +9,7 @@
;;; Copyright © 2018, 2019 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2018, 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018 Sou Bunnbu <iyzsong@member.fsf.org> ;;; Copyright © 2018 Sou Bunnbu <iyzsong@member.fsf.org>
;;; Copyright © 2018, 2019 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2018, 2019 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2019, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019 Jonathan Brielmaier <jonathan.brielmaier@web.de> ;;; Copyright © 2019 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
@ -132,8 +132,8 @@
;; Note: the 'update-guix-package.scm' script expects this definition to ;; Note: the 'update-guix-package.scm' script expects this definition to
;; start precisely like this. ;; start precisely like this.
(let ((version "1.2.0") (let ((version "1.2.0")
(commit "db42ee65bd657bae9b1a598cbdbe86079dc85f81") (commit "d4a562ba7ac4549cc2d57eff7f440026a2045f45")
(revision 9)) (revision 11))
(package (package
(name "guix") (name "guix")
@ -149,7 +149,7 @@
(commit commit))) (commit commit)))
(sha256 (sha256
(base32 (base32
"1kizkw6cxh6mhc8kal2fglnhyp1i668b4ilqbxq72slbmf9jr9jl")) "05gkymzfl0fdb2zjyvvn7w15arfnn7fgpbn3bch9r5yc7ldxg868"))
(file-name (string-append "guix-" version "-checkout")))) (file-name (string-append "guix-" version "-checkout"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
@ -301,6 +301,7 @@ $(prefix)/etc/init.d\n")))
(sqlite (assoc-ref inputs "guile-sqlite3")) (sqlite (assoc-ref inputs "guile-sqlite3"))
(zlib (assoc-ref inputs "guile-zlib")) (zlib (assoc-ref inputs "guile-zlib"))
(lzlib (assoc-ref inputs "guile-lzlib")) (lzlib (assoc-ref inputs "guile-lzlib"))
(zstd (assoc-ref inputs "guile-zstd"))
(git (assoc-ref inputs "guile-git")) (git (assoc-ref inputs "guile-git"))
(bs (assoc-ref inputs (bs (assoc-ref inputs
"guile-bytestructures")) "guile-bytestructures"))
@ -308,7 +309,7 @@ $(prefix)/etc/init.d\n")))
(gnutls (assoc-ref inputs "gnutls")) (gnutls (assoc-ref inputs "gnutls"))
(locales (assoc-ref inputs "glibc-utf8-locales")) (locales (assoc-ref inputs "glibc-utf8-locales"))
(deps (list gcrypt json sqlite gnutls git (deps (list gcrypt json sqlite gnutls git
bs ssh zlib lzlib)) bs ssh zlib lzlib zstd))
(deps* ,@(if (%current-target-system) (deps* ,@(if (%current-target-system)
'(deps) '(deps)
'((cons avahi deps)))) '((cons avahi deps))))
@ -362,6 +363,7 @@ $(prefix)/etc/init.d\n")))
("guile-sqlite3" ,guile-sqlite3) ("guile-sqlite3" ,guile-sqlite3)
("guile-zlib" ,guile-zlib) ("guile-zlib" ,guile-zlib)
("guile-lzlib" ,guile-lzlib) ("guile-lzlib" ,guile-lzlib)
("guile-zstd" ,guile-zstd)
("guile-ssh" ,guile-ssh) ("guile-ssh" ,guile-ssh)
("guile-git" ,guile-git) ("guile-git" ,guile-git)
@ -417,11 +419,19 @@ $(prefix)/etc/init.d\n")))
("guile-ssh" ,guile-ssh) ("guile-ssh" ,guile-ssh)
("guile-git" ,guile-git) ("guile-git" ,guile-git)
("guile-zlib" ,guile-zlib) ("guile-zlib" ,guile-zlib)
("guile-lzlib" ,guile-lzlib))) ("guile-lzlib" ,guile-lzlib)
("guile-zstd" ,guile-zstd)))
(native-search-paths (native-search-paths
(list (search-path-specification (list (search-path-specification
(variable "GUIX_EXTENSIONS_PATH") (variable "GUIX_EXTENSIONS_PATH")
(files '("share/guix/extensions"))))) (files '("share/guix/extensions")))
;; (guix git) and (guix build download) honor this variable whose
;; name comes from OpenSSL.
(search-path-specification
(variable "SSL_CERT_DIR")
(separator #f) ;single entry
(files '("etc/ssl/certs")))))
(home-page "https://www.gnu.org/software/guix/") (home-page "https://www.gnu.org/software/guix/")
(synopsis "Functional package manager for installed software packages and versions") (synopsis "Functional package manager for installed software packages and versions")
@ -1130,7 +1140,7 @@ outputs of those builds.")
(define-public guix-jupyter (define-public guix-jupyter
(package (package
(name "guix-jupyter") (name "guix-jupyter")
(version "0.1.0") (version "0.2.1")
(home-page "https://gitlab.inria.fr/guix-hpc/guix-kernel") (home-page "https://gitlab.inria.fr/guix-hpc/guix-kernel")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
@ -1138,24 +1148,7 @@ outputs of those builds.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(sha256 (sha256
(base32 (base32
"01z7jjkc7r7lj6637rcgpz40v8xqqyfp6871h94yvcnwm7zy9h1n")) "1kqwfp5h95s6mirq5nbydsbmlhsinn32grz1ld5mbxvhl6sn2i0j"))
(modules '((guix build utils)))
(snippet
'(begin
;; Allow builds with Guile 3.0.
(substitute* "configure.ac"
(("^GUILE_PKG.*")
"GUILE_PKG([3.0 2.2])\n"))
;; Avoid name clash and build failure now that
;; 'define-json-mapping' is also provided by Guile-JSON, as
;; of version 4.3.
(substitute* (find-files "." "\\.scm$")
(("define-json-mapping")
"define-json-mapping*")
(("<=>")
"<->"))
#t))
(file-name (string-append "guix-jupyter-" version "-checkout")))) (file-name (string-append "guix-jupyter-" version "-checkout"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
@ -1348,14 +1341,14 @@ the boot loader configuration.")
(define-public flatpak (define-public flatpak
(package (package
(name "flatpak") (name "flatpak")
(version "1.8.2") (version "1.10.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/flatpak/flatpak/releases/download/" (uri (string-append "https://github.com/flatpak/flatpak/releases/download/"
version "/flatpak-" version ".tar.xz")) version "/flatpak-" version ".tar.xz"))
(sha256 (sha256
(base32 "1c45a0k7wx685n5b3ihv7dk0mm2kmwbw7cx8w5g2la62yxfn49kr")))) (base32 "1dywvfpmszvp2wy5hvpzy8z6gz2gzmi9p302njp52p9vpx14ydf1"))))
;; Wrap 'flatpak' so that GIO_EXTRA_MODULES is set, thereby allowing GIO to ;; Wrap 'flatpak' so that GIO_EXTRA_MODULES is set, thereby allowing GIO to
;; find the TLS backend in glib-networking. ;; find the TLS backend in glib-networking.

6
gnu/packages/password-utils.scm
View file

@ -9,7 +9,7 @@
;;; Copyright © 2016, 2019, 2020 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2016, 2019, 2020 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Jelle Licht <jlicht@fsfe.org> ;;; Copyright © 2017 Jelle Licht <jlicht@fsfe.org>
;;; Copyright © 2017, 2019 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2017, 2019 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2017, 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2017, 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
@ -123,7 +123,7 @@ human.")
(define-public keepassxc (define-public keepassxc
(package (package
(name "keepassxc") (name "keepassxc")
(version "2.6.2") (version "2.6.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -131,7 +131,7 @@ human.")
"/releases/download/" version "/keepassxc-" "/releases/download/" version "/keepassxc-"
version "-src.tar.xz")) version "-src.tar.xz"))
(sha256 (sha256
(base32 "0f3ygnjzjijqmmrvrslwsbnz208jgxp5bwy4p336w3bn1bggl6qh")))) (base32 "1lgp20597dzj8qn8a71x3a6b549rvqybqx4haywwb09qiznvdq77"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:configure-flags '("-DWITH_XC_ALL=YES" '(#:configure-flags '("-DWITH_XC_ALL=YES"

152
gnu/packages/patches/freebayes-devendor-deps.patch Normal file
View file

@ -0,0 +1,152 @@
This patch is original to Guix, ongoing work to upstream bits as possible.
From 9acc56db5e7469f5976be38b52ba4993de98ee38 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Sun, 17 Jan 2021 13:27:17 +0200
Subject: [PATCH] devendor-dependants
---
meson.build | 84 +++++++++++++++++++++++++++++++++++++++++------------
1 file changed, 66 insertions(+), 18 deletions(-)
diff --git a/meson.build b/meson.build
index f6bf242..bded4af 100644
--- a/meson.build
+++ b/meson.build
@@ -9,8 +9,13 @@ project('freebayes', ['cpp', 'c'],
zlib_dep = dependency('zlib')
lzma_dep = dependency('liblzma')
+simde_dep = dependency('simde')
bzip2_dep = dependency('bz2lib', required: false)
htslib_dep = dependency('htslib', required : false)
+tabixpp_dep = dependency('tabixpp', required : false)
+fastahack_dep = dependency('fastahack', required : false)
+smithwaterman_dep = dependency('smithwaterman', required : false)
+vcflib_dep = dependency('libvcflib', required: false)
thread_dep = dependency('threads')
if htslib_dep.found()
@@ -59,6 +64,56 @@ else
]
endif
+if tabixpp_dep.found()
+ tabixpp_includes = ''
+ tabixpp_src = []
+else
+ tabixpp_includes = [
+ 'vcflib/tabixpp',
+ ]
+ tabixpp_src = [
+ 'vcflib/tabixpp/tabix.cpp',
+ ]
+endif
+
+if vcflib_dep.found()
+ vcflib_includes = ''
+ vcflib_src = []
+else
+ vcflib_includes = [
+ 'vcflib/src',
+ 'vcflib/multichoose',
+ 'vcflib/filevercmp',
+ ]
+ vcflib_src = [
+ 'vcflib/src/Variant.cpp',
+ ]
+endif
+
+if fastahack_dep.found()
+ fastahack_src = []
+else
+ fastahack_src = [
+ 'vcflib/fastahack/Fasta.cpp',
+ 'vcflib/src/split.cpp',
+ ]
+endif
+
+if smithwaterman_dep.found()
+ smithwaterman_includes = ''
+ smithwaterman_src = []
+else
+ smithwaterman_includes = [
+ 'vcflib/smithwaterman',
+ ]
+ smithwaterman_src = [
+ 'vcflib/smithwaterman/SmithWatermanGotoh.cpp',
+ 'vcflib/smithwaterman/disorder.cpp',
+ 'vcflib/smithwaterman/Repeats.cpp',
+ 'vcflib/smithwaterman/LeftAlign.cpp',
+ 'vcflib/smithwaterman/IndelAllele.cpp',
+ ]
+endif
#
@@ -105,23 +160,18 @@ seqlib_src = [
]
vcflib_src = [
- 'vcflib/tabixpp/tabix.cpp',
- 'vcflib/src/Variant.cpp',
- 'vcflib/smithwaterman/SmithWatermanGotoh.cpp',
- 'vcflib/smithwaterman/disorder.cpp',
- 'vcflib/smithwaterman/Repeats.cpp',
- 'vcflib/smithwaterman/LeftAlign.cpp',
- 'vcflib/smithwaterman/IndelAllele.cpp',
+ vcflib_src,
+ tabixpp_src,
+ smithwaterman_src,
]
bamleftalign_src = [
'src/bamleftalign.cpp',
'src/IndelAllele.cpp',
'contrib/SeqLib/src/BamWriter.cpp',
- 'vcflib/fastahack/Fasta.cpp',
- 'vcflib/smithwaterman/LeftAlign.cpp',
- 'vcflib/smithwaterman/IndelAllele.cpp',
- 'vcflib/src/split.cpp',
+ fastahack_src,
+ smithwaterman_src,
+ vcflib_src,
'src/LeftAlign.cpp',
]
@@ -134,11 +184,9 @@ incdir = include_directories(
'ttmath',
'contrib',
'contrib/SeqLib',
- 'vcflib/src',
- 'vcflib/tabixpp',
- 'vcflib/smithwaterman',
- 'vcflib/multichoose',
- 'vcflib/filevercmp')
+ tabixpp_includes,
+ smithwaterman_includes,
+ vcflib_includes)
c_args = ['-fpermissive','-w']
cpp_args = ['-fpermissive','-w','-Wc++14-compat']
@@ -152,7 +200,7 @@ executable('freebayes',
include_directories : incdir,
cpp_args : cpp_args,
c_args : c_args,
- dependencies: [zlib_dep, lzma_dep, htslib_dep, thread_dep],
+ dependencies: [zlib_dep, lzma_dep, simde_dep, htslib_dep, tabixpp_dep, smithwaterman_dep, vcflib_dep, thread_dep],
install: true
)
@@ -165,7 +213,7 @@ executable('bamleftalign',
include_directories : incdir,
cpp_args : cpp_args,
c_args : c_args,
- dependencies: [zlib_dep, lzma_dep, htslib_dep, thread_dep],
+ dependencies: [zlib_dep, lzma_dep, simde_dep, htslib_dep, tabixpp_dep, fastahack_dep, smithwaterman_dep, vcflib_dep, thread_dep],
install: true
)
--
2.30.0

23
gnu/packages/patches/guile-2.2-skip-so-test.patch Normal file
View file

@ -0,0 +1,23 @@
Skip 'test-stack-overflow' that crashes when using QEMU transparent emulation.
--- a/test-suite/standalone/Makefile.in 1970-01-01 01:00:01.000000000 +0100
+++ b/test-suite/standalone/Makefile.in 2021-01-11 10:59:31.606269449 +0100
@@ -102,8 +102,7 @@
test-scm-to-latin1-string$(EXEEXT) test-scm-values$(EXEEXT) \
test-scm-c-bind-keyword-arguments$(EXEEXT) \
test-srfi-4$(EXEEXT) $(am__append_6) $(am__EXEEXT_1) \
- test-smob-mark$(EXEEXT) test-smob-mark-race$(EXEEXT) \
- test-stack-overflow
+ test-smob-mark$(EXEEXT) test-smob-mark-race$(EXEEXT)
check_PROGRAMS = test-num2integral$(EXEEXT) test-round$(EXEEXT) \
test-foreign-object-c$(EXEEXT) test-list$(EXEEXT) \
test-unwind$(EXEEXT) test-conversion$(EXEEXT) \
@@ -1938,7 +1937,7 @@
test-command-line-encoding test-command-line-encoding2 \
test-language test-guild-compile $(am__append_3) \
test-foreign-object-scm test-fast-slot-ref test-mb-regexp \
- test-use-srfi $(am__append_5) test-stack-overflow
+ test-use-srfi $(am__append_5)
BUILT_SOURCES = $(am__append_2)
EXTRA_DIST = test-import-order-a.scm test-import-order-b.scm \
test-import-order-c.scm test-import-order-d.scm \

19
gnu/packages/patches/idris-disable-test.patch Normal file
View file

@ -0,0 +1,19 @@
The "pkg010" test output depends on the version of optparse-applicative being
used. The expected output requires optparse-applicative >= 0.15.1.0. Skip
the test for now.
--- idris-1.3.3/test/TestData.hs 2021-01-19 23:05:24.238958262 -0600
+++ idris-1.3.3/test/TestData.hs 2021-01-19 23:10:33.314390997 -0600
@@ -212,8 +212,10 @@
( 5, ANY ),
( 6, ANY ),
( 7, ANY ),
- ( 8, ANY ),
- ( 10, ANY )]),
+ ( 8, ANY )]),
+-- FIXME: Expected output depends on optparse-applicative version.
+-- See https://github.com/idris-lang/Idris-dev/issues/4896
+-- ( 10, ANY )]),
("prelude", "Prelude",
[ ( 1, ANY )]),
("primitives", "Primitive types",

77
gnu/packages/patches/ipxe-reproducible-geniso.patch Normal file
View file

@ -0,0 +1,77 @@
From 052d24d8217c51c572c2f6cbb4a687be2e8ba52d Mon Sep 17 00:00:00 2001
From: Brice Waegeneire <brice@waegenei.re>
Date: Fri, 5 Jun 2020 14:38:43 +0200
Subject: [PATCH] [geniso] Make it reproducible
Some timestamps get embedded in the generated ISO, making it
unreproducible so we overwrite those timestamps to be at the UNIX epoch.
---
src/util/geniso | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/src/util/geniso b/src/util/geniso
index ff090d4a..e032ffb0 100755
--- a/src/util/geniso
+++ b/src/util/geniso
@@ -11,6 +11,13 @@ function help() {
echo " -o FILE save iso image to file"
}
+function reset_timestamp() {
+ for f in "$1"/*; do
+ touch -t 197001010100 "$f"
+ done
+ touch -t 197001010100 "$1"
+}
+
LEGACY=0
FIRST=""
@@ -37,8 +44,9 @@ if [ -z "${OUT}" ]; then
exit 1
fi
-# There should either be mkisofs or the compatible genisoimage program
-for command in genisoimage mkisofs; do
+# There should either be mkisofs, xorriso or the compatible genisoimage
+# program
+for command in xorriso genisoimage mkisofs; do
if ${command} --version >/dev/null 2>/dev/null; then
mkisofs=(${command})
break
@@ -46,8 +54,10 @@ for command in genisoimage mkisofs; do
done
if [ -z "${mkisofs}" ]; then
- echo "${0}: mkisofs or genisoimage not found, please install or set PATH" >&2
+ echo "${0}: mkisofs, xorriso or genisoimage not found, please install or set PATH" >&2
exit 1
+elif [ "$mkisofs" = "xorriso" ]; then
+ mkisofs+=(-as mkisofs)
fi
dir=$(mktemp -d bin/iso.dir.XXXXXX)
@@ -115,6 +125,8 @@ case "${LEGACY}" in
exit 1
fi
+ reset_timestamp "$dir"
+
# generate the iso image
"${mkisofs[@]}" -b boot.img -output ${OUT} ${dir}
;;
@@ -127,6 +139,12 @@ case "${LEGACY}" in
cp ${LDLINUX_C32} ${dir}
fi
+ reset_timestamp "$dir"
+
+ if [ "${mkisofs[0]}" = "xorriso" ]; then
+ mkisofs+=(-isohybrid-mbr "$SYSLINUX_MBR_DISK_PATH")
+ fi
+
# generate the iso image
"${mkisofs[@]}" -b isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table -output ${OUT} ${dir}
--
2.26.2

45
gnu/packages/patches/mutt-CVE-2021-3181.patch Normal file
View file

@ -0,0 +1,45 @@
Fix CVE-2021-3181:
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-3181
Patch copied from upstream source repository:
https://gitlab.com/muttmua/mutt/-/commit/c059e20ea4c7cb3ee9ffd3500ffe313ae84b2545
From c059e20ea4c7cb3ee9ffd3500ffe313ae84b2545 Mon Sep 17 00:00:00 2001
From: Kevin McCarthy <kevin@8t8.us>
Date: Sun, 17 Jan 2021 10:40:37 -0800
Subject: [PATCH] Fix memory leak parsing group address.
When there was a group address terminator with no previous addresses,
an address would be allocated but not attached to the address list.
Change this to only allocate when last exists.
It would be more correct to not allocate at all unless we are inside a
group list, but I will address that in a separate commit to master.
---
rfc822.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/rfc822.c b/rfc822.c
index 7ff4eaa3..ced619f2 100644
--- a/rfc822.c
+++ b/rfc822.c
@@ -587,11 +587,10 @@ ADDRESS *rfc822_parse_adrlist (ADDRESS *top, const char *s)
#endif
/* add group terminator */
- cur = rfc822_new_address ();
if (last)
{
- last->next = cur;
- last = cur;
+ last->next = rfc822_new_address ();
+ last = last->next;
}
phraselen = 0;
--
GitLab

19
gnu/packages/patches/podofo-cmake-3.12.patch
View file

@ -1,19 +0,0 @@
The build fails with cmake 3.12.0. This patch will be obsolete with the next
release.
https://sourceforge.net/p/podofo/tickets/24/attachment/podofo-cmake-3.12.patch
--- a/test/TokenizerTest/CMakeLists.txt 2018-07-20 18:26:02.921494293 +0200
+++ b/test/TokenizerTest/CMakeLists.txt 2018-07-20 18:34:53.727136443 +0200
@@ -2,10 +2,3 @@
TARGET_LINK_LIBRARIES(TokenizerTest ${PODOFO_LIB} ${PODOFO_LIB_DEPENDS})
SET_TARGET_PROPERTIES(TokenizerTest PROPERTIES COMPILE_FLAGS "${PODOFO_CFLAGS}")
ADD_DEPENDENCIES(TokenizerTest ${PODOFO_DEPEND_TARGET})
-
-# Copy the test samples over to the build tree
-ADD_CUSTOM_COMMAND(
- TARGET TokenizerTest
- POST_BUILD
- COMMAND "${CMAKE_COMMAND}" -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/objects" "${CMAKE_CURRENT_BINARY_DIR}/objects"
- )

0
gnu/packages/patches/r-httpuv-1.5.4-unvendor-libuv.patch → gnu/packages/patches/r-httpuv-1.5.5-unvendor-libuv.patch
View file

165
gnu/packages/patches/tipp10-disable-downloader.patch Normal file
View file

@ -0,0 +1,165 @@
https://salsa.debian.org/debian/tipp10/-/raw/debian/2.1.0-5/debian/patches/disable_downloaders.patch
Author: Reiner Herrmann <reiner@reiner-h.de>
Description: Disable downloaders
This makes porting to Qt5 much easier, as QHttp is no longer available.
But the functionality was not enabled anyway or is no longer useful.
.
- checkversion.h/.cpp:
At startup (while loading settings), Tipp10 "phones home" to do an
update check (www.tipp10.com/update/version.tipp10v210).
For a packaged software and one that is no longer being developed,
this does not make much sense.
- updatedialog.h/.cpp:
Can download newer sqlite database (www.tipp10.com/update/sql.tipp10v210.utf),
but this file is no longer available on the server (404).
The update action has also not been enabled in the menu, so the update
functionality was currently not active:
widget/mainwindow.cpp:143: //fileMenu->addAction(updateAction);
- downloaddialog.h/.cpp:
Allows downloading lessons from user-specified location.
But the action (widget/startwidget.cpp -> lessonDownload) has not been part
of any menu, so it was also not in use.
--- a/tipp10.pro
+++ b/tipp10.pro
@@ -15,7 +15,6 @@
INCLUDEPATH += .
CONFIG += qt
QT += sql
-QT += network
RC_FILE += tipp10.rc
RESOURCES += tipp10.qrc
HEADERS += def/defines.h \
@@ -36,15 +35,12 @@
widget/settingspages.h \
widget/lessondialog.h \
widget/regexpdialog.h \
- widget/downloaddialog.h \
widget/lessonprintdialog.h \
widget/lessonresult.h \
- widget/updatedialog.h \
widget/helpbrowser.h \
widget/companylogo.h \
widget/errormessage.h \
widget/txtmessagedialog.h \
- widget/checkversion.h \
sql/connection.h \
sql/lessontablesql.h \
sql/chartablesql.h \
@@ -70,15 +66,12 @@
widget/settingspages.cpp \
widget/lessondialog.cpp \
widget/regexpdialog.cpp \
- widget/downloaddialog.cpp \
widget/lessonprintdialog.cpp \
widget/lessonresult.cpp \
- widget/updatedialog.cpp \
widget/helpbrowser.cpp \
widget/companylogo.cpp \
widget/errormessage.cpp \
widget/txtmessagedialog.cpp \
- widget/checkversion.cpp \
sql/lessontablesql.cpp \
sql/chartablesql.cpp \
sql/trainingsql.cpp \
--- a/widget/mainwindow.cpp
+++ b/widget/mainwindow.cpp
@@ -41,11 +41,9 @@
#include "mainwindow.h"
#include "settingsdialog.h"
-#include "updatedialog.h"
#include "def/defines.h"
#include "def/errordefines.h"
#include "errormessage.h"
-#include "checkversion.h"
MainWindow::MainWindow() {
trainingStarted = false;
@@ -214,8 +212,8 @@
}
void MainWindow::showUpdate() {
- UpdateDialog updateDialog(this);
- updateDialog.exec();
+ //UpdateDialog updateDialog(this);
+ //updateDialog.exec();
// Fill lesson list after online update
startWidget->fillLessonList(false);
}
@@ -486,6 +484,7 @@
settings.endGroup();
settings.beginGroup("general");
+#if 0
if (settings.value("check_new_version", true).toBool()) {
QDate lastVersionCheck = settings.value("last_version_check").toDate();
@@ -499,6 +498,7 @@
}
settings.setValue("last_version_check", today);
}
+#endif
settings.endGroup();
}
--- a/widget/settingspages.cpp
+++ b/widget/settingspages.cpp
@@ -581,7 +581,7 @@
// Layout of group box vertical
QVBoxLayout *layout = new QVBoxLayout;
- layout->addWidget(checkNewVersion);
+ //layout->addWidget(checkNewVersion);
layout->addSpacing(1);
layout->addWidget(checkNativeStyle);
layout->setMargin(16);
@@ -610,7 +610,6 @@
checkIntelligence->setChecked(settings.value("check_toggle_intelligence", true).toBool());
checkLimitLesson->setChecked(settings.value("check_limit_lesson", true).toBool());
checkLessonPublish->setChecked(settings.value("check_lesson_publish", true).toBool());
- checkNewVersion->setChecked(settings.value("check_new_version", true).toBool());
checkNativeStyle->setChecked(settings.value("check_native_style", false).toBool());
settings.endGroup();
}
@@ -636,7 +635,6 @@
settings.setValue("check_limit_lesson", checkLimitLesson->isChecked());
settings.setValue("check_lesson_publish", checkLessonPublish->isChecked());
settings.setValue("check_native_style", checkNativeStyle->isChecked());
- settings.setValue("check_new_version", checkNewVersion->isChecked());
settings.endGroup();
return requireRestart;
--- a/widget/startwidget.cpp
+++ b/widget/startwidget.cpp
@@ -43,12 +43,10 @@
#include "startwidget.h"
#include "sql/startsql.h"
-#include "updatedialog.h"
#include "def/defines.h"
#include "def/errordefines.h"
#include "errormessage.h"
#include "lessondialog.h"
-#include "downloaddialog.h"
#include "illustrationdialog.h"
#include "txtmessagedialog.h"
@@ -1048,7 +1046,7 @@
}
void StartWidget::clickDownloadLesson() {
-
+#if 0
QStringList lessonData;
DownloadDialog downloadDialog(&lessonData, this);
@@ -1083,6 +1081,7 @@
}
}
}
+#endif
}
void StartWidget::clickEditLesson() {

69
gnu/packages/patches/tipp10-qt5.patch Normal file
View file

@ -0,0 +1,69 @@
https://salsa.debian.org/debian/tipp10/-/raw/debian/2.1.0-5/debian/patches/qt5.patch
Author: Reiner Herrmann <reiner@reiner-h.de>
Description: Port to Qt5
Bug-Debian: https://bugs.debian.org/875207
--- a/tipp10.pro
+++ b/tipp10.pro
@@ -14,6 +14,7 @@
DEPENDPATH += .
INCLUDEPATH += .
CONFIG += qt
+QT += widgets multimedia printsupport
QT += sql
RC_FILE += tipp10.rc
RESOURCES += tipp10.qrc
--- a/main.cpp
+++ b/main.cpp
@@ -24,7 +24,6 @@
****************************************************************/
#include <QApplication>
-#include <QPlastiqueStyle>
#include <QString>
#include <QSettings>
#include <QCoreApplication>
@@ -212,7 +211,7 @@
// Set windows style
if (!useNativeStyle) {
- app.setStyle("plastique");
+ app.setStyle("fusion");
}
// Translation
--- a/games/abcrainwidget.cpp
+++ b/games/abcrainwidget.cpp
@@ -235,8 +235,7 @@
charballs.last()->wind = (qrand() % 8) + 2;
charballs.last()->rad = 0;
- chartext.append(new QGraphicsTextItem(QString(characterTemp),
- charballs.last(), scene));
+ chartext.append(new QGraphicsTextItem(QString(characterTemp), charballs.last()));
chartext.last()->setFont(QFont("Courier", 16, 100));
chartext.last()->setPos(-(chartext.last()->boundingRect().width() / 2), -(chartext.last()->boundingRect().height() / 2));
--- a/sql/chartablesql.cpp
+++ b/sql/chartablesql.cpp
@@ -137,7 +137,7 @@
sortColumn(4);
headerview->setStretchLastSection(true);
- headerview->setResizeMode(QHeaderView::Interactive);
+ headerview->setSectionResizeMode(QHeaderView::Interactive);
headerview->setSortIndicatorShown(true);
// Resize the columns
--- a/sql/lessontablesql.cpp
+++ b/sql/lessontablesql.cpp
@@ -202,7 +202,7 @@
sortColumn(-1);
headerview->setStretchLastSection(true);
- headerview->setResizeMode(QHeaderView::Interactive);
+ headerview->setSectionResizeMode(QHeaderView::Interactive);
headerview->setSortIndicatorShown(true);
// Resize the columns

135
gnu/packages/patches/vcflib-use-shared-libraries.patch
View file

@ -1,135 +0,0 @@
This patch is a combination of many of the patches from Debian:
https://sources.debian.org/src/libvcflib/1.0.1+dfsg-3/debian/patches/
---
Makefile | 63 +++++++++++---------------------------------------------
1 file changed, 12 insertions(+), 51 deletions(-)
diff --git a/Makefile b/Makefile
index 6b13350..be85f22 100644
--- a/Makefile
+++ b/Makefile
@@ -114,43 +114,25 @@ BIN_SOURCES = src/vcfecho.cpp \
src/vcfnull2ref.cpp \
src/vcfinfosummarize.cpp
-# when we can figure out how to build on mac
-# src/vcfsom.cpp
-
#BINS = $(BIN_SOURCES:.cpp=)
BINS = $(addprefix $(BIN_DIR)/,$(notdir $(BIN_SOURCES:.cpp=)))
SHORTBINS = $(notdir $(BIN_SOURCES:.cpp=))
-TABIX = tabixpp/tabix.o
-FASTAHACK = fastahack/Fasta.o
-SMITHWATERMAN = smithwaterman/SmithWatermanGotoh.o
-REPEATS = smithwaterman/Repeats.o
-INDELALLELE = smithwaterman/IndelAllele.o
-DISORDER = smithwaterman/disorder.o
-LEFTALIGN = smithwaterman/LeftAlign.o
-FSOM = fsom/fsom.o
FILEVERCMP = filevercmp/filevercmp.o
-# Work out how to find htslib
-# Use the one we ship in tabixpp unless told otherwise by the environment
-HTS_LIB ?= $(VCF_LIB_LOCAL)/tabixpp/htslib/libhts.a
-HTS_INCLUDES ?= -I$(VCF_LIB_LOCAL)/tabixpp/htslib
-HTS_LDFLAGS ?= -L$(VCF_LIB_LOCAL)/tabixpp/htslib -lhts -lbz2 -lm -lz -llzma -pthread
-
-
-INCLUDES = $(HTS_INCLUDES) -I$(INC_DIR)
-LDFLAGS = -L$(LIB_DIR) -lvcflib $(HTS_LDFLAGS) -lpthread -lz -lm -llzma -lbz2
+INCLUDES = -I$(INC_DIR) $(shell pkg-config --cflags htslib fastahack smithwaterman tabixpp)
+LDFLAGS = -L$(LIB_DIR) -lvcflib -lpthread -lz -lstdc++ -lm -llzma -lbz2 $(shell pkg-config --libs htslib fastahack smithwaterman tabixpp)
-all: $(OBJECTS) $(BINS) scriptToBin
+all: $(OBJECTS) $(BINS) scriptToBin libvcflib.a
scriptToBin: $(BINS)
$(CP) scripts/* $(BIN_DIR)
GIT_VERSION += $(shell git describe --abbrev=4 --dirty --always)
-CXXFLAGS = -Ofast -D_FILE_OFFSET_BITS=64 -std=c++0x
+CXXFLAGS = -Ofast -D_FILE_OFFSET_BITS=64 -std=c++0x -fPIC
#CXXFLAGS = -O2
#CXXFLAGS = -pedantic -Wall -Wshadow -Wpointer-arith -Wcast-qual
@@ -168,7 +150,7 @@ profiling:
gprof:
$(MAKE) CXXFLAGS="$(CXXFLAGS) -pg" all
-$(OBJECTS): $(SOURCES) $(HEADERS) $(TABIX) multichoose pre $(SMITHWATERMAN) $(FILEVERCMP) $(FASTAHACK)
+$(OBJECTS): $(SOURCES) $(HEADERS) multichoose pre $(FILEVERCMP)
$(CXX) -c -o $@ src/$(*F).cpp $(INCLUDES) $(LDFLAGS) $(CXXFLAGS) && $(CP) src/*.h* $(VCF_LIB_LOCAL)/$(INC_DIR)/
multichoose: pre
@@ -177,39 +159,22 @@ multichoose: pre
intervaltree: pre
cd intervaltree && $(MAKE) && $(CP) *.h* $(VCF_LIB_LOCAL)/$(INC_DIR)/
-$(TABIX): pre
- cd tabixpp && INCLUDES="$(HTS_INCLUDES)" LIBPATH="-L. $(HTS_LDFLAGS)" HTSLIB="$(HTS_LIB)" $(MAKE) && $(CP) *.h* $(VCF_LIB_LOCAL)/$(INC_DIR)/
-
-$(SMITHWATERMAN): pre
- cd smithwaterman && $(MAKE) && $(CP) *.h* $(VCF_LIB_LOCAL)/$(INC_DIR)/ && $(CP) *.o $(VCF_LIB_LOCAL)/$(OBJ_DIR)/
-
-$(DISORDER): $(SMITHWATERMAN)
-
-$(REPEATS): $(SMITHWATERMAN)
-
-$(LEFTALIGN): $(SMITHWATERMAN)
-
-$(INDELALLELE): $(SMITHWATERMAN)
-
-$(FASTAHACK): pre
- cd fastahack && $(MAKE) && $(CP) *.h* $(VCF_LIB_LOCAL)/$(INC_DIR)/ && $(CP) Fasta.o $(VCF_LIB_LOCAL)/$(OBJ_DIR)/
-
-#$(FSOM):
-# cd fsom && $(CXX) $(CXXFLAGS) -c fsom.c -lm
-
$(FILEVERCMP): pre
cd filevercmp && make && $(CP) *.h* $(VCF_LIB_LOCAL)/$(INC_DIR)/ && $(CP) *.o $(VCF_LIB_LOCAL)/$(INC_DIR)/
$(SHORTBINS): pre
$(MAKE) $(BIN_DIR)/$@
-$(BINS): $(BIN_SOURCES) libvcflib.a $(OBJECTS) $(SMITHWATERMAN) $(FASTAHACK) $(DISORDER) $(LEFTALIGN) $(INDELALLELE) $(SSW) $(FILEVERCMP) pre intervaltree
+$(BINS): $(BIN_SOURCES) libvcflib.so $(OBJECTS) $(SSW) $(FILEVERCMP) pre intervaltree
$(CXX) src/$(notdir $@).cpp -o $@ $(INCLUDES) $(LDFLAGS) $(CXXFLAGS) -DVERSION=\"$(GIT_VERSION)\"
-libvcflib.a: $(OBJECTS) $(SMITHWATERMAN) $(REPEATS) $(FASTAHACK) $(DISORDER) $(LEFTALIGN) $(INDELALLELE) $(SSW) $(FILEVERCMP) $(TABIX) pre
- ar rs libvcflib.a $(OBJECTS) smithwaterman/sw.o $(FASTAHACK) $(SSW) $(FILEVERCMP) $(TABIX)
+libvcflib.a: $(OBJECTS) $(SSW) $(FILEVERCMP) pre
+ ar rs libvcflib.a $(OBJECTS) $(SSW) $(FILEVERCMP)
$(CP) libvcflib.a $(LIB_DIR)
+libvcflib.so: $(OBJECTS) $(SSW) $(FILEVERCMP) pre
+ $(CXX) -shared -o libvcflib.so $(OBJECTS) $(SSW) $(FILEVERCMP)
+ $(CP) libvcflib.so $(LIB_DIR)
test: $(BINS)
@prove -Itests/lib -w tests/*.t
@@ -230,16 +195,12 @@ clean:
$(RM) $(BINS) $(OBJECTS)
$(RM) ssw_cpp.o ssw.o
$(RM) libvcflib.a
+ $(RM) libvcflib.so
$(RM) -r $(BIN_DIR)
$(RM) -r $(LIB_DIR)
$(RM) -r $(INC_DIR)
$(RM) -r $(OBJ_DIR)
- $(MAKE) clean -C tabixpp
- $(MAKE) clean -C smithwaterman
- $(MAKE) clean -C fastahack
$(MAKE) clean -C multichoose
- $(MAKE) clean -C fsom
- $(MAKE) clean -C libVCFH
$(MAKE) clean -C test
$(MAKE) clean -C filevercmp
$(MAKE) clean -C intervaltree
--
2.28.0

11
gnu/packages/pdf.scm
View file

@ -13,7 +13,7 @@
;;; Copyright © 2017, 2018 Leo Famulari <leo@famulari.name> ;;; Copyright © 2017, 2018 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2017, 2018 Rene Saavedra <pacoon@protonmail.com> ;;; Copyright © 2017, 2018 Rene Saavedra <pacoon@protonmail.com>
;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2019 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2019 Ben Sturmfels <ben@sturm.com.au> ;;; Copyright © 2019 Ben Sturmfels <ben@sturm.com.au>
;;; Copyright © 2019,2020 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2019,2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
@ -648,15 +648,14 @@ interaction.")
(define-public podofo (define-public podofo
(package (package
(name "podofo") (name "podofo")
(version "0.9.6") (version "0.9.7")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/podofo/podofo/" version (uri (string-append "mirror://sourceforge/podofo/podofo/" version
"/podofo-" version ".tar.gz")) "/podofo-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0wj0y4zcmj4q79wrn3vv3xq4bb0vhhxs8yifafwy9f2sjm83c5p9")) "1f0yvkx6nf99fp741w2y706d8bs9824x1z2gqm3rdy5fv8bfgwkw"))))
(patches (search-patches "podofo-cmake-3.12.patch"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
`(("cppunit" ,cppunit) `(("cppunit" ,cppunit)
@ -671,8 +670,8 @@ interaction.")
("openssl" ,openssl) ("openssl" ,openssl)
("zlib" ,zlib))) ("zlib" ,zlib)))
(arguments (arguments
`(#:configure-flags '("-DPODOFO_BUILD_SHARED=ON" `(#:configure-flags
"-DPODOFO_BUILD_STATIC=ON") (list "-DPODOFO_BUILD_SHARED=ON")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'patch (add-before 'configure 'patch

33
gnu/packages/perl.scm
View file

@ -11141,6 +11141,39 @@ package takes some liberties with the SDL API, and attempts to adhere to the
spirit of both the SDL and Perl.") spirit of both the SDL and Perl.")
(license license:lgpl2.1))) (license license:lgpl2.1)))
(define-public perl-sgmls
(package
(name "perl-sgmls")
(version "1.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://cpan/authors/id/R/RA/RAAB/SGMLSpm-"
version ".tar.gz"))
(sha256
(base32
"1gdjf3mcz2bxir0l9iljxiz6qqqg3a9gg23y5wjg538w552r432m"))))
(build-system perl-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
(add-after 'install 'wrap-script
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(site (string-append out "/lib/perl5/site_perl")))
(with-directory-excursion out
(rename-file "bin/sgmlspl.pl" "bin/sgmlspl")
(wrap-program "bin/sgmlspl"
`("PERL5LIB" suffix (,site))))
#t))))))
(native-inputs
`(("perl-module-build" ,perl-module-build)))
(home-page "https://metacpan.org/release/RAAB/SGMLSpm-1.1")
(synopsis "Perl module for processing SGML parser output")
(description "This package contains @code{SGMLS.pm}, a perl5 class library
for parsing the output from an SGML parser such as OpenSP. It also includes
the @command{sgmlspl} command, an Perl script showcasing how the library can
be used.")
(license license:gpl2+)))
(define-public perl-shell-command (define-public perl-shell-command
(package (package
(name "perl-shell-command") (name "perl-shell-command")

72
gnu/packages/printers.scm
View file

@ -1,7 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019, 2021 Ricardo Wurmus <rekado@elephly.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -21,13 +20,9 @@
(define-module (gnu packages printers) (define-module (gnu packages printers)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages compression)
#:use-module (gnu packages cups)
#:use-module (gnu packages libusb) #:use-module (gnu packages libusb)
#:use-module (gnu packages ghostscript)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages qt)) #:use-module (gnu packages qt))
@ -73,70 +68,3 @@
with Graphtec and Sihouette plotting cutters using an SVG file as its input.") with Graphtec and Sihouette plotting cutters using an SVG file as its input.")
(home-page "http://robocut.org") (home-page "http://robocut.org")
(license license:gpl3+))) (license license:gpl3+)))
(define-public brlaser
(let ((commit "9d7ddda8383bfc4d205b5e1b49de2b8bcd9137f1")
(revision "1"))
(package
(name "brlaser")
(version (git-version "6" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/pdewacht/brlaser")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1drh0nk7amn9a8wykki4l9maqa4vy7vwminypfy1712alwj31nd4"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags
(list (string-append "-DCUPS_DATA_DIR="
(assoc-ref %outputs "out")
"/share/cups")
(string-append "-DCUPS_SERVER_BIN="
(assoc-ref %outputs "out")
"/lib/cups"))))
(inputs
`(("ghostscript" ,ghostscript)
("cups" ,cups)
("zlib" ,zlib)))
(home-page "https://github.com/pdewacht/brlaser")
(synopsis "Brother laser printer driver")
(description "Brlaser is a CUPS driver for Brother laser printers. This
driver is known to work with these printers:
@enumerate
@item Brother DCP-1510 series
@item Brother DCP-1600 series
@item Brother DCP-7030
@item Brother DCP-7040
@item Brother DCP-7055
@item Brother DCP-7055W
@item Brother DCP-7060D
@item Brother DCP-7065DN
@item Brother DCP-7080
@item Brother DCP-L2500D series
@item Brother DCP-L2520D series
@item Brother DCP-L2540DW series
@item Brother HL-1110 series
@item Brother HL-1200 series
@item Brother HL-2030 series
@item Brother HL-2140 series
@item Brother HL-2220 series
@item Brother HL-2270DW series
@item Brother HL-5030 series
@item Brother HL-L2300D series
@item Brother HL-L2320D series
@item Brother HL-L2340D series
@item Brother HL-L2360D series
@item Brother MFC-1910W
@item Brother MFC-7240
@item Brother MFC-7360N
@item Brother MFC-7365DN
@item Brother MFC-7840W
@item Brother MFC-L2710DW series
@item Lenovo M7605D
@end enumerate")
(license license:gpl2+))))

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

@ -8260,14 +8260,14 @@ PEP 8.")
(define-public python-pep517 (define-public python-pep517
(package (package
(name "python-pep517") (name "python-pep517")
(version "0.8.2") (version "0.9.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "pep517" version)) (uri (pypi-uri "pep517" version))
(sha256 (sha256
(base32 (base32
"17m2bcabx3sr5wjalgzppfx5xahqrwm12zq58h68mm482b7rjqcf")))) "0zqidxah03qpnp6zkg3zd1kmd5f79hhdsfmlc0cldaniy80qddxf"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
'(#:phases '(#:phases
@ -18762,14 +18762,14 @@ implemented using @code{ctypes}.")
(define-public python-userspacefs (define-public python-userspacefs
(package (package
(name "python-userspacefs") (name "python-userspacefs")
(version "2.0.2") (version "2.0.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "userspacefs" version)) (uri (pypi-uri "userspacefs" version))
(sha256 (sha256
(base32 (base32
"0ayfcz9pjwq7h3ws0qas71842s1wm7dxlmg8dccxl2j6yavpv83f")))) "1v6saf62ml3j63adalvlkj4iavxjbsbapl20b21mn73p7kvn4ayf"))))
(build-system python-build-system) (build-system python-build-system)
(propagated-inputs (propagated-inputs
`(("python-fusepyng" ,python-fusepyng))) `(("python-fusepyng" ,python-fusepyng)))

170
gnu/packages/qt.scm
View file

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013, 2014, 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com> ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
;;; Copyright © 2015, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017 Nikita <nikita@n0.is> ;;; Copyright © 2016, 2017 Nikita <nikita@n0.is>
;;; Copyright © 2016 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2016 Thomas Danckaert <post@thomasdanckaert.be>
@ -343,16 +343,31 @@ developers using C++ or QML, a CSS & JavaScript like language.")
;; Qt 5: assembler error; see <http://hydra.gnu.org/build/112526>. ;; Qt 5: assembler error; see <http://hydra.gnu.org/build/112526>.
(supported-systems (delete "mips64el-linux" %supported-systems)))) (supported-systems (delete "mips64el-linux" %supported-systems))))
(define (qt5-urls component version)
"Return a list of URLs for VERSION of the Qt5 COMPONENT."
;; We can't use a mirror:// scheme because these URLs are not exact copies:
;; the layout differs between them.
(list (string-append "https://download.qt.io/official_releases/qt/"
(version-major+minor version) "/" version
"/submodules/" component "-everywhere-src-"
version ".tar.xz")
(string-append "https://download.qt.io/archive/qt/"
(version-major+minor version) "/" version
"/submodules/" component "-everywhere-src-"
version ".tar.xz")
(let ((directory (string-append "qt5" (string-drop component 2))))
(string-append "http://sources.buildroot.net/" directory "/"
component "-everywhere-src-" version ".tar.xz"))
(string-append "https://distfiles.macports.org/qt5/"
component "-everywhere-src-" version ".tar.xz")))
(define-public qtbase (define-public qtbase
(package (package
(name "qtbase") (name "qtbase")
(version "5.15.2") (version "5.15.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (qt5-urls name version))
(version-major+minor version) "/" version
"/submodules/" name "-everywhere-src-"
version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1y70libf2x52lpbqvhz10lpk7nyl1ajjwzjxly9pjdpfj4jsv7wh")) "1y70libf2x52lpbqvhz10lpk7nyl1ajjwzjxly9pjdpfj4jsv7wh"))
@ -610,10 +625,7 @@ developers using C++ or QML, a CSS & JavaScript like language.")
(version "5.15.2") (version "5.15.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (qt5-urls name version))
(version-major+minor version) "/" version
"/submodules/" name "-everywhere-src-"
version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0pjqrdmd1991x9h4rl8sf81pkd89hfd5h1a2gp3fjw96pk0w5hwb")))) "0pjqrdmd1991x9h4rl8sf81pkd89hfd5h1a2gp3fjw96pk0w5hwb"))))
@ -685,10 +697,7 @@ HostData=lib/qt5
(version "5.15.2") (version "5.15.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (qt5-urls name version))
(version-major+minor version) "/" version
"/submodules/" name "-everywhere-src-"
version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1msk8a0z8rr16hkp2fnv668vf6wayiydqgc2mcklaa04rv3qb0mz")) "1msk8a0z8rr16hkp2fnv668vf6wayiydqgc2mcklaa04rv3qb0mz"))
@ -726,10 +735,7 @@ support for MNG, TGA, TIFF and WBMP image formats.")))
(version "5.15.2") (version "5.15.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (qt5-urls name version))
(version-major+minor version) "/" version
"/submodules/" name "-everywhere-src-"
version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0gkfzj195v9flwljnqpdz3a532618yn4h2577nlsai56x4p7053h")))) "0gkfzj195v9flwljnqpdz3a532618yn4h2577nlsai56x4p7053h"))))
@ -750,10 +756,7 @@ from within Qt 5.")))
(version "5.15.2") (version "5.15.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (qt5-urls name version))
(version-major+minor version) "/" version
"/submodules/" name "-everywhere-src-"
version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1ypj5jpa31rlx8yfw3y9jia212lfnxvnqkvygs6ihjf3lxi23skn")))) "1ypj5jpa31rlx8yfw3y9jia212lfnxvnqkvygs6ihjf3lxi23skn"))))
@ -781,10 +784,7 @@ xmlpatternsvalidator.")))
(version "5.15.2") (version "5.15.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (qt5-urls name version))
(version-major+minor version) "/" version
"/submodules/" name "-everywhere-src-"
version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0lancdn7y0lrlmyn5cbdm0izd5yprvd5n77nhkb7a3wl2sbx0066")))) "0lancdn7y0lrlmyn5cbdm0izd5yprvd5n77nhkb7a3wl2sbx0066"))))
@ -825,10 +825,7 @@ with JavaScript and C++.")))
(version "5.15.2") (version "5.15.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (qt5-urls name version))
(version-major+minor version) "/" version
"/submodules/" name "-everywhere-src-"
version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"185zci61ip1wpjrygcw2m6v55lvninc0b8y2p3jh6qgpf5w35003")))) "185zci61ip1wpjrygcw2m6v55lvninc0b8y2p3jh6qgpf5w35003"))))
@ -849,10 +846,7 @@ with Bluetooth and NFC.")))
(version "5.15.2") (version "5.15.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (qt5-urls name version))
(version-major+minor version) "/" version
"/submodules/" name "-everywhere-src-"
version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0gr399fn5n8j3m9d3vv01vcbr1cb7pw043j04cnnxzrlvn2jvd50")))) "0gr399fn5n8j3m9d3vv01vcbr1cb7pw043j04cnnxzrlvn2jvd50"))))
@ -876,10 +870,7 @@ consume data received from the server, or both.")))
(version "5.15.2") (version "5.15.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (qt5-urls name version))
(version-major+minor version) "/" version
"/submodules/" name "-everywhere-src-"
version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0fa81r7bn1mf9ynwsx524a55dx1q0jb4vda6j48ssb4lx7wi201z")))) "0fa81r7bn1mf9ynwsx524a55dx1q0jb4vda6j48ssb4lx7wi201z"))))
@ -909,10 +900,7 @@ recognition API for devices.")))
(version "5.15.2") (version "5.15.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (qt5-urls name version))
(version-major+minor version) "/" version
"/submodules/" name "-everywhere-src-"
version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1xbd6kc7i0iablqdkvfrajpi32cbq7j6ajbfyyyalcai1s0mhdqc")) "1xbd6kc7i0iablqdkvfrajpi32cbq7j6ajbfyyyalcai1s0mhdqc"))
@ -960,10 +948,7 @@ set of plugins for interacting with pulseaudio and GStreamer.")))
(version "5.15.2") (version "5.15.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (qt5-urls name version))
(version-major+minor version) "/" version
"/submodules/" name "-everywhere-src-"
version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1ddfx4nak16xx0zh1kl836zxvpbixmmjyplsmfmg65pqkwi34dqr")))) "1ddfx4nak16xx0zh1kl836zxvpbixmmjyplsmfmg65pqkwi34dqr"))))
@ -1015,10 +1000,7 @@ compositor libraries.")))
(version "5.15.2") (version "5.15.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (qt5-urls name version))
(version-major+minor version) "/" version
"/submodules/" name "-everywhere-src-"
version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"17gp5qzg4wdg8qlxk2p3mh8x1vk33rf33wic3fy0cws193bmkiar")))) "17gp5qzg4wdg8qlxk2p3mh8x1vk33rf33wic3fy0cws193bmkiar"))))
@ -1049,10 +1031,7 @@ interacting with serial ports from within Qt.")))
(version "5.15.2") (version "5.15.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (qt5-urls name version))
(version-major+minor version) "/" version
"/submodules/" name "-everywhere-src-"
version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"125x6756fjpldqy6wbw6cg7ngjh2016aiq92bchh719z1mf7xsxf")))) "125x6756fjpldqy6wbw6cg7ngjh2016aiq92bchh719z1mf7xsxf"))))
@ -1084,10 +1063,7 @@ and others.")))
(version "5.15.2") (version "5.15.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (qt5-urls name version))
(version-major+minor version) "/" version
"/submodules/" name "-everywhere-src-"
version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1h9y634phvvk557mhmf9z4lmxr41rl8x9mqy2lzp31mk8ffffzqj")))) "1h9y634phvvk557mhmf9z4lmxr41rl8x9mqy2lzp31mk8ffffzqj"))))
@ -1108,10 +1084,7 @@ popular web engines, Qt WebKit 2 and Qt WebEngine.")))
(version "5.15.2") (version "5.15.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (qt5-urls name version))
(version-major+minor version) "/" version
"/submodules/" name "-everywhere-src-"
version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0ihlnhv8ldkqz82v3j7j22lrhk17b6ghra8sx85y2agd2ysq5rw1")))) "0ihlnhv8ldkqz82v3j7j22lrhk17b6ghra8sx85y2agd2ysq5rw1"))))
@ -1144,10 +1117,7 @@ OpenGL ES 2.0 and can be used in HTML5 canvas elements")))
(version "5.15.2") (version "5.15.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (qt5-urls name version))
(version-major+minor version) "/" version
"/submodules/" name "-everywhere-src-"
version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1rw1wibmbxlj6xc86qs3y8h42al1vczqiksyxzaylxs9gqb4d7xy")))) "1rw1wibmbxlj6xc86qs3y8h42al1vczqiksyxzaylxs9gqb4d7xy"))))
@ -1197,10 +1167,7 @@ positioning and geolocation plugins.")))
(version "5.15.2") (version "5.15.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (qt5-urls name version))
(version-major+minor version) "/" version
"/submodules/" name "-everywhere-src-"
version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1k618f7v6jaj0ygy8d7jvgb8zjr47sn55kiskbdkkizp3z7d12f1")))) "1k618f7v6jaj0ygy8d7jvgb8zjr47sn55kiskbdkkizp3z7d12f1"))))
@ -1225,10 +1192,7 @@ that helps in Qt development.")))
(version "5.15.2") (version "5.15.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (qt5-urls name version))
(version-major+minor version) "/" version
"/submodules/" name "-everywhere-src-"
version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0gk74hk488k9ldacxbxcranr3arf8ifqg8kz9nm1rgdgd59p36d2")) "0gk74hk488k9ldacxbxcranr3arf8ifqg8kz9nm1rgdgd59p36d2"))
@ -1249,10 +1213,7 @@ ECMAScript and Qt.")))
(version "5.15.2") (version "5.15.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (qt5-urls name version))
(version-major+minor version) "/" version
"/submodules/" name "-everywhere-src-"
version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1dczakl868mg0lnwpf082jjc5976ycn879li1vqlgw5ihirzp4y3")))) "1dczakl868mg0lnwpf082jjc5976ycn879li1vqlgw5ihirzp4y3"))))
@ -1273,10 +1234,7 @@ can be used to build complete interfaces in Qt Quick.")))
(version "5.15.2") (version "5.15.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (qt5-urls name version))
(version-major+minor version) "/" version
"/submodules/" name "-everywhere-src-"
version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"06c9vrwvbjmzapmfa25y34lgjkzg57xxbm92nr6wkv5qykjnq6v7")))) "06c9vrwvbjmzapmfa25y34lgjkzg57xxbm92nr6wkv5qykjnq6v7"))))
@ -1298,10 +1256,7 @@ not available.")))
(version "5.15.2") (version "5.15.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (qt5-urls name version))
(version-major+minor version) "/" version
"/submodules/" name "-everywhere-src-"
version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1r6zfc0qga2ax155js7c8y5rx6vgayf582s921j09mb797v6g3gc")))) "1r6zfc0qga2ax155js7c8y5rx6vgayf582s921j09mb797v6g3gc"))))
@ -1325,10 +1280,7 @@ coloring, and many more.")))
(version "5.15.2") (version "5.15.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (qt5-urls name version))
(version-major+minor version) "/" version
"/submodules/" name "-everywhere-src-"
version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0p07bg93fdfn4gr2kv38qgnws5znhswajrxdfs8xc9l3i7vi2xn7")))) "0p07bg93fdfn4gr2kv38qgnws5znhswajrxdfs8xc9l3i7vi2xn7"))))
@ -1355,10 +1307,7 @@ and mobile applications targeting TV-like form factors.")))
(version "5.15.2") (version "5.15.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (qt5-urls name version))
(version-major+minor version) "/" version
"/submodules/" name "-everywhere-src-"
version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1p5771b9hnpchfcdgy0zkhwg09a6xq88934aggp0rij1k85mkfb0")) "1p5771b9hnpchfcdgy0zkhwg09a6xq88934aggp0rij1k85mkfb0"))
@ -1386,10 +1335,7 @@ also contains functionality to support data models and executable content.")))
(version "5.15.2") (version "5.15.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (qt5-urls name version))
(version-major+minor version) "/" version
"/submodules/" name "-everywhere-src-"
version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"09rjx53519dfk4qj2gbn3vlxyriasyb747wpg1p11y7jkwqhs4l7")))) "09rjx53519dfk4qj2gbn3vlxyriasyb747wpg1p11y7jkwqhs4l7"))))
@ -1406,10 +1352,7 @@ purchasing goods and services.")))
(version "5.15.2") (version "5.15.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (qt5-urls name version))
(version-major+minor version) "/" version
"/submodules/" name "-everywhere-src-"
version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"049x7z8zcp9jixmdv2fjscy2ggpd6za9hkdbb2bqp2mxjm0hwxg0")))) "049x7z8zcp9jixmdv2fjscy2ggpd6za9hkdbb2bqp2mxjm0hwxg0"))))
@ -1433,10 +1376,7 @@ selecting one of the charts themes.")
(version "5.15.2") (version "5.15.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (qt5-urls name version))
(version-major+minor version) "/" version
"/submodules/" name "-everywhere-src-"
version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1zdn3vm0nfy9ny7c783aabp3mhlnqhi9fw2rljn7ibbksmsnasi2")))) "1zdn3vm0nfy9ny7c783aabp3mhlnqhi9fw2rljn7ibbksmsnasi2"))))
@ -1460,10 +1400,7 @@ customized by using themes or by adding custom items and labels to them.")
(version "5.15.2") (version "5.15.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (qt5-urls name version))
(version-major+minor version) "/" version
"/submodules/" name "-everywhere-src-"
version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"11fdgacv4syr8bff2vdw7rb0dg1gcqpdf37hm3pn31d6z91frhpw")))) "11fdgacv4syr8bff2vdw7rb0dg1gcqpdf37hm3pn31d6z91frhpw"))))
@ -1489,10 +1426,7 @@ implementation of OAuth and OAuth2 authenticathon methods for Qt.")))
(version "5.15.2") (version "5.15.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (qt5-urls name version))
(version-major+minor version) "/" version
"/submodules/" name "-everywhere-src-"
version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1hngbp0vkr35rpsrac7b9vx6f360v8v2g0fffzm590l8j2ybd0b7")))) "1hngbp0vkr35rpsrac7b9vx6f360v8v2g0fffzm590l8j2ybd0b7"))))
@ -1526,10 +1460,7 @@ processes or computers.")))
(version "5.15.2") (version "5.15.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (qt5-urls name version))
(version-major+minor version) "/" version
"/submodules/" name "-everywhere-src-"
version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1xc3x3ghnhgchsg1kgj156yg69wn4rwjx8r28i1jd05hxjggn468")))) "1xc3x3ghnhgchsg1kgj156yg69wn4rwjx8r28i1jd05hxjggn468"))))
@ -1591,10 +1522,7 @@ using the Enchant spell-checking library.")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (qt5-urls name version))
(version-major+minor version) "/" version
"/submodules/" name "-everywhere-src-"
version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1q4idxdm81sx102xc12ixj0xpfx52d6vwvs3jpapnkyq8c7cmby8")) "1q4idxdm81sx102xc12ixj0xpfx52d6vwvs3jpapnkyq8c7cmby8"))

40
gnu/packages/radio.scm
View file

@ -2,7 +2,7 @@
;;; Copyright © 2017, 2018, 2019, 2020 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2017, 2018, 2019, 2020 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2019, 2020 Christopher Howard <christopher@librehacker.com> ;;; Copyright © 2019, 2020 Christopher Howard <christopher@librehacker.com>
;;; Copyright © 2019, 2020 Evan Straw <evan.straw99@gmail.com> ;;; Copyright © 2019, 2020 Evan Straw <evan.straw99@gmail.com>
;;; Copyright © 2020 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2020, 2021 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org> ;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2020 Charlie Ritter <chewzerita@posteo.net> ;;; Copyright © 2020 Charlie Ritter <chewzerita@posteo.net>
;;; Copyright © 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
@ -538,7 +538,7 @@ to the fix block above.
(define-public gqrx (define-public gqrx
(package (package
(name "gqrx") (name "gqrx")
(version "2.13.5") (version "2.14.4")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -547,7 +547,7 @@ to the fix block above.
(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 "168wjad5g0ka555hwsciwbj7fqx1c89q59hq1yxj8aiyp5kfcahx")))) (base32 "0m4ncydihz4n4i80c252vk3c5v672yab1jv85n6ndn7a92xv3ilq"))))
(build-system qt-build-system) (build-system qt-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
@ -1057,7 +1057,7 @@ their position, altitude, speed, etc.")
(define-public rtl-433 (define-public rtl-433
(package (package
(name "rtl-433") (name "rtl-433")
(version "20.02") (version "20.11")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -1066,7 +1066,7 @@ their position, altitude, speed, etc.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "11991xky9gawkragdyg27qsf7kw5bhlg7ygvf3fn7ng00x4xbh1z")))) (base32 "093bxjxkg7yf78wqj5gpijbfa2p05ny09qqsj84kzi1svnzsa369"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
@ -1117,3 +1117,33 @@ modes:
@item X10 @item X10
@end itemize") @end itemize")
(license license:gpl2+))) (license license:gpl2+)))
(define-public nanovna-saver
(package
(name "nanovna-saver")
(version "0.3.8")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/NanoVNA-Saver/nanovna-saver")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0z83rwpnbbs1n74mx8dgh1d1crp90mannj9vfy161dmy4wzc5kpv"))))
(build-system python-build-system)
(native-inputs
`(("python-cython" ,python-cython)))
(inputs
`(("python-numpy" ,python-numpy)
("python-pyqt" ,python-pyqt)
("python-pyserial" ,python-pyserial)
("python-scipy" ,python-scipy)))
(arguments
'(#:tests? #f))
(home-page "https://github.com/NanoVNA-Saver/nanovna-saver")
(synopsis "GUI for NanoVNA devices")
(description
"NanoVNA-Saver is a tool for reading, displaying and saving data from the
NanoVNA vector network analyzers.")
(license license:gpl3+)))

10
gnu/packages/rdf.scm
View file

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013, 2014, 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015, 2016, 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2016, 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2019 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2020 Alexandros Theodotou <alex@zrythm.org> ;;; Copyright © 2020 Alexandros Theodotou <alex@zrythm.org>
;;; Copyright © 2020 Pjotr Prins <pjotr.guix@thebird.nl> ;;; Copyright © 2020 Pjotr Prins <pjotr.guix@thebird.nl>
@ -268,14 +268,14 @@ and triple stores.")
(define-public serd (define-public serd
(package (package
(name "serd") (name "serd")
(version "0.30.6") (version "0.30.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.drobilla.net/serd-" (uri (string-append "https://download.drobilla.net/serd-"
version ".tar.bz2")) version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"1vrprliknw9s0mz99dk7qf8i8xx38dd173q6b60332wxcm6cg8pm")))) "11zs53yx40mv62vxsl15mvdh7s17y5v6lgcgahdvzxgnan7w8bk7"))))
(build-system waf-build-system) (build-system waf-build-system)
(arguments (arguments
`(#:tests? #f ; no check target `(#:tests? #f ; no check target
@ -302,14 +302,14 @@ ideal (e.g. in LV2 implementations or embedded applications).")
(define-public sord (define-public sord
(package (package
(name "sord") (name "sord")
(version "0.16.6") (version "0.16.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.drobilla.net/sord-" (uri (string-append "https://download.drobilla.net/sord-"
version ".tar.bz2")) version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"0i4x49ckdi1d24kwp6rmnf2mz78sncdpq22xhv9kclq8frxg4yk6")))) "052y7zllrg0bzyky2rmrrwnnf16p6bk7q40rq9mgm0mzm8p9sa3w"))))
(build-system waf-build-system) (build-system waf-build-system)
(arguments (arguments
`(#:tests? #f ; no check target `(#:tests? #f ; no check target

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