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:
Marius Bakke 2022-12-28 01:02:47 +01:00
commit ec0fbb471d
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
233 changed files with 8947 additions and 4412 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.guix-authorizations
View file

@ -90,6 +90,9 @@
(;; primary: "B68B DF22 73F9 DA0E 63C1 8A32 515B F416 9242 D600" (;; primary: "B68B DF22 73F9 DA0E 63C1 8A32 515B F416 9242 D600"
"C699 ED09 E51B CE89 FD1D A078 AAC7 E891 896B 568A" "C699 ED09 E51B CE89 FD1D A078 AAC7 E891 896B 568A"
(name "pgarlick")) (name "pgarlick"))
(;; primary: "7E9F 5BF6 1680 4367 127B 7A87 F9E6 9FB8 5A75 54F1"
"A420 7B56 C255 109F 2CB3 157E 4990 97AE 5EA8 15D9"
(name "podiki"))
("CD2D 5EAA A98C CB37 DA91 D6B0 5F58 1664 7F8B E551" ("CD2D 5EAA A98C CB37 DA91 D6B0 5F58 1664 7F8B E551"
(name "raghavgururajan")) (name "raghavgururajan"))
("BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC" ("BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC"

32
NEWS
View file

@ -80,9 +80,28 @@ Please send Guix bug reports to bug-guix@gnu.org.
*** The init RAM disk honors more arguments—e.g. ‘root’ and ‘rootflags’ *** The init RAM disk honors more arguments—e.g. ‘root’ and ‘rootflags’
*** ‘guix system image’ can now generate WSL images *** ‘guix system image’ can now generate WSL images
*** The mcron task scheduler logs now contain the jobs exit statuses *** The mcron task scheduler logs now contain the jobs exit statuses
*** Chromium extensions are now built in a deterministic fashion
*** The ‘rsync’ service lets you specify individual “modules”
*** New services
anonip, bitmask, fail2ban, gitile, greetd, jami, lightdm, log-cleanup,
nar-herder, opendht, rasdaemon, samba, seatd, strongswan, wsdd
*** 5311 new packages
*** 6573 package updates
Noteworthy updates:
bash 5.1.8, binutils 2.37, clojure 1.11.1, cups 2.3.3op2, emacs 28.2,
enlightenment 0.25.4, gcc-toolchain 12.2.0, gdb 12.1, ghc 8.10.7,
gimp 2.10.32, glibc 2.33, gnome 42.4, gnupg 2.2.32, go 1.19.1, guile 3.0.8,
icecat 102.5.0-guix0-preview1, icedtea 3.19.0, inkscape 1.2.1, julia 1.6.7,
libreoffice 7.4.3.2, linux-libre 6.0.10, ocaml 4.14.0, octave 7.2.0,
openjdk 18, perl 5.34.0, python2 2.7.18, python 3.9.9, racket 8.7,
rust 1.60.0, r 4.2.2, sbcl 2.2.10, shepherd 0.9.3, xorg-server 21.1.4
** Programming interfaces ** Programming interfaces
*** Package input fields can now plain package lists *** Package input fields can now be plain package lists
*** G-expressions can now be used in build phases *** G-expressions can now be used in build phases
*** New ‘modify-inputs’ macro to ease customizing a list of package inputs *** New ‘modify-inputs’ macro to ease customizing a list of package inputs
*** New ‘this-package-input’ and ‘this-package-native-input’ macros *** New ‘this-package-input’ and ‘this-package-native-input’ macros
@ -92,7 +111,7 @@ Please send Guix bug reports to bug-guix@gnu.org.
*** ‘texlive-union’ is now deprecated in favor of ‘texlive-updmap.cfg’ *** ‘texlive-union’ is now deprecated in favor of ‘texlive-updmap.cfg’
*** New (guix cpu) module *** New (guix cpu) module
*** New (guix least-authority) module *** New (guix least-authority) module
*** New (guix plaform) module *** New (guix platform) module
*** New (guix read-print) module *** New (guix read-print) module
It provides a comment-preserving reader and a comment-preserving It provides a comment-preserving reader and a comment-preserving
@ -103,11 +122,14 @@ pretty-printer smarter than (ice-9 pretty-print).
This build system lets you build Guix instances from channel specifications, This build system lets you build Guix instances from channel specifications,
similar to how 'guix time-machine' would do it, as regular packages. similar to how 'guix time-machine' would do it, as regular packages.
*** New ‘pyproject-build-system’
This is an extension of ‘python-build-system’ with support for PEP-517 and
‘pyproject.toml’ files. It may eventually get merged back into
‘python-build-system’.
*** New ‘elm-build-system’ *** New ‘elm-build-system’
*** New ‘rebar-build-system’ *** New ‘rebar-build-system’
*** New services
anonip, bitmask, fail2ban, gitile, greetd, jami, lightdm, log-cleanup,
nar-herder, opendht, rasdaemon, samba, seatd, strongswan, wsdd
** Noteworthy bug fixes ** Noteworthy bug fixes
*** Fall back to Software Heritage when cloning a channel *** Fall back to Software Heritage when cloning a channel

2
doc/contributing.texi
View file

@ -1514,7 +1514,7 @@ that we can send the rest of the patches to.
@example @example
$ git send-email outgoing/0000-cover-letter.patch -a \ $ git send-email outgoing/0000-cover-letter.patch -a \
--to=guix-patches@@debbugs.gnu.org \ --to=guix-patches@@gnu.org \
$(etc/teams.scm cc-members ...) $(etc/teams.scm cc-members ...)
$ rm outgoing/0000-cover-letter.patch # we don't want to resend it! $ rm outgoing/0000-cover-letter.patch # we don't want to resend it!
@end example @end example

263
doc/guix.texi
View file

@ -10,8 +10,8 @@
@include version.texi @include version.texi
@c Identifier of the OpenPGP key used to sign tarballs and such. @c Identifier of the OpenPGP key used to sign tarballs and such.
@set OPENPGP-SIGNING-KEY-ID 27D586A4F8900854329FF09F1260E46482E63562 @set OPENPGP-SIGNING-KEY-ID 3CE464558A84FDC69DB40CFB090B11993D9AEBB5
@set OPENPGP-SIGNING-KEY-URL https://sv.gnu.org/people/viewgpg.php?user_id=127547 @set OPENPGP-SIGNING-KEY-URL https://sv.gnu.org/people/viewgpg.php?user_id=15145
@c Base URL for downloads. @c Base URL for downloads.
@set BASE-URL https://ftp.gnu.org/gnu/guix @set BASE-URL https://ftp.gnu.org/gnu/guix
@ -1522,8 +1522,10 @@ To install the policy run this command as root:
semodule -i etc/guix-daemon.cil semodule -i etc/guix-daemon.cil
@end example @end example
Then relabel the file system with @code{restorecon} or by a different Then relabel the file system with @code{restorecon -vR /} or by a
mechanism provided by your system. different mechanism provided by your system. You may need to remount
@file{/gnu/store} to make it writable first, e.g. with @code{mount -o
remount,rw /gnu/store}.
Once the policy is installed, the file system has been relabeled, and Once the policy is installed, the file system has been relabeled, and
the daemon has been restarted, it should be running in the the daemon has been restarted, it should be running in the
@ -1556,7 +1558,7 @@ but it would be preferable to define socket rules for only this label.
@code{guix gc} cannot access arbitrary links to profiles. By design, @code{guix gc} cannot access arbitrary links to profiles. By design,
the file label of the destination of a symlink is independent of the the file label of the destination of a symlink is independent of the
file label of the link itself. Although all profiles under file label of the link itself. Although all profiles under
$localstatedir are labelled, the links to these profiles inherit the @file{$localstatedir} are labelled, the links to these profiles inherit the
label of the directory they are in. For links in the user’s home label of the directory they are in. For links in the user’s home
directory this will be @code{user_home_t}. But for links from the root directory this will be @code{user_home_t}. But for links from the root
user’s home directory, or @file{/tmp}, or the HTTP server’s working user’s home directory, or @file{/tmp}, or the HTTP server’s working
@ -11706,8 +11708,7 @@ This is the declarative counterpart of @code{text-file}.
@end deffn @end deffn
@deffn {Scheme Procedure} computed-file @var{name} @var{gexp} @ @deffn {Scheme Procedure} computed-file @var{name} @var{gexp} @
[#:local-build? #t] [#:local-build? #t] [#:options '()]
[#:options '()]
Return an object representing the store item @var{name}, a file or Return an object representing the store item @var{name}, a file or
directory computed by @var{gexp}. When @var{local-build?} is true (the directory computed by @var{gexp}. When @var{local-build?} is true (the
default), the derivation is built locally. @var{options} is a list of default), the derivation is built locally. @var{options} is a list of
@ -13933,6 +13934,25 @@ gnu/packages/multiprecision.scm:40:12: 6.1.2 is already the latest version of gm
@end table @end table
If for some reason you don't want to update to the latest version, you
can update to a specific version by appending an equal sign and the
desired version number to the package specification. Note that not all
updaters support this; an error is reported when an updater cannot
refresh to the specified version.
@example
$ guix refresh trytond-party
gnu/packages/guile.scm:392:2: guile would be upgraded from 3.0.3 to 3.0.5
$ guix refresh -u guile=3.0.4
@dots{}
gnu/packages/guile.scm:392:2: guile: updating from version 3.0.3 to version 3.0.4...
@dots{}
$ guix refresh -u guile@@2.0=2.0.12
@dots{}
gnu/packages/guile.scm:147:2: guile: updating from version 2.0.10 to version 2.0.12...
@dots{}
@end example
Sometimes the upstream name differs from the package name used in Guix, Sometimes the upstream name differs from the package name used in Guix,
and @command{guix refresh} needs a little help. Most updaters honor the and @command{guix refresh} needs a little help. Most updaters honor the
@code{upstream-name} property in package definitions, which can be used @code{upstream-name} property in package definitions, which can be used
@ -17060,7 +17080,7 @@ I/O faster, and thus paging out unused portions of program memory will
expand the RAM available for such caching. expand the RAM available for such caching.
For a more detailed description of how memory is managed from the For a more detailed description of how memory is managed from the
viewpoint of a monolithic kernel, @xref{Memory viewpoint of a monolithic kernel, @pxref{Memory
Concepts,,, libc, The GNU C Library Reference Manual}. Concepts,,, libc, The GNU C Library Reference Manual}.
The Linux kernel has support for swap partitions and swap files: the The Linux kernel has support for swap partitions and swap files: the
@ -23237,8 +23257,6 @@ manages all the Bluetooth devices and provides a number of D-Bus
interfaces. When AUTO-ENABLE? is true, the bluetooth controller is interfaces. When AUTO-ENABLE? is true, the bluetooth controller is
powered automatically at boot, which can be useful when using a powered automatically at boot, which can be useful when using a
bluetooth keyboard or mouse. bluetooth keyboard or mouse.
Users need to be in the @code{lp} group to access the D-Bus service.
@end deffn @end deffn
@deffn {Scheme Variable} bluetooth-service-type @deffn {Scheme Variable} bluetooth-service-type
@ -25730,6 +25748,11 @@ Data type representing the configuration of opensmtpd.
@item @code{package} (default: @var{opensmtpd}) @item @code{package} (default: @var{opensmtpd})
Package object of the OpenSMTPD SMTP server. Package object of the OpenSMTPD SMTP server.
@item @code{shepherd-requirement} (default: @code{'()})
This option can be used to provide a list of symbols naming Shepherd services
that this service will depend on, such as @code{'networking}
if you want to configure OpenSMTPD to listen on non-loopback interfaces.
@item @code{config-file} (default: @code{%default-opensmtpd-config-file}) @item @code{config-file} (default: @code{%default-opensmtpd-config-file})
File-like object of the OpenSMTPD configuration file to use. By default File-like object of the OpenSMTPD configuration file to use. By default
it listens on the loopback network interface, and allows for mail from it listens on the loopback network interface, and allows for mail from
@ -28453,6 +28476,8 @@ Local accounts with lower values will silently fail to authenticate.
@node LDAP Services @node LDAP Services
@subsection LDAP Services @subsection LDAP Services
@cindex LDAP @cindex LDAP
@subsubheading Authentication against LDAP with nslcd
@cindex nslcd, LDAP service @cindex nslcd, LDAP service
The @code{(gnu services authentication)} module provides the The @code{(gnu services authentication)} module provides the
@ -28929,6 +28954,189 @@ Defaults to @samp{()}.
@c %end of generated documentation for nslcd-configuration @c %end of generated documentation for nslcd-configuration
@subsubheading LDAP Directory Server
@cindex LDAP, server
The @code{(gnu services ldap)} module provides the
@code{directory-server-service-type}, which can be used to create and
launch an LDAP server instance.
Here is an example configuration of the
@code{directory-server-service-type}:
@lisp
(use-service-modules ldap)
...
(operating-system
...
(services
(cons
(service directory-server-service-type
(directory-server-instance-configuration
(slapd
(slapd-configuration
(root-password "@{PBKDF2_SHA256@}AAAgAG@dots{}ABSOLUTELYSECRET")))))
%base-services)))
@end lisp
The root password should be generated with the @command{pwdhash} utility
that is provided by the @code{389-ds-base} package.
Note that changes to the directory server configuration will not be
applied to existing instances. You will need to back up and restore
server data manually. Only new directory server instances will be
created upon system reconfiguration.
@c %start of generated documentation for directory-server-instance-configuration
@deftp {Data Type} directory-server-instance-configuration
Available @code{directory-server-instance-configuration} fields are:
@table @asis
@item @code{package} (default: @code{389-ds-base}) (type: file-like)
The @code{389-ds-base} package.
@item @code{config-version} (default: @code{2}) (type: number)
Sets the format version of the configuration file. To use the INF file
with @command{dscreate}, this parameter must be 2.
@item @code{full-machine-name} (default: @code{"localhost"}) (type: string)
Sets the fully qualified hostname (FQDN) of this system.
@item @code{selinux} (default: @code{#false}) (type: boolean)
Enables SELinux detection and integration during the installation of
this instance. If set to @code{#true}, @command{dscreate} auto-detects
whether SELinux is enabled.
@item @code{strict-host-checking} (default: @code{#true}) (type: boolean)
Sets whether the server verifies the forward and reverse record set in
the @code{full-machine-name} parameter. When installing this instance with
GSSAPI authentication behind a load balancer, set this parameter to
@code{#false}.
@item @code{systemd} (default: @code{#false}) (type: boolean)
Enables systemd platform features. If set to @code{#true},
@command{dscreate} auto-detects whether systemd is installed.
@item @code{slapd} (type: slapd-configuration)
Configuration of slapd.
@deftp {Data Type} slapd-configuration
Available @code{slapd-configuration} fields are:
@table @asis
@item @code{instance-name} (default: @code{"localhost"}) (type: string)
Sets the name of the instance. You can refer to this value in other
parameters of this INF file using the @code{@{instance_name@}} variable.
Note that this name cannot be changed after the installation!
@item @code{user} (default: @code{"dirsrv"}) (type: string)
Sets the user name the ns-slapd process will use after the service
started.
@item @code{group} (default: @code{"dirsrv"}) (type: string)
Sets the group name the ns-slapd process will use after the service
started.
@item @code{port} (default: @code{389}) (type: number)
Sets the TCP port the instance uses for LDAP connections.
@item @code{secure-port} (default: @code{636}) (type: number)
Sets the TCP port the instance uses for TLS-secured LDAP connections
(LDAPS).
@item @code{root-dn} (default: @code{"cn=Directory Manager"}) (type: string)
Sets the @dfn{Distinquished Name} (DN) of the administrator account for this
instance.
@item @code{root-password} (default: @code{"@{invalid@}YOU-SHOULD-CHANGE-THIS"}) (type: string)
Sets the password of the account specified in the @code{root-dn}
parameter. You can either set this parameter to a plain text password
@command{dscreate} hashes during the installation or to a
"@{algorithm@}hash" string generated by the @command{pwdhash} utility.
Note that setting a plain text password can be a security risk if
unprivileged users can read this INF file!
@item @code{self-sign-cert} (default: @code{#true}) (type: boolean)
Sets whether the setup creates a self-signed certificate and enables TLS
encryption during the installation. This is not suitable for
production, but it enables administrators to use TLS right after the
installation. You can replace the self-signed certificate with a
certificate issued by a certificate authority.
@item @code{self-sign-cert-valid-months} (default: @code{24}) (type: number)
Set the number of months the issued self-signed certificate will be
valid.
@item @code{backup-dir} (default: @code{"/var/lib/dirsrv/slapd-@{instance_name@}/bak"}) (type: string)
Set the backup directory of the instance.
@item @code{cert-dir} (default: @code{"/etc/dirsrv/slapd-@{instance_name@}"}) (type: string)
Sets the directory of the instance's Network Security Services (NSS)
database.
@item @code{config-dir} (default: @code{"/etc/dirsrv/slapd-@{instance_name@}"}) (type: string)
Sets the configuration directory of the instance.
@item @code{db-dir} (default: @code{"/var/lib/dirsrv/slapd-@{instance_name@}/db"}) (type: string)
Sets the database directory of the instance.
@item @code{initconfig-dir} (default: @code{"/etc/dirsrv/registry"}) (type: string)
Sets the directory of the operating system's rc configuration directory.
@item @code{ldif-dir} (default: @code{"/var/lib/dirsrv/slapd-@{instance_name@}/ldif"}) (type: string)
Sets the LDIF export and import directory of the instance.
@item @code{lock-dir} (default: @code{"/var/lock/dirsrv/slapd-@{instance_name@}"}) (type: string)
Sets the lock directory of the instance.
@item @code{log-dir} (default: @code{"/var/log/dirsrv/slapd-@{instance_name@}"}) (type: string)
Sets the log directory of the instance.
@item @code{run-dir} (default: @code{"/run/dirsrv"}) (type: string)
Sets PID directory of the instance.
@item @code{schema-dir} (default: @code{"/etc/dirsrv/slapd-@{instance_name@}/schema"}) (type: string)
Sets schema directory of the instance.
@item @code{tmp-dir} (default: @code{"/tmp"}) (type: string)
Sets the temporary directory of the instance.
@end table
@end deftp
@item @code{backend-userroot} (type: backend-userroot-configuration)
Configuration of the userroot backend.
@deftp {Data Type} backend-userroot-configuration
Available @code{backend-userroot-configuration} fields are:
@table @asis
@item @code{create-suffix-entry?} (default: @code{#false}) (type: boolean)
Set this parameter to @code{#true} to create a generic root node entry
for the suffix in the database.
@item @code{require-index?} (default: @code{#false}) (type: boolean)
Set this parameter to @code{#true} to refuse unindexed searches in this
database.
@item @code{sample-entries} (default: @code{"no"}) (type: string)
Set this parameter to @code{"yes"} to add latest version of sample
entries to this database. Or, use @code{"001003006"} to use the 1.3.6
version sample entries. Use this option, for example, to create a
database for testing purposes.
@item @code{suffix} (type: maybe-string)
Sets the root suffix stored in this database. If you do not set the
suffix attribute the install process will not create the backend/suffix.
You can also create multiple backends/suffixes by duplicating this
section.
@end table
@end deftp
@end table
@end deftp
@c end of generated documentation for directory-server
@node Web Services @node Web Services
@subsection Web Services @subsection Web Services
@ -30820,7 +31028,7 @@ cache.size = 100 * MB
")))) "))))
@end lisp @end lisp
For more information, refer its @url{https://knot-resolver.readthedocs.org/en/stable/daemon.html#configuration, manual}. For more information, refer its @url{https://knot-resolver.readthedocs.io/en/stable/config-overview.html, manual}.
@end deffn @end deffn
@deftp {Data Type} knot-resolver-configuration @deftp {Data Type} knot-resolver-configuration
@ -31579,6 +31787,10 @@ The optional endpoint for the peer, such as
@item @code{public-key} @item @code{public-key}
The peer public-key represented as a base64 string. The peer public-key represented as a base64 string.
@item @code{preshared-key} (default: @code{#f})
An optional pre-shared key file for this peer. The given file will not
be autogenerated.
@item @code{allowed-ips} @item @code{allowed-ips}
A list of IP addresses from which incoming traffic for this peer is A list of IP addresses from which incoming traffic for this peer is
allowed and to which incoming traffic for this peer is directed. allowed and to which incoming traffic for this peer is directed.
@ -34065,6 +34277,10 @@ To override a setting, you must use the configuration type for that service:
@item @code{file-storage-paths} (default: @code{'()}) @item @code{file-storage-paths} (default: @code{'()})
List of allowed directories for file storage backend. List of allowed directories for file storage backend.
@item @code{hooks} (default: @code{#f})
When set, this should be a file-like object containing a directory with
@url{https://docs.ganeti.org/docs/ganeti/3.0/html/hooks.html,cluster execution hooks}.
@item @code{os} (default: @code{%default-ganeti-os}) @item @code{os} (default: @code{%default-ganeti-os})
List of @code{<ganeti-os>} records. List of @code{<ganeti-os>} records.
@end table @end table
@ -37209,6 +37425,15 @@ The Nix package to use.
@item @code{sandbox} (default: @code{#t}) @item @code{sandbox} (default: @code{#t})
Specifies whether builds are sandboxed by default. Specifies whether builds are sandboxed by default.
@item @code{build-directory} (default: @code{"/tmp"})
The directory where build directory are stored during builds.
This is useful to change if, for example, the default location does not
have enough space to hold build trees for big packages.
This is similar to setting the @env{TMPDIR} environment variable for
@command{guix-daemon}. @ref{Build Environment Setup, @env{TMPDIR}},
for more info.
@item @code{build-sandbox-items} (default: @code{'()}) @item @code{build-sandbox-items} (default: @code{'()})
This is a list of strings or objects appended to the This is a list of strings or objects appended to the
@code{build-sandbox-items} field of the configuration file. @code{build-sandbox-items} field of the configuration file.
@ -39255,7 +39480,7 @@ $ qemu-system-x86_64 \
-nic user,model=virtio-net-pci \ -nic user,model=virtio-net-pci \
-enable-kvm -m 2048 \ -enable-kvm -m 2048 \
-device virtio-blk,drive=myhd \ -device virtio-blk,drive=myhd \
-drive if=none,file=/tmp/qemu-image,id=myhd -drive if=none,file=guix-system-vm-image-@value{VERSION}.x86_64-linux.qcow2,id=myhd
@end example @end example
Here is what each of these options means: Here is what each of these options means:
@ -39291,8 +39516,9 @@ better performance than if it were emulating a complete disk drive. See the
QEMU and KVM documentation for more info. QEMU and KVM documentation for more info.
@item -drive if=none,file=/tmp/qemu-image,id=myhd @item -drive if=none,file=/tmp/qemu-image,id=myhd
Use our QCOW image, the @file{/tmp/qemu-image} file, as the backing Use our QCOW image, the
store of the ``myhd'' drive. @file{guix-system-vm-image-@value{VERSION}.x86_64-linux.qcow2} file, as
the backing store of the ``myhd'' drive.
@end table @end table
The default @command{run-vm.sh} script that is returned by an invocation of The default @command{run-vm.sh} script that is returned by an invocation of
@ -39521,11 +39747,10 @@ The service type for an @emph{extensible} service looks like this:
(compose concatenate) ;concatenate the list of rules (compose concatenate) ;concatenate the list of rules
(extend (lambda (config rules) (extend (lambda (config rules)
(match config (udev-configuration
(($ <udev-configuration> udev initial-rules) (inherit config)
(udev-configuration (rules (append (udev-configuration-rules config)
(udev udev) ;the udev package to use rules)))))))
(rules (append initial-rules rules)))))))))
@end lisp @end lisp
This is the service type for the This is the service type for the

12
doc/htmlxref.cnf
View file

@ -1,7 +1,7 @@
# htmlxref.cnf - reference file for free Texinfo manuals on the web. # htmlxref.cnf - reference file for free Texinfo manuals on the web.
# Modified by Ludovic Courtès <ludo@gnu.org> for the GNU Guix manual. # Modified by Ludovic Courtès <ludo@gnu.org> for the GNU Guix manual.
htmlxrefversion=2022-08-04.13; # UTC htmlxrefversion=2022-12-18.15; # UTC
# Copyright 2010-2020, 2022 Free Software Foundation, Inc. # Copyright 2010-2020, 2022 Free Software Foundation, Inc.
# #
@ -409,6 +409,8 @@ GUILE_GNOME = ${GS}/guile-gnome/docs
guile-gtk node ${GS}/guile-gtk/docs/guile-gtk/ guile-gtk node ${GS}/guile-gtk/docs/guile-gtk/
guile-netlink mono https://git.lepiller.eu/guile-netlink/manual/manual.html
guile-rpc mono ${GS}/guile-rpc/manual/guile-rpc.html guile-rpc mono ${GS}/guile-rpc/manual/guile-rpc.html
guile-rpc node ${GS}/guile-rpc/manual/html_node/ guile-rpc node ${GS}/guile-rpc/manual/html_node/
@ -420,6 +422,8 @@ GUIX = ${GUIX_ROOT}/manual
guix.es node ${GUIX}/es/html_node/ guix.es node ${GUIX}/es/html_node/
guix.fr mono ${GUIX}/fr/guix.fr.html guix.fr mono ${GUIX}/fr/guix.fr.html
guix.fr node ${GUIX}/fr/html_node/ guix.fr node ${GUIX}/fr/html_node/
guix.pt_BR mono ${GUIX}/pt-br/guix.pt_BR.html
guix.pt_BR node ${GUIX}/pt-br/html_node/
guix.ru mono ${GUIX}/ru/guix.ru.html guix.ru mono ${GUIX}/ru/guix.ru.html
guix.ru node ${GUIX}/ru/html_node/ guix.ru node ${GUIX}/ru/html_node/
guix.zh_CN mono ${GUIX}/zh-cn/guix.zh_CN.html guix.zh_CN mono ${GUIX}/zh-cn/guix.zh_CN.html
@ -428,10 +432,12 @@ GUIX = ${GUIX_ROOT}/manual
guix node ${GUIX}/en/html_node/ guix node ${GUIX}/en/html_node/
GUIX_COOKBOOK = ${GUIX_ROOT}/cookbook GUIX_COOKBOOK = ${GUIX_ROOT}/cookbook
guix-cookbook.de mono ${GUIX_COOKBOOK}/de/guix-cookbook.html guix-cookbook.de mono ${GUIX_COOKBOOK}/de/guix-cookbook.de.html
guix-cookbook.de node ${GUIX_COOKBOOK}/de/html_node/ guix-cookbook.de node ${GUIX_COOKBOOK}/de/html_node/
guix-cookbook.fr mono ${GUIX_COOKBOOK}/fr/guix-cookbook.html guix-cookbook.fr mono ${GUIX_COOKBOOK}/fr/guix-cookbook.fr.html
guix-cookbook.fr node ${GUIX_COOKBOOK}/fr/html_node/ guix-cookbook.fr node ${GUIX_COOKBOOK}/fr/html_node/
guix-cookbook.sk mono ${GUIX_COOKBOOK}/sk/guix-cookbook.sk.html
guix-cookbook.sk node ${GUIX_COOKBOOK}/sk/html_node/
guix-cookbook mono ${GUIX_COOKBOOK}/en/guix-cookbook.html guix-cookbook mono ${GUIX_COOKBOOK}/en/guix-cookbook.html
guix-cookbook node ${GUIX_COOKBOOK}/en/html_node/ guix-cookbook node ${GUIX_COOKBOOK}/en/html_node/

25
etc/guix-daemon.cil.in
View file

@ -1,6 +1,6 @@
; -*- lisp -*- ; -*- lisp -*-
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2018, 2022 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2020 Daniel Brooks <db48x@db48x.net> ;;; Copyright © 2020 Daniel Brooks <db48x@db48x.net>
;;; Copyright © 2020 Marius Bakke <marius@gnu.org> ;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
;;; ;;;
@ -37,11 +37,13 @@
(block guix_daemon (block guix_daemon
;; Require existing types ;; Require existing types
(typeattributeset cil_gen_require init_t)
(typeattributeset cil_gen_require tmp_t)
(typeattributeset cil_gen_require nscd_var_run_t)
(typeattributeset cil_gen_require var_log_t)
(typeattributeset cil_gen_require domain) (typeattributeset cil_gen_require domain)
(typeattributeset cil_gen_require init_t)
(typeattributeset cil_gen_require init_var_run_t)
(typeattributeset cil_gen_require nscd_var_run_t)
(typeattributeset cil_gen_require system_dbusd_var_run_t)
(typeattributeset cil_gen_require tmp_t)
(typeattributeset cil_gen_require var_log_t)
;; Declare own types ;; Declare own types
(type guix_daemon_t) (type guix_daemon_t)
@ -92,6 +94,9 @@
(allow init_t (allow init_t
guix_store_content_t guix_store_content_t
(file (open read execute))) (file (open read execute)))
(allow init_t
guix_profiles_t
(dir (setattr)))
;; guix-daemon needs to know the names of users ;; guix-daemon needs to know the names of users
(allow guix_daemon_t (allow guix_daemon_t
@ -284,6 +289,14 @@
guix_store_content_t guix_store_content_t
(sock_file (create getattr setattr unlink write))) (sock_file (create getattr setattr unlink write)))
;; Access to run state directories
(allow guix_daemon_t
system_dbusd_var_run_t
(dir (search)))
(allow guix_daemon_t
init_var_run_t
(dir (search)))
;; Access to configuration files and directories ;; Access to configuration files and directories
(allow guix_daemon_t (allow guix_daemon_t
guix_daemon_conf_t guix_daemon_conf_t
@ -447,6 +460,8 @@
any (unconfined_u object_r guix_store_content_t (low low))) any (unconfined_u object_r guix_store_content_t (low low)))
(filecon "@prefix@/bin/guix-daemon" (filecon "@prefix@/bin/guix-daemon"
file (system_u object_r guix_daemon_exec_t (low low))) file (system_u object_r guix_daemon_exec_t (low low)))
(filecon "@guix_localstatedir@/guix/profiles/per-user/[^/]+/current-guix/bin/guix-daemon"
file (system_u object_r guix_daemon_exec_t (low low)))
(filecon "@storedir@/.+-(guix-.+|profile)/bin/guix-daemon" (filecon "@storedir@/.+-(guix-.+|profile)/bin/guix-daemon"
file (system_u object_r guix_daemon_exec_t (low low))) file (system_u object_r guix_daemon_exec_t (low low)))
(filecon "@storedir@/[a-z0-9]+-guix-daemon" (filecon "@storedir@/[a-z0-9]+-guix-daemon"

12
etc/guix-install.sh
View file

@ -53,6 +53,7 @@ REQUIRE=(
"chmod" "chmod"
"uname" "uname"
"groupadd" "groupadd"
"useradd"
"tail" "tail"
"tr" "tr"
"xz" "xz"
@ -120,10 +121,8 @@ chk_require()
command -v "$c" &>/dev/null || warn+=("$c") command -v "$c" &>/dev/null || warn+=("$c")
done done
[ "${#warn}" -ne 0 ] && [ "${#warn}" -ne 0 ] && die "Missing commands: ${warn[*]}."
{ _err "${ERR}Missing commands: ${warn[*]}.";
return 1; }
_msg "${PAS}verification of required commands completed" _msg "${PAS}verification of required commands completed"
} }
@ -615,7 +614,10 @@ https://www.gnu.org/software/guix/
EOF EOF
# Don't use ‘read -p’ here! It won't display when run non-interactively. # Don't use ‘read -p’ here! It won't display when run non-interactively.
echo -n "Press return to continue..."$'\r' echo -n "Press return to continue..."$'\r'
read -r char if ! read -r char; then
echo
die "Can't read standard input. Hint: don't pipe scripts into a shell."
fi
if [ "$char" ]; then if [ "$char" ]; then
echo echo
echo "...that ($char) was not a return!" echo "...that ($char) was not a return!"

2
etc/snippets/tempel/text-mode
View file

@ -1,6 +1,6 @@
-*- mode: lisp-data -*- -*- mode: lisp-data -*-
text-mode :when (and (fboundp 'git-commit-mode) (git-commit-mode)) text-mode :when (and (fboundp 'git-commit-mode) git-commit-mode)
(add\ "gnu: Add " (add\ "gnu: Add "
(p (with-temp-buffer (p (with-temp-buffer

19
etc/teams.scm.in
View file

@ -360,6 +360,17 @@ asdf-build-system."
"gnu/packages/motti.scm" "gnu/packages/motti.scm"
"guix/build/minetest-build-system.scm"))) "guix/build/minetest-build-system.scm")))
(define-team localization
(team 'localization
#:name "Localization (l10n) team"
#:description
"Localization of your system to specific languages."
#:scope (list "gnu/packages/anthy.scm"
"gnu/packages/fcitx5.scm"
"gnu/packages/fcitx.scm"
"gnu/packages/fonts.scm"
"gnu/packages/ibus.scm")))
(define-team translations (define-team translations
(team 'translations (team 'translations
#:name "Translations" #:name "Translations"
@ -428,6 +439,10 @@ importer."
"andreas@enge.fr") "andreas@enge.fr")
science) science)
(define-member (person "Tobias Geerinckx-Rice"
"me@tobias.gr")
core kernel mentors)
(define-member (person "Björn Höfling" (define-member (person "Björn Höfling"
"bjoern.hoefling@bjoernhoefling.de") "bjoern.hoefling@bjoernhoefling.de")
java) java)
@ -500,6 +515,10 @@ importer."
"rg@raghavgururajan.name") "rg@raghavgururajan.name")
mentors) mentors)
(define-member (person "宋文武"
"iyzsong@envs.net")
games localization)
(define (find-team name) (define (find-team name)
(or (hash-ref %teams (string->symbol name)) (or (hash-ref %teams (string->symbol name))

2
gnu/bootloader/u-boot.scm
View file

@ -144,7 +144,7 @@
(define u-boot-beaglebone-black-bootloader (define u-boot-beaglebone-black-bootloader
(bootloader (bootloader
(inherit u-boot-bootloader) (inherit u-boot-bootloader)
(package u-boot-am335x-boneblack) (package u-boot-am335x-evm-boneblack)
(disk-image-installer install-beaglebone-black-u-boot))) (disk-image-installer install-beaglebone-black-u-boot)))
(define u-boot-allwinner-bootloader (define u-boot-allwinner-bootloader

11
gnu/build/activation.scm
View file

@ -363,9 +363,14 @@ second element is the name it should appear at, such as:
"Tell the kernel to look for device firmware under DIRECTORY. This "Tell the kernel to look for device firmware under DIRECTORY. This
mechanism bypasses udev: it allows Linux to handle firmware loading directly mechanism bypasses udev: it allows Linux to handle firmware loading directly
by itself, without having to resort to a \"user helper\"." by itself, without having to resort to a \"user helper\"."
(call-with-output-file "/sys/module/firmware_class/parameters/path"
(lambda (port) ;; If the kernel was built without firmware loading support, this file
(display directory port)))) ;; does not exist. Do nothing in that case.
(let ((firmware-path "/sys/module/firmware_class/parameters/path"))
(when (file-exists? firmware-path)
(call-with-output-file firmware-path
(lambda (port)
(display directory port))))))
(define (activate-ptrace-attach) (define (activate-ptrace-attach)
"Allow users to PTRACE_ATTACH their own processes. "Allow users to PTRACE_ATTACH their own processes.

2
gnu/build/hurd-boot.scm
View file

@ -194,7 +194,7 @@ set."
("proc" ("/hurd/procfs" "--stat-mode=444")))) ("proc" ("/hurd/procfs" "--stat-mode=444"))))
(define devices (define devices
'(("dev/full" ("/hurd/null" "--full") #o666) `(("dev/full" ("/hurd/null" "--full") #o666)
("dev/null" ("/hurd/null") #o666) ("dev/null" ("/hurd/null") #o666)
("dev/random" ("/hurd/random" "--seed-file" "/var/lib/random-seed") ("dev/random" ("/hurd/random" "--seed-file" "/var/lib/random-seed")
#o644) #o644)

23
gnu/build/install.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-2020, 2022 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com> ;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; ;;;
@ -282,12 +282,31 @@ disk."
(mount "/.rw-store" (%store-directory) "" MS_MOVE) (mount "/.rw-store" (%store-directory) "" MS_MOVE)
(rmdir "/.rw-store"))) (rmdir "/.rw-store")))
(define (umount* directory)
"Unmount DIRECTORY, but retry a few times upon EBUSY."
(let loop ((attempts 5))
(catch 'system-error
(lambda ()
(umount directory))
(lambda args
(if (and (= EBUSY (system-error-errno args))
(> attempts 0))
(begin
(sleep 1)
(loop (- attempts 1)))
(apply throw args))))))
(define (unmount-cow-store target backing-directory) (define (unmount-cow-store target backing-directory)
"Unmount copy-on-write store." "Unmount copy-on-write store."
(let ((tmp-dir "/remove")) (let ((tmp-dir "/remove"))
(mkdir-p tmp-dir) (mkdir-p tmp-dir)
(mount (%store-directory) tmp-dir "" MS_MOVE) (mount (%store-directory) tmp-dir "" MS_MOVE)
(umount tmp-dir)
;; We might get EBUSY at this point, possibly because of lingering
;; processes with open file descriptors. Use 'umount*' to retry upon
;; EBUSY, leaving a bit of time. See <https://issues.guix.gnu.org/59884>.
(umount* tmp-dir)
(rmdir tmp-dir) (rmdir tmp-dir)
(delete-file-recursively (delete-file-recursively
(string-append target backing-directory)))) (string-append target backing-directory))))

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

@ -120,22 +120,25 @@ services more consistent."))
home-xdg-base-directories-configuration-fields)) home-xdg-base-directories-configuration-fields))
(define (ensure-xdg-base-dirs-on-activation config) (define (ensure-xdg-base-dirs-on-activation config)
#~(map (lambda (xdg-base-dir-variable) (with-imported-modules '((guix build utils))
((@ (guix build utils) mkdir-p) #~(begin
(getenv (use-modules (guix build utils))
xdg-base-dir-variable))) (map (lambda (xdg-base-dir-variable)
'#$(filter-map (mkdir-p
(lambda (field) (getenv
(let ((variable xdg-base-dir-variable)))
(string-append '#$(filter-map
"XDG_" (lambda (field)
(object->snake-case-string (let ((variable
(configuration-field-name field) 'upper)))) (string-append
;; XDG_RUNTIME_DIR shouldn't be created during activation "XDG_"
;; and will be provided by elogind or other service. (object->snake-case-string
(and (not (string=? "XDG_RUNTIME_DIR" variable)) (configuration-field-name field) 'upper))))
variable))) ;; XDG_RUNTIME_DIR shouldn't be created during activation
home-xdg-base-directories-configuration-fields))) ;; and will be provided by elogind or other service.
(and (not (string=? "XDG_RUNTIME_DIR" variable))
variable)))
home-xdg-base-directories-configuration-fields)))))
(define (last-extension-or-cfg config extensions) (define (last-extension-or-cfg config extensions)
"Picks configuration value from last provided extension. If there "Picks configuration value from last provided extension. If there
@ -245,6 +248,8 @@ pre-populated content.")
home-activation-service-type home-activation-service-type
home-xdg-user-directories-activation-service))) home-xdg-user-directories-activation-service)))
(default-value (home-xdg-user-directories-configuration)) (default-value (home-xdg-user-directories-configuration))
(compose identity)
(extend last-extension-or-cfg)
(description "Configure XDG user directories. To (description "Configure XDG user directories. To
disable a directory, point it to the $HOME."))) disable a directory, point it to the $HOME.")))

30
gnu/installer/final.scm
View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018, 2020 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2018, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2019, 2020, 2022 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -114,6 +114,8 @@ it can interact with the rest of the system."
;; Catch SIGINT and kill the container process. ;; Catch SIGINT and kill the container process.
(sigaction SIGINT (sigaction SIGINT
(lambda (signum) (lambda (signum)
;: FIXME: Use of SIGKILL prevents the dynamic-wind exit handler of
;; THUNK to run.
(false-if-exception (false-if-exception
(kill pid SIGKILL)))) (kill pid SIGKILL))))
@ -196,14 +198,16 @@ or #f. Return #t on success and #f on failure."
;; the loaded cow-store locale files will prevent umounting. ;; the loaded cow-store locale files will prevent umounting.
(install-locale locale) (install-locale locale)
;; Save the database, so that it can be restored once the ;; Stop the daemon and save the database, so that it can be
;; cow-store is umounted. ;; restored once the cow-store is umounted.
(stop-service 'guix-daemon)
(copy-file database-file saved-database) (copy-file database-file saved-database)
(installer-log-line "mounting copy-on-write store")
(mount-cow-store (%installer-target-dir) backing-directory)) (mount-cow-store (%installer-target-dir) backing-directory))
(lambda () (lambda ()
;; We need to drag the guix-daemon to the container MNT ;; We need to drag the guix-daemon to the container MNT
;; namespace, so that it can operate on the cow-store. ;; namespace, so that it can operate on the cow-store.
(stop-service 'guix-daemon)
(start-service 'guix-daemon (list (number->string (getpid)))) (start-service 'guix-daemon (list (number->string (getpid))))
(setvbuf (current-output-port) 'none) (setvbuf (current-output-port) 'none)
@ -213,11 +217,25 @@ or #f. Return #t on success and #f on failure."
(set! ret (run-command install-command #:tty? #t))) (set! ret (run-command install-command #:tty? #t)))
(lambda () (lambda ()
;; Restart guix-daemon so that it does no keep the MNT namespace ;; Stop guix-daemon so that it does no keep the MNT namespace
;; alive. ;; alive.
(restart-service 'guix-daemon) (stop-service 'guix-daemon)
;; Restore the database and restart it. As part of restoring the
;; database, remove the WAL and shm files in case they were left
;; behind after guix-daemon was stopped. Failing to do so,
;; sqlite might behave as if transactions that appear in the WAL
;; file were committed. (See <https://www.sqlite.org/wal.html>.)
(installer-log-line "restoring store database from '~a'"
saved-database)
(copy-file saved-database database-file) (copy-file saved-database database-file)
(for-each (lambda (suffix)
(false-if-exception
(delete-file (string-append database-file suffix))))
'("-wal" "-shm"))
(start-service 'guix-daemon)
;; Finally umount the cow-store and exit the container. ;; Finally umount the cow-store and exit the container.
(installer-log-line "unmounting copy-on-write store")
(unmount-cow-store (%installer-target-dir) backing-directory) (unmount-cow-store (%installer-target-dir) backing-directory)
(assert-exit ret)))))))) (assert-exit ret))))))))

2
gnu/installer/newt.scm
View file

@ -116,7 +116,7 @@ report it by email to ~a.") uploaded-name %guix-bug-report-address)
(define command-output "") (define command-output "")
(define (line-accumulator line) (define (line-accumulator line)
(set! command-output (set! command-output
(string-append/shared command-output line "\n"))) (string-append/shared command-output line)))
(define result (run-external-command-with-line-hooks (list line-accumulator) (define result (run-external-command-with-line-hooks (list line-accumulator)
args)) args))
(define exit-val (status:exit-val result)) (define exit-val (status:exit-val result))

26
gnu/installer/utils.scm
View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018, 2020 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2018, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2019, 2020, 2022 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -159,7 +159,9 @@ COMMAND will be run in a pseudoterminal. Returns the integer status value of
the child process as returned by waitpid." the child process as returned by waitpid."
(define (handler input) (define (handler input)
(and (and
(and=> (get-line input) ;; Lines for progress bars etc. end in \r; treat is as a line ending so
;; those lines are printed right away.
(and=> (read-delimited "\r\n" input 'concat)
(lambda (line) (lambda (line)
(if (eof-object? line) (if (eof-object? line)
#f #f
@ -186,7 +188,7 @@ in a pseudoterminal."
(installer-log-line "running command ~s" command) (installer-log-line "running command ~s" command)
(define result (run-external-command-with-line-hooks (define result (run-external-command-with-line-hooks
(list %display-line-hook) command (list display) command
#:tty? tty?)) #:tty? tty?))
(define exit-val (status:exit-val result)) (define exit-val (status:exit-val result))
(define term-sig (status:term-sig result)) (define term-sig (status:term-sig result))
@ -264,7 +266,10 @@ values."
(or port (%make-void-port "w"))))) (or port (%make-void-port "w")))))
(define (%syslog-line-hook line) (define (%syslog-line-hook line)
(format (syslog-port) "installer[~d]: ~a~%" (getpid) line)) (let ((line (if (string-suffix? "\r" line)
(string-append (string-drop-right line 1) "\n")
line)))
(format (syslog-port) "installer[~d]: ~a" (getpid) line)))
(define-syntax syslog (define-syntax syslog
(lambda (s) (lambda (s)
@ -293,11 +298,7 @@ values."
port))) port)))
(define (%installer-log-line-hook line) (define (%installer-log-line-hook line)
(format (installer-log-port) "~a~%" line)) (display line (installer-log-port)))
(define (%display-line-hook line)
(display line)
(newline))
(define %default-installer-line-hooks (define %default-installer-line-hooks
(list %syslog-line-hook (list %syslog-line-hook
@ -309,9 +310,10 @@ values."
(syntax-case s () (syntax-case s ()
((_ fmt args ...) ((_ fmt args ...)
(string? (syntax->datum #'fmt)) (string? (syntax->datum #'fmt))
#'(let ((formatted (format #f fmt args ...))) (with-syntax ((fmt (string-append (syntax->datum #'fmt) "\n")))
(for-each (lambda (f) (f formatted)) #'(let ((formatted (format #f fmt args ...)))
%default-installer-line-hooks)))))) (for-each (lambda (f) (f formatted))
%default-installer-line-hooks)))))))
;;; ;;;

17
gnu/local.mk
View file

@ -671,6 +671,7 @@ GNU_SYSTEM_MODULES = \
%D%/services/guix.scm \ %D%/services/guix.scm \
%D%/services/hurd.scm \ %D%/services/hurd.scm \
%D%/services/kerberos.scm \ %D%/services/kerberos.scm \
%D%/services/ldap.scm \
%D%/services/lightdm.scm \ %D%/services/lightdm.scm \
%D%/services/linux.scm \ %D%/services/linux.scm \
%D%/services/lirc.scm \ %D%/services/lirc.scm \
@ -962,8 +963,6 @@ dist_patch_DATA = \
%D%/packages/patches/cdrkit-libre-cross-compile.patch \ %D%/packages/patches/cdrkit-libre-cross-compile.patch \
%D%/packages/patches/cdrtools-3.01-mkisofs-isoinfo.patch \ %D%/packages/patches/cdrtools-3.01-mkisofs-isoinfo.patch \
%D%/packages/patches/ceph-disable-cpu-optimizations.patch \ %D%/packages/patches/ceph-disable-cpu-optimizations.patch \
%D%/packages/patches/ceph-boost-compat.patch \
%D%/packages/patches/ceph-rocksdb-compat.patch \
%D%/packages/patches/chmlib-inttypes.patch \ %D%/packages/patches/chmlib-inttypes.patch \
%D%/packages/patches/cl-asdf-config-directories.patch \ %D%/packages/patches/cl-asdf-config-directories.patch \
%D%/packages/patches/clamav-config-llvm-libs.patch \ %D%/packages/patches/clamav-config-llvm-libs.patch \
@ -1111,6 +1110,7 @@ dist_patch_DATA = \
%D%/packages/patches/firebird-riscv64-support-pt1.patch \ %D%/packages/patches/firebird-riscv64-support-pt1.patch \
%D%/packages/patches/firebird-riscv64-support-pt2.patch \ %D%/packages/patches/firebird-riscv64-support-pt2.patch \
%D%/packages/patches/flann-cmake-3.11.patch \ %D%/packages/patches/flann-cmake-3.11.patch \
%D%/packages/patches/flashrom-fix-building-on-aarch64.patch \
%D%/packages/patches/flatpak-fix-path.patch \ %D%/packages/patches/flatpak-fix-path.patch \
%D%/packages/patches/flatpak-unset-gdk-pixbuf-for-sandbox.patch \ %D%/packages/patches/flatpak-unset-gdk-pixbuf-for-sandbox.patch \
%D%/packages/patches/fontconfig-cache-ignore-mtime.patch \ %D%/packages/patches/fontconfig-cache-ignore-mtime.patch \
@ -1344,14 +1344,7 @@ dist_patch_DATA = \
%D%/packages/patches/isl-0.11.1-aarch64-support.patch \ %D%/packages/patches/isl-0.11.1-aarch64-support.patch \
%D%/packages/patches/itk-snap-alt-glibc-compat.patch \ %D%/packages/patches/itk-snap-alt-glibc-compat.patch \
%D%/packages/patches/jami-disable-integration-tests.patch \ %D%/packages/patches/jami-disable-integration-tests.patch \
%D%/packages/patches/jami-fix-qml-imports.patch \
%D%/packages/patches/jami-fix-unit-tests-build.patch \
%D%/packages/patches/jami-libjami-headers-search.patch \ %D%/packages/patches/jami-libjami-headers-search.patch \
%D%/packages/patches/jami-no-webengine.patch \
%D%/packages/patches/jami-sipaccount-segfault.patch \
%D%/packages/patches/jami-sip-contacts.patch \
%D%/packages/patches/jami-sip-unregister.patch \
%D%/packages/patches/jami-xcb-link.patch \
%D%/packages/patches/jamvm-1.5.1-aarch64-support.patch \ %D%/packages/patches/jamvm-1.5.1-aarch64-support.patch \
%D%/packages/patches/jamvm-1.5.1-armv7-support.patch \ %D%/packages/patches/jamvm-1.5.1-armv7-support.patch \
%D%/packages/patches/jamvm-2.0.0-aarch64-support.patch \ %D%/packages/patches/jamvm-2.0.0-aarch64-support.patch \
@ -1377,9 +1370,9 @@ dist_patch_DATA = \
%D%/packages/patches/json-c-0.12-CVE-2020-12762.patch \ %D%/packages/patches/json-c-0.12-CVE-2020-12762.patch \
%D%/packages/patches/jsoncpp-pkg-config-version.patch \ %D%/packages/patches/jsoncpp-pkg-config-version.patch \
%D%/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch \ %D%/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch \
%D%/packages/patches/julia-tracker-16-compat.patch \
%D%/packages/patches/libffi-3.3-powerpc-fixes.patch \ %D%/packages/patches/libffi-3.3-powerpc-fixes.patch \
%D%/packages/patches/libffi-float128-powerpc64le.patch \ %D%/packages/patches/libffi-float128-powerpc64le.patch \
%D%/packages/patches/libgeotiff-fix-tests-with-proj-9.1.1.patch \
%D%/packages/patches/libobjc2-unbundle-robin-map.patch \ %D%/packages/patches/libobjc2-unbundle-robin-map.patch \
%D%/packages/patches/librime-fix-build-with-gcc10.patch \ %D%/packages/patches/librime-fix-build-with-gcc10.patch \
%D%/packages/patches/libvirt-add-install-prefix.patch \ %D%/packages/patches/libvirt-add-install-prefix.patch \
@ -1606,6 +1599,7 @@ dist_patch_DATA = \
%D%/packages/patches/onnx-use-system-googletest.patch \ %D%/packages/patches/onnx-use-system-googletest.patch \
%D%/packages/patches/onnx-shared-libraries.patch \ %D%/packages/patches/onnx-shared-libraries.patch \
%D%/packages/patches/onnx-skip-model-downloads.patch \ %D%/packages/patches/onnx-skip-model-downloads.patch \
%D%/packages/patches/openbios-gcc-warnings.patch \
%D%/packages/patches/openboardview-use-system-imgui.patch \ %D%/packages/patches/openboardview-use-system-imgui.patch \
%D%/packages/patches/openbox-python3.patch \ %D%/packages/patches/openbox-python3.patch \
%D%/packages/patches/opencascade-oce-glibc-2.26.patch \ %D%/packages/patches/opencascade-oce-glibc-2.26.patch \
@ -1642,6 +1636,7 @@ dist_patch_DATA = \
%D%/packages/patches/python-louvain-fix-test.patch \ %D%/packages/patches/python-louvain-fix-test.patch \
%D%/packages/patches/python-random2-getrandbits-test.patch \ %D%/packages/patches/python-random2-getrandbits-test.patch \
%D%/packages/patches/python-poppler-qt5-fix-build.patch \ %D%/packages/patches/python-poppler-qt5-fix-build.patch \
%D%/packages/patches/python-telingo-fix-comparison.patch \
%D%/packages/patches/python-w3lib-fix-test-failure.patch \ %D%/packages/patches/python-w3lib-fix-test-failure.patch \
%D%/packages/patches/sdcc-disable-non-free-code.patch \ %D%/packages/patches/sdcc-disable-non-free-code.patch \
%D%/packages/patches/sdl-pango-api_additions.patch \ %D%/packages/patches/sdl-pango-api_additions.patch \
@ -1719,7 +1714,6 @@ dist_patch_DATA = \
%D%/packages/patches/python-3-fix-tests.patch \ %D%/packages/patches/python-3-fix-tests.patch \
%D%/packages/patches/python-3-hurd-configure.patch \ %D%/packages/patches/python-3-hurd-configure.patch \
%D%/packages/patches/python-3-no-static-lib.patch \ %D%/packages/patches/python-3-no-static-lib.patch \
%D%/packages/patches/python-apsw-3.39.2.1-test-fix.patch \
%D%/packages/patches/python-aionotify-0.2.0-py3.8.patch \ %D%/packages/patches/python-aionotify-0.2.0-py3.8.patch \
%D%/packages/patches/python-argcomplete-1.11.1-fish31.patch \ %D%/packages/patches/python-argcomplete-1.11.1-fish31.patch \
%D%/packages/patches/python-cross-compile.patch \ %D%/packages/patches/python-cross-compile.patch \
@ -1729,7 +1723,6 @@ dist_patch_DATA = \
%D%/packages/patches/python-docopt-pytest6-compat.patch \ %D%/packages/patches/python-docopt-pytest6-compat.patch \
%D%/packages/patches/python-execnet-read-only-fix.patch \ %D%/packages/patches/python-execnet-read-only-fix.patch \
%D%/packages/patches/python-fixtures-remove-monkeypatch-test.patch \ %D%/packages/patches/python-fixtures-remove-monkeypatch-test.patch \
%D%/packages/patches/python-flask-restful-werkzeug-compat.patch \
%D%/packages/patches/python-ipython-documentation-chars.patch \ %D%/packages/patches/python-ipython-documentation-chars.patch \
%D%/packages/patches/python-ipython-documentation-repro.patch \ %D%/packages/patches/python-ipython-documentation-repro.patch \
%D%/packages/patches/python-keras-integration-test.patch \ %D%/packages/patches/python-keras-integration-test.patch \

50
gnu/packages/admin.scm
View file

@ -1409,14 +1409,14 @@ connection alive.")
bind-release-version))) bind-release-version)))
(package (package
(name "isc-dhcp") (name "isc-dhcp")
(version "4.4.3") (version "4.4.3-P1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://ftp.isc.org/isc/dhcp/" (uri (string-append "https://ftp.isc.org/isc/dhcp/"
version "/dhcp-" version ".tar.gz")) version "/dhcp-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"062q2g8cj2zv0zv22x6pg21m21bdlscxkg3li0ac0pm0qasccghf")))) "1ivkvhhvqxap6c51cli7pa6xn76ngxri1zbl45ishz4ranxidi0a"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:parallel-build? #f `(#:parallel-build? #f
@ -1559,7 +1559,10 @@ connection alive.")
(description (description
"ISC's Dynamic Host Configuration Protocol (DHCP) distribution provides a "ISC's Dynamic Host Configuration Protocol (DHCP) distribution provides a
reference implementation of all aspects of DHCP, through a suite of DHCP reference implementation of all aspects of DHCP, through a suite of DHCP
tools: server, client, and relay agent.") tools: server, client, and relay agent.
This software is @emph{end-of-life}! ISC does not intend to issue any further
maintenance releases.")
(license license:mpl2.0) (license license:mpl2.0)
(properties '((cpe-name . "dhcp")))))) (properties '((cpe-name . "dhcp"))))))
@ -1802,7 +1805,7 @@ over ssh connections.")
(define-public realmd (define-public realmd
(package (package
(name "realmd") (name "realmd")
(version "0.17.0") (version "0.17.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -1811,8 +1814,7 @@ over ssh connections.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32 "063cf4jkpfj548a7dxmffrpbh3j413nq3zy1zzj20lcfffnnaqwn"))))
"1c6q2a86kk2f1akzc36nh52hfwsmmc0mbp6ayyjxj4zsyk9zx5bf"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags '("--with-systemd-unit-dir=no" `(#:configure-flags '("--with-systemd-unit-dir=no"
@ -3919,13 +3921,13 @@ you are running, what theme or icon set you are using, etc.")
(define-public hyfetch (define-public hyfetch
(package (package
(name "hyfetch") (name "hyfetch")
(version "1.4.1") (version "1.4.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "HyFetch" version)) (uri (pypi-uri "HyFetch" version))
(sha256 (sha256
(base32 "18s8r63aqyah34vbahccgkiqw4008i2w5kvhqd9s8bdd4yvsrn4n")))) (base32 "1k3pcl16y2czkk7wd79yk0w1kqpi4fp8h8szhjs5ywwy20nqmms8"))))
(build-system python-build-system) (build-system python-build-system)
(inputs (list python-hypy-utils python-typing-extensions)) (inputs (list python-hypy-utils python-typing-extensions))
(arguments `(#:phases (modify-phases %standard-phases (arguments `(#:phases (modify-phases %standard-phases
@ -4085,14 +4087,14 @@ information tool.")
(define-public nnn (define-public nnn
(package (package
(name "nnn") (name "nnn")
(version "4.6") (version "4.7")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/jarun/nnn/releases/download/v" (uri (string-append "https://github.com/jarun/nnn/releases/download/v"
version "/nnn-v" version ".tar.gz")) version "/nnn-v" version ".tar.gz"))
(sha256 (sha256
(base32 "0gvyvynw957yirvc1aj65flzni7niaj5bvyk82ka5dfgi2dazb0m")))) (base32 "0dbm54m3iv8hzar38dsfxh77z4mlpjj649ga82s0wwms4vlrm5pg"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
(list ncurses readline)) (list ncurses readline))
@ -4309,7 +4311,7 @@ Python loading in HPC environments.")
(let ((real-name "inxi")) (let ((real-name "inxi"))
(package (package
(name "inxi-minimal") (name "inxi-minimal")
(version "3.3.23-1") (version "3.3.24-1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -4318,12 +4320,12 @@ 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 "0bpaffv4zqinfk46sbx82gic7572xsqiwb1lf894l1s6a6xi7zrd")))) (base32 "1nai43251r791qvc1c4hhvcaa6hq7zcjlww7k3ip7br6zgxqjaxm"))))
(build-system trivial-build-system) (build-system trivial-build-system)
(inputs (inputs
`(("bash" ,bash-minimal) (list bash-minimal
("perl" ,perl) perl
("procps" ,procps))) procps))
(native-inputs (native-inputs
(list gzip)) (list gzip))
(arguments (arguments
@ -4333,10 +4335,14 @@ Python loading in HPC environments.")
(use-modules (guix build utils) (use-modules (guix build utils)
(ice-9 match) (ice-9 match)
(srfi srfi-26)) (srfi srfi-26))
(setenv "PATH" (string-append (setenv "PATH" (string-join
(assoc-ref %build-inputs "bash") "/bin" ":" (map (lambda (file)
(assoc-ref %build-inputs "gzip") "/bin" ":" (dirname (search-input-file %build-inputs
(assoc-ref %build-inputs "perl") "/bin" ":")) file)))
(list "bin/bash"
"bin/gzip"
"bin/perl"))
":"))
(copy-recursively (assoc-ref %build-inputs "source") (copy-recursively (assoc-ref %build-inputs "source")
,(string-append real-name "-" version)) ,(string-append real-name "-" version))
(with-directory-excursion ,(string-append real-name "-" version) (with-directory-excursion ,(string-append real-name "-" version)
@ -4853,7 +4859,7 @@ entries, providing commands to add, remove, comment, and search.")
(define-public nmrpflash (define-public nmrpflash
(package (package
(name "nmrpflash") (name "nmrpflash")
(version "0.9.16") (version "0.9.19")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -4862,7 +4868,7 @@ entries, providing commands to add, remove, comment, and search.")
(url "https://github.com/jclehner/nmrpflash") (url "https://github.com/jclehner/nmrpflash")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(sha256 (sha256
(base32 "0gp66l3a2wznjnlc2ljs8g38mfrf1b9a0qcfxqg2bczmfxnrsynj")) (base32 "02r2z3mnbj8dfka7adw1l76zq1jh1l13mmkns93c54ychs44jz3d"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
@ -4881,7 +4887,7 @@ entries, providing commands to add, remove, comment, and search.")
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(mkdir-p (string-append (assoc-ref outputs "out") "/bin"))))))) (mkdir-p (string-append (assoc-ref outputs "out") "/bin")))))))
(home-page "https://github.com/jclehner/nmrpflash") (home-page "https://github.com/jclehner/nmrpflash")
(synopsis "Netgear unbrick utility") (synopsis "Reflash (``unbrick'') Netgear devices with corrupted firmware")
(description "This package provides a utility to flash a new firmware (description "This package provides a utility to flash a new firmware
image to a Netgear device. It has been tested on Netgear EX2700, EX6120, image to a Netgear device. It has been tested on Netgear EX2700, EX6120,
EX6150v2, DNG3700v2, R6100, R6220, R7000, D7000, WNR3500, R6400, R6800, EX6150v2, DNG3700v2, R6100, R6220, R7000, D7000, WNR3500, R6400, R6800,

4
gnu/packages/algebra.scm
View file

@ -327,7 +327,7 @@ precision.")
(define-public giac (define-public giac
(package (package
(name "giac") (name "giac")
(version "1.9.0-29") (version "1.9.0-33")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -339,7 +339,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 "03hbg5b0xmdfp919mxn5lsard1mwg1kcm9xrm8gk7wnmr9r1adgn")))) (base32 "00hdfakys4xpvmf2v851dr4hf3j6483pwwkfy5i63s5hs10mjsq5"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list (list

2
gnu/packages/arcan.scm
View file

@ -123,7 +123,7 @@
(files '("share/arcan/scripts"))))) (files '("share/arcan/scripts")))))
(inputs (inputs
`(("apr" ,apr) `(("apr" ,apr)
("ffmpeg" ,ffmpeg) ("ffmpeg" ,ffmpeg-4)
("freetype" ,freetype) ("freetype" ,freetype)
("glib" ,glib) ("glib" ,glib)
("glu" ,glu) ("glu" ,glu)

8
gnu/packages/aspell.scm
View file

@ -320,6 +320,14 @@ dictionaries, including personal ones.")
(base32 (base32
"0w2k5l5rbqpliripgqwiqixz5ghnjf7i9ggbrc4ly4vy1ia10rmc"))) "0w2k5l5rbqpliripgqwiqixz5ghnjf7i9ggbrc4ly4vy1ia10rmc")))
(define-public aspell-dict-nb
(aspell-dictionary "nb" "Norwegian Bokmål"
#:version "0.50.1-2"
#:prefix "aspell-"
#:sha256
(base32
"1xvns7dwx2sc0msldj7r2hv0426913rg3dpnkxlrvnsyrxzjpbpc")))
(define-public aspell-dict-pl (define-public aspell-dict-pl
(aspell-dictionary "pl" "Polish" (aspell-dictionary "pl" "Polish"
#:version "0.51-0" #:version "0.51-0"

8
gnu/packages/astronomy.scm
View file

@ -813,7 +813,7 @@ astronomical fields. SkyMaker is part of the EFIGI
(native-inputs (native-inputs
(list pkg-config)) (list pkg-config))
(inputs (inputs
(list gtkmm-3 libskry ffmpeg)) (list gtkmm-3 libskry ffmpeg-4))
(home-page "https://github.com/GreatAttractor/stackistry") (home-page "https://github.com/GreatAttractor/stackistry")
(synopsis "Astronomical lucky imaging/image stacking tool") (synopsis "Astronomical lucky imaging/image stacking tool")
(description (description
@ -1714,7 +1714,7 @@ arrays with NumPy as its only dependency.")
(copy-recursively "include" include)) (copy-recursively "include" include))
#t))))) #t)))))
(inputs (inputs
(list ffmpeg)) (list ffmpeg-4))
(home-page "https://github.com/GreatAttractor/libskry") (home-page "https://github.com/GreatAttractor/libskry")
(synopsis "Astronimical lucky imaging library") (synopsis "Astronimical lucky imaging library")
(description (description
@ -2505,13 +2505,13 @@ install an implementation package such as asdf-astropy.")
(define-public python-asdf-astropy (define-public python-asdf-astropy
(package (package
(name "python-asdf-astropy") (name "python-asdf-astropy")
(version "0.2.2") (version "0.3.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "asdf_astropy" version)) (uri (pypi-uri "asdf_astropy" version))
(sha256 (sha256
(base32 "1b0v4cl7xvly3x1k5k2rvc2l32jqgqp0iyf1j20fkvj450sx74f2")))) (base32 "1gp5iav0a9g9q0zb22vhzi3v9vwk5wn2nxvr3mvi3bsdcdj3h23v"))))
(build-system pyproject-build-system) (build-system pyproject-build-system)
(native-inputs (native-inputs
(list python-coverage (list python-coverage

33
gnu/packages/audio.scm
View file

@ -603,7 +603,11 @@ Filter) modules follow the convention of 1V / Octave.")
"--enable-samplerate" "--enable-samplerate"
"--enable-avcodec"))) "--enable-avcodec")))
(inputs (inputs
(list jack-1 libsndfile libsamplerate fftwf ffmpeg)) ; for libavcodec (list jack-1
libsndfile
libsamplerate
ffmpeg-4 ;for libavcodec
fftwf))
(native-inputs (native-inputs
(list pkg-config)) (list pkg-config))
(home-page "https://aubio.org/") (home-page "https://aubio.org/")
@ -849,26 +853,16 @@ engineers, musicians, soundtrack editors and composers.")
(define-public audacity (define-public audacity
(package (package
(name "audacity") (name "audacity")
(version "3.2.1") (version "3.2.2")
(source (source
(origin (origin
;; If built from the release tag, Audacity will describe itself
;; as an "Alpha test version" and suggest to users that they use
;; the "latest stable released version".
;; XXX: For 3.2.1 we rebelliously use a git tag anyway because the only
;; "processed" download is a .zip containing a .tar.gz which does not
;; fare well with the patch and snippet machinery:
;; https://github.com/audacity/audacity/issues/3811
;; TODO: Find a way to control the "alpha" status even when using git
;; so we're not reliant on preprocessed source code.
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/audacity/audacity") (url "https://github.com/audacity/audacity")
(commit (string-append "Audacity-" version)))) (commit (string-append "Audacity-" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32 "1akp9marc4y2g9mwwgfnl43q0gbb2dv7vhsnybh8wdn8ql30hfdw"))
"00mal30jxbcacs1ka4yb5s8xq81zm7mv3y8l5hvg77abkyvfvdzf"))
(patches (search-patches "audacity-ffmpeg-fallback.patch")) (patches (search-patches "audacity-ffmpeg-fallback.patch"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
@ -936,7 +930,11 @@ engineers, musicians, soundtrack editors and composers.")
;; TODO: enable this flag once we've packaged all dependencies ;; TODO: enable this flag once we've packaged all dependencies
;; "-Daudacity_obey_system_dependencies=on" ;; "-Daudacity_obey_system_dependencies=on"
;; disable crash reports, updates, ..., anything that phones home ;; disable crash reports, updates, ..., anything that phones home
"-Daudacity_has_networking=off") "-Daudacity_has_networking=off"
;; When building from Git — even from a release tag — this is undefined,
;; and Audacity assumes that is is an ‘alpha’ version and includes debug
;; symbols and extra code. Force level 2, ‘release’.
"-DAUDACITY_BUILD_LEVEL=2")
#:imported-modules ((guix build glib-or-gtk-build-system) #:imported-modules ((guix build glib-or-gtk-build-system)
,@%cmake-build-system-modules) ,@%cmake-build-system-modules)
#:modules #:modules
@ -4442,7 +4440,7 @@ simplified, although really accurate, measuring tools.")
,home-page)) ,home-page))
#t)))) #t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (list ffmpeg sox)) (inputs (list ffmpeg-4 sox))
(synopsis "Tool to adjust loudness of media files") (synopsis "Tool to adjust loudness of media files")
(description (description
"BS1770GAIN is a loudness scanner compliant with ITU-R BS.1770 and its "BS1770GAIN is a loudness scanner compliant with ITU-R BS.1770 and its
@ -5061,7 +5059,7 @@ stream to one or more IceCast and/or ShoutCast servers.")
(define-public libltc (define-public libltc
(package (package
(name "libltc") (name "libltc")
(version "1.3.1") (version "1.3.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -5069,8 +5067,7 @@ stream to one or more IceCast and/or ShoutCast servers.")
(string-append "https://github.com/x42/libltc/releases/download/v" (string-append "https://github.com/x42/libltc/releases/download/v"
version "/libltc-" version ".tar.gz")) version "/libltc-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32 "0j8j7cnw02arh8122d13bwkps1c0mi2xqq55gyi2bs91dk6l4v8a"))))
"173h9dgmain3nyrwk6q2d7yl4fnh4vacag4s2p01n5b7nyrkxrjh"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:parallel-tests? #f)) ;tests fail otherwise `(#:parallel-tests? #f)) ;tests fail otherwise

4
gnu/packages/backup.scm
View file

@ -633,13 +633,13 @@ detection, and lossless compression.")
(define-public borg (define-public borg
(package (package
(name "borg") (name "borg")
(version "1.2.2") (version "1.2.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "borgbackup" version)) (uri (pypi-uri "borgbackup" version))
(sha256 (sha256
(base32 "0q3jwmwwa3jlb02cbkcgh5a9cvwg64vawaypn41bdgpi8ds6hc6p")) (base32 "11b7jqv9sw22a9512b270d12k3mrcgmmcaimh6bgm5iwcgw1h973"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
#~(begin #~(begin

4
gnu/packages/benchmark.scm
View file

@ -72,14 +72,14 @@
(define-public fio (define-public fio
(package (package
(name "fio") (name "fio")
(version "3.32") (version "3.33")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://brick.kernel.dk/snaps/" (uri (string-append "https://brick.kernel.dk/snaps/"
"fio-" version ".tar.bz2")) "fio-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"0wlfzx6zwkp81fwqw0pqm9i7v0b89rpfbliwxdd8q4kp4mf3q2dv")))) "083c1w8jqkvyw7wcy69142inlikzmk1k78mk973rnqdp3a7798qb"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list #:modules (list #:modules

465
gnu/packages/bioconductor.scm
View file

@ -2202,6 +2202,53 @@ conditions or various species. @code{AMOUNTAIN} aims to search active modules
in multi-layer WGCN using a continuous optimization approach.") in multi-layer WGCN using a continuous optimization approach.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public r-amplican
(package
(name "r-amplican")
(version "1.20.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "amplican" version))
(sha256
(base32
"1c990i6gxbarcpbdpkz017x94spwzap95l95synlizbkyif4z8ij"))))
(properties `((upstream-name . "amplican")))
(build-system r-build-system)
(propagated-inputs
(list r-biocgenerics
r-biocparallel
r-biostrings
r-clustercrit
r-data-table
r-dplyr
r-genomeinfodb
r-genomicranges
r-ggplot2
r-ggthemes
r-gridextra
r-gtable
r-iranges
r-knitr
r-matrix
r-matrixstats
r-rcpp
r-rmarkdown
r-s4vectors
r-shortread
r-stringr
r-waffle))
(native-inputs (list r-knitr))
(home-page "https://github.com/valenlab/amplican")
(synopsis "Automated analysis of CRISPR experiments")
(description
"The package performs alignment of the amplicon reads, normalizes
gathered data, calculates multiple statistics (e.g. cut rates, frameshifts)
and presents the results in the form of aggregated reports. Data and
statistics can be broken down by experiments, barcodes, user defined groups,
guides and amplicons allowing for quick identification of potential
problems.")
(license license:gpl3)))
(define-public r-amaretto (define-public r-amaretto
(package (package
(name "r-amaretto") (name "r-amaretto")
@ -2287,13 +2334,13 @@ analysis, modelling, and visualization of spike-in controls.")
(define-public r-ancombc (define-public r-ancombc
(package (package
(name "r-ancombc") (name "r-ancombc")
(version "2.0.1") (version "2.0.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "ANCOMBC" version)) (uri (bioconductor-uri "ANCOMBC" version))
(sha256 (sha256
(base32 (base32
"1bwzvi6j3s66dcll1lb4xy25j4nfn1ln6mc3flh0wgy13l26x8m6")))) "0dlinv4vhxgni8ygzvfw8pbc6d1v9x5chhrpxblhs2c65bkgyxz5"))))
(properties `((upstream-name . "ANCOMBC"))) (properties `((upstream-name . "ANCOMBC")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -2337,6 +2384,65 @@ Methodologies included in the @code{ANCOMBC} package were designed to correct
these biases and construct statistically consistent estimators.") these biases and construct statistically consistent estimators.")
(license license:artistic2.0))) (license license:artistic2.0)))
(define-public r-animalcules
(package
(name "r-animalcules")
(version "1.14.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "animalcules" version))
(sha256
(base32
"1alpsamrglgvzhcibkaf7m3gyiv61wbj1gvsq4lw6vjka100j9qr"))))
(properties `((upstream-name . "animalcules")))
(build-system r-build-system)
(propagated-inputs
(list r-ape
r-assertthat
r-biomformat
r-caret
r-covr
r-deseq2
r-dplyr
r-dt
r-forcats
r-ggplot2
r-glmnet
r-gunifrac
r-lattice
r-limma
r-magrittr
r-matrix
r-multiassayexperiment
r-plotly
r-plotroc
r-rentrez
r-reshape2
r-s4vectors
r-scales
r-shiny
r-shinyjs
r-summarizedexperiment
r-tibble
r-tsne
r-umap
r-vegan
r-xml))
(native-inputs (list r-knitr))
(home-page "https://github.com/compbiomed/animalcules")
(synopsis "Interactive microbiome analysis toolkit")
(description
"Animalcules is an R package for utilizing up-to-date data analytics,
visualization methods, and machine learning models to provide users an
easy-to-use interactive microbiome analysis framework. It can be used as a
standalone software package or users can explore their data with the
accompanying interactive R Shiny application. Traditional microbiome analysis
such as alpha/beta diversity and differential abundance analysis are enhanced,
while new methods like biomarker identification are introduced by animalcules.
Powerful interactive and dynamic figures generated by animalcules enable users
to understand their data better and discover new insights.")
(license license:artistic2.0)))
(define-public r-aldex2 (define-public r-aldex2
(package (package
(name "r-aldex2") (name "r-aldex2")
@ -2492,6 +2598,37 @@ mapped reads). It is currently designed for un-stranded paired-end RNA-seq
data.") data.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public r-altcdfenvs
(package
(name "r-altcdfenvs")
(version "2.60.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "altcdfenvs" version))
(sha256
(base32
"0fm4l93j6nm1w1w57zzryc1hkzapp8l16pkwjzdzllvwvsnsg8r0"))))
(properties `((upstream-name . "altcdfenvs")))
(build-system r-build-system)
(propagated-inputs
(list r-affy
r-biobase
r-biocgenerics
r-biostrings
r-hypergraph
r-makecdfenv
r-s4vectors))
(home-page "https://bioconductor.org/packages/altcdfenvs")
(synopsis
"Convenience data structures and functions to handle CDF environments")
(description
"The package is usable with Affymetrix GeneChip short oligonucleotide
arrays, and it can be adapted or extended to other platforms. It is able to
modify or replace the grouping of probes in the probe sets. Also, the package
contains simple functions to read R connections in the FASTA format and it can
create an alternative mapping from sequences.")
(license license:gpl2+)))
(define-public r-aneufinder (define-public r-aneufinder
(package (package
(name "r-aneufinder") (name "r-aneufinder")
@ -2720,6 +2857,40 @@ biological knowledge. Genes, and clinical pathways are incorporated in the
model as latent variables.") model as latent variables.")
(license license:gpl3))) (license license:gpl3)))
(define-public r-asics
(package
(name "r-asics")
(version "2.14.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "ASICS" version))
(sha256
(base32
"0c2b3gdza58vqhharhw8967p2w2knnrm5s2svvnnjbf67qbg45b7"))))
(properties `((upstream-name . "ASICS")))
(build-system r-build-system)
(propagated-inputs
(list r-biocparallel
r-ggplot2
r-glmnet
r-gridextra
r-matrix
r-mvtnorm
r-pepsnmr
r-plyr
r-quadprog
r-ropls
r-summarizedexperiment
r-zoo))
(native-inputs (list r-knitr))
(home-page "https://bioconductor.org/packages/ASICS")
(synopsis "Automatic statistical identification in complex spectra")
(description
"ASICS quantifies concentration of metabolites in a complex spectrum.
The identification of metabolites is performed by fitting a mixture model to
the spectra of the library with a sparse penalty.")
(license license:gpl2+)))
(define-public r-aspli (define-public r-aspli
(package (package
(name "r-aspli") (name "r-aspli")
@ -3121,13 +3292,13 @@ Various visual and textual types of output are available.")
(define-public r-bambu (define-public r-bambu
(package (package
(name "r-bambu") (name "r-bambu")
(version "3.0.2") (version "3.0.5")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "bambu" version)) (uri (bioconductor-uri "bambu" version))
(sha256 (sha256
(base32 (base32
"0246cn5l1kxysjrzy4prfdxn71vc47a8kciqw384nm2mi3vsy4vx")))) "12rcbspy4ly714cyxbgd5v2m92vasksxm19m6hd4avasrhcr4d6l"))))
(properties `((upstream-name . "bambu"))) (properties `((upstream-name . "bambu")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -3164,13 +3335,13 @@ usage.")
(define-public r-bandits (define-public r-bandits
(package (package
(name "r-bandits") (name "r-bandits")
(version "1.14.0") (version "1.14.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "BANDITS" version)) (uri (bioconductor-uri "BANDITS" version))
(sha256 (sha256
(base32 (base32
"18xq8gg1j07gbbxy7r0cc34zwn40mh4fr39zzi8l3z0cymw73qs8")))) "0dbiz7zgdl3bqrwf4ffb73sc2dd8ygh76fakx5887a14azj8pk8x"))))
(properties `((upstream-name . "BANDITS"))) (properties `((upstream-name . "BANDITS")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -3309,6 +3480,44 @@ of Bioconductor.")
packages.") packages.")
(license license:artistic2.0))) (license license:artistic2.0)))
(define-public r-cardelino
(package
(name "r-cardelino")
(version "1.0.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "cardelino" version))
(sha256
(base32
"1ma4clkrkrjvy12ln2d2smyzzsz9y9554f5wgwmh9kv6s4xc66qs"))))
(properties `((upstream-name . "cardelino")))
(build-system r-build-system)
(propagated-inputs (list r-combinat
r-genomeinfodb
r-genomicranges
r-ggplot2
r-ggtree
r-matrix
r-matrixstats
r-pheatmap
r-s4vectors
r-snpstats
r-variantannotation
r-vcfr))
(native-inputs (list r-knitr))
(home-page "https://github.com/single-cell-genetics/cardelino")
(synopsis "Clone identification from single cell data")
(description
"This package provides methods to infer clonal tree configuration for a
population of cells using single-cell RNA-seq data (scRNA-seq), and possibly
other data modalities. Methods are also provided to assign cells to inferred
clones and explore differences in gene expression between clones. These
methods can flexibly integrate information from imperfect clonal trees
inferred based on bulk exome-seq data, and sparse variant alleles expressed in
scRNA-seq data. A flexible beta-binomial error model that accounts for
stochastic dropout events as well as systematic allelic imbalance is used.")
(license license:gpl3)))
(define-public r-coverageview (define-public r-coverageview
(package (package
(name "r-coverageview") (name "r-coverageview")
@ -3391,13 +3600,13 @@ factorial microarray data.")
(define-public r-damefinder (define-public r-damefinder
(package (package
(name "r-damefinder") (name "r-damefinder")
(version "1.10.0") (version "1.10.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "DAMEfinder" version)) (uri (bioconductor-uri "DAMEfinder" version))
(sha256 (sha256
(base32 (base32
"0ygsgg51473sycsh367rf8plca6zb1jg2l39zcprwvgpiln8mjdg")))) "1cgykb70mxnhilwwp1jr4dr523zvjxpix173s4ldfh49064gzwc1"))))
(properties `((upstream-name . "DAMEfinder"))) (properties `((upstream-name . "DAMEfinder")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -3705,13 +3914,13 @@ negative control samples.")
(define-public r-deconvr (define-public r-deconvr
(package (package
(name "r-deconvr") (name "r-deconvr")
(version "1.4.2") (version "1.4.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "deconvR" version)) (uri (bioconductor-uri "deconvR" version))
(sha256 (sha256
(base32 (base32
"1wa8l9zxdwx32122slnzqyk32klyznxnbziwn98jbp5fxmjka92l")))) "1jz7q4rv3m85bcvarjhqsyc2330fynb0wr5ajd2qffznczk846xb"))))
(properties `((upstream-name . "deconvR"))) (properties `((upstream-name . "deconvR")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -3727,6 +3936,7 @@ negative control samples.")
r-mass r-mass
r-matrixstats r-matrixstats
r-methylkit r-methylkit
r-minfi
r-nnls r-nnls
r-quadprog r-quadprog
r-rsq r-rsq
@ -4787,13 +4997,13 @@ only one command.")
(define-public r-biocparallel (define-public r-biocparallel
(package (package
(name "r-biocparallel") (name "r-biocparallel")
(version "1.32.3") (version "1.32.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "BiocParallel" version)) (uri (bioconductor-uri "BiocParallel" version))
(sha256 (sha256
(base32 (base32
"0z2g3p6ip4g865na9bmqaa7w2s52769pmjr3hpiv6x8bhifh3nm5")))) "1m4i27zx3ajwygwp38lrxf36rs575dkaxxc6jawpj1kzn7whi5ym"))))
(properties (properties
`((upstream-name . "BiocParallel"))) `((upstream-name . "BiocParallel")))
(build-system r-build-system) (build-system r-build-system)
@ -5154,26 +5364,26 @@ distribution.")
(define-public r-deseq2 (define-public r-deseq2
(package (package
(name "r-deseq2") (name "r-deseq2")
(version "1.38.1") (version "1.38.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "DESeq2" version)) (uri (bioconductor-uri "DESeq2" version))
(sha256 (sha256
(base32 (base32
"0xp3rfhwn8k1bqzqnjzjqlaq8lqyad7kqjhb29vkbxgzjvafvxmk")))) "1m81yvcl63h5m7kbbxpjk7hzygxmn4l9mlgqrdmnnls56183h3b4"))))
(properties `((upstream-name . "DESeq2"))) (properties `((upstream-name . "DESeq2")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
(list r-biobase (list r-biobase
r-biocgenerics r-biocgenerics
r-biocparallel r-biocparallel
r-genefilter
r-geneplotter r-geneplotter
r-genomicranges r-genomicranges
r-ggplot2 r-ggplot2
r-iranges r-iranges
r-locfit r-locfit
r-matrixstats
r-rcpp r-rcpp
r-rcpparmadillo r-rcpparmadillo
r-s4vectors r-s4vectors
@ -5386,13 +5596,13 @@ global-scaling and full-quantile normalization.")
(define-public r-edger (define-public r-edger
(package (package
(name "r-edger") (name "r-edger")
(version "3.40.0") (version "3.40.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "edgeR" version)) (uri (bioconductor-uri "edgeR" version))
(sha256 (sha256
(base32 (base32
"18vap3qp9blncr4sdl9q1szb4qhm46gldhxy3k3abw9fckcvggwg")))) "1a0rmczlqmqmip2ix28m4iwcpfj04p6nrcl562bjgaifvgyjqhzg"))))
(properties `((upstream-name . "edgeR"))) (properties `((upstream-name . "edgeR")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -5511,14 +5721,14 @@ analysis using other methods.")
(define-public r-genefilter (define-public r-genefilter
(package (package
(name "r-genefilter") (name "r-genefilter")
(version "1.80.0") (version "1.80.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "genefilter" version)) (uri (bioconductor-uri "genefilter" version))
(sha256 (sha256
(base32 (base32
"0swdqdyz956gx44crbx3qai0qx7n7yazg3yw7i93djcgahyz3kk7")))) "0f25z0hqmrkimv14j03pgjsxpq5rz9ymk151rlg4j4vpc06n73cq"))))
(build-system r-build-system) (build-system r-build-system)
(native-inputs (native-inputs
(list gfortran r-knitr)) (list gfortran r-knitr))
@ -5601,13 +5811,13 @@ genomic intervals. In addition, it can use BAM or BigWig files as input.")
(define-public r-genomeinfodb (define-public r-genomeinfodb
(package (package
(name "r-genomeinfodb") (name "r-genomeinfodb")
(version "1.34.3") (version "1.34.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "GenomeInfoDb" version)) (uri (bioconductor-uri "GenomeInfoDb" version))
(sha256 (sha256
(base32 (base32
"1pw8ml6b33z7zh7h592xl23l8dy32nqq4lzq20p57n9f0krqj1iv")))) "1nskqmlar85zg96c1fbacl7dqg6r0gl814rc7yh482y4wgmwyg0r"))))
(properties (properties
`((upstream-name . "GenomeInfoDb"))) `((upstream-name . "GenomeInfoDb")))
(build-system r-build-system) (build-system r-build-system)
@ -5661,13 +5871,13 @@ alignments.")
(define-public r-genomicfeatures (define-public r-genomicfeatures
(package (package
(name "r-genomicfeatures") (name "r-genomicfeatures")
(version "1.50.2") (version "1.50.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "GenomicFeatures" version)) (uri (bioconductor-uri "GenomicFeatures" version))
(sha256 (sha256
(base32 (base32
"10w15j107hy9qb0lh6jmyw7rinfvy3ca34xsskxw3wf25mh6vhzz")))) "14pn7lngayascj5k84g2g748assbivpiakss247cdj9ngzx5sfwz"))))
(properties (properties
`((upstream-name . "GenomicFeatures"))) `((upstream-name . "GenomicFeatures")))
(build-system r-build-system) (build-system r-build-system)
@ -5739,13 +5949,13 @@ provide added flexibility for data combination and manipulation.")
(define-public r-genomicranges (define-public r-genomicranges
(package (package
(name "r-genomicranges") (name "r-genomicranges")
(version "1.50.1") (version "1.50.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "GenomicRanges" version)) (uri (bioconductor-uri "GenomicRanges" version))
(sha256 (sha256
(base32 (base32
"14m4pvvd9m8kpc7k905km9vib7giq0i9g11bxc1ygw30ifi96966")))) "13b6bm6nrxx1vgzrzpf59c2lq5w8kjq9hsch5h037f0p9w3w5z9p"))))
(properties (properties
`((upstream-name . "GenomicRanges"))) `((upstream-name . "GenomicRanges")))
(build-system r-build-system) (build-system r-build-system)
@ -5823,6 +6033,33 @@ testing and other simple calculations.")
Enrichment Analysis} (GSEA).") Enrichment Analysis} (GSEA).")
(license license:artistic2.0))) (license license:artistic2.0)))
(define-public r-harshlight
(package
(name "r-harshlight")
(version "1.70.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "Harshlight" version))
(sha256
(base32
"0asjgcnwawg8x7ql0srhb2011rvb4kr2cpsa1cy28nfmjfvdf0qm"))))
(properties `((upstream-name . "Harshlight")))
(build-system r-build-system)
(propagated-inputs
(list r-affy
r-altcdfenvs
r-biobase))
(home-page "http://asterion.rockefeller.edu/Harshlight/")
(synopsis "Corrective make-up program for microarray chips")
(description
"The package detects extended diffuse and compact blemishes on microarray
chips. Harshlight marks the areas in a collection of chips (affybatch
objects). A corrected @code{AffyBatch} object will result. The package
replaces the defected areas with @code{N/A}s or the median of the values of
the same probe. The new version handles the substitute value as a whole
matrix to solve the memory problem.")
(license license:gpl2+)))
(define-public r-hpar (define-public r-hpar
(package (package
(name "r-hpar") (name "r-hpar")
@ -5875,13 +6112,13 @@ of other R packages who wish to make use of HTSlib.")
(define-public r-impute (define-public r-impute
(package (package
(name "r-impute") (name "r-impute")
(version "1.72.1") (version "1.72.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "impute" version)) (uri (bioconductor-uri "impute" version))
(sha256 (sha256
(base32 (base32
"0862mpbmznizcq5bgnp85dl9q0bip76jkga45gssdrv90wsi2192")))) "1k697pqlkrwmfszipl9irbzmwhk1vz97j3rh0k5nj2mrj3dr71mv"))))
(native-inputs (native-inputs
(list gfortran)) (list gfortran))
(build-system r-build-system) (build-system r-build-system)
@ -5944,13 +6181,13 @@ Shiny-based display methods for Bioconductor objects.")
(define-public r-lfa (define-public r-lfa
(package (package
(name "r-lfa") (name "r-lfa")
(version "1.28.0") (version "1.28.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "lfa" version)) (uri (bioconductor-uri "lfa" version))
(sha256 (sha256
(base32 "1l3ip0bsvbz9nagzv47qjh5hf7qf8ffk4hlnkwagngiwyq84vyp1")))) (base32 "0047wspvarbnbawrwvfjfz5y6i36l2r2k2501zjya09rjpiq101m"))))
(properties `((upstream-name . "lfa"))) (properties `((upstream-name . "lfa")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (list r-corpcor)) (propagated-inputs (list r-corpcor))
@ -6010,6 +6247,33 @@ reduction (between group analysis) and joint dimension reduction of two
datasets (coinertia analysis).") datasets (coinertia analysis).")
(license license:artistic2.0))) (license license:artistic2.0)))
(define-public r-makecdfenv
(package
(name "r-makecdfenv")
(version "1.74.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "makecdfenv" version))
(sha256
(base32
"0bvj5dg6yfjnhga1z8788zmb98d8shyz8pzz0ggnml87c1p2gy25"))))
(properties `((upstream-name . "makecdfenv")))
(build-system r-build-system)
(inputs (list zlib))
(propagated-inputs
(list r-affy
r-affyio
r-biobase
r-zlibbioc))
(home-page "https://bioconductor.org/packages/makecdfenv")
(synopsis "Chip description file environment maker")
(description
"This package implements two functions. One of them reads an Affymetrix
@acronym{CDF, chip description file} and creates a hash table environment
containing the location/probe set membership mapping. The other one creates a
package that automatically loads that environment.")
(license license:gpl2+)))
(define-public r-metaneighbor (define-public r-metaneighbor
(package (package
(name "r-metaneighbor") (name "r-metaneighbor")
@ -7050,13 +7314,13 @@ comprehensive scDblFinder method.")
(define-public r-scmap (define-public r-scmap
(package (package
(name "r-scmap") (name "r-scmap")
(version "1.20.0") (version "1.20.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "scmap" version)) (uri (bioconductor-uri "scmap" version))
(sha256 (sha256
(base32 "14vyjvfs2n4h0xsy25xg4zdmc8dqbg5vyl3qns6f0rh4bsshqdlm")))) (base32 "0rq185ynk874vgw4a5s2n92381dj6kxxnx2fcx2v7b2ahr3ybys7"))))
(properties `((upstream-name . "scmap"))) (properties `((upstream-name . "scmap")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -7597,13 +7861,13 @@ dependencies between GO terms can be implemented and applied.")
(define-public r-tximport (define-public r-tximport
(package (package
(name "r-tximport") (name "r-tximport")
(version "1.26.0") (version "1.26.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "tximport" version)) (uri (bioconductor-uri "tximport" version))
(sha256 (sha256
(base32 (base32
"1w1m6r85a5nvcfxbkq5dmczaar8vf3vbrgrmxqkjqhlpcq58z5ng")))) "1r67q4nb2bx9nqycyr2gnfmh4gizl0c7l510vmlcdvplv3yi73yn"))))
(build-system r-build-system) (build-system r-build-system)
(native-inputs (native-inputs
(list r-knitr)) (list r-knitr))
@ -7970,14 +8234,14 @@ packages.")
(define-public r-oligo (define-public r-oligo
(package (package
(name "r-oligo") (name "r-oligo")
(version "1.62.0") (version "1.62.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "oligo" version)) (uri (bioconductor-uri "oligo" version))
(sha256 (sha256
(base32 (base32
"0l6yb58frh4c080k6h8wyipc5kiz4qi7jimnr62jg8d737rrvnk2")))) "1rhzav57d092ip9qjsmskj3l8h4xyq8cpa2a2jl8g32fwh0dyvsz"))))
(properties `((upstream-name . "oligo"))) (properties `((upstream-name . "oligo")))
(build-system r-build-system) (build-system r-build-system)
(inputs (list zlib)) (inputs (list zlib))
@ -8115,14 +8379,14 @@ signal in the input, that lead to spurious peaks during peak calling.")
(define-public r-diffbind (define-public r-diffbind
(package (package
(name "r-diffbind") (name "r-diffbind")
(version "3.8.1") (version "3.8.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "DiffBind" version)) (uri (bioconductor-uri "DiffBind" version))
(sha256 (sha256
(base32 (base32
"1wgnrd1xpl49pdxxjzzl0v9535naapwp3ayqzvrx3z4m6iai2awj")))) "039gy9ll6ingh3y5h2hp3rhbh2imaryjxzgf8ysk87irlbpnx1qs"))))
(properties `((upstream-name . "DiffBind"))) (properties `((upstream-name . "DiffBind")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -8323,6 +8587,35 @@ classification and ranking tasks. @dfn{Area under curve} (AUC), precision at
a given recall, F-score for single and multiple classes are available.") a given recall, F-score for single and multiple classes are available.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public r-pepsnmr
(package
(name "r-pepsnmr")
(version "1.16.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "PepsNMR" version))
(sha256
(base32
"02i29jinawssqlb33wvj0h9w6cfcvamlyfxdynd38jmwx23l15l5"))))
(properties `((upstream-name . "PepsNMR")))
(build-system r-build-system)
(propagated-inputs
(list r-ggplot2
r-gridextra
r-matrix
r-matrixstats
r-ptw
r-reshape2))
(native-inputs (list r-knitr))
(home-page "https://github.com/ManonMartin/PepsNMR")
(synopsis "Pre-process 1H-NMR FID signals")
(description
"This package provides R functions for common pre-processing steps that
are applied on @acronym{1H-NMR, proton nuclear magnetic resonance} data. It
also provides a function to read the @acronym{FID, free induction decay}
signals directly in the Bruker format.")
(license license:gpl2)))
;; This is a CRAN package, but it depends on a Bioconductor package. ;; This is a CRAN package, but it depends on a Bioconductor package.
(define-public r-codedepends (define-public r-codedepends
(package (package
@ -8804,13 +9097,13 @@ information.")
(define-public r-glmgampoi (define-public r-glmgampoi
(package (package
(name "r-glmgampoi") (name "r-glmgampoi")
(version "1.10.0") (version "1.10.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "glmGamPoi" version)) (uri (bioconductor-uri "glmGamPoi" version))
(sha256 (sha256
(base32 (base32
"12jbqigg4k2ngrk2anbrrxrwkp57bbzdz492lg8lc6w1gygp5yip")))) "1qxzbh5i208cpghmysailachj8xpx4g4iqk8552xjpjkn54pkpbd"))))
(properties `((upstream-name . "glmGamPoi"))) (properties `((upstream-name . "glmGamPoi")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -9331,14 +9624,14 @@ penalized least squares regression method.")
(define-public r-dnacopy (define-public r-dnacopy
(package (package
(name "r-dnacopy") (name "r-dnacopy")
(version "1.72.0") (version "1.72.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "DNAcopy" version)) (uri (bioconductor-uri "DNAcopy" version))
(sha256 (sha256
(base32 (base32
"0z2hl68f5f6d2w6gbhax4531g3zbgiihj99h32sa44hp29al38ld")))) "1f6ilfwhli7bdnr48y2ijdydvw7kjbyz701kgbsw3w7inr6x6ayr"))))
(properties `((upstream-name . "DNAcopy"))) (properties `((upstream-name . "DNAcopy")))
(build-system r-build-system) (build-system r-build-system)
(native-inputs (list gfortran)) (native-inputs (list gfortran))
@ -9489,14 +9782,14 @@ coordinates.")
(define-public r-lpsymphony (define-public r-lpsymphony
(package (package
(name "r-lpsymphony") (name "r-lpsymphony")
(version "1.26.0") (version "1.26.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "lpsymphony" version)) (uri (bioconductor-uri "lpsymphony" version))
(sha256 (sha256
(base32 (base32
"0ryl48zxscb35s1gizyspxg48dlqg1j51h9iw2flq16y7y63ppzi")))) "167zpf7k7gn7gw2cxkqx89y322qinyzjr1naracp5axj4q2qagm3"))))
(build-system r-build-system) (build-system r-build-system)
(arguments (arguments
(list (list
@ -10378,14 +10671,14 @@ especially Illumina Infinium methylation microarrays.")
(define-public r-linnorm (define-public r-linnorm
(package (package
(name "r-linnorm") (name "r-linnorm")
(version "2.22.0") (version "2.22.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "Linnorm" version)) (uri (bioconductor-uri "Linnorm" version))
(sha256 (sha256
(base32 (base32
"0ndhvdd9gkqyayxqgj5320sgj15di7ji945lpdi3rj5lwldh7na0")))) "16d7viyidqbsy3mbr2cpq9p291yf362a4blhvs05qxcwm3fjllij"))))
(properties `((upstream-name . "Linnorm"))) (properties `((upstream-name . "Linnorm")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -10726,14 +11019,14 @@ the data set is suitable for such analysis.")
(define-public r-sigpathway (define-public r-sigpathway
(package (package
(name "r-sigpathway") (name "r-sigpathway")
(version "1.66.0") (version "1.66.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "sigPathway" version)) (uri (bioconductor-uri "sigPathway" version))
(sha256 (sha256
(base32 (base32
"0vb6v61ak8z3hx7d65lr1hrxk89n36j0zi3x0pp828khdyh3zvag")))) "1ln1n4zwmjw1ils45vix93q3h19xlg4q894yhhxkphgyj0qcy00b"))))
(properties `((upstream-name . "sigPathway"))) (properties `((upstream-name . "sigPathway")))
(build-system r-build-system) (build-system r-build-system)
(home-page "https://www.pnas.org/cgi/doi/10.1073/pnas.0506577102") (home-page "https://www.pnas.org/cgi/doi/10.1073/pnas.0506577102")
@ -10848,14 +11141,14 @@ data.")
(define-public r-enrichplot (define-public r-enrichplot
(package (package
(name "r-enrichplot") (name "r-enrichplot")
(version "1.18.1") (version "1.18.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "enrichplot" version)) (uri (bioconductor-uri "enrichplot" version))
(sha256 (sha256
(base32 (base32
"1x84wlkqisq1x2zniy4mp02zlsp4v85kxbflalmq0pixlkagq0vr")))) "0nzcr23m58z3h0n0frxf26z14j7ilcl4fjy7rqm7f2i1wyld70zl"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
(list r-aplot (list r-aplot
@ -10926,13 +11219,13 @@ profiles (GO and KEGG) of gene and gene clusters.")
(define-public r-clusterexperiment (define-public r-clusterexperiment
(package (package
(name "r-clusterexperiment") (name "r-clusterexperiment")
(version "2.18.0") (version "2.18.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "clusterExperiment" version)) (uri (bioconductor-uri "clusterExperiment" version))
(sha256 (sha256
(base32 (base32
"04kdiwz8qzr7cr1an1c7a684wqv9pkca0iaym5f069pdjhqvvq0a")))) "1f3f56d88yiqyj45rhcwqb04wbxr9m4fxhbbckw1j7nykm8100ps"))))
(build-system r-build-system) (build-system r-build-system)
(native-inputs (native-inputs
(list r-knitr)) (list r-knitr))
@ -11695,14 +11988,14 @@ investigation using RNA-seq data.")
(define-public r-aucell (define-public r-aucell
(package (package
(name "r-aucell") (name "r-aucell")
(version "1.20.1") (version "1.20.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "AUCell" version)) (uri (bioconductor-uri "AUCell" version))
(sha256 (sha256
(base32 (base32
"0bq729kavqkam2s4dmfzixgznsys61j0lvj5pk3b70gxv44gmpsh")))) "1qb13qd5xzgrpx6jlg3ll0ff5spz3y06ji31vvqzm759almg2w3s"))))
(properties `((upstream-name . "AUCell"))) (properties `((upstream-name . "AUCell")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -11711,6 +12004,7 @@ investigation using RNA-seq data.")
r-delayedarray r-delayedarray
r-delayedmatrixstats r-delayedmatrixstats
r-gseabase r-gseabase
r-matrix
r-mixtools r-mixtools
r-r-utils r-r-utils
r-shiny r-shiny
@ -12531,14 +12825,14 @@ and data files used across sessions.")
(define-public r-iclusterplus (define-public r-iclusterplus
(package (package
(name "r-iclusterplus") (name "r-iclusterplus")
(version "1.34.0") (version "1.34.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "iClusterPlus" version)) (uri (bioconductor-uri "iClusterPlus" version))
(sha256 (sha256
(base32 (base32
"01bl1gmc1v1b4lh88sdazjvm8pl7383dgzxnhmzpxwz7lkcxi1h2")))) "05y4jmbf8sxl32f3g5lw9ycxky0rw69gax3n2z0kif7xcb5qf3qv"))))
(properties `((upstream-name . "iClusterPlus"))) (properties `((upstream-name . "iClusterPlus")))
(build-system r-build-system) (build-system r-build-system)
(native-inputs (list gfortran)) (native-inputs (list gfortran))
@ -12971,14 +13265,14 @@ annotations.")
(define-public r-rsubread (define-public r-rsubread
(package (package
(name "r-rsubread") (name "r-rsubread")
(version "2.12.0") (version "2.12.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "Rsubread" version)) (uri (bioconductor-uri "Rsubread" version))
(sha256 (sha256
(base32 (base32
"0iha7xln7l3mrmka8rcmmlp74f5km9rc88k9nv6bxw0krr03089n")))) "1gvd8vmglvzc3bixqxrm4k7yikl2as5l4x6bvvvnwsgx2i7vz7dm"))))
(properties `((upstream-name . "Rsubread"))) (properties `((upstream-name . "Rsubread")))
(build-system r-build-system) (build-system r-build-system)
(inputs (list zlib)) (inputs (list zlib))
@ -13204,14 +13498,14 @@ manipulation of flow cytometry data.")
(define-public r-ggcyto (define-public r-ggcyto
(package (package
(name "r-ggcyto") (name "r-ggcyto")
(version "1.26.0") (version "1.26.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "ggcyto" version)) (uri (bioconductor-uri "ggcyto" version))
(sha256 (sha256
(base32 (base32
"0phhm54wcqihj62a0jk46whmf6wwg7wj3306wvnszy7yik4z857w")))) "1pj1v0bhvckvwn1p826phskqz9lv71c1913cz5w0fd87dzdbpzpj"))))
(properties `((upstream-name . "ggcyto"))) (properties `((upstream-name . "ggcyto")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -13427,38 +13721,30 @@ package.")
(define-public r-opencyto (define-public r-opencyto
(package (package
(name "r-opencyto") (name "r-opencyto")
(version "2.10.0") (version "2.10.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "openCyto" version)) (uri (bioconductor-uri "openCyto" version))
(sha256 (sha256
(base32 (base32
"1pkpm98fs17zqdvyymd58sl4cib7gdi7drvdkagilrafjcrpq31m")))) "16wsa9dhnz8gz1siyhfxvnbfg142g7fmhxiqxr7n69qpq9w8yhr0"))))
(properties `((upstream-name . "openCyto"))) (properties `((upstream-name . "openCyto")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
(list r-biobase (list r-bh
r-biobase
r-biocgenerics r-biocgenerics
r-clue r-cpp11
r-data-table r-data-table
r-flowclust r-flowclust
r-flowcore r-flowcore
r-flowstats
r-flowviz r-flowviz
r-flowworkspace r-flowworkspace
r-graph r-graph
r-gtools
r-ks
r-lattice
r-mass
r-ncdfflow r-ncdfflow
r-plyr
r-r-utils
r-rbgl r-rbgl
r-rcolorbrewer r-rcolorbrewer))
r-rcpp
r-rrcov))
(native-inputs (native-inputs
(list r-knitr)) (list r-knitr))
(home-page "https://bioconductor.org/packages/openCyto") (home-page "https://bioconductor.org/packages/openCyto")
@ -13658,14 +13944,14 @@ data, to only emphasize the data that actually matters.")
(define-public r-rcistarget (define-public r-rcistarget
(package (package
(name "r-rcistarget") (name "r-rcistarget")
(version "1.17.0") (version "1.18.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "RcisTarget" version)) (uri (bioconductor-uri "RcisTarget" version))
(sha256 (sha256
(base32 (base32
"1anwin5476q2n0zgywrmp3nj6sgy07i6pw1lczydvn4h1a8n1rvk")))) "02lz2m2zhwy1dvmjvlss6qg0dh574qhnvn7al3wx7ck1hkz0dgi2"))))
(properties `((upstream-name . "RcisTarget"))) (properties `((upstream-name . "RcisTarget")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -15328,13 +15614,13 @@ functionality.")
(define-public r-biocviews (define-public r-biocviews
(package (package
(name "r-biocviews") (name "r-biocviews")
(version "1.66.0") (version "1.66.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "biocViews" version)) (uri (bioconductor-uri "biocViews" version))
(sha256 (sha256
(base32 (base32
"1rgn0agw5m4y8838lxzq1r658h1pblaidmm444yfimjffa8znj23")))) "1xplkzm29v6aysfhb6kf2nnmvc37jmcvv6vsgbx8z8qccn96jk02"))))
(properties (properties
`((upstream-name . "biocViews"))) `((upstream-name . "biocViews")))
(build-system r-build-system) (build-system r-build-system)
@ -15346,6 +15632,7 @@ functionality.")
r-rcurl r-rcurl
r-xml r-xml
r-runit)) r-runit))
(native-inputs (list r-knitr))
(home-page "https://bioconductor.org/packages/biocViews") (home-page "https://bioconductor.org/packages/biocViews")
(synopsis "Bioconductor package categorization helper") (synopsis "Bioconductor package categorization helper")
(description "The purpose of biocViews is to create HTML pages that (description "The purpose of biocViews is to create HTML pages that
@ -15914,14 +16201,14 @@ generated.")
(define-public r-preprocesscore (define-public r-preprocesscore
(package (package
(name "r-preprocesscore") (name "r-preprocesscore")
(version "1.60.0") (version "1.60.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "preprocessCore" version)) (uri (bioconductor-uri "preprocessCore" version))
(sha256 (sha256
(base32 (base32
"1l0m591scln024jdpib47fndhx2wfp9jgkj3mdmwd9nkc5y0qjda")))) "1rwr31jp4dh3xcfx1kx8rz5xvyx1mrwy85hqrjrfr4m6h0qv28k1"))))
(properties (properties
`((upstream-name . "preprocessCore"))) `((upstream-name . "preprocessCore")))
(build-system r-build-system) (build-system r-build-system)
@ -15935,13 +16222,13 @@ routines.")
(define-public r-s4vectors (define-public r-s4vectors
(package (package
(name "r-s4vectors") (name "r-s4vectors")
(version "0.36.0") (version "0.36.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "S4Vectors" version)) (uri (bioconductor-uri "S4Vectors" version))
(sha256 (sha256
(base32 (base32
"05al4diwdbsa9b37i8msxnp79fxk7k24dk2vhh131s3snb89jvfs")))) "16lssnmhy3klqp4sw1328f38cixkjh9317gdyikcrmsbcwg2ak6v"))))
(properties (properties
`((upstream-name . "S4Vectors"))) `((upstream-name . "S4Vectors")))
(build-system r-build-system) (build-system r-build-system)
@ -16425,13 +16712,13 @@ This package wraps C++ code from the MOODS motif calling library.")
(define-public r-chromvar (define-public r-chromvar
(package (package
(name "r-chromvar") (name "r-chromvar")
(version "1.20.0") (version "1.20.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "chromVAR" version)) (uri (bioconductor-uri "chromVAR" version))
(sha256 (sha256
(base32 "1rwgbicbmszdkr05ksxfsisyhk0a4pvc3jrxbzjyc13jj5h6m5kp")))) (base32 "1nhhpqhpvmw6b0nwxdwsjnakmfpxzpii8fmabwwg9bk8ni3zj5dq"))))
(properties `((upstream-name . "chromVAR"))) (properties `((upstream-name . "chromVAR")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -16532,14 +16819,14 @@ cell types to infer the cell of origin of each single cell independently.")
(define-public r-scuttle (define-public r-scuttle
(package (package
(name "r-scuttle") (name "r-scuttle")
(version "1.8.1") (version "1.8.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "scuttle" version)) (uri (bioconductor-uri "scuttle" version))
(sha256 (sha256
(base32 (base32
"10wk46zgi57m9q9ab6wlmljcss3fph2r9yp1bp01s9yv7sd749b2")))) "1wgh28rj8m5dz89s9y4rzfy68d8ign6pcnnwj9g7h4sc3jfsg56i"))))
(properties `((upstream-name . "scuttle"))) (properties `((upstream-name . "scuttle")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -16612,14 +16899,14 @@ quality control.")
(define-public r-scran (define-public r-scran
(package (package
(name "r-scran") (name "r-scran")
(version "1.26.0") (version "1.26.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "scran" version)) (uri (bioconductor-uri "scran" version))
(sha256 (sha256
(base32 (base32
"11iwpw44600pfx01vqil97k728m1wf4dljr27k2ak4s7z75kxfih")))) "1sqc8pf1qzm24kf1l45da12wbzv0nxsy6l3v9fc8srmnvk37p04p"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
(list r-beachmat (list r-beachmat
@ -17214,13 +17501,13 @@ EMBL-EBI GWAS catalog.")
(define-public r-kegggraph (define-public r-kegggraph
(package (package
(name "r-kegggraph") (name "r-kegggraph")
(version "1.58.0") (version "1.58.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "KEGGgraph" version)) (uri (bioconductor-uri "KEGGgraph" version))
(sha256 (sha256
(base32 "0hpsb009qmhy9p67d5wd0cl60smhgjlhxsz5f52i1c6qy4jk1niq")))) (base32 "1s5j7zdp8ck4vhca81i4b6qclhwi56gmz8brawrxj3szvwmxf3y6"))))
(properties `((upstream-name . "KEGGgraph"))) (properties `((upstream-name . "KEGGgraph")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs

982
gnu/packages/bioinformatics.scm
View file

File diff suppressed because it is too large Load diff

117
gnu/packages/bootloaders.scm
View file

@ -3,7 +3,7 @@
;;; Copyright © 2015, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Leo Famulari <leo@famulari.name> ;;; Copyright © 2015 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2016, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2016, 2017, 2018, 2021 Marius Bakke <marius@gnu.org> ;;; Copyright © 2016-2018, 2021-2022 Marius Bakke <marius@gnu.org>
;;; 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, 2021, 2022 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017, 2018, 2020, 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
@ -537,12 +537,13 @@ The SUBDIR argument defaults to \"efi/Guix\", as it is also the case for
(lambda _ (lambda _
(invoke "chmod" "a+w" "utils/isohybrid.in"))) (invoke "chmod" "a+w" "utils/isohybrid.in")))
(replace 'check (replace 'check
(lambda _ (lambda* (#:key tests? #:allow-other-keys)
(setenv "CC" "gcc") (when tests?
(substitute* "tests/unittest/include/unittest/unittest.h" (setenv "CC" "gcc")
;; Don't look up headers under /usr. (substitute* "tests/unittest/include/unittest/unittest.h"
(("/usr/include/") "")) ;; Don't look up headers under /usr.
(invoke "make" "unittest")))))) (("/usr/include/") ""))
(invoke "make" "unittest")))))))
(home-page "https://www.syslinux.org") (home-page "https://www.syslinux.org")
(synopsis "Lightweight Linux bootloader") (synopsis "Lightweight Linux bootloader")
(description "Syslinux is a lightweight Linux bootloader.") (description "Syslinux is a lightweight Linux bootloader.")
@ -655,6 +656,7 @@ tree binary files. These are board description files used by Linux and BSD.")
lz4 lz4
ncurses/tinfo ncurses/tinfo
perl perl
pkg-config ;for 'make menuconfig'
python python
python-coverage python-coverage
python-pycryptodomex python-pycryptodomex
@ -728,8 +730,7 @@ def test_ctrl_c"))
;; This test requires a sound system, which is un-used ;; This test requires a sound system, which is un-used
;; in u-boot-tools. ;; in u-boot-tools.
(("CONFIG_SOUND=y") "CONFIG_SOUND=n"))) (("CONFIG_SOUND=y") "CONFIG_SOUND=n")))
(find-files "configs" "sandbox_.*defconfig$|tools-only_defconfig")) (find-files "configs" "sandbox_.*defconfig$|tools-only_defconfig"))))
#t))
(replace 'configure (replace 'configure
(lambda* (#:key make-flags #:allow-other-keys) (lambda* (#:key make-flags #:allow-other-keys)
(apply invoke "make" "tools-only_defconfig" make-flags))) (apply invoke "make" "tools-only_defconfig" make-flags)))
@ -754,8 +755,7 @@ def test_ctrl_c"))
"tools/proftool" "tools/proftool"
"tools/fdtgrep" "tools/fdtgrep"
"tools/env/fw_printenv" "tools/env/fw_printenv"
"tools/sunxi-spl-image-builder")) "tools/sunxi-spl-image-builder")))))
#t)))
(delete 'check) (delete 'check)
(add-after 'install 'check (add-after 'install 'check
(lambda* (#:key make-flags test-target #:allow-other-keys) (lambda* (#:key make-flags test-target #:allow-other-keys)
@ -817,6 +817,7 @@ appended to the package description."
#:test-target "test" #:test-target "test"
#:make-flags #:make-flags
(list "HOSTCC=gcc" (list "HOSTCC=gcc"
"KBUILD_VERBOSE=1"
,@(if (not (same-arch?)) ,@(if (not (same-arch?))
`((string-append "CROSS_COMPILE=" ,triplet "-")) `((string-append "CROSS_COMPILE=" ,triplet "-"))
'())) '()))
@ -889,7 +890,7 @@ appended to the package description."
(define-public u-boot-malta (define-public u-boot-malta
(make-u-boot-package "malta" "mips64el-linux-gnuabi64")) (make-u-boot-package "malta" "mips64el-linux-gnuabi64"))
(define-public u-boot-am335x-boneblack (define-public u-boot-am335x-evm-boneblack
(make-u-boot-package (make-u-boot-package
"am335x_evm" "arm-linux-gnueabihf" "am335x_evm" "arm-linux-gnueabihf"
;; Patch out other device trees to build an image small enough to fit ;; Patch out other device trees to build an image small enough to fit
@ -1419,7 +1420,7 @@ order to add a suitable bootloader menu entry.")
;; ;;
;; TODO: Bump this timestamp at each modifications of the package (not only ;; TODO: Bump this timestamp at each modifications of the package (not only
;; for updates) by running: date +%s. ;; for updates) by running: date +%s.
(let ((timestamp "1591706427")) (let ((timestamp "1671715380"))
(package (package
(name "ipxe") (name "ipxe")
(version "1.21.1") (version "1.21.1")
@ -1481,6 +1482,14 @@ order to add a suitable bootloader menu entry.")
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'enter-source-directory (add-after 'unpack 'enter-source-directory
(lambda _ (chdir "src") #t)) (lambda _ (chdir "src") #t))
(add-after 'enter-source-directory 'set-version
(lambda _
;; When not building from a git checkout, iPXE encodes the
;; version as "1.0.0+". Use the package version instead.
(substitute* "Makefile"
(("^VERSION[[:blank:]]+=.*")
(string-append "VERSION = " ,(package-version this-package)
"-guix\n")))))
(add-after 'enter-source-directory 'set-options (add-after 'enter-source-directory 'set-options
(lambda _ (lambda _
(substitute* "config/general.h" (substitute* "config/general.h"
@ -1531,3 +1540,85 @@ existing PXE ROM on your network card, or you can chainload into iPXE to obtain
the features of iPXE without the hassle of reflashing.") the features of iPXE without the hassle of reflashing.")
(license license:gpl2+)))) (license license:gpl2+))))
(define-public ipxe-qemu
(package/inherit ipxe
(name "ipxe-qemu")
(native-inputs
;; QEMU uses a 64-bit UEFI firmware.
(if (target-x86-64?)
(modify-inputs (package-native-inputs ipxe)
(prepend edk2-tools))
(if (target-64bit?)
(modify-inputs (package-native-inputs ipxe)
(prepend edk2-tools
(cross-gcc "x86_64-linux-gnu")
(cross-binutils "x86_64-linux-gnu")))
;; Our default 32-bit binutils is not 64-bit capable.
(let ((binutils-64-bit-bfd
(package/inherit
binutils
(name "binutils-64-bit-bfd")
(arguments
(substitute-keyword-arguments (package-arguments binutils)
((#:configure-flags flags ''())
`(cons "--enable-64-bit-bfd" ,flags)))))))
(modify-inputs (package-native-inputs ipxe)
(prepend edk2-tools
(make-ld-wrapper "ld-wrapper-64-bit-bfd"
#:binutils binutils)
binutils-64-bit-bfd
(cross-gcc "x86_64-linux-gnu")
(cross-binutils "x86_64-linux-gnu")))))))
(arguments
(let ((roms
;; Alist of ROM -> (VID . DID) entries. This list and below
;; build steps are taken from QEMUs roms/Makefile.
'(("e1000" . ("8086" . "100e"))
("e1000e" . ("8086" . "10d3"))
("eepro100" . ("8086" . "1209"))
("ne2k_pci" . ("1050" . "0940"))
("pcnet" . ("1022" . "2000"))
("rtl8139" . ("10ec" . "8139"))
("virtio" . ("1af4" . "1000"))
("vmxnet3" . ("15ad" . "07b0")))))
(substitute-keyword-arguments (package-arguments ipxe)
((#:modules modules)
`((ice-9 match) ,@modules))
((#:make-flags flags)
#~(append (delete "everything" #$flags)
'("CONFIG=qemu"
#$@(if (target-x86-64?)
'()
'("CROSS_COMPILE=x86_64-linux-gnu-")))
(map (match-lambda
((_ . (vid . did))
(string-append "bin/" vid did ".rom")))
'#$roms)
(map (match-lambda
((_ . (vid . did))
(string-append "bin-x86_64-efi/"
vid did ".efidrv")))
'#$roms)))
((#:phases phases)
#~(modify-phases #$phases
(replace 'install
(lambda _
(let ((firmware (string-append #$output "/share/qemu")))
(mkdir-p firmware)
(for-each
(match-lambda
((name . (vid . did))
(let ((rom (string-append "bin/" vid did ".rom")))
(copy-file rom
(string-append firmware
"/pxe-" name ".rom"))
(invoke "EfiRom"
"-b" rom
"-l" "0x02"
"-f" (string-append "0x" vid)
"-i" (string-append "0x" did)
"-ec" (string-append "bin-x86_64-efi/"
vid did ".efidrv")
"-o" (string-append firmware
"/efi-" name ".rom")))))
'#$roms)))))))))))

8
gnu/packages/c.scm
View file

@ -425,14 +425,14 @@ whose behaviour is inconsistent across *NIX flavours.")
(define-public libhx (define-public libhx
(package (package
(name "libhx") (name "libhx")
(version "4.3") (version "4.8")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://inai.de/files/libhx/" (uri (string-append "https://inai.de/files/libhx/"
"libHX-" version ".tar.xz")) "libHX-" version ".tar.xz"))
(sha256 (sha256
(base32 "06zkzaya6j3vaafz80qcgn5qcri047003bhmjisv5sbikcw97jqy")))) (base32 "1mj6n4p0fs1jzj1dvk2xkyiyc1s7s5fxv27iciwn0xkwhasjmhxa"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(home-page "https://inai.de/projects/libhx/") (home-page "https://inai.de/projects/libhx/")
(synopsis "C library with common data structures and functions") (synopsis "C library with common data structures and functions")
@ -760,7 +760,7 @@ portability.")
(define-public byacc (define-public byacc
(package (package
(name "byacc") (name "byacc")
(version "20220128") (version "20221106")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -768,7 +768,7 @@ portability.")
version ".tgz")) version ".tgz"))
(sha256 (sha256
(base32 (base32
"173l5pdzgqk2ld6lf0ablii0iiw07sry2vrjfrm4wc99qmf81ha2")))) "04lxggjarbidfq8ba5q6kwgqys4lhidbnz8gf3vrrb5wgcibx6d8"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(home-page "https://invisible-island.net/byacc/byacc.html") (home-page "https://invisible-island.net/byacc/byacc.html")
(synopsis "Berkeley Yacc LALR parser generator") (synopsis "Berkeley Yacc LALR parser generator")

4
gnu/packages/ccache.scm
View file

@ -35,14 +35,14 @@
(define-public ccache (define-public ccache
(package (package
(name "ccache") (name "ccache")
(version "4.7.2") (version "4.7.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/ccache/ccache/releases/download/v" (uri (string-append "https://github.com/ccache/ccache/releases/download/v"
version "/ccache-" version ".tar.xz")) version "/ccache-" version ".tar.xz"))
(sha256 (sha256
(base32 "1bsf27dii1bm6bamvs6gi6vm5pjrd0956vf8597ix76lfyjpbjhp")))) (base32 "0djfm138m863g772bnq7m2mfwh3y8sqxczc3yssg1yiybp8n836z"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
(list #:configure-flags (list #:configure-flags

87
gnu/packages/check.scm
View file

@ -580,6 +580,85 @@ It allows the specification of behaviour scenarios using a given-when-then
pattern.") pattern.")
(license license:apsl2)))) (license license:apsl2))))
(define-public catch2-3.1
(package
(name "catch2")
(version "3.1.1")
(home-page "https://github.com/catchorg/Catch2")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/catchorg/Catch2")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1qnr5b3zq8brh43f924rgnw5gmmjf9ax7kbq2crz1mlwgmdymxlp"))))
(outputs (list "out" "static"))
(build-system meson-build-system)
(arguments
(list
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'patch-meson
(lambda _
(substitute* "src/catch2/meson.build"
(("static_library") "both_libraries"))))
(add-after 'install 'install-cmake-config
(lambda* (#:key outputs #:allow-other-keys)
(define prefix (string-append (assoc-ref outputs "out")
"/lib/cmake/Catch2/"))
(mkdir-p prefix)
(call-with-output-file (string-append
prefix
"catch2-config-version.cmake")
(lambda (port)
(format
port
"set(PACKAGE_VERSION ~s)~@
if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)~@
set(PACKAGE_VERSION_EXACT TRUE)~@
set(PACKAGE_VERSION_COMPATIBLE TRUE)~@
elseif(PACKAGE_FIND_VERSION VERSION_LESS_EQUAL ~
PACKAGE_VERSION)~@
set(PACKAGE_VERSION_COMPATIBLE TRUE)~@
else()~@
set(PACKAGE_VERSION_COMPATIBLE FALSE)~@
endif()"
#$version)))
(call-with-output-file (string-append prefix
"catch2-config.cmake")
(lambda (port)
(format
port
"include(FindPkgConfig)~@
pkg_check_modules(CATCH2 IMPORTED_TARGET GLOBAL catch2)~@
pkg_check_modules(CATCH2MAIN ~
IMPORTED_TARGET GLOBAL ~
catch2 catch2-with-main)~@
if(CATCH2_FOUND)~@
add_library(Catch2::Catch2 ALIAS PkgConfig::CATCH2)~@
endif()~@
if(CATCH2MAIN_FOUND)~@
add_library(Catch2::Catch2WithMain ~
ALIAS PkgConfig::CATCH2MAIN)~@
endif()")))))
(add-after 'install 'move-static-libraries
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(static (assoc-ref outputs "static")))
(for-each
(lambda (file)
(install-file file (string-append static "/lib"))
(delete-file file))
(find-files (string-append out "/lib")
"\\.a$"))))))))
(inputs (list python-wrapper))
(synopsis "Automated test framework for C++ and Objective-C")
(description "Catch2 stands for C++ Automated Test Cases in Headers and is
a multi-paradigm automated test framework for C++ and Objective-C.")
(license license:boost1.0)))
(define-public cmdtest (define-public cmdtest
(package (package
(name "cmdtest") (name "cmdtest")
@ -750,7 +829,7 @@ and it supports a very flexible form of test discovery.")
(define-public doctest (define-public doctest
(package (package
(name "doctest") (name "doctest")
(version "2.4.8") (version "2.4.9")
(home-page "https://github.com/onqtam/doctest") (home-page "https://github.com/onqtam/doctest")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
@ -759,7 +838,7 @@ and it supports a very flexible form of test discovery.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"057wdkv3gcz42mh1j284sgvm16i5fk1f9b1plgvavca70q4p52gz")))) "1pkpwwvskcr21p00zrbnxpddv34p605mls86qirqqdwggmws82ds"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(synopsis "C++ test framework") (synopsis "C++ test framework")
(description (description
@ -3235,7 +3314,7 @@ system. The code under test requires no modification to work with pyfakefs.")
(define-public python-aiounittest (define-public python-aiounittest
(package (package
(name "python-aiounittest") (name "python-aiounittest")
(version "1.4.1") (version "1.4.2")
;; Pypi package lacks tests. ;; Pypi package lacks tests.
(source (source
(origin (method git-fetch) (origin (method git-fetch)
@ -3245,7 +3324,7 @@ system. The code under test requires no modification to work with pyfakefs.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"10x7ds09b9415r92f7g9714gxixvvq3bm5mnh29ml9aba8blcb0n")))) "0srahyzrk5awfh4rmppvqkblfmiavdklxl9i5mcr8gl7ahiwwl7f"))))
(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/chromium.scm
View file

@ -317,7 +317,7 @@
;; run the Blink performance tests, just remove everything to save ~70MiB. ;; run the Blink performance tests, just remove everything to save ~70MiB.
'("third_party/blink/perf_tests")) '("third_party/blink/perf_tests"))
(define %chromium-version "108.0.5359.98") (define %chromium-version "108.0.5359.124")
(define %ungoogled-revision (string-append %chromium-version "-1")) (define %ungoogled-revision (string-append %chromium-version "-1"))
(define %debian-revision "debian/102.0.5005.61-1") (define %debian-revision "debian/102.0.5005.61-1")
(define %arch-revision "4de5019014aeb77187a517c5ca6db8723d622a40") (define %arch-revision "4de5019014aeb77187a517c5ca6db8723d622a40")
@ -330,7 +330,7 @@
(file-name (git-file-name "ungoogled-chromium" %ungoogled-revision)) (file-name (git-file-name "ungoogled-chromium" %ungoogled-revision))
(sha256 (sha256
(base32 (base32
"16rc15qsndrsj52p56ma3hg94jslkfy2f91ryr3qss73r2rkjf8j")))) "18sz2ksawyb08h4kbxzkf1zhxs832z8mwvndm43nykz01wxk20bp"))))
(define %debian-origin (define %debian-origin
(origin (origin
@ -491,7 +491,7 @@
%chromium-version ".tar.xz")) %chromium-version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"07jnhd5y7k4zp2ipz052isw7llagxn8l8rbz8x3jkjz3f5wi7dk0")) "0x9ac6m4xdccjdrk2bmq4y7bhfpgf2dv0q7lsbbsa50vlv1gm3fl"))
(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)
@ -899,7 +899,7 @@
dbus dbus
expat expat
flac flac
ffmpeg ffmpeg-4
fontconfig fontconfig
fp16 fp16
freetype freetype

4
gnu/packages/code.scm
View file

@ -143,14 +143,14 @@ highlighting your own code that seemed comprehensible when you wrote it.")
(define-public global ; a global variable (define-public global ; a global variable
(package (package
(name "global") (name "global")
(version "6.6.8") (version "6.6.9")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/global/global-" (uri (string-append "mirror://gnu/global/global-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1kaphc3gml89p8dpdgh2is8hj46wj05689kxj0bmh5q759rxk4vg")))) "1mgss7ch4izz7ibb23xah6h4iva77g9dq4pkc9g69jk0ipxa1jxa"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list #:configure-flags (list #:configure-flags

17
gnu/packages/compression.scm
View file

@ -2695,7 +2695,7 @@ to their original, binary CD format.")
(define-public libdeflate (define-public libdeflate
(package (package
(name "libdeflate") (name "libdeflate")
(version "1.14") (version "1.15")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -2704,19 +2704,16 @@ to their original, binary CD format.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"09y69mnbv3mprgjp53zvin5zqznqajginrk5b25xmi9y0b83bns8")))) "001l1xdc3k1dfjvl3ng480ydz0rnyvlhv54l5mshg2p9v4iz3v09"))))
(build-system gnu-build-system) (build-system cmake-build-system)
(arguments (arguments
(list #:make-flags (list #:configure-flags
#~(list (string-append "CC=" #$(cc-for-target)) #~(list "-DLIBDEFLATE_BUILD_STATIC_LIB=NO")
(string-append "PREFIX=" #$output))
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'skip-static-library-installation (replace 'check
(lambda _ (lambda _
(substitute* "Makefile" (invoke "../source/scripts/run_tests.sh"))))))
(("install .*\\$\\(STATIC_LIB\\).*") ""))))
(delete 'configure)))) ; no configure script
(inputs (inputs
(list zlib)) (list zlib))
(home-page "https://github.com/ebiggers/libdeflate") (home-page "https://github.com/ebiggers/libdeflate")

2
gnu/packages/containers.scm
View file

@ -91,7 +91,7 @@
(inputs (inputs
(list libcap (list libcap
libseccomp libseccomp
libyajl)) yajl))
(native-inputs (native-inputs
(list automake (list automake
autoconf autoconf

4
gnu/packages/cpp.scm
View file

@ -1901,7 +1901,7 @@ multi-threaded applications and network applications.")
(define-public gulrak-filesystem (define-public gulrak-filesystem
(package (package
(name "gulrak-filesystem") (name "gulrak-filesystem")
(version "1.5.10") (version "1.5.12")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -1910,7 +1910,7 @@ multi-threaded applications and network applications.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0dx1yvbz5rnisymkqap7z0b06ag9fcs6q6l82vgi8caylhkwsqs7")))) "1qg10akvhp801xirkj4mqcpvcxj90z81ygpyg752xv110zj4914g"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(synopsis "Header only C++ std::filesystem compatible library") (synopsis "Header only C++ std::filesystem compatible library")
(description "This package provides a header-only single-file (description "This package provides a header-only single-file

833
gnu/packages/cran.scm
View file

File diff suppressed because it is too large Load diff

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

@ -30,6 +30,7 @@
;;; Copyright © 2022 Gabriel Arazas <foo.dogsquared@gmail.com> ;;; Copyright © 2022 Gabriel Arazas <foo.dogsquared@gmail.com>
;;; Copyright © 2022 ( <paren@disroot.org> ;;; Copyright © 2022 ( <paren@disroot.org>
;;; Copyright © 2022 Greg Hogan <code@greghogan.com> ;;; Copyright © 2022 Greg Hogan <code@greghogan.com>
;;; Copyright © 2022 Paul A. Patience <paul@apatience.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -14746,6 +14747,29 @@ processors.")
"Bare bones CSV parsing with no_std support.") "Bare bones CSV parsing with no_std support.")
(license (list license:unlicense license:expat)))) (license (list license:unlicense license:expat))))
(define-public rust-csv-index-0.1
(package
(name "rust-csv-index")
(version "0.1.6")
(source
(origin
(method url-fetch)
(uri (crate-uri "csv-index" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "01048y84y0bakqm0x4y1svjv6lzc753b9q598xp7xgcqrdgi6x7j"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-byteorder" ,rust-byteorder-1)
("rust-csv" ,rust-csv-1))))
(home-page "https://github.com/BurntSushi/rust-csv")
(synopsis "On-disk CSV indexing data structures")
(description
"A collection of data structures for indexing CSV data, with a focus on
data structures that can be easily serialized to and deserialized from disk.")
(license (list license:unlicense license:expat))))
(define-public rust-cstr-core-0.2 (define-public rust-cstr-core-0.2
(package (package
(name "rust-cstr-core") (name "rust-cstr-core")

26
gnu/packages/crypto.scm
View file

@ -953,14 +953,14 @@ SHA256, SHA512, SHA3, AICH, ED2K, Tiger, DC++ TTH, BitTorrent BTIH, GOST R
(define-public botan (define-public botan
(package (package
(name "botan") (name "botan")
(version "2.19.2") (version "2.19.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://botan.randombit.net/releases/" (uri (string-append "https://botan.randombit.net/releases/"
"Botan-" version ".tar.xz")) "Botan-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0xad3fa96l6x3azxs2gbz5jfqm2drfv9y9idhf5wvdf62mvg3x9s")))) "0m9dh00zibx13pbjij8lbncf86pix3cxklxmgl47z965k7rlgq6s"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list (list
@ -1293,10 +1293,10 @@ signatures include trusted comments in addition to untrusted comments.
Trusted comments are signed, thus verified, before being displayed.") Trusted comments are signed, thus verified, before being displayed.")
(license license:isc))) (license license:isc)))
(define-public libolm (define-public olm
(package (package
(name "libolm") (name "olm")
(version "3.2.12") (version "3.2.14")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -1304,7 +1304,7 @@ Trusted comments are signed, thus verified, before being displayed.")
(commit version))) (commit version)))
(sha256 (sha256
(base32 (base32
"1k8v9ig32vmjm58rbris621d7mvp4q91qa5p79vc51p41sz91yhj")) "0pj7gs32ixhlls792wah7xf49j5pra0avp7dpvy9cndkdkg6biq5"))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
;; Delete the bundled blob. It's free, but unauditable, ;; Delete the bundled blob. It's free, but unauditable,
;; and apparently only required for android. ;; and apparently only required for android.
@ -1319,13 +1319,16 @@ Trusted comments are signed, thus verified, before being displayed.")
(when tests? (when tests?
(with-directory-excursion "tests" (with-directory-excursion "tests"
(invoke "ctest" ".")))))))) (invoke "ctest" "."))))))))
(synopsis "Implementation of the olm and megolm cryptographic ratchets") (synopsis "Implementation of the Olm and Megolm cryptographic ratchets")
(description "The libolm library implements the Double Ratchet (description "The Olm library implements the Double Ratchet
cryptographic ratchet. It is written in C and C++11, and exposed as a C cryptographic ratchet. It is written in C and C++11, and exposed as a C
API.") API.")
(home-page "https://matrix.org/docs/projects/other/olm/") (home-page "https://matrix.org/docs/projects/other/olm/")
(license license:asl2.0))) (license license:asl2.0)))
(define-public libolm
(deprecated-package "libolm" olm))
(define-public python-olm (define-public python-olm
(package (package
;; python-olm is part of libolm and must be updated at the same time. ;; python-olm is part of libolm and must be updated at the same time.
@ -1351,10 +1354,9 @@ API.")
(list python-cffi python-future)) (list python-cffi python-future))
(native-inputs (native-inputs
(list python-pytest python-pytest-benchmark python-aspectlib)) (list python-pytest python-pytest-benchmark python-aspectlib))
(synopsis "Python bindings for libolm") (synopsis "Python bindings for Olm")
(description "The libolm library implements the Double Ratchet (description "The Olm library implements the Double Ratchet
cryptographic ratchet. It is written in C and C++11, and exposed as a C cryptographic ratchet. This package contains its Python bindings.")))
API. This package contains its Python bindings.")))
(define-public hash-extender (define-public hash-extender
(let ((commit "cb8aaee49f93e9c0d2f03eb3cafb429c9eed723d") (let ((commit "cb8aaee49f93e9c0d2f03eb3cafb429c9eed723d")

211
gnu/packages/databases.scm
View file

@ -174,6 +174,7 @@
#:use-module (guix build-system go) #:use-module (guix build-system go)
#:use-module (guix build-system meson) #:use-module (guix build-system meson)
#:use-module (guix build-system perl) #:use-module (guix build-system perl)
#:use-module (guix build-system pyproject)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module (guix build-system qt) #:use-module (guix build-system qt)
#:use-module (guix build-system ruby) #:use-module (guix build-system ruby)
@ -487,14 +488,14 @@ mapping from string keys to string values.")
(define-public memcached (define-public memcached
(package (package
(name "memcached") (name "memcached")
(version "1.6.16") (version "1.6.17")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"https://memcached.org/files/memcached-" version ".tar.gz")) "https://memcached.org/files/memcached-" version ".tar.gz"))
(sha256 (sha256
(base32 "1nilmfhy8hc7zzlihnx3hmiqf7siyrpgz2g5s3r3l36xy4xsjl9h")))) (base32 "090jpprdjhbr1v9ph15s077bj8ryrsnz1ydg54aw53rxc5ry6m90"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
(list libevent cyrus-sasl)) (list libevent cyrus-sasl))
@ -577,13 +578,13 @@ the API, and provides features such as:
(define-public python-pylibmc (define-public python-pylibmc
(package (package
(name "python-pylibmc") (name "python-pylibmc")
(version "1.6.1") (version "1.6.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "pylibmc" version)) (uri (pypi-uri "pylibmc" version))
(sha256 (sha256
(base32 "1sg7d9j0v6g3xg3finf4l1hb72c13vcyyi6rqrc9shbx903d93ca")))) (base32 "1q06696lxpqn155sydg3z6dksimks6n35q72zdjsvarpal8ldypf"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
'(#:phases '(#:phases
@ -593,7 +594,7 @@ the API, and provides features such as:
(lambda _ (lambda _
(invoke "memcached" "-d")))))) (invoke "memcached" "-d"))))))
(native-inputs (native-inputs
(list memcached python-nose)) (list memcached python-pytest))
(inputs (inputs
(list libmemcached zlib cyrus-sasl)) (list libmemcached zlib cyrus-sasl))
(home-page "http://sendapatch.se/projects/pylibmc/") (home-page "http://sendapatch.se/projects/pylibmc/")
@ -1572,14 +1573,14 @@ types are supported, as is encryption.")
(define-public emacs-rec-mode (define-public emacs-rec-mode
(package (package
(name "emacs-rec-mode") (name "emacs-rec-mode")
(version "1.9.0") (version "1.9.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/" (uri (string-append "https://elpa.gnu.org/packages/"
"rec-mode-" version ".tar")) "rec-mode-" version ".tar"))
(sha256 (sha256
(base32 (base32
"1w1q6kh567fd8xismq9i6wr1y893lypd30l452yvydi1qjiq1n6x")) "0f60bw07l6kk1kkjjxsk30p6rxj9mpngaxqy8piyabnijfgjzd3s"))
(snippet #~(begin (delete-file "rec-mode.info"))))) (snippet #~(begin (delete-file "rec-mode.info")))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments (arguments
@ -2795,7 +2796,7 @@ semantics.")
(define-public libpqxx (define-public libpqxx
(package (package
(name "libpqxx") (name "libpqxx")
(version "7.7.3") (version "7.7.4")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -2804,7 +2805,7 @@ semantics.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1mrhsih5bhiin0l3c4vp22l9p7c5035m0vvqpx18c0407fkzc7hp")))) "1qwpfba8g55jjv0xnsk4hhf2cmhk7mdirxx115cvnjjw97ppy0z0"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (list gcc-11 python-wrapper)) (native-inputs (list gcc-11 python-wrapper))
(inputs (list postgresql)) (inputs (list postgresql))
@ -2937,13 +2938,13 @@ with Python's asyncio framework.")
(define-public python-asyncmy (define-public python-asyncmy
(package (package
(name "python-asyncmy") (name "python-asyncmy")
(version "0.2.3") (version "0.2.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "asyncmy" version)) (uri (pypi-uri "asyncmy" version))
(sha256 (sha256
(base32 "19p81jd4w7m7v2x1jdrwibp67wzqx1a7rdw5n4qqmch3iffp97vn")))) (base32 "0i18zxy6xvzv6dk791xifn2sw2q4zvqwpzrzy8qx51d3mp8z6gng"))))
(build-system python-build-system) (build-system python-build-system)
(native-inputs (list python-cython)) (native-inputs (list python-cython))
(home-page "https://github.com/long2ice/asyncmy") (home-page "https://github.com/long2ice/asyncmy")
@ -3089,13 +3090,13 @@ or languages. It uses only Python's built-in data types.")
(define-public python-pyodbc (define-public python-pyodbc
(package (package
(name "python-pyodbc") (name "python-pyodbc")
(version "4.0.32") (version "4.0.35")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "pyodbc" version)) (uri (pypi-uri "pyodbc" version))
(sha256 (sha256
(base32 "0sqs0x2l5mk3yv0wwz3ya8yh5f4babihyhc8hjbf2m86b71z1rcv")) (base32 "1j7577acd2f16zifw49ajg0aw7vm0pdg6jxrr1dlaa5rx14azfcj"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Delete precompiled binaries. The corresponding source is included. ;; Delete precompiled binaries. The corresponding source is included.
@ -3403,14 +3404,13 @@ framework.")
(define-public python-sqlalchemy-utils (define-public python-sqlalchemy-utils
(package (package
(name "python-sqlalchemy-utils") (name "python-sqlalchemy-utils")
(version "0.38.2") (version "0.38.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "SQLAlchemy-Utils" version)) (uri (pypi-uri "SQLAlchemy-Utils" version))
(sha256 (sha256
(base32 (base32 "0k8z0mjhvdv302kn0nhci8b2dgw4cn2akprsf37ma1540ykgp6lz"))))
"1d6fq81489kqzxmk3l6f39sinw206lzs392frmpr5lsjzg9xc0cy"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
'(#:tests? #f)) ; FIXME: Many tests require a running database server. '(#:tests? #f)) ; FIXME: Many tests require a running database server.
@ -3542,7 +3542,7 @@ PickleShare.")
(define-public python-apsw (define-public python-apsw
(package (package
(name "python-apsw") (name "python-apsw")
(version "3.39.2.1") (version "3.40.0.0")
;; The compressed release has fetching functionality disabled. ;; The compressed release has fetching functionality disabled.
(source (source
(origin (origin
@ -3552,24 +3552,23 @@ PickleShare.")
version "/apsw-" version ".zip")) version "/apsw-" version ".zip"))
(sha256 (sha256
(base32 (base32
"06x3qgg71xz8l3kz8gz04wkfp5f6zfrg476a4mm1c5hikqyw6ykj")) "02sgja00azvd08wi2wm105apmhp2644s7aw9b1zdg3dkcwjnsiad"))))
;; Cherry-picked from upstream, remove when bumping to 3.39.3. (build-system pyproject-build-system)
(patches (native-inputs
(search-patches "python-apsw-3.39.2.1-test-fix.patch")))) (list python-cython unzip))
(build-system python-build-system) (inputs (list sqlite-next)) ;SQLite 3.40 required.
(native-inputs (list unzip))
(inputs (list sqlite-next)) ;SQLite 3.39 required.
(arguments (arguments
(list #:phases (list
#~(modify-phases %standard-phases #:phases
(replace 'build #~(modify-phases %standard-phases
(lambda _ (add-before 'build 'build-extensions
(invoke "python" "setup.py" "build" "--enable-all-extensions" (lambda _
"--enable=load_extension"))) (invoke "python" "setup.py" "build" "--enable-all-extensions"
(add-after 'build 'build-test-helper "--enable=load_extension")))
(lambda _ (add-after 'build 'build-test-helper
(invoke "gcc" "-fPIC" "-shared" "-o" "./testextension.sqlext" (lambda _
"-I." "-Isqlite3" "src/testextension.c")))))) (invoke "gcc" "-fPIC" "-shared" "-o" "./testextension.sqlext"
"-I." "-Isqlite3" "src/testextension.c"))))))
(home-page "https://github.com/rogerbinns/apsw/") (home-page "https://github.com/rogerbinns/apsw/")
(synopsis "Another Python SQLite Wrapper") (synopsis "Another Python SQLite Wrapper")
(description (description
@ -3638,13 +3637,13 @@ managers for automatically closing connections.")
(define-public python-psycopg2 (define-public python-psycopg2
(package (package
(name "python-psycopg2") (name "python-psycopg2")
(version "2.9.3") (version "2.9.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "psycopg2" version)) (uri (pypi-uri "psycopg2" version))
(sha256 (sha256
(base32 "1099as8ind9kpz30rmqzc3nir668fmpkxwayrj2sjka3ycdiv14f")))) (base32 "0ni4kq6p7hbkm2qsky998q36q5gq5if4nwd8hwhjx5rsd0p6s955"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
;; Tests would require a postgresql database "psycopg2_test" ;; Tests would require a postgresql database "psycopg2_test"
@ -3960,7 +3959,7 @@ reasonable substitute.")
(define-public python-rq (define-public python-rq
(package (package
(name "python-rq") (name "python-rq")
(version "1.11") (version "1.11.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -3969,7 +3968,7 @@ reasonable substitute.")
(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 "1dj3m8dh9vf1qiq1drjhfw5xbr975v1kpzn4fwja83cfd7jrpzvy")))) (base32 "0dnjm2s036l4j4ypq0h903vh132dp2wiwjrn8jicz1nw829dqpzf"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
'(#:phases (modify-phases %standard-phases '(#:phases (modify-phases %standard-phases
@ -4057,13 +4056,13 @@ is designed to have a low barrier to entry.")
(define-public python-sqlparse (define-public python-sqlparse
(package (package
(name "python-sqlparse") (name "python-sqlparse")
(version "0.4.2") (version "0.4.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "sqlparse" version)) (uri (pypi-uri "sqlparse" version))
(sha256 (sha256
(base32 (base32
"1bkx52c2jh28c528b69qfk2ijfzw1laxx6lim7jr8fi6fh67600c")))) "0s3jyllg0ka0n7pgqfng1hzvh39li853dr40qcp4s4dv8r481jk9"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -4263,6 +4262,138 @@ language-bindings for structure manipulation. It also provides IPC and common
algorithm implementations.") algorithm implementations.")
(license license:asl2.0))) (license license:asl2.0)))
(define-public apache-arrow-for-ceph
(package
(name "apache-arrow")
(version "6.0.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/apache/arrow")
(commit (string-append "apache-arrow-" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0mcw361akqw4sxnnpnr9c9v1zk4hphk6gcq763pcb19yzljh88ig"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f
#:phases
(modify-phases %standard-phases
(add-before 'configure 'enter-source-directory
(lambda _ (chdir "cpp")))
(add-after 'unpack 'set-env
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "cpp/src/parquet/parquet.pc.in"
(("includedir=\\$\\{prefix\\}/")
"includedir="))
(substitute* "cpp/cmake_modules/ThirdpartyToolchain.cmake"
(("set\\(xsimd_SOURCE.*") ""))
(setenv "BOOST_ROOT" (assoc-ref inputs "boost"))
(setenv "BROTLI_HOME" (assoc-ref inputs "brotli"))
(setenv "FLATBUFFERS_HOME" (assoc-ref inputs "flatbuffers"))
(setenv "RAPIDJSON_HOME" (assoc-ref inputs "rapidjson")))))
#:build-type "Release"
#:configure-flags
(list "-DARROW_PYTHON=ON"
"-DARROW_GLOG=ON"
;; Parquet options
"-DARROW_PARQUET=ON"
"-DPARQUET_BUILD_EXECUTABLES=ON"
;; The maintainers disallow using system versions of
;; jemalloc:
;; https://issues.apache.org/jira/browse/ARROW-3507. This
;; is unfortunate because jemalloc increases performance:
;; https://arrow.apache.org/blog/2018/07/20/jemalloc/.
"-DARROW_JEMALLOC=OFF"
;; The CMake option ARROW_DEPENDENCY_SOURCE is a global
;; option that instructs the build system how to resolve
;; each dependency. SYSTEM = Finding the dependency in
;; system paths using CMake's built-in find_package
;; function, or using pkg-config for packages that do not
;; have this feature
"-DARROW_DEPENDENCY_SOURCE=SYSTEM"
"-Dxsimd_SOURCE=SYSTEM"
"-DARROW_RUNTIME_SIMD_LEVEL=NONE"
"-DARROW_SIMD_LEVEL=NONE"
"-DARROW_PACKAGE_KIND=Guix"
;; Split output into its component packages.
(string-append "-DCMAKE_INSTALL_PREFIX="
(assoc-ref %outputs "lib"))
(string-append "-DCMAKE_INSTALL_RPATH="
(assoc-ref %outputs "lib")
"/lib")
(string-append "-DCMAKE_INSTALL_BINDIR="
(assoc-ref %outputs "out")
"/bin")
(string-append "-DCMAKE_INSTALL_INCLUDEDIR="
(assoc-ref %outputs "include")
"/share/include")
"-DARROW_WITH_SNAPPY=ON"
"-DARROW_WITH_ZLIB=ON"
"-DARROW_WITH_ZSTD=ON"
"-DARROW_WITH_LZ4=ON"
"-DARROW_COMPUTE=ON"
"-DARROW_CSV=ON"
"-DARROW_DATASET=ON"
"-DARROW_FILESYSTEM=ON"
"-DARROW_HDFS=ON"
"-DARROW_JSON=ON"
;; Arrow Python C++ integration library (required for
;; building pyarrow). This library must be built against
;; the same Python version for which you are building
;; pyarrow. NumPy must also be installed. Enabling this
;; option also enables ARROW_COMPUTE, ARROW_CSV,
;; ARROW_DATASET, ARROW_FILESYSTEM, ARROW_HDFS, and
;; ARROW_JSON.
"-DARROW_PYTHON=ON"
;; Building the tests forces on all the
;; optional features and the use of static
;; libraries.
"-DARROW_BUILD_TESTS=OFF"
"-DBENCHMARK_ENABLE_GTEST_TESTS=OFF"
;;"-DBENCHMARK_ENABLE_TESTING=OFF"
"-DARROW_BUILD_STATIC=OFF")))
(inputs
(list boost
brotli
bzip2
double-conversion
gflags
glog
grpc
protobuf
python
python-numpy
rapidjson
re2
snappy
xsimd))
;; These are all listed under Requires.private in arrow.pc
(propagated-inputs
(list (list apache-thrift "lib")
lz4
utf8proc
zlib
(list zstd "lib")))
(native-inputs
(list pkg-config))
(outputs '("out" "lib" "include"))
(home-page "https://arrow.apache.org/")
(synopsis "Columnar in-memory analytics")
(description "Apache Arrow is a columnar in-memory analytics layer
designed to accelerate big data. It houses a set of canonical in-memory
representations of flat and hierarchical data along with multiple
language-bindings for structure manipulation. It also provides IPC and common
algorithm implementations.")
(license license:asl2.0)))
(define-public apache-arrow-0.16 (define-public apache-arrow-0.16
(package (package
(name "apache-arrow") (name "apache-arrow")

4
gnu/packages/debian.scm
View file

@ -339,7 +339,7 @@ distributions such as Debian and Trisquel.")
(define-public dpkg (define-public dpkg
(package (package
(name "dpkg") (name "dpkg")
(version "1.21.8") (version "1.21.12")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -348,7 +348,7 @@ distributions such as Debian and Trisquel.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1whb78pywdlm4v1ablgvvplqjn15b6qrwqkj0pihw5j77aakyz2s")))) (base32 "08a72lhkgz4iiimdkqlmf58m31zrwqcs0741nbxxq1x3s9phc25m"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases

8
gnu/packages/diffoscope.scm
View file

@ -245,7 +245,7 @@ install.")
(define-public reprotest (define-public reprotest
(package (package
(name "reprotest") (name "reprotest")
(version "0.7.21") (version "0.7.22")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -254,8 +254,7 @@ install.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32 "0qpjg37x2ha7lb113fb5cic5if3zv30zqijsmkq91ld909x30ggd"))))
"1jmnp6dwd91w00vfvph89cvgxwk0nvij8his9az5b72265jf9bxz"))))
(inputs (inputs
(list python-debian python-distro python-libarchive-c python-rstr)) (list python-debian python-distro python-libarchive-c python-rstr))
(native-inputs (native-inputs
@ -296,8 +295,7 @@ install.")
(install-file "doc/reprotest.1" mandir1) (install-file "doc/reprotest.1" mandir1)
(mkdir-p docdir) (mkdir-p docdir)
(install-file "./README.rst" docdir) (install-file "./README.rst" docdir)
(install-file "./README-dev.rst" docdir)) (install-file "./README-dev.rst" docdir)))))))
#t)))))
(home-page "https://salsa.debian.org/reproducible-builds/reprotest") (home-page "https://salsa.debian.org/reproducible-builds/reprotest")
(synopsis "Build software and check it for reproducibility") (synopsis "Build software and check it for reproducibility")
(description "Reprotest builds the same source code twice in different (description "Reprotest builds the same source code twice in different

12
gnu/packages/dns.scm
View file

@ -290,7 +290,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.87") (version "2.88")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -298,7 +298,7 @@ prompt the user with the option to go with insecure DNS only.")
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0ynyi4mixhxhbfxb2bivinkrjc5zgj9lj5bzgvymc8vz98vc0a02")))) "1cy1zci6vyhzczy6ncc5m9d7zsnnzs9mmwd6pr9w0h03l7nlsm13"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
(list pkg-config)) (list pkg-config))
@ -544,14 +544,14 @@ asynchronous fashion.")
(define-public nsd (define-public nsd
(package (package
(name "nsd") (name "nsd")
(version "4.4.0") (version "4.6.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.nlnetlabs.nl/downloads/nsd/nsd-" (uri (string-append "https://www.nlnetlabs.nl/downloads/nsd/nsd-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 "0dl8iriy0mscppfa6ar5qcglgvxw87140abwxyksak1lk7fnzkfg")))) (base32 "0ym2fgkjar94y99lyvp93p7jpj33ysprvqd7py28xxn37shs6q1z"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -871,7 +871,7 @@ Extensions} (DNSSEC).")
(define-public knot (define-public knot
(package (package
(name "knot") (name "knot")
(version "3.2.3") (version "3.2.4")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -880,7 +880,7 @@ Extensions} (DNSSEC).")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "117q8jllaakd6gv0mfkq45sigy5c8j8jbyxiwna3wan0mjx81fhv")) (base32 "0b6fnrdy5zqn3mnn5cl92j0m7k9l6hh4gnr92qpirqf54bl2lfm2"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin

6
gnu/packages/education.scm
View file

@ -547,7 +547,7 @@ specialized device.")
(inputs (inputs
(list alsa-lib (list alsa-lib
coreutils-minimal ;for patched 'env' shebang coreutils-minimal ;for patched 'env' shebang
ffmpeg ffmpeg-4
freetype freetype
lame lame
libass libass
@ -582,7 +582,7 @@ a pen-tablet display and a beamer.")
(define-public fet (define-public fet
(package (package
(name "fet") (name "fet")
(version "6.7.1") (version "6.7.7")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -591,7 +591,7 @@ a pen-tablet display and a beamer.")
(list (string-append directory base) (list (string-append directory base)
(string-append directory "old/" base)))) (string-append directory "old/" base))))
(sha256 (sha256
(base32 "0vwddhmr9n21q4yhkcz6iakkff91hvjcfzhg84zvf1ap30xx09hk")))) (base32 "08rm3yka3swr6wf3lcmzh2jlq5ajxi8c6nd2likqzvbg6plrjx6b"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list (list

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

File diff suppressed because it is too large Load diff

8
gnu/packages/emulators.scm
View file

@ -323,7 +323,7 @@ console.")
bluez bluez
curl curl
eudev eudev
ffmpeg ffmpeg-4
font-wqy-microhei font-wqy-microhei
freetype freetype
glew glew
@ -1471,7 +1471,7 @@ as RetroArch.")
"--disable-builtinminiupnpc"))))))) "--disable-builtinminiupnpc")))))))
(inputs (inputs
`(("alsa-lib" ,alsa-lib) `(("alsa-lib" ,alsa-lib)
("ffmpeg" ,ffmpeg) ("ffmpeg" ,ffmpeg-4)
("freetype" ,freetype) ("freetype" ,freetype)
("libxinerama" ,libxinerama) ("libxinerama" ,libxinerama)
("libxkbcommon" ,libxkbcommon) ("libxkbcommon" ,libxkbcommon)
@ -2035,7 +2035,7 @@ assembler, and debugger for the Intel 8085 microprocessor.
(list libcdio (list libcdio
sdl2 sdl2
gtk+ gtk+
ffmpeg ffmpeg-4
libxv libxv
libarchive libarchive
pulseaudio)) pulseaudio))
@ -2322,7 +2322,7 @@ elseif(FALSE)"))
(native-inputs (list pkg-config python)) (native-inputs (list pkg-config python))
(inputs (list bash (inputs (list bash
cityhash cityhash
ffmpeg ffmpeg-4
glew glew
glslang glslang
libpng libpng

6
gnu/packages/engineering.scm
View file

@ -2437,7 +2437,7 @@ comments.")))
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "02976k91ypv41rqdl27jbmyhnhgx7k5bj520lcqs8qzgcdsynd03")))) (base32 "0wsfz2jqfhmqshyr1n4qxcc3c6a96gyll4h34vn2zzvvcnncn9rb"))))
(build-system qt-build-system) (build-system qt-build-system)
(native-inputs (native-inputs
(list doxygen (list doxygen
@ -3886,7 +3886,7 @@ form, numpad.
(define-public rizin (define-public rizin
(package (package
(name "rizin") (name "rizin")
(version "0.4.0") (version "0.4.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -3894,7 +3894,7 @@ form, numpad.
version "/rizin-src-v" version ".tar.xz")) version "/rizin-src-v" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0nkb6v9lks25w5sv5s6p2ghgqnnnsf39md8nlx1cy4z89xlaisq9")))) "1f5zzlnr2na4hkvcwn4n9cjlk6595945vwrw89pa683qk5mrb7b6"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
(list (list

40
gnu/packages/erlang.scm
View file

@ -7,6 +7,7 @@
;;; Copyright © 2020-2022 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2020-2022 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2021 Oskar Köök <oskar@maatriks.ee> ;;; Copyright © 2021 Oskar Köök <oskar@maatriks.ee>
;;; Copyright © 2021 Cees de Groot <cg@evrl.com> ;;; Copyright © 2021 Cees de Groot <cg@evrl.com>
;;; Copyright © 2022 jgart <jgart@dismail.de>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -280,6 +281,28 @@ Mozilla's canonical set.")
printing extending the io:format syntax to add colours.") printing extending the io:format syntax to add colours.")
(license license:expat))) (license license:expat)))
(define-public erlang-yamerl
(package
(name "erlang-yamerl")
(version "0.10.0")
(source
(origin
(method git-fetch)
(uri (git-reference
;; There are no tests included on Hex.
(url "https://github.com/yakaz/yamerl")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0if8abgmispcfk7zhd0a5dndzwzbsmqrbyrm5shk375r2dbbwak6"))))
(build-system rebar-build-system)
(synopsis "YAML and JSON parser in pure Erlang")
(description
"Erlang application to parse YAML 1.1 and YAML 1.2 documents, as well as
JSON documents.")
(home-page "https://hexdocs.pm/yamerl/")
(license license:bsd-2)))
(define-public erlang-covertool (define-public erlang-covertool
(package (package
(name "erlang-covertool") (name "erlang-covertool")
@ -499,6 +522,23 @@ Erlang's type language, and can also be used for the model-based random
testing of stateful systems.") testing of stateful systems.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public erlang-jsx
(package
(name "erlang-jsx")
(version "3.1.0")
(source (origin
(method url-fetch)
(uri (hexpm-uri "jsx" version))
(sha256
(base32
"1wr7jkxm6nlgvd52xhniav64xr9rml2ngb35rwjwqlqvq7ywhp0c"))))
(build-system rebar-build-system)
(synopsis "Streaming, evented JSON parsing toolkit")
(description
"An Erlang application for consuming, producing and manipulating json.")
(home-page "https://github.com/talentdeficit/jsx")
(license license:expat)))
(define-public erlang-providers (define-public erlang-providers
(package (package
(name "erlang-providers") (name "erlang-providers")

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

@ -599,7 +599,7 @@ from the bcachefs-tools package. It is meant to be used in initrds.")
(define-public exfatprogs (define-public exfatprogs
(package (package
(name "exfatprogs") (name "exfatprogs")
(version "1.1.3") (version "1.2.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -608,7 +608,7 @@ from the bcachefs-tools package. It is meant to be used in initrds.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "14lgwvbg6jibsdpzpcj484p9q4ixawyjxi9hw23w89c6870gglw9")))) (base32 "02a6178brikg12wl80h9qgxyhpm6mly0jnml0rs9phb7lkbv9kzh"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -752,6 +752,41 @@ transaction log.
from the jfsutils package. It is meant to be used in initrds.") from the jfsutils package. It is meant to be used in initrds.")
(license (package-license jfsutils)))) (license (package-license jfsutils))))
(define-public nilfs-utils
(package
(name "nilfs-utils")
(version "2.2.9")
(source
(origin
(method url-fetch)
(uri (string-append "https://nilfs.sourceforge.io/download"
"/nilfs-utils-" version ".tar.bz2"))
(sha256
(base32 "15vsayvzr8nc29n939sz9ddq46vpn53rp8h8qv484h88qac3kxjx"))))
(build-system gnu-build-system)
(arguments
(list
#:configure-flags
#~(list "--enable-static=no")
#:phases
#~(modify-phases %standard-phases
(add-before 'bootstrap 'force-bootstrap
(lambda _
(delete-file "configure")
(substitute* "configure.ac"
(("\\[/etc\\]") "[${prefix}/etc]")
(("\\[/sbin\\]") "[${prefix}/sbin]")))))))
(inputs
(list (list util-linux "lib")))
(native-inputs (list autoconf automake libtool))
(home-page "https://nilfs.sourceforge.io/")
(synopsis "Continuous Snapshotting Filesystem")
(description
"NILFS is a log-structured file system supporting versioning of the entire
file system and continuous snapshotting, which allows users to even restore
files mistakenly overwritten or destroyed just a few seconds ago.")
(license license:gpl3+)))
(define-public disorderfs (define-public disorderfs
(package (package
(name "disorderfs") (name "disorderfs")

17
gnu/packages/finance.scm
View file

@ -271,14 +271,14 @@ Accounting.")
(define-public homebank (define-public homebank
(package (package
(name "homebank") (name "homebank")
(version "5.5.8") (version "5.6")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://homebank.free.fr/public/homebank-" (uri (string-append "http://homebank.free.fr/public/homebank-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"11fgmdqsnxdqma1ffljbcl7w1ahx0s5p41hjy600f8zarsrmnyjh")))) "1ig00d3wby6lisz3vbyb5qm7h4a6npfwqyphdl8fjgibzpapq5a1"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(native-inputs (native-inputs
(list pkg-config intltool)) (list pkg-config intltool))
@ -1645,7 +1645,7 @@ a client based on Qt. This is a fork of Bitcoin Core.")
(define-public libofx (define-public libofx
(package (package
(name "libofx") (name "libofx")
(version "0.10.7") (version "0.10.9")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -1654,13 +1654,14 @@ a client based on Qt. This is a fork of Bitcoin Core.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1k3ygavyb9b3f1ra62dsa46iiia0a1588yn3zy7bh7w4vfcrbd6d")))) "120hyhs4fkxrgpvd2p0hpf5v8dq0jjql2fzllk77m33m1c82pr18"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list (list
#:parallel-build? #f ;fails with -j64 #:parallel-build? #f ;fails with -j64
#:configure-flags #:configure-flags
#~(list (string-append "--with-opensp-includes=" #~(list "--disable-static"
(string-append "--with-opensp-includes="
(search-input-directory %build-inputs (search-input-directory %build-inputs
"include/OpenSP"))))) "include/OpenSP")))))
(native-inputs (native-inputs
@ -1905,8 +1906,8 @@ generate a variety of reports from them, and provides a web interface.")
(define-public emacs-beancount (define-public emacs-beancount
;; Note that upstream has not made any release since this project moved ;; Note that upstream has not made any release since this project moved
;; into its own repository (it was originally part of beancount itself) ;; into its own repository (it was originally part of beancount itself)
(let ((commit "dbafe6a73d90c1f64d457b356b9dbb43499f70d5") (let ((commit "687775da63784d153a3c1cfee9801090c6b51842")
(revision "0")) (revision "1"))
(package (package
(name "emacs-beancount") (name "emacs-beancount")
(version (git-version "0.0.0" revision commit)) (version (git-version "0.0.0" revision commit))
@ -1918,7 +1919,7 @@ generate a variety of reports from them, and provides a web interface.")
(commit commit))) (commit commit)))
(sha256 (sha256
(base32 (base32
"0v9bws2gv5b00x829p7hrcxqgdp7iwxvv1vhfjka81qrw6w1fvjw")) "08383yqqanx29al1hg1r6ndx3gwjg6fj7kl340f1zz9m9cfiyvg3"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://github.com/beancount/beancount-mode") (home-page "https://github.com/beancount/beancount-mode")

431
gnu/packages/firmware.scm
View file

@ -34,6 +34,7 @@
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system meson) #:use-module (guix build-system meson)
#:use-module (guix build-system trivial)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages admin) #:use-module (gnu packages admin)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
@ -72,7 +73,8 @@
#: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 web)
#:use-module (gnu packages xml)) #:use-module (gnu packages xml)
#:use-module (ice-9 match))
(define-public ath9k-htc-firmware (define-public ath9k-htc-firmware
(package (package
@ -342,6 +344,82 @@ broadband modem as found, for example, on PinePhone.")
(home-page "https://gitlab.com/mobian1/devices/eg25-manager") (home-page "https://gitlab.com/mobian1/devices/eg25-manager")
(license license:gpl3+))) (license license:gpl3+)))
(define* (make-openbios-package name arch)
(let ((target (cond
((string-suffix? "ppc" arch)
"powerpc-linux-gnu")
((string-suffix? "amd64" arch)
"x86_64-linux-gnu")
((string-suffix? "x86" arch)
"i686-linux-gnu")
(else (string-append arch "-linux-gnu")))))
(package
(name name)
(version "1.1")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/openbios/openbios")
(commit (string-append "v" version))))
(file-name (git-file-name "openbios" version))
(patches (search-patches "openbios-gcc-warnings.patch"))
(sha256
(base32
"11cr0097aiw4hc07v5hfl95753ikyra5ig4nv899ci7l42ilrrbr"))))
(build-system gnu-build-system)
(arguments
(list #:tests? #f ;no tests
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'build-reproducibly
(lambda _
(substitute* "Makefile.target"
(("TZ=UTC date \\+")
"TZ=UTC date --date=@1 +"))))
(replace 'configure
(lambda _
(invoke "./config/scripts/switch-arch" #$arch)))
(replace 'install
(lambda _
(let ((build-target
(if (string-contains #$arch "-")
(car (reverse (string-split #$arch #\-)))
#$arch)))
(for-each (lambda (elf)
(install-file elf
(string-append #$output
"/share/firmware")))
(find-files (string-append "obj-" build-target)
"\\.elf$"))))))))
(native-inputs
(append (if (string-prefix? (%current-system) target)
'()
(list (cross-gcc target) (cross-binutils target)))
(list libxslt which)))
(home-page "https://openfirmware.info/Welcome_to_OpenBIOS")
(synopsis "Open Firmware implementation")
(description
"OpenBIOS is an implementation of the IEEE 1275-1994 \"Open Firmware\"
specification. It can be used as a system firmware, as a boot loader, or
provide OpenFirmware functionality on top of an already running system.")
;; Some files are GPLv2 only.
(license license:gpl2))))
(define-public openbios-qemu-ppc
(let ((base (make-openbios-package "openbios-qemu-ppc" "qemu-ppc")))
(package
(inherit base)
(arguments
(substitute-keyword-arguments (package-arguments base)
((#:phases phases)
#~(modify-phases #$phases
(add-after 'install 'rename-executable
(lambda _
(with-directory-excursion #$output
(rename-file "share/firmware" "share/qemu")
(rename-file "share/qemu/openbios-qemu.elf"
"share/qemu/openbios-ppc")))))))))))
(define* (make-opensbi-package platform name #:optional (arch "riscv64")) (define* (make-opensbi-package platform name #:optional (arch "riscv64"))
(package (package
(name name) (name name)
@ -352,7 +430,7 @@ broadband modem as found, for example, on PinePhone.")
(uri (git-reference (uri (git-reference
(url "https://github.com/riscv-software-src/opensbi") (url "https://github.com/riscv-software-src/opensbi")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name "opensbi" version))
(sha256 (sha256
(base32 "0xlnhl965286kvizyjm571qbhj3l5n71a02dmbmgxzcqapzgi9wk")))) (base32 "0xlnhl965286kvizyjm571qbhj3l5n71a02dmbmgxzcqapzgi9wk"))))
(build-system gnu-build-system) (build-system gnu-build-system)
@ -399,10 +477,33 @@ executing in M-mode.")
(define-public opensbi-generic (define-public opensbi-generic
(make-opensbi-package "generic" "opensbi-generic")) (make-opensbi-package "generic" "opensbi-generic"))
(define-public opensbi-qemu
(package
(inherit opensbi-generic)
(name "opensbi-qemu")
(native-inputs '())
(inputs (list opensbi-generic))
(build-system trivial-build-system)
(arguments
(list #:modules '((guix build utils))
#:builder
#~(begin
(use-modules ((guix build utils)))
(let ((opensbi-riscv64 (search-input-file %build-inputs
"fw_dynamic.bin"))
(out (string-append #$output "/share/qemu")))
(mkdir-p out)
(symlink opensbi-riscv64
(string-append
out "/opensbi-riscv64-generic-fw_dynamic.bin"))))))
(synopsis "OpenSBI firmware files for QEMU")
(description
"This package contains OpenSBI firmware files for use with QEMU.")))
(define-public seabios (define-public seabios
(package (package
(name "seabios") (name "seabios")
(version "1.15.0") (version "1.16.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -411,76 +512,52 @@ executing in M-mode.")
(commit (string-append "rel-" version)))) (commit (string-append "rel-" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0gnsfmbgcvihsap8sz8c2n3qs439q44i3pwrms2nv3xcnf1sclj9")))) (base32 "0gph1hf70jjpx55qc0lzx2yghkipg9dnsin07i4jajk0p1jpd2d0"))
(modules '((guix build utils)))
(snippet
#~(begin
;; Delete IASL-generated files.
(for-each delete-file (find-files "." "\\.hex$"))))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (list python-wrapper)) (native-inputs
(list acpica python-wrapper))
(arguments (arguments
`(#:tests? #f ; no check target (list
#:make-flags '("EXTRAVERSION=-guix") ;upstream wants distros to set this #:tests? #f ;no tests
#:modules (,@%gnu-build-system-modules #:make-flags
(ice-9 match)) ;; If EXTRAVERSION is not set the build system will embed the current
#:phases ;; date in binaries. Use this opportunity to personalize as recommended
(modify-phases %standard-phases ;; by Build_overview.md.
(replace 'configure #~'("EXTRAVERSION=/GNU Guix"
(lambda _ "V=1") ;build verbosely
;; Create the ".version" file that is present in release tarballs. #:phases
;; Otherwise this will be regarded as an "unclean" build, and the #~(modify-phases %standard-phases
;; build system ends up encoding the build date in the binaries. (replace 'configure
(call-with-output-file ".version" (lambda _
(lambda (port) ;; Ensure this file is present in case we're building from a git
(format port ,(package-version this-package)))) ;; checkout instead of release tarball.
(setenv "CC" "gcc"))) (call-with-output-file ".version"
(add-after 'build 'build-vgabios (lambda (port)
(lambda* (#:key (make-flags ''()) #:allow-other-keys) (format port #$(package-version this-package))))
(for-each ;; If we use (cc-for-target) then we have the system prefix
(match-lambda ;; twice or we might have the wrong prefix.
((target . config) (setenv "CC" "gcc")))
(let* ((dot-config (string-append (getcwd) "/" target "/.config")) (add-before 'build 'build-description-tables
(flags (append make-flags (lambda _
(list (string-append "KCONFIG_CONFIG=" ;; Regenerate the ACPI description tables.
dot-config) (invoke "make" "iasl")
(string-append "OUT=" target "/"))))) ;; Clear temporary files added by the iasl target.
(mkdir target) (invoke "make" "clean")))
(call-with-output-file dot-config (replace 'install
(lambda (port) (lambda _
(for-each (lambda (entry) (install-file "out/bios.bin"
(if (string-suffix? "=n" entry) (string-append #$output "/share/firmware")))))))
(format port "# CONFIG_~a is not set~%"
(string-drop-right entry 2))
(format port "CONFIG_~a~%" entry)))
(cons "BUILD_VGABIOS=y" config))))
(apply invoke "make" (append flags '("oldnoconfig")))
(apply invoke "make" flags)
(link (string-append target "/bios.bin")
(string-append "out/" target ".bin")))))
;; These tuples are modelled after Debians packaging:
;; https://salsa.debian.org/qemu-team/seabios/-/blob/master/debian/rules
'(("ati" . ("VGA_ATI=y" "VGA_PCI=y"))
("bochs-display" . ("DISPLAY_BOCHS=y" "VGA_PCI=y"))
("cirrus" . ("VGA_CIRRUS=y" "VGA_PCI=y"))
("stdvga" . ("VGA_BOCHS=y" "VGA_PCI=y"))
("virtio" . ("VGA_BOCHS_VIRTIO=y" "VGA_PCI=y"))
("vmware" . ("VGA_BOCHS_VMWARE=y" "VGA_PCI=y"))
("qxl" . ("VGA_BOCHS_QXL=y" "VGA_PCI=y"))
("isavga" . ("VGA_BOCHS=y" "VGA_PCI=n"))
("ramfb" . ("VGA_RAMFB=y" "VGA_PCI=n"))))))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(fmw (string-append out "/share/firmware")))
(mkdir-p fmw)
(copy-file "out/bios.bin" (string-append fmw "/bios.bin"))
(for-each (lambda (bios)
(install-file bios fmw))
(find-files "out" "\\.bin$"))
(with-directory-excursion fmw
;; QEMU 1.7 and later looks only for the latter.
(symlink "bios.bin" "bios-256k.bin"))))))))
(home-page "https://www.seabios.org/SeaBIOS") (home-page "https://www.seabios.org/SeaBIOS")
(synopsis "x86 BIOS implementation") (synopsis "x86 BIOS implementation")
(description "SeaBIOS is an implementation of a 16bit x86 BIOS. SeaBIOS (description "SeaBIOS is an implementation of a 16bit x86 BIOS. SeaBIOS
can run in an emulator or it can run natively on X86 hardware with the use of can run in an emulator or it can run natively on X86 hardware with the use of
coreboot.") coreboot.")
(supported-systems '("i686-linux" "x86_64-linux"))
;; Dual licensed. ;; Dual licensed.
(license (list license:gpl3+ license:lgpl3+ (license (list license:gpl3+ license:lgpl3+
;; src/fw/acpi-dsdt.dsl is lgpl2 ;; src/fw/acpi-dsdt.dsl is lgpl2
@ -489,6 +566,228 @@ coreboot.")
;; cpl with a linking exception. ;; cpl with a linking exception.
license:cpl1.0)))) license:cpl1.0))))
(define-public seabios-qemu
(package/inherit seabios
(name "seabios-qemu")
(native-inputs
(if (member (%current-system) '("i686-linux" "x86_64-linux"))
(package-native-inputs seabios)
(modify-inputs (package-native-inputs seabios)
(prepend (cross-gcc "i686-linux-gnu")
(cross-binutils "i686-linux-gnu")))))
(supported-systems %supported-systems)
(arguments
(substitute-keyword-arguments (package-arguments seabios)
((#:modules modules %gnu-build-system-modules)
`((ice-9 match)
(ice-9 threads)
,@modules))
((#:phases phases)
#~(modify-phases #$phases
#$@(match (%current-system)
((or "i686-linux" "x86_64-linux")
#~())
(_
#~((add-after 'configure 'configure-cross
(lambda _
(substitute* "Makefile"
(("CROSS_PREFIX=")
"CROSS_PREFIX=i686-linux-gnu-")))))))
(replace 'build
(lambda* (#:key (make-flags #~'()) #:allow-other-keys)
;; Note: These BIOS configurations are taken from QEMUs roms/
;; directory.
(let ((biosen
'( ;; The standard BIOS using default options.
("bios-256k" . ("QEMU=y" "ROM_SIZE=256" "ATA_DMA=n"))
;; A minimal BIOS for old QEMU machine types.
("bios-128k"
. ("QEMU=y" "ROM_SIZE=128" "ATA_DMA=n" "BOOTSPLASH=n"
"XEN=n" "USB_OHCI=n" "USB_XHCI=n" "USB_UAS=n"
"SDCARD=n" "TCGBIOS=n" "MPT_SCSI=n" "ESP_SCSI=n"
"MEGASAS=n" "PVSCSI=n" "NVME=n" "USE_SMM=n"
"VGAHOOKS=n" "HOST_BIOS_GEOMETRY=n" "ACPI_PARSE=n"))
;; Minimal BIOS for the "microvm" machine type.
("bios-microvm"
. ("QEMU=y" "ROM_SIZE=128" "XEN=n" "BOOTSPLASH=n"
"ATA=n" "AHCI=n" "SDCARD=n" "PVSCSI=n" "ESP_SCSI=n"
"LSI_SCSI=n" "MEGASAS=n" "MPT_SCSI=n" "FLOPPY=n"
"FLASH_FLOPPY=n" "NVME=n" "PS2PORT=n" "USB=n"
"LPT=n" "RTC_TIMER=n" "USE_SMM=n" "PMTIMER=n"
"TCGBIOS=n" "HARDWARE_IRQ=n" "ACPI_PARSE=y"))))
(vgabiosen
'(("ati" . ("VGA_ATI=y" "VGA_PCI=y"))
("bochs-display" . ("DISPLAY_BOCHS=y" "VGA_PCI=y"))
("cirrus" . ("VGA_CIRRUS=y" "VGA_PCI=y"))
("stdvga" . ("VGA_BOCHS=y" "VGA_PCI=y"))
("virtio" . ("VGA_BOCHS=y" "VGA_BOCHS_VIRTIO=y"
"VGA_PCI=y"))
("vmware" . ("VGA_BOCHS=y" "VGA_BOCHS_VMWARE=y"
"VGA_PCI=y"))
("qxl" . ("VGA_BOCHS=y" "VGA_BOCHS_QXL=y"
"VGA_PCI=y"))
("isavga" . ("VGA_BOCHS=y" "VGA_PCI=n"))
("ramfb" . ("VGA_RAMFB=y" "VGA_PCI=n")))))
(mkdir "out")
(n-par-for-each
(parallel-job-count)
(match-lambda
((target . config)
(let* ((dot-config (string-append (getcwd) "/" target
"/.config"))
(flags (append
make-flags
(list (string-append "KCONFIG_CONFIG="
dot-config)
(string-append "OUT=" target "/")))))
(mkdir target)
(call-with-output-file dot-config
(lambda (port)
(for-each (lambda (entry)
(format port "CONFIG_~a~%" entry))
config)))
(apply invoke "make" "oldnoconfig" flags)
(apply invoke "make" flags)
(link (string-append target "/"
(if (string-prefix? "vgabios" target)
"vgabios.bin" "bios.bin"))
(string-append "out/" target ".bin")))))
(append biosen
(map (lambda (pair)
`(,(string-append "vgabios-" (car pair))
.
,(cons "BUILD_VGABIOS=y" (cdr pair))))
vgabiosen))))))
(replace 'install
(lambda _
(let ((firmware (string-append #$output "/share/qemu")))
(for-each (lambda (bios)
(install-file bios firmware))
(find-files "out" "\\.bin$"))
(with-directory-excursion firmware
;; Compatibility symlinks for QEMU.
(symlink "bios-128k.bin" "bios.bin")
(symlink "vgabios-isavga.bin" "vgabios.bin")))))))))))
(define-public sgabios
;; There are no tags in the repository.
(let ((commit "72f39d48bedf044e202fd51fecf3e2218fc2ae66")
(revision "0"))
(package
(name "sgabios")
(version (git-version "0.0" revision commit))
(home-page "https://gitlab.com/qemu-project/sgabios")
(source (origin
(method git-fetch)
(uri (git-reference (url home-page) (commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0ybl021i0xaz18wzq4q13ifypy5b3dj8m11c8m0qdiq00g06vm0i"))))
(build-system gnu-build-system)
(arguments
(list #:make-flags
#~'(#$@(if (member (%current-system) '("i686-linux" "x86_64-linux"))
#~("CC=gcc")
#~("CC=i686-linux-gnu-gcc"
"LD=i686-linux-gnu-ld"
"OBJCOPY=i686-linux-gnu-objcopy"))
"HOSTCC=gcc")
#:parallel-build? #f
#:tests? #f ;no tests
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'build-reproducibly
(lambda _
(substitute* "Makefile"
(("BUILD_DATE = .*")
"BUILD_DATE = \\\"Jan 1 1970\\\"\n")
(("BUILD_SHORT_DATE = .*")
"BUILD_SHORT_DATE = \\\"1/1/70\\\"\n"))))
(delete 'configure)
(replace 'install
(lambda _
(install-file "sgabios.bin"
(string-append #$output "/share/qemu")))))))
(native-inputs
(if (member (%current-system) '("i686-linux" "x86_64-linux"))
'()
(list (cross-gcc "i686-linux-gnu")
(cross-binutils "i686-linux-gnu"))))
(synopsis "Serial graphics adapter BIOS")
(description
"SGABIOS provides a means for legacy PC software to communicate with an
attached serial console as if a VGA card is attached. It is designed to be
inserted into a BIOS as an option ROM to provide over a serial port the display
and input capabilites normally handled by a VGA adapter and a keyboard, and
additionally provide hooks for logging displayed characters for later collection
after an operating system boots.")
(license license:asl2.0))))
(define-public edk2-tools
(package
(name "edk2-tools")
(version "202211")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/tianocore/edk2")
(commit (string-append "edk2-stable" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1264542mm0mffjcmw5sw34h94n405swz5z56rw1ragp3j62144iy"))))
(build-system gnu-build-system)
(arguments
(list #:make-flags
#~(list (string-append "BUILD_CC=" #$(cc-for-target)))
#:test-target "Tests"
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'change-directory
(lambda _
(chdir "BaseTools")))
(add-after 'change-directory 'disable-some-tools
(lambda _
;; Disable building brotli and xz, since we package them
;; separately, and it would require fetching submodules.
(substitute* "Source/C/GNUmakefile"
(("^[[:blank:]]+BrotliCompress[[:blank:]]+\\\\")
"\\")
(("^[[:blank:]]+LzmaCompress[[:blank:]]+\\\\")
"\\"))))
(replace 'build
(lambda* (#:key (make-flags #~'()) #:allow-other-keys)
;; The default build target also runs tests.
(apply invoke "make" "-C" "Source/C" make-flags)))
(delete 'configure)
(replace 'install
(lambda _
(mkdir #$output)
(copy-recursively "Source/C/bin"
(string-append #$output "/bin")))))))
(native-inputs
(list python-wrapper))
(inputs
(list `(,util-linux "lib"))) ;for libuuid
(home-page
"https://github.com/tianocore/tianocore.github.io/wiki/EDK-II-Tools-List")
(synopsis "EFI development tools")
(description
"This package contains tools for processing UEFI firmware content.
Executables included are:
@itemize
@item @code{EfiRom}: Build Option ROM images.
@item @code{GenFfs}: Generate FFS files.
@item @code{GenFv}: Generate a PI firmware volume image.
@item @code{GenFw}: Get image data from PE32 files.
@item @code{GenSec}: Generate EFI_SECTION type files.
@item @code{VfrCompile}: Parse preprocessed UEFI and Framework VFR files.
@item @code{VolInfo}: Display the contents of a firmware volume.
@end itemize")
(license license:bsd-2)))
(define-public ovmf (define-public ovmf
(let ((commit "13a50a6fe1dcfa6600c38456ee24e0f9ecf51b5f") (let ((commit "13a50a6fe1dcfa6600c38456ee24e0f9ecf51b5f")
(revision "1")) (revision "1"))

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

@ -66,7 +66,9 @@
version ".tar.bz2")) version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"0ax4kqnh7kd3z120ypgp73qy1knz47l6qxsqzrfkd97mh5cdky71")))) "0ax4kqnh7kd3z120ypgp73qy1knz47l6qxsqzrfkd97mh5cdky71"))
(patches
(search-patches "flashrom-fix-building-on-aarch64.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (list dmidecode pciutils libusb libftdi)) (inputs (list dmidecode pciutils libusb libftdi))
(native-inputs (list pkg-config)) (native-inputs (list pkg-config))

37
gnu/packages/fpga.scm
View file

@ -65,40 +65,39 @@
#:use-module (gnu packages libusb)) #:use-module (gnu packages libusb))
(define-public abc (define-public abc
(let ((commit "5ae4b975c49c") (let ((commit "70cb339f869e")
(revision "1")) (revision "2"))
(package (package
(name "abc") (name "abc")
(version (git-version "0.0" revision commit)) (version (git-version "0.0" revision commit))
(source (origin (source (origin
(method url-fetch) (method git-fetch)
(uri (uri (git-reference
(string-append "https://bitbucket.org/alanmi/abc/get/" commit ".zip")) (url "https://github.com/berkeley-abc/abc")
(file-name (string-append name "-" version "-checkout.zip")) (commit commit)))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1syygi1x40rdryih3galr4q8yg1w5bvdzl75hd27v1xq0l5bz3d0")))) "1ngxg4jvz8vwm74sbidysgz3v5lrzjcabkqj4nhcksi6hnhyc9m8"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs
(list unzip))
(inputs (inputs
(list readline)) (list readline))
(arguments (arguments
`(#:tests? #f ; no check target (list #:license-file-regexp "copyright.txt"
#:phases #:tests? #f ; no tests
(modify-phases %standard-phases #:phases
(delete 'configure) #~(modify-phases %standard-phases
(replace 'install (delete 'configure)
(lambda* (#:key outputs #:allow-other-keys) (replace 'install
(let* ((out (assoc-ref outputs "out")) (lambda _
(out-bin (string-append out "/bin"))) (install-file "abc" (string-append #$output "/bin")))))))
(install-file "abc" out-bin)))))))
(home-page "https://people.eecs.berkeley.edu/~alanmi/abc/") (home-page "https://people.eecs.berkeley.edu/~alanmi/abc/")
(synopsis "Sequential logic synthesis and formal verification") (synopsis "Sequential logic synthesis and formal verification")
(description "ABC is a program for sequential logic synthesis and (description "ABC is a program for sequential logic synthesis and
formal verification.") formal verification.")
(license (license
(license:non-copyleft "https://fedoraproject.org/wiki/Licensing:MIT#Modern_Variants"))))) (license:non-copyleft
"https://people.eecs.berkeley.edu/~alanmi/abc/copyright.htm")))))
(define-public iverilog (define-public iverilog
(package (package

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

@ -2665,7 +2665,7 @@ utilities frequently used in roguelikes.")
`(("alsa-lib" ,alsa-lib) `(("alsa-lib" ,alsa-lib)
("curl" ,curl) ("curl" ,curl)
("freetype" ,freetype) ("freetype" ,freetype)
("ffmpeg" ,ffmpeg) ("ffmpeg" ,ffmpeg-4)
("libjpeg" ,libjpeg-turbo) ("libjpeg" ,libjpeg-turbo)
("libogg" ,libogg) ("libogg" ,libogg)
("libpng" ,libpng) ("libpng" ,libpng)

42
gnu/packages/games.scm
View file

@ -52,7 +52,7 @@
;;; Copyright © 2020 Vitaliy Shatrov <D0dyBo0D0dyBo0@protonmail.com> ;;; Copyright © 2020 Vitaliy Shatrov <D0dyBo0D0dyBo0@protonmail.com>
;;; Copyright © 2020 Jack Hill <jackhill@jackhill.us> ;;; Copyright © 2020 Jack Hill <jackhill@jackhill.us>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2020, 2021 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2020, 2021, 2022 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020 Trevor Hass <thass@okstate.edu> ;;; Copyright © 2020 Trevor Hass <thass@okstate.edu>
;;; Copyright © 2020, 2021 Liliana Marie Prikler <liliana.prikler@gmail.com> ;;; Copyright © 2020, 2021 Liliana Marie Prikler <liliana.prikler@gmail.com>
;;; Copyright © 2020 Lu hux <luhux@outlook.com> ;;; Copyright © 2020 Lu hux <luhux@outlook.com>
@ -7930,7 +7930,7 @@ ncurses for text display.")
(define-public naev (define-public naev
(package (package
(name "naev") (name "naev")
(version "0.9.4") (version "0.10.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -7940,7 +7940,7 @@ ncurses for text display.")
(recursive? #t))) ; for game data (recursive? #t))) ; for game data
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0isswidhxhs2q5c4cxryjr8y8ibfxckpfyccly3b4lg1nxvm5gjv")))) (base32 "183dbi4a91xggxm1rmn7vr8rq519yz7b3zhrd03azsg6fxylv9wn"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
;; XXX: Do not add debugging symbols, which cause the build to fail. ;; XXX: Do not add debugging symbols, which cause the build to fail.
@ -7949,7 +7949,8 @@ ncurses for text display.")
(native-inputs (native-inputs
(list gettext-minimal pkg-config)) (list gettext-minimal pkg-config))
(inputs (inputs
(list freetype (list enet
freetype
glpk glpk
libpng libpng
libunibreak libunibreak
@ -7959,6 +7960,7 @@ ncurses for text display.")
luajit luajit
openal openal
openblas openblas
pcre2
physfs physfs
python python
python-pyyaml python-pyyaml
@ -8478,7 +8480,7 @@ to download and install them in @file{$HOME/.stepmania-X.Y/Songs} directory.")
(native-inputs (native-inputs
(list pkg-config)) (list pkg-config))
(inputs (inputs
(list cairo ffmpeg pango sdl2 sdl2-image)) (list cairo ffmpeg-4 pango sdl2 sdl2-image))
(home-page "https://github.com/fmang/oshu/") (home-page "https://github.com/fmang/oshu/")
(synopsis "Rhythm game in which you click on circles") (synopsis "Rhythm game in which you click on circles")
(description "@i{oshu!} is a minimalist variant of the @i{osu!} rhythm game, (description "@i{oshu!} is a minimalist variant of the @i{osu!} rhythm game,
@ -8885,7 +8887,7 @@ fight each other on an arena-like map.")
(define-public flare-engine (define-public flare-engine
(package (package
(name "flare-engine") (name "flare-engine")
(version "1.13.04") (version "1.14")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -8894,7 +8896,7 @@ fight each other on an arena-like map.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"042n2r9whnd3kncf3k89dcl1srn7p2jk6kdc0lb2hbwff55iylnw")))) "1gyaxr6zykwg5kg9xc3vlb5a6fas4z3zbk53y0zlfl35n4vqlh84"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
(list (list
@ -8914,7 +8916,7 @@ action RPGs.")
(define-public flare-game (define-public flare-game
(package (package
(name "flare-game") (name "flare-game")
(version "1.13.04") (version "1.14")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -8923,7 +8925,7 @@ action RPGs.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"18rdrwv7p5rvmlah5pl9vbc09xlb8id75a7c73yn2sxkm6cf5c2l")))) "1as9dsg0ddz14jjk4y5nj0ml20cwncrcnbdk10r1jaa2vss9bbn3"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
(list (list
@ -9318,7 +9320,7 @@ play with up to four players simultaneously. It has network support.")
(string-append "../hedgewars-src-" #$version) (string-append "../hedgewars-src-" #$version)
(install-file "misc/hedgewars.png" icons)))))))) (install-file "misc/hedgewars.png" icons))))))))
(inputs (inputs
(list ffmpeg (list ffmpeg-4
freeglut freeglut
ghc-entropy ghc-entropy
ghc-hslogger ghc-hslogger
@ -10336,10 +10338,10 @@ etc. You can also play games on FICS or against an engine.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public stockfish (define-public stockfish
(let ((neural-network-revision "6877cd24400e")) ; also update hash below (let ((neural-network-revision "ad9b42354671")) ; also update hash below
(package (package
(name "stockfish") (name "stockfish")
(version "15") (version "15.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -10348,7 +10350,7 @@ etc. You can also play games on FICS or against an engine.")
(commit (string-append "sf_" version)))) (commit (string-append "sf_" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1v19v6qhwbf31wpc3qcih4dvqxwqkh0p426skgjin6ags31hkbmh")))) (base32 "0zmnv8vbhhid73pjyxg56r4ckm887znv4d55br370plm3p5b56xa"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("neural-network" `(("neural-network"
@ -10358,7 +10360,7 @@ etc. You can also play games on FICS or against an engine.")
neural-network-revision ".nnue")) neural-network-revision ".nnue"))
(sha256 (sha256
(base32 (base32
"1qyna598c0v7gdpycc6kpl12h5a2wa50dqray6gv208f80jcsxv8")))))) "11mpdhnsfggldgvmzwmya64pp3fndyppi2fkdf8kfhbi8qsl56xd"))))))
(arguments (arguments
`(#:tests? #f `(#:tests? #f
#:make-flags (list "-C" "src" #:make-flags (list "-C" "src"
@ -10388,11 +10390,13 @@ etc. You can also play games on FICS or against an engine.")
(copy-file (assoc-ref inputs "neural-network") (copy-file (assoc-ref inputs "neural-network")
(format #f "src/nn-~a.nnue" (format #f "src/nn-~a.nnue"
,neural-network-revision)))) ,neural-network-revision))))
;; Guix doesn't use a multiarch gcc. (add-after 'unpack 'remove-m-flag-and-net-target
(add-after 'unpack 'remove-m-flag
(lambda _ (lambda _
(substitute* "src/Makefile" (substitute* "src/Makefile"
(("-m\\$\\(bits\\)") ""))))))) ;; Guix doesn't use a multiarch gcc.
(("-m\\$\\(bits\\)") "")
;; Dont depend on net target.
((": net") ": ")))))))
(synopsis "Strong chess engine") (synopsis "Strong chess engine")
(description (description
"Stockfish is a very strong chess engine. It is much stronger than the "Stockfish is a very strong chess engine. It is much stronger than the
@ -11020,7 +11024,7 @@ disassembly of the DOS version, extended with new features.")
(define-public fheroes2 (define-public fheroes2
(package (package
(name "fheroes2") (name "fheroes2")
(version "0.9.11") (version "1.0.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -11029,7 +11033,7 @@ disassembly of the DOS version, extended with new features.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1m8649srzg3j2b1hs4x2y8fib6hn7v0afv4c7bjnfk4bhpi4cqd7")))) (base32 "0bvp9xhzlh4d6q5jlvz4nciald75g9v0vahzax47q9xgajnbibzk"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f ; no tests `(#:tests? #f ; no tests

160
gnu/packages/geo.scm
View file

@ -65,6 +65,7 @@
#:use-module (gnu packages bison) #:use-module (gnu packages bison)
#:use-module (gnu packages boost) #:use-module (gnu packages boost)
#:use-module (gnu packages build-tools) #:use-module (gnu packages build-tools)
#:use-module (gnu packages c)
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages cmake) #:use-module (gnu packages cmake)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
@ -79,6 +80,7 @@
#:use-module (gnu packages flex) #:use-module (gnu packages flex)
#:use-module (gnu packages fonts) #:use-module (gnu packages fonts)
#:use-module (gnu packages fontutils) #:use-module (gnu packages fontutils)
#:use-module (gnu packages gcc)
#:use-module (gnu packages gettext) #:use-module (gnu packages gettext)
#:use-module (gnu packages gl) #:use-module (gnu packages gl)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
@ -128,25 +130,94 @@
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module (gnu packages xorg)) #:use-module (gnu packages xorg))
(define-public libaec
(package
(name "libaec")
(version "1.0.6")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.dkrz.de/k202009/libaec")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "14myrmmiz9z6wgxqywf3a63cq514vrzsd6z4zvpwigvawlk30iip"))))
(build-system cmake-build-system)
(home-page "https://gitlab.dkrz.de/k202009/libaec")
(synopsis "Adaptive Entropy Coding library")
(description "Libaec provides fast lossless compression of 1 up to 32 bit
wide signed or unsigned integers (samples). The library achieves best results
for low entropy data as often encountered in space imaging instrument data or
numerical model output from weather or climate simulations. While floating
point representations are not directly supported, they can also be efficiently
coded by grouping exponents and mantissa.")
(license license:bsd-2)))
(define-public eccodes
(package
(name "eccodes")
(version "2.27.0")
(source
(origin
(method url-fetch)
(uri (string-append
"https://confluence.ecmwf.int/download/attachments/45757960/"
"eccodes-" version "-Source.tar.gz"))
(sha256
(base32 "16cw4v2d0kjq6gq04paqny0sh5jymn70w449mig7m5h3spzv7rgd"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags '("-DENABLE_MEMFS=ON" "-DENABLE_PNG=ON")
#:validate-runpath? #f))
(inputs
(list jasper libaec libjpeg-turbo libpng netcdf openjpeg))
(native-inputs
(list gfortran perl pkg-config python))
(home-page "https://confluence.ecmwf.int/display/ECC")
(synopsis "Library for handling the GRIB, BUFR and GTS file formats")
(description "ecCodes is a package developed by @acronym{ECMWF, European
Centre for Medium-Range Weather Forecasts} which provides an application
programming interface and a set of tools for decoding and encoding messages in
the @acronym{WMO, World Meteorological Organization} FM-92 GRIB, WMO FM-94
BUFR and WMO GTS abbreviated header formats.")
(license license:asl2.0)))
(define-public cdo (define-public cdo
(package (package
(name "cdo") (name "cdo")
(version "2.0.5") (version "2.1.0")
(source (origin (source
(method url-fetch) (origin
(uri (string-append (method url-fetch)
"https://code.mpimet.mpg.de/attachments/download/26823/cdo-" (uri (string-append
version ".tar.gz")) "https://code.mpimet.mpg.de/attachments/download/27481/cdo-"
(sha256 version ".tar.gz"))
(base32 (sha256
"1khdbd5cmnn7qm6hcqg4md5wbq14fs6brrns8b3g18diqgqvpvpd")))) (base32 "1k18llghpf3jnjn0xcnhmbg7arb1fiy854qqn9m5c1abjin38wdq"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list #:configure-flags (list #:configure-flags
#~(list (string-append "--with-netcdf=" #~(list (string-append "--with-curl="
#$(this-package-input "netcdf"))))) #$(this-package-input "curl"))
(string-append "--with-eccodes="
#$(this-package-input "eccodes"))
(string-append "--with-fftw3="
#$(this-package-input "fftw"))
(string-append "--with-hdf5="
#$(this-package-input "hdf5"))
(string-append "--with-netcdf="
#$(this-package-input "netcdf"))
(string-append "--with-proj="
#$(this-package-input "proj"))
(string-append "--with-udunits2="
#$(this-package-input "udunits"))
(string-append "--with-libxml2="
#$(this-package-input "libxml2")))
;; Some tests can fail on machines with many threads.
#:parallel-tests? #f))
(inputs (inputs
(list netcdf)) (list curl eccodes fftw hdf5 libxml2 netcdf proj udunits))
(native-inputs (native-inputs
(list pkg-config)) (list pkg-config))
(home-page "https://code.mpimet.mpg.de/projects/cdo") (home-page "https://code.mpimet.mpg.de/projects/cdo")
@ -222,7 +293,7 @@ OpenStreetMap written in C using eXpat, Cairo and GLib.")
(define-public geos (define-public geos
(package (package
(name "geos") (name "geos")
(version "3.11.0") (version "3.11.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://download.osgeo.org/geos/geos-" (uri (string-append "http://download.osgeo.org/geos/geos-"
@ -230,7 +301,7 @@ OpenStreetMap written in C using eXpat, Cairo and GLib.")
".tar.bz2")) ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"12l59pxawyizmc4wn20dvjn7aifqwkim4ysmc78h91mayjmqravr")))) "1qhbirv1rbznv99ha0pa0zybvcsn0dsz2xfc65vr8bgrm77v63kd"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments `(#:phases (arguments `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
@ -338,6 +409,7 @@ and driving.")
(method url-fetch) (method url-fetch)
(uri (string-append "http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-" (uri (string-append "http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-"
version ".tar.gz")) version ".tar.gz"))
(patches (search-patches "libgeotiff-fix-tests-with-proj-9.1.1.patch"))
(sha256 (sha256
(base32 "1mjmgv48x51ppax5dnb6lq7z600czxll53bx6jbzqwd4m93i7aq5")) (base32 "1mjmgv48x51ppax5dnb6lq7z600czxll53bx6jbzqwd4m93i7aq5"))
(modules '((guix build utils))) (modules '((guix build utils)))
@ -528,7 +600,7 @@ fully fledged Spatial SQL capabilities.")
(define-public proj (define-public proj
(package (package
(name "proj") (name "proj")
(version "9.1.0") (version "9.1.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -536,7 +608,7 @@ fully fledged Spatial SQL capabilities.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0593vd9sac0c98j1f4rammd90d4xnhygbr6d49i8il6ajjdj7cl1")))) "0fbd1vj4cj19kwh03vdn0a4hr0xaacvi876yyyw5xfsj1q0x8g00"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (list googletest pkg-config)) (native-inputs (list googletest pkg-config))
(propagated-inputs (list curl libtiff sqlite)) ;required by proj.pc (propagated-inputs (list curl libtiff sqlite)) ;required by proj.pc
@ -630,14 +702,14 @@ projections.")
(define-public python-pyproj (define-public python-pyproj
(package (package
(name "python-pyproj") (name "python-pyproj")
(version "3.3.1") (version "3.4.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "pyproj" version)) (uri (pypi-uri "pyproj" version))
(sha256 (sha256
(base32 (base32
"1gjg63irs44djyqbp9gg7s02d0y5i9cd1a83phyzp5fcj56y3n5k")))) "0czbfl5dd7jckbwvinfwiwdb99sxj796gfn3a9zqbsdc4xcl8257"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -974,7 +1046,7 @@ development.")
(define-public gdal (define-public gdal
(package (package
(name "gdal") (name "gdal")
(version "3.5.1") (version "3.6.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -982,7 +1054,7 @@ development.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1l93q7xf6qx9ck5axfkf3ygmvclxkvrjd8x00ckn7j0d0750ci3w")) "1qckwnygszxkkq40bf87s3m1sab6jj9jyakdvskh0qf7dq8zjarf"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
`(begin `(begin
@ -1012,19 +1084,27 @@ development.")
json-c json-c
libgeotiff libgeotiff
libjpeg-turbo libjpeg-turbo
libjxl
libpng libpng
libtiff libtiff
libwebp libwebp
lz4
netcdf netcdf
openssl openssl
openjpeg
pcre2 pcre2
postgresql ; libpq postgresql ; libpq
proj proj
qhull qhull
sqlite sqlite
zlib)) swig
zlib
zstd))
(native-inputs (native-inputs
(list pkg-config)) (list pkg-config
python))
(propagated-inputs
(list python-numpy))
(home-page "https://gdal.org/") (home-page "https://gdal.org/")
(synopsis "Raster and vector geospatial data format library") (synopsis "Raster and vector geospatial data format library")
(description "GDAL is a translator library for raster and vector geospatial (description "GDAL is a translator library for raster and vector geospatial
@ -1053,25 +1133,6 @@ utilities for data translation and processing.")
;; frmts/mrf/libLERC ;; frmts/mrf/libLERC
license:asl2.0)))) license:asl2.0))))
(define-public python-gdal
(package (inherit gdal)
(name "python-gdal")
(build-system python-build-system)
(arguments
'(#:tests? #f ; no tests
#:phases
(modify-phases %standard-phases
(add-before 'build 'chdir
(lambda _
(chdir "swig/python")
#t)))))
(native-inputs '())
(propagated-inputs
(list python-numpy))
(inputs
(list gdal))
(synopsis "GDAL (Geospatial Data Abstraction Library) python bindings")))
(define-public python-pyshp (define-public python-pyshp
(package (package
(name "python-pyshp") (name "python-pyshp")
@ -1106,13 +1167,13 @@ utilities for data translation and processing.")
(package (package
(name "python-cartopy") (name "python-cartopy")
;; This is a post-release fix that adds build_ext to setup.py. ;; This is a post-release fix that adds build_ext to setup.py.
(version "0.20.3") (version "0.21.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "Cartopy" version)) (uri (pypi-uri "Cartopy" version))
(sha256 (sha256
(base32 "01lhnkhw22jp6hnrs5qvgkq4fqcni2sx7ydiyv8w8xxx5wpglq0d")))) (base32 "0hnfs75dcnz12ximah5xn9566r8zz189lxikmj4lrs9jl4l3l7ff"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -1135,13 +1196,12 @@ utilities for data translation and processing.")
python-scipy python-scipy
python-shapely)) python-shapely))
(inputs (inputs
(list geos (list geos))
;; cartopy's setup.py looks for the proj executable.
;; Not sure if it actually makes use of it since it
;; probably uses proj only through pyproj.
proj))
(native-inputs (native-inputs
(list python-cython python-flufl-lock python-pytest)) (list python-cython
python-flufl-lock
python-pytest
python-pytest-mpl))
(home-page "https://scitools.org.uk/cartopy/docs/latest/") (home-page "https://scitools.org.uk/cartopy/docs/latest/")
(synopsis "Cartographic library for visualisation") (synopsis "Cartographic library for visualisation")
(description (description
@ -2480,6 +2540,7 @@ growing set of geoscientific methods.")
"ProcessingQgisAlgorithmsTestPt2" "ProcessingQgisAlgorithmsTestPt2"
"ProcessingQgisAlgorithmsTestPt3" "ProcessingQgisAlgorithmsTestPt3"
"ProcessingQgisAlgorithmsTestPt4" "ProcessingQgisAlgorithmsTestPt4"
"ProcessingGdalAlgorithmsRasterTest"
"ProcessingGdalAlgorithmsVectorTest" "ProcessingGdalAlgorithmsVectorTest"
"ProcessingGrass7AlgorithmsImageryTest" "ProcessingGrass7AlgorithmsImageryTest"
"ProcessingGrass7AlgorithmsRasterTestPt1" "ProcessingGrass7AlgorithmsRasterTestPt1"
@ -2597,7 +2658,6 @@ growing set of geoscientific methods.")
python-chardet python-chardet
python-dateutil python-dateutil
python-future python-future
python-gdal
python-jinja2 python-jinja2
python-numpy python-numpy
python-owslib python-owslib

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

@ -361,16 +361,16 @@ copy, move, delete, or edit your files.")
(define-public gnome-shell-extension-unite-shell (define-public gnome-shell-extension-unite-shell
(package (package
(name "gnome-shell-extension-unite-shell") (name "gnome-shell-extension-unite-shell")
(version "65") (version "69")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/hardpixel/unite-shell") (url "https://github.com/hardpixel/unite-shell")
(commit "127edac6396b89cdedec003bdff38820e6a0f91f"))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1lzhf7hlvzg62nxjfpv265315qibcjz5dv08dzpfckf2dx68nab4")))) "10yh6ylyp43ykcza180iak08wfypay3raqf3p0vrj9ngm98qzq70"))))
(build-system copy-build-system) (build-system copy-build-system)
(native-inputs (list `(,glib "bin") gettext-minimal)) (native-inputs (list `(,glib "bin") gettext-minimal))
(inputs (list xprop)) (inputs (list xprop))
@ -934,7 +934,7 @@ copies you now want to paste.")
(define-public gnome-shell-extension-vertical-overview (define-public gnome-shell-extension-vertical-overview
(package (package
(name "gnome-shell-extension-vertical-overview") (name "gnome-shell-extension-vertical-overview")
(version "9") (version "10")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -943,7 +943,7 @@ copies you now want to paste.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(sha256 (sha256
(base32 (base32
"0pkby00rjipj04z68d6i3rr7mzm01dckf2vl3iz6yvbl39602icl")) "1sqkbg93qqrq47wyfnh2flg7dpsmv5c2pmkx8kgqhnbl7j2kgi0l"))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(snippet (snippet
'(begin (delete-file "schemas/gschemas.compiled"))))) '(begin (delete-file "schemas/gschemas.compiled")))))
@ -1015,7 +1015,7 @@ position when the mouse is moved rapidly.")
(define-public gnome-shell-extension-burn-my-windows (define-public gnome-shell-extension-burn-my-windows
(package (package
(name "gnome-shell-extension-burn-my-windows") (name "gnome-shell-extension-burn-my-windows")
(version "21") (version "22")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -1024,7 +1024,7 @@ position when the mouse is moved rapidly.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(sha256 (sha256
(base32 (base32
"07ckfl47pq83nhb77v230zfxlz3imga3s8nn3sr9cq4zxvbkj2r4")) "185xrf330d9bflmk0l61cnzlylnppb2v4yz6v6ygkk4zpwyil8np"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system copy-build-system) (build-system copy-build-system)
(arguments (arguments

44
gnu/packages/gnome.scm
View file

@ -766,8 +766,7 @@ of known objects without needing a central registrar.")
(with-directory-excursion "doc/libzeitgeist" (with-directory-excursion "doc/libzeitgeist"
(substitute* "zeitgeist-gtkdoc-index.sgml" (substitute* "zeitgeist-gtkdoc-index.sgml"
(("http://www.oasis-open.org/docbook/xml/4.3/") (("http://www.oasis-open.org/docbook/xml/4.3/")
(string-append (assoc-ref inputs "docbook-xml") (search-input-directory inputs "/xml/dtd/docbook/"))))))
"/xml/dtd/docbook/"))))))
(add-after 'patch-docbook-xml 'disable-failing-tests (add-after 'patch-docbook-xml 'disable-failing-tests
(lambda _ (lambda _
(substitute* "test/direct/Makefile.am" (substitute* "test/direct/Makefile.am"
@ -781,25 +780,25 @@ of known objects without needing a central registrar.")
;; To honor `autoreconf -vif` by build-system. ;; To honor `autoreconf -vif` by build-system.
(delete-file "autogen.sh")))))) (delete-file "autogen.sh"))))))
(native-inputs (native-inputs
`(("autoconf" ,autoconf) (list autoconf
("automake" ,automake) automake
("docbook-xml" ,docbook-xml-4.3) docbook-xml-4.3
("gettext" ,gettext-minimal) gettext-minimal
("gobject-introspection" ,gobject-introspection) gobject-introspection
("gtk-doc" ,gtk-doc/stable) gtk-doc/stable
("libtool" ,libtool) libtool
("pkg-config" ,pkg-config) pkg-config
("vala" ,vala) vala
("xorg-server-for-tests" ,xorg-server-for-tests))) xorg-server-for-tests))
(inputs (inputs
`(("dee-icu" ,dee) (list dee
("gtk+" ,gtk+) gtk+
("json-glib" ,json-glib) json-glib
("sqlite" ,sqlite) sqlite
("telepathy-glib" ,telepathy-glib) telepathy-glib
("python" ,python-wrapper) python-wrapper
("python-rdflib" ,python-rdflib) python-rdflib
("xapian-config" ,xapian))) xapian))
(propagated-inputs (propagated-inputs
(list glib)) (list glib))
(synopsis "Desktop Activity Logging") (synopsis "Desktop Activity Logging")
@ -889,6 +888,7 @@ tomorrow, the rest of the week and for special occasions.")
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
(list (list
#:disallowed-references (list (this-package-native-input "git-minimal"))
#:glib-or-gtk? #t #:glib-or-gtk? #t
#:configure-flags #:configure-flags
#~(list "-Ddogtail=false" ; Not available #~(list "-Ddogtail=false" ; Not available
@ -909,7 +909,7 @@ tomorrow, the rest of the week and for special occasions.")
(list dbus (list dbus
desktop-file-utils desktop-file-utils
gettext-minimal gettext-minimal
git-minimal git-minimal/fixed
`(,glib "bin") `(,glib "bin")
gobject-introspection gobject-introspection
gsettings-desktop-schemas gsettings-desktop-schemas
@ -9724,7 +9724,7 @@ endpoint and it understands SPARQL.")
"--no-suite" "slow"))))))) "--no-suite" "slow")))))))
(native-inputs (native-inputs
(list dbus (list dbus
intltool gettext-minimal
`(,glib "bin") `(,glib "bin")
docbook-xsl docbook-xsl
docbook-xml docbook-xml

2
gnu/packages/gnunet.scm
View file

@ -100,7 +100,7 @@
`(("exiv2" ,exiv2) `(("exiv2" ,exiv2)
("bzip2" ,bzip2) ("bzip2" ,bzip2)
("flac" ,flac) ("flac" ,flac)
("ffmpeg" ,ffmpeg) ("ffmpeg" ,ffmpeg-4)
("file" ,file) ;libmagic, for the MIME plug-in ("file" ,file) ;libmagic, for the MIME plug-in
("glib" ,glib) ("glib" ,glib)
("giflib" ,giflib) ("giflib" ,giflib)

4
gnu/packages/gnupg.scm
View file

@ -257,14 +257,14 @@ specifications are building blocks of S/MIME and TLS.")
(define libksba/fixed (define libksba/fixed
(package (package
(inherit libksba) (inherit libksba)
(version "1.6.2") (version "1.6.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"mirror://gnupg/libksba/libksba-" version ".tar.bz2")) "mirror://gnupg/libksba/libksba-" version ".tar.bz2"))
(sha256 (sha256
(base32 "0wf9j9hlzvgn0vz6zg3fvcmpdr62v8bz1kzsvzdbs4lqqp51rq7w")))))) (base32 "0p6y82j9y6n0l7scjgqhz3as9w13jiqjfx9n2jzynw89nf6wcwiz"))))))
(define-public npth (define-public npth
(package (package

20
gnu/packages/gnuzilla.scm
View file

@ -477,8 +477,8 @@ in C/C++.")
;; XXXX: Workaround 'snippet' limitations. ;; XXXX: Workaround 'snippet' limitations.
(define computed-origin-method (@@ (guix packages) computed-origin-method)) (define computed-origin-method (@@ (guix packages) computed-origin-method))
(define %icecat-version "102.5.0-guix0-preview1") (define %icecat-version "102.6.0-guix0-preview1")
(define %icecat-build-id "20221115000000") ;must be of the form YYYYMMDDhhmmss (define %icecat-build-id "20221213000000") ;must be of the form YYYYMMDDhhmmss
;; 'icecat-source' is a "computed" origin that generates an IceCat tarball ;; 'icecat-source' is a "computed" origin that generates an IceCat tarball
;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat' ;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat'
@ -500,11 +500,11 @@ in C/C++.")
"firefox-" upstream-firefox-version ".source.tar.xz")) "firefox-" upstream-firefox-version ".source.tar.xz"))
(sha256 (sha256
(base32 (base32
"1n2pq165fxmvgcr5mv3hhaid2vn7lh3jg03lf13kz4c5295x8z81")))) "1zhggzrk7lgip8jm37idh22qks76kmjy4yqy2qi63mvnv2j58cfj"))))
(upstream-icecat-base-version "102.5.0") ; maybe older than base-version (upstream-icecat-base-version "102.6.0") ; maybe older than base-version
;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version)) ;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version))
(gnuzilla-commit "a8848cb35e4e47a344d40596f72d82d57bf5a6f1") (gnuzilla-commit "b6260130b9808f550bdb35061af2d7962109a181")
(gnuzilla-source (gnuzilla-source
(origin (origin
(method git-fetch) (method git-fetch)
@ -516,7 +516,7 @@ in C/C++.")
(string-take gnuzilla-commit 8))) (string-take gnuzilla-commit 8)))
(sha256 (sha256
(base32 (base32
"0d0brzi7wmg70kvi9p3g24cyya17bvg2djgjn64g14hpnalg8icw")))) "19v443w43jbcl9m5kl52nfai7hs4j07nf2ad9ggca7b2b0cz89b4"))))
;; 'search-patch' returns either a valid file name or #f, so wrap it ;; 'search-patch' returns either a valid file name or #f, so wrap it
;; in 'assume-valid-file-name' to avoid 'local-file' warnings. ;; in 'assume-valid-file-name' to avoid 'local-file' warnings.
@ -1097,8 +1097,8 @@ standards of the IceCat project.")
(cpe-name . "firefox_esr") (cpe-name . "firefox_esr")
(cpe-version . ,(first (string-split version #\-))))))) (cpe-version . ,(first (string-split version #\-)))))))
(define %icedove-build-id "20221201000000") ;must be of the form YYYYMMDDhhmmss (define %icedove-build-id "20221213000000") ;must be of the form YYYYMMDDhhmmss
(define %icedove-version "102.5.1") (define %icedove-version "102.6.0")
;; Provides the "comm" folder which is inserted into the icecat source. ;; Provides the "comm" folder which is inserted into the icecat source.
;; Avoids the duplication of Icecat's source tarball. ;; Avoids the duplication of Icecat's source tarball.
@ -1107,11 +1107,11 @@ standards of the IceCat project.")
(method hg-fetch) (method hg-fetch)
(uri (hg-reference (uri (hg-reference
(url "https://hg.mozilla.org/releases/comm-esr102") (url "https://hg.mozilla.org/releases/comm-esr102")
(changeset "bbf216e50e6a8cb4362b2b77feeb8ca4a1d78914"))) (changeset "d46a947ae837300f19cc45c75d473c7b1cf4ebb3")))
(file-name (string-append "thunderbird-" %icedove-version "-checkout")) (file-name (string-append "thunderbird-" %icedove-version "-checkout"))
(sha256 (sha256
(base32 (base32
"06fhdzpl72mihm97g2i76knbny1jj261isl2jy8085wdmriv2f8z")))) "0klr6i2sbaiv2gc8q1cxrz87zd5cskdwa9qacp3dhfb8x17qwb41"))))
(define-public icedove (define-public icedove
(package (package

4
gnu/packages/graph.scm
View file

@ -67,7 +67,7 @@
(define-public plfit (define-public plfit
(package (package
(name "plfit") (name "plfit")
(version "0.9.3") (version "0.9.4")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -76,7 +76,7 @@
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"03x5jbvg8vwr92682swy58ljxrhqwmga1xzd0cpfbfmda41gm2fb")))) "042b60cnsz5wy27sz026xs0mnn9p58j46crgs78skncgkvzqyyc6"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:configure-flags (list "-DBUILD_SHARED_LIBS=ON"))) '(#:configure-flags (list "-DBUILD_SHARED_LIBS=ON")))

10
gnu/packages/graphics.scm
View file

@ -570,7 +570,7 @@ and export to various formats including the format used by Magicavoxel.")
(define-public assimp (define-public assimp
(package (package
(name "assimp") (name "assimp")
(version "5.2.2") (version "5.2.5")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -579,7 +579,7 @@ and export to various formats including the format used by Magicavoxel.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1kjifakjnpm89410pw27wq21fn975gfq46kn9zs3h8bryldvvlgk")))) "0j0pd279n6xyy95x782ha8j75kbx0ck7vs5wv3krhbyfim9bw64l"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs (inputs
(list zlib)) (list zlib))
@ -957,7 +957,7 @@ other vector formats such as:
(define-public alembic (define-public alembic
(package (package
(name "alembic") (name "alembic")
(version "1.8.3") (version "1.8.4")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -966,7 +966,7 @@ other vector formats such as:
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0glfx3cm7r8zn3cn7j4x4ch1ab6igfis0i2lcy23jc56q87r8yj2")))) (base32 "04cvzr87zqx55si4j3dqiidbmfx92ja3mc1dj0v6ddvl0cwj3m7i"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:configure-flags (list "-DUSE_HDF5=ON"))) `(#:configure-flags (list "-DUSE_HDF5=ON")))
@ -1308,7 +1308,7 @@ visual effects work for film.")
("jasper" ,jasper) ("jasper" ,jasper)
("librsvg" ,librsvg) ("librsvg" ,librsvg)
("libxrandr" ,libxrandr) ("libxrandr" ,libxrandr)
("ffmpeg" ,ffmpeg) ("ffmpeg" ,ffmpeg-4)
("mesa" ,mesa))) ("mesa" ,mesa)))
(synopsis "High-performance real-time graphics toolkit") (synopsis "High-performance real-time graphics toolkit")
(description (description

23
gnu/packages/graphviz.scm
View file

@ -2,7 +2,7 @@
;;; Copyright © 2013, 2015, 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2015, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Theodoros Foradis <theodoros@foradis.org> ;;; Copyright © 2016 Theodoros Foradis <theodoros@foradis.org>
;;; Copyright © 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017, 2018, 2019, 2022 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Gábor Boskovits <boskovits@gmail.com> ;;; Copyright © 2017 Gábor Boskovits <boskovits@gmail.com>
;;; Copyright © 2018 Mathieu Lirzin <mthl@gnu.org> ;;; Copyright © 2018 Mathieu Lirzin <mthl@gnu.org>
@ -32,6 +32,7 @@
(define-module (gnu packages graphviz) (define-module (gnu packages graphviz)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system pyproject)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download) #:use-module (guix git-download)
@ -180,27 +181,25 @@ interfaces for other technical domains.")
(define-public python-graphviz (define-public python-graphviz
(package (package
(name "python-graphviz") (name "python-graphviz")
(version "0.13.2") (version "0.20.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "graphviz" version ".zip")) (uri (pypi-uri "graphviz" version ".zip"))
(sha256 (sha256
(base32 (base32
"009alrilzx0v7kl41khbq7k6k8b8pxyvbsi1b1ai933f6kpbxb30")))) "1y1b956r01kg7qarkkrivhn71q64k0gbq6bcybd4gfd3v95g2n4c"))))
(build-system python-build-system) (build-system pyproject-build-system)
(arguments (arguments
'(#:phases (modify-phases %standard-phases (list
(replace 'check #:phases
(lambda* (#:key tests #:allow-other-keys) '(modify-phases %standard-phases
(if tests (add-before 'check 'prepare-chec
(invoke "pytest" "-vv") ;; Needed for fontconfig cache directories
(format #t "test suite not run~%")) (lambda _ (setenv "HOME" (getcwd)))))))
#t)))))
(native-inputs (native-inputs
(list unzip (list unzip
;; For tests. ;; For tests.
graphviz graphviz
python-mock
python-pytest python-pytest
python-pytest-cov python-pytest-cov
python-pytest-mock)) python-pytest-mock))

11
gnu/packages/gstreamer.scm
View file

@ -734,6 +734,17 @@ model to base your own plug-in on, here it is.")
(home-page "https://gstreamer.freedesktop.org/") (home-page "https://gstreamer.freedesktop.org/")
(license license:lgpl2.0+))) (license license:lgpl2.0+)))
(define-public gst-plugins-good-qt
(package
(inherit gst-plugins-good)
(name "gst-plugins-good-qt")
(inputs
(modify-inputs (package-inputs gst-plugins-good)
(prepend qtbase-5
qtdeclarative-5
qtwayland-5
qtx11extras)))))
(define-public gst-plugins-bad (define-public gst-plugins-bad
(package (package
(name "gst-plugins-bad") (name "gst-plugins-bad")

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

@ -337,6 +337,72 @@ to UNIX pipes (@code{|}), Clojure's threading macros (@code{->} and
@code{->>}).") @code{->>}).")
(license license:gpl3+)))) (license license:gpl3+))))
(define-public guile-pubstrate
(let ((commit "b11b7df5e7ffefa45c5859b868d8125c4d939418")
(revision "1"))
(package
(name "guile-pubstrate")
(version (git-version "0.1.dev" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.com/dustyweb/pubstrate")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1qk45b3hjhzzq3dim699jrbmlc7ryr4s1fiz99ljz16rag2rr5p4"))))
(build-system gnu-build-system)
(arguments
(list
#:make-flags
'(list "GUILE_AUTO_COMPILE=0")
#:phases
'(modify-phases %standard-phases
(add-after 'unpack 'fix-build-system
(lambda _
(substitute* "configure.ac"
(("GUILE_PROGS" m)
(string-append m "
guilemoduledir=\"${datarootdir}/guile/site/${GUILE_EFFECTIVE_VERSION}\"
AC_SUBST([guilemoduledir])
AC_SUBST([GUILE_EFFECTIVE_VERSION])
")))
;; The user.scm line is doubled
(substitute* "Makefile.am"
((".*pubstrate/webapp/user.scm.*") "")
((".*pubstrate/webapp/app.scm.*" m)
(string-append m "pubstrate/webapp/user.scm \\\n"))
(("/ccache") "/site-ccache"))))
(add-after 'unpack 'fix-srfi64-tests
(lambda _
(substitute* (find-files "tests/" "test-.*\\.scm$")
(("\\(test-exit\\)") "")
(("\\(test-end.*" m)
(string-append "(test-exit)" m))))))))
(native-inputs
(list autoconf
automake
pkg-config
texinfo))
(inputs
(list guile-3.0
libgcrypt))
(propagated-inputs
(list gnutls
guile-8sync-for-pubstrate
guile-gcrypt
guile-gdbm-ffi
guile-irregex
guile-lib
guile-sjson
guile-webutils))
(home-page "https://gitlab.com/dustyweb/pubstrate/")
(synopsis "ActivityStreams and ActivityPub implementation in Guile")
(description "This package provides an implementation of ActivityStreams
and ActivityPub in Guile. It includes a full (currently demo) web server.")
(license license:gpl3+))))
(define-public guile-f-scm (define-public guile-f-scm
(package (package
(name "guile-f-scm") (name "guile-f-scm")
@ -564,6 +630,44 @@ library for GNU Guile based on the actor model.")
(properties '((upstream-name . "8sync"))) (properties '((upstream-name . "8sync")))
(license license:lgpl3+)))) (license license:lgpl3+))))
(define guile-8sync-for-pubstrate
(let ((commit "7972787723d08a491379b63e6e5dc1cc6a3fac87")
(revision "0"))
(package
(inherit guile-8sync)
(name "guile-8sync-for-pubstrate")
(version (git-version "0.4.2" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(commit commit)
(url "https://git.savannah.gnu.org/git/8sync.git")))
(sha256
(base32
"0m3k3cizi89frnw58dws3g4jcssck6jf1ahpadxxg3ncclqzad8r"))
(file-name (git-file-name name version))
(modules '((guix build utils)))
(snippet
'(substitute* "Makefile.am"
(("2.2") "3.0")))))
(build-system gnu-build-system)
(arguments
(list
#:make-flags
'(list "GUILE_AUTO_COMPILE=0")
#:phases
'(modify-phases %standard-phases
;; See commit ee371103855e5bfe8aae3debe442a24c6353e172
(add-after 'unpack 'fix-srfi64-tests
(lambda _
(substitute* '("tests/test-actors.scm"
"tests/test-rmeta-slot.scm")
(("\\(test-exit\\)") "")
(("\\(test-end.*" m)
(string-append "(test-exit)" m))))))))
(native-inputs (list autoconf automake guile-3.0 pkg-config texinfo))
(propagated-inputs (list guile-fibers)))))
(define-public guile-daemon (define-public guile-daemon
(package (package
(name "guile-daemon") (name "guile-daemon")
@ -1177,6 +1281,36 @@ non-mutating insert, delete, and search operations, with support for
convenient nested tree operations.") convenient nested tree operations.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public guile-aws
(let ((commit "f32bea12333e1054b97ab50e58a72636edabb5b7")
(revision "1"))
(package
(name "guile-aws")
(version (git-version "0.1.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://git.elephly.net/software/guile-aws.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0z2mrjw1dry14vjqsh9xi199bavlmy6cajshnv015n7p5my0cx9z"))))
(build-system gnu-build-system)
(native-inputs
(list autoconf automake pkg-config))
(inputs
(list guile-3.0))
(propagated-inputs
(list guile-json-4 guile-gcrypt))
(home-page "https://git.elephly.net/software/guile-aws.git")
(synopsis "Scheme DSL for the AWS APIs")
(description
"This package provides a DSL for a number of @dfn{Amazon Web
Services} (AWS) APIs, including EFS, EC2, Route53, and more. Guile AWS uses
the Guile compiler tower to generate the DSL from AWS JSON specifications.")
(license license:gpl3+))))
(define-public guile-simple-zmq (define-public guile-simple-zmq
(let ((commit "ff0b39aec9312517fb48681564e261bd000aaf63") (let ((commit "ff0b39aec9312517fb48681564e261bd000aaf63")
(revision "10")) (revision "10"))
@ -3592,7 +3726,7 @@ debugging code.")
(define-public guile-png (define-public guile-png
(package (package
(name "guile-png") (name "guile-png")
(version "0.2.0") (version "0.3.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -3601,10 +3735,21 @@ debugging code.")
(file-name (string-append name "-" version "-checkout")) (file-name (string-append name "-" version "-checkout"))
(sha256 (sha256
(base32 (base32
"1nk81z2cf9fsyppq5ly0yjw7yvdk5qraf71in7ayzdkngphhfgfx")))) "1lv2cjzgrr0yshqng96l6bnn8pjmljv8qcn4w3wldh97ns7qigds"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:make-flags '("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings `(#:make-flags '("GUILE_AUTO_COMPILE=0") ;to prevent guild warnings
#:phases
(modify-phases %standard-phases
;; Guile-PNG tries to log parser messages to the syslog which is not
;; available during the build.
(add-after 'unpack 'fix-tests
(lambda* (#:key inputs outputs #:allow-other-keys)
(substitute* "tests/graphics.scm"
((" \\(png graphics\\)\\)")
(string-append " (png graphics)\n"
" (png fsm context))\n"
"(log-clear-handlers!)"))))))))
(native-inputs (list autoconf automake pkg-config texinfo)) (native-inputs (list autoconf automake pkg-config texinfo))
(inputs (list bash-minimal guile-3.0 guile-lib guile-zlib)) (inputs (list bash-minimal guile-3.0 guile-lib guile-zlib))
(propagated-inputs (list guile-smc)) (propagated-inputs (list guile-smc))
@ -4076,8 +4221,8 @@ gnome-keyring, and many more.")
(license license:expat))) (license license:expat)))
(define-public guile-webutils (define-public guile-webutils
(let ((commit "8541904f761066dc9c27b1153e9a838be9a55299") (let ((commit "d309d65a85247e4f3cea63a17defd1e6d35d821f")
(revision "0")) (revision "1"))
(package (package
(name "guile-webutils") (name "guile-webutils")
(version (git-version "0.1" revision commit)) (version (git-version "0.1" revision commit))
@ -4089,15 +4234,7 @@ gnome-keyring, and many more.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1s9n3hbxd7lfpdi0x8wr0cfvlsf6g62ird9gbspxdrp5p05rbi64")) "1a3bblk5zaldkkxn0a94s544drqm0w2i5fsjpghagd64m149blf0"))))
(modules '((guix build utils)))
(snippet
'(begin
;; Allow builds with Guile 3.0.
(substitute* "configure.ac"
(("2\\.2 2\\.0")
"3.0 2.2 2.0"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
(list autoconf automake pkg-config texinfo)) (list autoconf automake pkg-config texinfo))

15
gnu/packages/hardware.scm
View file

@ -14,6 +14,7 @@
;;; Copyright © 2022 Marius Bakke <marius@gnu.org> ;;; Copyright © 2022 Marius Bakke <marius@gnu.org>
;;; Copyright © 2022 Marcel Kupiec <formbi@protonmail.com> ;;; Copyright © 2022 Marcel Kupiec <formbi@protonmail.com>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2022 Efraim Flashner <efraim@flashner.co.il>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -134,7 +135,7 @@ sets, and tools to deal with register databases.")
(define-public hw-probe (define-public hw-probe
(package (package
(name "hw-probe") (name "hw-probe")
(version "1.6.4") (version "1.6.5")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -144,7 +145,7 @@ sets, and tools to deal with register databases.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "028wnhrbn10lfxwmcpzdbz67ygldimv7z1k1bm64ggclykvg5aim")))) (base32 "1sbp0scdi54zwgvb1s3ki3cw8xnxaxzm5cicq2nn3a2b6n1d4ljs"))))
(build-system perl-build-system) (build-system perl-build-system)
(arguments (arguments
(list (list
@ -263,6 +264,7 @@ sets, and tools to deal with register databases.")
ddcutil ddcutil
dmidecode dmidecode
dpkg dpkg
edac-utils
edid-decode edid-decode
efibootmgr efibootmgr
efivar efivar
@ -1132,7 +1134,14 @@ supported by the Linux kernel.")
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0zwrkqfxd671iy69v3q0844gfdpm1yk51i9qh2rqc969bd8glxga")))) (base32 "0zwrkqfxd671iy69v3q0844gfdpm1yk51i9qh2rqc969bd8glxga"))
(snippet
#~(begin
;; https://github.com/rockchip-linux/rkdeveloptool/pull/57
(use-modules (guix build utils))
(substitute* "main.cpp"
(("snprintf\\(buffer, sizeof\\(buffer\\), \"\\%s\", chip)")
"memccpy(buffer, chip, '\\0', sizeof(buffer))"))))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
(list autoconf automake pkg-config)) (list autoconf automake pkg-config))

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

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

76
gnu/packages/ibus.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, 2021 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com> ;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2017, 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
@ -36,6 +36,7 @@
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system meson)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (gnu packages) #:use-module (gnu packages)
@ -54,6 +55,7 @@
#:use-module (gnu packages gettext) #:use-module (gnu packages gettext)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
#:use-module (gnu packages gnome) #:use-module (gnu packages gnome)
#:use-module (gnu packages gstreamer)
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
#:use-module (gnu packages iso-codes) #:use-module (gnu packages iso-codes)
#:use-module (gnu packages logging) #:use-module (gnu packages logging)
@ -63,11 +65,13 @@
#:use-module (gnu packages python-xyz) #:use-module (gnu packages python-xyz)
#:use-module (gnu packages python-web) #:use-module (gnu packages python-web)
#:use-module (gnu packages serialization) #:use-module (gnu packages serialization)
#:use-module (gnu packages speech)
#:use-module (gnu packages sqlite) #:use-module (gnu packages sqlite)
#:use-module (gnu packages textutils) #:use-module (gnu packages textutils)
#:use-module (gnu packages unicode) #:use-module (gnu packages unicode)
#:use-module (gnu packages xorg) #:use-module (gnu packages xorg)
#:use-module (gnu packages xdisorg) #:use-module (gnu packages xdisorg)
#:use-module (gnu packages xml)
#:use-module (srfi srfi-1)) #:use-module (srfi srfi-1))
(define-public ibus-minimal (define-public ibus-minimal
@ -847,6 +851,76 @@ hanja dictionary and small hangul character classification.")
"ibus-hangul is a Korean input method engine for IBus.") "ibus-hangul is a Korean input method engine for IBus.")
(license gpl2+))) (license gpl2+)))
(define-public ibus-speech-to-text
(package
(name "ibus-speech-to-text")
(version "0.4.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/PhilippeRo/IBus-Speech-To-Text")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"00p7jfv815dblg20hahch6151rdbxhkdhfj51i0yvvmg3irvf7nm"))))
(build-system meson-build-system)
(arguments
(list
#:glib-or-gtk? #true
#:phases
'(modify-phases %standard-phases
(add-after 'unpack 'skip-update-desktop-database
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "meson.build"
(("update_desktop_database: true")
"update_desktop_database: false"))))
(add-after 'install 'wrap-with-additional-paths
(lambda* (#:key inputs outputs #:allow-other-keys)
;; Make sure 'ibus-{setup,engine}-stt' find the gst-vosk plugin
;; and run with the correct GUIX_PYTHONPATH and GI_TYPELIB_PATH.
(let ((out (assoc-ref outputs "out")))
(for-each (lambda (prog)
(wrap-program prog
`("GST_PLUGIN_PATH" ":" prefix
(,(string-append (assoc-ref inputs "gst-vosk")
"/lib/gstreamer-1.0")
,(getenv "GST_PLUGIN_SYSTEM_PATH")))
`("GUIX_PYTHONPATH" ":" prefix
(,(getenv "GUIX_PYTHONPATH")
,(string-append (assoc-ref inputs "ibus")
"/lib/girepository-1.0")
,(string-append (assoc-ref outputs "out")
"/share/ibus-stt")))
`("GI_TYPELIB_PATH" ":" prefix
(,(string-append (assoc-ref inputs "ibus")
"/lib/girepository-1.0")
,(string-append (assoc-ref outputs "out")
"/share/ibus-stt")))))
(list (string-append out "/libexec/ibus-engine-stt")
(string-append out "/libexec/ibus-setup-stt")))))))))
(inputs
(list desktop-file-utils
(list glib "bin")
gobject-introspection
gst-vosk
gstreamer
gtk
ibus
libadwaita
python
python-babel
python-pygobject))
(native-inputs
(list gettext-minimal libxml2 pkg-config))
(home-page "https://github.com/PhilippeRo/IBus-Speech-To-Text")
(synopsis "Speech to text IBus engine using VOSK")
(description "This Input Method uses VOSK for voice recognition and allows
to dictate text in several languages in any application that supports IBus.
One of the main adavantages is that VOSK performs voice recognition locally
and does not rely on an online service.")
(license gpl3+)))
(define-public ibus-theme-tools (define-public ibus-theme-tools
(package (package
(name "ibus-theme-tools") (name "ibus-theme-tools")

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

@ -620,7 +620,7 @@ integrates with various databases on GUI toolkits such as Qt and Tk.")
(sha256 (sha256
(base32 "0ga0l4ranp1834gxgp487ll1amvmssa02l2nk5ja5w0rx4d8hh26")))))) (base32 "0ga0l4ranp1834gxgp487ll1amvmssa02l2nk5ja5w0rx4d8hh26"))))))
(inputs (inputs
(list ffmpeg (list ffmpeg-4
gtk+ gtk+
gtkglext gtkglext
hdf5 hdf5
@ -925,7 +925,7 @@ recalculates.")
double-conversion double-conversion
eigen eigen
expat expat
ffmpeg ffmpeg-4
freetype freetype
gdal gdal
gl2ps gl2ps

17
gnu/packages/irc.scm
View file

@ -387,22 +387,23 @@ highlighted.
(define-public ii (define-public ii
(package (package
(name "ii") (name "ii")
(version "1.9") (version "2.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://dl.suckless.org/tools/" (uri (string-append "http://dl.suckless.org/tools/"
name "-" version ".tar.gz")) name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"05wcaszm9hap5gqf58bciqm3ad1kfgp976fs3fsn3ll3nliv6345")))) "0ns2wpzkk7qzhv7addgr0w5as0m7jwag5nxai2dr61wc436syrsg"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; no tests (list #:tests? #f ; no tests
#:make-flags (list (string-append "PREFIX=" %output) #:make-flags
,(string-append "CC=" (cc-for-target))) #~(list (string-append "PREFIX=" #$output)
#:phases (string-append "CC=" #$(cc-for-target)))
(modify-phases %standard-phases #:phases
(delete 'configure)))) ; no configure #~(modify-phases %standard-phases
(delete 'configure)))) ; no configure script
(home-page "https://tools.suckless.org/ii/") (home-page "https://tools.suckless.org/ii/")
(synopsis "FIFO and file system based IRC client") (synopsis "FIFO and file system based IRC client")
(description (description

13
gnu/packages/jami.scm
View file

@ -69,7 +69,7 @@
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix utils)) #:use-module (guix utils))
(define %jami-version "20221031.1308.130cc26") (define %jami-version "20221220.0956.79e1207")
(define %jami-sources (define %jami-sources
;; Return an origin object of the tarball release sources archive of the ;; Return an origin object of the tarball release sources archive of the
@ -93,16 +93,9 @@
"plugins")))) "plugins"))))
(sha256 (sha256
(base32 (base32
"0hbsjjs61n7268lyjnjb9lzfpkkd65fmz76l1bg4awlz1f3cyywm")) "0g5709rmb9944s0ij9g4pm1b871f5z0s5nawvm10z14wx3y1np8m"))
(patches (search-patches "jami-disable-integration-tests.patch" (patches (search-patches "jami-disable-integration-tests.patch"
"jami-libjami-headers-search.patch" "jami-libjami-headers-search.patch"))))
"jami-fix-unit-tests-build.patch"
"jami-fix-qml-imports.patch"
"jami-no-webengine.patch"
"jami-sipaccount-segfault.patch"
"jami-sip-contacts.patch"
"jami-sip-unregister.patch"
"jami-xcb-link.patch"))))
;; Jami maintains a set of patches for some key dependencies (currently ;; Jami maintains a set of patches for some key dependencies (currently
;; pjproject and ffmpeg) of Jami that haven't yet been integrated upstream. ;; pjproject and ffmpeg) of Jami that haven't yet been integrated upstream.

42
gnu/packages/java.scm
View file

@ -1761,18 +1761,18 @@ new Date();"))
(define-public openjdk11 (define-public openjdk11
(package (package
(name "openjdk") (name "openjdk")
(version "11.0.15") (version "11.0.17")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://openjdk-sources.osci.io/openjdk11/openjdk-" (uri (string-append "https://openjdk-sources.osci.io/openjdk11/openjdk-"
version "-ga.tar.xz")) version "-ga.tar.xz"))
(file-name (string-append name "-" version ".tar.bz2")) (file-name (string-append name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0di91nnms2iq1svgq72r5y17am17r4vh2lq43k0bkcwpc84d6nd8")) "1prvqy0ysz0999wrhsrbz6vrknpqfihl9l74l16ph93g89dqi5ia"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(for-each delete-file (find-files "." ".*.(bin|exe|jar)$"))))) '(for-each delete-file (find-files "." "\\.(bin|exe|jar)$")))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" "jdk" "doc")) (outputs '("out" "jdk" "doc"))
(arguments (arguments
@ -1851,8 +1851,7 @@ new Date();"))
(format (current-error-port) (format (current-error-port)
"warning: failed to substitute: ~a~%" "warning: failed to substitute: ~a~%"
file)))) file))))
(find-files "." (find-files "." "\\.c$|\\.h$")))))
"\\.c$|\\.h$")))))
(add-before 'build 'write-source-revision-file (add-before 'build 'write-source-revision-file
(lambda _ (lambda _
(with-output-to-file ".src-rev" (with-output-to-file ".src-rev"
@ -1879,7 +1878,7 @@ new Date();"))
,@make-flags)))) ,@make-flags))))
(replace 'install (replace 'install
(lambda _ (lambda _
(let ((images (car (find-files "build" ".*-server-release" (let ((images (car (find-files "build" "-server-release"
#:directories? #t)))) #:directories? #t))))
(copy-recursively (string-append images "/images/jdk") (copy-recursively (string-append images "/images/jdk")
#$output:jdk) #$output:jdk)
@ -1913,7 +1912,7 @@ new Date();"))
(invoke "unzip" archive)) (invoke "unzip" archive))
(delete-file archive) (delete-file archive)
(with-directory-excursion dir (with-directory-excursion dir
(let ((char-data-files (find-files "." "CharacterData.*"))) (let ((char-data-files (find-files "." "CharacterData")))
(for-each (lambda (file) (for-each (lambda (file)
(substitute* file (substitute* file
(((string-append "This file was generated " (((string-append "This file was generated "
@ -1924,7 +1923,7 @@ new Date();"))
"file")))) "file"))))
char-data-files))) char-data-files)))
(with-directory-excursion dir (with-directory-excursion dir
(let ((files (find-files "." ".*" #:directories? #t))) (let ((files (find-files "." #:directories? #t)))
(apply invoke "zip" "-0" "-X" archive files)))))) (apply invoke "zip" "-0" "-X" archive files))))))
(add-after 'strip-character-data-timestamps 'remove-extraneous-files (add-after 'strip-character-data-timestamps 'remove-extraneous-files
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
@ -1949,7 +1948,7 @@ new Date();"))
(invoke "unzip" archive)) (invoke "unzip" archive))
(delete-file archive) (delete-file archive)
(for-each (compose repack-archive canonicalize-path) (for-each (compose repack-archive canonicalize-path)
(find-files dir "(ct.sym|\\.jar)$")) (find-files dir "(ct\\.sym|\\.jar)$"))
(let ((reset-file-timestamp (let ((reset-file-timestamp
(lambda (file) (lambda (file)
(let ((s (lstat file))) (let ((s (lstat file)))
@ -1959,7 +1958,7 @@ new Date();"))
(for-each reset-file-timestamp (for-each reset-file-timestamp
(find-files dir #:directories? #t))) (find-files dir #:directories? #t)))
(with-directory-excursion dir (with-directory-excursion dir
(let ((files (find-files "." ".*" #:directories? #t))) (let ((files (find-files "." #:directories? #t)))
(apply invoke "zip" "-0" "-X" archive files))))))) (apply invoke "zip" "-0" "-X" archive files)))))))
(for-each repack-archive (for-each repack-archive
(find-files #$output:doc "\\.zip$")) (find-files #$output:doc "\\.zip$"))
@ -2019,6 +2018,7 @@ new Date();"))
libxtst)) libxtst))
(native-inputs (native-inputs
(list autoconf (list autoconf
bash ; not bash-minimal, needs ulimit
openjdk10 openjdk10
`(,openjdk10 "jdk") `(,openjdk10 "jdk")
gnu-make-4.2 gnu-make-4.2
@ -2100,8 +2100,8 @@ blacklisted.certs.pem"
"#! java BlacklistedCertsConverter SHA-256\n")))))))))) "#! java BlacklistedCertsConverter SHA-256\n"))))))))))
(define-public openjdk13 (define-public openjdk13
(make-openjdk openjdk12 "13.0.7" (make-openjdk openjdk12 "13.0.13"
"0wrrr0d7lz1v8qqm752mn4gz5l2vpl2kmx4ac3ysvk4mljc924hp")) "0pxf4dlig61k0pg7amg4mi919hzam7nzwckry01avgq1wj8ambji"))
(define-public openjdk14 (define-public openjdk14
(make-openjdk (make-openjdk
@ -2119,8 +2119,8 @@ blacklisted.certs.pem"
(define-public openjdk15 (define-public openjdk15
(make-openjdk (make-openjdk
openjdk14 "15.0.3" openjdk14 "15.0.9"
"168cr08nywp0q3vyj8njkhsmmnyd8rz9r58hk4xhzdzc6bdfkl1i" "1k3x06fv89l84ysjsyw8s89q8blghq85m6xjzv373x6297ln8n7a"
(source (origin (source (origin
(inherit (package-source base)) (inherit (package-source base))
(modules '()) (modules '())
@ -2137,13 +2137,13 @@ blacklisted.certs.pem"
(append `(,openjdk14 "jdk")))))) (append `(,openjdk14 "jdk"))))))
(define-public openjdk16 (define-public openjdk16
(make-openjdk openjdk15 "16.0.1" (make-openjdk openjdk15 "16.0.2"
"1ggddsbsar4dj2fycfqqqagqil7prhb30afvq6933rz7pa9apm2f")) "0587px2qbz07g3xi4a3ya6m630p72dvkxcn0bj1813pxnwvcgigz"))
(define-public openjdk17 (define-public openjdk17
(make-openjdk (make-openjdk
openjdk16 "17.0.3" openjdk16 "17.0.5"
"0slmd6ww947gxpp4yr2wmr5z975bg86qh7zqfp2radf2q77ql65b" "1asnysg6kxdkrmb88y6qihdr12ljsyxv0mg6hlcs7cwxgsdlqkfs"
(arguments (arguments
(substitute-keyword-arguments (package-arguments openjdk16) (substitute-keyword-arguments (package-arguments openjdk16)
((#:phases phases) ((#:phases phases)
@ -2155,8 +2155,8 @@ blacklisted.certs.pem"
(("^#!.*") "#! java BlockedCertsConverter SHA-256\n")))))))))) (("^#!.*") "#! java BlockedCertsConverter SHA-256\n"))))))))))
(define-public openjdk18 (define-public openjdk18
(make-openjdk openjdk17 "18" (make-openjdk openjdk17 "18.0.2"
"1bv6bdhkmwvn10l0xy8yi9xibds640hs5zsvx0jp7wrxa3qw4qy8")) "1yimfdkwpinhg5cf1mcrzk9xvjwnray3cx762kypb9jcwbranjwx"))
;;; Convenience alias to point to the latest version of OpenJDK. ;;; Convenience alias to point to the latest version of OpenJDK.
(define-public openjdk openjdk18) (define-public openjdk openjdk18)

2
gnu/packages/julia-jll.scm
View file

@ -254,7 +254,7 @@ build tree Yggdrasil.")
;; There's a Julia file for each platform, override them all ;; There's a Julia file for each platform, override them all
(find-files "src/wrappers/" "\\.jl$"))))))) (find-files "src/wrappers/" "\\.jl$")))))))
(inputs (inputs
(list ffmpeg)) (list ffmpeg-4))
(propagated-inputs (propagated-inputs
(list julia-jllwrappers (list julia-jllwrappers
julia-bzip2-jll julia-bzip2-jll

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

File diff suppressed because it is too large Load diff

2
gnu/packages/kde-multimedia.scm
View file

@ -334,7 +334,7 @@ This package is part of the KDE multimedia module.")
(native-inputs (native-inputs
(list docbook-xsl (list docbook-xsl
extra-cmake-modules extra-cmake-modules
ffmpeg ffmpeg-4
kdoctools kdoctools
libxslt libxslt
python-wrapper python-wrapper

2
gnu/packages/kde-utils.scm
View file

@ -423,7 +423,7 @@ Kate's features include:
(home-page "https://invent.kde.org/utilities/kdebugsettings") (home-page "https://invent.kde.org/utilities/kdebugsettings")
(synopsis "Choose which QLoggingCategory are displayed") (synopsis "Choose which QLoggingCategory are displayed")
(description (description
"This package allows to select which QLoggingCategory are displayed.") "This package selects which QLoggingCategory are displayed.")
(license license:lgpl2.0+))) (license license:lgpl2.0+)))
(define-public kbackup (define-public kbackup

2
gnu/packages/kodi.scm
View file

@ -399,7 +399,7 @@ alternatives. In compilers, this can reduce the cascade of secondary errors.")
("dcadec" ,dcadec) ("dcadec" ,dcadec)
("dbus" ,dbus) ("dbus" ,dbus)
("eudev" ,eudev) ("eudev" ,eudev)
("ffmpeg" ,ffmpeg) ("ffmpeg" ,ffmpeg-4)
("flac" ,flac) ("flac" ,flac)
("flatbuffers" ,flatbuffers) ("flatbuffers" ,flatbuffers)
("fmt" ,fmt-7) ("fmt" ,fmt-7)

84
gnu/packages/lighting.scm
View file

@ -19,6 +19,7 @@
(define-module (gnu packages lighting) (define-module (gnu packages lighting)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix gexp)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages) #:use-module (guix packages)
@ -36,52 +37,49 @@
#:use-module (gnu packages protobuf)) #:use-module (gnu packages protobuf))
(define-public ola (define-public ola
;; Use a commit that allows building with libmicrohttpd 0.9.71. (package
;; https://github.com/OpenLightingProject/ola/pull/1651 (name "ola")
(let ((commit "5d882936436240b312b3836afd199587beaca840") (version "0.10.8")
(revision "0")) (source
(package (origin
(name "ola") (method git-fetch)
(version (git-version "0.10.7" revision commit)) (uri (git-reference
(source (url "https://github.com/OpenLightingProject/ola")
(origin (commit version)))
(method git-fetch) (sha256
(uri (git-reference (base32 "17dwmjdw87hv314gv5b1rmh5jglz8a0rzw7wj26xn74xw2jvxa6l"))
(url "https://github.com/OpenLightingProject/ola") (file-name (git-file-name name version))))
(commit commit))) (build-system gnu-build-system)
(sha256 (native-inputs
(base32 "1bhl3gvmvmnyrygfj13cibf2xirm285m8abjkaxq22hrqbsvab2m")) (list bison
(file-name (git-file-name name version)))) cppunit
(build-system gnu-build-system) flex
(native-inputs pkg-config
(list bison ;; For git repository bootstrapping.
cppunit autoconf
flex automake
pkg-config libtool))
;; For git repository bootstrapping. (inputs
autoconf (list libftdi
automake libmicrohttpd
libtool)) libusb
(inputs `(,util-linux "lib")
`(("libftdi" ,libftdi) zlib))
("libmicrohttpd" ,libmicrohttpd) (propagated-inputs
("libusb" ,libusb) (list protobuf)) ; for pkg-config --libs libola
("libuuid" ,util-linux "lib") (arguments
("zlib" ,zlib))) (list
(propagated-inputs ;; G++ >= 4.8 macro expansion tracking requires lots of memory, causing
(list protobuf)) ; for pkg-config --libs libola ;; build to fail on low memory systems. We disable that with the
(arguments ;; following configure flags.
`( ;; G++ >= 4.8 macro expansion tracking requires lots of memory, causing #:configure-flags #~(list "CXXFLAGS=-ftrack-macro-expansion=0")))
;; build to fail on low memory systems. We disable that with the (synopsis "Framework for controlling entertainment lighting equipment")
;; following configure flags. (description "The Open Lighting Architecture is a framework for lighting
#:configure-flags (list "CXXFLAGS=-ftrack-macro-expansion=0")))
(synopsis "Framework for controlling entertainment lighting equipment")
(description "The Open Lighting Architecture is a framework for lighting
control information. It supports a range of protocols and over a dozen USB control information. It supports a range of protocols and over a dozen USB
devices. It can run as a standalone service, which is useful for converting devices. It can run as a standalone service, which is useful for converting
signals between protocols, or alternatively using the OLA API, it can be used signals between protocols, or alternatively using the OLA API, it can be used
as the backend for lighting control software. OLA runs on many different as the backend for lighting control software. OLA runs on many different
platforms including ARM, which makes it a perfect fit for low cost Ethernet to platforms including ARM, which makes it a perfect fit for low cost Ethernet to
DMX gateways.") DMX gateways.")
(home-page "https://www.openlighting.org/ola") (home-page "https://www.openlighting.org/ola")
(license license:lgpl2.1+)))) (license license:lgpl2.1+)))

2
gnu/packages/linphone.scm
View file

@ -645,7 +645,7 @@ API. It also comprises a simple HTTP/HTTPS client implementation.")
("bcg729" ,bcg729) ("bcg729" ,bcg729)
("bcmatroska2" ,bcmatroska2) ("bcmatroska2" ,bcmatroska2)
("bctoolbox" ,bctoolbox) ("bctoolbox" ,bctoolbox)
("ffmpeg" ,ffmpeg) ("ffmpeg" ,ffmpeg-4)
("glew" ,glew) ("glew" ,glew)
("glu" ,glu) ("glu" ,glu)
("glx" ,mesa-utils) ("glx" ,mesa-utils)

418
gnu/packages/linux.scm
View file

@ -130,6 +130,7 @@
#:use-module (gnu packages libunwind) #:use-module (gnu packages libunwind)
#:use-module (gnu packages libusb) #:use-module (gnu packages libusb)
#:use-module (gnu packages llvm) #:use-module (gnu packages llvm)
#:use-module (gnu packages lsof)
#:use-module (gnu packages lua) #:use-module (gnu packages lua)
#:use-module (gnu packages man) #:use-module (gnu packages man)
#:use-module (gnu packages maths) #:use-module (gnu packages maths)
@ -143,12 +144,14 @@
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages pciutils) #:use-module (gnu packages pciutils)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages polkit)
#:use-module (gnu packages popt) #:use-module (gnu packages popt)
#:use-module (gnu packages pulseaudio) #:use-module (gnu packages pulseaudio)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages python-xyz) #:use-module (gnu packages python-xyz)
#:use-module (gnu packages readline) #:use-module (gnu packages readline)
#:use-module (gnu packages rrdtool) #:use-module (gnu packages rrdtool)
#:use-module (gnu packages rsync)
#:use-module (gnu packages samba) #:use-module (gnu packages samba)
#:use-module (gnu packages sdl) #:use-module (gnu packages sdl)
#:use-module (gnu packages serialization) #:use-module (gnu packages serialization)
@ -477,7 +480,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-6.0-version "6.0.12") (define-public linux-libre-6.0-version "6.0.15")
(define-public linux-libre-6.0-gnu-revision "gnu") (define-public linux-libre-6.0-gnu-revision "gnu")
(define deblob-scripts-6.0 (define deblob-scripts-6.0
(linux-libre-deblob-scripts (linux-libre-deblob-scripts
@ -487,7 +490,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "16g2bin3xay30zfss1vlb7pwcss5giaxaksp4v1gk05wn51wjrqr"))) (base32 "16g2bin3xay30zfss1vlb7pwcss5giaxaksp4v1gk05wn51wjrqr")))
(define-public linux-libre-6.0-pristine-source (define-public linux-libre-6.0-pristine-source
(let ((version linux-libre-6.0-version) (let ((version linux-libre-6.0-version)
(hash (base32 "00ag63lnxw2gijw3b6v29lhrlv480m12954q5zh4jawlz3nk1dw9"))) (hash (base32 "08389890gq4b9vkvrb22lzkr4blkn3a5ma074ns19gl89wyyp16l")))
(make-linux-libre-source version (make-linux-libre-source version
(%upstream-linux-source version hash) (%upstream-linux-source version hash)
deblob-scripts-6.0))) deblob-scripts-6.0)))
@ -495,7 +498,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.15-version "5.15.82") (define-public linux-libre-5.15-version "5.15.85")
(define-public linux-libre-5.15-gnu-revision "gnu") (define-public linux-libre-5.15-gnu-revision "gnu")
(define deblob-scripts-5.15 (define deblob-scripts-5.15
(linux-libre-deblob-scripts (linux-libre-deblob-scripts
@ -505,12 +508,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "1m73pgx8v047xb2gck2g7j7khniis8c9akn9vhzgsdfglrf8p6fj"))) (base32 "1m73pgx8v047xb2gck2g7j7khniis8c9akn9vhzgsdfglrf8p6fj")))
(define-public linux-libre-5.15-pristine-source (define-public linux-libre-5.15-pristine-source
(let ((version linux-libre-5.15-version) (let ((version linux-libre-5.15-version)
(hash (base32 "0r8v7113favmch2x6br7jk6idihza99l9qyd7ik99i5sg6xzdvpw"))) (hash (base32 "024qhjh9mgfnanr1qd8002n6a4wpn98lajli12a0m3n9z8lsw2rc")))
(make-linux-libre-source version (make-linux-libre-source version
(%upstream-linux-source version hash) (%upstream-linux-source version hash)
deblob-scripts-5.15))) deblob-scripts-5.15)))
(define-public linux-libre-5.10-version "5.10.158") (define-public linux-libre-5.10-version "5.10.161")
(define-public linux-libre-5.10-gnu-revision "gnu1") (define-public linux-libre-5.10-gnu-revision "gnu1")
(define deblob-scripts-5.10 (define deblob-scripts-5.10
(linux-libre-deblob-scripts (linux-libre-deblob-scripts
@ -520,12 +523,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "0a96g4pjdgwvxn2wpz6rfc8nwdlkw138r9pp66kvfrrn08i313ii"))) (base32 "0a96g4pjdgwvxn2wpz6rfc8nwdlkw138r9pp66kvfrrn08i313ii")))
(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 "1rq7lyp41fydybs53rcdjhiy271arh95xch16s5s3jhhanxj82hy"))) (hash (base32 "0ya04njrxr4d37zkxvivmn5f0bdvcb504pyp9ahwz8nqpk8gdaks")))
(make-linux-libre-source version (make-linux-libre-source version
(%upstream-linux-source version hash) (%upstream-linux-source version hash)
deblob-scripts-5.10))) deblob-scripts-5.10)))
(define-public linux-libre-5.4-version "5.4.226") (define-public linux-libre-5.4-version "5.4.228")
(define-public linux-libre-5.4-gnu-revision "gnu1") (define-public linux-libre-5.4-gnu-revision "gnu1")
(define deblob-scripts-5.4 (define deblob-scripts-5.4
(linux-libre-deblob-scripts (linux-libre-deblob-scripts
@ -535,12 +538,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "1bgblfkcnrabnr9hpdl07qgps57h6bq4v5pjrxs798vq43db66va"))) (base32 "1bgblfkcnrabnr9hpdl07qgps57h6bq4v5pjrxs798vq43db66va")))
(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 "0i4s1hl5q0ax55z7m5krzyw1zj9v03q8jcfksknb6qrg3lm5a7qc"))) (hash (base32 "0935dq7zbpf0fkppl3q96a2gh1zrmq01h1nivzgmdhjlmhn3n9c0")))
(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.268") (define-public linux-libre-4.19-version "4.19.269")
(define-public linux-libre-4.19-gnu-revision "gnu1") (define-public linux-libre-4.19-gnu-revision "gnu1")
(define deblob-scripts-4.19 (define deblob-scripts-4.19
(linux-libre-deblob-scripts (linux-libre-deblob-scripts
@ -550,12 +553,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "0g1yhzxm3ixfll6n630v7lddcyvf888sg114nimh0lkvzd180s99"))) (base32 "0g1yhzxm3ixfll6n630v7lddcyvf888sg114nimh0lkvzd180s99")))
(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 "0kr0di4gr6p57c8h6ybcli01kazq235npbh6qrpx0hpmqcdcx6r1"))) (hash (base32 "02mjb16xxfj984vibpxvhjl84y5yg0jgzjccjdxnn8db4k9aa2vf")))
(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.301") (define-public linux-libre-4.14-version "4.14.302")
(define-public linux-libre-4.14-gnu-revision "gnu1") (define-public linux-libre-4.14-gnu-revision "gnu1")
(define deblob-scripts-4.14 (define deblob-scripts-4.14
(linux-libre-deblob-scripts (linux-libre-deblob-scripts
@ -565,12 +568,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "00i91lx938nqlgy63hiricqd0fnbbf26vgya9c5lb7m1f4x324im"))) (base32 "00i91lx938nqlgy63hiricqd0fnbbf26vgya9c5lb7m1f4x324im")))
(define-public linux-libre-4.14-pristine-source (define-public linux-libre-4.14-pristine-source
(let ((version linux-libre-4.14-version) (let ((version linux-libre-4.14-version)
(hash (base32 "16zrpfadsnznpl37crbq5g1hz1ch0zfp2a75yzlqy2fs0f7fxlmc"))) (hash (base32 "102c9h0byr9v4bxzkdh7mnw1grm47ji6lf6l1gjlwah7f46j6ap3")))
(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.335") (define-public linux-libre-4.9-version "4.9.336")
(define-public linux-libre-4.9-gnu-revision "gnu1") (define-public linux-libre-4.9-gnu-revision "gnu1")
(define deblob-scripts-4.9 (define deblob-scripts-4.9
(linux-libre-deblob-scripts (linux-libre-deblob-scripts
@ -580,7 +583,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "0bib3641dbcqdkx3anna3caxnsg3nw9cnmhcklq0s93g3m57041h"))) (base32 "0bib3641dbcqdkx3anna3caxnsg3nw9cnmhcklq0s93g3m57041h")))
(define-public linux-libre-4.9-pristine-source (define-public linux-libre-4.9-pristine-source
(let ((version linux-libre-4.9-version) (let ((version linux-libre-4.9-version)
(hash (base32 "0agb1avdqxbmb0z751f5c4d6s7k9zb6dq04z82gx0v4zzrhxhkzd"))) (hash (base32 "032hgfvn7za2v49jjc3pdzx0cfglrmjkbl2d3pz857yc0q9y2v8z")))
(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)))
@ -1082,43 +1085,6 @@ Linux kernel. It has been modified to remove all non-free binary blobs.")
(define-public linux-libre-source linux-libre-6.0-source) (define-public linux-libre-source linux-libre-6.0-source)
(define-public linux-libre linux-libre-6.0) (define-public linux-libre linux-libre-6.0)
(define-public linux-libre-documentation
(package
(inherit linux-libre)
(name "linux-libre-documentation")
(arguments
(list
#:tests? #f
#:phases #~(modify-phases %standard-phases
(delete 'configure)
(replace 'build
(lambda _
(substitute* "Documentation/Makefile"
;; Remove problematic environment check script.
((".*scripts/sphinx-pre-install.*") ""))
(invoke "make" "infodocs")))
(replace 'install
(lambda _
(let* ((info-dir (string-append #$output "/share/info"))
(info (string-append info-dir
"/TheLinuxKernel.info.gz")))
(with-directory-excursion "Documentation/output"
(invoke "make" "-C" "texinfo" "install-info"
(string-append "infodir=" info-dir)))
;; Create a symlink, for convenience.
(symlink info (string-append info-dir
"/linux.info.gz"))))))))
(native-inputs
(list graphviz
perl
python
python-sphinx
texinfo
which))
(synopsis "Documentation for the kernel Linux-Libre")
(description "This package provides the documentation for the kernel
Linux-Libre, as an Info manual. To consult it, run @samp{info linux}.")))
(define-public linux-libre-5.15 (define-public linux-libre-5.15
(make-linux-libre* linux-libre-5.15-version (make-linux-libre* linux-libre-5.15-version
linux-libre-5.15-gnu-revision linux-libre-5.15-gnu-revision
@ -1900,6 +1866,47 @@ login password to @code{gpg-agent}. This can be useful if you are using a
GnuPG-based password manager like @code{pass}.") GnuPG-based password manager like @code{pass}.")
(license license:gpl3+))) (license license:gpl3+)))
;;;
;;; Kernel documentation
;;;
(define-public linux-libre-documentation
(package
(inherit linux-libre)
(name "linux-libre-documentation")
(arguments
(list
#:tests? #f
#:phases #~(modify-phases %standard-phases
(delete 'configure)
(replace 'build
(lambda _
(substitute* "Documentation/Makefile"
;; Remove problematic environment check script.
((".*scripts/sphinx-pre-install.*") ""))
(invoke "make" "infodocs")))
(replace 'install
(lambda _
(let* ((info-dir (string-append #$output "/share/info"))
(info (string-append info-dir
"/TheLinuxKernel.info.gz")))
(with-directory-excursion "Documentation/output"
(invoke "make" "-C" "texinfo" "install-info"
(string-append "infodir=" info-dir)))
;; Create a symlink, for convenience.
(symlink info (string-append info-dir
"/linux.info.gz"))))))))
(native-inputs
(list graphviz
perl
python
python-sphinx
texinfo
which))
(synopsis "Documentation for the kernel Linux-Libre")
(description "This package provides the documentation for the kernel
Linux-Libre, as an Info manual. To consult it, run @samp{info linux}.")))
;;; ;;;
;;; Miscellaneous. ;;; Miscellaneous.
@ -1933,7 +1940,7 @@ It provides the commands @code{powercap-info} and @code{powercap-set}.")
(define-public powerstat (define-public powerstat
(package (package
(name "powerstat") (name "powerstat")
(version "0.02.27") (version "0.02.28")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -1942,7 +1949,7 @@ It provides the commands @code{powercap-info} and @code{powercap-set}.")
(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 "1ik5yv2bhz2hvyga4h1m28rf0xpi20zpqm4swhvskyf1g6qf381z")))) (base32 "1wydjxmb6qf7rqarpl8rblg4biq3r2kfcx7p3pzvsr0w1xwdiisd"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:make-flags `(#:make-flags
@ -2868,6 +2875,56 @@ IPv6 packet filter.
Both commands are targeted at system administrators.") Both commands are targeted at system administrators.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public bolt
(package
(name "bolt")
(version "0.9.4")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.freedesktop.org/bolt/bolt")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0w66shv7ra8yrhr0byifahbq25wi8qfsm3rifz0j31l7cmnys3js"))))
(build-system meson-build-system)
(arguments
(list #:configure-flags '(list "--localstatedir=/var")
#:glib-or-gtk? #t ;To wrap binaries and/or compile schemas
#:phases #~(modify-phases %standard-phases
(add-after 'unpack 'replace-directories
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "meson.build"
(("udev.get_pkgconfig_variable..udevdir..")
(string-append "'"
#$output "/lib/udev'")))
(substitute* "scripts/meson-install.sh"
(("mkdir.*")
""))))
(add-before 'install 'no-polkit-magic
(lambda* (#:key outputs #:allow-other-keys)
(setenv "PKEXEC_UID" "something"))))))
(native-inputs (list pkg-config
`(,glib "bin") python asciidoc umockdev))
(inputs (list eudev dbus polkit))
(synopsis "Thunderbolt 3 device manager")
(description
"This package provides @command{boltd}, a userspace daemon
for Thunderbolt devices, and @command{boltctl}, a command-line utility for
managing those devices.
The daemon @command{boltd} exposes devices via D-Bus to clients. It also
stores a database of previously authorized devices and will, depending on the
policy set for the individual devices, automatically authorize newly connected
devices without user interaction.
The command-line utility @command{boltctl} manages Thunderbolt devices via
@command{boltd}. It can list devices, monitor changes, and initiate
authorization of devices.")
(home-page "https://gitlab.freedesktop.org/bolt/bolt")
(license license:gpl2+)))
(define-public jitterentropy-rngd (define-public jitterentropy-rngd
(package (package
(name "jitterentropy-rngd") (name "jitterentropy-rngd")
@ -3973,7 +4030,7 @@ from the module-init-tools project.")
(define-public earlyoom (define-public earlyoom
(package (package
(name "earlyoom") (name "earlyoom")
(version "1.6.2") (version "1.7")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -3982,7 +4039,7 @@ from the module-init-tools project.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"16iyn51xlrsbshc7p5xl2338yyfzknaqc538sa7mamgccqwgyvvq")))) "1xqrs6wz59ks76hdgfd4vaj010kbvllilgam2xxyn0g56kai71zi"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list (list
@ -5932,36 +5989,25 @@ uncompressed size will not match the number given by @command{tar} or
obviously it can be shared with files outside our set).") obviously it can be shared with files outside our set).")
(license license:gpl2+))) (license license:gpl2+)))
(define-public f2fs-tools-1.7 (define-public f2fs-tools
(package (package
(name "f2fs-tools") (name "f2fs-tools")
(version "1.7.0") (version "1.15.0")
(source (origin (source (origin
(method url-fetch) (method git-fetch)
(uri (string-append (uri (git-reference
"https://git.kernel.org/cgit/linux/kernel/git/jaegeuk" (url "https://git.kernel.org/pub/scm/linux/kernel\
"/f2fs-tools.git/snapshot/f2fs-tools-" version ".tar.gz")) /git/jaegeuk/f2fs-tools.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1m6bn1ibq0p53m0n97il91xqgjgn2pzlz74lb5bfzassx7159m1k")))) "1ffws8pbpzp9730v0wy5xjas698lnbd2p7wpr2gl4mx45rsay9a5"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments
`(#:configure-flags '("CFLAGS=-fcommon")
#:phases
(modify-phases %standard-phases
(add-after 'install 'install-headers
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(out-include (string-append out "/include")))
(install-file "include/f2fs_fs.h" out-include)
(install-file "mkfs/f2fs_format_utils.h" out-include)
#t))))))
(native-inputs (native-inputs
(list autoconf automake libtool pkg-config)) (list autoconf automake libtool pkg-config))
(inputs (inputs
`(("libuuid" ,util-linux "lib") (list `(,util-linux "lib"))) ;for libuuid
("libselinux" ,libselinux)))
(home-page "https://f2fs.wiki.kernel.org/") (home-page "https://f2fs.wiki.kernel.org/")
(synopsis "Userland tools for f2fs") (synopsis "Userland tools for f2fs")
(description (description
@ -5972,21 +6018,33 @@ disks and SD cards. This package provides the userland utilities.")
;; GPL2/LGPL2.1, everything else is GPL2 only. See 'COPYING'. ;; GPL2/LGPL2.1, everything else is GPL2 only. See 'COPYING'.
(license (list license:gpl2 license:lgpl2.1)))) (license (list license:gpl2 license:lgpl2.1))))
(define-public f2fs-tools (define-public f2fs-tools-1.7
(package (package
(inherit f2fs-tools-1.7) (inherit f2fs-tools)
(name "f2fs-tools") (name "f2fs-tools")
(version "1.14.0") (version "1.7.0")
(source (origin (source (origin
(method url-fetch) (method git-fetch)
(uri (string-append (uri (git-reference
"https://git.kernel.org/cgit/linux/kernel/git/jaegeuk" (url (git-reference-url
"/f2fs-tools.git/snapshot/f2fs-tools-" version ".tar.gz")) (origin-uri (package-source f2fs-tools))))
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1lab1446c78xsjwhpki7s85z4171m8p9279c8yhm4882wba674k1")))) "0wpzklw8smnngng0dm25jdmi7v5zfhpz02dksyxpz0a7kzzvnqqm"))))
(inputs (inputs
`(("libuuid" ,util-linux "lib"))))) (list `(,util-linux "lib") libselinux))
(arguments
'(#:configure-flags '("CFLAGS=-fcommon")
#:phases
(modify-phases %standard-phases
(add-after 'install 'install-headers
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(out-include (string-append out "/include")))
(install-file "include/f2fs_fs.h" out-include)
(install-file "mkfs/f2fs_format_utils.h" out-include)))))))))
(define-public f2fs-tools/static (define-public f2fs-tools/static
(static-package (static-package
@ -6004,18 +6062,9 @@ disks and SD cards. This package provides the userland utilities.")
"-I" libuuid "/include/blkid") "-I" libuuid "/include/blkid")
(string-append "libblkid_LIBS=-L" libuuid-static "/lib -lblkid"))) (string-append "libblkid_LIBS=-L" libuuid-static "/lib -lblkid")))
#:disallowed-references (,util-linux) #:disallowed-references (,util-linux)
#:make-flags '("LDFLAGS=-all-static")
#:phases #:phases
(modify-phases %standard-phases ; TODO: f2fs phases. (modify-phases %standard-phases ; TODO: f2fs phases.
(add-after 'unpack 'make-static
(lambda _
(define (append-to-file name body)
(let ((file (open-file name "a")))
(display body file)
(close-port file)))
(append-to-file "mkfs/Makefile.am" "\nmkfs_f2fs_LDFLAGS = -all-static\n")
(append-to-file "fsck/Makefile.am" "\nfsck_f2fs_LDFLAGS = -all-static\n")
(append-to-file "tools/Makefile.am" "\nf2fscrypt_LDFLAGS = -all-static -luuid\n")
#t))
(add-after 'install 'remove-store-references (add-after 'install 'remove-store-references
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; Work around bug in our util-linux. ;; Work around bug in our util-linux.
@ -6719,12 +6768,16 @@ not as a replacement for it.")
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags (list "--disable-pywrap") `(#:configure-flags (list "--disable-pywrap")
#:modules (,@%gnu-build-system-modules
(ice-9 binary-ports)
(rnrs bytevectors)
(srfi srfi-26))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'patch-source-shebangs 'patch-hardcoded-paths (add-after 'patch-source-shebangs 'patch-hardcoded-paths
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out"))
(utils-linux (assoc-ref inputs "utils-linux")) (util-linux (assoc-ref inputs "util-linux"))
(cryptsetup (assoc-ref inputs "cryptsetup")) (cryptsetup (assoc-ref inputs "cryptsetup"))
(linux-pam (assoc-ref inputs "linux-pam")) (linux-pam (assoc-ref inputs "linux-pam"))
(lvm2 (assoc-ref inputs "lvm2"))) (lvm2 (assoc-ref inputs "lvm2")))
@ -6738,9 +6791,9 @@ not as a replacement for it.")
"src/desktop/ecryptfs-mount-private.desktop.in" "src/desktop/ecryptfs-mount-private.desktop.in"
"src/desktop/ecryptfs-setup-private.desktop.in") "src/desktop/ecryptfs-setup-private.desktop.in")
(("/bin/mount") (("/bin/mount")
(string-append utils-linux "/bin/mount")) (string-append util-linux "/bin/mount"))
(("/bin/umount") (("/bin/umount")
(string-append utils-linux "/bin/umount")) (string-append util-linux "/bin/umount"))
(("/sbin/mount.ecryptfs_private") (("/sbin/mount.ecryptfs_private")
(string-append out "/sbin/mount.ecryptfs_private")) (string-append out "/sbin/mount.ecryptfs_private"))
(("/sbin/umount.ecryptfs_private") (("/sbin/umount.ecryptfs_private")
@ -6756,17 +6809,48 @@ not as a replacement for it.")
(("/sbin/unix_chkpwd") (("/sbin/unix_chkpwd")
(string-append linux-pam "/sbin/unix_chkpwd")) (string-append linux-pam "/sbin/unix_chkpwd"))
(("/sbin/dmsetup") (("/sbin/dmsetup")
(string-append lvm2 "/sbin/dmsetup"))))))))) (string-append lvm2 "/sbin/dmsetup"))))))
(add-after 'install 'wrap-scripts
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin"))
(add (map (lambda (bin)
(dirname (search-input-file
inputs (string-append "bin/" bin))))
;; For simplicity, we wrap all scripts the same.
(list "awk" "find" "gettext" "grep" "keyctl" "ls"
"lsof" "mount" "rsync" "sed" "which")))
(script? (lambda (file)
(call-with-input-file file
(lambda (port)
(bytevector=? (string->utf8 "#!")
(get-bytevector-n port 2)))))))
(for-each (lambda (file)
(when (script? file)
(wrap-program file
;; '= would be better than 'suffix but break
;; setuid binaries.
`("PATH" ":" suffix (,@add
,(string-append bin))))))
(find-files bin "."))))))))
(native-inputs (native-inputs
(list intltool perl ; for pod2man (list intltool perl ; for pod2man
pkg-config)) pkg-config))
(inputs (inputs
`(("keyutils" ,keyutils) (list coreutils
("linux-pam" ,linux-pam) cryptsetup
("utils-linux" ,util-linux) findutils
("cryptsetup" ,cryptsetup) gawk
("lvm2" ,lvm2) grep
("nss" ,nss))) keyutils
linux-pam
lsof
lvm2
nss
rsync
sed
util-linux
which))
(home-page "https://ecryptfs.org/") (home-page "https://ecryptfs.org/")
(synopsis "eCryptfs cryptographic file system utilities") (synopsis "eCryptfs cryptographic file system utilities")
(description (description
@ -6904,7 +6988,7 @@ the @code{mce-inject} module loaded if it exists.")
(define-public mcelog (define-public mcelog
(package (package
(name "mcelog") (name "mcelog")
(version "189") (version "190")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -6913,7 +6997,7 @@ the @code{mce-inject} module loaded if it exists.")
(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 "0ml12xmmmljp22a89fw23c6gmba4dngavgnisv665w67kbnv5085")) (base32 "1466zkbxgjg8ik0gd9vwsjiwg0yg7g8ra4bw3lg3ypla2kiydy4q"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
`(begin `(begin
@ -6949,7 +7033,7 @@ exceeded.")
(define-public mtd-utils (define-public mtd-utils
(package (package
(name "mtd-utils") (name "mtd-utils")
(version "2.1.4") (version "2.1.5")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -6957,7 +7041,7 @@ exceeded.")
"mtd-utils-" version ".tar.bz2")) "mtd-utils-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"168vyzpfa0n66i8lcf626b9jczjr81rqbdk7735lfb18bp8i2rrc")))) "0ilz8hkcyvfcnqpy25kbr8fb71x9vl28wbmw56vvd68n2byjfviq"))))
(arguments (arguments
(list #:configure-flags (list #:configure-flags
(if (%current-target-system) ; When cross-compiling. (if (%current-target-system) ; When cross-compiling.
@ -6968,12 +7052,12 @@ exceeded.")
(native-inputs (native-inputs
(list cmocka pkg-config)) (list cmocka pkg-config))
(inputs (inputs
`(("acl" ,acl) ; extended attributes (xattr) (list acl ; extended attributes (xattr)
("libuuid" ,util-linux "lib") lzo
("lzo" ,lzo) openssl ; optional crypto support
("openssl" ,openssl) ; optional crypto support `(,util-linux "lib")
("zlib" ,zlib) zlib
("zstd" ,zstd "lib"))) `(,zstd "lib")))
(build-system gnu-build-system) (build-system gnu-build-system)
(synopsis "MTD Flash Storage Utilities") (synopsis "MTD Flash Storage Utilities")
(description "This package provides utilities for testing, partitioning, etc (description "This package provides utilities for testing, partitioning, etc
@ -7568,14 +7652,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.2.3") (version "1.2.4")
(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 "0m82bmh8i24hwxmz7rxwxjll4904ghd2b1x1p5h8algrg6dyl5p9")))) (base32 "0zs7c8swlirxnbhl8q1b0p8g3jrzns7fyxsrglz71zfdwhxj7zn0"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
(list pkg-config)) (list pkg-config))
@ -7651,7 +7735,7 @@ userspace queueing component and the logging subsystem.")
(define-public libnetfilter-conntrack (define-public libnetfilter-conntrack
(package (package
(name "libnetfilter-conntrack") (name "libnetfilter-conntrack")
(version "1.0.8") (version "1.0.9")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -7660,8 +7744,7 @@ userspace queueing component and the logging subsystem.")
"libnetfilter_conntrack-" "libnetfilter_conntrack-"
version ".tar.bz2")) version ".tar.bz2"))
(sha256 (sha256
(base32 (base32 "1a3rnpsba64dzy97wwjrxal89wr0nf9znvag2j18nkp3kzs9vgb7"))))
"1ky1mqgnplw2h9jf0kn0a69d94jkydhbiipng9l2hdcj13h3pl8c"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (list pkg-config)) (native-inputs (list pkg-config))
(inputs (list libnfnetlink libmnl)) (inputs (list libnfnetlink libmnl))
@ -7679,7 +7762,7 @@ conntrack-tools among many other applications.")
(define-public libnetfilter-cttimeout (define-public libnetfilter-cttimeout
(package (package
(name "libnetfilter-cttimeout") (name "libnetfilter-cttimeout")
(version "1.0.0") (version "1.0.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -7687,8 +7770,7 @@ conntrack-tools among many other applications.")
"libnetfilter_cttimeout/files/" "libnetfilter_cttimeout/files/"
"libnetfilter_cttimeout-" version ".tar.bz2")) "libnetfilter_cttimeout-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32 "0983cpyvxyycbnzqlrzml80pph2z51r6s7sxp06ciq8468pxln8b"))))
"1fpyz1zlvcq80244knvyvy87909xjqlj02lmw8yblz2m9xsi5axf"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (list pkg-config)) (native-inputs (list pkg-config))
(inputs (list libmnl)) (inputs (list libmnl))
@ -7706,7 +7788,7 @@ by conntrack-tools.")
(define-public libnetfilter-cthelper (define-public libnetfilter-cthelper
(package (package
(name "libnetfilter-cthelper") (name "libnetfilter-cthelper")
(version "1.0.0") (version "1.0.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -7714,8 +7796,7 @@ by conntrack-tools.")
"libnetfilter_cthelper/files/" "libnetfilter_cthelper/files/"
"libnetfilter_cthelper-" version ".tar.bz2")) "libnetfilter_cthelper-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32 "04n95ngil5l8m8v64dfjm1dwq0wd3kf4vw1zblsrff13hxa3s1ql"))))
"0gfgzkc1fjniqwk4jxds72c0lcgfhq2591hrvjrvd9nrqiqqwq87"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (list pkg-config)) (native-inputs (list pkg-config))
(inputs (list libmnl)) (inputs (list libmnl))
@ -8122,14 +8203,14 @@ available in the kernel Linux.")
(define-public cpuid (define-public cpuid
(package (package
(name "cpuid") (name "cpuid")
(version "20221003") (version "20221201")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://www.etallen.com/cpuid/cpuid-" (uri (string-append "http://www.etallen.com/cpuid/cpuid-"
version ".src.tar.gz")) version ".src.tar.gz"))
(sha256 (sha256
(base32 (base32
"01w318kxcksfbjwjnnc9ly12g0yp4vm6xjgfl8mmi0jndg0cbi33")))) "0vlg5zc0dayyn9bzyb25fcaxid9svrsjjza11afplrhh50wdrzh8"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list #:make-flags (list #:make-flags
@ -8793,7 +8874,7 @@ the superuser to make device nodes.")
(define-public fakeroot (define-public fakeroot
(package (package
(name "fakeroot") (name "fakeroot")
(version "1.28") (version "1.30.1")
(source (source
(origin (origin
;; There are no tags in the repository, so take this snapshot. ;; There are no tags in the repository, so take this snapshot.
@ -8802,7 +8883,7 @@ the superuser to make device nodes.")
"fakeroot/fakeroot_" version ".orig.tar.gz")) "fakeroot/fakeroot_" version ".orig.tar.gz"))
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 "1hlh77b6m2cfm42lcav372mbjni5akbgs25yg4wgi1gndzihbm2n")) (base32 "0xba5gfh7ygv6na8n1ckqd2jnpdr9q88qan385qxp85c47sb3srj"))
(modules '((guix build utils) (modules '((guix build utils)
(ice-9 ftw))) (ice-9 ftw)))
(snippet (snippet
@ -8864,16 +8945,8 @@ the superuser to make device nodes.")
(substitute* "test/compare-tar" (substitute* "test/compare-tar"
(("tar -tvf") "tar --numeric-owner -tvf"))))))) (("tar -tvf") "tar --numeric-owner -tvf")))))))
(native-inputs (native-inputs
`(;; For bootstrapping the package. (list autoconf-2.71 automake gettext-minimal libtool po4a
("autoconf" ,autoconf-2.71) sharutils xz)) ; for tests
("automake" ,automake)
("libtool" ,libtool)
("gettext" ,gettext-minimal)
("po4a" ,po4a)
;; For tests.
("sharutils" ,sharutils)
("xz" ,xz)))
(inputs (inputs
(list acl libcap util-linux sed coreutils)) (list acl libcap util-linux sed coreutils))
(synopsis "Run commands in an environment with fake root privileges") (synopsis "Run commands in an environment with fake root privileges")
@ -8991,7 +9064,7 @@ types and interfaces and translates so that the X server can use them.")
(list alsa-lib (list alsa-lib
dbus dbus
eudev eudev
ffmpeg ffmpeg-4
gstreamer gstreamer
gst-plugins-base gst-plugins-base
libva libva
@ -9035,6 +9108,7 @@ of Linux application development.")
(modify-inputs (package-native-inputs pipewire) (modify-inputs (package-native-inputs pipewire)
(prepend python-docutils))) (prepend python-docutils)))
(inputs (modify-inputs (package-inputs pipewire) (inputs (modify-inputs (package-inputs pipewire)
(replace "ffmpeg" ffmpeg)
(prepend avahi (prepend avahi
bluez bluez
jack-2 jack-2
@ -9290,7 +9364,7 @@ and above.")
(define-public bpftrace (define-public bpftrace
(package (package
(name "bpftrace") (name "bpftrace")
(version "0.15.0") (version "0.16.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -9299,7 +9373,7 @@ and 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 "022fg0kiz0liahj82wvlxmivkwyp86shs5fwr2v4blx7lh05k9zm")) (base32 "0v1376wfk4gy5rrjdsck6r3347nb0bgbj70998z1bkx9z95wm3ab"))
(patches (search-patches "bpftrace-disable-bfd-disasm.patch")))) (patches (search-patches "bpftrace-disable-bfd-disasm.patch"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
@ -9356,14 +9430,14 @@ receiving. It is dedicated to the PL011 UART of the Raspberry Pi.")
(define-public ipset (define-public ipset
(package (package
(name "ipset") (name "ipset")
(version "7.15") (version "7.16")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://ipset.netfilter.org/" (uri (string-append "https://ipset.netfilter.org/"
"ipset-" version ".tar.bz2")) "ipset-" version ".tar.bz2"))
(sha256 (sha256
(base32 "0l8pcaym6057hq3a4zwnk53p5y6xg1m3d3c83wn18h5nmnm4am8a")))) (base32 "1l4nybq17gr2ick7bbb5gq46bsqiw4rxmrvi0qfkvpm1yk6xkcc7"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
(list libmnl)) (list libmnl))
@ -9395,7 +9469,7 @@ then IP sets may be the proper tool for you.")
(define-public liburing (define-public liburing
(package (package
(name "liburing") (name "liburing")
(version "2.2") (version "2.3")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -9404,7 +9478,7 @@ then IP sets may be the proper tool for you.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1677zqqbd9nw9hrdaxqbd1zwy54cxfsv2z0bjipn23mrkz2xzy1k")))) "1ngg5640adlinkal8b28x5snrbab9yr8jw1w539h39k4pqnsbpmw"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(;; Tests are dependent on kernel version and features `(;; Tests are dependent on kernel version and features
@ -9468,27 +9542,37 @@ provides user-space tools for creating EROFS file systems.")
(sha256 (sha256
(base32 "0r0339mg4rc12p63iiq2kwdqn1zjakyiv014i2a2l9s8v5rjik41")))) (base32 "0r0339mg4rc12p63iiq2kwdqn1zjakyiv014i2a2l9s8v5rjik41"))))
(native-inputs (list autoconf automake libtool)) (native-inputs (list autoconf automake libtool))
(inputs (list perl sqlite)) (inputs (list perl perl-dbd-sqlite sqlite dmidecode kmod))
(arguments (arguments
`(#:configure-flags (list
(list "--enable-all" #:configure-flags
;; Don't install unused /etc/sysconfig/rasdaemon environment file. #~(list "--enable-all"
"--with-sysconfdefdir=." ;; Don't install unused /etc/sysconfig/rasdaemon environment file.
"--localstatedir=/var") "--with-sysconfdefdir=."
#:phases "--localstatedir=/var")
(modify-phases %standard-phases #:phases
(add-before 'configure 'munge-autotools #~(modify-phases %standard-phases
(lambda _ (add-before 'configure 'munge-autotools
;; For some reason upstream forces sysconfdir=/etc. This results (lambda _
;; in EPERM during the install phase. Removing the offending ;; For some reason upstream forces sysconfdir=/etc. This results
;; line lets sysconfdir correctly pick up DESTDIR. ;; in EPERM during the install phase. Removing the offending
(substitute* "configure.ac" ;; line lets sysconfdir correctly pick up DESTDIR.
(("^test .* sysconfdir=/etc\n$") "")) (substitute* "configure.ac"
;; Upstream tries to create /var/lib/rasdaemon at install time. (("^test .* sysconfdir=/etc\n$") ""))
;; This results in EPERM on guix. Instead, the service should ;; Upstream tries to create /var/lib/rasdaemon at install time.
;; create this at activation time. ;; This results in EPERM on guix. Instead, the service should
(substitute* "Makefile.am" ;; create this at activation time.
(("^\\s*\\$\\(install_sh\\) -d .*@RASSTATEDIR@.*$") ""))))))) (substitute* "Makefile.am"
(("^\\s*\\$\\(install_sh\\) -d .*@RASSTATEDIR@.*$") ""))))
(add-after 'install 'fix-dmidecode-and-modprobe
(lambda _
(substitute* (string-append #$output "/sbin/ras-mc-ctl")
(("find_prog \\(\"dmidecode\"\\).*$") (format #f "~s;~%" (string-append #$dmidecode "/sbin/dmidecode")))
(("find_prog \\(\"modprobe\"\\).*$") (format #f "~s;~%" (string-append #$kmod "/bin/modprobe"))))))
(add-after 'wrap 'wrap-rasdaemon
(lambda _
(wrap-program (string-append #$output "/sbin/ras-mc-ctl")
`("PERL5LIB" ":" prefix ,(string-split (getenv "PERL5LIB") #\:))))))))
(build-system gnu-build-system) (build-system gnu-build-system)
(home-page "https://github.com/mchehab/rasdaemon") (home-page "https://github.com/mchehab/rasdaemon")
(synopsis "Platform Reliability, Availability, and Serviceability tools") (synopsis "Platform Reliability, Availability, and Serviceability tools")

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

@ -104,6 +104,7 @@
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages python-xyz) #:use-module (gnu packages python-xyz)
#:use-module (gnu packages readline) #:use-module (gnu packages readline)
#:use-module (gnu packages rsync)
#:use-module (gnu packages sdl) #:use-module (gnu packages sdl)
#:use-module (gnu packages serialization) #:use-module (gnu packages serialization)
#:use-module (gnu packages sqlite) #:use-module (gnu packages sqlite)
@ -894,9 +895,74 @@ Features:
(define-public ecl-cl-irc (define-public ecl-cl-irc
(sbcl-package->ecl-package sbcl-cl-irc)) (sbcl-package->ecl-package sbcl-cl-irc))
(define-public sbcl-tripod (define-public sbcl-coleslaw
(let ((commit "bcea16610b4961a927e417e4413fffe686d71c83") (let ((commit "e7e68ce6020d13b14bf212890a7d8973d7af3b40")
(revision "0")) (revision "0"))
(package
(name "sbcl-coleslaw")
(version (git-version "0.9.7" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/coleslaw-org/coleslaw")
(commit commit)))
(file-name (git-file-name "cl-coleslaw" version))
(sha256
(base32 "1w21a272q4x7nlr4kbmwwvkjvb4hpnw869byvy47vv361y7pimws"))))
(build-system asdf-build-system/sbcl)
(outputs '("out" "bin"))
(arguments
'(#:asd-systems '("coleslaw" "coleslaw-cli")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-paths
(lambda _
(substitute* "plugins/publish-gh-pages.sh"
(("^rsync\\b") (which "rsync")))
(substitute* '("plugins/rsync.lisp"
"src/coleslaw.lisp")
(("\\brun-program \"rsync\\b")
(string-append "run-program \"" (which "rsync"))))))
(add-after 'create-asdf-configuration 'build-program
(lambda* (#:key outputs #:allow-other-keys)
(build-program
(string-append (assoc-ref outputs "bin") "/bin/coleslaw")
outputs
#:dependencies '("coleslaw-cli")
#:entry-program '((apply (function coleslaw-cli::main)
arguments))
#:compress? #t))))))
(native-inputs
(list sbcl-prove))
(inputs
(list rsync
sbcl-3bmd
sbcl-alexandria
sbcl-cl-fad
sbcl-cl-ppcre
sbcl-cl-unicode
sbcl-clack
sbcl-closer-mop
sbcl-closure-template
sbcl-inferior-shell
sbcl-local-time
sbcl-trivia))
(home-page "https://github.com/coleslaw-org/coleslaw")
(synopsis "Static site generator")
(description
"Coleslaw is a static site generator written in Common Lisp.")
(license license:bsd-2))))
(define-public cl-coleslaw
(sbcl-package->cl-source-package sbcl-coleslaw))
(define-public ecl-coleslaw
(sbcl-package->ecl-package sbcl-coleslaw))
(define-public sbcl-tripod
(let ((commit "b019a27cd7eb895870f84b0eb6c3edc5d7b05928")
(revision "1"))
(package (package
(name "sbcl-tripod") (name "sbcl-tripod")
(version (git-version "0.0.1" revision commit)) (version (git-version "0.0.1" revision commit))
@ -908,17 +974,30 @@ Features:
(commit commit))) (commit commit)))
(file-name (git-file-name "cl-tripod" version)) (file-name (git-file-name "cl-tripod" version))
(sha256 (sha256
(base32 "07czbwzfqg8n1q4dsfmrdp2zmp90xgsg8q26hkrniyvkylq4nn1z")))) (base32 "0y8sns6njq9x7km58vpj7gx4cia9zkcpng3d38300xk0nnk2kz8w"))))
(build-system asdf-build-system/sbcl) (build-system asdf-build-system/sbcl)
(outputs '("out" "bin"))
(arguments
(list #:phases
#~(modify-phases %standard-phases
(add-after 'create-asdf-configuration 'build-program
(lambda* (#:key outputs #:allow-other-keys)
(build-program (string-append #$output:bin "/bin/tripod")
outputs
#:entry-program '((tripod:entry-point))
#:compress? #t))))))
(inputs (inputs
(list sbcl-alexandria (list sbcl-alexandria
sbcl-cl-gopher sbcl-cl-gopher
sbcl-cl-markdown sbcl-cl-markdown
sbcl-clss sbcl-clss
sbcl-hunchentoot sbcl-hunchentoot
sbcl-phos sbcl-local-time
sbcl-plump sbcl-nactivitypub
sbcl-trivial-mimes)) sbcl-njson
sbcl-phos
sbcl-plump
sbcl-trivial-mimes))
(home-page "https://aartaka.me/blog/tripod") (home-page "https://aartaka.me/blog/tripod")
(synopsis "Common Lisp web server aiming to ease website hosting") (synopsis "Common Lisp web server aiming to ease website hosting")
(description (description
@ -932,7 +1011,6 @@ and Gopher website hosting.")
(define-public ecl-tripod (define-public ecl-tripod
(sbcl-package->ecl-package sbcl-tripod)) (sbcl-package->ecl-package sbcl-tripod))
(define-public sbcl-trivial-timeout (define-public sbcl-trivial-timeout
(let ((commit "feb869357f40f5e109570fb40abad215fb370c6c") (let ((commit "feb869357f40f5e109570fb40abad215fb370c6c")
(revision "1")) (revision "1"))
@ -1425,6 +1503,53 @@ within.")
(define-public cl-ubiquitous (define-public cl-ubiquitous
(sbcl-package->cl-source-package sbcl-ubiquitous)) (sbcl-package->cl-source-package sbcl-ubiquitous))
(define-public sbcl-uax-14
(let ((commit "0432162525119c401d3d705bb9bcc9580a03914f")
(revision "1"))
(package
(name "sbcl-uax-14")
(version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Shinmera/uax-14")
(commit commit)))
(file-name (git-file-name "uax-14" version))
(sha256
(base32 "1sb2s58k01yjaggaq8i7kbyfsh6mzyqbiz1vm59smxn9qqwd8apm"))))
(build-system asdf-build-system/sbcl)
(native-inputs
(list sbcl-parachute sbcl-cl-ppcre))
(inputs
(list sbcl-documentation-utils))
(arguments
`(#:asd-systems '("uax-14")))
(home-page "https://shinmera.github.io/uax-14/")
(synopsis "Unicode Standard Annex #14 for standardised line breaking")
(description
"This is an implementation of the Unicode Standards Annex
#14 (@url{http://www.unicode.org/reports/tr14/}) line breaking algorithm. It
provides a fast and convenient way to determine line breaking opportunities in
text.
Note that this algorithm does not support break opportunities that require
morphological analysis. In order to handle such cases, please consult a system
that provides this kind of capability, such as a hyphenation algorithm.
Also note that this system is completely unaware of layouting decisions. Any
kind of layouting decisions, such as which breaks to pick, how to space
between words, how to handle bidirectionality, and what to do in emergency
situations when there are no breaks on an overfull line are left up to the
user.")
(license license:zlib))))
(define-public ecl-uax-14
(sbcl-package->ecl-package sbcl-uax-14))
(define-public cl-uax-14
(sbcl-package->cl-source-package sbcl-uax-14))
(define-public sbcl-uax-15 (define-public sbcl-uax-15
(package (package
(name "sbcl-uax-15") (name "sbcl-uax-15")
@ -1592,7 +1717,10 @@ reading and writing.")
`(("zpb-ttf" ,sbcl-zpb-ttf))) `(("zpb-ttf" ,sbcl-zpb-ttf)))
(arguments (arguments
'(#:asd-systems '("cl-vectors" '(#:asd-systems '("cl-vectors"
"cl-paths-ttf"))) "cl-paths"
"cl-paths-ttf"
"cl-aa"
"cl-aa-misc")))
(home-page "http://projects.tuxee.net/cl-vectors/") (home-page "http://projects.tuxee.net/cl-vectors/")
(synopsis "Create, transform and render anti-aliased vectorial paths") (synopsis "Create, transform and render anti-aliased vectorial paths")
(description (description
@ -10428,6 +10556,39 @@ the library does not depend on X11).
(define-public ecl-cl-colors2 (define-public ecl-cl-colors2
(sbcl-package->ecl-package sbcl-cl-colors2)) (sbcl-package->ecl-package sbcl-cl-colors2))
(define-public sbcl-colored
(let ((commit "bee87efb0b047da0f071f5cf1457997ab5f93feb")
(revision "1"))
(package
(name "sbcl-colored")
(version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Shinmera/colored/")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "0mpg91r6yfb9xqccd4r8z3hl2qzjhdj6daswb1cinrm8ffxrvy5k"))))
(build-system asdf-build-system/sbcl)
(native-inputs
(list sbcl-parachute))
(inputs
(list sbcl-documentation-utils))
(synopsis "Colour representation, conversion, and operation for Common Lisp")
(description
"This is a library for representing and mapping colours between their
various spaces.")
(home-page "https://shinmera.github.io/colored/")
(license license:zlib))))
(define-public cl-colored
(sbcl-package->cl-source-package sbcl-colored))
(define-public ecl-colored
(sbcl-package->ecl-package sbcl-colored))
(define-public sbcl-cl-jpeg (define-public sbcl-cl-jpeg
(let ((commit "ec557038128df6895fbfb743bfe8faf8ec2534af") (let ((commit "ec557038128df6895fbfb743bfe8faf8ec2534af")
(revision "1")) (revision "1"))
@ -10678,8 +10839,8 @@ performance and correctness.")
(sbcl-package->ecl-package sbcl-png-read)) (sbcl-package->ecl-package sbcl-png-read))
(define-public sbcl-3b-bmfont (define-public sbcl-3b-bmfont
(let ((commit "d1b5bec0de580c2d08ec947a93c56b1400f2a37a") (let ((commit "48a38f52d282064829851c484d9e7dee0ffe9e72")
(revision "1")) (revision "2"))
(package (package
(name "sbcl-3b-bmfont") (name "sbcl-3b-bmfont")
(version (git-version "0.0.1" revision commit)) (version (git-version "0.0.1" revision commit))
@ -10691,7 +10852,7 @@ performance and correctness.")
(commit commit))) (commit commit)))
(file-name (git-file-name "3b-bmfont" version)) (file-name (git-file-name "3b-bmfont" version))
(sha256 (sha256
(base32 "12sgf7m0h6fqzhvkas7vmci6mprj3j3fnz778jlbqbsydln6v2yc")))) (base32 "0v4lcrlpx60ayg0g5b10q2hjh1iaanln4ck0hm1rvjxm39gl2d86"))))
(build-system asdf-build-system/sbcl) (build-system asdf-build-system/sbcl)
(arguments (arguments
`(#:asd-systems `(#:asd-systems
@ -10719,6 +10880,63 @@ read/write Bit Map Font (BMF) into text, JSON and XML.")
(define-public cl-3b-bmfont (define-public cl-3b-bmfont
(sbcl-package->cl-source-package sbcl-3b-bmfont)) (sbcl-package->cl-source-package sbcl-3b-bmfont))
(define sbcl-3b-bmfont/shinmera
(let ((commit "58e529d24b7799d56b4b3f9c8a953b585d42c7d2")
(revision "1"))
(package (inherit sbcl-3b-bmfont)
(version (git-version "0.0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Shinmera/3b-bmfont/")
(commit commit)))
(file-name (git-file-name "3b-bmfont2" version))
(sha256
(base32 "17zby669b64rhxhk2szamzdgvispimh6ici05xa6x2vz4rvk71jq")))))))
(define-public sbcl-sdf
;; Shinmera's fork required for Alloy.
(let ((commit "e1ab3ac4ea52c0e0119b832f428c71f580b4d83b")
(revision "1"))
(package
(name "sbcl-sdf")
(version (git-version "0.0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Shinmera/sdf")
(commit commit)))
(file-name (git-file-name "sdf" version))
(sha256
(base32 "1cyq4hkgiw9mnb87ah6xw19cybfs9hfbjvg1ch2mf4cr0ism0nvn"))))
(build-system asdf-build-system/sbcl)
(inputs
(list sbcl-zpb-ttf
sbcl-cl-vectors
sbcl-opticl
sbcl-binpack
sbcl-3b-bmfont/shinmera
sbcl-pathname-utils))
(arguments
`(#:asd-systems '("sdf" "sdf/bmfont")))
(home-page "https://github.com/Shinmera/sdf")
(synopsis "Signed distance font atlas generator")
(description
"This library generates
sdf (@url{https://steamcdn-a.akamaihd.net/apps/valve/2007/SIGGRAPH2007_AlphaTestedMagnification.pdf}),
psdf and
msdf (@url{https://github.com/Chlumsky/msdfgen/files/3050967/thesis.pdf})
atlases.")
(license license:expat))))
(define-public ecl-sdf
(sbcl-package->ecl-package sbcl-sdf))
(define-public cl-sdf
(sbcl-package->cl-source-package sbcl-sdf))
(define-public sbcl-zpng (define-public sbcl-zpng
(package (package
(name "sbcl-zpng") (name "sbcl-zpng")
@ -16732,8 +16950,8 @@ protocol for Mastodon.")
(sbcl-package->cl-source-package sbcl-tooter)) (sbcl-package->cl-source-package sbcl-tooter))
(define-public sbcl-croatoan (define-public sbcl-croatoan
(let ((commit "5d0949d57a12e7fece8828e089daa339b260da96") (let ((commit "35c92fcc6c4458339c7e27bdf16f7fa908d95eb8")
(revision "5")) (revision "6"))
(package (package
(name "sbcl-croatoan") (name "sbcl-croatoan")
(version (git-version "0.0.1" revision commit)) (version (git-version "0.0.1" revision commit))
@ -16745,7 +16963,7 @@ protocol for Mastodon.")
(commit commit))) (commit commit)))
(file-name (git-file-name "cl-croatoan" version)) (file-name (git-file-name "cl-croatoan" version))
(sha256 (sha256
(base32 "0qsnz10hri95al73vhpqrs7mapz2px0dbwgfn52sbi93gwk5aki9")))) (base32 "0v1lrdjd29krjb6pr0mql9hjj5c2lv760xwpr17dbsw263vx29xz"))))
(build-system asdf-build-system/sbcl) (build-system asdf-build-system/sbcl)
(arguments (arguments
'(#:phases '(#:phases
@ -16871,11 +17089,11 @@ dynamically.")
(sbcl-package->cl-source-package sbcl-sxql-composer)) (sbcl-package->cl-source-package sbcl-sxql-composer))
(define-public sbcl-cl-i18n (define-public sbcl-cl-i18n
(let ((commit "5b569f3fe4c76d600fafecac507ac4f50e4cc1d1") (let ((commit "66b02dc2cff3ab97f924329aaf965807fe18aa20")
(revision "1")) (revision "2"))
(package (package
(name "sbcl-cl-i18n") (name "sbcl-cl-i18n")
(version (git-version "0.5.2" revision commit)) (version (git-version "0.5.3" revision commit))
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -16884,7 +17102,7 @@ dynamically.")
(commit commit))) (commit commit)))
(file-name (git-file-name "cl-i18n" version)) (file-name (git-file-name "cl-i18n" version))
(sha256 (sha256
(base32 "0kj1wfvlbi7qwq61b0rcdxa0bmb4sfsnh1bj3n5jxp24sdib73w2")))) (base32 "06ij1wxancsym87gg63nvjh7vfzjipi1f02h4fb2ypip60vw06lc"))))
(build-system asdf-build-system/sbcl) (build-system asdf-build-system/sbcl)
(inputs (inputs
(list sbcl-alexandria sbcl-babel sbcl-cl-ppcre-unicode)) (list sbcl-alexandria sbcl-babel sbcl-cl-ppcre-unicode))
@ -17456,6 +17674,38 @@ compiled foreign library collection.")
(define-public cl-conspack (define-public cl-conspack
(sbcl-package->cl-source-package sbcl-cl-conspack)) (sbcl-package->cl-source-package sbcl-cl-conspack))
(define-public sbcl-binpack
(let ((commit "e67f56bb697bdeac81e28e1cca4a5d117a9cf125")
(revision "1"))
(package
(name "sbcl-binpack")
(version (git-version "0.0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/lispgames/binpack")
(commit commit)))
(file-name (git-file-name "binpack" version))
(sha256
(base32 "1pcnsg60pqywd3k72m5pwimq01sm3jyvc1c3rbkij740r7grdxi1"))))
(build-system asdf-build-system/sbcl)
(native-inputs
(list sbcl-parachute))
(inputs
(list sbcl-alexandria))
(home-page "https://github.com/lispgames/binpack")
(synopsis "Common Lisp rectangle packer for sprite/texture atlases")
(description
"This library features a rectangle packer for sprite and texture atlases.")
(license license:expat))))
(define-public ecl-binpack
(sbcl-package->ecl-package sbcl-binpack))
(define-public cl-binpack
(sbcl-package->cl-source-package sbcl-binpack))
(define-public sbcl-cl-opengl (define-public sbcl-cl-opengl
(let ((commit "e2d83e0977b7e7ac3f3d348d8ccc7ccd04e74d59") (let ((commit "e2d83e0977b7e7ac3f3d348d8ccc7ccd04e74d59")
(revision "1")) (revision "1"))
@ -19979,9 +20229,41 @@ developing library for Common Lisp.")
(define-public cl-liballegro (define-public cl-liballegro
(sbcl-package->cl-source-package sbcl-cl-liballegro)) (sbcl-package->cl-source-package sbcl-cl-liballegro))
(define-public sbcl-alloy (define-public sbcl-font-discovery
(let ((commit "e86e22c2887836ec31cd97e039f0bca5248d8f1c") (let ((commit "5101ca79151055f3ec9839aae73b8af42b884528")
(revision "1")) (revision "1"))
(package
(name "sbcl-font-discovery")
(version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Shinmera/font-discovery")
(commit commit)))
(file-name (git-file-name "font-discovery" version))
(sha256
(base32 "1p9wkwc23rnif8vcjaj5ih1fmr5g57sidqjlz08qw6k0z4f6bia1"))))
(build-system asdf-build-system/sbcl)
(inputs
(list sbcl-cffi sbcl-documentation-utils sbcl-trivial-indent))
(home-page "https://shinmera.github.io/font-discovery/")
(synopsis "Find system font files matching a font spec")
(description
"This is a library to find system font files. It works on systems with
FontConfig on Linux, BSD. It does not have any foreign dependencies that
aren't already directly available on the system.")
(license license:zlib))))
(define-public ecl-font-discovery
(sbcl-package->ecl-package sbcl-font-discovery))
(define-public cl-font-discovery
(sbcl-package->cl-source-package sbcl-font-discovery))
(define-public sbcl-alloy
(let ((commit "ea02e4576fd92917201b3c9b63dd3cdc72045dbf")
(revision "2"))
(package (package
(name "sbcl-alloy") (name "sbcl-alloy")
(version (git-version "0.0.0" revision commit)) (version (git-version "0.0.0" revision commit))
@ -19993,12 +20275,25 @@ developing library for Common Lisp.")
(commit commit))) (commit commit)))
(file-name (git-file-name "alloy" version)) (file-name (git-file-name "alloy" version))
(sha256 (sha256
(base32 "1jsqjr6sf86hcdvnjp4gd10qv0r7kfkr9hmda85irb5lha4q9n7w")))) (base32 "1g8ibvlajhlbdrmny7ck55ilv1shjdpj38q380wri4mavfymjw5f"))))
(build-system asdf-build-system/sbcl) (build-system asdf-build-system/sbcl)
(native-inputs (native-inputs
(list sbcl-alexandria sbcl-parachute)) (list sbcl-alexandria sbcl-parachute))
(inputs (inputs
(list sbcl-array-utils sbcl-closer-mop sbcl-documentation-utils)) (list sbcl-array-utils sbcl-closer-mop sbcl-documentation-utils
sbcl-float-features sbcl-colored sbcl-stealth-mixin
sbcl-cl-opengl sbcl-font-discovery sbcl-uax-14 sbcl-sdf))
(arguments
;; Dismiss alloy-svg, since it is not completed:
;; https://github.com/Shirakumo/alloy/issues/24
'(#:asd-systems '("alloy"
"alloy-windowing"
"alloy-animation"
"alloy-simple"
"alloy-simple-presentations"
"alloy-opengl"
"alloy-opengl-msdf"
"alloy-opengl-png")))
(home-page "https://shirakumo.github.io/alloy/") (home-page "https://shirakumo.github.io/alloy/")
(synopsis (synopsis
"Common Lisp user interface protocol and toolkit implementation") "Common Lisp user interface protocol and toolkit implementation")
@ -23039,6 +23334,50 @@ Lisp. A subsystem offers an experimental GUI Gemini client.")
(define-public ecl-phos (define-public ecl-phos
(sbcl-package->ecl-package sbcl-phos)) (sbcl-package->ecl-package sbcl-phos))
(define-public sbcl-germinal
(let ((commit "5bfb371ea57dae8985c0e1c6f184f0338487d684")
(revision "0"))
(package
(name "sbcl-germinal")
(version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://git.carcosa.net/jmcbray/germinal")
(commit commit)))
(file-name (git-file-name "cl-germinal" version))
(sha256
(base32 "12jypa8m10825lp5yxfcm1fyk3r4ziwcri7ndxa0m5dz0y7hggck"))))
(build-system asdf-build-system/sbcl)
(inputs
(list sbcl-alexandria
sbcl-babel
sbcl-bordeaux-threads
sbcl-cl+ssl
sbcl-cl-fad
sbcl-cl-interpol
sbcl-cl-ppcre
sbcl-cl-str
sbcl-local-time
sbcl-osicat
sbcl-ppath
sbcl-quri
sbcl-trivial-mimes
sbcl-uax-15
sbcl-usocket))
(home-page "https://git.carcosa.net/jmcbray/germinal")
(synopsis "Gemini protocol server")
(description "Germinal is a server for the Gemini protocol, written in
Common Lisp.")
(license license:agpl3))))
(define-public cl-germinal
(sbcl-package->cl-source-package sbcl-germinal))
(define-public ecl-germinal
(sbcl-package->ecl-package sbcl-germinal))
(define-public sbcl-css-lite (define-public sbcl-css-lite
(let ((commit "6ee4e6212ed56943d665df163d2a834b122e6273") (let ((commit "6ee4e6212ed56943d665df163d2a834b122e6273")
(revision "0")) (revision "0"))
@ -26047,8 +26386,25 @@ Zombie Raptor game engine project.")
(sha256 (sha256
(base32 "146mwshynhdw82m2nxrcjvf1nk0z3fn6ywcd2vqxkly5qricc53w")))) (base32 "146mwshynhdw82m2nxrcjvf1nk0z3fn6ywcd2vqxkly5qricc53w"))))
(build-system asdf-build-system/sbcl) (build-system asdf-build-system/sbcl)
(outputs '("out" "bin"))
(arguments (arguments
'(#:asd-systems '("charje.triads"))) '(#:asd-systems '("charje.triads")
#:phases
(modify-phases %standard-phases
(add-after 'create-asdf-configuration 'build-binary
(lambda* (#:key outputs #:allow-other-keys)
(setenv "HOME" (getcwd))
(invoke
"sbcl" "--eval" "(require :asdf)" "--eval"
(format
#f "~S"
`(progn
(require "charje.triads"
,(string-append (getcwd) "/charje.triads.asd"))
(asdf:make "charje.triads"))))
(install-file
(string-append (getcwd) "/triads")
(string-append (assoc-ref outputs "bin") "/bin")))))))
(inputs (inputs
(list sbcl-cl-str (list sbcl-cl-str
sbcl-serapeum sbcl-serapeum
@ -26065,7 +26421,15 @@ roman numeral given in the key.")
(sbcl-package->cl-source-package sbcl-triads)) (sbcl-package->cl-source-package sbcl-triads))
(define-public ecl-triads (define-public ecl-triads
(sbcl-package->ecl-package sbcl-triads)) (let ((ecl-package (sbcl-package->ecl-package sbcl-triads)))
(package
(inherit ecl-package)
(outputs '("out"))
(arguments
(substitute-keyword-arguments (package-arguments ecl-package)
((#:phases phases)
`(modify-phases ,phases
(delete 'build-binary))))))))
(define-public sbcl-closure-template (define-public sbcl-closure-template
;; There are no releases since 2015. ;; There are no releases since 2015.

136
gnu/packages/machine-learning.scm
View file

@ -1552,35 +1552,39 @@ interactive learning.")
(define-public python-hyperopt (define-public python-hyperopt
(package (package
(name "python-hyperopt") (name "python-hyperopt")
(version "0.2.5") (version "0.2.7")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "hyperopt" version)) (uri (pypi-uri "hyperopt" version))
(sha256 (sha256
(base32 "1k4ma8ci0bxghw7g4ms944zak1pi83yv2d6bxd7fcslm1zalfq5w")))) (base32 "0jd1ghmm423kbhjvd6pxq92y5vkz25390687fcnd7fshh3jrmy0v"))))
(build-system python-build-system) (build-system pyproject-build-system)
(arguments (arguments
`(#:phases (list
(modify-phases %standard-phases #:phases
'(modify-phases %standard-phases
(replace 'check (replace 'check
(lambda* (#:key inputs outputs tests? #:allow-other-keys) (lambda* (#:key tests? #:allow-other-keys)
(when tests? (when tests?
(add-installed-pythonpath inputs outputs) (invoke "python" "-m" "pytest"
(invoke "python" "-m" "pytest" "--ignore"
;; Needs python-pyspark. ;; Needs python-pyspark.
"hyperopt/tests/test_spark.py" "--ignore" "hyperopt/tests/integration/test_spark.py"
;; Needs both python-scikit-learn and python-lightgbm. ;; Needs both python-scikit-learn and python-lightgbm.
"--ignore" "hyperopt/tests/test_atpe_basic.py" "--ignore" "hyperopt/tests/unit/test_atpe_basic.py"
;; The tests below need python-lightgbm. ;; The tests below need python-lightgbm.
"-k" (string-append "not test_branin" "-k"
" and not test_distractor" (string-append "not test_branin"
" and not test_q1lognormal" " and not test_distractor"
" and not test_quadratic1" " and not test_q1lognormal"
" and not test_twoarms")))))))) " and not test_quadratic1"
" and not test_twoarms"
;; XXX Type error with this version of scipy
" and not test_distribution_rvs"))))))))
(propagated-inputs (propagated-inputs
(list python-cloudpickle (list python-cloudpickle
python-future python-future
python-py4j
python-networkx python-networkx
python-numpy python-numpy
python-scipy python-scipy
@ -1588,8 +1592,6 @@ interactive learning.")
python-tqdm)) python-tqdm))
(native-inputs (native-inputs
(list python-black (list python-black
python-ipython
python-ipyparallel
python-nose python-nose
python-pymongo python-pymongo
python-pytest)) python-pytest))
@ -1602,8 +1604,8 @@ discrete, and conditional dimensions.")
;; There have been no proper releases yet. ;; There have been no proper releases yet.
(define-public kaldi (define-public kaldi
(let ((commit "dd107fd594ac58af962031c1689abfdc10f84452") (let ((commit "be22248e3a166d9ec52c78dac945f471e7c3a8aa")
(revision "0") (revision "1")
(openfst openfst-1.7.3)) ;; Temporary bypass for upstream issues (openfst openfst-1.7.3)) ;; Temporary bypass for upstream issues
(package (package
(name "kaldi") (name "kaldi")
@ -1616,14 +1618,14 @@ discrete, and conditional dimensions.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0iqbzgn7gzmgwvjfzifpbwwidxx887qmlgmsjkg7b1yzyfv00l21")))) "1wkxz3p0h68mxbg41i1wygir2r4rraxbb4672xkkvvs85r6c8r8i"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:test-target "test" `(#:test-target "test"
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'chdir (add-after 'unpack 'chdir
(lambda _ (chdir "src") #t)) (lambda _ (chdir "src")))
(replace 'configure (replace 'configure
(lambda* (#:key build system inputs outputs #:allow-other-keys) (lambda* (#:key build system inputs outputs #:allow-other-keys)
(when (not (or (string-prefix? "x86_64" system) (when (not (or (string-prefix? "x86_64" system)
@ -1669,8 +1671,7 @@ discrete, and conditional dimensions.")
(invoke "make" "-C" "onlinebin" "depend") (invoke "make" "-C" "onlinebin" "depend")
(invoke "make" "-C" "onlinebin") (invoke "make" "-C" "onlinebin")
(invoke "make" "-C" "gst-plugin" "depend") (invoke "make" "-C" "gst-plugin" "depend")
(invoke "make" "-C" "gst-plugin") (invoke "make" "-C" "gst-plugin")))
#t))
;; TODO: also install the executables. ;; TODO: also install the executables.
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
@ -1691,8 +1692,7 @@ discrete, and conditional dimensions.")
(install-file file target-dir))) (install-file file target-dir)))
(find-files "." "\\.h")) (find-files "." "\\.h"))
(install-file "gst-plugin/libgstonlinegmmdecodefaster.so" (install-file "gst-plugin/libgstonlinegmmdecodefaster.so"
(string-append lib "/gstreamer-1.0")) (string-append lib "/gstreamer-1.0"))))))))
#t))))))
(inputs (inputs
(list alsa-lib (list alsa-lib
`(,gfortran "lib") `(,gfortran "lib")
@ -1814,8 +1814,8 @@ written in C++.")
(find-files "." "\\.h"))))))))))) (find-files "." "\\.h")))))))))))
(define-public gst-kaldi-nnet2-online (define-public gst-kaldi-nnet2-online
(let ((commit "cb227ef43b66a9835c14eb0ad39e08ee03c210ad") (let ((commit "7888ae562a65bd7e406783ce2c33535bc66a30ef")
(revision "2")) (revision "3"))
(package (package
(name "gst-kaldi-nnet2-online") (name "gst-kaldi-nnet2-online")
(version (git-version "0" revision commit)) (version (git-version "0" revision commit))
@ -1827,12 +1827,13 @@ written in C++.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1i6ffwiavxx07ri0lxix6s8q0r31x7i4xxvhys5jxkixf5q34w8g")))) "0xp59a6lmx1y24i8bkmxcm27lhm5x5m6y41670yjzhamcbnx8jcr"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; there are none (list
#:make-flags #:tests? #f ; there are none
(list (string-append "SHELL=" #:make-flags
'(list (string-append "SHELL="
(assoc-ref %build-inputs "bash") "/bin/bash") (assoc-ref %build-inputs "bash") "/bin/bash")
(string-append "KALDI_ROOT=" (string-append "KALDI_ROOT="
(assoc-ref %build-inputs "kaldi-src")) (assoc-ref %build-inputs "kaldi-src"))
@ -1840,33 +1841,32 @@ written in C++.")
(assoc-ref %build-inputs "kaldi") "/lib") (assoc-ref %build-inputs "kaldi") "/lib")
"KALDI_FLAVOR=dynamic") "KALDI_FLAVOR=dynamic")
#:phases #:phases
(modify-phases %standard-phases '(modify-phases %standard-phases
(add-after 'unpack 'chdir (add-after 'unpack 'chdir
(lambda _ (chdir "src") #t)) (lambda _ (chdir "src")))
(replace 'configure (replace 'configure
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((glib (assoc-ref inputs "glib"))) (let ((glib (assoc-ref inputs "glib")))
(setenv "CXXFLAGS" "-fPIC") (setenv "CXXFLAGS" "-fPIC")
(setenv "CPLUS_INCLUDE_PATH" (setenv "CPLUS_INCLUDE_PATH"
(string-append glib "/include/glib-2.0:" (string-append glib "/include/glib-2.0:"
glib "/lib/glib-2.0/include:" glib "/lib/glib-2.0/include:"
(assoc-ref inputs "gstreamer") (assoc-ref inputs "gstreamer")
"/include/gstreamer-1.0"))) "/include/gstreamer-1.0:"
(substitute* "Makefile" (getenv "CPLUS_INCLUDE_PATH"))))
(("include \\$\\(KALDI_ROOT\\)/src/kaldi.mk") "") (substitute* "Makefile"
(("\\$\\(error Cannot find") "#")) (("include \\$\\(KALDI_ROOT\\)/src/kaldi.mk") "")
#t)) (("\\$\\(error Cannot find") "#"))))
(add-before 'build 'build-depend (add-before 'build 'build-depend
(lambda* (#:key make-flags #:allow-other-keys) (lambda* (#:key make-flags #:allow-other-keys)
(apply invoke "make" "depend" make-flags))) (apply invoke "make" "depend" make-flags)))
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(lib (string-append out "/lib/gstreamer-1.0"))) (lib (string-append out "/lib/gstreamer-1.0")))
(install-file "libgstkaldinnet2onlinedecoder.so" lib) (install-file "libgstkaldinnet2onlinedecoder.so" lib)))))))
#t))))))
(inputs (inputs
(list glib gstreamer jansson openfst kaldi)) (list glib gstreamer jansson openfst-1.7.3 kaldi))
(native-inputs (native-inputs
`(("bash" ,bash) `(("bash" ,bash)
("glib:bin" ,glib "bin") ; glib-genmarshal ("glib:bin" ,glib "bin") ; glib-genmarshal
@ -1882,8 +1882,8 @@ automatically.")
(define-public kaldi-gstreamer-server (define-public kaldi-gstreamer-server
;; This is the tip of the py3 branch ;; This is the tip of the py3 branch
(let ((commit "f68cab490be7eb0da2af1475fbc16655f50a60cb") (let ((commit "f79e204d751a5964918001822e4520fa2acfd246")
(revision "2")) (revision "3"))
(package (package
(name "kaldi-gstreamer-server") (name "kaldi-gstreamer-server")
(version (git-version "0" revision commit)) (version (git-version "0" revision commit))
@ -1895,7 +1895,7 @@ automatically.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"17lh1368vkg8ngrcbn2phvigzlmalrqg6djx2gg61qq1a0nj87dm")))) "1iijq8jmgdxr7961inal1ggs496ymxradm51m4sqx8vl983x14y8"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; there are no tests that can be run automatically `(#:tests? #f ; there are no tests that can be run automatically
@ -1925,8 +1925,7 @@ automatically.")
"-m" "compileall" "-m" "compileall"
"-f" ; force rebuild "-f" ; force rebuild
,file))) ,file)))
(find-files "." "\\.py$"))) (find-files "." "\\.py$")))))
#t))
(replace 'install (replace 'install
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
@ -1965,14 +1964,13 @@ exec ~a ~a/~a \"$@\"~%"
(list server client worker) (list server client worker)
(list "master_server.py" (list "master_server.py"
"client.py" "client.py"
"worker.py"))) "worker.py")))))))))
#t))))))
(inputs (inputs
`(("gst-kaldi-nnet2-online" ,gst-kaldi-nnet2-online) (list gst-kaldi-nnet2-online
("python" ,python-wrapper) python-wrapper
("python-pygobject" ,python-pygobject) python-pygobject
("python-pyyaml" ,python-pyyaml) python-pyyaml
("python-tornado" ,python-tornado-6))) python-tornado-6))
(home-page "https://github.com/alumae/kaldi-gstreamer-server") (home-page "https://github.com/alumae/kaldi-gstreamer-server")
(synopsis "Real-time full-duplex speech recognition server") (synopsis "Real-time full-duplex speech recognition server")
(description "This is a real-time full-duplex speech recognition server, (description "This is a real-time full-duplex speech recognition server,

81
gnu/packages/mail.scm
View file

@ -1164,7 +1164,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.")
(define-public mu (define-public mu
(package (package
(name "mu") (name "mu")
(version "1.8.11") (version "1.8.13")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -1173,7 +1173,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0b5h5kdalv62z31aqyipymiqhazfssbx4c7ww96nn41a0l0g0ir0")))) "0y4f5p7pwmaj8733rjzg29038dw33057qlsbsq2wapvp24wcjymr"))))
(build-system meson-build-system) (build-system meson-build-system)
(native-inputs (native-inputs
(list pkg-config (list pkg-config
@ -2566,13 +2566,13 @@ maintained.")
(define-public khard (define-public khard
(package (package
(name "khard") (name "khard")
(version "0.17.0") (version "0.18.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri name version)) (uri (pypi-uri name version))
(sha256 (sha256
(base32 (base32
"062nv4xkfsjc11k9m52dh6xjn9z68a4a6x1s8z05wwv4jbp1lkhn")))) "05860fdayqap128l7i6bcmi9kdyi2gx02g2pmh88d56xgysd927y"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -2581,8 +2581,7 @@ maintained.")
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(zsh (string-append out "/share/zsh/site-functions"))) (zsh (string-append out "/share/zsh/site-functions")))
(copy-recursively "misc/zsh" zsh) (copy-recursively "misc/zsh" zsh)))))))
#t))))))
(native-inputs (native-inputs
(list python-setuptools-scm)) (list python-setuptools-scm))
(inputs (inputs
@ -3294,7 +3293,7 @@ writing OpenSMTPd filters.")
(define-public opensmtpd-filter-dkimsign (define-public opensmtpd-filter-dkimsign
(package (package
(name "opensmtpd-filter-dkimsign") (name "opensmtpd-filter-dkimsign")
(version "0.5") (version "0.6")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -3303,7 +3302,7 @@ writing OpenSMTPd filters.")
(string-append "https://distfiles.sigtrap.nl/" (string-append "https://distfiles.sigtrap.nl/"
"filter-dkimsign-" version ".tar.gz"))) "filter-dkimsign-" version ".tar.gz")))
(sha256 (sha256
(base32 "0jwp47ixibnz8rghn193bk2hxh1j1zfrnidml18j7d7cylxfrd55")))) (base32 "1hrn31hayr0hb32km5c42hhbaxw7g3jcgm59p0v0ydlj1fs0sprv"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:make-flags `(#:make-flags
@ -3324,8 +3323,8 @@ writing OpenSMTPd filters.")
(list mandoc)) ; silently installs empty man page without (list mandoc)) ; silently installs empty man page without
(inputs (inputs
(list libevent libopensmtpd (list libevent libopensmtpd
;; XXX Our OpenSMTPd package uses libressl, but this package currently ;; Our OpenSMTPd package uses libressl, but this package currently
;; supports HAVE_ED25519 only with openssl. Switch back when possible. ;; supports HAVE_ED25519 only with openssl.
openssl)) openssl))
(home-page "http://imperialat.at/dev/filter-dkimsign/") (home-page "http://imperialat.at/dev/filter-dkimsign/")
(synopsis "OpenSMTPd filter for signing mail with DKIM") (synopsis "OpenSMTPd filter for signing mail with DKIM")
@ -4027,11 +4026,11 @@ It is a replacement for the @command{urlview} program.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public mumi (define-public mumi
(let ((commit "4590e4822dda792f59f69b764824aa148d92dad0") (let ((commit "0a90eeda9b5e12a2f83e3917c46fa539f308d0c8")
(revision "2")) (revision "2"))
(package (package
(name "mumi") (name "mumi")
(version (git-version "0.0.2" revision commit)) (version (git-version "0.0.4" revision commit))
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -4040,33 +4039,38 @@ It is a replacement for the @command{urlview} program.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"16brl1dk92kppzvxx8q5hcqiywg863s4sz5wb64hz8a37xa4hkyr")))) "1yxi1vvygrk8qd0mqh65qh1g99r5d4rlymj8amcn80ggi3z32byk"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:modules ((guix build gnu-build-system) (list
#:modules '((guix build gnu-build-system)
((guix build guile-build-system) ((guix build guile-build-system)
#:select (target-guile-effective-version)) #:select (target-guile-effective-version))
(guix build utils)) (guix build utils))
#:imported-modules ((guix build guile-build-system) #:imported-modules `((guix build guile-build-system)
,@%gnu-build-system-modules) ,@%gnu-build-system-modules)
#:configure-flags '("--localstatedir=/var") #:configure-flags '(list "--localstatedir=/var")
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'install 'wrap-executable (add-after 'unpack 'install-picocss
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let ((pico (dirname (search-input-file inputs "/scss/pico.scss"))))
(bin (string-append out "/bin")) (mkdir-p "assets/pico/scss")
(version (target-guile-effective-version)) (copy-recursively pico "assets/pico/scss"))))
(scm (string-append out "/share/guile/site/" version)) (add-after 'install 'wrap-executable
(go (string-append out "/lib/guile/" version (lambda _
"/site-ccache"))) (let* ((bin (string-append #$output "/bin"))
(wrap-program (string-append bin "/mumi") (version (target-guile-effective-version))
`("GUILE_LOAD_PATH" ":" prefix (scm (string-append #$output "/share/guile/site/" version))
(,scm ,(getenv "GUILE_LOAD_PATH"))) (go (string-append #$output "/lib/guile/" version
`("GUILE_LOAD_COMPILED_PATH" ":" prefix "/site-ccache")))
(,go ,(getenv "GUILE_LOAD_COMPILED_PATH")))))))))) (wrap-program (string-append bin "/mumi")
`("GUILE_LOAD_PATH" ":" prefix
(,scm ,(getenv "GUILE_LOAD_PATH")))
`("GUILE_LOAD_COMPILED_PATH" ":" prefix
(,go ,(getenv "GUILE_LOAD_COMPILED_PATH"))))))))))
(inputs (inputs
(list guile-email-latest (list guile-email-latest
guile-fibers guile-fibers
@ -4080,7 +4084,16 @@ It is a replacement for the @command{urlview} program.")
guile-3.0 guile-3.0
mailutils)) mailutils))
(native-inputs (native-inputs
(list autoconf automake pkg-config)) (list autoconf automake pkg-config sassc
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/picocss/pico.git")
(commit "3052db4bd3439e236479dc0f98069f7d3b559486")))
(file-name (git-file-name "pico" "1.5.6"))
(sha256
(base32
"1gs1li48hqizx7lc4n2fdxn9i2v4vafkqpza7svvfpcamfz29jpi")))))
(home-page "https://git.elephly.net/software/mumi.git") (home-page "https://git.elephly.net/software/mumi.git")
(synopsis "Debbugs web interface") (synopsis "Debbugs web interface")
(description "Mumi is a Debbugs web interface.") (description "Mumi is a Debbugs web interface.")
@ -4471,7 +4484,7 @@ on RFC 3501 and original @code{imaplib} module.")
(define-public rspamd (define-public rspamd
(package (package
(name "rspamd") (name "rspamd")
(version "3.2") (version "3.4")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -4479,7 +4492,7 @@ on RFC 3501 and original @code{imaplib} module.")
(url "https://github.com/rspamd/rspamd") (url "https://github.com/rspamd/rspamd")
(commit version))) (commit version)))
(sha256 (sha256
(base32 "122d5m1nfxxz93bhsk8lm4dazvdknzphb0a1188m7bsa4iynbfv2")) (base32 "0jgmi8wqzsnwvfj6w4njzhxhcawbafsdxjkx1ym8r2jx8k4hwhi8"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments

5
gnu/packages/man.scm
View file

@ -270,7 +270,7 @@ PostScript, and PDF. Additional tools include the @command{man} viewer, and
(define-public man-pages (define-public man-pages
(package (package
(name "man-pages") (name "man-pages")
(version "6.00") (version "6.01")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -280,7 +280,7 @@ PostScript, and PDF. Additional tools include the @command{man} viewer, and
(string-append "mirror://kernel.org/linux/docs/man-pages/Archive/" (string-append "mirror://kernel.org/linux/docs/man-pages/Archive/"
"man-pages-" version ".tar.xz"))) "man-pages-" version ".tar.xz")))
(sha256 (sha256
(base32 "1252c1356z5spya3yl0lcmmymglx3bmfwmamiz1y5l13xqpwbnwy")))) (base32 "02swrdim3wq4ppsfv0zdxbnn9apz0bb4fyaihjlq1i484xxigrcb"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list (list
@ -316,6 +316,7 @@ Linux kernel and C library interfaces employed by user-space programs.")
(define-public man-pages-posix (define-public man-pages-posix
(package (package
(name "man-pages-posix") (name "man-pages-posix")
;; Make sure that updates are still legally distributable. 2017-a is not.
(version "2013-a") (version "2013-a")
(source (source
(origin (origin

4
gnu/packages/mastodon.scm
View file

@ -42,13 +42,13 @@
(define-public toot (define-public toot
(package (package
(name "toot") (name "toot")
(version "0.30.1") (version "0.32.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "toot" version)) (uri (pypi-uri "toot" version))
(sha256 (sha256
(base32 "0r9f2frlwfxkcv6c9lh36maph90v2yp6s7phynbrb3m7v35xzaxz")))) (base32 "0diskgvqmnkjl4k6sdda8f1sfz0c4w0j8ppv1q7p84phh9vgml6g"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
'(#:phases '(#:phases

180
gnu/packages/maths.scm
View file

@ -58,6 +58,7 @@
;;; Copyright © 2022 Liliana Marie Prikler <liliana.prikler@gmail.com> ;;; Copyright © 2022 Liliana Marie Prikler <liliana.prikler@gmail.com>
;;; Copyright © 2022 Maximilian Heisinger <mail@maxheisinger.at> ;;; Copyright © 2022 Maximilian Heisinger <mail@maxheisinger.at>
;;; Copyright © 2022 Akira Kyle <akira@akirakyle.com> ;;; Copyright © 2022 Akira Kyle <akira@akirakyle.com>
;;; Copyright © 2022 Roman Scherer <roman.scherer@burningswell.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -93,6 +94,7 @@
#:use-module (guix build-system ocaml) #:use-module (guix build-system ocaml)
#:use-module (guix build-system perl) #:use-module (guix build-system perl)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module (guix build-system pyproject)
#:use-module (guix build-system ruby) #:use-module (guix build-system ruby)
#:use-module (gnu packages algebra) #:use-module (gnu packages algebra)
#:use-module (gnu packages audio) #:use-module (gnu packages audio)
@ -127,6 +129,7 @@
#:use-module (gnu packages image) #:use-module (gnu packages image)
#:use-module (gnu packages java) #:use-module (gnu packages java)
#:use-module (gnu packages less) #:use-module (gnu packages less)
#:use-module (gnu packages libffi)
#: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 llvm)
@ -1850,16 +1853,16 @@ similar to MATLAB, GNU Octave or SciPy.")
(define-public netcdf (define-public netcdf
(package (package
(name "netcdf") (name "netcdf")
(version "4.7.4") (version "4.9.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"https://www.unidata.ucar.edu/downloads/netcdf/ftp/" "https://downloads.unidata.ucar.edu/netcdf-c/" version
"netcdf-c-" version ".tar.gz")) "/netcdf-c-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1a2fpp15a2rl1m50gcvvzd9y6bavl6vjf9zzf63sz5gdmq06yiqf")) "0j8b814mjdqvqanzmrxpq8hn33n22cdzb3gf9vhya24wnwi615ac"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Make sure this variable is defined only once. Failing to do so ;; Make sure this variable is defined only once. Failing to do so
@ -1872,13 +1875,18 @@ similar to MATLAB, GNU Octave or SciPy.")
(native-inputs (native-inputs
(list m4 doxygen graphviz)) (list m4 doxygen graphviz))
(inputs (inputs
`(("hdf4" ,hdf4-alt) `(("curl" ,curl)
("hdf4" ,hdf4-alt)
("hdf5" ,hdf5) ("hdf5" ,hdf5)
("curl" ,curl) ("libjpeg" ,libjpeg-turbo)
("zlib" ,zlib) ("libxml2" ,libxml2)
("libjpeg" ,libjpeg-turbo))) ("unzip" ,unzip)
("zlib" ,zlib)))
(arguments (arguments
`(#:configure-flags '("--enable-doxygen" "--enable-dot" "--enable-hdf4") `(#:configure-flags '("--enable-doxygen"
"--enable-dot"
"--enable-hdf4"
"--disable-dap-remote-tests")
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(add-before 'configure 'fix-source-date (add-before 'configure 'fix-source-date
@ -1889,8 +1897,7 @@ similar to MATLAB, GNU Octave or SciPy.")
;; package not reproducible. ;; package not reproducible.
(substitute* "./configure" (substitute* "./configure"
(("date -u -d \"\\$\\{SOURCE_DATE_EPOCH\\}\"") (("date -u -d \"\\$\\{SOURCE_DATE_EPOCH\\}\"")
"date --date='@0'")) "date --date='@0'"))))
#t))
(add-after 'configure 'patch-settings (add-after 'configure 'patch-settings
(lambda _ (lambda _
;; libnetcdf.settings contains the full filename of the compilers ;; libnetcdf.settings contains the full filename of the compilers
@ -1899,8 +1906,11 @@ similar to MATLAB, GNU Octave or SciPy.")
;; store items. ;; store items.
(substitute* "libnetcdf.settings" (substitute* "libnetcdf.settings"
(("(/gnu/store/)([0-9A-Za-z]*)" all prefix hash) (("(/gnu/store/)([0-9A-Za-z]*)" all prefix hash)
(string-append prefix (string-take hash 10) "..."))) (string-append prefix (string-take hash 10) "...")))))
#t))) (add-before 'check 'fix-test-rcmerge
(lambda _
;; Set HOME, to fix the test-rcmerge test.
(setenv "HOME" "/tmp"))))
#:parallel-tests? #f)) ;various race conditions #:parallel-tests? #f)) ;various race conditions
(home-page "https://www.unidata.ucar.edu/software/netcdf/") (home-page "https://www.unidata.ucar.edu/software/netcdf/")
@ -2626,67 +2636,119 @@ satisfiability checking (SAT).")
(define-public clingo (define-public clingo
(package (package
(name "clingo") (name "clingo")
(version "5.5.0") (version "5.6.2")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/potassco/clingo") (url "https://github.com/potassco/clingo")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(modules '((guix build utils)))
(snippet
#~(begin
(delete-file-recursively "clasp")
;; TODO: Unvendor other third-party stuff
(delete-file-recursively "third_party/catch")))
(sha256 (sha256
(base32 (base32
"0rfjwkcwm0mmf3r4i7asyjwb6cia4i7px7fn2kdbi9j85qvas4pb")))) "19s59ndcm2yj0kxlikfxnx2bmp6b7n31wq1zvwc7hyk37rqarwys"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:configure-flags `("-DCLINGO_BUILD_TESTS=on" (list
"-DCLINGO_INSTALL_LIB=on" #:configure-flags #~`("-DCLINGO_BUILD_TESTS=on"
"-DCLINGO_BUILD_STATIC=off" "-DCLINGO_INSTALL_LIB=on"
"-DCLINGO_BUILD_SHARED=on" "-DCLINGO_BUILD_STATIC=off"
;; XXX: Clingo requries private headers and "-DCLINGO_BUILD_SHARED=on"
;; sources from clasp "-DCLINGO_USE_LOCAL_CLASP=off"
,(string-append "-DCLINGO_USE_LOCAL_CATCH=off")
"-DCLASP_SOURCE_DIR=" #:phases
(assoc-ref %build-inputs "clasp-src"))) #~(modify-phases %standard-phases
#:phases (add-after 'unpack 'patch-cmake
(modify-phases %standard-phases (lambda _
(add-after 'unpack 'patch-cmake (substitute* "CMakeLists.txt"
(lambda _ (("add_subdirectory\\(clasp\\)")
(substitute* "CMakeLists.txt" "find_package(clasp REQUIRED)"))
(("add_subdirectory\\(clasp\\)") (substitute* "libclingo/CMakeLists.txt"
"find_package(clasp REQUIRED)")) (("\"cmake/Clingo\"") "\"cmake/clingo\"")
(substitute* "libclingo/CMakeLists.txt" (("ClingoConfig\\.cmake") "clingo-config.cmake")
(("\"cmake/Clingo\"") "\"cmake/clingo\"") (("ClingoConfigVersion\\.cmake")
(("ClingoConfig\\.cmake") "clingo-config.cmake") "clingo-config-version.cmake"))
(("ClingoConfigVersion\\.cmake") (substitute* "cmake/ClingoConfig.cmake.in"
"clingo-config-version.cmake")) (("find_package\\(Clasp") "find_package(clasp"))
(substitute* "cmake/ClingoConfig.cmake.in" (rename-file "cmake/ClingoConfig.cmake.in"
(("find_package\\(Clasp") "find_package(clasp")) "cmake/clingo-config.cmake.in")))
(rename-file "cmake/ClingoConfig.cmake.in" (add-after 'unpack 'skip-failing-tests
"cmake/clingo-config.cmake.in"))) (lambda _
(add-after 'unpack 'skip-failing-tests (with-directory-excursion "libclingo/tests"
(lambda _ (substitute* "CMakeLists.txt"
(with-directory-excursion "libclingo/tests" (("COMMAND test_clingo" all)
(substitute* "CMakeLists.txt" (string-append all
(("COMMAND test_clingo" all) " -f "
(string-append all "\"${CMAKE_CURRENT_SOURCE_DIR}/good.txt\"")))
" -f " (call-with-output-file "good.txt"
"\"${CMAKE_CURRENT_SOURCE_DIR}/good.txt\""))) (lambda (port)
(call-with-output-file "good.txt" (for-each (lambda (test) (format port "~s~%" test))
(lambda (port) '("parse-ast-v2" "add-ast-v2" "build-ast-v2"
(for-each (lambda (test) (format port "~s~%" test)) "unpool-ast-v2" "parse_term"
'("parse-ast-v2" "add-ast-v2" "build-ast-v2" "propagator" "propgator-sequence-mining"
"unpool-ast-v2" "parse_term" "symbol" "visitor"))))))))))
"propagator" "propgator-sequence-mining" (inputs (list catch2-3.1 clasp libpotassco))
"symbol" "visitor")))))))))) (native-inputs (list pkg-config))
(inputs
(list clasp libpotassco))
(native-inputs
`(("clasp-src" ,(package-source clasp))))
(home-page "https://potassco.org/") (home-page "https://potassco.org/")
(synopsis "Grounder and solver for logic programs") (synopsis "Grounder and solver for logic programs")
(description "Clingo computes answer sets for a given logic program.") (description "Clingo computes answer sets for a given logic program.")
(license license:expat))) (license license:expat)))
(define-public python-clingo
(package
(inherit clingo)
(name "python-clingo")
(arguments
(substitute-keyword-arguments (package-arguments clingo)
((#:configure-flags flags #~'())
#~(cons* "-DCLINGO_BUILD_WITH_PYTHON=pip"
"-DCLINGO_USE_LIB=yes"
#$flags))
((#:phases phases #~%standard-phases)
#~(modify-phases #$phases
(add-after 'unpack 'fix-failing-tests
(lambda _
(substitute* "libpyclingo/clingo/tests/test_conf.py"
(("ctl\\.solve\\(on_statistics=on_statistics\\)" all)
(string-append
all
"; self.skipTest(\"You shall not fail.\")")))))))))
(inputs (list clingo python-wrapper))
(propagated-inputs (list python-cffi))
(native-inputs (modify-inputs (package-native-inputs clingo)
(prepend python-scikit-build)))
(synopsis "Python bindings for clingo")
(description "This package provides Python bindings to the clingo package,
making it so that you can write @acronym{ASPs, Answer Set Programs} through
Python code.")))
(define-public python-telingo
(package
(name "python-telingo")
(version "2.1.1")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/potassco/telingo")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(patches (search-patches "python-telingo-fix-comparison.patch"))
(sha256
(base32
"0g3khxfdzc2hc7dkiyyqhb399h6h21m5wkp6wy8w71n0m32fiy53"))))
(build-system pyproject-build-system)
(propagated-inputs (list python-clingo))
(home-page "https://potassco.org/")
(synopsis "Solve dynamic temporal logic programs")
(description "This package provides a system to solve dynamic temporal
logic programs based on clingo.")
(license license:expat)))
(define-public ceres (define-public ceres
(package (package
(name "ceres-solver") (name "ceres-solver")

19
gnu/packages/mercury.scm
View file

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020 Brett Gilio <brettg@gnu.org> ;;; Copyright © 2020 Brett Gilio <brettg@gnu.org>
;;; Copyright © 2022 jgart <jgart@dismail.de>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -56,7 +57,7 @@
(define-public mercury-minimal (define-public mercury-minimal
(package (package
(name "mercury-minimal") (name "mercury-minimal")
(version "20.06.1") (version "22.01.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -64,7 +65,7 @@
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"07qwkk871yxd4q1sw5xv26g8jrpvnpprmzvfd7zg7i142kl3l2gg")))) "1vakjg4rqpplkxw7k91qv8jvlasrr6iwrzrylwqllbq088qs0mbp"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:modules ((guix build gnu-build-system) `(#:modules ((guix build gnu-build-system)
@ -112,7 +113,6 @@
"scripts/Mmake.vars.in" "scripts/Mmake.vars.in"
"scripts/mdb.in" "scripts/mdb.in"
"scripts/rs6000_hack" "scripts/rs6000_hack"
"scripts/fullarch"
"scripts/mmc.in" "scripts/mmc.in"
"scripts/canonical_grade" "scripts/canonical_grade"
"scripts/mprof.in" "scripts/mprof.in"
@ -143,14 +143,14 @@
(gc-fork (gc-fork
libatomic-ops libatomic-ops
"https://github.com/Mercury-Language/libatomic_ops.git" "https://github.com/Mercury-Language/libatomic_ops.git"
"49b70d57f6922fd8be55a7dcb77955c8abfc9ae9" "95809e50a5ff6e765f1af2f589796970a73e9c00"
"1flvwscsa6b2b8a38vhhcgl10bbkb5nnihw7s7iia60cinf7wcqm"))) "0a1y795bvzwzk1v8d9g6wvifj7hvhmxlir1g581bq2slj16h95iz")))
("libgc" ,(package-source ("libgc" ,(package-source
(gc-fork (gc-fork
libgc-7 libgc-7
"https://github.com/Mercury-Language/bdwgc.git" "https://github.com/Mercury-Language/bdwgc.git"
"43ac2ea45261ba0a715534e9da41b2504904c46a" "def741752f55f9068d4f469a14c4b2c168829730"
"0bmzmbs7id0ndyhy9xli6fhfad1shrim6vmy2k8m1nqr5wb31q76"))) "07d94j5l9w6l2kjmcwblgn5lf77aw3r0zjn22pq4hbhknky6ny43")))
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(synopsis "Pure logic programming language (used only for (synopsis "Pure logic programming language (used only for
bootstrapping dependent Mercury)") bootstrapping dependent Mercury)")
@ -171,7 +171,7 @@ separate compilation, and numerous optimization/time trade-offs.")
(define-public mercury (define-public mercury
(package (inherit mercury-minimal) (package (inherit mercury-minimal)
(name "mercury") (name "mercury")
(version "20.06.1") (version "22.01.4")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -183,7 +183,7 @@ separate compilation, and numerous optimization/time trade-offs.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1b6rmdinw8mj6n9sc7c75kkf42gd2k254rf51x4snlrqckxj7aaz")))) "0ycy1j9a4rdj6d37x02dj6kyr00mykvc5kykci11fim906d92gzh"))))
(arguments (arguments
(substitute-keyword-arguments (substitute-keyword-arguments
(package-arguments mercury-minimal) (package-arguments mercury-minimal)
@ -205,7 +205,6 @@ separate compilation, and numerous optimization/time trade-offs.")
"scripts/Mmake.vars.in" "scripts/Mmake.vars.in"
"scripts/mdb.in" "scripts/mdb.in"
"scripts/rs6000_hack" "scripts/rs6000_hack"
"scripts/fullarch"
"scripts/mmc.in" "scripts/mmc.in"
"scripts/mprof.in" "scripts/mprof.in"
"scripts/gud.el" "scripts/gud.el"

8
gnu/packages/messaging.scm
View file

@ -2380,7 +2380,7 @@ QMatrixClient project.")
curl curl
json-modern-cxx json-modern-cxx
libevent libevent
libolm olm
libsodium libsodium
openssl openssl
spdlog spdlog
@ -2459,11 +2459,11 @@ for the Matrix protocol. It is built on to of @code{Boost.Asio}.")
curl curl
gst-plugins-base gst-plugins-base
gst-plugins-bad ; sdp & webrtc for voip gst-plugins-bad ; sdp & webrtc for voip
gst-plugins-good ; rtpmanager for voip gst-plugins-good-qt ; rtpmanager for voip
json-modern-cxx json-modern-cxx
libevent libevent
libnice ; for voip libnice ; for voip
libolm olm
lmdb lmdb
lmdbxx lmdbxx
mtxclient mtxclient
@ -2884,7 +2884,7 @@ validating international phone numbers.")
libgcrypt libgcrypt
libgee libgee
libhandy libhandy
libolm olm
libphonenumber libphonenumber
modem-manager modem-manager
pidgin pidgin

2
gnu/packages/monitoring.scm
View file

@ -636,7 +636,7 @@ devices.")
;; Required because of patched sources. ;; Required because of patched sources.
(invoke "autoreconf" "-vfi")))))) (invoke "autoreconf" "-vfi"))))))
(inputs (inputs
(list rrdtool curl libyajl)) (list rrdtool curl yajl))
(native-inputs (native-inputs
(list autoconf automake libtool pkg-config)) (list autoconf automake libtool pkg-config))
(home-page "https://collectd.org/") (home-page "https://collectd.org/")

2
gnu/packages/mp3.scm
View file

@ -643,7 +643,7 @@ command-line tool.")
(inputs (inputs
;; requires one of FFmpeg (prefered), FFTW3 or vDSP ;; requires one of FFmpeg (prefered), FFTW3 or vDSP
;; use the same ffmpeg version as for acoustid-fingerprinter ;; use the same ffmpeg version as for acoustid-fingerprinter
(list ffmpeg boost)) (list ffmpeg-4 boost))
(home-page "https://acoustid.org/chromaprint") (home-page "https://acoustid.org/chromaprint")
(synopsis "Audio fingerprinting library") (synopsis "Audio fingerprinting library")
(description "Chromaprint is a library for calculating audio (description "Chromaprint is a library for calculating audio

10
gnu/packages/mpd.scm
View file

@ -116,7 +116,7 @@ interfacing MPD in the C, C++ & Objective C languages.")
(define-public mpd (define-public mpd
(package (package
(name "mpd") (name "mpd")
(version "0.23.10") (version "0.23.11")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (uri
@ -125,7 +125,7 @@ interfacing MPD in the C, C++ & Objective C languages.")
"/mpd-" version ".tar.xz")) "/mpd-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1a764k504nh9vqmsd92qh8sg03fwns19d7mypm618j6c8bmqqp30")))) "1afwvw2670yz3kxzlqjlg9r8ra8fjihj97hgc6skiwnzz6lfgd7d"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
(list (list
@ -170,7 +170,7 @@ interfacing MPD in the C, C++ & Objective C languages.")
zlib)) zlib))
(native-inputs (list cmake pkg-config python-sphinx)) (native-inputs (list cmake pkg-config python-sphinx))
;; Missing optional inputs: ;; Missing optional inputs:
;; libyajl ;; yajl
;; libcdio_paranoia ;; libcdio_paranoia
;; libmms ;; libmms
;; libadplug ;; libadplug
@ -581,7 +581,7 @@ mpdevil loads all tags and covers on demand.")
(define-public mympd (define-public mympd
(package (package
(name "mympd") (name "mympd")
(version "10.1.3") (version "10.1.6")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -590,7 +590,7 @@ mpdevil loads all tags and covers on demand.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"16cvjwbyb1m88kmgylp95p82a4xdjikmrw9arl6kvmgcbyw317yp")))) "06i8v8dh2x4lrph9lm56h5yy698y95ic5xrgmyisafvxd239sn0x"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
(list #:tests? #f)) ; no test target (list #:tests? #f)) ; no test target

184
gnu/packages/music.scm
View file

@ -3554,7 +3554,7 @@ tune-in sender list from @url{http://opml.radiotime.com}.")
(define-public pianobar (define-public pianobar
(package (package
(name "pianobar") (name "pianobar")
(version "2020.11.28") (version "2022.04.01")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -3563,7 +3563,7 @@ tune-in sender list from @url{http://opml.radiotime.com}.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"13qx52a1yj2wghf7yd9jf4ar92scbc8zgqdq0kkqf4p9isf1phf3")))) "14s97fx83dg8szbib2y608hjzfdhz20hch2ify3gqhji58v69wil"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; no tests `(#:tests? #f ; no tests
@ -4730,7 +4730,7 @@ standalone JACK client and an LV2 plugin is also available.")
(define-public sfizz (define-public sfizz
(package (package
(name "sfizz") (name "sfizz")
(version "1.0.0") (version "1.2.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/sfztools/sfizz" (uri (string-append "https://github.com/sfztools/sfizz"
@ -4738,34 +4738,38 @@ standalone JACK client and an LV2 plugin is also available.")
"/sfizz-" version ".tar.gz")) "/sfizz-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1pk67xvyqkvhjz2q5hbj5v0mnfvdvvl8vl5bsh6ymwiq3glkd41l")) "1wsr3dpn7a7whqn480m02kp6n4raamnfi3imhf2q8k58md1yn9jw"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; TODO: pugixml is bundled, but can only be removed in
;; versions after 1.0.0.
'(for-each delete-file-recursively '(for-each delete-file-recursively
'("external/abseil-cpp" '("external/abseil-cpp"
"external/simde" "external/simde"
"plugins/editor/external/vstgui4" "plugins/editor/external/vstgui4"
"plugins/vst"))))) "plugins/vst"
"src/external/pugixml")))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:configure-flags (list
(list "-DSFIZZ_LV2_UI=OFF" #:configure-flags
"-DSFIZZ_VST=OFF" #~(list "-DSFIZZ_LV2_UI=OFF"
"-DSFIZZ_VST2=OFF" "-DSFIZZ_VST=OFF"
"-DSFIZZ_TESTS=ON" "-DSFIZZ_VST2=OFF"
"-DSFIZZ_USE_SYSTEM_ABSEIL=ON"))) "-DSFIZZ_TESTS=ON"
"-DSFIZZ_USE_SYSTEM_ABSEIL=ON"
"-DSFIZZ_USE_SYSTEM_PUGIXML=ON"
;; XXX: Guix SIMDe version 0.7.2 is not enough.
;; "-DSFIZZ_USE_SYSTEM_SIMDE=ON"
)))
(native-inputs (native-inputs
(list pkg-config)) (list pkg-config))
(inputs (inputs
`(("abseil-cpp" ,abseil-cpp) (list abseil-cpp
("glib" ,glib) glib
("jack" ,jack-2) jack-2
("lv2" ,lv2) lv2
("libsamplerate" ,libsamplerate) libsamplerate
("pugixml" ,pugixml) pugixml
("simde" ,simde))) simde))
(home-page "https://sfz.tools/sfizz/") (home-page "https://sfz.tools/sfizz/")
(synopsis "SFZ parser and synth library") (synopsis "SFZ parser and synth library")
(description "Sfizz provides an SFZ parser and synth C++ library. It (description "Sfizz provides an SFZ parser and synth C++ library. It
@ -4775,7 +4779,7 @@ includes LV2 plugins and a JACK standalone client.")
(define-public musescore (define-public musescore
(package (package
(name "musescore") (name "musescore")
(version "3.6.2") (version "4.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -4784,22 +4788,22 @@ includes LV2 plugins and a JACK standalone client.")
(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 "0szvb6mlzy9df9lrq546rrpixa480knzij1wgh6ilflxz87q048q")) (base32 "16rcwr6fzghv8100syzicabqg8jqvng3zzsi6h3ja4zkp9hcbkcr"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Remove unused libraries.
'(begin '(begin
;; Remove unused libraries...
(for-each delete-file-recursively (for-each delete-file-recursively
'("thirdparty/freetype" '("thirdparty/freetype"))
"thirdparty/openssl" ;; ... and precompiled binaries.
"thirdparty/portmidi" (delete-file-recursively "src/diagnostics/crashpad_handler")
"thirdparty/qt-google-analytics")))))) (substitute* "src/diagnostics/CMakeLists.txt"
(("install") "#install"))))))
(build-system qt-build-system) (build-system qt-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
`("-DBUILD_TELEMETRY_MODULE=OFF" ;don't phone home `("-DDOWNLOAD_SOUNDFONT=OFF"
"-DBUILD_WEBENGINE=OFF" "-DBUILD_DIAGNOSTICS=OFF"
"-DDOWNLOAD_SOUNDFONT=OFF"
"-DMUSESCORE_BUILD_CONFIG=release" "-DMUSESCORE_BUILD_CONFIG=release"
"-DUSE_SYSTEM_FREETYPE=ON") "-DUSE_SYSTEM_FREETYPE=ON")
;; There are tests, but no simple target to run. The command used to ;; There are tests, but no simple target to run. The command used to
@ -4811,6 +4815,8 @@ includes LV2 plugins and a JACK standalone client.")
;; Basically, it requires to start a whole new build process. ;; Basically, it requires to start a whole new build process.
;; So we simply skip them. ;; So we simply skip them.
#:tests? #f)) #:tests? #f))
(native-inputs
(list git-minimal pkg-config qttools-5))
(inputs (inputs
(list alsa-lib (list alsa-lib
freetype freetype
@ -4823,15 +4829,17 @@ includes LV2 plugins and a JACK standalone client.")
portaudio portaudio
portmidi portmidi
pulseaudio pulseaudio
python
qtbase-5 qtbase-5
qtdeclarative-5 qtdeclarative-5
qtgraphicaleffects qtgraphicaleffects
qtnetworkauth-5
qtquickcontrols-5
qtquickcontrols2-5 qtquickcontrols2-5
qtscript qtscript
qtsvg-5 qtsvg-5
qtx11extras
qtxmlpatterns)) qtxmlpatterns))
(native-inputs
(list pkg-config qttools-5))
(synopsis "Music composition and notation software") (synopsis "Music composition and notation software")
(description (description
"MuseScore is a music score typesetter. Its main purpose is the creation "MuseScore is a music score typesetter. Its main purpose is the creation
@ -4846,7 +4854,7 @@ appearance and layout are provided.
MuseScore can also play back scores through the built-in sequencer and SoundFont MuseScore can also play back scores through the built-in sequencer and SoundFont
sample library.") sample library.")
(home-page "https://musescore.org") (home-page "https://musescore.org")
(license license:gpl2))) (license license:gpl3)))
(define-public muse-sequencer (define-public muse-sequencer
(package (package
@ -5010,7 +5018,7 @@ specification and header.")
(define-public rosegarden (define-public rosegarden
(package (package
(name "rosegarden") (name "rosegarden")
(version "22.06") (version "22.12")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -5018,61 +5026,62 @@ specification and header.")
(version-major+minor version) "/" (version-major+minor version) "/"
"rosegarden-" version ".tar.bz2")) "rosegarden-" version ".tar.bz2"))
(sha256 (sha256
(base32 "1nzs6g8g36g37zi8dl7gznc77596418g6rzm9a5vxcgbam8q494h")))) (base32 "061xy3flmj7bllibkp5wzdycvghfxvyzdr9g9yrr5q3m70a7wznz"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:configure-flags '("-DCMAKE_BUILD_TYPE=Release") (list
#:phases #:configure-flags #~(list "-DCMAKE_BUILD_TYPE=Release")
(modify-phases %standard-phases #:phases
(add-after 'unpack 'patch-tests #~(modify-phases %standard-phases
(lambda _ (add-after 'unpack 'patch-tests
(substitute* "CMakeLists.txt" (lambda _
(("BUILD_TESTING OFF") "BUILD_TESTING ON") (substitute* "CMakeLists.txt"
;; Make tests work. (("BUILD_TESTING OFF") "BUILD_TESTING ON")
((" -fvisibility=hidden") "")))) ;; Make tests work.
(add-after 'unpack 'fix-references ((" -fvisibility=hidden") ""))))
(lambda* (#:key inputs #:allow-other-keys) (add-after 'unpack 'fix-references
(substitute* "src/gui/general/ProjectPackager.cpp" (lambda* (#:key inputs #:allow-other-keys)
(("\"flac\\>") (substitute* "src/gui/general/ProjectPackager.cpp"
(string-append "\"" (assoc-ref inputs "flac") "/bin/flac")) (("\"flac\\>")
(("\"wavpack\\>") (string-append "\"" (search-input-file inputs "/bin/flac")))
(string-append "\"" (assoc-ref inputs "wavpack") "/bin/wavpack")) (("\"wavpack\\>")
(("\"wvunpack\\>") (string-append "\"" (search-input-file inputs "/bin/wavpack")))
(string-append "\"" (assoc-ref inputs "wavpack") "/bin/wvunpack")) (("\"wvunpack\\>")
(("\"bash\\>") (string-append "\"" (search-input-file inputs "/bin/wvunpack")))
(string-append "\"" (assoc-ref inputs "bash") "/bin/bash")) (("\"bash\\>")
(("\"tar\\>") (string-append "\"" (search-input-file inputs "/bin/bash")))
(string-append "\"" (assoc-ref inputs "tar") "/bin/tar"))) (("\"tar\\>")
(substitute* "src/gui/general/LilyPondProcessor.cpp" (string-append "\"" (search-input-file inputs "/bin/tar"))))
(("\"convert-ly\\>") (substitute* "src/gui/general/LilyPondProcessor.cpp"
(string-append "\"" (assoc-ref inputs "lilypond") "/bin/convert-ly")) (("\"convert-ly\\>")
(("\"lilypond\\>") (string-append "\"" (search-input-file inputs "/bin/convert-ly")))
(string-append "\"" (assoc-ref inputs "lilypond") "/bin/lilypond"))))) (("\"lilypond\\>")
(add-after 'unpack 'make-reproducible (string-append "\"" (search-input-file inputs "/bin/lilypond"))))))
(lambda _ (add-after 'unpack 'make-reproducible
;; Prevent Last-Modified from being written. (lambda _
;; The "*.qm" files that are used in locale.qrc would have a new ;; Prevent Last-Modified from being written.
;; mtime otherwise that is written into qrc_locale.cpp in the ;; The "*.qm" files that are used in locale.qrc would have a new
;; end - except when we disable it. ;; mtime otherwise that is written into qrc_locale.cpp in the
(substitute* "src/CMakeLists.txt" ;; end - except when we disable it.
(("COMMAND [$][{]QT_RCC_EXECUTABLE[}]") (substitute* "src/CMakeLists.txt"
"COMMAND ${QT_RCC_EXECUTABLE} --format-version 1") (("COMMAND [$][{]QT_RCC_EXECUTABLE[}]")
;; Extraneous. "COMMAND ${QT_RCC_EXECUTABLE} --format-version 1")
;;(("qt5_add_resources[(]rg_SOURCES ../data/data.qrc[)]") ;; Extraneous.
;; "qt5_add_resources(rg_SOURCES ../data/data.qrc OPTIONS --format-version 1)") ;;(("qt5_add_resources[(]rg_SOURCES ../data/data.qrc[)]")
) ;; "qt5_add_resources(rg_SOURCES ../data/data.qrc OPTIONS --format-version 1)")
;; Make hashtable traversal order predicable. )
(setenv "QT_RCC_TEST" "1"))) ; important ;; Make hashtable traversal order predicable.
(add-before 'check 'prepare-check (setenv "QT_RCC_TEST" "1"))) ; important
(lambda _ (add-before 'check 'prepare-check
(setenv "QT_QPA_PLATFORM" "offscreen") (lambda _
;; Tests create files in $HOME/.local/share/rosegarden . (setenv "QT_QPA_PLATFORM" "offscreen")
(mkdir-p "/tmp/foo") ;; Tests create files in $HOME/.local/share/rosegarden .
(setenv "HOME" "/tmp/foo") (mkdir-p "/tmp/foo")
(setenv "XDG_RUNTIME_DIR" "/tmp/foo")))))) (setenv "HOME" "/tmp/foo")
(setenv "XDG_RUNTIME_DIR" "/tmp/foo"))))))
(inputs (inputs
(list alsa-lib (list alsa-lib
bash bash-minimal
dssi dssi
flac flac
fftwf fftwf
@ -5083,12 +5092,13 @@ specification and header.")
lilypond lilypond
lrdf lrdf
qtbase-5 qtbase-5
shared-mime-info
tar tar
lirc lirc
wavpack wavpack
zlib)) zlib))
(native-inputs (native-inputs
(list pkg-config qttools-5)) ;for qtlinguist (list pkg-config qttools-5)) ;for qtlinguist
(synopsis "Music composition and editing environment based around a MIDI (synopsis "Music composition and editing environment based around a MIDI
sequencer") sequencer")
(description "Rosegarden is a music composition and editing environment (description "Rosegarden is a music composition and editing environment
@ -6806,7 +6816,7 @@ choice.")
(list alsa-lib (list alsa-lib
boost boost
curl curl
ffmpeg ffmpeg-4
lame lame
libev libev
libmicrohttpd libmicrohttpd

4
gnu/packages/nano.scm
View file

@ -31,13 +31,13 @@
(define-public nano (define-public nano
(package (package
(name "nano") (name "nano")
(version "7.0") (version "7.1")
(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 "0j91am8y8dy48dj1nf8p1lhpassgv2py3w414vc8d1rbig1ymmld")))) (base32 "0dk8820w631ip6hpl7qc8kg5viw7wc154l7fvpvg06bmkcg7bfjp"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
(list gettext-minimal ncurses)) (list gettext-minimal ncurses))

33
gnu/packages/ncdu.scm
View file

@ -30,17 +30,20 @@
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages zig)) #:use-module (gnu packages zig))
(define-public ncdu (define-public ncdu-1
;; This old version is ‘LTS’. Version 2 works fine and has more features,
;; but Zig is still a fast-moving target and doesn't support cross-compilation
;; yet, so we'll keep both for just a little longer.
(package (package
(name "ncdu") (name "ncdu")
(version "1.17") (version "1.18")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://dev.yorhel.nl/download/ncdu-" (uri (string-append "https://dev.yorhel.nl/download/ncdu-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1wfvdajln0iy7364nxkg4bpgdv8l3b6a9bnkhy67icqsxnl4a1w1")))) "15czid6584j7vclwrw85ihahknghxv2w6b9mrk9cbjc0cnls2drw"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (list ncurses)) (inputs (list ncurses))
(synopsis "Ncurses-based disk usage analyzer") (synopsis "Ncurses-based disk usage analyzer")
@ -55,10 +58,10 @@ ncurses installed.")
version))) version)))
(home-page "https://dev.yorhel.nl/ncdu"))) (home-page "https://dev.yorhel.nl/ncdu")))
(define-public ncdu-2 (define-public ncdu
(package (package
(inherit ncdu) (inherit ncdu-1)
(name "ncdu2") ; To destinguish it from the C based version. (name "ncdu")
(version "2.2.1") (version "2.2.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
@ -66,12 +69,19 @@ ncurses installed.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0hfimrr7z9zrfkiyj09i8nh4a1rjn7d00y9xzpc7mkyqpkvghjjy")))) "0hfimrr7z9zrfkiyj09i8nh4a1rjn7d00y9xzpc7mkyqpkvghjjy"))
(modules '((guix build utils)))
(snippet
#~(begin
;; Delete a pregenerated man page. We'll build it ourselves.
(delete-file "ncdu.1")))))
(arguments (arguments
(list (list
#:make-flags #:make-flags
#~(list (string-append "PREFIX=" #$output) #~(list (string-append "PREFIX=" #$output)
(string-append "CC=" #$(cc-for-target))) (string-append "CC=" #$(cc-for-target))
;; XXX By default, zig builds with -march=native!
(string-append "ZIG_FLAGS=-Drelease-fast -Dcpu=baseline"))
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(delete 'configure) ; No configure script. (delete 'configure) ; No configure script.
@ -81,12 +91,13 @@ ncurses installed.")
(mkdtemp "/tmp/zig-cache-XXXXXX")))) (mkdtemp "/tmp/zig-cache-XXXXXX"))))
(add-after 'build 'build-manpage (add-after 'build 'build-manpage
(lambda _ (lambda _
(delete-file "ncdu.1")
(invoke "make" "doc"))) (invoke "make" "doc")))
(replace 'check (replace 'check
(lambda* (#:key tests? #:allow-other-keys) (lambda* (#:key tests? #:allow-other-keys)
(when tests? (when tests?
(invoke "zig" "test" "build.zig"))))))) (invoke "zig" "test" "build.zig")))))))
(native-inputs (native-inputs
(list perl zig)) (list perl zig))))
(properties `((upstream-name . "ncdu")))))
(define-public ncdu-2
(deprecated-package "ncdu2" ncdu))

32
gnu/packages/networking.scm
View file

@ -196,7 +196,7 @@ runs on top of IP or UDP, and supports both v4 and v6 versions.")
(define-public arp-scan (define-public arp-scan
(package (package
(name "arp-scan") (name "arp-scan")
(version "1.9.7") (version "1.9.8")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -206,7 +206,7 @@ runs on top of IP or UDP, and supports both v4 and v6 versions.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1mf7a4f9vzvnkiavc87aqyciswggsb4fpy7j05jxnvjyyxv3l7gp")))) (base32 "18pck3hi7caykpkry5ri16w4w8m11g8gvh3qx5rhwsc6d9xa2a6d"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
(list libpcap)) (list libpcap))
@ -1754,14 +1754,14 @@ of the same name.")
(define-public wireshark (define-public wireshark
(package (package
(name "wireshark") (name "wireshark")
(version "4.0.1") (version "4.0.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.wireshark.org/download/src/wireshark-" (uri (string-append "https://www.wireshark.org/download/src/wireshark-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 "1hpxkw0ww6b8fnda5bhgpma2836bfarpxgnkkrzz9fqkkpwh5c5k")))) (base32 "07a18jx88jaa2j1i949w9n1yb149xi02s80inbfji6rgkxliangk"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -1966,15 +1966,15 @@ transmission protocol (SCTP) in a Go application.")
(base32 (base32
"1y7sbgkhgadmd93x1zafqc4yp26ssiv16ni5bbi9vmvvdl55m29y")))) "1y7sbgkhgadmd93x1zafqc4yp26ssiv16ni5bbi9vmvvdl55m29y"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments
(list #:make-flags
#~(list (string-append "CC=" #$(cc-for-target))
(string-append "PREFIX=" #$output))
#:tests? #f)) ; no test suite
(native-inputs (native-inputs
`(("gettext" ,gettext-minimal))) (list gettext-minimal))
(inputs (inputs
(list fftw ncurses openssl)) (list fftw ncurses openssl))
(arguments
`(#:make-flags (list ,(string-append "CC=" (cc-for-target))
(string-append "DESTDIR=" (assoc-ref %outputs "out"))
"PREFIX=")
#:tests? #f)) ; no tests
(home-page "https://www.vanheusden.com/httping/") (home-page "https://www.vanheusden.com/httping/")
(synopsis "Web server latency and throughput monitor") (synopsis "Web server latency and throughput monitor")
(description (description
@ -2760,7 +2760,7 @@ procedure calls (RPCs).")
(define-public openvswitch (define-public openvswitch
(package (package
(name "openvswitch") (name "openvswitch")
(version "3.0.1") (version "3.0.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -2768,7 +2768,7 @@ procedure calls (RPCs).")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0s5xbcchnfqlgrabjs76bwd5d6qhvjx352r274r5p7wis0b1g8g4")))) "0qwlpnwjcyb7fpw6yp65mdqg20i1851z70xmvzxwxwpifq56a1pm"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:configure-flags '(#:configure-flags
@ -3852,14 +3852,14 @@ protocol daemons for BGP, IS-IS, LDP, OSPF, PIM, and RIP.")
(define-public bird (define-public bird
(package (package
(name "bird") (name "bird")
(version "2.0.10") (version "2.0.11")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "ftp://bird.network.cz/pub/bird/bird-" (uri (string-append "ftp://bird.network.cz/pub/bird/bird-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0npx3zgbjnhm4905zmj2qkz3d13s8hakassq6sbzm1ywv3fl3lvy")))) "1mjm7w5zkbc5q2v4bdn7mcqzcq94s7fiz8a5lz98kl5rcwxvi9v0"))))
(inputs (inputs
(list libssh readline)) (list libssh readline))
(native-inputs (native-inputs
@ -4257,14 +4257,14 @@ realistic with today's hardware.")
(define-public lldpd (define-public lldpd
(package (package
(name "lldpd") (name "lldpd")
(version "1.0.15") (version "1.0.16")
(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 "09iidaan6gq384n7ykdwwsll3vmq6q7zd7j7j721k2p91c9kmzpp")) (base32 "1ab5hkgi2iwqpfw6xy2wxjhqmz6pnkynfkg85zm7r9kv1ijr3cz3"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin

587
gnu/packages/ocaml.scm
View file

@ -185,6 +185,67 @@ OCaml and can effectively bootstrap OCaml 4.07.
This package produces a native @command{ocamlc} and a bytecode @command{ocamllex}.") This package produces a native @command{ocamlc} and a bytecode @command{ocamllex}.")
(license license:expat)))) (license license:expat))))
(define-public ocaml-5.0
(package
(name "ocaml")
(version "5.0.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/ocaml/ocaml")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"1p0p8wldrnbr61wfy3x4122017g4k5gjvfwlg3mvlqn8r2fxn2m5"))))
(build-system gnu-build-system)
(native-search-paths
(list (search-path-specification
(variable "OCAMLPATH")
(files (list "lib/ocaml" "lib/ocaml/site-lib")))
(search-path-specification
(variable "CAML_LD_LIBRARY_PATH")
(files (list "lib/ocaml/site-lib/stubslibs"
"lib/ocaml/site-lib/stublibs")))))
(native-inputs
(list perl pkg-config))
(inputs
(list libx11 libiberty ;needed for objdump support
zlib)) ;also needed for objdump support
(arguments
`(#:configure-flags '("--enable-ocamltest")
#:test-target "tests"
#:make-flags '("world.opt")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-/bin/sh-references
(lambda* (#:key inputs #:allow-other-keys)
(let* ((sh (search-input-file inputs "/bin/sh"))
(quoted-sh (string-append "\"" sh "\"")))
(with-fluids ((%default-port-encoding #f))
(for-each
(lambda (file)
(substitute* file
(("\"/bin/sh\"")
(begin
(format (current-error-port) "\
patch-/bin/sh-references: ~a: changing `\"/bin/sh\"' to `~a'~%"
file quoted-sh)
quoted-sh))))
(find-files "." "\\.ml$")))))))))
(home-page "https://ocaml.org/")
(synopsis "The OCaml programming language")
(description
"OCaml is a general purpose industrial-strength programming language with
an emphasis on expressiveness and safety. Developed for more than 20 years at
Inria it benefits from one of the most advanced type systems and supports
functional, imperative and object-oriented styles of programming.")
;; The compiler is distributed under qpl1.0 with a change to choice of
;; law: the license is governed by the laws of France. The library is
;; distributed under lgpl2.0.
(license (list license:qpl license:lgpl2.0))))
(define-public ocaml-4.14 (define-public ocaml-4.14
(package (package
(name "ocaml") (name "ocaml")
@ -880,7 +941,7 @@ name = Guix Builder")
("ocaml-cppo" ,ocaml-cppo) ("ocaml-cppo" ,ocaml-cppo)
;; For tests. ;; For tests.
("git" ,git-minimal) ("git" ,git-minimal/fixed)
("openssl" ,openssl) ("openssl" ,openssl)
("python" ,python-wrapper) ("python" ,python-wrapper)
("rsync" ,rsync) ("rsync" ,rsync)
@ -901,10 +962,12 @@ name = Guix Builder")
("opam-repo-f372039d" ,(opam-repo "f372039db86a970ef3e662adbfe0d4f5cd980701" ("opam-repo-f372039d" ,(opam-repo "f372039db86a970ef3e662adbfe0d4f5cd980701"
"0ld7fcry6ss6fmrpswvr6bikgx299w97h0gwrjjh7kd7rydsjdws"))))) "0ld7fcry6ss6fmrpswvr6bikgx299w97h0gwrjjh7kd7rydsjdws")))))
(inputs (inputs
(list ocaml ncurses curl bubblewrap)) (list ocaml ncurses curl bubblewrap ocaml-cmdliner ocaml-dose3
(propagated-inputs ocaml-mccs ocaml-opam-file-format ocaml-re))
(list ocaml-cmdliner ocaml-dose3 ocaml-mccs ocaml-opam-file-format (properties
ocaml-re)) ;; OPAM is used as a tool and not as a library, we can use the OCaml 4.14
;; compiled opam until opam is compatible with OCaml 5.0.
`((ocaml5.0-variant . ,(delay opam))))
(home-page "http://opam.ocamlpro.com/") (home-page "http://opam.ocamlpro.com/")
(synopsis "Package manager for OCaml") (synopsis "Package manager for OCaml")
(description (description
@ -1343,14 +1406,14 @@ to the other.")
(define-public ocaml-findlib (define-public ocaml-findlib
(package (package
(name "ocaml-findlib") (name "ocaml-findlib")
(version "1.9.3") (version "1.9.5")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://download.camlcity.org/download/" (uri (string-append "http://download.camlcity.org/download/"
"findlib" "-" version ".tar.gz")) "findlib" "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0hfcwamcvinmww59b5i4yxbf0kxyzkp5qv3d1c7ybn9q52vgq463")))) "0w9578j1561f5gi51sn2jgxm3kh3sn88cpannhdkqcdg1kk08iqd"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
(list m4 ocaml)) (list m4 ocaml))
@ -1405,6 +1468,13 @@ compilers that can directly deal with packages.")
(native-inputs (native-inputs
(list m4 ocaml-4.09)))) (list m4 ocaml-4.09))))
(define-public ocaml5.0-findlib
(package
(inherit ocaml-findlib)
(name "ocaml5.0-findlib")
(native-inputs
(list m4 ocaml-5.0))))
(define-public ocaml-ounit2 (define-public ocaml-ounit2
(package (package
(name "ocaml-ounit2") (name "ocaml-ounit2")
@ -1618,7 +1688,7 @@ archive(native) = \"frontc.cmxa\""))))
(define-public ocaml-qcheck (define-public ocaml-qcheck
(package (package
(name "ocaml-qcheck") (name "ocaml-qcheck")
(version "0.18.1") (version "0.20")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -1627,12 +1697,12 @@ archive(native) = \"frontc.cmxa\""))))
(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 "0g3r8lrw6fsdphgpnp08saxyxk1vd3chpmb564ir2qnsp716vz6z")))) (base32 "1r0m5p1dd06lbgfxqdpl1ya4vb8252z7hqkvdi9k444g4rx2ay3p"))))
(build-system dune-build-system) (build-system dune-build-system)
(arguments (arguments
`(#:test-target ".")) `(#:test-target "."))
(propagated-inputs (propagated-inputs
(list ocaml-alcotest ocaml-ounit)) (list ocaml-alcotest ocaml-ounit ocaml-ppxlib))
(native-inputs (native-inputs
(list ocamlbuild)) (list ocamlbuild))
(properties `((ocaml4.07-variant . ,(delay ocaml4.07-qcheck)))) (properties `((ocaml4.07-variant . ,(delay ocaml4.07-qcheck))))
@ -1752,6 +1822,9 @@ following a very simple s-expression syntax.")
(define ocaml4.09-dune-bootstrap (define ocaml4.09-dune-bootstrap
(package-with-ocaml4.09 dune-bootstrap)) (package-with-ocaml4.09 dune-bootstrap))
(define ocaml5.0-dune-bootstrap
(package-with-ocaml5.0 dune-bootstrap))
(define-public dune-configurator (define-public dune-configurator
(package (package
(inherit dune-bootstrap) (inherit dune-bootstrap)
@ -1772,7 +1845,8 @@ following a very simple s-expression syntax.")
(delete-file-recursively "vendor/pp")))))) (delete-file-recursively "vendor/pp"))))))
(propagated-inputs (propagated-inputs
(list ocaml-csexp)) (list ocaml-csexp))
(properties `((ocaml4.09-variant . ,(delay ocaml4.09-dune-configurator)))) (properties `((ocaml4.09-variant . ,(delay ocaml4.09-dune-configurator))
(ocaml5.0-variant . ,(delay ocaml5.0-dune-configurator))))
(synopsis "Dune helper library for gathering system configuration") (synopsis "Dune helper library for gathering system configuration")
(description "Dune-configurator is a small library that helps writing (description "Dune-configurator is a small library that helps writing
OCaml scripts that test features available on the system, in order to generate OCaml scripts that test features available on the system, in order to generate
@ -1797,13 +1871,25 @@ config.h files for instance. Among other things, dune-configurator allows one t
(propagated-inputs (propagated-inputs
`(("ocaml-csexp" ,ocaml4.09-csexp))))) `(("ocaml-csexp" ,ocaml4.09-csexp)))))
(define-public ocaml5.0-dune-configurator
(package
(inherit dune-configurator)
(name "ocaml5.0-dune-configurator")
(arguments
`(,@(package-arguments dune-configurator)
#:dune ,ocaml5.0-dune-bootstrap
#:ocaml ,ocaml-5.0
#:findlib ,ocaml5.0-findlib))
(propagated-inputs (list ocaml5.0-csexp))))
(define-public dune (define-public dune
(package (package
(inherit dune-bootstrap) (inherit dune-bootstrap)
(propagated-inputs (propagated-inputs
(list dune-configurator)) (list dune-configurator))
(properties `((ocaml4.07-variant . ,(delay ocaml4.07-dune)) (properties `((ocaml4.07-variant . ,(delay ocaml4.07-dune))
(ocaml4.09-variant . ,(delay ocaml4.09-dune)))))) (ocaml4.09-variant . ,(delay ocaml4.09-dune))
(ocaml5.0-variant . ,(delay ocaml5.0-dune))))))
(define-public ocaml4.09-dune (define-public ocaml4.09-dune
(package (package
@ -1825,6 +1911,12 @@ config.h files for instance. Among other things, dune-configurator allows one t
(base32 (base32
"0l4x0x2fz135pljv88zj8y6w1ninsqw0gn1mdxzprd6wbxbyn8wr")))))) "0l4x0x2fz135pljv88zj8y6w1ninsqw0gn1mdxzprd6wbxbyn8wr"))))))
(define-public ocaml5.0-dune
(package
(inherit ocaml5.0-dune-bootstrap)
(propagated-inputs
(list ocaml5.0-dune-configurator))))
(define-public ocaml-csexp (define-public ocaml-csexp
(package (package
(name "ocaml-csexp") (name "ocaml-csexp")
@ -1850,7 +1942,8 @@ config.h files for instance. Among other things, dune-configurator allows one t
#t))))) #t)))))
(propagated-inputs (propagated-inputs
(list ocaml-result)) (list ocaml-result))
(properties `((ocaml4.09-variant . ,(delay ocaml4.09-csexp)))) (properties `((ocaml4.09-variant . ,(delay ocaml4.09-csexp))
(ocaml5.0-variant . ,(delay ocaml5.0-csexp))))
(home-page "https://github.com/ocaml-dune/csexp") (home-page "https://github.com/ocaml-dune/csexp")
(synopsis "Parsing and printing of S-expressions in Canonical form") (synopsis "Parsing and printing of S-expressions in Canonical form")
(description "This library provides minimal support for Canonical (description "This library provides minimal support for Canonical
@ -1879,6 +1972,18 @@ module of this library is parameterised by the type of S-expressions.")
(propagated-inputs (propagated-inputs
`(("ocaml-result" ,ocaml4.09-result))))) `(("ocaml-result" ,ocaml4.09-result)))))
(define-public ocaml5.0-csexp
(package
(inherit ocaml-csexp)
(name "ocaml5.0-csexp")
(arguments
`(#:ocaml ,ocaml-5.0
#:findlib ,ocaml5.0-findlib
,@(substitute-keyword-arguments (package-arguments ocaml-csexp)
((#:dune _) ocaml5.0-dune-bootstrap))))
(propagated-inputs
`(("ocaml-result" ,ocaml5.0-result)))))
(define-public ocaml-migrate-parsetree (define-public ocaml-migrate-parsetree
(package (package
(name "ocaml-migrate-parsetree") (name "ocaml-migrate-parsetree")
@ -2064,7 +2169,8 @@ bitsrings in Erlang style as primitives to the language.")))
(arguments (arguments
`(#:test-target "." `(#:test-target "."
#:dune ,dune-bootstrap)) #:dune ,dune-bootstrap))
(properties `((ocaml4.09-variant . ,(delay ocaml4.09-result)))) (properties `((ocaml4.09-variant . ,(delay ocaml4.09-result))
(ocaml5.0-variant . ,(delay ocaml5.0-result))))
(home-page "https://github.com/janestreet/result") (home-page "https://github.com/janestreet/result")
(synopsis "Compatibility Result module") (synopsis "Compatibility Result module")
(description "Uses the new result type defined in OCaml >= 4.03 while (description "Uses the new result type defined in OCaml >= 4.03 while
@ -2081,6 +2187,16 @@ defined in this library.")
#:dune ,ocaml4.09-dune-bootstrap #:dune ,ocaml4.09-dune-bootstrap
#:ocaml ,ocaml-4.09 #:ocaml ,ocaml-4.09
#:findlib ,ocaml4.09-findlib)))) #:findlib ,ocaml4.09-findlib))))
(define-public ocaml5.0-result
(package
(inherit ocaml-result)
(name "ocaml5.0-result")
(arguments
`(#:test-target "."
#:dune ,ocaml5.0-dune-bootstrap
#:ocaml ,ocaml-5.0
#:findlib ,ocaml5.0-findlib))))
(define-public ocaml-topkg (define-public ocaml-topkg
(package (package
@ -2607,6 +2723,207 @@ for mapping files in memory. This function is the same as the
@command{Unix.map_file} function added in OCaml >= 4.06.") @command{Unix.map_file} function added in OCaml >= 4.06.")
(license (list license:qpl license:lgpl2.0)))) (license (list license:qpl license:lgpl2.0))))
(define-public ocaml-psq
(package
(name "ocaml-psq")
(version "0.2.1")
(home-page "https://github.com/pqwy/psq")
(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
"0ahxbzkbq5sw8sqv31c2lil2zny4076q8b0dc7h5slq7i2r23d79"))))
(build-system dune-build-system)
(native-inputs (list ocaml-qcheck ocaml-alcotest))
(synopsis "Functional Priority Search Queues for OCaml")
(description
"This library provides Functional Priority Search Queues for OCaml.
Typical applications are searches, schedulers and caches.")
(license license:isc)))
(define-public ocaml-optint
(package
(name "ocaml-optint")
(version "0.3.0")
(home-page "https://github.com/mirage/optint")
(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
"1qj32bcw1in7s6raxdvbmjr3lvj99iwv98x1ar9cwxp4zf8ybfss"))))
(build-system dune-build-system)
(arguments `(#:test-target "."))
(native-inputs (list ocaml-crowbar ocaml-monolith ocaml-fmt))
(synopsis "Efficient integer types on 64-bit architectures for OCaml")
(description
"This OCaml library provides two new integer types, @code{Optint.t} and
@code{Int63.t}, which guarantee efficient representation on 64-bit
architectures and provide a best-effort boxed representation on 32-bit
architectures.")
(license license:isc)))
(define-public ocaml-hmap
(package
(name "ocaml-hmap")
(version "0.8.1")
(source
(origin
(method url-fetch)
(uri "https://erratique.ch/software/hmap/releases/hmap-0.8.1.tbz")
(sha256
(base32 "10xyjy4ab87z7jnghy0wnla9wrmazgyhdwhr4hdmxxdn28dxn03a"))))
(build-system ocaml-build-system)
(arguments
`(#:build-flags
(list "build" "--tests" "true")
#:phases
(modify-phases %standard-phases
(delete 'configure))))
(native-inputs (list ocaml-topkg ocamlbuild opam))
(home-page "https://erratique.ch/software/hmap")
(synopsis "Heterogeneous value maps for OCaml")
(description
"Hmap provides heterogeneous value maps for OCaml. These maps bind keys to
values with arbitrary types. Keys witness the type of the value they are bound
to which allows adding and looking up bindings in a type safe manner.")
(license license:isc)))
(define ocaml-eio
(package
(name "ocaml-eio")
(version "0.7")
(home-page "https://github.com/ocaml-multicore/eio")
(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
"118raxdwv6pn5b152ffdhmwdi0l4wlwflcj2nmckfmm7v1z2fq4s"))))
(build-system dune-build-system)
(arguments `(#:package "eio"
#:test-target "."))
(propagated-inputs (list ocaml-bigstringaf
ocaml-cstruct
ocaml-lwt
ocaml-lwt-dllist
ocaml-logs
ocaml-optint
ocaml-psq
ocaml-fmt
ocaml-hmap
ocaml-mtime
ocaml-odoc))
(native-inputs (list ocaml-astring ocaml-crowbar ocaml-alcotest))
(synopsis "Effect-based direct-style IO API for OCaml")
(description "This package provides an effect-based IO API for multicore
OCaml with fibers.")
(license license:isc)))
(define-public ocaml5.0-eio
(package-with-ocaml5.0 ocaml-eio))
(define ocaml-eio-luv
(package
(inherit ocaml-eio)
(name "ocaml-eio-luv")
(arguments `(#:package "eio_luv"
#:test-target "."))
(propagated-inputs (list ocaml-eio ocaml-luv))
(native-inputs (list ocaml-mdx))
(synopsis "Libuv-based backend for Ocaml Eio")
(description "@code{Eio_luv} provides a cross-platform backend for
@code{Ocaml Eio}'s APIs using luv (libuv)")))
(define-public ocaml5.0-eio-luv
(package-with-ocaml5.0 ocaml-eio-luv))
(define-public ocaml-uring
(package
(name "ocaml-uring")
(version "0.4")
(home-page "https://github.com/ocaml-multicore/ocaml-uring")
(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
"0k70y7nb2wrk2yql0pwnrhsp1x7k9ld4gd8iihbv6r34kcm3a5m1"))))
(build-system dune-build-system)
(arguments `(#:test-target "."))
(propagated-inputs
(list ocaml-cstruct
ocaml-fmt
ocaml-optint))
(native-inputs
(list ocaml-lwt
ocaml-bechamel
ocaml-logs
ocaml-cmdliner
ocaml-mdx))
(synopsis "OCaml bindings for Linux io_uring")
(description "This package provides OCaml bindings to the Linux
@code{io_uring} kernel IO interfaces.")
(license
(list license:isc license:expat))))
(define ocaml-eio-linux
(package
(inherit ocaml-eio)
(name "ocaml-eio-linux")
(arguments `(#:package "eio_linux"
#:test-target "."))
(propagated-inputs
(list ocaml-eio
ocaml-uring
ocaml-logs
ocaml-fmt))
(native-inputs
(list ocaml-mdx
ocaml-alcotest
ocaml-mdx))
(synopsis "Linux backend for ocaml-eio")
(description "@code{Eio_linux} provides a Linux io-uring backend for
@code{Ocaml Eio} APIs, plus a low-level API that can be used directly
(in non-portable code).")))
(define-public ocaml5.0-eio-linux
(package-with-ocaml5.0 ocaml-eio-linux))
(define ocaml-eio-main
(package
(inherit ocaml-eio)
(name "ocaml-eio-main")
(arguments `(#:package "eio_main"
#:test-target "."
;; tests require network
#:tests? #f))
(propagated-inputs
(list ocaml-eio
ocaml-eio-luv
ocaml-eio-linux))
(native-inputs
(list ocaml-mdx))
(synopsis "Eio backend selector")
(description "@code{Eio_main} selects an appropriate backend (e.g.
@samp{eio_linux} or @samp{eio_luv}), depending on your platform.")))
(define-public ocaml5.0-eio-main
(package-with-ocaml5.0 ocaml-eio-main))
(define-public ocaml-lwt (define-public ocaml-lwt
(package (package
(name "ocaml-lwt") (name "ocaml-lwt")
@ -2637,6 +2954,27 @@ process. Also, in many cases, Lwt threads can interact without the need for
locks or other synchronization primitives.") locks or other synchronization primitives.")
(license license:lgpl2.1))) (license license:lgpl2.1)))
(define-public ocaml-lwt-dllist
(package
(name "ocaml-lwt-dllist")
(version "1.0.1")
(home-page "https://github.com/mirage/lwt-dllist")
(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
"18bi8fb4yly1pyf43pjvvdhlyzb3wkgxifffx9d1g9y2mwsng6jw"))))
(build-system dune-build-system)
(native-inputs (list ocaml-lwt))
(synopsis "OCaml library providing mutable doubly-linked list with Lwt iterators")
(description "This OCaml library provides an implementation of a mutable
doubly-linked list with Lwt iterators.")
(license license:expat)))
(define-public ocaml-luv (define-public ocaml-luv
(package (package
(name "ocaml-luv") (name "ocaml-luv")
@ -3400,6 +3738,30 @@ your functions and to easily compare the results. A statistical test
is used to determine whether the results truly differ.") is used to determine whether the results truly differ.")
(license license:lgpl3+))) (license license:lgpl3+)))
(define-public ocaml-bechamel
(package
(name "ocaml-bechamel")
(version "0.3.0")
(home-page "https://github.com/mirage/bechamel")
(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 "1x7sf45iy5dzx7kknbkkvpna42rcwpj5p55y0nqsg2fb4srj0b1q"))))
(build-system dune-build-system)
(arguments `(#:package "bechamel"))
(propagated-inputs (list ocaml-fmt ocaml-stdlib-shims))
(synopsis "Yet Another Benchmark in OCaml")
(description
"BEnchmark for a CHAMEL/camel/caml which is agnostic to the system. It's a
micro-benchmark tool for OCaml which lets the user to re-analyzes and prints
samples.")
(license license:expat)))
(define-public ocaml-batteries (define-public ocaml-batteries
(package (package
(name "ocaml-batteries") (name "ocaml-batteries")
@ -4590,6 +4952,7 @@ long and size_t whose sizes depend on the host platform.")
("integers" ,ocaml-integers))) ("integers" ,ocaml-integers)))
(inputs (inputs
(list libffi)) (list libffi))
(properties `((ocaml5.0-variant . ,(delay ocaml5.0-ctypes))))
(synopsis "Library for binding to C libraries using pure OCaml") (synopsis "Library for binding to C libraries using pure OCaml")
(description "Ctypes is a library for binding to C libraries using pure (description "Ctypes is a library for binding to C libraries using pure
OCaml. The primary aim is to make writing C extensions as straightforward as OCaml. The primary aim is to make writing C extensions as straightforward as
@ -4600,6 +4963,33 @@ functions that you want to call, then bind directly to those functions -- all
without writing or generating any C!") without writing or generating any C!")
(license license:expat))) (license license:expat)))
(define-public ocaml5.0-ctypes
;; Contains fix to support OCaml 5.0
;; (https://github.com/ocamllabs/ocaml-ctypes/pull/709)
(let ((commit "52ff621f47dbc1ee5a90c30af0ae0474549946b4")
(revision "0"))
(package-with-ocaml5.0
(package
(inherit ocaml-ctypes)
(name "ocaml-ctypes")
(version (git-version "0.20.1" revision commit))
(home-page "https://github.com/ocamllabs/ocaml-ctypes")
(arguments
(append
;; Some tests fail. Failure seems to be due to OCaml 5.0.
`(#:tests? #f)
(package-arguments ocaml-ctypes)))
(source (origin
(method git-fetch)
(uri (git-reference
(url home-page)
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0vyiryqchz0mdfhal7bdivqsk5yhvzzckrqv495rlpbdxzklcp7g"))))
(properties '())))))
(define-public ocaml-ocb-stubblr (define-public ocaml-ocb-stubblr
(package (package
(name "ocaml-ocb-stubblr") (name "ocaml-ocb-stubblr")
@ -4979,7 +5369,7 @@ serializers and deserializers from type definitions.")
(define-public ocaml-merlin-lib (define-public ocaml-merlin-lib
(package (package
(name "ocaml-merlin-lib") (name "ocaml-merlin-lib")
(version "4.6-414") (version "4.7-414")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -4989,17 +5379,39 @@ serializers and deserializers from type definitions.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1cpa9x45w54l4mqqmc8z3s5gscggw37gb6z9i7wwss86fj1wgclh")))) "1bd4j2zq0lyszbkibgky1z9swv4scb7ljww3fv1kqy0cya743b5l"))))
(build-system dune-build-system) (build-system dune-build-system)
(arguments '(#:package "merlin-lib" (arguments '(#:package "merlin-lib"
#:tests? #f)) ; no tests #:tests? #f)) ; no tests
(propagated-inputs (list ocaml-csexp ocaml-menhir)) (propagated-inputs (list ocaml-csexp ocaml-menhir))
(properties `((ocaml5.0-variant . ,(delay ocaml5.0-merlin-lib))))
(home-page "https://ocaml.github.io/merlin/") (home-page "https://ocaml.github.io/merlin/")
(synopsis "Merlin libraries") (synopsis "Merlin libraries")
(description "These libraries provides access to low-level compiler (description "These libraries provides access to low-level compiler
interfaces and the standard higher-level merlin protocol.") interfaces and the standard higher-level merlin protocol.")
(license license:expat))) (license license:expat)))
;; the 500 indicates that this version is for OCaml 5.0
(define ocaml-merlin-lib-500
(package
(inherit ocaml-merlin-lib)
(name "ocaml-merlin-lib")
(version "4.7.1-500")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/ocaml/merlin")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"05a87i2dkzv800nwb6y7b2j45avg8gs3gzb5a98wrj1i5zjqwh01"))))
(properties '())))
(define-public ocaml5.0-merlin-lib
(package-with-ocaml5.0 ocaml-merlin-lib-500))
(define-public ocaml-dot-merlin-reader (define-public ocaml-dot-merlin-reader
(package (package
(inherit ocaml-merlin-lib) (inherit ocaml-merlin-lib)
@ -5007,10 +5419,23 @@ interfaces and the standard higher-level merlin protocol.")
(arguments '(#:package "dot-merlin-reader" (arguments '(#:package "dot-merlin-reader"
#:tests? #f)) ; no tests #:tests? #f)) ; no tests
(propagated-inputs (list ocaml-merlin-lib)) (propagated-inputs (list ocaml-merlin-lib))
(properties `((ocaml5.0-variant . ,(delay ocaml5.0-dot-merlin-reader))))
(synopsis "Reads config files for @code{ocaml-merlin}") (synopsis "Reads config files for @code{ocaml-merlin}")
(description "@code{ocaml-dot-merlin-reader} is an external reader for (description "@code{ocaml-dot-merlin-reader} is an external reader for
@code{ocaml-merlin} configurations."))) @code{ocaml-merlin} configurations.")))
(define-public ocaml5.0-dot-merlin-reader
(package-with-ocaml5.0
(package
(inherit ocaml-merlin-lib-500)
(name "ocaml-dot-merlin-reader")
(arguments '(#:package "dot-merlin-reader"
#:tests? #f)) ; no tests
(propagated-inputs (list ocaml5.0-merlin-lib))
(synopsis "Reads config files for @code{ocaml-merlin}")
(description "@code{ocaml-dot-merlin-reader} is an external reader for
@code{ocaml-merlin} configurations."))))
(define-public ocaml-merlin (define-public ocaml-merlin
(package (package
(inherit ocaml-dot-merlin-reader) (inherit ocaml-dot-merlin-reader)
@ -5024,9 +5449,12 @@ interfaces and the standard higher-level merlin protocol.")
(when tests? (when tests?
(invoke "dune" "runtest" "-p" "merlin,dot-merlin-reader"))))))) (invoke "dune" "runtest" "-p" "merlin,dot-merlin-reader")))))))
(propagated-inputs (list ocaml-merlin-lib ocaml-yojson)) (propagated-inputs (list ocaml-merlin-lib ocaml-yojson))
(properties `((ocaml5.0-variant . ,(delay ocaml5.0-merlin))))
(native-inputs (native-inputs
(list ocaml-dot-merlin-reader ; required for tests (list ocaml-dot-merlin-reader ; required for tests
ocaml-mdx jq)) ocaml-ppxlib
ocaml-mdx
jq))
(synopsis "Context sensitive completion for OCaml in Vim and Emacs") (synopsis "Context sensitive completion for OCaml in Vim and Emacs")
(description "Merlin is an editor service that provides modern IDE (description "Merlin is an editor service that provides modern IDE
features for OCaml. Emacs and Vim support is provided out-of-the-box. features for OCaml. Emacs and Vim support is provided out-of-the-box.
@ -5034,6 +5462,32 @@ External contributors added support for Visual Studio Code, Sublime Text and
Atom.") Atom.")
(license license:expat))) (license license:expat)))
(define-public ocaml5.0-merlin
(package-with-ocaml5.0
(package
(inherit ocaml-merlin-lib-500)
(name "ocaml-merlin")
(arguments
'(#:package "merlin"
#:phases
(modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "dune" "runtest" "-p" "merlin,dot-merlin-reader")))))))
(propagated-inputs (list ocaml-merlin-lib ocaml-yojson))
(native-inputs
(list ocaml-dot-merlin-reader ; required for tests
ocaml-ppxlib
ocaml-mdx
jq))
(synopsis "Context sensitive completion for OCaml in Vim and Emacs")
(description "Merlin is an editor service that provides modern IDE
features for OCaml. Emacs and Vim support is provided out-of-the-box.
External contributors added support for Visual Studio Code, Sublime Text and
Atom.")
(license license:expat))))
(define-public ocaml-gsl (define-public ocaml-gsl
(package (package
(name "ocaml-gsl") (name "ocaml-gsl")
@ -5298,7 +5752,8 @@ functionality for parsing and pretty-printing s-expressions.")
(build-system dune-build-system) (build-system dune-build-system)
(propagated-inputs (propagated-inputs
(list ocaml-sexplib0)) (list ocaml-sexplib0))
(properties `((ocaml4.07-variant . ,(delay ocaml4.07-base)))) (properties `((ocaml4.07-variant . ,(delay ocaml4.07-base))
(ocaml5.0-variant . ,(delay ocaml5.0-base))))
(synopsis (synopsis
"Full standard library replacement for OCaml") "Full standard library replacement for OCaml")
(description (description
@ -5313,6 +5768,28 @@ provided by companion libraries such as
@url{https://github.com/janestreet/stdio, ocaml-stdio}.") @url{https://github.com/janestreet/stdio, ocaml-stdio}.")
(license license:expat))) (license license:expat)))
(define-public ocaml5.0-base
;; This version contains fixes for OCaml 5.0
;; (see https://github.com/ocaml/opam-repository/pull/21851)
(let ((commit "423dbad212f55506767d758b1ceb2d6e0ee8e7f5")
(revision "0"))
(package-with-ocaml5.0
(package
(inherit ocaml-base)
(name "ocaml-base")
(version (git-version "0.15.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/kit-ty-kate/base")
(commit commit)))
(file-name (git-file-name "ocaml5.0-base" version))
(sha256
(base32
"15vsiv3q53l1bzrvqgspf3lp2104s9dzw62z3nl75f53jvjvsyf6"))))
(properties '())))))
(define-public ocaml4.07-base (define-public ocaml4.07-base
(package-with-ocaml4.07 (package-with-ocaml4.07
(package (package
@ -5465,7 +5942,7 @@ as part of the same ocaml-migrate-parsetree driver.")
(define-public ocaml-ppxlib (define-public ocaml-ppxlib
(package (package
(name "ocaml-ppxlib") (name "ocaml-ppxlib")
(version "0.25.0") (version "0.25.1")
(home-page "https://github.com/ocaml-ppx/ppxlib") (home-page "https://github.com/ocaml-ppx/ppxlib")
(source (source
(origin (origin
@ -5476,7 +5953,7 @@ as part of the same ocaml-migrate-parsetree driver.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0wlqvyqy9ccp7z981blv42aqwq7zfq93cakbahjyy48hiiir6vp2")))) "1402fzv5mg5grf3hb82fqsdkzxk07yfp9hvjh33dzjwjsqfhx3wi"))))
(build-system dune-build-system) (build-system dune-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -6545,7 +7022,8 @@ useful errors on failure.")
ocaml-migrate-parsetree ocaml-migrate-parsetree
ocaml-re)) ocaml-re))
(properties `((upstream-name . "ppx_expect") (properties `((upstream-name . "ppx_expect")
(ocaml4.07-variant . ,(delay ocaml4.07-ppx-expect)))) (ocaml4.07-variant . ,(delay ocaml4.07-ppx-expect))
(ocaml5.0-variant . ,(delay ocaml5.0-ppx-expect))))
(home-page "https://github.com/janestreet/ppx_expect") (home-page "https://github.com/janestreet/ppx_expect")
(synopsis "Cram like framework for OCaml") (synopsis "Cram like framework for OCaml")
(description "Expect-test is a framework for writing tests in OCaml, similar (description "Expect-test is a framework for writing tests in OCaml, similar
@ -6555,6 +7033,28 @@ output-generating code, interleaved with @code{%expect} extension expressions
to denote the expected output.") to denote the expected output.")
(license license:asl2.0))) (license license:asl2.0)))
(define-public ocaml5.0-ppx-expect
;; Contains fixes for OCaml 5.0
;; (https://github.com/janestreet/ppx_expect/pull/39/).
(let ((commit "83edfc1ee779e8dcdd975e26715c2e688326befa")
(revision "0"))
(package-with-ocaml5.0
(package
(inherit ocaml-ppx-expect)
(name "ocaml-ppx-expect")
(version (git-version "0.15.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/janestreet/ppx_expect")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"05r7wlmrhb5biwyw6bjcpmr77srglijcbf7nm7h2hiil0d0i7bkz"))))
(properties '())))))
(define-public ocaml4.07-ppx-expect (define-public ocaml4.07-ppx-expect
(package-with-ocaml4.07 (package-with-ocaml4.07
(package (package
@ -7573,9 +8073,7 @@ then run the Bisect_ppx report tool on the generated visitation files.")
(define-public ocaml-odoc (define-public ocaml-odoc
(package (package
(name "ocaml-odoc") (name "ocaml-odoc")
;; 2.2.0-alpha contains fixes for Dune 3.0 compatibility (version "2.2.0")
;; (https://github.com/ocaml/odoc/commit/6ac97f3148f7791ec7451785ef4dbd9ca0daf2d1)
(version "2.2.0-alpha")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -7584,7 +8082,7 @@ then run the Bisect_ppx report tool on the generated visitation files.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "07zjkk455l51i29lcayzrc1q8j5bvbv97sscv8yhcj7x6h6q2nag")))) (base32 "19mww1lyrdi705aw3lwql6xc7p11fcq5gprmhyxpb4x80gnvlzrh"))))
(build-system dune-build-system) (build-system dune-build-system)
(arguments (arguments
`(#:tests? #f; not compatible with current version of ocaml-yojson `(#:tests? #f; not compatible with current version of ocaml-yojson
@ -7836,7 +8334,7 @@ variants.")
(("`") "'") (("`") "'")
(("COMMAND") "[COMMAND]") (("COMMAND") "[COMMAND]")
(("\\.\\.\\.") "…"))))))) (("\\.\\.\\.") "…")))))))
(inputs (propagated-inputs
(list ocaml-fmt (list ocaml-fmt
ocaml-astring ocaml-astring
ocaml-logs ocaml-logs
@ -8205,7 +8703,8 @@ defined in OCaml 4.12.0.")
ocaml-uuseg ocaml-uuseg
ocaml-uutf)) ocaml-uutf))
(native-inputs (native-inputs
(list git-minimal ocaml-alcotest ocaml-ocp-indent ocaml-bisect-ppx)) (list git-minimal/fixed ;for tests
ocaml-alcotest ocaml-ocp-indent ocaml-bisect-ppx))
(home-page "https://github.com/ocaml-ppx/ocamlformat") (home-page "https://github.com/ocaml-ppx/ocamlformat")
(synopsis "Auto-formatter for OCaml code") (synopsis "Auto-formatter for OCaml code")
(description "OCamlFormat is a tool to automatically format OCaml code in (description "OCamlFormat is a tool to automatically format OCaml code in
@ -8527,6 +9026,31 @@ Using this package, you can run afl-fuzz in ``persistent mode'', which avoids
repeated forking and is much faster.") repeated forking and is much faster.")
(license license:expat))) (license license:expat)))
(define-public ocaml-monolith
(package
(name "ocaml-monolith")
(version "20210525")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.inria.fr/fpottier/monolith")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"1b6jj4ivl9ni8kba7wls4xsqdy8nm7q9mnx9347jvb99dmmlj5mc"))))
(build-system dune-build-system)
(arguments `(#:test-target "."))
(propagated-inputs (list ocaml-afl-persistent ocaml-pprint ocaml-seq))
(home-page "https://gitlab.inria.fr/fpottier/monolith")
(synopsis "Framework for testing an OCaml library using afl-fuzz")
(description "Monolith offers facilities for testing an OCaml library (for
instance, a data structure implementation) by comparing it against a reference
implementation. It can be used to perform either random testing or fuzz
testing by using the @code{afl-fuzz} tool.")
(license license:lgpl3+)))
(define-public ocaml-pprint (define-public ocaml-pprint
(package (package
(name "ocaml-pprint") (name "ocaml-pprint")
@ -8581,12 +9105,21 @@ document and by the text width.")
ocaml-uunf ocaml-uunf
ocaml-uutf ocaml-uutf
ocaml-pprint)) ocaml-pprint))
(properties `((ocaml5.0-variant . ,(delay ocaml5.0-crowbar))))
(synopsis "Ocaml library for tests, let a fuzzer find failing cases") (synopsis "Ocaml library for tests, let a fuzzer find failing cases")
(description "Crowbar is a library for testing code, combining (description "Crowbar is a library for testing code, combining
QuickCheck-style property-based testing and the magical bug-finding powers of QuickCheck-style property-based testing and the magical bug-finding powers of
@uref{http://lcamtuf.coredump.cx/afl/, afl-fuzz}.") @uref{http://lcamtuf.coredump.cx/afl/, afl-fuzz}.")
(license license:expat))) (license license:expat)))
(define-public ocaml5.0-crowbar
(package-with-ocaml5.0
(package
(inherit ocaml-crowbar)
;; Tests require ocaml-calendar which does not work with OCaml 5.0
(arguments `(#:tests? #f))
(properties '()))))
(define-public ocaml-eqaf (define-public ocaml-eqaf
(package (package
(name "ocaml-eqaf") (name "ocaml-eqaf")

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

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2017, 2018 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2017, 2018, 2022 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016 John Darrington <jmd@gnu.org> ;;; Copyright © 2016 John Darrington <jmd@gnu.org>
;;; Copyright © 2017, 2018 Leo Famulari <leo@famulari.name> ;;; Copyright © 2017, 2018 Leo Famulari <leo@famulari.name>
;;; Copyright © 2018, 2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
@ -27,6 +27,7 @@
#:use-module (guix licenses) #:use-module (guix licenses)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix gexp)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
@ -84,9 +85,9 @@ IPv4 and IPv6. ONC RPC is notably used by the network file system (NFS).")
(substitute-keyword-arguments (package-arguments libtirpc) (substitute-keyword-arguments (package-arguments libtirpc)
((#:configure-flags flags ''()) ((#:configure-flags flags ''())
;; When cross-building the target system's krb5-config should be used. ;; When cross-building the target system's krb5-config should be used.
`(list (string-append "ac_cv_prog_KRB5_CONFIG=" #~(list (string-append "ac_cv_prog_KRB5_CONFIG="
(assoc-ref %build-inputs "mit-krb5") #$(this-package-input "mit-krb5")
"/bin/krb5-config"))))))) "/bin/krb5-config")))))))
(define libtirpc/fixed (define libtirpc/fixed
(package (package

276
gnu/packages/openldap.scm
View file

@ -2,7 +2,7 @@
;;; Copyright © 2013, 2014, 2015, 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014, 2015, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2016, 2021 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016, 2021 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017, 2018, 2019, 2021 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017, 2018, 2019, 2021, 2022 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2020 Lars-Dominik Braun <ldb@leibniz-psychology.org> ;;; Copyright © 2020 Lars-Dominik Braun <ldb@leibniz-psychology.org>
@ -30,6 +30,7 @@
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages cyrus-sasl) #:use-module (gnu packages cyrus-sasl)
#:use-module (gnu packages databases)
#:use-module (gnu packages dbm) #:use-module (gnu packages dbm)
#:use-module (gnu packages documentation) #:use-module (gnu packages documentation)
#:use-module (gnu packages gettext) #:use-module (gnu packages gettext)
@ -58,6 +59,7 @@
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (guix utils) #:use-module (guix utils)
#: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 python)) #:use-module (guix build-system python))
@ -126,7 +128,7 @@
(define-public openldap-2.6 (define-public openldap-2.6
(package (package
(inherit openldap) (inherit openldap)
(version "2.6.1") (version "2.6.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
;; See <http://www.openldap.org/software/download/> for a list of ;; See <http://www.openldap.org/software/download/> for a list of
@ -142,7 +144,7 @@
"openldap-release/openldap-" version ".tgz"))) "openldap-release/openldap-" version ".tgz")))
(sha256 (sha256
(base32 (base32
"1wz6f3g3bbqgbbxs20zlappmmhapqbl791c0waibhz9djsk6wmwx")))) "0ihddk8c6hg9lkjv0wk0w13g8kb75r8dfsn1n6b77mzk3pbs38nj"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments openldap) (substitute-keyword-arguments (package-arguments openldap)
((#:phases phases) ((#:phases phases)
@ -244,155 +246,151 @@ servers from Python programs.")
(define-public 389-ds-base (define-public 389-ds-base
(package (package
(name "389-ds-base") (name "389-ds-base")
(version "1.4.4.17") ;; More recent versions require rust. That's not bad, but it's a
;; challenge to integrate three build systems.
(version "2.2.2")
(source (origin (source (origin
(method url-fetch) (method git-fetch)
(uri (string-append "https://github.com/389ds/389-ds-base/archive/" (uri (git-reference
"389-ds-base-" version ".tar.gz")) (url "https://github.com/389ds/389-ds-base")
(commit (string-append "389-ds-base-" version))))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0i8m4crbnjjhfb7cq758rd0fxyz36i291yq6fykkprjykz9s3zv4")))) "1sdvfbjfg0091f47562gw3gdc2vgvvhyhdi21lrpwnw9lqc8xdxk"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:modules ((srfi srfi-1) (list
#:modules '((srfi srfi-1)
(guix build gnu-build-system) (guix build gnu-build-system)
((guix build python-build-system) ((guix build python-build-system)
#:select (add-installed-pythonpath python-version)) #:select (add-installed-pythonpath python-version))
(guix build utils)) (guix build utils))
#:imported-modules ((guix build python-build-system) #:imported-modules `((guix build python-build-system)
,@%gnu-build-system-modules) ,@%gnu-build-system-modules)
#:configure-flags #:configure-flags
(list (string-append "--with-db=" #~(list "--enable-cmocka"
(assoc-ref %build-inputs "bdb")) (string-append "--with-db="
(string-append "--with-sasl=" #$(this-package-input "bdb"))
(assoc-ref %build-inputs "cyrus-sasl")) (string-append "--with-netsnmp="
(string-append "--with-netsnmp=" #$(this-package-input "net-snmp"))
(assoc-ref %build-inputs "net-snmp")) (string-append "--with-selinux="
(string-append "--with-pcre=" #$(this-package-input "libselinux"))
(assoc-ref %build-inputs "pcre")) "--localstatedir=/var"
(string-append "--with-selinux=" "--with-instconfigdir=/etc/dirsrv")
(assoc-ref %build-inputs "libselinux")) #:phases
"--localstatedir=/var" #~(modify-phases %standard-phases
"--with-instconfigdir=/etc/dirsrv" (add-after 'unpack 'fix-references
;; The Perl scripts are being removed in the 1.4.0 release. (lambda _
;; Building them would require packaging of the outdated Mozilla ;; Avoid dependency on systemd-detect-virt
;; LDAP SDK (instead of OpenLDAP) and PerLDAP. (substitute* "src/lib389/lib389/instance/setup.py"
"--disable-perl") (("container_result = subprocess.*") "container_result = 1\n")
#:phases (("container_result.returncode") "container_result"))
(modify-phases %standard-phases (substitute* "ldap/servers/plugins/sync/sync_persist.c"
(add-after 'unpack 'fix-references (("nspr4") "nspr"))
(lambda _ (substitute* "src/lib389/lib389/utils.py"
(substitute* "include/ldaputil/certmap.h" (("'/sbin/ip'")
(("nss3/cert.h") "nss/cert.h")) (string-append "'" (which "ip") "'")))
(substitute* "src/lib389/lib389/utils.py" (substitute* "src/lib389/lib389/nss_ssl.py"
(("'/sbin/ip'") (("'/usr/bin/certutil'")
(string-append "'" (which "ip") "'"))) (string-append "'" (which "certutil") "'"))
(substitute* "src/lib389/lib389/nss_ssl.py" (("'/usr/bin/openssl'")
(("'/usr/bin/certutil'") (string-append "'" (which "openssl") "'")))))
(string-append "'" (which "certutil") "'")) (add-after 'unpack 'overwrite-default-locations
(("'/usr/bin/openssl'") (lambda _
(string-append "'" (which "openssl") "'")) (substitute* "src/lib389/lib389/paths.py"
(("'/usr/bin/c_rehash'") (("/usr/share/dirsrv/inf/defaults.inf")
(string-append "'" (which "perl") "', '" (string-append #$output "/share/dirsrv/inf/defaults.inf")))
(which "c_rehash") "'"))))) ;; This directory can only be specified relative to sysconfdir. This
(add-after 'unpack 'overwrite-default-locations ;; is used to determine where to look for installed directory
(lambda* (#:key outputs #:allow-other-keys) ;; servers, so in the absence of a search path it needs to be global.
(let ((out (assoc-ref outputs "out"))) (substitute* "ldap/admin/src/defaults.inf.in"
(substitute* "src/lib389/lib389/paths.py" (("^initconfig_dir =.*")
(("/usr/share/dirsrv/inf/defaults.inf") "initconfig_dir = /etc/dirsrv/registry\n"))
(string-append out "/share/dirsrv/inf/defaults.inf"))) ;; This is used to determine where to write certificate files
;; This directory can only be specified relative to sysconfdir. This ;; when installing new directory server instances.
;; is used to determine where to look for installed directory (substitute* "src/lib389/lib389/instance/setup.py"
;; servers, so in the absence of a search path it needs to be global. (("etc_dirsrv_path = .*")
(substitute* "ldap/admin/src/defaults.inf.in" "etc_dirsrv_path = '/etc/dirsrv/'\n"))))
(("^initconfig_dir =.*") (add-after 'unpack 'fix-install-location-of-python-tools
"initconfig_dir = /etc/dirsrv/registry\n")) (lambda* (#:key inputs outputs #:allow-other-keys)
;; This is used to determine where to write certificate files (let ((pythondir (string-append
;; when installing new directory server instances. #$output "/lib/python"
(substitute* '("src/lib389/lib389/instance/setup.py" (python-version #$(this-package-input "python"))
"src/lib389/lib389/instance/remove.py")
(("etc_dirsrv_path = .*")
"etc_dirsrv_path = '/etc/dirsrv/'\n")))))
(add-after 'unpack 'fix-install-location-of-python-tools
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(pythondir (string-append
out "/lib/python"
(python-version (assoc-ref inputs "python"))
"/site-packages/"))) "/site-packages/")))
;; Install directory must be on PYTHONPATH. ;; Install directory must be on PYTHONPATH.
(add-installed-pythonpath inputs outputs) (add-installed-pythonpath inputs outputs)
;; Install directory must exist. ;; Install directory must exist.
(mkdir-p pythondir) (mkdir-p pythondir)
(substitute* "src/lib389/setup.py" (setenv "INSTALL_PREFIX" #$output)
(("/usr") out)) (substitute* "Makefile.am"
(substitute* "Makefile.am" (("setup.py install --skip-build" m)
(("setup.py install --skip-build" m) (string-append
(string-append m " --prefix=" #$output
m " --prefix=" out " --root=/ --single-version-externally-managed"))))))
" --root=/ --single-version-externally-managed")))))) (add-after 'build 'build-python-tools
(add-after 'build 'build-python-tools (lambda* (#:key make-flags #:allow-other-keys)
(lambda* (#:key make-flags #:allow-other-keys) ;; Set DETERMINISTIC_BUILD to override the embedded mtime in pyc
;; Set DETERMINISTIC_BUILD to override the embedded mtime in pyc ;; files.
;; files. (setenv "DETERMINISTIC_BUILD" "1")
(setenv "DETERMINISTIC_BUILD" "1") ;; Use deterministic hashes for strings, bytes, and datetime
;; Use deterministic hashes for strings, bytes, and datetime ;; objects.
;; objects. (setenv "PYTHONHASHSEED" "0")
(setenv "PYTHONHASHSEED" "0") (apply invoke "make" "lib389" make-flags)))
(apply invoke "make" "lib389" make-flags))) (add-after 'install 'install-python-tools
(add-after 'install 'install-python-tools (lambda* (#:key make-flags #:allow-other-keys)
(lambda* (#:key make-flags #:allow-other-keys) (apply invoke "make" "lib389-install" make-flags)))
(apply invoke "make" "lib389-install" make-flags))) (add-after 'install-python-tools 'wrap-python-tools
(add-after 'install-python-tools 'wrap-python-tools (lambda* (#:key outputs #:allow-other-keys)
(lambda* (#:key outputs #:allow-other-keys) (let ((pythonpath (getenv "GUIX_PYTHONPATH")))
(let* ((out (assoc-ref outputs "out")) (for-each (lambda (file)
(pythonpath (getenv "GUIX_PYTHONPATH"))) (wrap-program (string-append #$output file)
(for-each (lambda (file) `("GUIX_PYTHONPATH" ":" prefix (,pythonpath))))
(wrap-program (string-append out file) '("/sbin/dsconf"
`("GUIX_PYTHONPATH" ":" prefix (,pythonpath)))) "/sbin/dscreate"
'("/sbin/dsconf" "/sbin/dsctl"
"/sbin/dscreate" "/sbin/dsidm"
"/sbin/dsctl" "/bin/ds-logpipe.py"
"/sbin/dsidm" "/bin/ds-replcheck"))))))))
"/bin/ds-logpipe.py"
"/bin/ds-replcheck"))))))))
(inputs (inputs
`(("bdb" ,bdb) (list bdb
("cracklib" ,cracklib) cracklib
("cyrus-sasl" ,cyrus-sasl) cyrus-sasl
("gnutls" ,gnutls) gnutls
("httpd" ,httpd) httpd
("icu4c" ,icu4c) icu4c
("iproute" ,iproute) iproute
("libevent" ,libevent) json-c
("libselinux" ,libselinux) libevent
("linux-pam" ,linux-pam) libselinux
("mit-krb5" ,mit-krb5) linux-pam
("net-snmp" ,net-snmp) lmdb
("nspr" ,nspr) mit-krb5
("nss" ,nss) net-snmp
("nss:bin" ,nss "bin") ; for certutil nspr
("openldap" ,openldap) nss
("openssl" ,openssl) ; #included by net-snmp (list nss "bin") ;for certutil
("pcre" ,pcre) openldap
("perl" ,perl) openssl ;#included by net-snmp
("python" ,python) pcre
("python-pyasn1" ,python-pyasn1) python
("python-pyasn1-modules" ,python-pyasn1-modules) python-pyasn1
("python-pytest" ,python-pytest) python-pyasn1-modules
("python-dateutil" ,python-dateutil) python-pytest
("python-six" ,python-six) python-dateutil
("python-argcomplete" ,python-argcomplete) python-six
("python-argparse-manpage" ,python-argparse-manpage) python-argcomplete
("python-ldap" ,python-ldap))) python-argparse-manpage
python-ldap))
(native-inputs (native-inputs
`(("autoconf" ,autoconf) (list autoconf
("automake" ,automake) automake
("doxygen" ,doxygen) cmocka
("gettext" ,gettext-minimal) doxygen
("libtool" ,libtool) gettext-minimal
("rsync" ,rsync) libtool
("pkg-config" ,pkg-config))) rsync
pkg-config))
(home-page "https://directory.fedoraproject.org") (home-page "https://directory.fedoraproject.org")
(synopsis "Enterprise-class LDAP server") (synopsis "Enterprise-class LDAP server")
(description "389ds is an enterprise-class LDAP server. It is hardened by (description "389ds is an enterprise-class LDAP server. It is hardened by

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