me/guix
Archived
1
0
Fork 0
Code Activity

Merge branch 'master' into staging

Browse source
This commit is contained in:
Marius Bakke 2022-08-11 22:15:22 +02:00
commit b50eaa6764
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
312 changed files with 180117 additions and 186817 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.guix-authorizations
View file

@ -4,7 +4,8 @@
(authorizations (authorizations
(version 0) (version 0)
(("D963 A5A3 8A80 3D52 4461 F914 7483 0A27 6C32 8EC2" (;; primary: "D963 A5A3 8A80 3D52 4461 F914 7483 0A27 6C32 8EC2"
("2841 9AC6 5038 7440 C7E9 2FFA 2208 D209 58C1 DEB0"
(name "abcdw")) (name "abcdw"))
("4FB9 9F49 2B12 A365 7997 E664 8246 0C08 2A0E E98F" ("4FB9 9F49 2B12 A365 7997 E664 8246 0C08 2A0E E98F"
(name "alezost")) (name "alezost"))

17
Makefile.am
View file

@ -130,6 +130,7 @@ MODULES = \
guix/cve.scm \ guix/cve.scm \
guix/workers.scm \ guix/workers.scm \
guix/least-authority.scm \ guix/least-authority.scm \
guix/read-print.scm \
guix/ipfs.scm \ guix/ipfs.scm \
guix/platform.scm \ guix/platform.scm \
guix/platforms/arm.scm \ guix/platforms/arm.scm \
@ -141,6 +142,7 @@ MODULES = \
guix/build-system/android-ndk.scm \ guix/build-system/android-ndk.scm \
guix/build-system/ant.scm \ guix/build-system/ant.scm \
guix/build-system/cargo.scm \ guix/build-system/cargo.scm \
guix/build-system/channel.scm \
guix/build-system/chicken.scm \ guix/build-system/chicken.scm \
guix/build-system/clojure.scm \ guix/build-system/clojure.scm \
guix/build-system/cmake.scm \ guix/build-system/cmake.scm \
@ -524,6 +526,7 @@ SCM_TESTS = \
tests/profiles.scm \ tests/profiles.scm \
tests/publish.scm \ tests/publish.scm \
tests/pypi.scm \ tests/pypi.scm \
tests/read-print.scm \
tests/records.scm \ tests/records.scm \
tests/scripts.scm \ tests/scripts.scm \
tests/search-paths.scm \ tests/search-paths.scm \
@ -578,6 +581,7 @@ SH_TESTS = \
tests/guix-package.sh \ tests/guix-package.sh \
tests/guix-package-aliases.sh \ tests/guix-package-aliases.sh \
tests/guix-package-net.sh \ tests/guix-package-net.sh \
tests/guix-style.sh \
tests/guix-system.sh \ tests/guix-system.sh \
tests/guix-home.sh \ tests/guix-home.sh \
tests/guix-archive.sh \ tests/guix-archive.sh \
@ -973,18 +977,14 @@ release: dist-with-updated-version all
mv "guix-binary.$$system.tar.xz" \ mv "guix-binary.$$system.tar.xz" \
"$(releasedir)/guix-binary-$(PACKAGE_VERSION).$$system.tar.xz" ; \ "$(releasedir)/guix-binary-$(PACKAGE_VERSION).$$system.tar.xz" ; \
done done
# Bump the Guix package version and build it (again). # Build 'current-guix' to speed things up for the next step.
GUIX_ALLOW_ME_TO_USE_PRIVATE_COMMIT=yes \ $(top_builddir)/pre-inst-env guix build \
$(top_builddir)/pre-inst-env "$(GUILE)" \ -e '((@ (gnu packages package-management) current-guix))' \
$(top_srcdir)/build-aux/update-guix-package.scm \
"`git rev-parse HEAD`"
git add $(top_srcdir)/gnu/packages/package-management.scm
git commit -m "gnu: guix: Update to `git rev-parse HEAD | cut -c1-7`."
$(top_builddir)/pre-inst-env guix build guix \
$(call system_flags,$(GUIX_SYSTEM_SUPPORTED_SYSTEMS)) \ $(call system_flags,$(GUIX_SYSTEM_SUPPORTED_SYSTEMS)) \
-v1 --no-grafts --fallback -v1 --no-grafts --fallback
# Generate the ISO installation images. # Generate the ISO installation images.
for system in $(GUIX_SYSTEM_SUPPORTED_SYSTEMS) ; do \ for system in $(GUIX_SYSTEM_SUPPORTED_SYSTEMS) ; do \
GUIX_DISPLAYED_VERSION="`git describe --match=v* | sed -'es/^v//v'`" ; \
image=`$(top_builddir)/pre-inst-env \ image=`$(top_builddir)/pre-inst-env \
guix system image -t iso9660 \ guix system image -t iso9660 \
--label="GUIX_$${system}_$(VERSION)" \ --label="GUIX_$${system}_$(VERSION)" \
@ -1000,6 +1000,7 @@ release: dist-with-updated-version all
done done
# Generate the VM images. # Generate the VM images.
for system in $(GUIX_SYSTEM_VM_SYSTEMS) ; do \ for system in $(GUIX_SYSTEM_VM_SYSTEMS) ; do \
GUIX_DISPLAYED_VERSION="`git describe --match=v* | sed -'es/^v//v'`" ; \
image=`$(top_builddir)/pre-inst-env \ image=`$(top_builddir)/pre-inst-env \
guix system image -t qcow2 $(GUIX_SYSTEM_VM_IMAGE_FLAGS) \ guix system image -t qcow2 $(GUIX_SYSTEM_VM_IMAGE_FLAGS) \
--save-provenance \ --save-provenance \

452
doc/guix.texi
View file

@ -4362,7 +4362,8 @@ nothing and exit immediately.
@item --delete-generations[=@var{duration}] @item --delete-generations[=@var{duration}]
@itemx -d [@var{duration}] @itemx -d [@var{duration}]
Before starting the garbage collection process, delete all the generations Before starting the garbage collection process, delete all the generations
older than @var{duration}, for all the user profiles; when run as root, this older than @var{duration}, for all the user profiles and home environment
generations; when run as root, this
applies to all the profiles @emph{of all the users}. applies to all the profiles @emph{of all the users}.
For example, this command deletes all the generations of all your profiles For example, this command deletes all the generations of all your profiles
@ -7875,8 +7876,8 @@ upstream version, with different dependencies, different compilation
options, and so on. Some of these custom packages can be defined options, and so on. Some of these custom packages can be defined
straight from the command line (@pxref{Package Transformation Options}). straight from the command line (@pxref{Package Transformation Options}).
This section describes how to define package variants in code. This can This section describes how to define package variants in code. This can
be useful in ``manifests'' (@pxref{profile-manifest, be useful in ``manifests'' (@pxref{Writing Manifests})
@option{--manifest}}) and in your own package collection and in your own package collection
(@pxref{Creating a Channel}), among others! (@pxref{Creating a Channel}), among others!
@cindex inherit, for package definitions @cindex inherit, for package definitions
@ -9567,6 +9568,19 @@ with @code{build-expression->derivation} (@pxref{Derivations,
@code{build-expression->derivation}}). @code{build-expression->derivation}}).
@end defvr @end defvr
@defvr {Scheme Variable} channel-build-system
This variable is exported by @code{(guix build-system channel)}.
This build system is meant primarily for internal use. A package using
this build system must have a channel specification as its @code{source}
field (@pxref{Channels}); alternatively, its source can be a directory
name, in which case an additional @code{#:commit} argument must be
supplied to specify the commit being built (a hexadecimal string).
The resulting package is a Guix instance of the given channel, similar
to how @command{guix time-machine} would build it.
@end defvr
@node Build Phases @node Build Phases
@section Build Phases @section Build Phases
@ -14057,9 +14071,12 @@ otherwise.
@node Invoking guix style @node Invoking guix style
@section Invoking @command{guix style} @section Invoking @command{guix style}
The @command{guix style} command helps packagers style their package The @command{guix style} command helps users and packagers alike style
definitions according to the latest fashionable trends. The command their package definitions and configuration files according to the
currently provides the following styling rules: latest fashionable trends. It can either reformat whole files, with the
@option{--whole-file} option, or apply specific @dfn{styling rules} to
individual package definitions. The command currently provides the
following styling rules:
@itemize @itemize
@item @item
@ -14114,6 +14131,12 @@ the packages. The @option{--styling} or @option{-S} option allows you
to select the style rule, the default rule being @code{format}---see to select the style rule, the default rule being @code{format}---see
below. below.
To reformat entire source files, the syntax is:
@example
guix style --whole-file @var{file}@dots{}
@end example
The available options are listed below. The available options are listed below.
@table @code @table @code
@ -14121,6 +14144,19 @@ The available options are listed below.
@itemx -n @itemx -n
Show source file locations that would be edited but do not modify them. Show source file locations that would be edited but do not modify them.
@item --whole-file
@itemx -f
Reformat the given files in their entirety. In that case, subsequent
arguments are interpreted as file names (rather than package names), and
the @option{--styling} option has no effect.
As an example, here is how you might reformat your operating system
configuration (you need write permissions for the file):
@example
guix style -f /etc/config.scm
@end example
@item --styling=@var{rule} @item --styling=@var{rule}
@itemx -S @var{rule} @itemx -S @var{rule}
Apply @var{rule}, one of the following styling rules: Apply @var{rule}, one of the following styling rules:
@ -14358,6 +14394,16 @@ names returned by @option{--list-checkers}.
Only disable the checkers specified in a comma-separated list using the Only disable the checkers specified in a comma-separated list using the
names returned by @option{--list-checkers}. names returned by @option{--list-checkers}.
@item --expression=@var{expr}
@itemx -e @var{expr}
Consider the package @var{expr} evaluates to.
This is useful to unambiguously designate packages, as in this example:
@example
guix lint -c archival -e '(@@ (gnu packages guile) guile-3.0)'
@end example
@item --no-network @item --no-network
@itemx -n @itemx -n
Only enable the checkers that do not depend on Internet access. Only enable the checkers that do not depend on Internet access.
@ -16375,8 +16421,9 @@ include @code{read-only}, @code{bind-mount}, @code{no-dev} (disallow
access to special files), @code{no-suid} (ignore setuid and setgid access to special files), @code{no-suid} (ignore setuid and setgid
bits), @code{no-atime} (do not update file access times), bits), @code{no-atime} (do not update file access times),
@code{strict-atime} (update file access time), @code{lazy-time} (only @code{strict-atime} (update file access time), @code{lazy-time} (only
update time on the in-memory version of the file inode), and update time on the in-memory version of the file inode),
@code{no-exec} (disallow program execution). @code{no-exec} (disallow program execution), and @code{shared} (make the
mount shared).
@xref{Mount-Unmount-Remount,,, libc, The GNU C Library Reference @xref{Mount-Unmount-Remount,,, libc, The GNU C Library Reference
Manual}, for more information on these flags. Manual}, for more information on these flags.
@ -18810,9 +18857,10 @@ The log rotation frequency, a symbol.
@item @code{files} @item @code{files}
The list of files or file glob patterns to rotate. The list of files or file glob patterns to rotate.
@item @code{options} (default: @code{'()}) @vindex %default-log-rotation-options
@item @code{options} (default: @code{%default-log-rotation-options})
The list of rottlog options for this rotation (@pxref{Configuration The list of rottlog options for this rotation (@pxref{Configuration
parameters,,, rottlog, GNU Rot[t]lg Manual}). parameters,,, rottlog, GNU Rot[t]log Manual}).
@item @code{post-rotate} (default: @code{#f}) @item @code{post-rotate} (default: @code{#f})
Either @code{#f} or a gexp to execute once the rotation has completed. Either @code{#f} or a gexp to execute once the rotation has completed.
@ -19767,75 +19815,46 @@ The value of this service is a @code{opendht-configuration} object, as
described below. described below.
@end defvr @end defvr
@deftp {Data Type} opendht-configuration
This is the data type for the OpenDHT service configuration.
@c The fields documentation has been auto-generated using the @c The fields documentation has been auto-generated using the
@c configuration->documentation procedure from @c configuration->documentation procedure from
@c (gnu services configuration). @c (gnu services configuration).
@deftp {Data Type} opendht-configuration
Available @code{opendht-configuration} fields are: Available @code{opendht-configuration} fields are:
@deftypevr {@code{opendht-configuration} parameter} package opendht @table @asis
@item @code{opendht} (default: @code{opendht}) (type: file-like)
The @code{opendht} package to use. The @code{opendht} package to use.
@end deftypevr @item @code{peer-discovery?} (default: @code{#f}) (type: boolean)
@deftypevr {@code{opendht-configuration} parameter} boolean peer-discovery?
Whether to enable the multicast local peer discovery mechanism. Whether to enable the multicast local peer discovery mechanism.
Defaults to @samp{#f}. @item @code{enable-logging?} (default: @code{#f}) (type: boolean)
@end deftypevr
@deftypevr {@code{opendht-configuration} parameter} boolean enable-logging?
Whether to enable logging messages to syslog. It is disabled by default Whether to enable logging messages to syslog. It is disabled by default
as it is rather verbose. as it is rather verbose.
Defaults to @samp{#f}. @item @code{debug?} (default: @code{#f}) (type: boolean)
@end deftypevr
@deftypevr {@code{opendht-configuration} parameter} boolean debug?
Whether to enable debug-level logging messages. This has no effect if Whether to enable debug-level logging messages. This has no effect if
logging is disabled. logging is disabled.
Defaults to @samp{#f}. @item @code{bootstrap-host} (default: @code{"bootstrap.jami.net:4222"}) (type: maybe-string)
@end deftypevr
@deftypevr {@code{opendht-configuration} parameter} maybe-string bootstrap-host
The node host name that is used to make the first connection to the The node host name that is used to make the first connection to the
network. A specific port value can be provided by appending the network. A specific port value can be provided by appending the
@code{:PORT} suffix. By default, it uses the Jami bootstrap nodes, but @code{:PORT} suffix. By default, it uses the Jami bootstrap nodes, but
any host can be specified here. It's also possible to disable any host can be specified here. It's also possible to disable
bootsrapping by explicitly setting this to the @code{*unspecified*} bootstrapping by explicitly setting this field to the
value. @code{'unset} value.
Defaults to @samp{"bootstrap.jami.net:4222"}. @item @code{port} (default: @code{4222}) (type: maybe-number)
The UDP port to bind to. When left unspecified, an available port is
automatically selected.
@end deftypevr @item @code{proxy-server-port} (type: maybe-number)
@deftypevr {@code{opendht-configuration} parameter} maybe-number port
The UDP port to bind to. When explicitly set to @code{*unspecified*},
an available port is automatically selected.
Defaults to @samp{4222}.
@end deftypevr
@deftypevr {@code{opendht-configuration} parameter} maybe-number proxy-server-port
Spawn a proxy server listening on the specified port. Spawn a proxy server listening on the specified port.
Defaults to @samp{disabled}. @item @code{proxy-server-port-tls} (type: maybe-number)
@end deftypevr
@deftypevr {@code{opendht-configuration} parameter} maybe-number proxy-server-port-tls
Spawn a proxy server listening to TLS connections on the specified port. Spawn a proxy server listening to TLS connections on the specified port.
Defaults to @samp{disabled}. @end table
@end deftypevr
@end deftp @end deftp
@cindex Tor @cindex Tor
@ -21015,7 +21034,7 @@ List of GNOME Shell assets needed by GDM: icon theme, fonts, etc.
@item @code{xorg-configuration} (default: @code{(xorg-configuration)}) @item @code{xorg-configuration} (default: @code{(xorg-configuration)})
Configuration of the Xorg graphical server. Configuration of the Xorg graphical server.
@item @code{xsession} (default: @code{(xinitrc)}) @item @code{x-session} (default: @code{(xinitrc)})
Script to run before starting a X session. Script to run before starting a X session.
@item @code{dbus-daemon} (default: @code{dbus-daemon-wrapper}) @item @code{dbus-daemon} (default: @code{dbus-daemon-wrapper})
@ -21168,7 +21187,7 @@ Select display server to use for the greeter. Valid values are
@item @code{numlock} (default: "on") @item @code{numlock} (default: "on")
Valid values are @samp{"on"}, @samp{"off"} or @samp{"none"}. Valid values are @samp{"on"}, @samp{"off"} or @samp{"none"}.
@item @code{halt-command} (default @code{#~(string-apppend #$shepherd "/sbin/halt")}) @item @code{halt-command} (default @code{#~(string-append #$shepherd "/sbin/halt")})
Command to run when halting. Command to run when halting.
@item @code{reboot-command} (default @code{#~(string-append #$shepherd "/sbin/reboot")}) @item @code{reboot-command} (default @code{#~(string-append #$shepherd "/sbin/reboot")})
@ -22423,7 +22442,7 @@ their default values are:
@item handle-lid-switch-docked @item handle-lid-switch-docked
@code{ignore} @code{ignore}
@item handle-lid-switch-external-power @item handle-lid-switch-external-power
@code{ignore} @code{*unspecified*}
@item power-key-ignore-inhibited? @item power-key-ignore-inhibited?
@code{#f} @code{#f}
@item suspend-key-ignore-inhibited? @item suspend-key-ignore-inhibited?
@ -25147,6 +25166,11 @@ it listens on the loopback network interface, and allows for mail from
users and daemons on the local machine, as well as permitting email to users and daemons on the local machine, as well as permitting email to
remote servers. Run @command{man smtpd.conf} for more information. remote servers. Run @command{man smtpd.conf} for more information.
@item @code{setgid-commands?} (default: @code{#t})
Make the following commands setgid to @code{smtpq} so they can be
executed: @command{smtpctl}, @command{sendmail}, @command{send-mail},
@command{makemap}, @command{mailq}, and @command{newaliases}.
@xref{Setuid Programs}, for more information on setgid programs.
@end table @end table
@end deftp @end deftp
@ -30525,362 +30549,184 @@ Both can be run simultaneously.
@c %automatically generated documentation @c %automatically generated documentation
@deftp {Data Type} openvpn-client-configuration
Available @code{openvpn-client-configuration} fields are: Available @code{openvpn-client-configuration} fields are:
@deftypevr {@code{openvpn-client-configuration} parameter} package openvpn @table @asis
@item @code{openvpn} (default: @code{openvpn}) (type: file-like)
The OpenVPN package. The OpenVPN package.
@end deftypevr @item @code{pid-file} (default: @code{"/var/run/openvpn/openvpn.pid"}) (type: string)
@deftypevr {@code{openvpn-client-configuration} parameter} string pid-file
The OpenVPN pid file. The OpenVPN pid file.
Defaults to @samp{"/var/run/openvpn/openvpn.pid"}. @item @code{proto} (default: @code{udp}) (type: proto)
@end deftypevr
@deftypevr {@code{openvpn-client-configuration} parameter} proto proto
The protocol (UDP or TCP) used to open a channel between clients and The protocol (UDP or TCP) used to open a channel between clients and
servers. servers.
Defaults to @samp{udp}. @item @code{dev} (default: @code{tun}) (type: dev)
@end deftypevr
@deftypevr {@code{openvpn-client-configuration} parameter} dev dev
The device type used to represent the VPN connection. The device type used to represent the VPN connection.
Defaults to @samp{tun}. @item @code{ca} (default: @code{"/etc/openvpn/ca.crt"}) (type: maybe-string)
@end deftypevr
If you do not have some of these files (eg.@: you use a username and
password), you can disable any of the following three fields by setting
it to @code{*unspecified*}.
@deftypevr {@code{openvpn-client-configuration} parameter} maybe-string ca
The certificate authority to check connections against. The certificate authority to check connections against.
Defaults to @samp{"/etc/openvpn/ca.crt"}. @item @code{cert} (default: @code{"/etc/openvpn/client.crt"}) (type: maybe-string)
@end deftypevr
@deftypevr {@code{openvpn-client-configuration} parameter} maybe-string cert
The certificate of the machine the daemon is running on. It should be The certificate of the machine the daemon is running on. It should be
signed by the authority given in @code{ca}. signed by the authority given in @code{ca}.
Defaults to @samp{"/etc/openvpn/client.crt"}. @item @code{key} (default: @code{"/etc/openvpn/client.key"}) (type: maybe-string)
The key of the machine the daemon is running on. It must be the key
whose certificate is @code{cert}.
@end deftypevr @item @code{comp-lzo?} (default: @code{#t}) (type: boolean)
@deftypevr {@code{openvpn-client-configuration} parameter} maybe-string key
The key of the machine the daemon is running on. It must be the key whose
certificate is @code{cert}.
Defaults to @samp{"/etc/openvpn/client.key"}.
@end deftypevr
@deftypevr {@code{openvpn-client-configuration} parameter} boolean comp-lzo?
Whether to use the lzo compression algorithm. Whether to use the lzo compression algorithm.
Defaults to @samp{#t}. @item @code{persist-key?} (default: @code{#t}) (type: boolean)
@end deftypevr
@deftypevr {@code{openvpn-client-configuration} parameter} boolean persist-key?
Don't re-read key files across SIGUSR1 or --ping-restart. Don't re-read key files across SIGUSR1 or --ping-restart.
Defaults to @samp{#t}. @item @code{persist-tun?} (default: @code{#t}) (type: boolean)
@end deftypevr
@deftypevr {@code{openvpn-client-configuration} parameter} boolean persist-tun?
Don't close and reopen TUN/TAP device or run up/down scripts across Don't close and reopen TUN/TAP device or run up/down scripts across
SIGUSR1 or --ping-restart restarts. SIGUSR1 or --ping-restart restarts.
Defaults to @samp{#t}. @item @code{fast-io?} (default: @code{#f}) (type: boolean)
@end deftypevr
@deftypevr {@code{openvpn-client-configuration} parameter} boolean fast-io?
(Experimental) Optimize TUN/TAP/UDP I/O writes by avoiding a call to (Experimental) Optimize TUN/TAP/UDP I/O writes by avoiding a call to
poll/epoll/select prior to the write operation. poll/epoll/select prior to the write operation.
Defaults to @samp{#f}. @item @code{verbosity} (default: @code{3}) (type: number)
@end deftypevr
@deftypevr {@code{openvpn-client-configuration} parameter} number verbosity
Verbosity level. Verbosity level.
Defaults to @samp{3}. @item @code{tls-auth} (default: @code{#f}) (type: tls-auth-client)
@end deftypevr
@deftypevr {@code{openvpn-client-configuration} parameter} tls-auth-client tls-auth
Add an additional layer of HMAC authentication on top of the TLS control Add an additional layer of HMAC authentication on top of the TLS control
channel to protect against DoS attacks. channel to protect against DoS attacks.
Defaults to @samp{#f}. @item @code{auth-user-pass} (type: maybe-string)
@end deftypevr
@deftypevr {@code{openvpn-client-configuration} parameter} maybe-string auth-user-pass
Authenticate with server using username/password. The option is a file Authenticate with server using username/password. The option is a file
containing username/password on 2 lines. Do not use a file-like object as it containing username/password on 2 lines. Do not use a file-like object
would be added to the store and readable by any user. as it would be added to the store and readable by any user.
@end deftypevr @item @code{verify-key-usage?} (default: @code{#t}) (type: key-usage)
@deftypevr {@code{openvpn-client-configuration} parameter} key-usage verify-key-usage?
Whether to check the server certificate has server usage extension. Whether to check the server certificate has server usage extension.
Defaults to @samp{#t}. @item @code{bind?} (default: @code{#f}) (type: bind)
@end deftypevr
@deftypevr {@code{openvpn-client-configuration} parameter} bind bind?
Bind to a specific local port number. Bind to a specific local port number.
Defaults to @samp{#f}. @item @code{resolv-retry?} (default: @code{#t}) (type: resolv-retry)
@end deftypevr
@deftypevr {@code{openvpn-client-configuration} parameter} resolv-retry resolv-retry?
Retry resolving server address. Retry resolving server address.
Defaults to @samp{#t}. @item @code{remote} (default: @code{()}) (type: openvpn-remote-list)
@end deftypevr
@deftypevr {@code{openvpn-client-configuration} parameter} openvpn-remote-list remote
A list of remote servers to connect to. A list of remote servers to connect to.
Defaults to @samp{()}. @deftp {Data Type} openvpn-remote-configuration
Available @code{openvpn-remote-configuration} fields are: Available @code{openvpn-remote-configuration} fields are:
@deftypevr {@code{openvpn-remote-configuration} parameter} string name @table @asis
@item @code{name} (default: @code{"my-server"}) (type: string)
Server name. Server name.
Defaults to @samp{"my-server"}. @item @code{port} (default: @code{1194}) (type: number)
@end deftypevr
@deftypevr {@code{openvpn-remote-configuration} parameter} number port
Port number the server listens to. Port number the server listens to.
Defaults to @samp{1194}. @end table
@end deftypevr @end deftp
@end table
@end deftp
@end deftypevr
@c %end of automatic openvpn-client documentation @c %end of automatic openvpn-client documentation
@c %automatically generated documentation @c %automatically generated documentation
@deftp {Data Type} openvpn-server-configuration
Available @code{openvpn-server-configuration} fields are: Available @code{openvpn-server-configuration} fields are:
@deftypevr {@code{openvpn-server-configuration} parameter} package openvpn @table @asis
@item @code{openvpn} (default: @code{openvpn}) (type: file-like)
The OpenVPN package. The OpenVPN package.
@end deftypevr @item @code{pid-file} (default: @code{"/var/run/openvpn/openvpn.pid"}) (type: string)
@deftypevr {@code{openvpn-server-configuration} parameter} string pid-file
The OpenVPN pid file. The OpenVPN pid file.
Defaults to @samp{"/var/run/openvpn/openvpn.pid"}. @item @code{proto} (default: @code{udp}) (type: proto)
@end deftypevr
@deftypevr {@code{openvpn-server-configuration} parameter} proto proto
The protocol (UDP or TCP) used to open a channel between clients and The protocol (UDP or TCP) used to open a channel between clients and
servers. servers.
Defaults to @samp{udp}. @item @code{dev} (default: @code{tun}) (type: dev)
@end deftypevr
@deftypevr {@code{openvpn-server-configuration} parameter} dev dev
The device type used to represent the VPN connection. The device type used to represent the VPN connection.
Defaults to @samp{tun}. @item @code{ca} (default: @code{"/etc/openvpn/ca.crt"}) (type: maybe-string)
@end deftypevr
If you do not have some of these files (eg.@: you use a username and
password), you can disable any of the following three fields by setting
it to @code{*unspecified*}.
@deftypevr {@code{openvpn-server-configuration} parameter} maybe-string ca
The certificate authority to check connections against. The certificate authority to check connections against.
Defaults to @samp{"/etc/openvpn/ca.crt"}. @item @code{cert} (default: @code{"/etc/openvpn/client.crt"}) (type: maybe-string)
@end deftypevr
@deftypevr {@code{openvpn-server-configuration} parameter} maybe-string cert
The certificate of the machine the daemon is running on. It should be The certificate of the machine the daemon is running on. It should be
signed by the authority given in @code{ca}. signed by the authority given in @code{ca}.
Defaults to @samp{"/etc/openvpn/client.crt"}. @item @code{key} (default: @code{"/etc/openvpn/client.key"}) (type: maybe-string)
The key of the machine the daemon is running on. It must be the key
whose certificate is @code{cert}.
@end deftypevr @item @code{comp-lzo?} (default: @code{#t}) (type: boolean)
@deftypevr {@code{openvpn-server-configuration} parameter} maybe-string key
The key of the machine the daemon is running on. It must be the key whose
certificate is @code{cert}.
Defaults to @samp{"/etc/openvpn/client.key"}.
@end deftypevr
@deftypevr {@code{openvpn-server-configuration} parameter} boolean comp-lzo?
Whether to use the lzo compression algorithm. Whether to use the lzo compression algorithm.
Defaults to @samp{#t}. @item @code{persist-key?} (default: @code{#t}) (type: boolean)
@end deftypevr
@deftypevr {@code{openvpn-server-configuration} parameter} boolean persist-key?
Don't re-read key files across SIGUSR1 or --ping-restart. Don't re-read key files across SIGUSR1 or --ping-restart.
Defaults to @samp{#t}. @item @code{persist-tun?} (default: @code{#t}) (type: boolean)
@end deftypevr
@deftypevr {@code{openvpn-server-configuration} parameter} boolean persist-tun?
Don't close and reopen TUN/TAP device or run up/down scripts across Don't close and reopen TUN/TAP device or run up/down scripts across
SIGUSR1 or --ping-restart restarts. SIGUSR1 or --ping-restart restarts.
Defaults to @samp{#t}. @item @code{fast-io?} (default: @code{#f}) (type: boolean)
@end deftypevr
@deftypevr {@code{openvpn-server-configuration} parameter} boolean fast-io?
(Experimental) Optimize TUN/TAP/UDP I/O writes by avoiding a call to (Experimental) Optimize TUN/TAP/UDP I/O writes by avoiding a call to
poll/epoll/select prior to the write operation. poll/epoll/select prior to the write operation.
Defaults to @samp{#f}. @item @code{verbosity} (default: @code{3}) (type: number)
@end deftypevr
@deftypevr {@code{openvpn-server-configuration} parameter} number verbosity
Verbosity level. Verbosity level.
Defaults to @samp{3}. @item @code{tls-auth} (default: @code{#f}) (type: tls-auth-server)
@end deftypevr
@deftypevr {@code{openvpn-server-configuration} parameter} tls-auth-server tls-auth
Add an additional layer of HMAC authentication on top of the TLS control Add an additional layer of HMAC authentication on top of the TLS control
channel to protect against DoS attacks. channel to protect against DoS attacks.
Defaults to @samp{#f}. @item @code{port} (default: @code{1194}) (type: number)
@end deftypevr
@deftypevr {@code{openvpn-server-configuration} parameter} number port
Specifies the port number on which the server listens. Specifies the port number on which the server listens.
Defaults to @samp{1194}. @item @code{server} (default: @code{"10.8.0.0 255.255.255.0"}) (type: ip-mask)
@end deftypevr
@deftypevr {@code{openvpn-server-configuration} parameter} ip-mask server
An ip and mask specifying the subnet inside the virtual network. An ip and mask specifying the subnet inside the virtual network.
Defaults to @samp{"10.8.0.0 255.255.255.0"}. @item @code{server-ipv6} (default: @code{#f}) (type: cidr6)
@end deftypevr
@deftypevr {@code{openvpn-server-configuration} parameter} cidr6 server-ipv6
A CIDR notation specifying the IPv6 subnet inside the virtual network. A CIDR notation specifying the IPv6 subnet inside the virtual network.
Defaults to @samp{#f}. @item @code{dh} (default: @code{"/etc/openvpn/dh2048.pem"}) (type: string)
@end deftypevr
@deftypevr {@code{openvpn-server-configuration} parameter} string dh
The Diffie-Hellman parameters file. The Diffie-Hellman parameters file.
Defaults to @samp{"/etc/openvpn/dh2048.pem"}. @item @code{ifconfig-pool-persist} (default: @code{"/etc/openvpn/ipp.txt"}) (type: string)
@end deftypevr
@deftypevr {@code{openvpn-server-configuration} parameter} string ifconfig-pool-persist
The file that records client IPs. The file that records client IPs.
Defaults to @samp{"/etc/openvpn/ipp.txt"}. @item @code{redirect-gateway?} (default: @code{#f}) (type: gateway)
@end deftypevr
@deftypevr {@code{openvpn-server-configuration} parameter} gateway redirect-gateway?
When true, the server will act as a gateway for its clients. When true, the server will act as a gateway for its clients.
Defaults to @samp{#f}. @item @code{client-to-client?} (default: @code{#f}) (type: boolean)
@end deftypevr
@deftypevr {@code{openvpn-server-configuration} parameter} boolean client-to-client?
When true, clients are allowed to talk to each other inside the VPN. When true, clients are allowed to talk to each other inside the VPN.
Defaults to @samp{#f}. @item @code{keepalive} (default: @code{(10 120)}) (type: keepalive)
@end deftypevr
@deftypevr {@code{openvpn-server-configuration} parameter} keepalive keepalive
Causes ping-like messages to be sent back and forth over the link so Causes ping-like messages to be sent back and forth over the link so
that each side knows when the other side has gone down. @code{keepalive} that each side knows when the other side has gone down. @code{keepalive}
requires a pair. The first element is the period of the ping sending, requires a pair. The first element is the period of the ping sending,
and the second element is the timeout before considering the other side and the second element is the timeout before considering the other side
down. down.
@end deftypevr @item @code{max-clients} (default: @code{100}) (type: number)
@deftypevr {@code{openvpn-server-configuration} parameter} number max-clients
The maximum number of clients. The maximum number of clients.
Defaults to @samp{100}. @item @code{status} (default: @code{"/var/run/openvpn/status"}) (type: string)
@end deftypevr
@deftypevr {@code{openvpn-server-configuration} parameter} string status
The status file. This file shows a small report on current connection. The status file. This file shows a small report on current connection.
It is truncated and rewritten every minute. It is truncated and rewritten every minute.
Defaults to @samp{"/var/run/openvpn/status"}. @item @code{client-config-dir} (default: @code{()}) (type: openvpn-ccd-list)
@end deftypevr
@deftypevr {@code{openvpn-server-configuration} parameter} openvpn-ccd-list client-config-dir
The list of configuration for some clients. The list of configuration for some clients.
Defaults to @samp{()}. @end table
Available @code{openvpn-ccd-configuration} fields are: @end deftp
@deftypevr {@code{openvpn-ccd-configuration} parameter} string name
Client name.
Defaults to @samp{"client"}.
@end deftypevr
@deftypevr {@code{openvpn-ccd-configuration} parameter} ip-mask iroute
Client own network
Defaults to @samp{#f}.
@end deftypevr
@deftypevr {@code{openvpn-ccd-configuration} parameter} ip-mask ifconfig-push
Client VPN IP.
Defaults to @samp{#f}.
@end deftypevr
@end deftypevr
@c %end of automatic openvpn-server documentation @c %end of automatic openvpn-server documentation
@ -31512,7 +31358,7 @@ Each parameter definition is preceded by its type; for example,
@samp{boolean foo} indicates that the @code{foo} parameter should be @samp{boolean foo} indicates that the @code{foo} parameter should be
specified as a boolean. Types starting with @code{maybe-} denote specified as a boolean. Types starting with @code{maybe-} denote
parameters that won't show up in TLP config file when their value is parameters that won't show up in TLP config file when their value is
left unset, or is explicitly set to the @code{*unspecified*} value. left unset, or is explicitly set to the @code{'unset} value.
@c The following documentation was initially generated by @c The following documentation was initially generated by
@c (generate-tlp-documentation) in (gnu services pm). Manually maintained @c (generate-tlp-documentation) in (gnu services pm). Manually maintained
@ -37655,6 +37501,10 @@ guix system container my-config.scm \
--expose=$HOME --share=$HOME/tmp=/exchange --expose=$HOME --share=$HOME/tmp=/exchange
@end example @end example
The @option{--share} and @option{--expose} options can also be passed to
the generated script to bind-mount additional directories into the
container.
@quotation Note @quotation Note
This option requires Linux-libre 3.19 or newer. This option requires Linux-libre 3.19 or newer.
@end quotation @end quotation
@ -39129,7 +38979,7 @@ macro which is a shorthand of this.
Sometimes a field should not be serialized if the user doesn’t specify a Sometimes a field should not be serialized if the user doesn’t specify a
value. To achieve this, you can use the @code{define-maybe} macro to value. To achieve this, you can use the @code{define-maybe} macro to
define a ``maybe type''; if the value of a maybe type is left unset, or define a ``maybe type''; if the value of a maybe type is left unset, or
is set to the @code{*unspecified*} value, then it will not be is set to the @code{'unset} value, then it will not be
serialized. serialized.
When defining a ``maybe type'', the corresponding serializer for the When defining a ``maybe type'', the corresponding serializer for the

4
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-06-16.15; # UTC htmlxrefversion=2022-08-04.13; # UTC
# Copyright 2010-2020, 2022 Free Software Foundation, Inc. # Copyright 2010-2020, 2022 Free Software Foundation, Inc.
# #
@ -413,7 +413,7 @@ guile-rpc mono ${GS}/guile-rpc/manual/guile-rpc.html
guile-rpc node ${GS}/guile-rpc/manual/html_node/ guile-rpc node ${GS}/guile-rpc/manual/html_node/
GUIX_ROOT = https://guix.gnu.org GUIX_ROOT = https://guix.gnu.org
GUIX = ${GUIX_ROOT}/guix/manual GUIX = ${GUIX_ROOT}/manual
guix.de mono ${GUIX}/de/guix.de.html guix.de mono ${GUIX}/de/guix.de.html
guix.de node ${GUIX}/de/html_node/ guix.de node ${GUIX}/de/html_node/
guix.es mono ${GUIX}/es/guix.es.html guix.es mono ${GUIX}/es/guix.es.html

21
etc/disarchive-manifest.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2021-2022 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -30,11 +30,12 @@
(match (origin-actual-file-name origin) (match (origin-actual-file-name origin)
(#f #f) (#f #f)
((? string? file) ((? string? file)
;; As of version 0.2.1, Disarchive can only deal with raw tarballs and ;; As of version 0.4.0, Disarchive can only deal with raw tarballs,
;; gzip-compressed tarballs. ;; gzip-compressed tarballs, and xz-compressed tarballs.
(and (origin-hash origin) (and (origin-hash origin)
(or (string-suffix? ".tar.gz" file) (or (string-suffix? ".tar.gz" file)
(string-suffix? ".tgz" file) (string-suffix? ".tgz" file)
(string-suffix? ".tar.xz" file)
(string-suffix? ".tar" file)))))) (string-suffix? ".tar" file))))))
(define (origin->disarchive origin) (define (origin->disarchive origin)
@ -98,6 +99,20 @@ an empty directory if ORIGIN could not be disassembled."
(directory-union "disarchive-collection" (directory-union "disarchive-collection"
(filter-map (lambda (origin) (filter-map (lambda (origin)
(and (tarball-origin? origin) (and (tarball-origin? origin)
;; Dismiss origins with (sha256 #f) such
;; as that of IceCat.
(and=> (origin-hash origin)
content-hash-value)
;; FIXME: Exclude the Chromium tarball
;; because it's huge and "disarchive
;; disassemble" exceeds the max-silent
;; timeout.
(not (string-prefix?
"chromium-"
(origin-actual-file-name origin)))
(origin->disarchive origin))) (origin->disarchive origin)))
origins) origins)
#:copy? #t)) #:copy? #t))

33
etc/news.scm
View file

@ -25,6 +25,35 @@
(channel-news (channel-news
(version 0) (version 0)
(entry (commit "a15542d26df42dabdb5e2f76d150ae200230c3b0")
(title
(en "New @option{--whole-file} option for @command{guix style}")
(de "Neue Option @option{--whole-file} für @command{guix style}")
(fr "Nouvelle option @option{--whole-file} pour @command{guix style}"))
(body
(en "The @command{guix style} command has a new @option{--whole-file}
option: instead of formatting individual package definitions, this option lets
you reformat entire Scheme files. You might want to use it to format your
operating system configuration file, for instance.
Run @command{info \"(guix) Invoking guix style\"} for more info.")
(de "Der Befehl @command{guix style} verfügt über eine neue
Befehlszeilenoption @option{--whole-file}: Mit ihr werden keine einzelnen
Paketdefinitionen umformatiert, sondern ganze Scheme-Dateien werden in die
richtige Darstellungsform gebracht. Sie können damit zum Beispiel die
Konfigurationsdatei für Ihr Betriebssystem formatieren lassen.
Führen Sie @command{info \"(guix.de) Aufruf von guix style\"} aus, um mehr
Informationen zu erhalten.")
(fr "La commande @command{guix style} a désormais une nouvelle option
@option{--whole-file} : au lieu de mettre en forme des définitions de paquets,
cette option permet de mettre en forme des fichiers Scheme entiers. Ça peut
s'avérer utile par exemple pour mettre en forme son fichier de configuration
du système d'exploitation.
Lancer @command{info \"(guix.fr) Invoquer guix style\"} pour plus
d'informations.")))
(entry (commit "2ec7ab2610eb67e26dab52b671eb29e46f64ea0f") (entry (commit "2ec7ab2610eb67e26dab52b671eb29e46f64ea0f")
(title (title
(en "Linux-libre kernel updated to 5.18") (en "Linux-libre kernel updated to 5.18")
@ -385,7 +414,7 @@ Bezeichnungen aus Paketeingaben entfernt werden. Wenn Sie {--styling}
weglassen, passiert das Gleiche wie wenn Sie @samp{--styling=format} angeben; weglassen, passiert das Gleiche wie wenn Sie @samp{--styling=format} angeben;
früher war es das Gleiche wie @samp{--styling=inputs}. früher war es das Gleiche wie @samp{--styling=inputs}.
Führen Sie @command{info \"(guix) Invoking guix style\"} aus, um mehr Führen Sie @command{info \"(guix.de) Aufruf von guix style\"} aus, um mehr
Informationen zu erhalten.") Informationen zu erhalten.")
(fr "La commande @command{guix style}, récemment introduite, peut (fr "La commande @command{guix style}, récemment introduite, peut
désormais être utilisée pour mettre en forme des définitions de paquets désormais être utilisée pour mettre en forme des définitions de paquets
@ -872,7 +901,7 @@ das Löschen, Ersetzen, Hinzufügen von Eingaben.
Um den Übergang zum „neuen Stil“ zu erleichtern, steht ein neuer Um den Übergang zum „neuen Stil“ zu erleichtern, steht ein neuer
Befehl @command{guix style} zur Verfügung. Führen Sie @command{info Befehl @command{guix style} zur Verfügung. Führen Sie @command{info
\"(guix) Invoking guix style\"} aus, um mehr Informationen zu \"(guix.de) Aufruf von guix style\"} aus, um mehr Informationen zu
erhalten."))) erhalten.")))
(entry (commit "82daab42811a2e3c7684ebdf12af75ff0fa67b99") (entry (commit "82daab42811a2e3c7684ebdf12af75ff0fa67b99")

3
etc/system-tests.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016, 2018-2020, 2022 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -20,7 +20,6 @@
(gnu packages package-management) (gnu packages package-management)
(guix monads) (guix monads)
(guix store) (guix store)
((gnu ci) #:select (channel-source->package))
((guix git-download) #:select (git-predicate)) ((guix git-download) #:select (git-predicate))
((guix utils) #:select (current-source-directory)) ((guix utils) #:select (current-source-directory))
(git) (git)

9
etc/teams.scm.in
View file

@ -181,6 +181,7 @@ and the maven-build-system."))
(define-team mozilla (define-team mozilla
(team 'mozilla (team 'mozilla
#:name "Mozilla" #:name "Mozilla"
#:description
"Taking care about Icecat and Icedove, built from Mozilla Firefox "Taking care about Icecat and Icedove, built from Mozilla Firefox
and Thunderbird.")) and Thunderbird."))
@ -189,6 +190,10 @@ and Thunderbird."))
"bauermann@kolabnow.com") "bauermann@kolabnow.com")
embedded-bootstrap translations) embedded-bootstrap translations)
(define-member (person "Eric Bavier"
"bavier@posteo.net")
science)
(define-member (person "Lars-Dominik Braun" (define-member (person "Lars-Dominik Braun"
"lars@6xq.net") "lars@6xq.net")
python haskell) python haskell)
@ -225,6 +230,10 @@ and Thunderbird."))
"julien@lepiller.eu") "julien@lepiller.eu")
java ocaml translations) java ocaml translations)
(define-member (person "Mathieu Othacehe"
"othacehe@gnu.org")
core installer mentors)
(define-member (person "Florian Pelz" (define-member (person "Florian Pelz"
"pelzflorian@pelzflorian.de") "pelzflorian@pelzflorian.de")
translations) translations)

4
gnu/artwork.scm
View file

@ -29,7 +29,7 @@
;;; Code: ;;; Code:
(define %artwork-repository (define %artwork-repository
(let ((commit "2f2fe74c1078be605a6a93c2193fd6c715cebbb0")) (let ((commit "4c7f2ce6428a63e202cd2a9474a06f68a946934d"))
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -39,6 +39,6 @@
"-checkout")) "-checkout"))
(sha256 (sha256
(base32 (base32
"0c8r0phvm3wgf914n2kw1461cwdjl2zbzqvzq9x7d9pwkgv7xmq7"))))) "1rl569759q9wm1dxn7nkq3873d2k92giic7aa6jwzwr3n16prc7y")))))
;;; artwork.scm ends here ;;; artwork.scm ends here

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

@ -6,6 +6,7 @@
;;; Copyright © 2019–2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 David C. Trudgian <dave@trudgian.net> ;;; Copyright © 2019 David C. Trudgian <dave@trudgian.net>
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2022 Oleg Pykhalov <go.wigust@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -1123,6 +1124,8 @@ corresponds to the symbols listed in FLAGS."
(logior MS_STRICTATIME (loop rest))) (logior MS_STRICTATIME (loop rest)))
(('lazy-time rest ...) (('lazy-time rest ...)
(logior MS_LAZYTIME (loop rest))) (logior MS_LAZYTIME (loop rest)))
(('shared rest ...)
(loop rest))
(() (()
0)))) 0))))
@ -1186,6 +1189,9 @@ corresponds to the symbols listed in FLAGS."
(cond (cond
((string-prefix? "nfs" type) ((string-prefix? "nfs" type)
(mount-nfs source target type flags options)) (mount-nfs source target type flags options))
((memq 'shared (file-system-flags fs))
(mount source target type flags options)
(mount "none" target #f MS_SHARED))
(else (else
(mount source target type flags options))) (mount source target type flags options)))

9
gnu/build/marionette.scm
View file

@ -105,11 +105,14 @@ QEMU monitor and to the guest's backdoor REPL."
"-monitor" (string-append "unix:" socket-directory "/monitor") "-monitor" (string-append "unix:" socket-directory "/monitor")
"-chardev" (string-append "socket,id=repl,path=" socket-directory "-chardev" (string-append "socket,id=repl,path=" socket-directory
"/repl") "/repl")
"-chardev" (string-append "socket,id=qga,server=on,wait=off,path="
socket-directory "/qemu-ga")
;; See ;; See
;; <http://www.linux-kvm.org/page/VMchannel_Requirements#Invocation>. ;; <http://www.linux-kvm.org/page/VMchannel_Requirements#Invocation>.
"-device" "virtio-serial" "-device" "virtio-serial"
"-device" "virtserialport,chardev=repl,name=org.gnu.guix.port.0")) "-device" "virtserialport,chardev=repl,name=org.gnu.guix.port.0"
"-device" "virtserialport,chardev=qga,name=org.qemu.guest_agent.0"))
(define (accept* port) (define (accept* port)
(match (select (list port) '() (list port) timeout) (match (select (list port) '() (list port) timeout)
@ -255,8 +258,8 @@ accept connections in MARIONETTE. Raise an error on failure."
(define (marionette-control command marionette) (define (marionette-control command marionette)
"Run COMMAND in the QEMU monitor of MARIONETTE. COMMAND is a string such as "Run COMMAND in the QEMU monitor of MARIONETTE. COMMAND is a string such as
\"sendkey ctrl-alt-f1\" or \"screendump foo.ppm\" (info \"(qemu-doc) \"sendkey ctrl-alt-f1\" or \"screendump foo.ppm\" (info \"(QEMU) QEMU
pcsys_monitor\")." Monitor\")."
(match marionette (match marionette
(($ <marionette> _ _ monitor) (($ <marionette> _ _ monitor)
(display command monitor) (display command monitor)

43
gnu/ci.scm
View file

@ -21,9 +21,9 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu ci) (define-module (gnu ci)
#:use-module (guix channels) #:use-module (guix build-system channel)
#:use-module (guix config) #:use-module (guix config)
#:use-module (guix describe) #:autoload (guix describe) (package-channels)
#:use-module (guix store) #:use-module (guix store)
#:use-module (guix grafts) #:use-module (guix grafts)
#:use-module (guix profiles) #:use-module (guix profiles)
@ -32,14 +32,12 @@
#:use-module (guix channels) #:use-module (guix channels)
#:use-module (guix config) #:use-module (guix config)
#:use-module (guix derivations) #:use-module (guix derivations)
#:use-module (guix build-system)
#:use-module (guix monads) #:use-module (guix monads)
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (guix ui) #:use-module (guix ui)
#:use-module ((guix licenses) #:use-module ((guix licenses)
#:select (gpl3+ license? license-name)) #:select (gpl3+ license? license-name))
#:use-module ((guix utils) #:select (%current-system)) #:use-module ((guix utils) #:select (%current-system))
#:use-module ((guix scripts system) #:select (read-operating-system))
#:use-module ((guix scripts pack) #:use-module ((guix scripts pack)
#:select (lookup-compressor self-contained-tarball)) #:select (lookup-compressor self-contained-tarball))
#:use-module (gnu bootloader) #:use-module (gnu bootloader)
@ -72,7 +70,6 @@
image->job image->job
%core-packages %core-packages
channel-source->package
arguments->systems arguments->systems
cuirass-jobs)) cuirass-jobs))
@ -289,42 +286,6 @@ otherwise use the IMAGE name."
'())) '()))
'())) '()))
(define channel-build-system
;; Build system used to "convert" a channel instance to a package.
(let* ((build (lambda* (name inputs
#:key source commit system
#:allow-other-keys)
(mlet* %store-monad ((source (if (string? source)
(return source)
(lower-object source)))
(instance
-> (checkout->channel-instance
source #:commit commit)))
(channel-instances->derivation (list instance)))))
(lower (lambda* (name #:key system source commit
#:allow-other-keys)
(bag
(name name)
(system system)
(build build)
(arguments `(#:source ,source
#:commit ,commit))))))
(build-system (name 'channel)
(description "Turn a channel instance into a package.")
(lower lower))))
(define* (channel-source->package source #:key commit)
"Return a package for the given channel SOURCE, a lowerable object."
(package
(inherit guix)
(version (string-append (package-version guix) "+"))
(build-system channel-build-system)
(arguments `(#:source ,source
#:commit ,commit))
(inputs '())
(native-inputs '())
(propagated-inputs '())))
(define* (system-test-jobs store system (define* (system-test-jobs store system
#:key source commit) #:key source commit)
"Return a list of jobs for the system tests." "Return a list of jobs for the system tests."

26
gnu/home.scm
View file

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2021 Andrew Tropin <andrew@trop.in> ;;; Copyright © 2021 Andrew Tropin <andrew@trop.in>
;;; Copyright © 2022 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -27,7 +28,8 @@
#:use-module (guix diagnostics) #:use-module (guix diagnostics)
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (guix store) #:use-module (guix store)
#:use-module (ice-9 match)
#:use-module (ice-9 regex)
#:export (home-environment #:export (home-environment
home-environment? home-environment?
this-home-environment this-home-environment
@ -38,7 +40,9 @@
home-environment-services home-environment-services
home-environment-location home-environment-location
home-environment-with-provenance)) home-environment-with-provenance
home-generation-base))
;;; Comment: ;;; Comment:
;;; ;;;
@ -114,3 +118,21 @@ of HOME-PROVENANCE-SERVICE-TYPE to its services."
(run-with-store store (home-environment-derivation he) (run-with-store store (home-environment-derivation he)
#:system system #:system system
#:target target))))) #:target target)))))
(define %profile-generation-rx
;; Regexp that matches profile generation.
(make-regexp "(.*)-([0-9]+)-link$"))
(define (home-generation-base file)
"If FILE is a Home generation GC root such as \"guix-home-42-link\",
return its corresponding base---e.g., \"guix-home\". Otherwise return #f.
This is similar to the 'generation-profile' procedure but applied to Home
generations."
(match (regexp-exec %profile-generation-rx file)
(#f #f)
(m (let ((profile (match:substring m 1)))
;; Distinguish from a "real" profile and from a system generation.
(and (file-exists? (string-append profile "/on-first-login"))
(file-exists? (string-append profile "/profile/manifest"))
profile)))))

14
gnu/home/services.scm
View file

@ -20,6 +20,7 @@
(define-module (gnu home services) (define-module (gnu home services)
#:use-module (gnu services) #:use-module (gnu services)
#:use-module ((gnu packages package-management) #:select (guix)) #:use-module ((gnu packages package-management) #:select (guix))
#:use-module ((gnu packages base) #:select (coreutils))
#:use-module (guix channels) #:use-module (guix channels)
#:use-module (guix monads) #:use-module (guix monads)
#:use-module (guix store) #:use-module (guix store)
@ -367,9 +368,11 @@ activation.")))
(define (compute-on-first-login-script _ gexps) (define (compute-on-first-login-script _ gexps)
(program-file (program-file
"on-first-login" "on-first-login"
(with-imported-modules (source-module-closure '((guix i18n))) (with-imported-modules (source-module-closure '((guix i18n)
(guix diagnostics)))
#~(begin #~(begin
(use-modules (guix i18n)) (use-modules (guix i18n)
(guix diagnostics))
#$%initialize-gettext #$%initialize-gettext
(let* ((xdg-runtime-dir (or (getenv "XDG_RUNTIME_DIR") (let* ((xdg-runtime-dir (or (getenv "XDG_RUNTIME_DIR")
@ -386,7 +389,7 @@ activation.")))
(begin #$@gexps (touch flag-file-path))) (begin #$@gexps (touch flag-file-path)))
;; TRANSLATORS: 'on-first-login' is the name of a service and ;; TRANSLATORS: 'on-first-login' is the name of a service and
;; shouldn't be translated ;; shouldn't be translated
(display (G_ "XDG_RUNTIME_DIR doesn't exists, on-first-login script (warning (G_ "XDG_RUNTIME_DIR doesn't exists, on-first-login script
won't execute anything. You can check if xdg runtime directory exists, won't execute anything. You can check if xdg runtime directory exists,
XDG_RUNTIME_DIR variable is set to appropriate value and manually execute the XDG_RUNTIME_DIR variable is set to appropriate value and manually execute the
script by running '$HOME/.guix-home/on-first-login'")))))))) script by running '$HOME/.guix-home/on-first-login'"))))))))
@ -426,8 +429,9 @@ extended with one gexp.")))
#f)))) #f))))
(if (file-exists? (he-init-file new-home)) (if (file-exists? (he-init-file new-home))
(let* ((port ((@ (ice-9 popen) open-input-pipe) (let* ((port ((@ (ice-9 popen) open-input-pipe)
(format #f "source ~a && env -0" (format #f "source ~a && ~a -0"
(he-init-file new-home)))) (he-init-file new-home)
#$(file-append coreutils "/bin/env"))))
(result ((@ (ice-9 rdelim) read-delimited) "" port)) (result ((@ (ice-9 rdelim) read-delimited) "" port))
(vars (map (lambda (x) (vars (map (lambda (x)
(let ((si (string-index x #\=))) (let ((si (string-index x #\=)))

8
gnu/home/services/ssh.scm
View file

@ -69,10 +69,10 @@
" " value "\n")) " " value "\n"))
(define (address-family? obj) (define (address-family? obj)
(memv obj (list *unspecified* AF_INET AF_INET6))) (memv obj (list 'unset AF_INET AF_INET6)))
(define (serialize-address-family field family) (define (serialize-address-family field family)
(if (unspecified? family) (if (eq? 'unset family)
"" ""
(string-append " " (serialize-field-name field) " " (string-append " " (serialize-field-name field) " "
(cond ((= family AF_INET) "inet") (cond ((= family AF_INET) "inet")
@ -117,8 +117,8 @@
(address-family (address-family
address-family address-family
"Address family to use when connecting to this host: one of "Address family to use when connecting to this host: one of
@code{AF_INET} (for IPv4 only), @code{AF_INET6} (for IPv6 only), or @code{AF_INET} (for IPv4 only), @code{AF_INET6} (for IPv6 only).
@code{*unspecified*} (allowing any address family).") Additionally, the field can be left unset to allow any address family.")
(identity-file (identity-file
maybe-string maybe-string
"The identity file to use---e.g., "The identity file to use---e.g.,

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

@ -23,6 +23,7 @@
#:use-module (gnu packages freedesktop) #:use-module (gnu packages freedesktop)
#:use-module (gnu home services utils) #:use-module (gnu home services utils)
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (guix modules)
#:use-module (guix records) #:use-module (guix records)
#:use-module (guix i18n) #:use-module (guix i18n)
#:use-module (guix diagnostics) #:use-module (guix diagnostics)
@ -106,14 +107,20 @@ services more consistent."))
(define (ensure-xdg-base-dirs-on-activation config) (define (ensure-xdg-base-dirs-on-activation config)
#~(map (lambda (xdg-base-dir-variable) #~(map (lambda (xdg-base-dir-variable)
((@@ (guix build utils) mkdir-p) ((@ (guix build utils) mkdir-p)
(getenv (getenv
xdg-base-dir-variable))) xdg-base-dir-variable)))
'#$(map (lambda (field) '#$(filter-map
(format (lambda (field)
#f "XDG_~a" (let ((variable
(string-append
"XDG_"
(object->snake-case-string (object->snake-case-string
(configuration-field-name field) 'upper))) (configuration-field-name field) 'upper))))
;; XDG_RUNTIME_DIR shouldn't be created during activation
;; and will be provided by elogind or other service.
(and (not (string=? "XDG_RUNTIME_DIR" variable))
variable)))
home-xdg-base-directories-configuration-fields))) home-xdg-base-directories-configuration-fields)))
(define (last-extension-or-cfg config extensions) (define (last-extension-or-cfg config extensions)
@ -207,8 +214,8 @@ pre-populated content.")
home-xdg-user-directories-configuration-fields))) home-xdg-user-directories-configuration-fields)))
#~(let ((ensure-dir #~(let ((ensure-dir
(lambda (path) (lambda (path)
(mkdir-p ((@ (guix build utils) mkdir-p)
((@@ (ice-9 string-fun) string-replace-substring) ((@ (ice-9 string-fun) string-replace-substring)
path "$HOME" (getenv "HOME")))))) path "$HOME" (getenv "HOME"))))))
(display "Creating XDG user directories...") (display "Creating XDG user directories...")
(map ensure-dir '#$dirs) (map ensure-dir '#$dirs)

3
gnu/installer.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>
;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Florian Pelz <pelzflorian@pelzflorian.de> ;;; Copyright © 2020 Florian Pelz <pelzflorian@pelzflorian.de>
;;; ;;;
@ -63,6 +63,7 @@
(('gnu 'installer _ ...) #t) (('gnu 'installer _ ...) #t)
(('gnu 'build _ ...) #t) (('gnu 'build _ ...) #t)
(('guix 'build _ ...) #t) (('guix 'build _ ...) #t)
(('guix 'read-print) #t)
(_ #f))) (_ #f)))
(define not-config? (define not-config?

22
gnu/installer/parted.scm
View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018, 2019 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2018, 2019 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>
;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -38,6 +38,7 @@
#:select (%base-initrd-modules)) #:select (%base-initrd-modules))
#:use-module (guix build syscalls) #:use-module (guix build syscalls)
#:use-module (guix build utils) #:use-module (guix build utils)
#:use-module (guix read-print)
#:use-module (guix records) #:use-module (guix records)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (guix i18n) #:use-module (guix i18n)
@ -828,6 +829,7 @@ cause them to cross."
(installer-log-line "~/type: ~a" partition-type) (installer-log-line "~/type: ~a" partition-type)
(installer-log-line "~/filesystem-type: ~a" (installer-log-line "~/filesystem-type: ~a"
(filesystem-type-name filesystem-type)) (filesystem-type-name filesystem-type))
(installer-log-line "~/flags: ~a" flags)
(installer-log-line "~/start: ~a" start-sector*) (installer-log-line "~/start: ~a" start-sector*)
(installer-log-line "~/end: ~a" end-sector) (installer-log-line "~/end: ~a" end-sector)
(installer-log-line "~/start-range: [~a, ~a]" (installer-log-line "~/start-range: [~a, ~a]"
@ -844,15 +846,18 @@ cause them to cross."
(when (and partition-ok? has-name? name) (when (and partition-ok? has-name? name)
(partition-set-name partition name)) (partition-set-name partition name))
;; Set flags is required. ;; Both partition-set-system and partition-set-flag calls can affect
;; the partition type. Their order is important, see:
;; https://issues.guix.gnu.org/55549.
(partition-set-system partition filesystem-type)
;; Set flags if required.
(for-each (lambda (flag) (for-each (lambda (flag)
(and (partition-is-flag-available? partition flag) (and (partition-is-flag-available? partition flag)
(partition-set-flag partition flag 1))) (partition-set-flag partition flag 1)))
flags) flags)
(and partition-ok? (and partition-ok? partition))))))
(partition-set-system partition filesystem-type)
partition))))))
;; ;;
@ -1439,6 +1444,13 @@ USER-PARTITIONS, or return nothing."
`((mapped-devices `((mapped-devices
(list ,@(map user-partition->mapped-device (list ,@(map user-partition->mapped-device
encrypted-partitions))))) encrypted-partitions)))))
,(vertical-space 1)
,(let-syntax ((G_ (syntax-rules () ((_ str) str))))
(comment (G_ "\
;; The list of file systems that get \"mounted\". The unique
;; file system identifiers there (\"UUIDs\") can be obtained
;; by running 'blkid' in a terminal.\n")))
(file-systems (cons* (file-systems (cons*
,@(user-partitions->file-systems user-partitions) ,@(user-partitions->file-systems user-partitions)
%base-file-systems))))) %base-file-systems)))))

37
gnu/installer/services.scm
View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2019, 2022 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2021 Leo Famulari <leo@famulari.name> ;;; Copyright © 2021 Leo Famulari <leo@famulari.name>
@ -22,6 +22,7 @@
(define-module (gnu installer services) (define-module (gnu installer services)
#:use-module (guix records) #:use-module (guix records)
#:use-module (guix read-print)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:export (system-service? #:export (system-service?
system-service-name system-service-name
@ -35,6 +36,11 @@
%system-services %system-services
system-services->configuration)) system-services->configuration))
(define-syntax-rule (G_ str)
;; In this file, translatable strings are annotated with 'G_' so xgettext
;; catches them, but translation happens later on at run time.
str)
(define-record-type* <system-service> (define-record-type* <system-service>
system-service make-system-service system-service make-system-service
system-service? system-service?
@ -52,9 +58,7 @@
((_ fields ...) ((_ fields ...)
(system-service (system-service
(type 'desktop) (type 'desktop)
fields ...)))) fields ...)))))
(G_ (syntax-rules () ;for xgettext
((_ str) str))))
(list (list
;; This is the list of desktop environments supported as services. ;; This is the list of desktop environments supported as services.
(desktop-environment (desktop-environment
@ -94,7 +98,12 @@
(system-service (system-service
(name (G_ "OpenSSH secure shell daemon (sshd)")) (name (G_ "OpenSSH secure shell daemon (sshd)"))
(type 'networking) (type 'networking)
(snippet '((service openssh-service-type)))) (snippet `(,(vertical-space 1)
,(comment
(G_ "\
;; To configure OpenSSH, pass an 'openssh-configuration'
;; record as a second argument to 'service' below.\n"))
(service openssh-service-type))))
(system-service (system-service
(name (G_ "Tor anonymous network router")) (name (G_ "Tor anonymous network router"))
(type 'networking) (type 'networking)
@ -149,24 +158,38 @@
(desktop? (find desktop-system-service? services)) (desktop? (find desktop-system-service? services))
(base (if desktop? (base (if desktop?
'%desktop-services '%desktop-services
'%base-services))) '%base-services))
(heading (list (vertical-space 1)
(comment (G_ "\
;; Below is the list of system services. To search for available
;; services, run 'guix system search KEYWORD' in a terminal.\n")))))
(if (null? snippets) (if (null? snippets)
`(,@(if (null? packages) `(,@(if (null? packages)
'() '()
`((packages (append (list ,@packages) `((packages (append (list ,@packages)
%base-packages)))) %base-packages))))
,@heading
(services ,base)) (services ,base))
`(,@(if (null? packages) `(,@(if (null? packages)
'() '()
`((packages (append (list ,@packages) `((packages (append (list ,@packages)
%base-packages)))) %base-packages))))
,@heading
(services (append (list ,@snippets (services (append (list ,@snippets
,@(if desktop? ,@(if desktop?
;; XXX: Assume 'keyboard-layout' is in ;; XXX: Assume 'keyboard-layout' is in
;; scope. ;; scope.
'((set-xorg-configuration `((set-xorg-configuration
(xorg-configuration (xorg-configuration
(keyboard-layout keyboard-layout)))) (keyboard-layout keyboard-layout))))
'())) '()))
,(vertical-space 1)
,(comment (G_ "\
;; This is the default list of services we
;; are appending to.\n"))
,base)))))) ,base))))))

32
gnu/installer/steps.scm
View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018, 2019 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2018, 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2020, 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2020-2022 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -21,9 +21,9 @@
#:use-module (guix records) #:use-module (guix records)
#:use-module (guix build utils) #:use-module (guix build utils)
#:use-module (guix i18n) #:use-module (guix i18n)
#:use-module (guix read-print)
#:use-module (gnu installer utils) #:use-module (gnu installer utils)
#:use-module (ice-9 match) #:use-module (ice-9 match)
#:use-module (ice-9 pretty-print)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (srfi srfi-34) #:use-module (srfi srfi-34)
#:use-module (srfi srfi-35) #:use-module (srfi srfi-35)
@ -224,10 +224,14 @@ found in RESULTS."
(conf-formatter result-step) (conf-formatter result-step)
'()))) '())))
steps)) steps))
(modules '((use-modules (gnu)) (modules `(,(vertical-space 1)
,(comment (G_ "\
;; Indicate which modules to import to access the variables
;; used in this configuration.\n"))
(use-modules (gnu))
(use-service-modules cups desktop networking ssh xorg)))) (use-service-modules cups desktop networking ssh xorg))))
`(,@modules `(,@modules
() ,(vertical-space 1)
(operating-system ,@configuration)))) (operating-system ,@configuration))))
(define* (configuration->file configuration (define* (configuration->file configuration
@ -241,14 +245,22 @@ found in RESULTS."
;; length below 60 characters. ;; length below 60 characters.
(display (G_ "\ (display (G_ "\
;; This is an operating system configuration generated ;; This is an operating system configuration generated
;; by the graphical installer.\n") ;; by the graphical installer.
;;
;; Once installation is complete, you can learn and modify
;; this file to tweak the system configuration, and pass it
;; to the 'guix system reconfigure' command to effect your
;; changes.\n")
port) port)
(newline port) (newline port)
(for-each (lambda (part) (pretty-print-with-comments/splice port configuration
(if (null? part) #:max-width 75
(newline port) #:format-comment
(pretty-print part port))) (lambda (c indent)
configuration) ;; Localize C.
(comment (G_ (comment->string c))
(comment-margin? c))))
(flush-output-port port)))) (flush-output-port port))))
;;; Local Variables: ;;; Local Variables:

7
gnu/installer/user.scm
View file

@ -18,6 +18,7 @@
(define-module (gnu installer user) (define-module (gnu installer user)
#:use-module (guix records) #:use-module (guix records)
#:use-module (guix read-print)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (srfi srfi-9) #:use-module (srfi srfi-9)
#:use-module (srfi srfi-9 gnu) #:use-module (srfi srfi-9 gnu)
@ -69,7 +70,11 @@
(supplementary-groups '("wheel" "netdev" (supplementary-groups '("wheel" "netdev"
"audio" "video")))) "audio" "video"))))
`((users (cons* (define-syntax-rule (G_ str) str)
`(,(vertical-space 1)
,(comment (G_ ";; The list of user accounts ('root' is implicit).\n"))
(users (cons*
,@(filter-map (lambda (user) ,@(filter-map (lambda (user)
;; Do not emit a 'user-account' form for "root". ;; Do not emit a 'user-account' form for "root".
(and (not (string=? (user-name user) "root")) (and (not (string=? (user-name user) "root"))

32
gnu/local.mk
View file

@ -50,6 +50,7 @@
# Copyright © 2022 Daniel Meißner <daniel.meissner-i4k@ruhr-uni-bochum.de> # Copyright © 2022 Daniel Meißner <daniel.meissner-i4k@ruhr-uni-bochum.de>
# Copyright © 2022 Remco van 't Veer <remco@remworks.net> # Copyright © 2022 Remco van 't Veer <remco@remworks.net>
# Copyright © 2022 Artyom V. Poptsov <poptsov.artyom@gmail.com> # Copyright © 2022 Artyom V. Poptsov <poptsov.artyom@gmail.com>
# Copyright © 2022 John Kehayias <john.kehayias@protonmail.com>
# #
# This file is part of GNU Guix. # This file is part of GNU Guix.
# #
@ -301,6 +302,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/haskell-crypto.scm \ %D%/packages/haskell-crypto.scm \
%D%/packages/haskell-web.scm \ %D%/packages/haskell-web.scm \
%D%/packages/haskell-xyz.scm \ %D%/packages/haskell-xyz.scm \
%D%/packages/haxe.scm \
%D%/packages/heads.scm \ %D%/packages/heads.scm \
%D%/packages/hexedit.scm \ %D%/packages/hexedit.scm \
%D%/packages/hugs.scm \ %D%/packages/hugs.scm \
@ -856,8 +858,10 @@ dist_patch_DATA = \
%D%/packages/patches/antiword-CVE-2014-8123.patch \ %D%/packages/patches/antiword-CVE-2014-8123.patch \
%D%/packages/patches/antlr3-3_1-fix-java8-compilation.patch \ %D%/packages/patches/antlr3-3_1-fix-java8-compilation.patch \
%D%/packages/patches/antlr3-3_3-fix-java8-compilation.patch \ %D%/packages/patches/antlr3-3_3-fix-java8-compilation.patch \
%D%/packages/patches/aoflagger-use-system-provided-pybind11.patch \
%D%/packages/patches/apr-skip-getservbyname-test.patch \ %D%/packages/patches/apr-skip-getservbyname-test.patch \
%D%/packages/patches/ark-skip-xar-test.patch \ %D%/packages/patches/ark-skip-xar-test.patch \
%D%/packages/patches/aspell-CVE-2019-25051.patch \
%D%/packages/patches/aspell-default-dict-dir.patch \ %D%/packages/patches/aspell-default-dict-dir.patch \
%D%/packages/patches/ath9k-htc-firmware-binutils.patch \ %D%/packages/patches/ath9k-htc-firmware-binutils.patch \
%D%/packages/patches/ath9k-htc-firmware-gcc.patch \ %D%/packages/patches/ath9k-htc-firmware-gcc.patch \
@ -886,6 +890,7 @@ dist_patch_DATA = \
%D%/packages/patches/awesome-4.3-fno-common.patch \ %D%/packages/patches/awesome-4.3-fno-common.patch \
%D%/packages/patches/aws-c-auth-install-private-headers.patch \ %D%/packages/patches/aws-c-auth-install-private-headers.patch \
%D%/packages/patches/azr3.patch \ %D%/packages/patches/azr3.patch \
%D%/packages/patches/barony-fix-textures.patch \
%D%/packages/patches/bash-completion-directories.patch \ %D%/packages/patches/bash-completion-directories.patch \
%D%/packages/patches/bash-linux-pgrp-pipe.patch \ %D%/packages/patches/bash-linux-pgrp-pipe.patch \
%D%/packages/patches/bastet-change-source-of-unordered_set.patch \ %D%/packages/patches/bastet-change-source-of-unordered_set.patch \
@ -1049,6 +1054,13 @@ dist_patch_DATA = \
%D%/packages/patches/exercism-disable-self-update.patch \ %D%/packages/patches/exercism-disable-self-update.patch \
%D%/packages/patches/extempore-unbundle-external-dependencies.patch \ %D%/packages/patches/extempore-unbundle-external-dependencies.patch \
%D%/packages/patches/extundelete-e2fsprogs-1.44.patch \ %D%/packages/patches/extundelete-e2fsprogs-1.44.patch \
%D%/packages/patches/fail2ban-0.11.2_CVE-2021-32749.patch \
%D%/packages/patches/fail2ban-0.11.2_fix-setuptools-drop-2to3.patch \
%D%/packages/patches/fail2ban-0.11.2_fix-test-suite.patch \
%D%/packages/patches/fail2ban-paths-guix-conf.patch \
%D%/packages/patches/fail2ban-python310-server-action.patch \
%D%/packages/patches/fail2ban-python310-server-actions.patch \
%D%/packages/patches/fail2ban-python310-server-jails.patch \
%D%/packages/patches/farstream-gupnp.patch \ %D%/packages/patches/farstream-gupnp.patch \
%D%/packages/patches/farstream-make.patch \ %D%/packages/patches/farstream-make.patch \
%D%/packages/patches/fastcap-mulGlobal.patch \ %D%/packages/patches/fastcap-mulGlobal.patch \
@ -1079,6 +1091,7 @@ dist_patch_DATA = \
%D%/packages/patches/fpc-reproducibility.patch \ %D%/packages/patches/fpc-reproducibility.patch \
%D%/packages/patches/freedink-engine-fix-sdl-hints.patch \ %D%/packages/patches/freedink-engine-fix-sdl-hints.patch \
%D%/packages/patches/freeimage-unbundle.patch \ %D%/packages/patches/freeimage-unbundle.patch \
%D%/packages/patches/fuse-glibc-2.34.patch \
%D%/packages/patches/fuse-overlapping-headers.patch \ %D%/packages/patches/fuse-overlapping-headers.patch \
%D%/packages/patches/fxdiv-system-libraries.patch \ %D%/packages/patches/fxdiv-system-libraries.patch \
%D%/packages/patches/gajim-honour-GAJIM_PLUGIN_PATH.patch \ %D%/packages/patches/gajim-honour-GAJIM_PLUGIN_PATH.patch \
@ -1200,6 +1213,7 @@ dist_patch_DATA = \
%D%/packages/patches/gnome-session-support-elogind.patch \ %D%/packages/patches/gnome-session-support-elogind.patch \
%D%/packages/patches/gnome-todo-libportal.patch \ %D%/packages/patches/gnome-todo-libportal.patch \
%D%/packages/patches/gnome-tweaks-search-paths.patch \ %D%/packages/patches/gnome-tweaks-search-paths.patch \
%D%/packages/patches/gnupg-CVE-2022-34903.patch \
%D%/packages/patches/gnupg-default-pinentry.patch \ %D%/packages/patches/gnupg-default-pinentry.patch \
%D%/packages/patches/gnupg-1-build-with-gcc10.patch \ %D%/packages/patches/gnupg-1-build-with-gcc10.patch \
%D%/packages/patches/gnutls-skip-trust-store-test.patch \ %D%/packages/patches/gnutls-skip-trust-store-test.patch \
@ -1302,13 +1316,10 @@ dist_patch_DATA = \
%D%/packages/patches/irrlicht-link-against-needed-libs.patch \ %D%/packages/patches/irrlicht-link-against-needed-libs.patch \
%D%/packages/patches/isl-0.11.1-aarch64-support.patch \ %D%/packages/patches/isl-0.11.1-aarch64-support.patch \
%D%/packages/patches/itk-snap-alt-glibc-compat.patch \ %D%/packages/patches/itk-snap-alt-glibc-compat.patch \
%D%/packages/patches/jami-fix-esc-bug.patch \
%D%/packages/patches/json-c-0.13-CVE-2020-12762.patch \ %D%/packages/patches/json-c-0.13-CVE-2020-12762.patch \
%D%/packages/patches/json-c-0.12-CVE-2020-12762.patch \ %D%/packages/patches/json-c-0.12-CVE-2020-12762.patch \
%D%/packages/patches/jsoncpp-pkg-config-version.patch \ %D%/packages/patches/jsoncpp-pkg-config-version.patch \
%D%/packages/patches/jami-fix-crash-on-quit.patch \
%D%/packages/patches/jami-images-loading.patch \
%D%/packages/patches/jami-memory-usage.patch \
%D%/packages/patches/jami-libclient-audio-managers.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 \
@ -1410,6 +1421,7 @@ dist_patch_DATA = \
%D%/packages/patches/libmpeg2-global-symbol-test.patch \ %D%/packages/patches/libmpeg2-global-symbol-test.patch \
%D%/packages/patches/libmygpo-qt-fix-qt-5.11.patch \ %D%/packages/patches/libmygpo-qt-fix-qt-5.11.patch \
%D%/packages/patches/libmygpo-qt-missing-qt5-modules.patch \ %D%/packages/patches/libmygpo-qt-missing-qt5-modules.patch \
%D%/packages/patches/libphonenumber-reproducible-build.patch \
%D%/packages/patches/libqalculate-3.8.0-libcurl-ssl-fix.patch \ %D%/packages/patches/libqalculate-3.8.0-libcurl-ssl-fix.patch \
%D%/packages/patches/libquicktime-ffmpeg.patch \ %D%/packages/patches/libquicktime-ffmpeg.patch \
%D%/packages/patches/librecad-support-for-boost-1.76.patch \ %D%/packages/patches/librecad-support-for-boost-1.76.patch \
@ -1418,6 +1430,7 @@ dist_patch_DATA = \
%D%/packages/patches/libtgvoip-disable-sse2.patch \ %D%/packages/patches/libtgvoip-disable-sse2.patch \
%D%/packages/patches/libtgvoip-disable-webrtc.patch \ %D%/packages/patches/libtgvoip-disable-webrtc.patch \
%D%/packages/patches/libtheora-config-guess.patch \ %D%/packages/patches/libtheora-config-guess.patch \
%D%/packages/patches/libtirpc-CVE-2021-46828.patch \
%D%/packages/patches/libtirpc-hurd.patch \ %D%/packages/patches/libtirpc-hurd.patch \
%D%/packages/patches/libtommath-fix-linkage.patch \ %D%/packages/patches/libtommath-fix-linkage.patch \
%D%/packages/patches/libtool-skip-tests2.patch \ %D%/packages/patches/libtool-skip-tests2.patch \
@ -1515,10 +1528,6 @@ dist_patch_DATA = \
%D%/packages/patches/mrrescue-support-love-11.patch \ %D%/packages/patches/mrrescue-support-love-11.patch \
%D%/packages/patches/mrustc-riscv64-support.patch \ %D%/packages/patches/mrustc-riscv64-support.patch \
%D%/packages/patches/mtools-mformat-uninitialized.patch \ %D%/packages/patches/mtools-mformat-uninitialized.patch \
%D%/packages/patches/mumps-build-parallelism.patch \
%D%/packages/patches/mumps-shared-libseq.patch \
%D%/packages/patches/mumps-shared-mumps.patch \
%D%/packages/patches/mumps-shared-pord.patch \
%D%/packages/patches/mupen64plus-ui-console-notice.patch \ %D%/packages/patches/mupen64plus-ui-console-notice.patch \
%D%/packages/patches/mupen64plus-video-z64-glew-correct-path.patch \ %D%/packages/patches/mupen64plus-video-z64-glew-correct-path.patch \
%D%/packages/patches/musl-cross-locale.patch \ %D%/packages/patches/musl-cross-locale.patch \
@ -1544,7 +1553,6 @@ dist_patch_DATA = \
%D%/packages/patches/nginx-socket-cloexec.patch \ %D%/packages/patches/nginx-socket-cloexec.patch \
%D%/packages/patches/nnpack-system-libraries.patch \ %D%/packages/patches/nnpack-system-libraries.patch \
%D%/packages/patches/nsis-env-passthru.patch \ %D%/packages/patches/nsis-env-passthru.patch \
%D%/packages/patches/nsis-source-date-epoch.patch \
%D%/packages/patches/nss-getcwd-nonnull.patch \ %D%/packages/patches/nss-getcwd-nonnull.patch \
%D%/packages/patches/nss-increase-test-timeout.patch \ %D%/packages/patches/nss-increase-test-timeout.patch \
%D%/packages/patches/nss-3.56-pkgconfig.patch \ %D%/packages/patches/nss-3.56-pkgconfig.patch \
@ -1740,6 +1748,7 @@ dist_patch_DATA = \
%D%/packages/patches/qtscript-disable-tests.patch \ %D%/packages/patches/qtscript-disable-tests.patch \
%D%/packages/patches/quagga-reproducible-build.patch \ %D%/packages/patches/quagga-reproducible-build.patch \
%D%/packages/patches/quickswitch-fix-dmenu-check.patch \ %D%/packages/patches/quickswitch-fix-dmenu-check.patch \
%D%/packages/patches/qtwayland-gcc-11.patch \
%D%/packages/patches/qtwebkit-pbutils-include.patch \ %D%/packages/patches/qtwebkit-pbutils-include.patch \
%D%/packages/patches/qtwebkit-fix-building-with-bison-3.7.patch \ %D%/packages/patches/qtwebkit-fix-building-with-bison-3.7.patch \
%D%/packages/patches/qtwebkit-fix-building-with-python-3.9.patch \ %D%/packages/patches/qtwebkit-fix-building-with-python-3.9.patch \
@ -1773,6 +1782,9 @@ dist_patch_DATA = \
%D%/packages/patches/rocm-opencl-runtime-4.3-noclinfo.patch \ %D%/packages/patches/rocm-opencl-runtime-4.3-noclinfo.patch \
%D%/packages/patches/rocm-opencl-runtime-4.3-noopencl.patch \ %D%/packages/patches/rocm-opencl-runtime-4.3-noopencl.patch \
%D%/packages/patches/ruby-hydra-minimal-no-byebug.patch \ %D%/packages/patches/ruby-hydra-minimal-no-byebug.patch \
%D%/packages/patches/ruby-anystyle-data-immutable-install.patch \
%D%/packages/patches/ruby-anystyle-fix-dictionary-populate.patch \
%D%/packages/patches/ruby-latex-decode-fix-test.patch \
%D%/packages/patches/ruby-mustache-1.1.1-fix-race-condition-tests.patch \ %D%/packages/patches/ruby-mustache-1.1.1-fix-race-condition-tests.patch \
%D%/packages/patches/ruby-sanitize-system-libxml.patch \ %D%/packages/patches/ruby-sanitize-system-libxml.patch \
%D%/packages/patches/rustc-1.54.0-src.patch \ %D%/packages/patches/rustc-1.54.0-src.patch \
@ -1807,7 +1819,6 @@ dist_patch_DATA = \
%D%/packages/patches/serf-python3.patch \ %D%/packages/patches/serf-python3.patch \
%D%/packages/patches/shakespeare-spl-fix-grammar.patch \ %D%/packages/patches/shakespeare-spl-fix-grammar.patch \
%D%/packages/patches/sharutils-CVE-2018-1000097.patch \ %D%/packages/patches/sharutils-CVE-2018-1000097.patch \
%D%/packages/patches/shishi-fix-libgcrypt-detection.patch \
%D%/packages/patches/slim-session.patch \ %D%/packages/patches/slim-session.patch \
%D%/packages/patches/slim-config.patch \ %D%/packages/patches/slim-config.patch \
%D%/packages/patches/slim-sigusr1.patch \ %D%/packages/patches/slim-sigusr1.patch \
@ -1893,6 +1904,7 @@ dist_patch_DATA = \
%D%/packages/patches/unzip-CVE-2014-9636.patch \ %D%/packages/patches/unzip-CVE-2014-9636.patch \
%D%/packages/patches/unzip-CVE-2015-7696.patch \ %D%/packages/patches/unzip-CVE-2015-7696.patch \
%D%/packages/patches/unzip-CVE-2015-7697.patch \ %D%/packages/patches/unzip-CVE-2015-7697.patch \
%D%/packages/patches/unzip-CVE-2022-0529+CVE-2022-0530.patch \
%D%/packages/patches/unzip-allow-greater-hostver-values.patch \ %D%/packages/patches/unzip-allow-greater-hostver-values.patch \
%D%/packages/patches/unzip-attribs-overflow.patch \ %D%/packages/patches/unzip-attribs-overflow.patch \
%D%/packages/patches/unzip-overflow-on-invalid-input.patch \ %D%/packages/patches/unzip-overflow-on-invalid-input.patch \

271
gnu/packages/admin.scm
View file

@ -77,6 +77,7 @@
#: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 python) #:use-module (guix build-system python)
#:use-module (guix build-system qt)
#:use-module (guix build-system ruby) #:use-module (guix build-system ruby)
#:use-module (guix build-system trivial) #:use-module (guix build-system trivial)
#:use-module (guix download) #:use-module (guix download)
@ -100,6 +101,7 @@
#:use-module (gnu packages cross-base) #:use-module (gnu packages cross-base)
#:use-module (gnu packages crypto) #:use-module (gnu packages crypto)
#:use-module (gnu packages cryptsetup) #:use-module (gnu packages cryptsetup)
#:use-module (gnu packages curl)
#:use-module (gnu packages cyrus-sasl) #:use-module (gnu packages cyrus-sasl)
#:use-module (gnu packages dns) #:use-module (gnu packages dns)
#:use-module (gnu packages elf) #:use-module (gnu packages elf)
@ -134,6 +136,7 @@
#:use-module (gnu packages mcrypt) #:use-module (gnu packages mcrypt)
#:use-module (gnu packages mpi) #:use-module (gnu packages mpi)
#:use-module (gnu packages ncurses) #:use-module (gnu packages ncurses)
#:use-module (gnu packages networking)
#:use-module (gnu packages openldap) #:use-module (gnu packages openldap)
#:use-module (gnu packages patchutils) #:use-module (gnu packages patchutils)
#:use-module (gnu packages pciutils) #:use-module (gnu packages pciutils)
@ -152,6 +155,7 @@
#:use-module (gnu packages ruby) #:use-module (gnu packages ruby)
#:use-module (gnu packages selinux) #:use-module (gnu packages selinux)
#:use-module (gnu packages serialization) #:use-module (gnu packages serialization)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages ssh) #:use-module (gnu packages ssh)
#:use-module (gnu packages sphinx) #:use-module (gnu packages sphinx)
#:use-module (gnu packages tcl) #:use-module (gnu packages tcl)
@ -1830,18 +1834,15 @@ at once based on a Perl regular expression.")
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "rc/weekly" (substitute* "rc/weekly"
(("/bin/kill") (("/bin/kill")
(string-append (assoc-ref inputs "coreutils*") (search-input-file inputs "/bin/kill"))
"/bin/kill"))
(("syslogd\\.pid") (("syslogd\\.pid")
;; The file is called 'syslog.pid' (no 'd'). ;; The file is called 'syslog.pid' (no 'd').
"syslog.pid")) "syslog.pid"))))
#t))
(add-after 'install 'install-info (add-after 'install 'install-info
(lambda _ (lambda _
(invoke "make" "install-info")))))) (invoke "make" "install-info"))))))
(native-inputs (list texinfo automake util-linux)) ; for 'cal' (native-inputs (list texinfo automake util-linux)) ; for 'cal'
(inputs `(("coreutils*" ,coreutils) (inputs (list coreutils mailutils))
("mailutils" ,mailutils)))
(home-page "https://www.gnu.org/software/rottlog/") (home-page "https://www.gnu.org/software/rottlog/")
(synopsis "Log rotation and management") (synopsis "Log rotation and management")
(description (description
@ -2140,39 +2141,35 @@ command.")
(inherit wpa-supplicant) (inherit wpa-supplicant)
(name "wpa-supplicant-gui") (name "wpa-supplicant-gui")
(inputs (modify-inputs (package-inputs wpa-supplicant) (inputs (modify-inputs (package-inputs wpa-supplicant)
(prepend qtbase-5 qtsvg))) (prepend qtbase-5 qtsvg-5)))
(native-inputs (native-inputs
;; For icons. ;; For icons.
(modify-inputs (package-native-inputs wpa-supplicant) (modify-inputs (package-native-inputs wpa-supplicant)
(prepend imagemagick inkscape/stable))) (prepend imagemagick inkscape/stable)))
(build-system qt-build-system)
(arguments (arguments
`(#:phases (modify-phases %standard-phases (list
#:test-target "check"
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'chdir (add-after 'unpack 'chdir
(lambda _ (chdir "wpa_supplicant/wpa_gui-qt4")))
(replace 'configure
(lambda _ (invoke "qmake" "wpa_gui.pro")))
(add-after 'build 'build-icons
(lambda _ (lambda _
(chdir "wpa_supplicant/wpa_gui-qt4") ;; Inkscape complains (but works) without a writable $HOME.
#t)) (setenv "HOME" "/tmp")
(delete 'configure)
(replace 'build
(lambda _
(invoke "qmake" "wpa_gui.pro")
(invoke "make" "-j" (number->string (parallel-job-count)))
(invoke "make" "-C" "icons"))) (invoke "make" "-C" "icons")))
(replace 'install (replace 'install
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda _
(let ((out (assoc-ref outputs "out")) (install-file "wpa_gui" (string-append #$output "/bin"))
(qt '("qtbase" "qtsvg")))
(install-file "wpa_gui" (string-append out "/bin"))
(install-file "wpa_gui.desktop" (install-file "wpa_gui.desktop"
(string-append out "/share/applications")) (string-append #$output
"/share/applications"))
(copy-recursively "icons/hicolor" (copy-recursively "icons/hicolor"
(string-append out "/share/icons/hicolor")) (string-append #$output
(wrap-program (string-append out "/bin/wpa_gui") "/share/icons/hicolor")))))))
`("QT_PLUGIN_PATH" ":" prefix
,(map (lambda (label)
(string-append (assoc-ref inputs label)
"/lib/qt5/plugins/"))
qt)))
#t))))))
(synopsis "Graphical user interface for WPA supplicant"))) (synopsis "Graphical user interface for WPA supplicant")))
(define-public hostapd (define-public hostapd
@ -3972,14 +3969,14 @@ information tool.")
(define-public nnn (define-public nnn
(package (package
(name "nnn") (name "nnn")
(version "4.5") (version "4.6")
(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 "1aj9hzhpwxl2v1dlf3jpd3rp81z689dq8iycbipc0024dnyibp7s")))) (base32 "0gvyvynw957yirvc1aj65flzni7niaj5bvyk82ka5dfgi2dazb0m"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
(list ncurses readline)) (list ncurses readline))
@ -5233,3 +5230,217 @@ allows applications to use whatever seat management is available.")
mediate access to shared devices, such as graphics and input, for applications mediate access to shared devices, such as graphics and input, for applications
that require it.") that require it.")
(license license:expat))) (license license:expat)))
(define-public fail2ban
(package
(name "fail2ban")
(version "0.11.2")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/fail2ban/fail2ban")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"00d9q8m284q2wy6q462nipzszplfbvrs9fhgn0y3imwsc24kv1db"))
(modules '((guix build utils)))
(snippet
'(begin
;; Get rid of absolute file names.
(substitute* "setup.py"
(("/etc/fail2ban")
"etc/fail2ban")
(("/var/lib/fail2ban")
"var/lib/fail2ban")
(("\"/usr/bin/\"")
"\"usr/bin/\"")
(("\"/usr/lib/fail2ban/\"")
"\"usr/lib/fail2ban/\"")
(("'/usr/share/doc/fail2ban'")
"'usr/share/doc/fail2ban'"))
;; disable tests performing unacceptable side-effects
(let ((make-suite (lambda (t)
(string-append
"tests.addTest.unittest.makeSuite."
t ".."))))
(substitute* "fail2ban/tests/utils.py"
(((make-suite "actiontestcase.CommandActionTest"))
"")
(((make-suite "misctestcase.SetupTest"))
"")
(((make-suite
"filtertestcase.DNSUtilsNetworkTests"))
"")
(((make-suite "filtertestcase.IgnoreIPDNS"))
"")
(((make-suite "filtertestcase.GetFailures"))
"")
(((make-suite
"fail2banclienttestcase.Fail2banServerTest"))
"")
(((make-suite
"servertestcase.ServerConfigReaderTests"))
"")))))
(patches (search-patches
"fail2ban-0.11.2_fix-setuptools-drop-2to3.patch"
"fail2ban-python310-server-action.patch"
"fail2ban-python310-server-actions.patch"
"fail2ban-python310-server-jails.patch"
"fail2ban-0.11.2_fix-test-suite.patch"
"fail2ban-0.11.2_CVE-2021-32749.patch"
"fail2ban-paths-guix-conf.patch"))))
(build-system python-build-system)
(arguments
'(#:phases (modify-phases %standard-phases
(add-before 'build 'invoke-2to3
(lambda _
(invoke "./fail2ban-2to3")))
(add-before 'install 'fix-default-config
(lambda* (#:key outputs #:allow-other-keys)
(substitute* '("config/paths-common.conf"
"fail2ban/tests/utils.py"
"fail2ban/client/configreader.py"
"fail2ban/client/fail2bancmdline.py"
"fail2ban/client/fail2banregex.py")
(("/etc/fail2ban")
(string-append (assoc-ref outputs "out")
"/etc/fail2ban")))))
(add-after 'fix-default-config 'set-action-dependencies
(lambda* (#:key inputs #:allow-other-keys)
;; deleting things that are not feasible to fix
;; or won't be used any way
(with-directory-excursion "config"
(for-each delete-file
'("paths-arch.conf"
"paths-debian.conf"
"paths-fedora.conf"
"paths-freebsd.conf"
"paths-opensuse.conf"
"paths-osx.conf")))
(with-directory-excursion "config/action.d"
(for-each delete-file
'("apf.conf"
"bsd-ipfw.conf"
"dshield.conf"
"ipfilter.conf"
"ipfw.conf"
"firewallcmd-allports.conf"
"firewallcmd-common.conf"
"firewallcmd-ipset.conf"
"firewallcmd-multiport.conf"
"firewallcmd-new.conf"
"firewallcmd-rich-logging.conf"
"firewallcmd-rich-rules.conf"
"osx-afctl.conf"
"osx-ipfw.conf"
"pf.conf"
"nginx-block-map.conf"
"npf.conf"
"shorewall.conf"
"shorewall-ipset-proto6.conf"
"ufw.conf")))
(let* ((lookup-cmd (lambda (i)
(search-input-file inputs i)))
(bin (lambda (i)
(lookup-cmd (string-append "/bin/" i))))
(sbin (lambda (i)
(lookup-cmd (string-append "/sbin/" i))))
(ip (sbin "ip"))
(sendmail (sbin "sendmail")))
(substitute* (find-files "config/action.d" "\\.conf$")
;; TODO: deal with geoiplookup ..
(("(awk|curl|dig|jq)" all cmd)
(bin cmd))
(("(cat|echo|grep|head|printf|wc) " all
cmd)
(string-append (bin cmd) " "))
((" (date|rm|sed|tail|touch|tr) " all
cmd)
(string-append " "
(bin cmd) " "))
(("cut -d")
(string-append (bin "cut") " -d"))
(("`date`")
(string-append "`"
(bin "date") "`"))
(("id -")
(string-append (bin "id") " -"))
(("ip -([46]) addr" all ver)
(string-append ip " -" ver " addr"))
(("ip route")
(string-append ip " route"))
(("ipset ")
(string-append (sbin "ipset") " "))
(("(iptables|ip6tables) <" all cmd)
(string-append (sbin cmd) " <"))
(("/usr/bin/nsupdate")
(bin "nsupdate"))
(("mail -E")
(string-append sendmail " -E"))
(("nftables = nft")
(string-append "nftables = " (sbin "nft")))
(("perl -e")
(string-append (bin "perl") " -e"))
(("/usr/sbin/sendmail")
sendmail)
(("test -e")
(string-append (bin "test") " -e"))
(("_whois = whois")
(string-append "_whois = " (bin "whois")))))
(substitute* "config/jail.conf"
(("before = paths-debian.conf")
"before = paths-guix.conf"))))
(add-after 'install 'copy-man-pages
(lambda* (#:key outputs #:allow-other-keys)
(let* ((man (string-append (assoc-ref outputs "out")
"/man"))
(install-man (lambda (m)
(lambda (f)
(install-file (string-append f
"." m)
(string-append man
"/man" m)))))
(install-man1 (install-man "1"))
(install-man5 (install-man "5")))
(with-directory-excursion "man"
(for-each install-man1
'("fail2ban"
"fail2ban-client"
"fail2ban-python"
"fail2ban-regex"
"fail2ban-server"
"fail2ban-testcases"))
(for-each install-man5
'("jail.conf")))))))))
(inputs (list gawk
coreutils-minimal
curl
grep
jq
iproute
ipset
iptables
`(,isc-bind "utils")
nftables
perl
python-pyinotify
sed
sendmail
sqlite
whois))
(home-page "http://www.fail2ban.org")
(synopsis "Daemon to ban hosts that cause multiple authentication errors")
(description
"Fail2Ban scans log files like @file{/var/log/auth.log} and bans IP
addresses conducting too many failed login attempts. It does this by updating
system firewall rules to reject new connections from those IP addresses, for a
configurable amount of time. Fail2Ban comes out-of-the-box ready to read many
standard log files, such as those for sshd and Apache, and is easily
configured to read any log file of your choosing, for any error you wish.
Though Fail2Ban is able to reduce the rate of incorrect authentication
attempts, it cannot eliminate the risk presented by weak authentication. Set
up services to use only two factor, or public/private authentication
mechanisms if you really want to protect services.")
(license license:gpl2+)))

73
gnu/packages/algebra.scm
View file

@ -413,13 +413,13 @@ or text interfaces) or as a C++ library.")
(define-public flint (define-public flint
(package (package
(name "flint") (name "flint")
(version "2.8.4") (version "2.9.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://flintlib.org/flint-" version ".tar.gz")) (uri (string-append "http://flintlib.org/flint-" version ".tar.gz"))
(sha256 (sha256
(base32 "1gp4wm2s8c27g2hh53d09cys62da1bsxfwbcsj9cd7cfikm95pv1")))) (base32 "0sp79ixaawjzna79afrlwlx9hg55jxil03f1wq435j9k23ar1h1g"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
(list ntl)) (list ntl))
@ -466,7 +466,7 @@ fast arithmetic.")
(define-public arb (define-public arb
(package (package
(name "arb") (name "arb")
(version "2.22.1") (version "2.23.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -475,7 +475,7 @@ fast arithmetic.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0qcyf8a7w95yxap0r3sb7xibk53nbs5kkidja3ljvqpbpk5xvpax")))) "1m9vskyf857gbm0cbh3z8c8m6cqkqa765wb9hqmsv7yzfmklzpvn"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(propagated-inputs (propagated-inputs
(list flint)) ; flint.h is included by arf.h (list flint)) ; flint.h is included by arf.h
@ -540,14 +540,14 @@ these types and other mathematical functions.")
(define-public ntl (define-public ntl
(package (package
(name "ntl") (name "ntl")
(version "11.4.4") (version "11.5.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://shoup.net/ntl/ntl-" (uri (string-append "https://shoup.net/ntl/ntl-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1nr1h27j2gdz6badzz9lk2pknxhdijqdxqhd3haryh0sw616wzwx")) "12ka3hym4skg63mp8vgkin79svbpdk2m6i41yvmcdjq62g1hc391"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -923,7 +923,7 @@ algorithms from the FORTRAN library MINPACK.")
(define-public symengine (define-public symengine
(package (package
(name "symengine") (name "symengine")
(version "0.6.0") (version "0.9.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -932,7 +932,7 @@ algorithms from the FORTRAN library MINPACK.")
(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 "129iv9maabmb42ylfdv0l0g94mcbf3y4q3np175008rcqdr8z6h1")))) (base32 "17b6byrhk0bgvarqmg92nrrqhzll9as6x1smghmyq2h9xc373ap4"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:configure-flags '(#:configure-flags
@ -1206,17 +1206,17 @@ xtensor provides:
(define-public gap (define-public gap
(package (package
(name "gap") (name "gap")
(version "4.11.0") (version "4.11.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://files.gap-system.org/gap-" (uri (string-append "https://files.gap-system.org/gap-"
(version-major+minor version) (version-major+minor version)
"/tar.bz2/gap-" "/tar.gz/gap-"
version version
".tar.bz2")) ".tar.gz"))
(sha256 (sha256
(base32 "00l6hvy4iggnlrib4vp805sxdm3j7n3hzpv5zs9hbiiavh80l1xz")) (base32 "01535s81h254zcs84zi95xqmhvvn6fn9qss8761myxc2gpdcadb6"))
(modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1)))
(snippet (snippet
'(begin '(begin
@ -1242,28 +1242,42 @@ xtensor provides:
"SmallGrp-" ; artistic2.0 "SmallGrp-" ; artistic2.0
"transgrp" ; artistic2.0 for data, "transgrp" ; artistic2.0 for data,
; gpl2 or gpl3 for code ; gpl2 or gpl3 for code
;; Recommended package. ;; Optional packages.
"io-" ; gpl3+
;; Optional packages, searched for at start,
;; and their depedencies.
"alnuth-" "alnuth-"
"AutoDoc-"
"automata-"
"autpgrp-" "autpgrp-"
"crime-"
"crisp-" ; bsd-2 "crisp-" ; bsd-2
"ctbllib" ; gpl3+, clarified in the next release; "ctbllib" ; gpl3+
; see "datastructures"
; http://www.math.rwth-aachen.de/~Thomas.Breuer/ctbllib/README.md
"FactInt-" "FactInt-"
"fga" "fga"
"format"
"groupoids-"
"guarana"
"idrel-"
"images-" ; mpl2.0
"IntPic-"
"io-" ; gpl3+
"irredsol-" ; bsd-2 "irredsol-" ; bsd-2
"laguna-" "laguna-"
"liering-"
"MapClass-"
"nilmat-"
"NumericalSgps-"
"OpenMath-"
"orb-" ; gpl3+
"polenta-" "polenta-"
"polycyclic-" "polycyclic-"
"radiroot-" "radiroot-"
"repsn-"
"resclasses-" "resclasses-"
"simpcomp"
"sophus-" "sophus-"
"tomlib-" "tomlib-"
"utils-")))) "unipot-"
#t)))) "utils-"))))))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
(list gmp readline zlib)) (list gmp readline zlib))
@ -1280,14 +1294,12 @@ xtensor provides:
(lambda _ (lambda _
(setenv "CONFIG_SHELL" (which "bash")) (setenv "CONFIG_SHELL" (which "bash"))
(with-directory-excursion "pkg" (with-directory-excursion "pkg"
(invoke "../bin/BuildPackages.sh") (invoke "../bin/BuildPackages.sh"))))
#t)))
(add-after 'build-packages 'build-doc (add-after 'build-packages 'build-doc
;; The documentation is bundled, but we create it from source. ;; The documentation is bundled, but we create it from source.
(lambda _ (lambda _
(with-directory-excursion "doc" (with-directory-excursion "doc"
(invoke "./make_doc")) (invoke "./make_doc"))))
#t))
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
@ -1312,6 +1324,8 @@ xtensor provides:
(chmod prog #o755) (chmod prog #o755)
;; Install the headers and library, which are needed by Sage. ;; Install the headers and library, which are needed by Sage.
(invoke "make" "install-headers") (invoke "make" "install-headers")
(install-file "gen/config.h"
(string-append out "/include/gap"))
(invoke "make" "install-libgap") (invoke "make" "install-libgap")
;; Remove information on the build directory from sysinfo.gap. ;; Remove information on the build directory from sysinfo.gap.
(substitute* "sysinfo.gap" (substitute* "sysinfo.gap"
@ -1321,8 +1335,7 @@ xtensor provides:
(invoke "make" "install-gaproot") (invoke "make" "install-gaproot")
;; Copy the directory of compiled packages; the make target ;; Copy the directory of compiled packages; the make target
;; install-pkg is currently empty. ;; install-pkg is currently empty.
(copy-recursively "pkg" (string-append share "/pkg"))) (copy-recursively "pkg" (string-append share "/pkg"))))))))
#t)))))
(home-page "https://www.gap-system.org/") (home-page "https://www.gap-system.org/")
(synopsis (synopsis
"System for computational group theory") "System for computational group theory")
@ -1589,16 +1602,16 @@ of M4RI from F_2 to F_{2^e}.")
(define-public eclib (define-public eclib
(package (package
(name "eclib") (name "eclib")
(version "20190909") (version "20220621")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/JohnCremona/eclib/") (url "https://github.com/JohnCremona/eclib/")
(commit (string-append "v" version)))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1gw27lqc3f525n8qdcmr2nyn16y9g10z9f6dnmckyyxcdzvhq35n")))) "07wbkzmn6w0hrv2vim7f0il7k59ccc66x5vnn623xkmhfw32b3nz"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
(list autoconf automake libtool)) (list autoconf automake libtool))

30
gnu/packages/android.scm
View file

@ -34,6 +34,7 @@
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix build-system android-ndk) #:use-module (guix build-system android-ndk)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system go) #:use-module (guix build-system go)
#:use-module (guix build-system python) #:use-module (guix build-system python)
@ -54,6 +55,8 @@
#:use-module (gnu packages python-crypto) #:use-module (gnu packages python-crypto)
#:use-module (gnu packages python-web) #:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz) #:use-module (gnu packages python-xyz)
#:use-module (gnu packages qt)
#:use-module (gnu packages readline)
#:use-module (gnu packages selinux) #:use-module (gnu packages selinux)
#:use-module (gnu packages serialization) #:use-module (gnu packages serialization)
#:use-module (gnu packages sphinx) #:use-module (gnu packages sphinx)
@ -1268,3 +1271,30 @@ Dalvik VM. Their bytecode differs from the bytecode of normal Java
applications. Enjarify can translate the Dalvik bytecode back to equivalent applications. Enjarify can translate the Dalvik bytecode back to equivalent
Java bytecode, which simplifies the analysis of Android applications.") Java bytecode, which simplifies the analysis of Android applications.")
(license license:asl2.0))) (license license:asl2.0)))
(define-public android-file-transfer
(package
(name "android-file-transfer")
(version "4.2")
(source (origin
(method git-fetch)
(uri (git-reference
(url
"https://github.com/whoozle/android-file-transfer-linux/")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"125rq8ji83nw6chfw43i0h9c38hjqh1qjibb0gnf9wrigar9zc8b"))))
(build-system cmake-build-system)
(arguments
(list #:tests? #f)) ;there are no tests
(inputs (list qtbase-5 fuse-3 libxkbcommon))
(native-inputs (list qttools-5 openssl readline))
(home-page "https://whoozle.github.io/android-file-transfer-linux/")
(synopsis "MTP client for Android devices")
(description
"This package provides a Qt graphical interface for transferring files
with Android devices using MTP. It also allows the Android device to be
mounted via FUSE.")
(license license:lgpl2.1+)))

8
gnu/packages/animation.scm
View file

@ -435,7 +435,7 @@ language.")
(add-after 'install 'wrap-executable (add-after 'install 'wrap-executable
(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"))
(qt '("qt" "qtmultimedia"))) (qt '("qt" "qtmultimedia-5")))
(wrap-program (string-append out "/bin/Papagayo") (wrap-program (string-append out "/bin/Papagayo")
`("QT_PLUGIN_PATH" ":" prefix `("QT_PLUGIN_PATH" ":" prefix
,(map (lambda (label) ,(map (lambda (label)
@ -445,10 +445,10 @@ language.")
#t)))))) #t))))))
(inputs (inputs
`(("qt" ,qtbase-5) `(("qt" ,qtbase-5)
("qtmultimedia" ,qtmultimedia) ("qtmultimedia-5" ,qtmultimedia-5)
("libsndfile" ,libsndfile))) ("libsndfile" ,libsndfile)))
(native-inputs (native-inputs
(list qttools)) (list qttools-5))
(home-page "https://www.lostmarble.com/papagayo/") (home-page "https://www.lostmarble.com/papagayo/")
(synopsis "Lip-syncing for animations") (synopsis "Lip-syncing for animations")
(description (description
@ -474,7 +474,7 @@ waveform until they line up with the proper sounds.")
"0b1nwiwyg01087q318vymg4si76dw41ykxbn2zwd6dqbxzbpr1dh")))) "0b1nwiwyg01087q318vymg4si76dw41ykxbn2zwd6dqbxzbpr1dh"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
(list qtbase-5 qtxmlpatterns qtmultimedia qtsvg)) (list qtbase-5 qtxmlpatterns qtmultimedia-5 qtsvg-5))
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases

11
gnu/packages/aspell.scm
View file

@ -47,6 +47,7 @@
(package (package
(name "aspell") (name "aspell")
(version "0.60.8") (version "0.60.8")
(replacement aspell/replacement)
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -92,6 +93,16 @@ documents written in the UTF-8 encoding and its ability to use multiple
dictionaries, including personal ones.") dictionaries, including personal ones.")
(license lgpl2.1+))) (license lgpl2.1+)))
;; Replacement package with security fixes.
(define aspell/replacement
(package
(inherit aspell)
(source
(origin
(inherit (package-source aspell))
(patches (append (origin-patches (package-source aspell))
(search-patches "aspell-CVE-2019-25051.patch")))))))
;;; ;;;
;;; Dictionaries. ;;; Dictionaries.
;;; ;;;

229
gnu/packages/astronomy.scm
View file

@ -69,6 +69,7 @@
#:use-module (gnu packages xorg) #:use-module (gnu packages xorg)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#:use-module (guix build-system copy)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module (guix download) #:use-module (guix download)
@ -79,6 +80,33 @@
#:use-module (ice-9 match) #:use-module (ice-9 match)
#:use-module (srfi srfi-1)) #:use-module (srfi srfi-1))
(define-public aocommon
(let ((commit "7329a075271edab8f6264db649e81e62b2b6ae5e")
(revision "1"))
(package
(name "aocommon")
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.com/aroffringa/aocommon")
(commit commit)))
(sha256
(base32 "0qcfax6pbzs0yigy0x8xibrkk539wm2pbvjsb4lh50fybir02nix"))
(file-name (git-file-name name version))))
(build-system copy-build-system)
(arguments
(list #:install-plan
#~'(("include/aocommon" "include/aocommon"))))
(home-page "https://gitlab.com/aroffringa/aocommon")
(synopsis "Collection of functionality that is reused in astronomical applications")
(description
"This package provides source-only AOCommon collection of functionality that is
reused in several astronomical applications, such as @code{wsclean},
@code{aoflagger}, @code{DP3} and @code{everybeam}.")
(license license:gpl3+))))
(define-public calceph (define-public calceph
(package (package
(name "calceph") (name "calceph")
@ -114,6 +142,69 @@ moment, supported SPICE files are:
@end itemize\n") @end itemize\n")
(license license:cecill))) (license license:cecill)))
(define-public aoflagger
(package
(name "aoflagger")
(version "3.2.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.com/aroffringa/aoflagger")
(commit (string-append "v" version))))
(sha256
(base32 "1dcbfrbiybhpbypna2xhddx1wk7yifh38ha2r6p5rzsikzwlsin1"))
(patches
(search-patches "aoflagger-use-system-provided-pybind11.patch"))
(file-name (git-file-name name version))))
(build-system cmake-build-system)
(arguments
(list
;; XXX: Tests require external files download from
;; https://www.astron.nl/citt/ci_data/aoflagger/
;; FIXME: runtest is not found
#:tests? #f
#:configure-flags
#~(list (string-append "-DCASACORE_ROOT_DIR="
#$(this-package-input "casacore")))
#:phases
#~(modify-phases %standard-phases
;; aocommon and pybind11 are expected to be found as git submodules,
;; link them before build.
(add-after 'unpack 'link-submodule-package
(lambda _
(rmdir "external/aocommon")
(symlink #$(this-package-native-input "aocommon")
(string-append (getcwd) "/external/aocommon")))))))
(native-inputs
(list aocommon
boost
pkg-config
python
pybind11))
(inputs
(list casacore
cfitsio
fftw
gsl
gtkmm-3
hdf5
lapack
libpng
libsigc++
libxml2
lua
openblas
zlib))
(home-page "https://gitlab.com/aroffringa/aoflagger")
(synopsis "Astronomical tool that can find and remove radio-frequency interference")
(description
"AOFlagger is a tool that can find and remove radio-frequency
interference (RFI) in radio astronomical observations. It can make use of Lua
scripts to make flagging strategies flexible, and the tools are applicable to a
wide set of telescopes.")
(license license:gpl3+)))
(define-public casacore (define-public casacore
(package (package
(name "casacore") (name "casacore")
@ -607,7 +698,7 @@ deconvolution). Such post-processing is not performed by Stackistry.")
(inputs (inputs
(list qtbase-5 (list qtbase-5
qtlocation qtlocation
qtmultimedia qtmultimedia-5
qtscript qtscript
qtserialport qtserialport
zlib)) zlib))
@ -615,7 +706,7 @@ deconvolution). Such post-processing is not performed by Stackistry.")
`(("gettext" ,gettext-minimal) ; xgettext is used at compile time `(("gettext" ,gettext-minimal) ; xgettext is used at compile time
("perl" ,perl) ; for pod2man ("perl" ,perl) ; for pod2man
("qtbase" ,qtbase-5) ; Qt MOC is needed at compile time ("qtbase" ,qtbase-5) ; Qt MOC is needed at compile time
("qttools" ,qttools))) ("qttools-5" ,qttools-5)))
(arguments (arguments
`(#:test-target "test" `(#:test-target "test"
#:configure-flags (list "-DENABLE_TESTING=1" #:configure-flags (list "-DENABLE_TESTING=1"
@ -1131,6 +1222,48 @@ Mechanics, Astrometry and Astrodynamics library.")
(license (list license:lgpl2.0+ (license (list license:lgpl2.0+
license:gpl2+)))) ; examples/transforms.c & lntest/*.c license:gpl2+)))) ; examples/transforms.c & lntest/*.c
(define-public libsep
(package
(name "libsep")
(version "1.2.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/kbarbary/sep")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0sag96am6r1ffh9860yq40js874362v3132ahlm6sq7padczkicf"))))
(build-system cmake-build-system)
(arguments
(list
#:make-flags #~(list (string-append "CC=" #$(cc-for-target))
(string-append "PREFIX=" #$output))
#:phases #~(modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(chdir "../source")
(invoke "make"
(string-append "CC=" #$(cc-for-target))
"test")))))))
(native-inputs
(list python-wrapper))
(home-page "https://github.com/kbarbary/sep")
(synopsis "Astronomical source extraction and photometry library")
(description
"SEP makes the core algorithms of
@url{https://www.astromatic.net/software/sextractor/, sextractor} available as a
library of stand-alone functions and classes. These operate directly on
in-memory arrays (no FITS files or configuration files). The code is derived
from the Source Extractor code base (written in C) and aims to produce results
compatible with Source Extractor whenever possible. SEP consists of a C library
with no dependencies outside the standard library, and a Python module that
wraps the C library in a Pythonic API. The Python wrapper operates on NumPy
arrays with NumPy as its only dependency.")
(license (list license:expat license:lgpl3+ license:bsd-3))))
(define-public libskry (define-public libskry
(package (package
(name "libskry") (name "libskry")
@ -1606,29 +1739,89 @@ Astronomical Union (IAU). All C routines are wrapped as Numpy universal
functions, so that they can be called with scalar or array inputs.") functions, so that they can be called with scalar or array inputs.")
(license license:bsd-3))) (license license:bsd-3)))
(define-public python-sep (define-public python-pynbody
(package (package
(name "python-sep") (name "python-pynbody")
(version "1.1.1") (version "1.2.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "sep" version)) (uri (pypi-uri "pynbody" version))
(sha256 (sha256
(base32 "0wxdqn92q1grv8k7xi7h88ac6wnznw4xh5bdlz1vz6za2dgsyj4m")))) (base32 "1jxwk2s4qz1znvyak2lj7ld01kl1jh87xp81ki7a8dz1gcy93fkx"))))
(build-system python-build-system) (build-system python-build-system)
(arguments
(list #:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'disable-tests-require-testdata
(lambda _
;; Disable tests which need to download additional 1.0GiB+
;; of test data archive from
;; http://star.ucl.ac.uk/~app/testdata.tar.gz
;; https://github.com/pynbody/pynbody/blob/ \
;; f4bd482dc47532831b3ec115c7cb07149d61bfc5/ \
;; .github/workflows/build-test.yaml#L41
(with-directory-excursion "tests"
(for-each delete-file
'("gravity_test.py"
"adaptahop_test.py"
"ahf_halos_test.py"
"array_test.py"
"bridge_test.py"
"family_test.py"
"partial_tipsy_test.py"
"snapshot_test.py"
"test_profile.py"
"gadget_test.py"
"gadgethdf_test.py"
"grafic_test.py"
"halotools_test.py"
"nchilada_test.py"
"ramses_new_ptcl_format_test.py"
"ramses_test.py"
"rockstar_test.py"
"sph_image_test.py"
"sph_smooth_test.py"
"subfind_test.py"
"subfindhdf_gadget4_test.py"
"tipsy_test.py")))))
(replace 'check
(lambda* (#:key tests? inputs outputs #:allow-other-keys)
(when tests?
(add-installed-pythonpath inputs outputs)
(setenv "HOME" "/tmp")
(invoke "pytest" "-vv")))))))
(native-inputs (native-inputs
(list python-cython python-pytest)) (list python-cython
(inputs python-pandas
(list python-numpy)) python-pytest))
(home-page "https://github.com/kbarbary/sep") (propagated-inputs
(synopsis "Astronomical source extraction and photometry library") (list python-h5py
(description python-matplotlib
"SEP makes the core algorithms of Source Extractor available as a library python-numpy
of stand-alone functions and classes.") python-posix-ipc
(license (list license:bsd-3 python-scipy))
license:expat (home-page "https://pynbody.github.io/pynbody/index.html")
license:lgpl3+)))) (synopsis "Light-weight astronomical N-body/SPH analysis for python")
(description "@code{Pynbody} is an analysis framework for N-body and hydrodynamic
astrophysical simulations supporting PKDGRAV/Gasoline, Gadget, Gadget4/Arepo,
N-Chilada and RAMSES AMR outputs.")
(license license:gpl3+)))
(define-public python-sep
(package
(inherit libsep)
(name "python-sep")
(build-system python-build-system)
(arguments
(strip-keyword-arguments
'(#:make-flags) (package-arguments libsep)))
(native-inputs
(modify-inputs (package-inputs libsep)
(prepend python-cython)))
(propagated-inputs
(modify-inputs (package-inputs libsep)
(prepend python-numpy)))))
(define-public python-asdf (define-public python-asdf
(package (package

38
gnu/packages/audio.scm
View file

@ -125,6 +125,7 @@
#:use-module (gnu packages web) #:use-module (gnu packages web)
#:use-module (gnu packages webkit) #:use-module (gnu packages webkit)
#:use-module (gnu packages wxwidgets) #:use-module (gnu packages wxwidgets)
#:use-module (gnu packages xdisorg)
#:use-module (gnu packages xiph) #:use-module (gnu packages xiph)
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module (gnu packages xorg) #:use-module (gnu packages xorg)
@ -586,7 +587,7 @@ implementation of Adaptive Multi Rate Narrowband and Wideband
liblo liblo
qtbase-5)) qtbase-5))
(native-inputs (native-inputs
(list pkg-config qttools)) (list pkg-config qttools-5))
(home-page "http://alsamodular.sourceforge.net/") (home-page "http://alsamodular.sourceforge.net/")
(synopsis "Realtime modular synthesizer and effect processor") (synopsis "Realtime modular synthesizer and effect processor")
(description (description
@ -3096,7 +3097,7 @@ different audio devices such as ALSA or PulseAudio.")
(inputs (inputs
(list jack-1 alsa-lib portaudio qtbase-5 qtx11extras)) (list jack-1 alsa-lib portaudio qtbase-5 qtx11extras))
(native-inputs (native-inputs
(list pkg-config qttools)) (list pkg-config qttools-5))
(home-page "https://qjackctl.sourceforge.io/") (home-page "https://qjackctl.sourceforge.io/")
(synopsis "Jack server control application") (synopsis "Jack server control application")
(description "Control a Jack server. Allows you to plug various sources (description "Control a Jack server. Allows you to plug various sources
@ -3217,7 +3218,7 @@ link REQUIRED)"))))))
(string-append ide "/bin")) (string-append ide "/bin"))
(delete-file scide))))))) (delete-file scide)))))))
(native-inputs (native-inputs
(list ableton-link pkg-config qttools xorg-server-for-tests)) (list ableton-link pkg-config qttools-5 xorg-server-for-tests))
(inputs (list jack-1 (inputs (list jack-1
libsndfile libsndfile
fftw fftw
@ -3231,12 +3232,12 @@ link REQUIRED)"))))))
boost-sync boost-sync
yaml-cpp yaml-cpp
qtbase-5 qtbase-5
qtdeclarative qtdeclarative-5
qtsvg qtsvg-5
qtwebchannel qtwebchannel-5
qtwebsockets)) qtwebsockets-5))
(propagated-inputs ;to get native-search-path (propagated-inputs ;to get native-search-path
(list qtwebengine)) (list qtwebengine-5))
(home-page "https://github.com/supercollider/supercollider") (home-page "https://github.com/supercollider/supercollider")
(synopsis "Synthesis engine and programming language") (synopsis "Synthesis engine and programming language")
(description "SuperCollider is a synthesis engine (@code{scsynth} or (description "SuperCollider is a synthesis engine (@code{scsynth} or
@ -3597,16 +3598,16 @@ stretching and pitch scaling of audio. This package contains the library.")
(define-public libkeyfinder (define-public libkeyfinder
(package (package
(name "libkeyfinder") (name "libkeyfinder")
(version "2.2.6") (version "2.2.7")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/mixxxdj/libkeyfinder") (url "https://github.com/mixxxdj/libkeyfinder")
(commit (string-append "v" version)))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0s7nqjmv44q5qjynfcs0j6h4a6qcz4mxzandkkdjjbnwv5rxc3zg")))) (base32 "0nvhdzy0m3bchk3dpnspv2f518p2v9fjcrv36z1sva1pv9a2g35w"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
(list catch-framework2)) (list catch-framework2))
@ -3902,7 +3903,7 @@ interface.")
(arguments (arguments
`(#:tests? #f)) ; no "check" phase `(#:tests? #f)) ; no "check" phase
(native-inputs (native-inputs
(list qttools pkg-config)) (list qttools-5 pkg-config))
(inputs (inputs
(list fluidsynth qtbase-5 qtx11extras)) (list fluidsynth qtbase-5 qtx11extras))
(home-page "https://qsynth.sourceforge.io") (home-page "https://qsynth.sourceforge.io")
@ -5454,11 +5455,11 @@ Rate} 3600x2250 bit/s vocoder used in various radio systems.")
python ;for running tests python ;for running tests
portaudio ;for portaudio examples portaudio ;for portaudio examples
qtbase-5 ;for Qt examples qtbase-5 ;for Qt examples
qtdeclarative qtdeclarative-5
qttools)) qttools-5))
(inputs (inputs
(list jack-1 ;for JACK examples (list jack-1 ;for JACK examples
qtquickcontrols)) ;for Qt examples qtquickcontrols-5)) ;for Qt examples
(propagated-inputs (propagated-inputs
;; This is because include/ableton/platforms/asio/AsioWrapper.hpp ;; This is because include/ableton/platforms/asio/AsioWrapper.hpp
;; contains '#include <asio.hpp>'. ;; contains '#include <asio.hpp>'.
@ -5848,12 +5849,11 @@ and DSD streams.")
(base32 (base32
"1xqmlbqj6ny4cpclzr8xyy6d6i392h9f1vmlbasp6xfy5b0yya94")))) "1xqmlbqj6ny4cpclzr8xyy6d6i392h9f1vmlbasp6xfy5b0yya94"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments (list #:tests? #f)) ;; no tests
`(#:tests? #f)) ;; no tests
(inputs (list alsa-lib (inputs (list alsa-lib
libxkbcommon
pipewire-0.3 pipewire-0.3
;; qtsvg is still on version 5; use qtbase-5 to match qtbase
qtbase-5
qtsvg)) qtsvg))
(native-inputs (list pkg-config)) (native-inputs (list pkg-config))
(synopsis "PipeWire graph manager") (synopsis "PipeWire graph manager")

2
gnu/packages/aux-files/emacs/guix-emacs.el
View file

@ -56,7 +56,7 @@ The files in the list do not have extensions (.el, .elc)."
(let ((autoloads (mapcan #'guix-emacs-find-autoloads (let ((autoloads (mapcan #'guix-emacs-find-autoloads
(guix-emacs--non-core-load-path)))) (guix-emacs--non-core-load-path))))
(mapc (lambda (f) (mapc (lambda (f)
(load f 'noerror)) (load f 'noerror t))
autoloads))) autoloads)))
;;;###autoload ;;;###autoload

28
gnu/packages/backup.scm
View file

@ -2,7 +2,7 @@
;;; Copyright © 2014, 2015, 2020 Eric Bavier <bavier@posteo.net> ;;; Copyright © 2014, 2015, 2020 Eric Bavier <bavier@posteo.net>
;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net> ;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net>
;;; Copyright © 2015, 2016, 2017, 2021, 2022 Leo Famulari <leo@famulari.name> ;;; Copyright © 2015, 2016, 2017, 2021, 2022 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017–2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017, 2021 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2017, 2021 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net>
@ -1091,14 +1091,14 @@ interactive mode.")
(define-public btrbk (define-public btrbk
(package (package
(name "btrbk") (name "btrbk")
(version "0.31.3") (version "0.32.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://digint.ch/download/btrbk/releases/" (uri (string-append "https://digint.ch/download/btrbk/releases/"
name "-" version ".tar.xz")) "btrbk-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1lx7vnf386nsik8mxrrfyx1h7mkqk5zs26sy0s0lynfxcm4lkxb2")))) "0gi0j09fm4pgw3dq0z27lkpyvrs3ssyqg9b46v5ba794z63w753z"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list (list
@ -1121,19 +1121,23 @@ interactive mode.")
(string-append "program_name = " (string-append "program_name = "
"$ENV{'BTRBK_PROGRAM_NAME'}"))) "$ENV{'BTRBK_PROGRAM_NAME'}")))
;; Wrap the script, so that it works with SSH URI and ;; Wrap the script, so that it works with SSH URI and
;; finds mbuffer out of the box. ;; finds mbuffer and other tools out of the box.
(wrap-program btrbk (wrap-program btrbk
#:sh (search-input-file inputs "bin/bash") #:sh (search-input-file inputs "bin/bash")
'("BTRBK_PROGRAM_NAME" = ("$0")) '("BTRBK_PROGRAM_NAME" = ("$0"))
`("PATH" prefix `("PATH" prefix
,(list (string-append #$btrfs-progs "/bin") ,(map (lambda (command)
(string-append #$coreutils "/bin") (dirname (search-input-file inputs command)))
(string-append #$mbuffer "/bin") (list "bin/btrfs"
(string-append #$openssh "/bin"))))))))) "bin/cat"
"bin/find"
"bin/mbuffer"
"bin/ssh")))))))))
(native-inputs (list ruby-asciidoctor)) (native-inputs (list ruby-asciidoctor))
(inputs (list bash-minimal (inputs (list bash-minimal
btrfs-progs btrfs-progs
coreutils coreutils
findutils
mbuffer mbuffer
openssh openssh
perl)) perl))
@ -1287,13 +1291,13 @@ borgmatic is powered by borg.")
(define-public vorta (define-public vorta
(package (package
(name "vorta") (name "vorta")
(version "0.8.3") (version "0.8.7")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "vorta" version)) (uri (pypi-uri "vorta" version))
(sha256 (sha256
(base32 (base32
"0674crxsmf1gwiacpi9ixypgz685fyzr5y3f9sd768b0bmh7ilsn")))) "0yv2z2djbl7aq3fa9m3ihzv9i99a5ahsxz7dlzwvvf4a7pmhc6b2"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
(list (list
@ -1335,7 +1339,7 @@ borgmatic is powered by borg.")
python-pyqt-without-qtwebkit python-pyqt-without-qtwebkit
python-secretstorage python-secretstorage
;; This is included so that the qt-wrap phase picks it up. ;; This is included so that the qt-wrap phase picks it up.
qtsvg)) qtsvg-5))
(home-page "https://github.com/borgbase/vorta") (home-page "https://github.com/borgbase/vorta")
(synopsis "Graphical backup client based on BorgBackup") (synopsis "Graphical backup client based on BorgBackup")
(description "Vorta is a graphical backup client based on the Borg backup (description "Vorta is a graphical backup client based on the Borg backup

2
gnu/packages/benchmark.scm
View file

@ -499,7 +499,7 @@ and options. With careful benchmarking, different hardware can be compared.")
(substitute* "src/benchmark.cpp" (substitute* "src/benchmark.cpp"
(("\"fio\"") (("\"fio\"")
(format #f "~s" (search-input-file inputs "bin/fio"))))))))) (format #f "~s" (search-input-file inputs "bin/fio")))))))))
(native-inputs (list extra-cmake-modules qttools)) (native-inputs (list extra-cmake-modules qttools-5))
(inputs (list fio qtbase-5)) (inputs (list fio qtbase-5))
(home-page "https://github.com/JonMagon/KDiskMark") (home-page "https://github.com/JonMagon/KDiskMark")
(synopsis "Simple disk benchmark tool") (synopsis "Simple disk benchmark tool")

187
gnu/packages/bioconductor.scm
View file

@ -49,6 +49,7 @@
#:use-module (gnu packages image) #:use-module (gnu packages image)
#:use-module (gnu packages maths) #:use-module (gnu packages maths)
#:use-module (gnu packages netpbm) #:use-module (gnu packages netpbm)
#:use-module (gnu packages python)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages statistics) #:use-module (gnu packages statistics)
@ -2647,6 +2648,65 @@ and evaluate clustering results.")
arbitrary genomic intervals along chromosomal ideogram.") arbitrary genomic intervals along chromosomal ideogram.")
(license license:gpl2))) (license license:gpl2)))
(define-public r-infercnv
(package
(name "r-infercnv")
(version "1.12.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "infercnv" version))
(sha256
(base32
"01f021fdxm058733rky46dlvqg7dmf5mn5x9lnq0fspp5665w3bl"))))
(properties `((upstream-name . "infercnv")))
(build-system r-build-system)
(inputs (list python))
(propagated-inputs
(list r-ape
r-argparse
r-biocgenerics
r-catools
r-coda
r-coin
r-digest
r-doparallel
r-dplyr
r-edger
r-fastcluster
r-fitdistrplus
r-foreach
r-futile-logger
r-future
r-ggplot2
r-gplots
r-gridextra
r-hiddenmarkov
r-leiden
r-matrix
r-paralleldist
r-phyclust
r-rann
r-rcolorbrewer
r-reshape
r-rjags
r-singlecellexperiment
r-summarizedexperiment
r-tidyr))
(native-inputs (list r-knitr))
(home-page "https://github.com/broadinstitute/inferCNV/wiki")
(synopsis "Infer copy number variation from single-cell RNA-Seq data")
(description
"@code{InferCNV} is used to explore tumor single cell RNA-Seq data to identify
evidence for somatic large-scale chromosomal copy number alterations, such as gains
or deletions of entire chromosomes or large segments of chromosomes. This is done
by exploring expression intensity of genes across positions of a tumor genome in
comparison to a set of reference \"normal\" cells. A heatmap is generated
illustrating the relative expression intensities across each chromosome, and it
often becomes readily apparent as to which regions of the tumor genome are
over-abundant or less-abundant as compared to that of normal cells.")
(license license:bsd-3)))
(define-public r-iranges (define-public r-iranges
(package (package
(name "r-iranges") (name "r-iranges")
@ -3357,6 +3417,53 @@ users direct access to a diverse set of data and enable a wide range of
powerful online queries from gene annotation to database mining.") powerful online queries from gene annotation to database mining.")
(license license:artistic2.0))) (license license:artistic2.0)))
;; This is a CRAN package, but it depends on a Bioconductor package:
;; r-biomart
(define-public r-biomartr
(package
(name "r-biomartr")
(version "1.0.2")
(source (origin
(method url-fetch)
(uri (cran-uri "biomartr" version))
(sha256
(base32
"0hr7wks88lbfcqzjzm4x265dk4lpmc3i2ndp7xcrx8ssj76wrmkz"))))
(properties `((upstream-name . "biomartr")))
(build-system r-build-system)
(propagated-inputs
(list r-biomart
r-biostrings
r-curl
r-data-table
r-downloader
r-dplyr
r-fs
r-httr
r-jsonlite
r-philentropy
r-purrr
r-r-utils
r-rcurl
r-readr
r-stringr
r-tibble
r-withr
r-xml))
(native-inputs (list r-knitr))
(home-page "https://docs.ropensci.org/biomartr/")
(synopsis "Genomic data retrieval")
(description
"Perform large scale genomic data retrieval and functional annotation
retrieval. This package aims to provide users with a standardized way to
automate genome, proteome, RNA, coding sequence (CDS), GFF, and metagenome
retrieval from NCBI RefSeq, NCBI Genbank, ENSEMBL, and UniProt databases.
Furthermore, an interface to the BioMart database allows users to retrieve
functional annotation for genomic loci. In addition, users can download
entire databases such as NCBI RefSeq, NCBI nr, NCBI nt, NCBI Genbank, etc with
only one command.")
(license license:gpl2)))
(define-public r-biocparallel (define-public r-biocparallel
(package (package
(name "r-biocparallel") (name "r-biocparallel")
@ -4629,6 +4736,56 @@ TAB-Seq.")
throughput genetic sequencing data sets using regression methods.") throughput genetic sequencing data sets using regression methods.")
(license license:artistic2.0))) (license license:artistic2.0)))
(define-public r-muscat
(package
(name "r-muscat")
(version "1.10.1")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "muscat" version))
(sha256
(base32
"1j3zkhqgza92vdykb1yia1jjwsdqra6q9c0jk6p5p2x0778xqgfd"))))
(properties `((upstream-name . "muscat")))
(build-system r-build-system)
(propagated-inputs
(list r-biocparallel
r-blme
r-complexheatmap
r-data-table
r-deseq2
r-dplyr
r-edger
r-ggplot2
r-glmmtmb
r-limma
r-lme4
r-lmertest
r-matrix
r-matrixstats
r-progress
r-purrr
r-s4vectors
r-scales
r-scater
r-sctransform
r-scuttle
r-singlecellexperiment
r-summarizedexperiment
r-variancepartition
r-viridis))
(native-inputs (list r-knitr))
(home-page "https://github.com/HelenaLC/muscat")
(synopsis "Multi-sample multi-group scRNA-seq data analysis tools")
(description
"This package @code{muscat} provides various methods and visualization tools
for @dfn{DS}(differential splicing) analysis in multi-sample, multi-group,
multi-(cell-)subpopulation scRNA-seq data, including cell-level mixed models and
methods based on aggregated \"pseudobulk\" data, as well as a flexible simulation
platform that mimics both single and multi-sample scRNA-seq data.")
(license license:gpl3)))
(define-public r-mutationalpatterns (define-public r-mutationalpatterns
(package (package
(name "r-mutationalpatterns") (name "r-mutationalpatterns")
@ -8834,7 +8991,7 @@ study various biological conditions. The output from such analysis is both
the mRNA level (e.g. cytosolic mRNA level) and the level of mRNA actively the mRNA level (e.g. cytosolic mRNA level) and the level of mRNA actively
involved in translation (the actively translating mRNA level) for each mRNA. involved in translation (the actively translating mRNA level) for each mRNA.
The standard analysis of such data strives towards identifying differential The standard analysis of such data strives towards identifying differential
translational between two or more sample classes - i.e. differences in translational between two or more sample classes - i.e., differences in
actively translated mRNA levels that are independent of underlying differences actively translated mRNA levels that are independent of underlying differences
in cytosolic mRNA levels. This package allows for such analysis using partial in cytosolic mRNA levels. This package allows for such analysis using partial
variances and the random variance model. As 10s of thousands of mRNAs are variances and the random variance model. As 10s of thousands of mRNAs are
@ -11832,6 +11989,30 @@ genes in the gene-set that are ranked above the leading edge).")
"This package provides a pipeline for analysing Capture Hi-C data.") "This package provides a pipeline for analysing Capture Hi-C data.")
(license license:artistic2.0))) (license license:artistic2.0)))
;; This is a CRAN package, but it depends on Bioconductor packages, so we put
;; it here.
(define-public r-ciara
(package
(name "r-ciara")
(version "0.1.0")
(source (origin
(method url-fetch)
(uri (cran-uri "CIARA" version))
(sha256
(base32
"0nr7wks9231326x0lhpbh824c6vcb5hr5jn89s9bmg9mci907bsf"))))
(properties `((upstream-name . "CIARA")))
(build-system r-build-system)
(propagated-inputs (list r-biobase r-ggplot2 r-ggraph r-magrittr))
(native-inputs (list r-knitr))
(home-page "https://cran.r-project.org/package=CIARA")
(synopsis "Cluster-independent algorithm for rare cell types identification")
(description
"This is a package to support identification of markers of rare cell
types by looking at genes whose expression is confined in small regions of the
expression space.")
(license license:artistic2.0)))
(define-public r-cicero (define-public r-cicero
(package (package
(name "r-cicero") (name "r-cicero")
@ -12744,14 +12925,14 @@ using whole genome sequencing data.")
(define-public r-activepathways (define-public r-activepathways
(package (package
(name "r-activepathways") (name "r-activepathways")
(version "1.1.0") (version "1.1.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "ActivePathways" version)) (uri (cran-uri "ActivePathways" version))
(sha256 (sha256
(base32 (base32
"0zbrgz91mlik7j8j11wsdswqqqfsijj8jkgd5fx1ar3mc6rqsmbg")))) "1crq164vyqhdq5y3q09k3m5zljqrhcd5ak0jrc0xqvzf0pasml2m"))))
(properties (properties
`((upstream-name . "ActivePathways"))) `((upstream-name . "ActivePathways")))
(build-system r-build-system) (build-system r-build-system)

295
gnu/packages/bioinformatics.scm
View file

@ -11,7 +11,7 @@
;;; Copyright © 2017, 2021, 2022 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2017, 2021, 2022 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com> ;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com>
;;; Copyright © 2018 Gábor Boskovits <boskovits@gmail.com> ;;; Copyright © 2018 Gábor Boskovits <boskovits@gmail.com>
;;; Copyright © 2018, 2019, 2020, 2021 Mădălin Ionel Patrașcu <madalinionel.patrascu@mdc-berlin.de> ;;; Copyright © 2018, 2019, 2020, 2021, 2022 Mădălin Ionel Patrașcu <madalinionel.patrascu@mdc-berlin.de>
;;; Copyright © 2019, 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2019, 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2019 Brian Leung <bkleung89@gmail.com> ;;; Copyright © 2019 Brian Leung <bkleung89@gmail.com>
;;; Copyright © 2019 Brett Gilio <brettg@gnu.org> ;;; Copyright © 2019 Brett Gilio <brettg@gnu.org>
@ -6264,7 +6264,7 @@ subsequent visualization, annotation and storage of results.")
(define-public plink-ng (define-public plink-ng
(package (inherit plink) (package (inherit plink)
(name "plink-ng") (name "plink-ng")
(version "2.00a3-20220315") (version "2.00a3.3")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -6273,12 +6273,14 @@ subsequent visualization, annotation and storage of results.")
(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 "19inr47jwddkjb9kfb14yxc7xb16c73lkhgxj9sncb0fsiskb4x8")))) (base32 "0m8wkyvbgvcr5kzc284w8fbhpxwglh2c1xq0yc3yv00a53gs7rv0"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:make-flags `(#:make-flags
,#~(list "BLASFLAGS=-llapack -lopenblas" ,#~(list "BLASFLAGS=-llapack -lopenblas"
"CFLAGS=-Wall -O2 -DDYNAMIC_ZLIB=1" (string-append "CFLAGS=-Wall -O2 -DDYNAMIC_ZLIB=1"
" -I" (search-input-directory
%build-inputs "include/simde"))
"ZLIB=-lz" "ZLIB=-lz"
"BIN=plink prettify" "BIN=plink prettify"
(string-append "CC=" #$(cc-for-target)) (string-append "CC=" #$(cc-for-target))
@ -6305,7 +6307,7 @@ subsequent visualization, annotation and storage of results.")
(inputs (inputs
(list lapack openblas zlib)) (list lapack openblas zlib))
(native-inputs (native-inputs
(list diffutils plink python)) ; for tests (list diffutils plink python simde)) ; for tests
(home-page "https://www.cog-genomics.org/plink/") (home-page "https://www.cog-genomics.org/plink/")
(license license:gpl3+))) (license license:gpl3+)))
@ -7523,6 +7525,41 @@ of transcriptional heterogeneity among single cells.")
;; See https://github.com/hms-dbmi/scde/issues/38 ;; See https://github.com/hms-dbmi/scde/issues/38
(license license:gpl2))) (license license:gpl2)))
(define-public r-millefy
(package
(name "r-millefy")
(version "0.1.9-beta")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/yuifu/millefy")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0z2y0x99f761pxvg6n37cmnyrnj699jhjk43pvk05sa86iykgizl"))))
(properties `((upstream-name . "millefy")))
(build-system r-build-system)
(propagated-inputs
(list r-data-table
r-destiny
r-dplyr
r-genomicranges
r-iranges
r-magrittr
r-rsamtools
r-rtracklayer
r-tidyr))
(home-page "https://github.com/yuifu/millefy")
(synopsis "Make millefy plot with single-cell RNA-seq data")
(description "@code{Millefy} is a tool for visualizing read coverage of
@dfn{scRNA-seq}(single-cell RNA sequencing) datasets in genomic contexts. By
dynamically and automatically reorder single cells based on locus-specific
pseudo time, @code{Millefy} highlights cell-to-cell heterogeneity in read coverage
of scRNA-seq data.")
(license license:expat)))
(define-public r-misha (define-public r-misha
(package (package
(name "r-misha") (name "r-misha")
@ -9031,6 +9068,91 @@ remove biased methylation positions for RRBS sequence files.")
programs for inferring phylogenies (evolutionary trees).") programs for inferring phylogenies (evolutionary trees).")
(license license:bsd-2))) (license license:bsd-2)))
(define-public phyml
(package
(name "phyml")
(version "3.3.20220408")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/stephaneguindon/phyml")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"03hdqmnsgnzkcrp9r9ajdfkj33jgq4b86kra8ssjlrph65y344sa"))
(snippet
'(delete-file "doc/phyml-manual.pdf"))))
(build-system gnu-build-system)
(supported-systems '("x86_64-linux"))
(arguments
(let ((default-flags (list "--disable-native")))
`(#:phases
(let ((build (lambda (what)
(lambda args
(apply (assoc-ref %standard-phases 'configure)
(append args
(list #:configure-flags
(cons (format #false "--enable-~a" what)
'() #;,default-flags))))
(apply (assoc-ref %standard-phases 'build) args)
(apply (assoc-ref %standard-phases 'install) args)))))
(modify-phases %standard-phases
;; We cannot use --disable-native; see
;; https://github.com/stephaneguindon/phyml/issues/173 Instead we
;; patch the code to at least get rid of -march=native.
(add-after 'unpack 'remove-march-native
(lambda _
(substitute* "configure.ac"
(("DEFAULT_VECTOR_FLAG=\"-march=native\"")
"DEFAULT_VECTOR_FLAG=\"-march=athlon64-sse3\"\n"))))
(add-after 'build 'build-manual
(lambda _
(with-directory-excursion "doc"
(invoke "make" "phyml-manual.pdf"))))
(add-after 'build-manual 'install-manual
(lambda* (#:key outputs #:allow-other-keys)
(with-directory-excursion "doc"
(install-file "phyml-manual.pdf"
(string-append (assoc-ref outputs "out")
"/share/doc/phyml")))))
(add-after 'install 'build-phyml-mpi
(build "phyml-mpi"))
(add-after 'build-phyml-mpi 'build-rf
(build "rf"))
(add-after 'build-rf 'build-phyrex
(build "phyrex")))))))
(native-inputs
(list automake
autoconf
openmpi
(texlive-updmap.cfg (list texlive-amsfonts
texlive-caption
texlive-cite
texlive-fonts-ec
texlive-grfext
texlive-hyperref
texlive-latex-fancyvrb
texlive-latex-graphics
texlive-latex-psfrag
texlive-xcolor))))
(home-page "https://github.com/stephaneguindon/phyml")
(synopsis "Programs for working on SAM/BAM files")
(description
"@code{PhyML} is a software package that uses modern statistical
approaches to analyse alignments of nucleotide or amino acid sequences in a
phylogenetic framework. The main tool in this package builds phylogenies
under the maximum likelihood criterion. It implements a large number of
substitution models coupled with efficient options to search the space of
phylogenetic tree topologies. code{PhyREX} fits the
spatial-Lambda-Fleming-Viot model to geo-referenced genetic data. This model
is similar to the structured coalescent but assumes that individuals are
distributed along a spatial continuum rather than discrete demes.
@code{PhyREX} can be used to estimate population densities and rates of
dispersal. Its output can be processed by treeannotator (from the
@code{BEAST} package) as well as @code{SPREAD}.")
(license license:gpl3)))
(define-public imp (define-public imp
(package (package
(name "imp") (name "imp")
@ -9895,7 +10017,7 @@ The following file formats are supported:
(inputs (inputs
`(("boost" ,boost) `(("boost" ,boost)
("bzip2" ,bzip2) ("bzip2" ,bzip2)
("cereal" ,cereal) ("cereal" ,cereal-1.3.0)
("curl" ,curl) ("curl" ,curl)
("eigen" ,eigen) ("eigen" ,eigen)
("jemalloc" ,jemalloc) ("jemalloc" ,jemalloc)
@ -11262,7 +11384,7 @@ Thus the per-base error rate is similar to the raw input reads.")
(install-file "Bandage" (string-append out "/bin")) (install-file "Bandage" (string-append out "/bin"))
#t)))))) #t))))))
(inputs (inputs
(list qtbase-5 qtsvg)) (list qtbase-5 qtsvg-5))
(native-inputs (native-inputs
(list imagemagick)) (list imagemagick))
(home-page "https://rrwick.github.io/Bandage/") (home-page "https://rrwick.github.io/Bandage/")
@ -11413,6 +11535,123 @@ including:
dynamic cellular processes at single-cell resolution.") dynamic cellular processes at single-cell resolution.")
(license license:expat)))) (license license:expat))))
;; Needed for r-liana
(define-public r-omnipathr/devel
(let ((commit "679bb79e319af246a16968d27d64d8d6937a331a")
(revision "1"))
(package
(name "r-omnipathr")
(version (git-version "3.5.5" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/saezlab/omnipathr")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"10h6lyapyx4ik8r4kx5z2dly46jlf2v57caq4g6i0hzifyz2vgjq"))))
(properties `((upstream-name . "OmnipathR")))
(build-system r-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'set-HOME
(lambda _ (setenv "HOME" "/tmp"))))))
(propagated-inputs
(list r-checkmate
r-crayon
r-curl
r-digest
r-dplyr
r-httr
r-igraph
r-jsonlite
r-later
r-logger
r-magrittr
r-progress
r-purrr
r-rappdirs
r-readr
r-readxl
r-rlang
r-rvest
r-stringr
r-tibble
r-tidyr
r-tidyselect
r-withr
r-xml2
r-yaml))
(native-inputs (list r-knitr))
(home-page "https://github.com/saezlab/omnipathr")
(synopsis "OmniPath web service client and more")
(description
"This package provides a client for the OmniPath web service and many
other resources. It also includes functions to transform and pretty print
some of the downloaded data, functions to access a number of other resources
such as BioPlex, ConsensusPathDB, EVEX, Gene Ontology, Guide to
Pharmacology (IUPHAR/BPS), Harmonizome, HTRIdb, Human Phenotype Ontology,
InWeb InBioMap, KEGG Pathway, Pathway Commons, Ramilowski et al. 2015,
RegNetwork, ReMap, TF census, TRRUST and Vinayagam et al. 2011. Furthermore,
OmnipathR features a close integration with the NicheNet method for ligand
activity prediction from transcriptomics data, and its R implementation
@code{nichenetr}.")
(license license:expat))))
(define-public r-liana
(let ((commit "efb1249af46f576d1d620956053cfa93b2cee961")
(revision "1"))
(package
(name "r-liana")
(version (git-version "0.1.5" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/saezlab/liana/")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0z645k26kqrfj5f1s412vwclw1q47h1zfxxrh9ijr30pxhpv6cv0"))))
(properties `((upstream-name . "liana")))
(build-system r-build-system)
(arguments
(list
#:phases
`(modify-phases %standard-phases
;; This is needed to find ~/.config/OmnipathR/omnipathr.yml
(add-after 'unpack 'set-HOME
(lambda _ (setenv "HOME" "/tmp"))))))
(propagated-inputs
(list r-complexheatmap
r-dplyr
r-ggplot2
r-magrittr
r-omnipathr/devel
r-purrr
r-rcolorbrewer
r-readr
r-reticulate
r-rlang
r-scater
r-scran
r-scuttle
r-seuratobject
r-singlecellexperiment
r-stringr
r-tibble
r-tidyr
r-tidyselect))
(native-inputs (list r-knitr))
(home-page "https://github.com/saezlab/liana/")
(synopsis "LIANA: a LIgand-receptor ANalysis frAmework")
(description
"LIANA provides a number of methods and resource for ligand-receptor
interaction inference from scRNA-seq data.")
(license license:gpl3))))
(define-public r-circus (define-public r-circus
(package (package
(name "r-circus") (name "r-circus")
@ -11842,19 +12081,23 @@ million cells.")
(define-public python-bbknn (define-public python-bbknn
(package (package
(name "python-bbknn") (name "python-bbknn")
(version "1.3.6") (version "1.5.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "bbknn" version)) (uri (pypi-uri "bbknn" version))
(sha256 (sha256
(base32 (base32
"1jbsh01f57zj4bhvjr3jh4532zznqd6nccmgrl3qi9gnhkf7c4y0")))) "0q11xdmjr2kf6f179a6kjizj3lllfrq743gslgw67qyzimvrrnhn"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:tests? #f ; no tests are included `(#:tests? #f ; no tests are included
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
;; Numba needs a writable dir to cache functions.
(add-before 'check 'set-numba-cache-dir
(lambda _
(setenv "NUMBA_CACHE_DIR" "/tmp")))
(add-after 'unpack 'do-not-fail-to-find-sklearn (add-after 'unpack 'do-not-fail-to-find-sklearn
(lambda _ (lambda _
;; XXX: I have no idea why it cannot seem to find sklearn. ;; XXX: I have no idea why it cannot seem to find sklearn.
@ -11864,6 +12107,7 @@ million cells.")
(list python-annoy (list python-annoy
python-cython python-cython
python-numpy python-numpy
python-pandas
python-scikit-learn python-scikit-learn
python-scipy python-scipy
python-umap-learn)) python-umap-learn))
@ -12060,14 +12304,14 @@ allowing the insertion of arbitrary types into the tree.")
(define-public python-intervaltree (define-public python-intervaltree
(package (package
(name "python-intervaltree") (name "python-intervaltree")
(version "3.0.2") (version "3.1.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "intervaltree" version)) (uri (pypi-uri "intervaltree" version))
(sha256 (sha256
(base32 (base32
"0wz234g6irlm4hivs2qzmnywk0ss06ckagwh15nflkyb3p462kyb")))) "0bcm6c6r4ck9nfj9xwz4rm2swc5lrjvmw3lyl6rgj639jf41nawh"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -12433,6 +12677,35 @@ cooler). Both @code{hic} and @code{cool} files describe Hi-C contact
matrices.") matrices.")
(license license:expat))) (license license:expat)))
(define-public python-scanorama
(package
(name "python-scanorama")
(version "1.7.2")
(source (origin
(method url-fetch)
(uri (pypi-uri "scanorama" version))
(sha256
(base32
"0il7bf4c7vli2dm2jx7dskh3ymgv8nmk0y90jzgfrnqjzh250x5w"))))
(build-system python-build-system)
(propagated-inputs
(list python-annoy
python-fbpca
python-geosketch
python-intervaltree
python-matplotlib
python-numpy
python-scikit-learn
python-scipy))
(home-page "https://github.com/brianhie/scanorama")
(synopsis "Panoramic stitching of heterogeneous single cell transcriptomic data")
(description
"Scanorama enables batch-correction and integration of heterogeneous
scRNA-seq datasets, which is described in the paper \"Efficient integration of
heterogeneous single-cell transcriptomes using Scanorama\" by Brian Hie, Bryan
Bryson, and Bonnie Berger.")
(license license:expat)))
(define-public r-pore (define-public r-pore
(package (package
(name "r-pore") (name "r-pore")

4
gnu/packages/bittorrent.scm
View file

@ -470,14 +470,14 @@ desktops.")
(wrap-qt-program "qbittorrent" #:output out #:inputs inputs)) (wrap-qt-program "qbittorrent" #:output out #:inputs inputs))
#t))))) #t)))))
(native-inputs (native-inputs
(list pkg-config qttools)) (list pkg-config qttools-5))
(inputs (inputs
`(("boost" ,boost) `(("boost" ,boost)
("libtorrent-rasterbar" ,libtorrent-rasterbar) ("libtorrent-rasterbar" ,libtorrent-rasterbar)
("openssl" ,openssl) ("openssl" ,openssl)
("python" ,python-wrapper) ("python" ,python-wrapper)
("qtbase" ,qtbase-5) ("qtbase" ,qtbase-5)
("qtsvg" ,qtsvg) ("qtsvg-5" ,qtsvg-5)
("zlib" ,zlib))) ("zlib" ,zlib)))
(home-page "https://www.qbittorrent.org/") (home-page "https://www.qbittorrent.org/")
(synopsis "Graphical BitTorrent client") (synopsis "Graphical BitTorrent client")

8
gnu/packages/boost.scm
View file

@ -443,14 +443,14 @@ signals and slots system.")
(define-public mdds (define-public mdds
(package (package
(name "mdds") (name "mdds")
(version "1.5.0") (version "2.0.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append "https://kohei.us/files/mdds/src/mdds-"
"http://kohei.us/files/mdds/src/mdds-" version ".tar.bz2")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"03b8i43pw4m767mm0cnbi77x7qhpkzpi9b1f6dpp4cmyszmnsk8l")))) "1r68kxqppmhfg0dhz54d0hqzs5882cqrv1x6wpg7lak6gyyws0bc"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(propagated-inputs (propagated-inputs
(list boost)) ; inclusion of header files (list boost)) ; inclusion of header files

21
gnu/packages/bootloaders.scm
View file

@ -340,10 +340,23 @@ menu to select one of the installed operating systems.")
(synopsis "GRand Unified Boot loader (UEFI 32bit version)") (synopsis "GRand Unified Boot loader (UEFI 32bit version)")
(arguments (arguments
`(,@(substitute-keyword-arguments (package-arguments grub-efi) `(,@(substitute-keyword-arguments (package-arguments grub-efi)
((#:configure-flags flags ((#:configure-flags flags ''())
''()) `(cons* ,(cond ((target-x86?) "--target=i386") `(cons*
((target-arm?) "--target=arm")) ,@(cond ((target-x86?) '("--target=i386"))
,flags))))))) ((target-aarch64?)
(list "--target=arm"
(string-append "TARGET_CC="
(cc-for-target "arm-linux-gnueabihf"))))
((target-arm?) '("--target=arm"))
(else '()))
,flags)))))
(native-inputs
(if (target-aarch64?)
(modify-inputs (package-native-inputs grub-efi)
(prepend
(cross-gcc "arm-linux-gnueabihf")
(cross-binutils "arm-linux-gnueabihf")))
(package-native-inputs grub-efi)))))
;; Because grub searches hardcoded paths it's easiest to just build grub ;; Because grub searches hardcoded paths it's easiest to just build grub
;; again to make it find both grub-pc and grub-efi. There is a command ;; again to make it find both grub-pc and grub-efi. There is a command

20
gnu/packages/c.scm
View file

@ -16,6 +16,7 @@
;;; Copyright © 2022 (unmatched parenthesis <paren@disroot.org> ;;; Copyright © 2022 (unmatched parenthesis <paren@disroot.org>
;;; Copyright © 2022 Artyom V. Poptsov <poptsov.artyom@gmail.com> ;;; Copyright © 2022 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;; Copyright © 2022 Ekaitz Zarraga <ekaitz@elenq.tech> ;;; Copyright © 2022 Ekaitz Zarraga <ekaitz@elenq.tech>
;;; Copyright © 2022 ( <paren@disroot.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -185,12 +186,21 @@ standard.")
"1p34w496095mi0473f815w6wbi57zxil106mg7pj6sg6gzpjcgww")))) "1p34w496095mi0473f815w6wbi57zxil106mg7pj6sg6gzpjcgww"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases (list #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'fix-multiple-definitions
(lambda _
;; Certain variables are defined multiple times. This
;; upsets the linker and causes a build failure.
(substitute* "cc/ccom/pass1.h"
(("FLT flt_zero;") "extern FLT flt_zero;"))
(substitute* (list "cc/ccom/scan.l" "cc/cxxcom/scan.l")
(("lineno, ") ""))))
(replace 'check (replace 'check
(lambda _ (invoke "make" "-C" "cc/cpp" "test") #t))))) (lambda* (#:key tests? #:allow-other-keys)
(native-inputs (when tests?
(list bison flex)) (invoke "make" "-C" "cc/cpp" "test")))))))
(native-inputs (list bison flex))
(synopsis "Portable C compiler") (synopsis "Portable C compiler")
(description (description
"PCC is a portable C compiler. The project goal is to write a C99 "PCC is a portable C compiler. The project goal is to write a C99

11
gnu/packages/check.scm
View file

@ -452,7 +452,16 @@ multi-paradigm automated test framework for C++ and Objective-C.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1gdp5wm8khn02g2miz381llw3191k7309qj8s3jd6sasj01rhf23")))) "1gdp5wm8khn02g2miz381llw3191k7309qj8s3jd6sasj01rhf23"))
(modules '((guix build utils)))
(snippet
'(substitute* '("include/internal/catch_fatal_condition.hpp"
"single_include/catch.hpp")
;; In glibc 2.34 and later, SIGSTKSZ is no longer a
;; compile-time constant. Hard code a reasonably large
;; value.
(("SIGSTKSZ")
"32768")))))
(build-system cmake-build-system) (build-system cmake-build-system)
(synopsis "Automated test framework for C++ and Objective-C") (synopsis "Automated test framework for C++ and Objective-C")
(description "Catch2 stands for C++ Automated Test Cases in Headers and is (description "Catch2 stands for C++ Automated Test Cases in Headers and is

14
gnu/packages/chromium.scm
View file

@ -316,7 +316,7 @@
;; run the Blink performance tests, just remove everything to save ~70MiB. ;; run the Blink performance tests, just remove everything to save ~70MiB.
'("third_party/blink/perf_tests")) '("third_party/blink/perf_tests"))
(define %chromium-version "103.0.5060.134") (define %chromium-version "104.0.5112.81")
(define %ungoogled-revision (string-append %chromium-version "-1")) (define %ungoogled-revision (string-append %chromium-version "-1"))
(define %debian-revision "debian/102.0.5005.61-1") (define %debian-revision "debian/102.0.5005.61-1")
@ -328,7 +328,7 @@
(file-name (git-file-name "ungoogled-chromium" %ungoogled-revision)) (file-name (git-file-name "ungoogled-chromium" %ungoogled-revision))
(sha256 (sha256
(base32 (base32
"00mpmyaa8bqxf1f4vhk1waxhjbhcwab8m1x1vf341al64f6bmr1r")))) "0dvwh470h06x5a4p8kw22pi4lvch16knh90i2kh10y0wfggqz78w"))))
(define %debian-origin (define %debian-origin
(origin (origin
@ -477,7 +477,7 @@
%chromium-version ".tar.xz")) %chromium-version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0wdmy15602qxrb403p8yyx69k7py85fbawdsgap1l6z4h4j2g2p4")) "0x17jzzvn2aqx3ahqyi6ijyn70sn79kg648r0ks9m5gib1bbgf0y"))
(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)
@ -509,7 +509,6 @@
"disable_fieldtrial_testing_config=true" "disable_fieldtrial_testing_config=true"
"safe_browsing_mode=0" "safe_browsing_mode=0"
"enable_mdns=false" "enable_mdns=false"
"enable_one_click_signin=false"
"enable_reading_list=false" "enable_reading_list=false"
"enable_remoting=false" "enable_remoting=false"
"enable_reporting=false" "enable_reporting=false"
@ -596,6 +595,12 @@
;; This include path is added by Debians openjpeg patch. ;; This include path is added by Debians openjpeg patch.
(("/usr/include/openjpeg-2.4") openjpeg)) (("/usr/include/openjpeg-2.4") openjpeg))
;; Remove contrib/ prefix from minizip header inclusions.
(substitute* (find-files "third_party/tflite_support\
/src/tensorflow_lite_support/metadata/cc")
(("contrib/minizip/")
"minizip/"))
(substitute* (substitute*
'("base/process/launch_posix.cc" '("base/process/launch_posix.cc"
"base/third_party/dynamic_annotations/dynamic_annotations.c" "base/third_party/dynamic_annotations/dynamic_annotations.c"
@ -790,6 +795,7 @@
"chrome_200_percent.pak" "chrome_200_percent.pak"
"resources.pak" "resources.pak"
"v8_context_snapshot.bin" "v8_context_snapshot.bin"
"chrome_crashpad_handler"
;; Swiftshader ICD. ;; Swiftshader ICD.
"libvk_swiftshader.so" "libvk_swiftshader.so"

5
gnu/packages/code.scm
View file

@ -914,8 +914,7 @@ extensions over the standard utility.")
(("test_command \"cc -Wall -Wextra -o source.out source.c\"" all) (("test_command \"cc -Wall -Wextra -o source.out source.c\"" all)
"test_command \"gcc -Wall -Wextra -o source.out source.c\""))))) "test_command \"gcc -Wall -Wextra -o source.out source.c\"")))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs (list python-wrapper))
`(("python" ,python-wrapper)))
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
@ -1067,7 +1066,7 @@ Using cscope, you can easily search for where symbols are used and defined.")
"Xenon is a monitoring tool based on Radon. It monitors code complexity. "Xenon is a monitoring tool based on Radon. It monitors code complexity.
Ideally, @code{xenon} is run every time code is committed. Through command Ideally, @code{xenon} is run every time code is committed. Through command
line options, various thresholds can be set for the complexity of code. It line options, various thresholds can be set for the complexity of code. It
will fail (i.e. it will exit with a non-zero exit code) when any of these will fail (i.e., it will exit with a non-zero exit code) when any of these
requirements is not met.") requirements is not met.")
(license license:expat))) (license license:expat)))

46
gnu/packages/compression.scm
View file

@ -113,7 +113,16 @@
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" "static")) (outputs '("out" "static"))
(arguments (arguments
`(#:phases `(#:make-flags
,(if (target-mingw?)
`(list ,(string-append "PREFIX=" (%current-target-system) "-")
"BINARY_PATH = $(prefix)/bin"
"INCLUDE_PATH = $(prefix)/include"
"LIBRARY_PATH = $(prefix)/lib"
"SHARED_MODE = 1"
(string-append "prefix = " (assoc-ref %outputs "out")))
''())
#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'configure (replace 'configure
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
@ -125,8 +134,10 @@
,@(if (%current-target-system) ,@(if (%current-target-system)
`((setenv "CHOST" ,(%current-target-system))) `((setenv "CHOST" ,(%current-target-system)))
'()) '())
(invoke "./configure" ,@(if (target-mingw?)
(string-append "--prefix=" out))))) `((rename-file "win32/Makefile.gcc" "Makefile"))
`((invoke "./configure"
(string-append "--prefix=" out)))))))
(add-after 'install 'move-static-library (add-after 'install 'move-static-library
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out"))
@ -1757,6 +1768,7 @@ Compression ratios of 2:1 to 3:1 are common for text files.")
(package (inherit zip) (package (inherit zip)
(name "unzip") (name "unzip")
(version "6.0") (version "6.0")
(replacement unzip/fixed)
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -1806,7 +1818,8 @@ Compression ratios of 2:1 to 3:1 are common for text files.")
(build-system gnu-build-system) (build-system gnu-build-system)
;; no inputs; bzip2 is not supported, since not compiled with BZ_NO_STDIO ;; no inputs; bzip2 is not supported, since not compiled with BZ_NO_STDIO
(arguments (arguments
`(#:phases (modify-phases %standard-phases (list #:phases
#~(modify-phases %standard-phases
(delete 'configure) (delete 'configure)
(add-after 'unpack 'fortify (add-after 'unpack 'fortify
(lambda _ (lambda _
@ -1822,9 +1835,16 @@ Compression ratios of 2:1 to 3:1 are common for text files.")
(parallel-job-count)) (parallel-job-count))
,@make-flags ,@make-flags
"generic_gcc"))))) "generic_gcc")))))
#:make-flags (list "-f" "unix/Makefile" #:make-flags
;; Fix cross-compilation without affecting native builds, as doing so
;; would trigger too many rebuilds: https://issues.guix.gnu.org/57127
(if (%current-target-system)
#~(list "-f" "unix/Makefile"
(string-append "prefix=" #$output)
(string-append "MANDIR=" #$output "/share/man/man1"))
#~(list "-f" "unix/Makefile"
(string-append "prefix=" %output) (string-append "prefix=" %output)
(string-append "MANDIR=" %output "/share/man/man1")))) (string-append "MANDIR=" %output "/share/man/man1")))))
(home-page "http://www.info-zip.org/UnZip.html") (home-page "http://www.info-zip.org/UnZip.html")
(synopsis "Decompression and file extraction utility") (synopsis "Decompression and file extraction utility")
(description (description
@ -1835,9 +1855,19 @@ UnZip lists, tests, or extracts files from a .zip archive. The default
behaviour (with no options) is to extract into the current directory, and behaviour (with no options) is to extract into the current directory, and
subdirectories below it, all files from the specified zipfile. UnZip subdirectories below it, all files from the specified zipfile. UnZip
recreates the stored directory structure by default.") recreates the stored directory structure by default.")
(properties `((lint-hidden-cve . ("CVE-2019-13232"))))
(license (license:non-copyleft "file://LICENSE" (license (license:non-copyleft "file://LICENSE"
"See LICENSE in the distribution.")))) "See LICENSE in the distribution."))))
(define unzip/fixed
(package (inherit unzip)
(source
(origin
(inherit (package-source unzip))
(patches (append
(origin-patches (package-source unzip))
(search-patches "unzip-CVE-2022-0529+CVE-2022-0530.patch")))))))
(define-public ziptime (define-public ziptime
(let ((commit "2a5bc9dfbf7c6a80e5f7cb4dd05b4036741478bc") (let ((commit "2a5bc9dfbf7c6a80e5f7cb4dd05b4036741478bc")
(revision "0")) (revision "0"))
@ -2335,7 +2365,7 @@ reading from and writing to ZIP archives.")
(define-public zchunk (define-public zchunk
(package (package
(name "zchunk") (name "zchunk")
(version "1.1.16") (version "1.2.2")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -2344,7 +2374,7 @@ reading from and writing to ZIP archives.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0nlzwnv6wh2yjyyv27f81jnvmk7psgpbnw7dsdp7frfkya569hgv")))) "0q0avb0397xkmidl8rxasfywp0r7w3awk6271pa2d9xl9p1n82zy"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:phases (modify-phases %standard-phases `(#:phases (modify-phases %standard-phases

2
gnu/packages/connman.scm
View file

@ -165,7 +165,7 @@ sharing) to clients via USB, ethernet, WiFi, cellular and Bluetooth.")
(inputs (inputs
(list qtbase-5)) (list qtbase-5))
(native-inputs (native-inputs
(list qttools)) (list qttools-5))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases '(#:phases

8
gnu/packages/cpp.scm
View file

@ -727,7 +727,7 @@ lock-free fixed size queue written in C++11.")
(define-public gperftools (define-public gperftools
(package (package
(name "gperftools") (name "gperftools")
(version "2.8.1") (version "2.10")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -735,7 +735,7 @@ lock-free fixed size queue written in C++11.")
(url "https://github.com/gperftools/gperftools") (url "https://github.com/gperftools/gperftools")
(commit (string-append "gperftools-" version)))) (commit (string-append "gperftools-" version))))
(sha256 (sha256
(base32 "19bj2vlsbfwq7m826v2ccqg47kd7cb5vcz1yw2x0v5qzhaxbakk1")) (base32 "0s9qhx940s8q6glc8sw74k5gs8hdhjfigq20zci92qawgm7zsicm"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
@ -1042,7 +1042,7 @@ Google's C++ code base.")
(define-public pegtl (define-public pegtl
(package (package
(name "pegtl") (name "pegtl")
(version "3.2.2") (version "3.2.7")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -1051,7 +1051,7 @@ Google's C++ code base.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1viwrlsw5nwvbv8d88mf5r77syapgxx3xm1kv5kmn6drw8jgsmzf")))) "01adjqqdr9yf4h379jl1x0526kvixfpqk4hdk9mna49qc4s5hpi1"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(home-page "https://github.com/taocpp/PEGTL") (home-page "https://github.com/taocpp/PEGTL")
(synopsis "Parsing Expression Grammar template library") (synopsis "Parsing Expression Grammar template library")

828
gnu/packages/cran.scm
View file

File diff suppressed because it is too large Load diff

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

@ -27945,7 +27945,7 @@ HTTP request or response body.")
(define-public rust-httparse-1 (define-public rust-httparse-1
(package (package
(name "rust-httparse") (name "rust-httparse")
(version "1.5.1") (version "1.7.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -27953,11 +27953,11 @@ HTTP request or response body.")
(file-name (file-name
(string-append name "-" version ".tar.gz")) (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 "00smbrgb9vyzbbj3j5d66iarjl5x2wpfwkmhcy5nizylw7dlzndc")))) (base32 "0k60q1hx96cvmjn6k3yjkff87fz0ga2a4z0g9ss8a9x5nndy4v29"))))
(build-system cargo-build-system) (build-system cargo-build-system)
(arguments (arguments
`(#:cargo-development-inputs `(#:cargo-development-inputs
(("rust-pico-sys" ,rust-pico-sys-0.0)))) (("rust-criterion" ,rust-criterion-0.3))))
(home-page "https://github.com/seanmonstar/httparse") (home-page "https://github.com/seanmonstar/httparse")
(synopsis "Zero-copy HTTP/1.x parser") (synopsis "Zero-copy HTTP/1.x parser")
(description (description
@ -42995,29 +42995,6 @@ function data structures.")
"Support code shared by PHF libraries.") "Support code shared by PHF libraries.")
(license license:expat))) (license license:expat)))
(define-public rust-pico-sys-0.0
(package
(name "rust-pico-sys")
(version "0.0.1")
(source
(origin
(method url-fetch)
(uri (crate-uri "pico-sys" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"1q5pg0ms6szz6b5h26h4k40zb76zbwwjgyigac4wly9qngdj4yl5"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-libc" ,rust-libc-0.2)
("rust-gcc" ,rust-gcc-0.3))))
(home-page "https://github.com/reem/rust-pico-sys")
(synopsis "Bindings to the PicoHTTPParser")
(description
"This package provides bindings to the PicoHTTPParser.")
(license license:expat)))
(define-public rust-pin-project-1 (define-public rust-pin-project-1
(package (package
(name "rust-pin-project") (name "rust-pin-project")

6
gnu/packages/crypto.scm
View file

@ -1295,15 +1295,15 @@ Trusted comments are signed, thus verified, before being displayed.")
(define-public libolm (define-public libolm
(package (package
(name "libolm") (name "libolm")
(version "3.2.3") (version "3.2.12")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://git.matrix.org/git/olm") (url "https://gitlab.matrix.org/matrix-org/olm")
(commit version))) (commit version)))
(sha256 (sha256
(base32 (base32
"0bixly6jqpwfx3p37c1qp1j685yg6m429r1nazwh43w4n527bs3y")) "1k8v9ig32vmjm58rbris621d7mvp4q91qa5p79vc51p41sz91yhj"))
(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.

37
gnu/packages/databases.scm
View file

@ -8,7 +8,7 @@
;;; Copyright © 2015, 2016 Sou Bunnbu <iyzsong@gmail.com> ;;; Copyright © 2015, 2016 Sou Bunnbu <iyzsong@gmail.com>
;;; Copyright © 2015 Leo Famulari <leo@famulari.name> ;;; Copyright © 2015 Leo Famulari <leo@famulari.name>
;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr> ;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2016, 2022 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2016 Christine Lemmer-Webber <cwebber@dustycloud.org> ;;; Copyright © 2016 Christine Lemmer-Webber <cwebber@dustycloud.org>
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017 Nikita <nikita@n0.is> ;;; Copyright © 2016, 2017 Nikita <nikita@n0.is>
@ -122,6 +122,7 @@
#:use-module (gnu packages ncurses) #:use-module (gnu packages ncurses)
#:use-module (gnu packages networking) #:use-module (gnu packages networking)
#:use-module (gnu packages onc-rpc) #:use-module (gnu packages onc-rpc)
#:use-module (gnu packages openstack)
#:use-module (gnu packages pantheon) #:use-module (gnu packages pantheon)
#:use-module (gnu packages parallel) #:use-module (gnu packages parallel)
#:use-module (gnu packages pcre) #:use-module (gnu packages pcre)
@ -2295,7 +2296,7 @@ Driver.")
(define-public nanodbc (define-public nanodbc
(package (package
(name "nanodbc") (name "nanodbc")
(version "2.13.0") (version "2.14.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (uri
@ -2305,7 +2306,7 @@ Driver.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1q80p7yv9mcl4hyvnvcjdr70y8nc940ypf368lp97vpqn5yckkgm")))) "1253bnrmchga3ra99jqkd2p29bc5h2ip79xd8afblz6b1v00wmbm"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -4754,7 +4755,7 @@ a Gtk.Grid Widget.")
qscintilla qscintilla
qtbase-5 qtbase-5
sqlite)) sqlite))
(native-inputs (list qttools)) (native-inputs (list qttools-5))
(home-page "https://sqlitebrowser.org/") (home-page "https://sqlitebrowser.org/")
(synopsis "Database browser for SQLite") (synopsis "Database browser for SQLite")
(description "Sqlitebrowser is a high quaility, visual, open source tool to (description "Sqlitebrowser is a high quaility, visual, open source tool to
@ -4795,3 +4796,31 @@ create design, and edit database file compatible with SQLite.")
(description (description
"This package implements the @acronym{LSP, Language Server Protocol} for SQL.") "This package implements the @acronym{LSP, Language Server Protocol} for SQL.")
(license license:expat))) (license license:expat)))
(define-public python-dogpile.cache
(package
(name "python-dogpile.cache")
(version "1.1.8")
(source (origin
(method url-fetch)
(uri (pypi-uri "dogpile.cache" version))
(sha256
(base32
"0kpx42vxzss4sz5ic6mp01a97zinzm6q76n8li2gbi4ccfxyhi6q"))))
(build-system python-build-system)
(arguments
'(#:phases
(modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "pytest")))))))
(native-inputs (list python-mako python-pytest))
(propagated-inputs (list python-decorator python-stevedore))
(home-page "https://github.com/sqlalchemy/dogpile.cache")
(synopsis "Caching front-end based on the Dogpile lock")
(description "@code{dogpile.cache} is a caching API which provides a
generic interface to caching backends of any variety, and additionally
provides API hooks which integrate these cache backends with the locking
mechanism of @code{dogpile}.")
(license license:expat)))

26
gnu/packages/datastructures.scm
View file

@ -4,7 +4,7 @@
;;; Copyright © 2018 Meiyo Peng <meiyo.peng@gmail.com> ;;; Copyright © 2018 Meiyo Peng <meiyo.peng@gmail.com>
;;; Copyright © 2019, 2020, 2022 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2019, 2020, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2020 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2020 Marius Bakke <marius@gnu.org> ;;; Copyright © 2020, 2022 Marius Bakke <marius@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -28,6 +28,7 @@
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix gexp)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
@ -134,6 +135,29 @@ that have sequences of identical bytes in the same order, even though bytes
in between these sequences may be different in both content and length.") in between these sequences may be different in both content and length.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public libcuckoo
(package
(name "libcuckoo")
(version "0.3.1")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/efficient/libcuckoo")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0h9yhpkhk813dk66y6bs2csybw3pbpfnp3cakr2xism02vjwy19l"))))
(build-system cmake-build-system)
(arguments
(list #:configure-flags #~'("-DBUILD_TESTS=1")))
(home-page "https://efficient.github.io/libcuckoo/")
(synopsis "Concurrent hash table")
(description
"@code{libcuckoo} provides a high-performance, compact hash table that
allows multiple concurrent reader and writer threads.")
(license license:asl2.0)))
(define-public liburcu (define-public liburcu
(package (package
(name "liburcu") (name "liburcu")

8
gnu/packages/diffoscope.scm
View file

@ -75,7 +75,7 @@
(define-public diffoscope (define-public diffoscope
(package (package
(name "diffoscope") (name "diffoscope")
(version "219") (version "220")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -84,7 +84,7 @@
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0n6dn53paxi1316fnv5abw5rlvpfd2kpfn3b08wfzrcb6chsx7br")) (base32 "0lkwbyf1z93skgqp1w4p0d7y8wwqf0bs53i43micwaq8p8xjs1ph"))
(patches (patches
(search-patches "diffoscope-fix-llvm-test.patch")))) (search-patches "diffoscope-fix-llvm-test.patch"))))
(build-system python-build-system) (build-system python-build-system)
@ -246,7 +246,7 @@ install.")
(define-public reprotest (define-public reprotest
(package (package
(name "reprotest") (name "reprotest")
(version "0.7.20") (version "0.7.21")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -256,7 +256,7 @@ install.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0c3nyiha9gh1xzl0dn9ji2yqa8y06d83v84pz0dqanihm40ljjsm")))) "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

18
gnu/packages/disk.scm
View file

@ -1357,7 +1357,7 @@ reliably with @code{bmaptool} than with traditional tools, like @code{dd} or
(define-public duc (define-public duc
(package (package
(name "duc") (name "duc")
(version "1.4.4") (version "1.4.5")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -1366,7 +1366,7 @@ reliably with @code{bmaptool} than with traditional tools, like @code{dd} or
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1i7ry25xzy027g6ysv6qlf09ax04q4vy0kikl8h0aq5jbxsl9q52")))) "0sglcn38rgn6y3m5ahngizyn3x2rzhqjphs7g0ppnlinkz56rcv4"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -1383,7 +1383,19 @@ reliably with @code{bmaptool} than with traditional tools, like @code{dd} or
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(doc (string-append out "/share/doc/" ,name "-" ,version))) (doc (string-append out "/share/doc/" ,name "-" ,version)))
(copy-recursively "examples" (string-append doc "/examples")))))))) (copy-recursively "examples" (string-append doc "/examples")))))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(substitute* "test.sh"
;; Keep the test logs where --keep-failed can see them.
(("^(DUC_TEST_DIR=).*" _ assign)
(format #f "~a~a/test-directory~%" assign (getcwd)))
;; XXX ‘actual size’ differed on my system (a consistent 348160
;; bytes where the tests expect 540672). However, the ‘apparent
;; size’ matches, as does the actual test output. Good enough…?
((" [0-9]*B actual") " [0-9]*B actual"))
(when tests?
(invoke "./test.sh"))))))) ; no ‘check’ target
(native-inputs (native-inputs
(list autoconf automake libtool pkg-config)) (list autoconf automake libtool pkg-config))
(inputs (inputs

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

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Joshua Grant <tadni@riseup.net> ;;; Copyright © 2013 Joshua Grant <tadni@riseup.net>
;;; Copyright © 2014, 2018 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2018, 2022 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2014 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Sou Bunnbu <iyzsong@gmail.com> ;;; Copyright © 2017 Sou Bunnbu <iyzsong@gmail.com>
@ -78,7 +78,7 @@
"0hcdysw8ibr66vk8i7v56l0v5ijvhlq67v4460mc2xf2910g2m72")))) "0hcdysw8ibr66vk8i7v56l0v5ijvhlq67v4460mc2xf2910g2m72"))))
(build-system qt-build-system) (build-system qt-build-system)
(native-inputs (native-inputs
(list extra-cmake-modules pkg-config qttools)) (list extra-cmake-modules pkg-config qttools-5))
(inputs (inputs
(list elogind (list elogind
glib glib
@ -86,14 +86,14 @@
libxkbcommon libxkbcommon
linux-pam linux-pam
qtbase-5 qtbase-5
qtdeclarative qtdeclarative-5
;; Some user-defined themes use QtQuick components internally. Adding ;; Some user-defined themes use QtQuick components internally. Adding
;; QtQuick & co. here; they end up in QML2_IMPORT_PATH thanks to ;; QtQuick & co. here; they end up in QML2_IMPORT_PATH thanks to
;; 'wrap-qt-program'. ;; 'wrap-qt-program'.
qtgraphicaleffects qtgraphicaleffects
qtquickcontrols qtquickcontrols-5
qtquickcontrols2 qtquickcontrols2-5
qtsvg qtsvg-5
shadow shadow
wayland)) wayland))
(arguments (arguments
@ -255,27 +255,24 @@ experience for your users, your family and yourself")
(license license:gpl3+))) (license license:gpl3+)))
(define-public lightdm (define-public lightdm
;; Use the latest commit, as the current official release doesn't build with
;; glib >= 2.33.
(let ((revision "0")
(commit "b7fc3214cbaed09c73e963847443a0d648dfd896"))
(package (package
(name "lightdm") (name "lightdm")
(version (git-version "1.30.0" revision commit)) (version "1.32.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/canonical/lightdm") (url "https://github.com/canonical/lightdm")
(commit commit))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0378jacazpmdgdjkiilk3mbikz3iysb4s9q40hg9zv4yngwsix1m")))) "1wr60c946p8jz9kb8zi4cd8d4mkcy7infbvlfzwajiglc22nblxn"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:parallel-tests? #f ; fails when run in parallel '(#:parallel-tests? #f ; fails when run in parallel
#:configure-flags #:configure-flags
(list "--localstatedir=/var" (list "--localstatedir=/var"
"--enable-gtk-doc"
;; Otherwise the test suite fails on such a warning. ;; Otherwise the test suite fails on such a warning.
"CFLAGS=-Wno-error=missing-prototypes") "CFLAGS=-Wno-error=missing-prototypes")
#:phases #:phases
@ -295,24 +292,25 @@ experience for your users, your family and yourself")
(("/bin/sh") (("/bin/sh")
(search-input-file inputs "bin/sh"))))) (search-input-file inputs "bin/sh")))))
(add-before 'check 'pre-check (add-before 'check 'pre-check
;; Run test-suite under a dbus session.
(lambda _ (lambda _
(wrap-program "tests/src/test-python-greeter" (wrap-program "tests/src/test-python-greeter"
`("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))) `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH")))
`("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH")))) `("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH"))))
;; Avoid printing locale warnings, which trip up the text ;; Avoid printing locale warnings, which trip up the text
;; matching tests. ;; matching tests.
(unsetenv "LC_ALL")))))) (unsetenv "LC_ALL"))))))
(inputs (inputs
(list audit (list audit
coreutils ;for cross-compilation bash-minimal ;for cross-compilation
coreutils-minimal ;ditto
linux-pam linux-pam
shadow ;for sbin/nologin shadow ;for sbin/nologin
libgcrypt libgcrypt
libxcb)) libxcb
libxdmcp))
(native-inputs (native-inputs
(list autoconf (list accountsservice
autoconf
automake automake
gobject-introspection gobject-introspection
gtk-doc gtk-doc
@ -334,7 +332,7 @@ experience for your users, your family and yourself")
(synopsis "Lightweight display manager") (synopsis "Lightweight display manager")
(description "The Light Display Manager (LightDM) is a cross-desktop (description "The Light Display Manager (LightDM) is a cross-desktop
display manager which supports different greeters.") display manager which supports different greeters.")
(license license:gpl3+)))) (license license:gpl3+)))
(define-public lightdm-gtk-greeter (define-public lightdm-gtk-greeter
(package (package
@ -351,43 +349,51 @@ display manager which supports different greeters.")
"04q62mvr97l9gv8h37hfarygqc7p0498ig7xclcg4kxkqw0b7yxy")))) "04q62mvr97l9gv8h37hfarygqc7p0498ig7xclcg4kxkqw0b7yxy"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags (list
(list (string-append "--enable-at-spi-command=" #:configure-flags
(assoc-ref %build-inputs "at-spi2-core") #~(list "--disable-indicator-services-command" ;requires upstart
"/libexec/at-spi-bus-launcher")) (string-append "--enable-at-spi-command="
(search-input-file
%build-inputs "libexec/at-spi-bus-launcher")))
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'install 'fix-.desktop-file (add-after 'install 'fix-.desktop-file
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (substitute* (search-input-file
(substitute* (string-append outputs
out "/share/xgreeters/lightdm-gtk-greeter.desktop") "share/xgreeters/lightdm-gtk-greeter.desktop")
(("Exec=lightdm-gtk-greeter") (("Exec=lightdm-gtk-greeter")
(string-append "Exec=" out "/sbin/lightdm-gtk-greeter"))) (string-append "Exec="
#t))) (search-input-file
outputs "sbin/lightdm-gtk-greeter"))))))
(add-after 'fix-.desktop-file 'wrap-program (add-after 'fix-.desktop-file 'wrap-program
;; Mimic glib-or-gtk build system ;; Mimic glib-or-gtk build system which doesn't wrap files in
;; which doesn't wrap files in /sbin ;; /sbin.
(lambda* (#:key outputs inputs #:allow-other-keys) (lambda* (#:key outputs inputs #:allow-other-keys)
(let ((gtk (assoc-ref inputs "gtk+"))) (let ((gtk #$(this-package-input "gtk+"))
(wrap-program (string-append (assoc-ref outputs "out") (shared-mime-info #$(this-package-input "shared-mime-info"))
"/sbin/lightdm-gtk-greeter") (glib #$(this-package-input "glib")))
(wrap-program (search-input-file
outputs "sbin/lightdm-gtk-greeter")
`("XDG_DATA_DIRS" ":" prefix `("XDG_DATA_DIRS" ":" prefix
,(cons "/run/current-system/profile/share" ,(cons "/run/current-system/profile/share"
(map (lambda (pkg) (map (lambda (pkg)
(string-append (assoc-ref inputs pkg) "/share")) (string-append pkg "/share"))
'("gtk+" "shared-mime-info" "glib")))) (list gtk shared-mime-info glib))))
`("GTK_PATH" ":" prefix (,gtk)) `("GTK_PATH" ":" prefix (,gtk))
`("GIO_EXTRA_MODULES" ":" prefix (,gtk)))) `("GIO_EXTRA_MODULES" ":" prefix (,gtk))
#t))))) '("XCURSOR_PATH" ":" prefix
("/run/current-system/profile/share/icons")))))))))
(native-inputs (native-inputs
(list exo intltool pkg-config xfce4-dev-tools)) (list exo intltool pkg-config xfce4-dev-tools))
(inputs (inputs
`(("bash" ,bash-minimal) ; for wrap-program (list bash-minimal ;for wrap-program
("lightdm" ,lightdm) lightdm
("shared-mime-info" ,shared-mime-info) shared-mime-info
("at-spi2-core" ,at-spi2-core) at-spi2-core
("gtk+" ,gtk+))) glib
gtk+))
(synopsis "GTK+ greeter for LightDM") (synopsis "GTK+ greeter for LightDM")
(home-page "https://github.com/xubuntu/lightdm-gtk-greeter") (home-page "https://github.com/xubuntu/lightdm-gtk-greeter")
(description "This package provides a LightDM greeter implementation using (description "This package provides a LightDM greeter implementation using

8
gnu/packages/django.scm
View file

@ -54,13 +54,13 @@
(define-public python-django-4.0 (define-public python-django-4.0
(package (package
(name "python-django") (name "python-django")
(version "4.0.6") (version "4.0.7")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "Django" version)) (uri (pypi-uri "Django" version))
(sha256 (sha256
(base32 (base32
"1bn3lg68r2bz6rzwnd7y2sin6fi9vahdqdsmamrx6zw2yqzpjym6")))) "0qblhh7s7fcznqr79919yp2d7wiz3ixv39navmifb677dg9mlvcw"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
'(#:phases '(#:phases
@ -141,13 +141,13 @@ to the @dfn{don't repeat yourself} (DRY) principle.")
(define-public python-django-3.2 (define-public python-django-3.2
(package (package
(inherit python-django-4.0) (inherit python-django-4.0)
(version "3.2.14") (version "3.2.15")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "Django" version)) (uri (pypi-uri "Django" version))
(sha256 (sha256
(base32 (base32
"1krg0bfd78mnqly1gzbprssz3bz6xryc2fig0x75la2vifx84wb7")))) "0asqhsw73555wjnvd7769b89q9w96q2k95mcr634mw92m2qk86gp"))))
(native-search-paths '()) ;no need for TZDIR (native-search-paths '()) ;no need for TZDIR
(propagated-inputs (propagated-inputs
(modify-inputs (package-propagated-inputs python-django-4.0) (modify-inputs (package-propagated-inputs python-django-4.0)

2
gnu/packages/djvu.scm
View file

@ -107,7 +107,7 @@ utilities.")
(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
(list autoconf automake libtool pkg-config qttools)) (list autoconf automake libtool pkg-config qttools-5))
(inputs (inputs
(list djvulibre glib libxt libtiff qtbase-5)) (list djvulibre glib libxt libtiff qtbase-5))
(arguments (arguments

10
gnu/packages/documentation.scm
View file

@ -371,7 +371,7 @@ local system.")
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin/zeal")) (bin (string-append out "/bin/zeal"))
(qt-process-path (string-append (qt-process-path (string-append
(assoc-ref inputs "qtwebengine") (assoc-ref inputs "qtwebengine-5")
"/lib/qt5/libexec/QtWebEngineProcess"))) "/lib/qt5/libexec/QtWebEngineProcess")))
(wrap-program bin (wrap-program bin
`("QTWEBENGINEPROCESS_PATH" = (,qt-process-path))) `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path)))
@ -382,10 +382,10 @@ local system.")
`(("libarchive" ,libarchive) `(("libarchive" ,libarchive)
("sqlite" ,sqlite) ("sqlite" ,sqlite)
("qtbase" ,qtbase-5) ("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative) ("qtdeclarative-5" ,qtdeclarative-5)
("qtwebchannel" ,qtwebchannel) ("qtwebchannel-5" ,qtwebchannel-5)
("qtwebengine" ,qtwebengine) ("qtwebengine-5" ,qtwebengine-5)
("qtquickcontrols" ,qtquickcontrols) ("qtquickcontrols-5" ,qtquickcontrols-5)
("qtx11extras" ,qtx11extras) ("qtx11extras" ,qtx11extras)
("xcb-util-keyms" ,xcb-util-keysyms))) ("xcb-util-keyms" ,xcb-util-keysyms)))
(home-page "https://zealdocs.org/") (home-page "https://zealdocs.org/")

4
gnu/packages/ebook.scm
View file

@ -202,7 +202,7 @@ with Microsoft Compiled HTML (CHM) files")
python-regex python-regex
speech-dispatcher speech-dispatcher
python-zeroconf python-zeroconf
qtwebengine qtwebengine-5
sqlite)) sqlite))
(arguments (arguments
(list (list
@ -293,7 +293,7 @@ sip-include-dirs = [\""
(setenv "CI" "true") (setenv "CI" "true")
;; The Qt test complains about being unable to load all image ;; The Qt test complains about being unable to load all image
;; plugins, and I notice the available plugins list it shows ;; plugins, and I notice the available plugins list it shows
;; lacks 'svg'. Adding qtsvg doesn't fix it, so I'm not sure how ;; lacks 'svg'. Adding qtsvg-5 doesn't fix it, so I'm not sure how
;; to fix it. TODO: Fix test and remove this. ;; to fix it. TODO: Fix test and remove this.
(setenv "SKIP_QT_BUILD_TEST" "true"))) (setenv "SKIP_QT_BUILD_TEST" "true")))
(add-after 'install 'install-rapydscript (add-after 'install 'install-rapydscript

46
gnu/packages/education.scm
View file

@ -174,18 +174,18 @@ of categories with some of the activities available in that category.
gettext-minimal gettext-minimal
kdoctools kdoctools
perl perl
qttools qttools-5
xorg-server-for-tests)) xorg-server-for-tests))
(inputs (inputs
(list openssl (list openssl
python-wrapper python-wrapper
qtbase-5 qtbase-5
qtdeclarative qtdeclarative-5
qtgraphicaleffects qtgraphicaleffects
qtmultimedia qtmultimedia-5
qtquickcontrols qtquickcontrols-5
qtsensors qtsensors
qtsvg qtsvg-5
qtxmlpatterns)) qtxmlpatterns))
(home-page "https://gcompris.net/index-en.html") (home-page "https://gcompris.net/index-en.html")
(synopsis "Educational games for small children") (synopsis "Educational games for small children")
@ -302,7 +302,7 @@ frequently used words in American English.")
;; Recreate Makefile ;; Recreate Makefile
(invoke "qmake"))))))) (invoke "qmake")))))))
(inputs (inputs
(list qtbase-5 qtmultimedia)) (list qtbase-5 qtmultimedia-5))
(home-page "https://www.tipp10.com/") (home-page "https://www.tipp10.com/")
(synopsis "Touch typing tutor") (synopsis "Touch typing tutor")
(description "Tipp10 is a touch typing tutor. The ingenious thing about (description "Tipp10 is a touch typing tutor. The ingenious thing about
@ -448,7 +448,7 @@ specialized device.")
(define-public openboard (define-public openboard
;; The last release builds from qtwebkit, which is planned for removal in ;; The last release builds from qtwebkit, which is planned for removal in
;; Guix, so use the latest commit of the 1.7-dev branch, which builds with ;; Guix, so use the latest commit of the 1.7-dev branch, which builds with
;; qtwebengine. ;; qtwebengine-5.
(let ((commit "39e914f600d26565706f0e5b6ea2482b8b4038c7") ;1.6.2-rc0311 (let ((commit "39e914f600d26565706f0e5b6ea2482b8b4038c7") ;1.6.2-rc0311
(revision "1")) (revision "1"))
(package (package
@ -540,7 +540,7 @@ specialized device.")
(symlink (string-append openboard "/OpenBoard") (symlink (string-append openboard "/OpenBoard")
(string-append bin "/openboard"))))))))) (string-append bin "/openboard")))))))))
(native-inputs (native-inputs
(list qttools)) (list qttools-5))
(inputs (inputs
(list alsa-lib (list alsa-lib
coreutils-minimal ;for patched 'env' shebang coreutils-minimal ;for patched 'env' shebang
@ -558,11 +558,11 @@ specialized device.")
opus opus
poppler poppler
qtbase-5 qtbase-5
qtdeclarative qtdeclarative-5
qtmultimedia qtmultimedia-5
qtsvg qtsvg-5
qtwebchannel qtwebchannel-5
qtwebengine qtwebengine-5
qtxmlpatterns qtxmlpatterns
quazip-0 quazip-0
sdl sdl
@ -672,9 +672,9 @@ language and very flexible regarding to new or unknown keyboard layouts.")
libxcb libxcb
libxkbfile libxkbfile
qtbase-5 qtbase-5
qtdeclarative qtdeclarative-5
qtgraphicaleffects qtgraphicaleffects
qtquickcontrols2 qtquickcontrols2-5
qtx11extras qtx11extras
qtxmlpatterns)) qtxmlpatterns))
(home-page "https://edu.kde.org/ktouch/") (home-page "https://edu.kde.org/ktouch/")
@ -807,9 +807,9 @@ stored and user can review his performance in any time.")
("python-requests" ,python-requests) ("python-requests" ,python-requests)
("python-send2trash" ,python-send2trash) ("python-send2trash" ,python-send2trash)
("python-sip" ,python-sip) ("python-sip" ,python-sip)
;; `qtwebengine' is included in `pyqtwebengine', included here for easy ;; `qtwebengine-5' is included in `pyqtwebengine', included here for easy
;; wrapping. ;; wrapping.
("qtwebengine" ,qtwebengine))) ("qtwebengine-5" ,qtwebengine-5)))
(home-page "https://apps.ankiweb.net/") (home-page "https://apps.ankiweb.net/")
(synopsis "Powerful, intelligent flash cards") (synopsis "Powerful, intelligent flash cards")
(description "Anki is a program which makes remembering things (description "Anki is a program which makes remembering things
@ -991,15 +991,15 @@ formats.")
(arguments (arguments
'(#:tests? #f)) ; no test target '(#:tests? #f)) ; no test target
(native-inputs (native-inputs
(list qttools)) (list qttools-5))
(inputs (inputs
(list libeb (list libeb
qtbase-5 qtbase-5
qtmultimedia qtmultimedia-5
qtquickcontrols2 qtquickcontrols2-5
qtdeclarative qtdeclarative-5
qtwebchannel qtwebchannel-5
qtwebengine qtwebengine-5
zlib)) zlib))
(synopsis "EPWING dictionary reader") (synopsis "EPWING dictionary reader")
(description "qolibri is a dictionary viewer for the EPWING dictionary (description "qolibri is a dictionary viewer for the EPWING dictionary

4
gnu/packages/electronics.scm
View file

@ -373,7 +373,7 @@ such as:
(rmdir "doc/pulseview") (rmdir "doc/pulseview")
(rmdir "doc")))))))) (rmdir "doc"))))))))
(native-inputs (native-inputs
(list pkg-config qttools)) (list pkg-config qttools-5))
(inputs (inputs
(list boost (list boost
glib glib
@ -381,7 +381,7 @@ such as:
libsigrok libsigrok
libsigrokdecode libsigrokdecode
qtbase-5 qtbase-5
qtsvg)) qtsvg-5))
(home-page "https://www.sigrok.org/wiki/PulseView") (home-page "https://www.sigrok.org/wiki/PulseView")
(synopsis "Qt based logic analyzer, oscilloscope and MSO GUI for sigrok") (synopsis "Qt based logic analyzer, oscilloscope and MSO GUI for sigrok")
(description "PulseView is a Qt based logic analyzer, oscilloscope and MSO GUI (description "PulseView is a Qt based logic analyzer, oscilloscope and MSO GUI

9
gnu/packages/elf.scm
View file

@ -133,14 +133,14 @@ object or archive file), @command{eu-strip} (for discarding symbols),
(package (package
(name "libabigail") (name "libabigail")
(home-page "https://sourceware.org/libabigail/") (home-page "https://sourceware.org/libabigail/")
(version "1.8") (version "2.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://sourceware.org/pub/libabigail/" (uri (string-append "https://sourceware.org/pub/libabigail/"
"libabigail-" version ".tar.gz")) "libabigail-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0p363mkgypcklgf8iylxpbdnfgqc086a6fv7n9hzrjjci45jdgqw")))) "1nkg7fsqvdr453hrskscy6xqz6fv45mylpgv1357dw3blnbsw11p"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags '("--disable-static" `(#:configure-flags '("--disable-static"
@ -177,10 +177,7 @@ object or archive file), @command{eu-strip} (for discarding symbols),
(find-files "bash-completion" ".*abi.*")) (find-files "bash-completion" ".*abi.*"))
#t))))) #t)))))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) (list pkg-config texinfo python-sphinx python))
("makeinfo" ,texinfo)
("python-sphinx" ,python-sphinx)
("python" ,python))) ;for tests
(propagated-inputs (propagated-inputs
(list elfutils ;libabigail.la says -lelf (list elfutils ;libabigail.la says -lelf
libxml2)) ;in Requires.private of libabigail.pc libxml2)) ;in Requires.private of libabigail.pc

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

@ -115,6 +115,7 @@
;;; Copyright © 2022 Thomas Albers Raviola <thomas@thomaslabs.org> ;;; Copyright © 2022 Thomas Albers Raviola <thomas@thomaslabs.org>
;;; Copyright © 2022 Haider Mirza <haider@haider.gq> ;;; Copyright © 2022 Haider Mirza <haider@haider.gq>
;;; Copyright © 2022 Jose G Perez Taveras <josegpt27@gmail.com> ;;; Copyright © 2022 Jose G Perez Taveras <josegpt27@gmail.com>
;;; Copyright © 2022 Hilton Chain <hako@ultrarare.space>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -3723,14 +3724,14 @@ the previous session
(define-public emacs-pabbrev (define-public emacs-pabbrev
(package (package
(name "emacs-pabbrev") (name "emacs-pabbrev")
(version "4.2.1") (version "4.2.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/" (uri (string-append "https://elpa.gnu.org/packages/"
"pabbrev-" version ".el")) "pabbrev-" version ".tar"))
(sha256 (sha256
(base32 "19v5adk61y8fpigw7k6wz6dj79jwr450hnbi7fj0jvb21cvjmfxh")))) (base32 "0iydz8yz866krxv1qv32k88w4464xpymh0wxgrxv6nvniwvhvd0s"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "http://elpa.gnu.org/packages/pabbrev.html") (home-page "http://elpa.gnu.org/packages/pabbrev.html")
(synopsis "Predictive abbreviation expansion") (synopsis "Predictive abbreviation expansion")
@ -8707,7 +8708,7 @@ built-in custom themes.")
(define-public emacs-gruvbox-theme (define-public emacs-gruvbox-theme
(package (package
(name "emacs-gruvbox-theme") (name "emacs-gruvbox-theme")
(version "1.28.0") (version "1.29.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -8716,7 +8717,7 @@ built-in custom themes.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"00qq92gp1g55pzm97rh7k0dgxy44pxziridl8kqm4rbpi31r7k9p")))) "0ydwr2l3jhqbs3gk5qajirl54vfb8i65qrlzrs04jnsj1pkzq5xa"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (propagated-inputs
(list emacs-autothemer)) (list emacs-autothemer))
@ -10178,7 +10179,7 @@ allowing unprefixed keys to insert their respective characters as expected.")
(define-public emacs-clojure-mode (define-public emacs-clojure-mode
(package (package
(name "emacs-clojure-mode") (name "emacs-clojure-mode")
(version "5.14.0") (version "5.15.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -10187,7 +10188,7 @@ allowing unprefixed keys to insert their respective characters as expected.")
(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 "0n7v6hx21f8x37gj388wnff38aqpzxxv5g8vxavp74vr3cbagsnn")))) (base32 "12m3yjhy4q0x3ri4xxb9raqg9lmw4hk4jgn436d9zvsk4fr3h1nd"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(native-inputs (native-inputs
(list emacs-buttercup emacs-dash emacs-paredit emacs-s)) (list emacs-buttercup emacs-dash emacs-paredit emacs-s))
@ -11011,7 +11012,7 @@ much easier.")
(define-public emacs-elfeed-protocol (define-public emacs-elfeed-protocol
(package (package
(name "emacs-elfeed-protocol") (name "emacs-elfeed-protocol")
(version "0.8.0") (version "0.8.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -11020,7 +11021,7 @@ much easier.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "07r1qlldgd0kfikd0y737y5n42ab3nkw2s5jx7frimj41yandbdp")))) (base32 "0k9rkghp9rg7aidmx7q0n4wpb9z5cwr7j8z167yzaqgf9s3y4jj2"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (propagated-inputs
(list emacs-elfeed)) (list emacs-elfeed))
@ -11805,7 +11806,7 @@ ack, ag, helm and pt.")
(define-public emacs-helm (define-public emacs-helm
(package (package
(name "emacs-helm") (name "emacs-helm")
(version "3.8.6") (version "3.8.7")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -11814,7 +11815,7 @@ ack, ag, helm and pt.")
(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 "02z5jxjkqspj6f6j2a87l9bzl2b4mh1560bzl8ia72w2vxg15m8z")))) (base32 "1a8zkp00ahb84ww5072naxwllzbjhi7ccarkk2d7xsykn5lig54c"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (propagated-inputs
(list emacs-async emacs-popup)) (list emacs-async emacs-popup))
@ -13111,7 +13112,7 @@ programming and reproducible research.")
(sha256 (sha256
(base32 "17aca4mc3gbdh6nhlcaa5ymh1yy76nwysrvy9sfcqkzvd5lgagzc")) (base32 "17aca4mc3gbdh6nhlcaa5ymh1yy76nwysrvy9sfcqkzvd5lgagzc"))
;; XXX: ob-sclang.el is packaged separately to avoid the dependency on ;; XXX: ob-sclang.el is packaged separately to avoid the dependency on
;; SuperCollider and qtwebengine. This will be unnecessary in 0.4+ ;; SuperCollider and qtwebengine-5. This will be unnecessary in 0.4+
;; release as the file is going to be removed from the repository. ;; release as the file is going to be removed from the repository.
;; XXX: org-contacts.el is now maintained in a separate repository and ;; XXX: org-contacts.el is now maintained in a separate repository and
@ -16613,7 +16614,7 @@ an elisp expression.")
(define-public emacs-taxy (define-public emacs-taxy
(package (package
(name "emacs-taxy") (name "emacs-taxy")
(version "0.9") (version "0.10")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -16621,7 +16622,7 @@ an elisp expression.")
"https://elpa.gnu.org/packages/taxy-" version ".tar")) "https://elpa.gnu.org/packages/taxy-" version ".tar"))
(sha256 (sha256
(base32 (base32
"1nzafs3yvcnmg07zi345n2yvjsw9wixlybzibnhf5k6jnd0vvpjh")))) "1jamry2p3qhswq8prd2g7ljh4yqk0wwblyd9fhnaclakahrn5vi3"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (propagated-inputs
(list emacs-magit)) (list emacs-magit))
@ -18865,7 +18866,7 @@ files to be expanded upon opening them.")
(define-public emacs-parsebib (define-public emacs-parsebib
(package (package
(name "emacs-parsebib") (name "emacs-parsebib")
(version "4.1") (version "4.2")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -18874,7 +18875,7 @@ files to be expanded upon opening them.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1bsxhizwhri8ayryfq59ghkybrql611q2bnjd45hpj7armwq3s8m")))) (base32 "0da4b6d65bq9xhyhq7h9g315zg6g5q9435vz870la966rgav5szd"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://github.com/joostkremers/parsebib") (home-page "https://github.com/joostkremers/parsebib")
(synopsis "Library for parsing @file{.bib} files") (synopsis "Library for parsing @file{.bib} files")
@ -24780,7 +24781,7 @@ well as providing an interface to attach and interact with the processes.")
(define-public emacs-dtrt-indent (define-public emacs-dtrt-indent
(package (package
(name "emacs-dtrt-indent") (name "emacs-dtrt-indent")
(version "1.7") (version "1.8")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -24789,7 +24790,7 @@ well as providing an interface to attach and interact with the processes.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0ihwmkxgbd0mgfvzisjiwvyypa9z21ckyxdnkf9y5lxywjyr39zh")))) "16g4bv2py423l19n0kaz18a41wk5fsrpnqzifdss6amqh0dqyvmf"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://github.com/jscheid/dtrt-indent") (home-page "https://github.com/jscheid/dtrt-indent")
(synopsis "Minor mode that guesses the indentation offset") (synopsis "Minor mode that guesses the indentation offset")
@ -26589,7 +26590,7 @@ through Dash docsets.")
(define-public emacs-devdocs (define-public emacs-devdocs
(package (package
(name "emacs-devdocs") (name "emacs-devdocs")
(version "0.4") (version "0.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -26597,7 +26598,7 @@ through Dash docsets.")
"https://elpa.gnu.org/packages/" "https://elpa.gnu.org/packages/"
"devdocs-" version ".tar")) "devdocs-" version ".tar"))
(sha256 (sha256
(base32 "05xmxqpp1cpf03y7idpqdsmbj30cissscy80ng5hqc3028kr2jqm")))) (base32 "0qyp8lhf76yv2ym7cryvygvf2m9jah5nsl1g79gqjrsin6vlhqka"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://github.com/astoff/devdocs.el") (home-page "https://github.com/astoff/devdocs.el")
(synopsis "Emacs viewer for DevDocs") (synopsis "Emacs viewer for DevDocs")
@ -26776,14 +26777,14 @@ well as an option for visually flashing evaluated s-expressions.")
(define-public emacs-tramp (define-public emacs-tramp
(package (package
(name "emacs-tramp") (name "emacs-tramp")
(version "2.5.3") (version "2.5.3.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/" (uri (string-append "https://elpa.gnu.org/packages/"
"tramp-" version ".tar")) "tramp-" version ".tar"))
(sha256 (sha256
(base32 "16bs90h7b1d188v6glhfp0y4wgxvwn3dl6l4sbswlf1zq3y61zy7")))) (base32 "0dqc5gmp20isrlanccvj6nhalmmsfg7bmm690gxfgrbqcc2vj69a"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments (arguments
(list (list
@ -27839,7 +27840,7 @@ contains a track position, playback will start at the specified position.")
(define-public emacs-org-jira (define-public emacs-org-jira
(package (package
(name "emacs-org-jira") (name "emacs-org-jira")
(version "4.3.3") (version "4.4.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -27849,7 +27850,7 @@ contains a track position, playback will start at the specified position.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0awfz4c70pxfj401p4h4j1lxic4pqpgigkldy9wvdkcyhqbphswj")))) "1s91l4ibjvvc7rfvd8gldxqrcgjq00q83fdww217ck2ps5yrzyjl"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (propagated-inputs
(list emacs-request emacs-s emacs-dash emacs-org)) (list emacs-request emacs-s emacs-dash emacs-org))
@ -28080,7 +28081,7 @@ Emacs that integrate with major modes like Org-mode.")
(define-public emacs-modus-themes (define-public emacs-modus-themes
(package (package
(name "emacs-modus-themes") (name "emacs-modus-themes")
(version "2.4.1") (version "2.5.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -28089,7 +28090,7 @@ Emacs that integrate with major modes like Org-mode.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0b4y8dzyc9qwwaf2ngqiwyfcnhwlr49kxhc96laqk20lvjlfsrnx")))) (base32 "0ng85240zabw87ac53xnrlrafp10ns5wn6dgv9d1jxvnq40p7zqz"))))
(native-inputs (list texinfo)) (native-inputs (list texinfo))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments (arguments
@ -31946,3 +31947,23 @@ can bind a popon to a specific buffer to only show on that buffer.")
be useful when working with the bitbake files in Yocto and OpenEmbedded be useful when working with the bitbake files in Yocto and OpenEmbedded
projects.") projects.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-vundo
(package
(name "emacs-vundo")
(version "2.0.0")
(source (origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/vundo-"
version ".tar"))
(sha256
(base32
"032aqcqq2xhh12qcpp8p3qldv0r9cnqr2y11jk1m5cvgal1cbb68"))))
(build-system emacs-build-system)
(home-page "https://github.com/casouri/vundo")
(synopsis "Visualize the undo tree")
(description
"Vundo (visual undo) displays the undo history as a tree and lets you move in the
tree to go back to previous buffer states. To use vundo, type @kbd{M-x vundo RET} in
the buffer you want to undo. An undo tree buffer should pop up.")
(license license:gpl3+)))

5
gnu/packages/emacs.scm
View file

@ -22,6 +22,7 @@
;;; Copyright © 2019 Amin Bandali <bandali@gnu.org> ;;; Copyright © 2019 Amin Bandali <bandali@gnu.org>
;;; Copyright © 2020 Jack Hill <jackhill@jackhill.us> ;;; Copyright © 2020 Jack Hill <jackhill@jackhill.us>
;;; Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com> ;;; Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com>
;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -69,6 +70,7 @@
#:use-module (gnu packages pdf) #:use-module (gnu packages pdf)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages selinux) #:use-module (gnu packages selinux)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages texinfo) #:use-module (gnu packages texinfo)
#:use-module (gnu packages tls) #:use-module (gnu packages tls)
#:use-module (gnu packages web) ; for jansson #:use-module (gnu packages web) ; for jansson
@ -340,6 +342,9 @@ languages.")
(sha256 (sha256
(base32 (base32
"0dqmrawkvbypxp8gcnspnhhmfamzp3l62gfgp1pw2l6svz58v991")))) "0dqmrawkvbypxp8gcnspnhhmfamzp3l62gfgp1pw2l6svz58v991"))))
(inputs
(modify-inputs (package-inputs emacs)
(prepend sqlite)))
(native-inputs (native-inputs
(modify-inputs (package-native-inputs emacs) (modify-inputs (package-native-inputs emacs)
(prepend autoconf)))))) (prepend autoconf))))))

8
gnu/packages/emulators.scm
View file

@ -744,7 +744,7 @@ The following systems are supported:
(list "-DUSE_LZMA=OFF" ;do not use bundled LZMA (list "-DUSE_LZMA=OFF" ;do not use bundled LZMA
"-DUSE_LIBZIP=OFF"))) ;use "zlib" instead "-DUSE_LIBZIP=OFF"))) ;use "zlib" instead
(native-inputs (native-inputs
(list pkg-config qttools)) (list pkg-config qttools-5))
(inputs (inputs
(list ffmpeg (list ffmpeg
libedit libedit
@ -755,7 +755,7 @@ The following systems are supported:
minizip minizip
ncurses ncurses
qtbase-5 qtbase-5
qtmultimedia qtmultimedia-5
sdl2 sdl2
sqlite sqlite
zlib)) zlib))
@ -1505,14 +1505,14 @@ multi-system game/emulator system.")
(define-public scummvm (define-public scummvm
(package (package
(name "scummvm") (name "scummvm")
(version "2.5.1") (version "2.6.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://downloads.scummvm.org/frs/scummvm/" version (uri (string-append "https://downloads.scummvm.org/frs/scummvm/" version
"/scummvm-" version ".tar.xz")) "/scummvm-" version ".tar.xz"))
(sha256 (sha256
(base32 "00az0dm85kh8rq0yqj74x0c5zrq4ybvwvnilijzl8qa5whwdpn4z")))) (base32 "05zw9xqdix88f8p3py2rfnyiaxr2sbifkqi9s5gy3nf9s3l3h50w"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ;require "git" `(#:tests? #f ;require "git"

66
gnu/packages/engineering.scm
View file

@ -213,7 +213,7 @@
(copy-recursively "unix/resources" share)) (copy-recursively "unix/resources" share))
#t))))) #t)))))
(inputs (inputs
(list boost muparser freetype qtbase-5 qtsvg)) (list boost muparser freetype qtbase-5 qtsvg-5))
(native-inputs (native-inputs
(list pkg-config which)) (list pkg-config which))
(home-page "https://librecad.org/") (home-page "https://librecad.org/")
@ -710,7 +710,7 @@ multipole-accelerated algorithm.")
(inputs (inputs
`(("qtbase" ,qtbase-5) `(("qtbase" ,qtbase-5)
("qtserialport" ,qtserialport) ("qtserialport" ,qtserialport)
("qtsvg" ,qtsvg) ("qtsvg-5" ,qtsvg-5)
("libgit2" ,libgit2) ("libgit2" ,libgit2)
("boost" ,boost) ("boost" ,boost)
("zlib" ,zlib) ("zlib" ,zlib)
@ -762,9 +762,9 @@ ready for production.")
(substitute* "qelectrotech.pro" (("\\/usr\\/local") out)) (substitute* "qelectrotech.pro" (("\\/usr\\/local") out))
(invoke "qmake"))))))) (invoke "qmake")))))))
(native-inputs (native-inputs
(list pkg-config qttools)) (list pkg-config qttools-5))
(inputs (inputs
(list kcoreaddons kwidgetsaddons qtbase-5 qtsvg sqlite)) (list kcoreaddons kwidgetsaddons qtbase-5 qtsvg-5 sqlite))
(home-page "https://qelectrotech.org/") (home-page "https://qelectrotech.org/")
(synopsis "CAD/CAE editor focusing on schematics drawing features") (synopsis "CAD/CAE editor focusing on schematics drawing features")
(description "QElectroTech, or QET in short, is a desktop application to (description "QElectroTech, or QET in short, is a desktop application to
@ -945,7 +945,7 @@ Emacs).")
(define-public kicad (define-public kicad
(package (package
(name "kicad") (name "kicad")
(version "6.0.6") (version "6.0.7")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -953,7 +953,7 @@ Emacs).")
(commit version))) (commit version)))
(sha256 (sha256
(base32 (base32
"0cb9zba812dlmn2w27s1q38mjpfdwhv0nnbilwsxchpvwg8j4k2j")) "10bqn99nif9zyi5v0lkic3na2vac5lgacw01ayil359vaw7d0pzy"))
(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
@ -1007,17 +1007,17 @@ Emacs).")
(variable "KICAD") ;to find kicad-doc (variable "KICAD") ;to find kicad-doc
(files '(""))) (files '("")))
(search-path-specification (search-path-specification
(variable "KICAD_TEMPLATE_DIR") (variable "KICAD6_TEMPLATE_DIR")
(files '("share/kicad/template"))) (files '("share/kicad/template")))
(search-path-specification (search-path-specification
(variable "KICAD_SYMBOL_DIR") ;symbol path (variable "KICAD6_SYMBOL_DIR")
(files '("share/kicad/library"))) (files '("share/kicad/symbols")))
(search-path-specification (search-path-specification
(variable "KISYSMOD") ;footprint path (variable "KICAD6_FOOTPRINT_DIR")
(files '("share/kicad/modules"))) (files '("share/kicad/footprints")))
(search-path-specification (search-path-specification
(variable "KISYS3DMOD") ;3D model path (variable "KICAD6_3DMODEL_DIR")
(files '("share/kicad/modules/packages3d"))))) (files '("share/kicad/3dmodels")))))
(native-inputs (list boost (native-inputs (list boost
desktop-file-utils desktop-file-utils
gettext-minimal gettext-minimal
@ -1060,7 +1060,7 @@ electrical diagrams), gerbview (viewing Gerber files) and others.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1kxv0j3nx6zn45znrhqq6bdqrsd60mgmgvr1gjv5p8g3cbkkslrx")))) "15arkjjbzd4k09crhsrizmj8ljwpv6xjm59k58pfbd5pmqkklh2d"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:configure-flags (list "-DBUILD_FORMATS=html") `(#:configure-flags (list "-DBUILD_FORMATS=html")
@ -1094,7 +1094,7 @@ electrical diagrams), gerbview (viewing Gerber files) and others.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"02z3vqhz1rlf57zi8vyrlxvvdl1hpsh447p41qdgcpn5dyjycb9d")))) "006ksx8r6cm6q7v701nalggivp21cmysj8p9zc18y3sch8n1mj4g"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f)) ; no tests exist `(#:tests? #f)) ; no tests exist
@ -1123,7 +1123,7 @@ libraries.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1phynxisha2pq2knbx5l1hkdz1bmjm0qxl3lcb4ab82h8d35r37c")))) "0c5fm4hlkka0ms43j02kbv7s9yrlkffn0jz6649ac3gpx6pk8lbf"))))
(synopsis "Official KiCad footprint libraries") (synopsis "Official KiCad footprint libraries")
(description "This package contains the official KiCad footprint libraries."))) (description "This package contains the official KiCad footprint libraries.")))
@ -1140,7 +1140,7 @@ libraries.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0ci9gxbpfnfqwah95ki4qcwlca78s1z6s7hckisnp58a1cm9siya")))) "0rdhwyhknrc63sc5ykmq097rzrl36zibnkls7q5hf54lrhn0n3k4"))))
(synopsis "Official KiCad 3D model libraries") (synopsis "Official KiCad 3D model libraries")
(description "This package contains the official KiCad 3D model libraries."))) (description "This package contains the official KiCad 3D model libraries.")))
@ -1246,7 +1246,7 @@ the 'showing the effect of'-style of operation.")
mpfr mpfr
openssl openssl
qtbase-5 qtbase-5
qtsvg)) qtsvg-5))
(home-page "https://github.com/ccoors/Valeronoi") (home-page "https://github.com/ccoors/Valeronoi")
(synopsis "WiFi mapping companion application for Valetudo") (synopsis "WiFi mapping companion application for Valetudo")
(description (description
@ -2118,9 +2118,9 @@ parallel computing platforms. It also supports serial execution.")
(base32 "0smp1p7wnrj0vh4rmz1cr2krfawc2lzx0pbzmgyay7xdp6jxympr")))) (base32 "0smp1p7wnrj0vh4rmz1cr2krfawc2lzx0pbzmgyay7xdp6jxympr"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
(list qtbase-5 qtsvg zlib)) (list qtbase-5 qtsvg-5 zlib))
(native-inputs (native-inputs
(list qttools ; for lrelease (list qttools-5 ; for lrelease
unzip)) unzip))
(arguments (arguments
`(#:phases `(#:phases
@ -2278,7 +2278,7 @@ simulation.")
(list pkg-config)) (list pkg-config))
(inputs (inputs
(list qtbase-5 (list qtbase-5
qtsvg qtsvg-5
openssl openssl
;; Depends on radare2 4.5.1 officially, builds and works fine with ;; Depends on radare2 4.5.1 officially, builds and works fine with
;; radare2 5.0.0 but fails to build with radare2 5.1.1. ;; radare2 5.0.0 but fails to build with radare2 5.1.1.
@ -2356,7 +2356,7 @@ specification can be downloaded at @url{http://3mf.io/specification/}.")
("opencsg" ,opencsg) ("opencsg" ,opencsg)
("qscintilla" ,qscintilla) ("qscintilla" ,qscintilla)
("qtbase" ,qtbase-5) ("qtbase" ,qtbase-5)
("qtmultimedia" ,qtmultimedia))) ("qtmultimedia-5" ,qtmultimedia-5)))
(native-inputs (native-inputs
`(("bison" ,bison) `(("bison" ,bison)
("flex" ,flex) ("flex" ,flex)
@ -2452,7 +2452,7 @@ comments.")))
(native-inputs (native-inputs
(list doxygen (list doxygen
graphviz graphviz
qttools qttools-5
pkg-config pkg-config
python-pyside-2-tools python-pyside-2-tools
swig)) swig))
@ -2490,10 +2490,10 @@ comments.")))
python-shiboken-2 python-shiboken-2
python-wrapper python-wrapper
qtbase-5 qtbase-5
qtdeclarative qtdeclarative-5
qtsvg qtsvg-5
qtwebchannel qtwebchannel-5
qtwebengine qtwebengine-5
qtx11extras qtx11extras
qtxmlpatterns qtxmlpatterns
sqlite sqlite
@ -3222,7 +3222,7 @@ visualization, matrix manipulation.")
(list pkg-config)) (list pkg-config))
(inputs (inputs
(list boost (list boost
cereal cereal-1.3.0
cgal cgal
curl curl
dbus dbus
@ -3422,11 +3422,11 @@ compiled translations. Prebuilt Firmware files are removed.")
python-trimesh python-trimesh
python-zeroconf python-zeroconf
qtbase qtbase
qtdeclarative qtdeclarative-5
qtgraphicaleffects qtgraphicaleffects
qtquickcontrols qtquickcontrols-5
qtquickcontrols2 qtquickcontrols2-5
qtsvg)) qtsvg-5))
(arguments (arguments
`(;; FIXME: tests are disabled, because they cause an infinite loop. `(;; FIXME: tests are disabled, because they cause an infinite loop.
#:tests? #f #:tests? #f
@ -3715,7 +3715,7 @@ netlists from the drawn schematic, allowing the simulation of the circuit.")
(base32 (base32
"08rqhl6a5a8s67a8yl16944zgcsnnb08xfv4klzyqwlvaqgfp783")))) "08rqhl6a5a8s67a8yl16944zgcsnnb08xfv4klzyqwlvaqgfp783"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (list qttools)) (native-inputs (list qttools-5))
(inputs (list qtbase-5 qtserialport)) (inputs (list qtbase-5 qtserialport))
(arguments (arguments
(list #:tests? #f ; no tests. (list #:tests? #f ; no tests.

6
gnu/packages/fcitx5.scm
View file

@ -392,9 +392,9 @@ the Anthy input method.")
("opencc" ,opencc) ("opencc" ,opencc)
("qtbase" ,qtbase-5) ("qtbase" ,qtbase-5)
("fcitx5-qt" ,fcitx5-qt) ("fcitx5-qt" ,fcitx5-qt)
("qtdeclarative" ,qtdeclarative) ("qtdeclarative-5" ,qtdeclarative-5)
("qtwebchannel" ,qtwebchannel) ("qtwebchannel-5" ,qtwebchannel-5)
("qtwebengine" ,qtwebengine))) ("qtwebengine-5" ,qtwebengine-5)))
(native-inputs (native-inputs
(list extra-cmake-modules pkg-config)) (list extra-cmake-modules pkg-config))
(outputs '("out" "gui")) (outputs '("out" "gui"))

82
gnu/packages/finance.scm
View file

@ -143,7 +143,7 @@
pkg-config pkg-config
python ; for the tests python ; for the tests
util-linux ; provides the hexdump command for tests util-linux ; provides the hexdump command for tests
qttools)) qttools-5))
(inputs (inputs
(list bdb-4.8 ; 4.8 required for compatibility (list bdb-4.8 ; 4.8 required for compatibility
boost boost
@ -159,7 +159,7 @@
(assoc-ref %build-inputs "boost")) (assoc-ref %build-inputs "boost"))
;; XXX: The configure script looks up Qt paths by ;; XXX: The configure script looks up Qt paths by
;; `pkg-config --variable=host_bins Qt5Core`, which fails to pick ;; `pkg-config --variable=host_bins Qt5Core`, which fails to pick
;; up executables residing in 'qttools', so we specify them here. ;; up executables residing in 'qttools-5', so we specify them here.
(string-append "ac_cv_path_LRELEASE=" (string-append "ac_cv_path_LRELEASE="
(assoc-ref %build-inputs "qttools") (assoc-ref %build-inputs "qttools")
"/bin/lrelease") "/bin/lrelease")
@ -651,7 +651,7 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.")
python-requests python-requests
python-stem python-stem
python-trezor python-trezor
qtsvg qtsvg-5
zlib)) zlib))
(home-page "https://electroncash.org/") (home-page "https://electroncash.org/")
(synopsis "Bitcoin Cash wallet") (synopsis "Bitcoin Cash wallet")
@ -671,7 +671,7 @@ blockchain.")
;; the system's dynamically linked library. ;; the system's dynamically linked library.
(package (package
(name "monero") (name "monero")
(version "0.17.3.2") (version "0.18.0.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -687,10 +687,9 @@ blockchain.")
;; Delete bundled dependencies. ;; Delete bundled dependencies.
(for-each (for-each
delete-file-recursively delete-file-recursively
'("external/miniupnp" "external/rapidjson" '("external/miniupnp" "external/rapidjson"))))
"external/unbound"))))
(sha256 (sha256
(base32 "19sgcbli7fc1l6ms7ma6hcz1mmpbnd296lc8a19rl410acpv45zy")))) (base32 "1jq2v2dg50gl3cf9s61jssny5rraclxqj4cc4y0sl00ip8icj08v"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
(list doxygen (list doxygen
@ -698,7 +697,7 @@ blockchain.")
pkg-config pkg-config
protobuf protobuf
python python
qttools)) qttools-5))
(inputs (inputs
(list boost (list boost
cppzmq cppzmq
@ -716,14 +715,14 @@ blockchain.")
xz xz
zeromq)) zeromq))
(arguments (arguments
`(#:out-of-source? #t (list #:out-of-source? #t
#:configure-flags #:configure-flags
(list "-DARCH=default" #~(list "-DARCH=default"
"-DBUILD_TESTS=ON" "-DBUILD_TESTS=ON"
(string-append "-DReadline_ROOT_DIR=" (string-append "-DReadline_ROOT_DIR="
(assoc-ref %build-inputs "readline"))) #$(this-package-input "readline")))
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
;; tests/core_tests need a valid HOME ;; tests/core_tests need a valid HOME
(add-before 'configure 'set-home (add-before 'configure 'set-home
(lambda _ (lambda _
@ -765,8 +764,8 @@ blockchain.")
excluded-unit-tests))))) excluded-unit-tests)))))
(add-after 'install 'delete-unused-files (add-after 'install 'delete-unused-files
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (delete-file-recursively
(delete-file-recursively (string-append out "/include")))))))) (string-append #$output "/include")))))))
(home-page "https://web.getmonero.org/") (home-page "https://web.getmonero.org/")
(synopsis "Command-line interface to the Monero currency") (synopsis "Command-line interface to the Monero currency")
(description (description
@ -777,7 +776,7 @@ the Monero command line client and daemon.")
(define-public monero-gui (define-public monero-gui
(package (package
(name "monero-gui") (name "monero-gui")
(version "0.17.3.2") (version "0.18.0.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -793,31 +792,31 @@ the Monero command line client and daemon.")
;; See the 'extract-monero-sources' phase. ;; See the 'extract-monero-sources' phase.
(delete-file-recursively "monero"))) (delete-file-recursively "monero")))
(sha256 (sha256
(base32 "12x0d981fkb43inx7zqjr3ny53dih9g8k03cmaflxqwviinb1k4b")))) (base32 "14rbw9803h3g7ld3d24vc3i9n55n09x13frkmd128xx5jw17v5sr"))))
(build-system qt-build-system) (build-system qt-build-system)
(native-inputs (native-inputs
`(,@(package-native-inputs monero) `(,@(package-native-inputs monero)
("monero-source" ,(package-source monero)))) ("monero-source" ,(package-source monero))))
(inputs (inputs
`(,@(package-inputs monero) (modify-inputs (package-inputs monero)
("libgcrypt" ,libgcrypt) (append libgcrypt
("monero" ,monero) monero
("qtbase" ,qtbase-5) qtbase-5
("qtdeclarative" ,qtdeclarative) qtdeclarative-5
("qtgraphicaleffects" ,qtgraphicaleffects) qtgraphicaleffects
("qtquickcontrols" ,qtquickcontrols) qtquickcontrols-5
("qtquickcontrols2",qtquickcontrols2) qtquickcontrols2-5
("qtsvg" ,qtsvg) qtsvg-5
("qtxmlpatterns" ,qtxmlpatterns))) qtxmlpatterns)))
(arguments (arguments
`(#:tests? #f ; No tests (list #:tests? #f ; No tests
#:configure-flags #:configure-flags
,#~(list "-DARCH=default" #~(list "-DARCH=default"
"-DENABLE_PASS_STRENGTH_METER=ON" "-DENABLE_PASS_STRENGTH_METER=ON"
(string-append "-DReadline_ROOT_DIR=" (string-append "-DReadline_ROOT_DIR="
#$(this-package-input "readline"))) #$(this-package-input "readline")))
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'extract-monero-sources (add-after 'unpack 'extract-monero-sources
;; Some of the monero package source code is required ;; Some of the monero package source code is required
;; to build the GUI. ;; to build the GUI.
@ -829,24 +828,23 @@ the Monero command line client and daemon.")
(lambda _ (lambda _
(substitute* "src/version.js.in" (substitute* "src/version.js.in"
(("@VERSION_TAG_GUI@") (("@VERSION_TAG_GUI@")
,version)) #$version))
(substitute* "external/CMakeLists.txt" (substitute* "external/CMakeLists.txt"
(("add_library\\(quirc" all) (("add_library\\(quirc" all)
(string-append (string-append
"set(CMAKE_C_FLAGS \"${CMAKE_C_FLAGS} -fPIC\")\n" "set(CMAKE_C_FLAGS \"${CMAKE_C_FLAGS} -fPIC\")\n"
all))))) all)))))
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda _
(let ((bin (string-append (assoc-ref outputs "out") "/bin"))) (let ((bin (string-append #$output "/bin")))
(mkdir-p bin) (mkdir-p bin)
(install-file "../build/bin/monero-wallet-gui" bin)))) (install-file "../build/bin/monero-wallet-gui" bin))))
(add-after 'qt-wrap 'install-monerod-link (add-after 'qt-wrap 'install-monerod-link
;; The monerod program must be available so that monero-wallet-gui ;; The monerod program must be available so that
;; can start a Monero daemon if necessary. ;; monero-wallet-gui can start a Monero daemon if necessary.
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(symlink (search-input-file inputs "/bin/monerod") (symlink (search-input-file inputs "/bin/monerod")
(string-append (assoc-ref outputs "out") (string-append #$output "/bin/monerod")))))))
"/bin/monerod")))))))
(home-page "https://web.getmonero.org/") (home-page "https://web.getmonero.org/")
(synopsis "Graphical user interface for the Monero currency") (synopsis "Graphical user interface for the Monero currency")
(description (description
@ -1543,7 +1541,7 @@ Trezor wallet.")
(list pkg-config (list pkg-config
python ; for the tests python ; for the tests
util-linux ; provides the hexdump command for tests util-linux ; provides the hexdump command for tests
qttools)) qttools-5))
(inputs (inputs
(list bdb-5.3 (list bdb-5.3
boost boost
@ -1657,7 +1655,7 @@ following three utilities are included with the library:
pkg-config pkg-config
python ; for the tests python ; for the tests
util-linux ; provides the hexdump command for tests util-linux ; provides the hexdump command for tests
qttools)) qttools-5))
(inputs (inputs
(list bdb-4.8 (list bdb-4.8
boost boost
@ -1677,7 +1675,7 @@ following three utilities are included with the library:
(assoc-ref %build-inputs "boost")) (assoc-ref %build-inputs "boost"))
;; XXX: The configure script looks up Qt paths by ;; XXX: The configure script looks up Qt paths by
;; `pkg-config --variable=host_bins Qt5Core`, which fails to pick ;; `pkg-config --variable=host_bins Qt5Core`, which fails to pick
;; up executables residing in 'qttools', so we specify them here. ;; up executables residing in 'qttools-5', so we specify them here.
(string-append "ac_cv_path_LRELEASE=" (string-append "ac_cv_path_LRELEASE="
(assoc-ref %build-inputs "qttools") (assoc-ref %build-inputs "qttools")
"/bin/lrelease") "/bin/lrelease")
@ -1731,7 +1729,7 @@ a Qt GUI.")
(string-append "PREFIX=" %output) (string-append "PREFIX=" %output)
"features=")))))) "features="))))))
(native-inputs (native-inputs
(list qttools)) (list qttools-5))
(inputs (inputs
(list python qtbase-5 rocksdb zlib)) (list python qtbase-5 rocksdb zlib))
(home-page "https://gitlab.com/FloweeTheHub/fulcrum/") (home-page "https://gitlab.com/FloweeTheHub/fulcrum/")
@ -1798,7 +1796,7 @@ like Flowee the Hub, which Fulcrum connects to over RPC.")
openssl openssl
qtbase-5)) qtbase-5))
(native-inputs (native-inputs
(list pkg-config qttools util-linux)) ; provides the hexdump command for tests (list pkg-config qttools-5 util-linux)) ; provides the hexdump command for tests
(home-page "https://flowee.org") (home-page "https://flowee.org")
(synopsis "Flowee infrastructure tools and services") (synopsis "Flowee infrastructure tools and services")
(description (description

92
gnu/packages/fonts.scm
View file

@ -50,6 +50,7 @@
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Liliana Marie Prikler <liliana.prikler@gmail.com> ;;; Copyright © 2021 Liliana Marie Prikler <liliana.prikler@gmail.com>
;;; Copyright © 2022 Jose G Perez Taveras <josegpt27@gmail.com> ;;; Copyright © 2022 Jose G Perez Taveras <josegpt27@gmail.com>
;;; Copyright © 2022 Hilton Chain <hako@ultrarare.space>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -1578,7 +1579,7 @@ programming. Iosevka is completely generated from its source code.")
(define-public font-sarasa-gothic (define-public font-sarasa-gothic
(package (package
(name "font-sarasa-gothic") (name "font-sarasa-gothic")
(version "0.36.0") (version "0.36.8")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -1586,7 +1587,7 @@ programming. Iosevka is completely generated from its source code.")
"/releases/download/v" version "/releases/download/v" version
"/sarasa-gothic-ttc-" version ".7z")) "/sarasa-gothic-ttc-" version ".7z"))
(sha256 (sha256
(base32 "0rr6qrf49zx3cl1pv7063l12nnj2nm9p4di3frp0p4ci9l7b4xmw")))) (base32 "01fn5mzr1rcz0c8nbhabwbv1pq1c3ylf2msxldc9adks1pi45fmh"))))
(build-system font-build-system) (build-system font-build-system)
(arguments (arguments
`(#:phases (modify-phases %standard-phases `(#:phases (modify-phases %standard-phases
@ -1598,7 +1599,7 @@ programming. Iosevka is completely generated from its source code.")
(native-inputs (list p7zip)) (native-inputs (list p7zip))
(home-page "https://github.com/be5invis/Sarasa-Gothic") (home-page "https://github.com/be5invis/Sarasa-Gothic")
(license license:silofl1.1) (license license:silofl1.1)
(synopsis "Sarasa Gothic / 更纱黑体 / 更紗黑體 / 更紗ゴシック / 사라사 고딕") (synopsis "CJK programming font based on Iosevka and Source Han Sans")
(description (description
"Sarasa Gothic is a programming font based on Iosevka and Source Han Sans, "Sarasa Gothic is a programming font based on Iosevka and Source Han Sans,
most CJK characters are same height, and double width as ASCII characters."))) most CJK characters are same height, and double width as ASCII characters.")))
@ -2709,3 +2710,88 @@ This package contains the following outputs:
icon is designed on a 24x24 grid with an emphasis on simplicity, consistency, icon is designed on a 24x24 grid with an emphasis on simplicity, consistency,
and readability. This package bundles those icons into a font.") and readability. This package bundles those icons into a font.")
(license license:expat)))) (license license:expat))))
(define-public font-lxgw-wenkai
(package
(name "font-lxgw-wenkai")
(version "1.235.2")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/lxgw/LxgwWenKai/releases/download/v"
version "/lxgw-wenkai-v" version ".tar.gz"))
(sha256
(base32
"17li3xry4j4ccdnwz2pcnf0gv7c5mwq0h5fwvl7ar28brn2qgdbk"))))
(build-system font-build-system)
(home-page "https://lxgw.github.io/2021/01/28/Klee-Simpchin/")
(synopsis "Simplified Chinese Imitation Song typeface")
(description
"LXGW Wenkai is a Simplified Chinese Imitation Song typeface covering the
CJK Unified Ideographs (base block) and commonly used Hangul. For characters
within GB 2312, standard glyphs for Mainland China is used.")
(license license:silofl1.1)))
(define-public font-lxgw-wenkai-tc
(package
(inherit font-lxgw-wenkai)
(name "font-lxgw-wenkai-tc")
(version "0.920")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/lxgw/LxgwWenKaiTC/releases/download/v"
version "/lxgw-wenkai-tc-v" version ".tar.gz"))
(sha256
(base32
"1kysqzi19ldd1a3pd9axmggcbm1719myq6i6q6fdb1afscn272cp"))))
(home-page "https://github.com/lxgw/LxgwWenKaitc")
(synopsis "Traditional Chinese Imitation Song typeface")
(description
"LXGW Wenkai TC is a Traditional Chinese inherited glyphs form Imitation
Song typeface covering commonly used characters as well as written form of
dialects in Hong Kong and Taiwan.")))
(define-public font-chiron-sung-hk
(package
(name "font-chiron-sung-hk")
(version "1.005")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/chiron-fonts/chiron-sung-hk")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0iqlnb7825kisg2avhr9hwwvb4jw8f642vvmms5dw6m9czzydpgw"))))
(build-system font-build-system)
(home-page "https://chiron-fonts.github.io/")
(synopsis "Traditional Chinese Song typeface")
(description
"Chiron Sung HK is a Traditional Chinese Song typeface based on the Hong
Kong variant of Adobe’s Source Han Serif. The font aims at providing a modern,
region-agnostic glyph set adopting the “modern” glyph style that is similar to
prevalent typefaces in Traditional Chinese regions.")
(license license:silofl1.1)))
(define-public font-chiron-hei-hk
(package
(inherit font-chiron-sung-hk)
(name "font-chiron-hei-hk")
(version "2.503")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/chiron-fonts/chiron-hei-hk")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"00av598lcsvbwfxabs8m1bfvlk3zq98nziynsrg5p2s5mhz2pkvk"))))
(synopsis "Traditional Chinese Gothic typeface")
(description
"Chiron Hei HK is a Traditional Chinese Gothic typeface based on the Hong
Kong variant of Adobe’s Source Han Sans. The font aims at providing a modern,
region-agnostic glyph set adopting the “modern” glyph style that is similar to
prevalent typefaces in Traditional Chinese regions.")))

109
gnu/packages/freedesktop.scm
View file

@ -25,7 +25,7 @@
;;; Copyright © 2021 pineapples <guixuser6392@protonmail.com> ;;; Copyright © 2021 pineapples <guixuser6392@protonmail.com>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev> ;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2021 Robby Zambito <contact@robbyzambito.me> ;;; Copyright © 2021 Robby Zambito <contact@robbyzambito.me>
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be> ;;; Copyright © 2021, 2022 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2021 John Kehayias <john.kehayias@protonmail.com> ;;; Copyright © 2021 John Kehayias <john.kehayias@protonmail.com>
;;; Copyright © 2021, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2021, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2022 Daniel Meißner <daniel.meissner-i4k@ruhr-uni-bochum.de> ;;; Copyright © 2022 Daniel Meißner <daniel.meissner-i4k@ruhr-uni-bochum.de>
@ -76,6 +76,7 @@
#:use-module (gnu packages disk) #:use-module (gnu packages disk)
#:use-module (gnu packages docbook) #:use-module (gnu packages docbook)
#:use-module (gnu packages documentation) #:use-module (gnu packages documentation)
#:use-module (gnu packages file)
#:use-module (gnu packages fontutils) #:use-module (gnu packages fontutils)
#:use-module (gnu packages gawk) #:use-module (gnu packages gawk)
#:use-module (gnu packages gettext) #:use-module (gnu packages gettext)
@ -414,7 +415,15 @@ inappropriate content.")
(list docbook-xsl docbook-xml-4.1.2 libxslt w3m xmlto)) (list docbook-xsl docbook-xml-4.1.2 libxslt w3m xmlto))
(inputs (inputs
`(("awk" ,gawk) `(("awk" ,gawk)
;; TODO(staging): Make this unconditional, to avoid canonical packages,
;; see <https://lists.gnu.org/archive/html/guix-devel/2020-02/msg00148.html>.
,@(if (%current-target-system)
`(("bash-minimal" ,bash-minimal)) ; for 'wrap-program'
'())
("coreutils" ,coreutils) ("coreutils" ,coreutils)
,@(if (%current-target-system)
`(("file" ,file))
'())
("grep" ,grep) ("grep" ,grep)
("inetutils" ,inetutils) ; xdg-screensaver uses `hostname' ("inetutils" ,inetutils) ; xdg-screensaver uses `hostname'
("perl-file-mimeinfo" ,perl-file-mimeinfo) ; for mimeopen fallback ("perl-file-mimeinfo" ,perl-file-mimeinfo) ; for mimeopen fallback
@ -428,19 +437,44 @@ inappropriate content.")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'patch-hardcoded-paths (add-after 'unpack 'patch-hardcoded-paths
(lambda _ ;; TODO(staging): make unconditional
(,@(if (%current-target-system)
'(lambda* (#:key inputs #:allow-other-keys))
'(lambda _))
(substitute* "scripts/xdg-mime.in" (substitute* "scripts/xdg-mime.in"
(("/usr/bin/file") (which "file"))) (("/usr/bin/file")
(,@(if (%current-target-system)
'(search-input-file inputs "bin/file")
'(which "file")))))
(substitute* "scripts/xdg-open.in" (substitute* "scripts/xdg-open.in"
(("/usr/bin/printf") (which "printf"))) (("/usr/bin/printf")
(,@(if (%current-target-system)
'(search-input-file inputs "bin/printf")
'(which "printf")))))
#t)) #t))
(add-before 'build 'locate-catalog-files (add-before 'build 'locate-catalog-files
(lambda* (#:key inputs #:allow-other-keys) ;; TODO(staging): Make unconditional for simplicity.
(let ((xmldoc (string-append (assoc-ref inputs "docbook-xml") (lambda* (#:key inputs ,@(if (%current-target-system)
'(native-inputs)
'()) #:allow-other-keys)
;; TODO(staging): Make unconditional for simplicity and
;; to avoid depending on input labels.
(let ,(if (%current-target-system)
`((native-inputs (or native-inputs inputs))
(xmldoc (search-input-directory native-inputs
"xml/dtd/docbook"))
(xsldoc
(search-input-directory
native-inputs
(string-append "xml/xsl/docbook-xsl-"
,(package-version docbook-xsl)))))
`((xmldoc
(string-append (assoc-ref inputs "docbook-xml")
"/xml/dtd/docbook")) "/xml/dtd/docbook"))
(xsldoc (string-append (assoc-ref inputs "docbook-xsl") (xsldoc
(string-append (assoc-ref inputs "docbook-xsl")
"/xml/xsl/docbook-xsl-" "/xml/xsl/docbook-xsl-"
,(package-version docbook-xsl)))) ,(package-version docbook-xsl)))))
(for-each (lambda (file) (for-each (lambda (file)
(substitute* file (substitute* file
(("http://.*/docbookx\\.dtd") (("http://.*/docbookx\\.dtd")
@ -456,6 +490,8 @@ inappropriate content.")
"/manpages/docbook.xsl man"))) "/manpages/docbook.xsl man")))
(setenv "STYLESHEET" (setenv "STYLESHEET"
(string-append xsldoc "/html/docbook.xsl")) (string-append xsldoc "/html/docbook.xsl"))
;; TODO(staging): Might as well remove the #t while we are at
;; it.
#t))) #t)))
(add-after 'install 'wrap-executables (add-after 'install 'wrap-executables
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
@ -1319,13 +1355,17 @@ Analysis and Reporting Technology) functionality.")
(propagated-inputs (propagated-inputs
(list glib)) ; required by udisks2.pc (list glib)) ; required by udisks2.pc
(inputs (inputs
(list acl `(,acl
cryptsetup ;; TODO(staging): Make unconditional.
libatasmart ,@(if (%current-target-system)
libblockdev (list bash-minimal) ; for wrap-program
libgudev '())
polkit ,cryptsetup
util-linux)) ,libatasmart
,libblockdev
,libgudev
,polkit
,util-linux))
(outputs '("out" (outputs '("out"
"doc")) ;5 MiB of gtk-doc HTML "doc")) ;5 MiB of gtk-doc HTML
(arguments (arguments
@ -1936,6 +1976,11 @@ applications define in those files.")
(base32 (base32
"1i5iw6ri0w9clwpqf40xmsh4isc8xvx2lyf2r5g34886i6rsdgpn")))) "1i5iw6ri0w9clwpqf40xmsh4isc8xvx2lyf2r5g34886i6rsdgpn"))))
(build-system perl-build-system) (build-system perl-build-system)
(inputs
;; TODO(staging): Make unconditional.
(if (%current-target-system)
(list bash-minimal) ; for wrap-program
'()))
;; If the tests are fixed, add perl-test-pod, perl-test-pod-coverage, and ;; If the tests are fixed, add perl-test-pod, perl-test-pod-coverage, and
;; perl-test-tiny as native-inputs. ;; perl-test-tiny as native-inputs.
(propagated-inputs (propagated-inputs
@ -1943,17 +1988,29 @@ applications define in those files.")
(arguments (arguments
;; Some tests fail due to requiring the mimetype of perl files to be ;; Some tests fail due to requiring the mimetype of perl files to be
;; text/plain when they are actually application/x-perl. ;; text/plain when they are actually application/x-perl.
`(#:tests? #f (list #:tests? #f
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'install 'wrap-programs (add-after 'install 'wrap-programs
(lambda* (#:key outputs #:allow-other-keys) ;; TODO(staging): Make unconditional.
(lambda* (#:key #$@(if (%current-target-system)
#~(inputs)
#~()) outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(for-each (lambda (prog) (for-each
(lambda (prog)
(wrap-program (string-append out "/bin/" prog) (wrap-program (string-append out "/bin/" prog)
`("PERL5LIB" ":" prefix `("PERL5LIB" ":" prefix
(,(string-append (getenv "PERL5LIB") ":" out ;; PERL5LIB looks in 'native-inputs', not 'inputs',
"/lib/perl5/site_perl"))))) ;; whereas the latter is required for
;; cross-compilation.
#$(if (%current-target-system)
#~,(search-path-as-list
'("lib/perl5/site_perl")
(map cdr (append inputs outputs)))
#~(,(string-append
(getenv "PERL5LIB")
":" out "/lib/perl5/site_perl"))))))
'("mimeopen" "mimetype"))) '("mimeopen" "mimetype")))
#t))))) #t)))))
(home-page "https://metacpan.org/release/File-MimeInfo") (home-page "https://metacpan.org/release/File-MimeInfo")
@ -2032,7 +2089,15 @@ Python, that binds to the C library @code{uchardet} to increase performance.")
("gettext" ,gettext-minimal) ("gettext" ,gettext-minimal)
("gobject-introspection" ,gobject-introspection))) ("gobject-introspection" ,gobject-introspection)))
(inputs (inputs
(list gobject-introspection gtk+ libappindicator libnotify udisks)) ;; TODO(staging): Make unconditional.
`(,@(if (%current-target-system)
(list bash-minimal)
'())
,gobject-introspection
,gtk+
,libappindicator
,libnotify
,udisks))
(propagated-inputs (propagated-inputs
(list python-docopt python-pygobject python-keyutils python-pyxdg (list python-docopt python-pygobject python-keyutils python-pyxdg
python-pyyaml)) python-pyyaml))

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

@ -13,7 +13,7 @@
;;; Copyright © 2017 Peter Mikkelsen <petermikkelsen10@gmail.com> ;;; Copyright © 2017 Peter Mikkelsen <petermikkelsen10@gmail.com>
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2017, 2019 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2017, 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2018, 2022 Marius Bakke <marius@gnu.org>
;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2019, 2020, 2021 Liliana Marie Prikler <liliana.prikler@gmail.com> ;;; Copyright © 2019, 2020, 2021 Liliana Marie Prikler <liliana.prikler@gmail.com>
;;; Copyright © 2019 Jethro Cao <jethrocao@gmail.com> ;;; Copyright © 2019 Jethro Cao <jethrocao@gmail.com>
@ -520,9 +520,9 @@ formats such as PNG.")
"05gczsywkk45bh0z1vv8l6cmrlncc2qj8agavj5ryxpnxkzy69r1")))) "05gczsywkk45bh0z1vv8l6cmrlncc2qj8agavj5ryxpnxkzy69r1"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
(list qtbase-5 qtdeclarative qtsvg zlib)) (list qtbase-5 qtdeclarative-5 qtsvg-5 zlib))
(native-inputs (native-inputs
(list qttools)) (list qttools-5))
(arguments (arguments
'(#:phases '(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
@ -531,8 +531,8 @@ formats such as PNG.")
(substitute* "translations/translations.pro" (substitute* "translations/translations.pro"
(("LRELEASE =.*") (("LRELEASE =.*")
(string-append "LRELEASE = " (string-append "LRELEASE = "
(assoc-ref inputs "qttools") (search-input-file inputs "/bin/lrelease")
"/bin/lrelease\n"))) "\n")))
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(invoke "qmake" (invoke "qmake"
(string-append "PREFIX=" out)))))))) (string-append "PREFIX=" out))))))))
@ -2467,13 +2467,23 @@ rigid body physics library written in C.")
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
;; Bundled code only used for the testbed. ;; Remove bundled code only used for the testbed.
(delete-file-recursively "extern"))))) (delete-file-recursively "extern")
;; Remove bundled copy of doctest, and adjust tests accordingly.
(delete-file "unit-test/doctest.h")
(substitute* "unit-test/CMakeLists.txt"
(("doctest\\.h")
""))
(substitute* (find-files "unit-test" "\\.cpp$")
(("include \"doctest\\.h\"")
"include <doctest/doctest.h>"))))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:test-target "unit_test" `(#:test-target "unit_test"
#:configure-flags '("-DBUILD_SHARED_LIBS=ON" #:configure-flags '("-DBUILD_SHARED_LIBS=ON"
"-DBOX2D_BUILD_TESTBED=OFF"))) "-DBOX2D_BUILD_TESTBED=OFF")))
(native-inputs
(list doctest)) ;for tests
(inputs (inputs
(list libx11)) (list libx11))
(home-page "https://box2d.org/") (home-page "https://box2d.org/")
@ -2623,7 +2633,7 @@ utilities frequently used in roguelikes.")
("openal" ,openal) ("openal" ,openal)
("pulseaudio" ,pulseaudio) ("pulseaudio" ,pulseaudio)
("qtbase" ,qtbase-5) ("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative) ("qtdeclarative-5" ,qtdeclarative-5)
("sdl2" ,sdl2) ("sdl2" ,sdl2)
("uuid.h" ,util-linux "lib") ("uuid.h" ,util-linux "lib")
("zlib" ,zlib))) ("zlib" ,zlib)))

300
gnu/packages/games.scm
View file

@ -504,6 +504,60 @@ regret their insolence.")
;; BY-SA 4.0, and fonts to OFL1.1. ;; BY-SA 4.0, and fonts to OFL1.1.
(license (list license:gpl3+ license:cc-by-sa4.0 license:silofl1.1)))) (license (list license:gpl3+ license:cc-by-sa4.0 license:silofl1.1))))
(define-public barony
(package
(name "barony")
(version "3.3.7")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/TurningWheel/Barony")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1y72k6zrqqhib3p05zkdklays2d218v51n87k7k68m0s7nnxa4vy"))
;; Fix textures for SDL 2.0.14.
;; See <https://github.com/TurningWheel/Barony/pull/582>.
(patches (search-patches "barony-fix-textures.patch"))))
(build-system cmake-build-system)
(arguments
'(#:configure-flags
(list "-DOPENAL_ENABLED=ON" ; enable sound
"-DEDITOR_EXE_NAME=barony-editor") ; instead of generic "editor"
#:tests? #f ; there are no tests
#:phases
(modify-phases %standard-phases
(add-before 'configure 'fix-installation
(lambda _
(substitute* "CMakeLists.txt"
(("\\$\\{CMAKE_CURRENT_BINARY_DIR\\}/lang")
"${CMAKE_SOURCE_DIR}/lang")))))))
(inputs
(list glu
libpng
libvorbis
openal
physfs
rapidjson
sdl2
sdl2-image
sdl2-net
sdl2-ttf
zlib))
(native-inputs
(list pkg-config))
(home-page "http://baronygame.com")
(synopsis "3D first-person roguelike game")
(description
"Barony is a first-person roguelike role-playing game with cooperative
play. The player must descend a dark dungeon and destroy an undead lich while
avoiding traps and fighting monsters. The game features randomly generated
dungeons, 13 character classes, hundreds of items and artifacts, and
cooperative multiplayer for up to four players. This package does @emph{not}
provide the game assets.")
(license license:bsd-2)))
(define-public bastet (define-public bastet
(package (package
(name "bastet") (name "bastet")
@ -993,10 +1047,10 @@ want what you have.")
(inputs (inputs
(list protobuf (list protobuf
qtbase-5 qtbase-5
qtmultimedia qtmultimedia-5
qtsvg qtsvg-5
qttools qttools-5
qtwebsockets qtwebsockets-5
xz xz
zlib)) zlib))
(home-page "https://cockatrice.github.io") (home-page "https://cockatrice.github.io")
@ -2504,7 +2558,7 @@ and defeat them with your bubbles!")
(setenv "XDG_RUNTIME_DIR" (getcwd)) (setenv "XDG_RUNTIME_DIR" (getcwd))
#t))))) #t)))))
(native-inputs (native-inputs
(list pkg-config qttools)) (list pkg-config qttools-5))
(inputs (inputs
`(("glm" ,glm) `(("glm" ,glm)
("libmodplug" ,libmodplug) ("libmodplug" ,libmodplug)
@ -7199,11 +7253,11 @@ making Yamagi Quake II one of the most solid Quake II implementations available.
;; with multiple "QPainter:: ... Painter not active" warnings. ;; with multiple "QPainter:: ... Painter not active" warnings.
#:tests? #f)) #:tests? #f))
(inputs (inputs
(list qtbase-5 qtsvg)) (list qtbase-5 qtsvg-5))
(native-inputs (native-inputs
`(("cmake" ,cmake-minimal) `(("cmake" ,cmake-minimal)
("gettext-minimal" ,gettext-minimal) ("gettext-minimal" ,gettext-minimal)
("qttools" ,qttools))) ("qttools-5" ,qttools-5)))
(synopsis "Realistic physics puzzle game") (synopsis "Realistic physics puzzle game")
(description "The Butterfly Effect (tbe) is a game that uses (description "The Butterfly Effect (tbe) is a game that uses
realistic physics simulations to combine lots of simple mechanical realistic physics simulations to combine lots of simple mechanical
@ -7949,7 +8003,7 @@ open-source FPS of its kind.")
(define-public frotz (define-public frotz
(package (package
(name "frotz") (name "frotz")
(version "2.44") (version "2.54")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (list (string-append (uri (list (string-append
@ -7960,18 +8014,15 @@ open-source FPS of its kind.")
"frotz/frotz-" version ".tar.gz"))) "frotz/frotz-" version ".tar.gz")))
(sha256 (sha256
(base32 (base32
"1v735xr3blznac8fnwa27s1vhllx4jpz7kw7qdw1bsfj6kq21v3k")))) "1vsfq9ryyb4nvzxpnnn40k423k9pdy8k67i8390qz5h0vmxw0fds"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; there are no tests (list #:tests? #f ; there are no tests
#:make-flags
#~(list (string-append "CC=" #$(cc-for-target)))
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(delete 'configure) (delete 'configure) ; no configure-script
(add-before 'build 'curses
(lambda _
(substitute* "Makefile"
(("lcurses") "lncurses"))
#t))
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
@ -7979,9 +8030,9 @@ open-source FPS of its kind.")
(man (string-append out "/share/man/man6"))) (man (string-append out "/share/man/man6")))
(install-file "frotz" bin) (install-file "frotz" bin)
(mkdir-p man) (mkdir-p man)
(install-file "doc/frotz.6" man) (install-file "doc/frotz.6" man)))))))
#t)))))) (native-inputs (list pkg-config which))
(inputs (list libmodplug libsamplerate libsndfile libvorbis ncurses)) (inputs (list ao libmodplug libsamplerate libsndfile libvorbis ncurses))
(synopsis "Portable Z-machine interpreter (ncurses version) for text adventure games") (synopsis "Portable Z-machine interpreter (ncurses version) for text adventure games")
(description "Frotz is an interpreter for Infocom games and other Z-machine (description "Frotz is an interpreter for Infocom games and other Z-machine
games in the text adventure/interactive fiction genre. This version of Frotz games in the text adventure/interactive fiction genre. This version of Frotz
@ -7994,7 +8045,7 @@ ncurses for text display.")
(define-public naev (define-public naev
(package (package
(name "naev") (name "naev")
(version "0.9.3") (version "0.9.4")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -8004,7 +8055,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 "0hvgxzvph9s5gdzlj5kjnz2d2j7bi8s11k7i6540837mnppah18j")))) (base32 "0isswidhxhs2q5c4cxryjr8y8ibfxckpfyccly3b4lg1nxvm5gjv"))))
(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.
@ -9270,8 +9321,8 @@ and also provides the base for the FlightGear Flight Simulator.")
openscenegraph openscenegraph
plib plib
qtbase-5 qtbase-5
qtdeclarative qtdeclarative-5
qtsvg qtsvg-5
simgear simgear
speexdsp speexdsp
sqlite sqlite
@ -9279,7 +9330,7 @@ and also provides the base for the FlightGear Flight Simulator.")
(native-inputs (native-inputs
`(("cppunit" ,cppunit) `(("cppunit" ,cppunit)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("qttools" ,qttools) ("qttools-5" ,qttools-5)
("flightgear-data" ("flightgear-data"
,(origin ,(origin
(method url-fetch) (method url-fetch)
@ -9407,7 +9458,7 @@ play with up to four players simultaneously. It has network support.")
("sdl" ,(sdl-union ("sdl" ,(sdl-union
(list sdl2 sdl2-mixer sdl2-net sdl2-ttf sdl2-image))))) (list sdl2 sdl2-mixer sdl2-net sdl2-ttf sdl2-image)))))
(native-inputs (native-inputs
(list clang-9 ghc pkg-config qttools)) (list clang-9 ghc pkg-config qttools-5))
(home-page "https://hedgewars.org/") (home-page "https://hedgewars.org/")
(synopsis "Turn-based artillery game featuring fighting hedgehogs") (synopsis "Turn-based artillery game featuring fighting hedgehogs")
(description (description
@ -9740,54 +9791,51 @@ Skorl. Maybe it would be an idea to try and escape...")
file-prefix release ".zip")) file-prefix release ".zip"))
(sha256 (sha256
(base32 hash)))) (base32 hash))))
(build-system trivial-build-system) (build-system copy-build-system)
(arguments (arguments
`(#:modules ((guix build utils)) (list
#:builder #:install-plan
(begin #~'(("queen.1c" #$(string-append "share/" name "/"))
(use-modules (guix build utils)) (#$name "bin/")
(let* ((out (assoc-ref %outputs "out")) (#$(string-append name ".desktop") "share/applications/")
(share (string-append out "/share")) ("." #$(string-append "share/doc/" name "-" version)
(data (string-append share "/" ,name)) #:include-regexp ("README" "readme")))
(apps (string-append share "/applications")) #:phases
(bin (string-append out "/bin")) #~(modify-phases %standard-phases
(executable (string-append bin "/" ,name)) (add-before 'install 'build
(scummvm (assoc-ref %build-inputs "scummvm"))) (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((unzip (search-input-file %build-inputs "/bin/unzip"))) (with-output-to-file #$name
(invoke unzip "-j" (assoc-ref %build-inputs "source")))
(let ((doc (string-append share "/doc/" ,name "-" ,version)))
(install-file "readme.txt" doc))
(install-file "queen.1c" data)
(mkdir-p bin)
(let ((bash (assoc-ref %build-inputs "bash")))
(with-output-to-file executable
(lambda () (lambda ()
(format #t "#!~a/bin/bash~%" bash) (format #t "#!~a~%" (search-input-file inputs "bin/sh"))
(format #t "exec ~a/bin/scummvm -q fr -p ~a queen~%" (format #t "exec ~a -q ~a -p ~a queen~%"
scummvm data)))) (search-input-file inputs "bin/scummvm")
(chmod executable #o755) #$language
;; Create desktop file. There is no dedicated (string-append (assoc-ref outputs "out")
;; icon for the game, so we borrow SCUMMVM's. "/share/" #$name))))
(mkdir-p apps) (chmod #$name #o755)
(with-output-to-file (string-append apps "/" ,name ".desktop") (with-output-to-file #$(string-append name ".desktop")
(lambda _ (lambda ()
(format #t (format
#t
"[Desktop Entry]~@ "[Desktop Entry]~@
Name=Flight of the Amazon Queen~@ Name=Flight of the Amazon Queen~@
GenericName=Queen~@ GenericName=Queen~@
Comment=Embark on a quest to rescue a kidnapped princess and in the process, discover the true sinister intentions of a suspiciously located Lederhosen company~@ Comment=Embark on a quest to rescue a kidnapped princess~
Comment[de]=Begib dich auf ein Abenteuer, um eine entführte Prinzessin zu retten und entdecke die wahren, finsteren Absichten eines verdächtig erscheinenden Lederhosen-Unternehmens~@ and in the process, discover the true sinister intentions~
of a suspiciously located Lederhosen company~@
Comment[de]=Begib dich auf ein Abenteuer, um eine entführte~
Prinzessin zu retten und entdecke die wahren, finsteren~
Absichten eines verdächtig erscheinenden~
Lederhosen-Unternehmens~@
Type=Application~@ Type=Application~@
Exec=~a~@ Exec=~a~@
Icon=~a/share/icons/hicolor/scalable/apps/scummvm.svg~@ Icon=~a/share/icons/hicolor/scalable/apps/scummvm.svg~@
Categories=AdventureGame;Game;RolePlaying;~@ Categories=AdventureGame;Game;RolePlaying;~@
Keywords=adventure;game;roleplaying;fantasy;~%" Keywords=adventure;game;roleplaying;fantasy;~%"
executable scummvm)))) (string-append (assoc-ref outputs "out") "/bin/" #$name)
#t))) (search-input-file inputs "bin/scummvm")))))))))
(native-inputs (native-inputs (list unzip))
(list unzip)) (inputs (list bash scummvm))
(inputs
(list bash scummvm))
(home-page "https://www.scummvm.org/") (home-page "https://www.scummvm.org/")
(synopsis "Classic 2D point and click adventure game") (synopsis "Classic 2D point and click adventure game")
(description "Flight of the Amazon Queen is a 2D point-and-click (description "Flight of the Amazon Queen is a 2D point-and-click
@ -10153,7 +10201,7 @@ can be downloaded from @url{https://zero.sjeng.org/best-network}.")
(native-inputs (native-inputs
(list pkg-config)) (list pkg-config))
(inputs (inputs
(list qtbase-5 qtmultimedia qtsvg)) (list qtbase-5 qtmultimedia-5 qtsvg-5))
(arguments (arguments
'(#:phases '(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
@ -10247,9 +10295,9 @@ can be downloaded from @url{https://zero.sjeng.org/best-network}.")
libkdegames libkdegames
python-wrapper python-wrapper
qtbase-5 qtbase-5
qtmultimedia qtmultimedia-5
qtdeclarative qtdeclarative-5
qtsvg)) qtsvg-5))
(home-page "https://games.kde.org/") (home-page "https://games.kde.org/")
(synopsis "Stamp drawing toy") (synopsis "Stamp drawing toy")
(description "KTuberling is a drawing toy intended for small children and (description "KTuberling is a drawing toy intended for small children and
@ -10294,8 +10342,8 @@ This package is part of the KDE games module.")
kxmlgui kxmlgui
libkdegames libkdegames
qtbase-5 qtbase-5
qtdeclarative qtdeclarative-5
qtsvg)) qtsvg-5))
(home-page "https://games.kde.org/") (home-page "https://games.kde.org/")
(synopsis "Number logic game") (synopsis "Number logic game")
(description "Picmi is a number logic game in which cells in a grid have (description "Picmi is a number logic game in which cells in a grid have
@ -10332,7 +10380,7 @@ This package is part of the KDE games module.")
ktextwidgets ktextwidgets
libkdegames libkdegames
qtbase-5 qtbase-5
qtdeclarative)) qtdeclarative-5))
(home-page "https://games.kde.org/") (home-page "https://games.kde.org/")
(synopsis "Miniature golf game") (synopsis "Miniature golf game")
(description "Kolf is a miniature golf game for one to ten players. The (description "Kolf is a miniature golf game for one to ten players. The
@ -10376,7 +10424,7 @@ This package is part of the KDE games module.")
ki18n ki18n
kwidgetsaddons kwidgetsaddons
qtbase-5 qtbase-5
qtsvg)) qtsvg-5))
(home-page "https://games.kde.org/") (home-page "https://games.kde.org/")
(synopsis "Shared library for kmahjongg and kshisen") (synopsis "Shared library for kmahjongg and kshisen")
(description "Shared library and common files for kmahjongg, kshisen and (description "Shared library and common files for kmahjongg, kshisen and
@ -10408,8 +10456,8 @@ other Mah Jongg like games.")
libkdegames libkdegames
libkmahjongg libkmahjongg
qtbase-5 qtbase-5
qtdeclarative qtdeclarative-5
qtsvg)) qtsvg-5))
(home-page "https://games.kde.org/") (home-page "https://games.kde.org/")
(synopsis "Tile laying patience") (synopsis "Tile laying patience")
(description "In KMahjongg the tiles are scrambled and staked on top of (description "In KMahjongg the tiles are scrambled and staked on top of
@ -10451,7 +10499,7 @@ This package is part of the KDE games module.")
libkdegames libkdegames
libkmahjongg libkmahjongg
qtbase-5 qtbase-5
qtdeclarative)) qtdeclarative-5))
(home-page "https://games.kde.org/") (home-page "https://games.kde.org/")
(synopsis "Shisen-Sho solitaire game") (synopsis "Shisen-Sho solitaire game")
(description "KShisen is a solitaire-like game played using the standard (description "KShisen is a solitaire-like game played using the standard
@ -10506,7 +10554,7 @@ This package is part of the KDE games module.")
python-pyqt python-pyqt
python-zope-interface python-zope-interface
qtbase-5 qtbase-5
qtsvg)) qtsvg-5))
(home-page "https://games.kde.org/") (home-page "https://games.kde.org/")
(synopsis "Classical Mah Jongg game for 4 players") (synopsis "Classical Mah Jongg game for 4 players")
(description "Kajongg is the ancient Chinese board game for 4 players. (description "Kajongg is the ancient Chinese board game for 4 players.
@ -10548,7 +10596,7 @@ This package is part of the KDE games module.")
kxmlgui kxmlgui
libkdegames libkdegames
qtbase-5 qtbase-5
qtdeclarative)) qtdeclarative-5))
(home-page "https://games.kde.org/") (home-page "https://games.kde.org/")
(synopsis "Breakout like game") (synopsis "Breakout like game")
(description "KBreakout is similar to the classics breakout and xboing, (description "KBreakout is similar to the classics breakout and xboing,
@ -10586,7 +10634,7 @@ This package is part of the KDE games module.")
kxmlgui kxmlgui
libkdegames libkdegames
qtbase-5 qtbase-5
qtdeclarative)) qtdeclarative-5))
(home-page "https://games.kde.org/") (home-page "https://games.kde.org/")
(synopsis "Classical mine sweeper game") (synopsis "Classical mine sweeper game")
(description "KMines is a classic Minesweeper game. The idea is to (description "KMines is a classic Minesweeper game. The idea is to
@ -10622,8 +10670,8 @@ This package is part of the KDE games module.")
kxmlgui kxmlgui
libkdegames libkdegames
qtbase-5 qtbase-5
qtdeclarative qtdeclarative-5
qtsvg)) qtsvg-5))
(home-page "https://games.kde.org/") (home-page "https://games.kde.org/")
(synopsis "Simple turn-based strategy game") (synopsis "Simple turn-based strategy game")
(description "Konquest is the KDE version of Gnu-Lactic Konquest. Players (description "Konquest is the KDE version of Gnu-Lactic Konquest. Players
@ -10661,8 +10709,8 @@ This package is part of the KDE games module.")
kxmlgui kxmlgui
libkdegames libkdegames
qtbase-5 qtbase-5
qtdeclarative qtdeclarative-5
qtsvg)) qtsvg-5))
(home-page "https://games.kde.org/") (home-page "https://games.kde.org/")
(synopsis "Jezzball arcade game") (synopsis "Jezzball arcade game")
(description "KBounce is a single player arcade game with the elements of (description "KBounce is a single player arcade game with the elements of
@ -10699,8 +10747,8 @@ This package is part of the KDE games module.")
kxmlgui kxmlgui
libkdegames libkdegames
qtbase-5 qtbase-5
qtdeclarative qtdeclarative-5
qtsvg)) qtsvg-5))
(home-page "https://games.kde.org/") (home-page "https://games.kde.org/")
(synopsis "Single player falling blocks puzzle game") (synopsis "Single player falling blocks puzzle game")
(description "KBlocks is the classic Tetris-like falling blocks game. (description "KBlocks is the classic Tetris-like falling blocks game.
@ -10742,8 +10790,8 @@ This package is part of the KDE games module.")
libkdegames libkdegames
glu glu
qtbase-5 qtbase-5
qtdeclarative qtdeclarative-5
qtsvg)) qtsvg-5))
(home-page "https://games.kde.org/") (home-page "https://games.kde.org/")
(synopsis "Sudoku puzzle game and solver") (synopsis "Sudoku puzzle game and solver")
(description "KSudoku is a Sudoku game and solver, supporting a range of (description "KSudoku is a Sudoku game and solver, supporting a range of
@ -10798,7 +10846,7 @@ This package is part of the KDE games module.")
kxmlgui kxmlgui
libkdegames libkdegames
qtbase-5 qtbase-5
qtdeclarative)) qtdeclarative-5))
(home-page "https://games.kde.org/") (home-page "https://games.kde.org/")
(synopsis "Place 5 equal pieces together, but wait, there are 3 new ones") (synopsis "Place 5 equal pieces together, but wait, there are 3 new ones")
(description "KLines is a simple but highly addictive one player game. (description "KLines is a simple but highly addictive one player game.
@ -10841,7 +10889,7 @@ This package is part of the KDE games module.")
kxmlgui kxmlgui
libkdegames libkdegames
qtbase-5 qtbase-5
qtdeclarative)) qtdeclarative-5))
(home-page "https://games.kde.org/") (home-page "https://games.kde.org/")
(synopsis "Action and puzzle solving game") (synopsis "Action and puzzle solving game")
(description "KGoldrunner is an action game where the hero runs through a (description "KGoldrunner is an action game where the hero runs through a
@ -10884,7 +10932,7 @@ This package is part of the KDE games module.")
kxmlgui kxmlgui
libkdegames libkdegames
qtbase-5 qtbase-5
qtdeclarative)) qtdeclarative-5))
(home-page "https://games.kde.org/") (home-page "https://games.kde.org/")
(synopsis "Three-in-a-row game") (synopsis "Three-in-a-row game")
(description "KDiamond is a three-in-a-row game like Bejeweled. It (description "KDiamond is a three-in-a-row game like Bejeweled. It
@ -10919,8 +10967,8 @@ This package is part of the KDE games module.")
kxmlgui kxmlgui
libkdegames libkdegames
qtbase-5 qtbase-5
qtdeclarative qtdeclarative-5
qtsvg)) qtsvg-5))
(home-page "https://games.kde.org/") (home-page "https://games.kde.org/")
(synopsis "Place 4 pieces in a row") (synopsis "Place 4 pieces in a row")
(description "KFourInLine is a board game for two players based on the (description "KFourInLine is a board game for two players based on the
@ -10958,8 +11006,8 @@ This package is part of the KDE games module.")
kxmlgui kxmlgui
libkdegames libkdegames
qtbase-5 qtbase-5
qtdeclarative qtdeclarative-5
qtsvg)) qtsvg-5))
(home-page "https://games.kde.org/") (home-page "https://games.kde.org/")
(synopsis "Find atoms in a grid by shooting electrons") (synopsis "Find atoms in a grid by shooting electrons")
(description "KBlackbox is a game of hide and seek played on a grid of (description "KBlackbox is a game of hide and seek played on a grid of
@ -10999,7 +11047,7 @@ This package is part of the KDE games module.")
kxmlgui kxmlgui
libkdegames libkdegames
qtbase-5 qtbase-5
qtdeclarative)) qtdeclarative-5))
(home-page "https://games.kde.org/") (home-page "https://games.kde.org/")
(synopsis "Turn the board pieces to get all computers connected") (synopsis "Turn the board pieces to get all computers connected")
(description "KNetWalk is a small game where you have to build up a (description "KNetWalk is a small game where you have to build up a
@ -11037,7 +11085,7 @@ This package is part of the KDE games module.")
kxmlgui kxmlgui
libkdegames libkdegames
qtbase-5 qtbase-5
qtdeclarative)) qtdeclarative-5))
(home-page "https://games.kde.org/") (home-page "https://games.kde.org/")
(synopsis "Arcade bombing game") (synopsis "Arcade bombing game")
(description "Bomber is a single player arcade game. (description "Bomber is a single player arcade game.
@ -11081,8 +11129,8 @@ This package is part of the KDE games module.")
kxmlgui kxmlgui
libkdegames libkdegames
qtbase-5 qtbase-5
qtdeclarative qtdeclarative-5
qtsvg)) qtsvg-5))
(home-page "https://games.kde.org/") (home-page "https://games.kde.org/")
(synopsis "Bomberman clone") (synopsis "Bomberman clone")
(description "Granatier is a clone of the classic Bomberman game, (description "Granatier is a clone of the classic Bomberman game,
@ -11117,8 +11165,8 @@ This package is part of the KDE games module.")
phonon phonon
qca qca
qtbase-5 qtbase-5
qtdeclarative qtdeclarative-5
qtsvg qtsvg-5
zlib)) zlib))
(home-page "https://games.kde.org/") (home-page "https://games.kde.org/")
(synopsis "Computerized version of the well known strategy board game (synopsis "Computerized version of the well known strategy board game
@ -11178,8 +11226,8 @@ This package is part of the KDE games module.")
kxmlgui kxmlgui
libkdegames libkdegames
qtbase-5 qtbase-5
qtdeclarative qtdeclarative-5
qtsvg qtsvg-5
shared-mime-info)) shared-mime-info))
(home-page "https://games.kde.org/") (home-page "https://games.kde.org/")
(synopsis "Jigsaw puzzle game") (synopsis "Jigsaw puzzle game")
@ -11219,7 +11267,7 @@ This package is part of the KDE games module.")
kxmlgui kxmlgui
libkdegames libkdegames
qtbase-5 qtbase-5
qtdeclarative)) qtdeclarative-5))
(home-page "https://games.kde.org/") (home-page "https://games.kde.org/")
(synopsis "Yahtzee dice game") (synopsis "Yahtzee dice game")
(description "Kiriki is an addictive and fun dice game, designed to be (description "Kiriki is an addictive and fun dice game, designed to be
@ -11258,8 +11306,8 @@ This package is part of the KDE games module.")
kxmlgui kxmlgui
libkdegames libkdegames
qtbase-5 qtbase-5
qtdeclarative qtdeclarative-5
qtsvg)) qtsvg-5))
(home-page "https://games.kde.org/") (home-page "https://games.kde.org/")
(synopsis "Go board game") (synopsis "Go board game")
(description "Kigo is an open-source implementation of the popular Go (description "Kigo is an open-source implementation of the popular Go
@ -11303,8 +11351,8 @@ This package is part of the KDE games module.")
kxmlgui kxmlgui
libkdegames libkdegames
qtbase-5 qtbase-5
qtdeclarative qtdeclarative-5
qtsvg)) qtsvg-5))
(home-page "https://games.kde.org/") (home-page "https://games.kde.org/")
(synopsis "Game based on Rubik's Cube") (synopsis "Game based on Rubik's Cube")
(description "Kubrick is a game based on the Rubik's Cube puzzle. (description "Kubrick is a game based on the Rubik's Cube puzzle.
@ -11343,8 +11391,8 @@ This package is part of the KDE games module.")
kxmlgui kxmlgui
libkdegames libkdegames
qtbase-5 qtbase-5
qtdeclarative qtdeclarative-5
qtsvg)) qtsvg-5))
(home-page "https://games.kde.org/") (home-page "https://games.kde.org/")
(synopsis "Lieutnant Skat card game") (synopsis "Lieutnant Skat card game")
(description "Lieutnant Skat (from German \"Offiziersskat\") is a fun and (description "Lieutnant Skat (from German \"Offiziersskat\") is a fun and
@ -11381,8 +11429,8 @@ This package is part of the KDE games module.")
kxmlgui kxmlgui
libkdegames libkdegames
qtbase-5 qtbase-5
qtdeclarative qtdeclarative-5
qtsvg)) qtsvg-5))
(home-page "https://games.kde.org/") (home-page "https://games.kde.org/")
(synopsis "Pac-Man clone") (synopsis "Pac-Man clone")
(description "Kapman is a clone of the well known game Pac-Man. (description "Kapman is a clone of the well known game Pac-Man.
@ -11420,8 +11468,8 @@ This package is part of the KDE games module.")
kxmlgui kxmlgui
libkdegames libkdegames
qtbase-5 qtbase-5
qtdeclarative qtdeclarative-5
qtsvg)) qtsvg-5))
(home-page "https://games.kde.org/") (home-page "https://games.kde.org/")
(synopsis "Two player game with shooting spaceships flying around a sun") (synopsis "Two player game with shooting spaceships flying around a sun")
(description "KSpaceduel is a space battle game for one or two players, (description "KSpaceduel is a space battle game for one or two players,
@ -11453,8 +11501,8 @@ This package is part of the KDE games module.")
kxmlgui kxmlgui
libkdegames libkdegames
qtbase-5 qtbase-5
qtdeclarative qtdeclarative-5
qtsvg)) qtsvg-5))
(home-page "https://games.kde.org/") (home-page "https://games.kde.org/")
(synopsis "Classic pen and paper game: five in a line") (synopsis "Classic pen and paper game: five in a line")
(description "Bovo is a Gomoku (from Japanese 五目並べ - lit. \"five (description "Bovo is a Gomoku (from Japanese 五目並べ - lit. \"five
@ -11492,7 +11540,7 @@ This package is part of the KDE games module.")
kxmlgui kxmlgui
libkdegames libkdegames
qtbase-5 qtbase-5
qtdeclarative)) qtdeclarative-5))
(home-page "https://games.kde.org/") (home-page "https://games.kde.org/")
(synopsis "Port of the classic BSD console game robots") (synopsis "Port of the classic BSD console game robots")
(description "Killbots is a simple game of evading killer robots. (description "Killbots is a simple game of evading killer robots.
@ -11533,8 +11581,8 @@ This package is part of the KDE games module.")
kxmlgui kxmlgui
libkdegames libkdegames
qtbase-5 qtbase-5
qtdeclarative qtdeclarative-5
qtsvg)) qtsvg-5))
(home-page "https://games.kde.org/") (home-page "https://games.kde.org/")
(synopsis "Snake race played against the computer") (synopsis "Snake race played against the computer")
(description "KSnakeDuel is a fast action game where you steer a snake (description "KSnakeDuel is a fast action game where you steer a snake
@ -11570,7 +11618,7 @@ This package is part of the KDE games module.")
kxmlgui kxmlgui
libkdegames libkdegames
qtbase-5 qtbase-5
qtdeclarative)) qtdeclarative-5))
(home-page "https://games.kde.org/") (home-page "https://games.kde.org/")
(synopsis "Simple ball dodging game") (synopsis "Simple ball dodging game")
(description "In Kollision you use mouse to control a small blue ball in a (description "In Kollision you use mouse to control a small blue ball in a
@ -11610,7 +11658,7 @@ This package is part of the KDE games module.")
kxmlgui kxmlgui
libkdegames libkdegames
qtbase-5 qtbase-5
qtdeclarative)) qtdeclarative-5))
(home-page "https://games.kde.org/") (home-page "https://games.kde.org/")
(synopsis "Battleship board game with built-in game server") (synopsis "Battleship board game with built-in game server")
(description "KBattleship is a Battle Ship game for KDE. (description "KBattleship is a Battle Ship game for KDE.
@ -11649,8 +11697,8 @@ This package is part of the KDE games module.")
kxmlgui kxmlgui
libkdegames libkdegames
qtbase-5 qtbase-5
qtdeclarative qtdeclarative-5
qtsvg)) qtsvg-5))
(home-page "https://games.kde.org/") (home-page "https://games.kde.org/")
(synopsis "Old reversi board game, also known as othello") (synopsis "Old reversi board game, also known as othello")
(description "KReversi is a simple one player strategy game played (description "KReversi is a simple one player strategy game played
@ -11690,7 +11738,7 @@ This package is part of the KDE games module.")
kxmlgui kxmlgui
libkdegames libkdegames
qtbase-5 qtbase-5
qtdeclarative)) qtdeclarative-5))
(home-page "https://games.kde.org/") (home-page "https://games.kde.org/")
(synopsis "Dots and Boxes game") (synopsis "Dots and Boxes game")
(description "KSquares is an implementation of the popular paper based (description "KSquares is an implementation of the popular paper based
@ -11726,8 +11774,8 @@ This package is part of the KDE games module.")
kxmlgui kxmlgui
libkdegames libkdegames
qtbase-5 qtbase-5
qtdeclarative qtdeclarative-5
qtsvg)) qtsvg-5))
(home-page "https://games.kde.org/") (home-page "https://games.kde.org/")
(synopsis "Simple tactical game for number-crunchers") (synopsis "Simple tactical game for number-crunchers")
(description "KJumpingcube is a simple tactical game for one or two (description "KJumpingcube is a simple tactical game for one or two
@ -11883,9 +11931,9 @@ and chess engines.")
(base32 "01fjchil2h6ry2ywr0dwjw2g7zd29580cr4c74d5z74h999lp6nh")))) (base32 "01fjchil2h6ry2ywr0dwjw2g7zd29580cr4c74d5z74h999lp6nh"))))
(build-system qt-build-system) (build-system qt-build-system)
(native-inputs (native-inputs
(list qttools)) (list qttools-5))
(inputs (inputs
(list qtbase-5 qtmultimedia qtspeech qtsvg zlib)) (list qtbase-5 qtmultimedia-5 qtspeech qtsvg-5 zlib))
(arguments (arguments
`(#:tests? #f `(#:tests? #f
#:phases #:phases

12
gnu/packages/gdb.scm
View file

@ -149,6 +149,18 @@ the program is running to try to fix bugs. It can be used to debug programs
written in C, C++, Ada, Objective-C, Pascal and more.") written in C, C++, Ada, Objective-C, Pascal and more.")
(license gpl3+))) (license gpl3+)))
(define-public gdb-12
(package
(inherit gdb-11)
(version "12.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/gdb/gdb-"
version ".tar.xz"))
(sha256
(base32
"1vczsqcbh5y0gx7qrclpna0qzx26sk7lra6y8qzxam1biyzr65qf"))))))
(define-public gdb (define-public gdb
;; This is the fixed version that packages depend on. Update it rarely ;; This is the fixed version that packages depend on. Update it rarely
;; enough to avoid massive rebuilds. ;; enough to avoid massive rebuilds.

20
gnu/packages/geo.scm
View file

@ -1495,7 +1495,7 @@ map display. Downloads map data from a number of websites, including
(string-append "\"" font "/share/fonts/\""))))))) (string-append "\"" font "/share/fonts/\"")))))))
#:tests? #f)) ; no tests #:tests? #f)) ; no tests
(native-inputs (native-inputs
(list qttools)) (list qttools-5))
(inputs (inputs
(list bzip2 (list bzip2
font-liberation font-liberation
@ -1952,16 +1952,16 @@ using the dataset of topographical information collected by
(base32 "184fqmsfzr3b333ssizjk6gvv7mncmygq8dj5r7rsvs5md26z2ys")))) (base32 "184fqmsfzr3b333ssizjk6gvv7mncmygq8dj5r7rsvs5md26z2ys"))))
(build-system qt-build-system) (build-system qt-build-system)
(native-inputs (native-inputs
(list pkg-config qttools)) (list pkg-config qttools-5))
(inputs (inputs
(list gdal (list gdal
libjpeg-turbo libjpeg-turbo
proj proj
qtbase-5 qtbase-5
qtdeclarative qtdeclarative-5
qtlocation qtlocation
qtwebchannel qtwebchannel-5
qtwebengine qtwebengine-5
quazip quazip
routino routino
sqlite ; See wrap phase sqlite ; See wrap phase
@ -2199,7 +2199,7 @@ track your position right from your laptop.")
("zlib" ,zlib))) ("zlib" ,zlib)))
(native-inputs (native-inputs
`(("doxygen" ,doxygen) `(("doxygen" ,doxygen)
("qttools" ,qttools))) ("qttools-5" ,qttools-5)))
(home-page "https://www.openorienteering.org/apps/mapper/") (home-page "https://www.openorienteering.org/apps/mapper/")
(synopsis "OpenOrienteering Mapper (OOM)") (synopsis "OpenOrienteering Mapper (OOM)")
(description (description
@ -2618,11 +2618,11 @@ growing set of geoscientific methods.")
qca qca
qscintilla qscintilla
qtbase-5 qtbase-5
qtdeclarative qtdeclarative-5
qtkeychain qtkeychain
qtlocation qtlocation
qtserialport qtserialport
qtsvg qtsvg-5
qwt qwt
;;("saga" ,saga) ;;("saga" ,saga)
sqlite)) sqlite))
@ -2634,7 +2634,7 @@ growing set of geoscientific methods.")
pkg-config pkg-config
python-mock python-mock
python-nose2 python-nose2
qttools qttools-5
shellcheck shellcheck
xorg-server-for-tests)) xorg-server-for-tests))
(home-page "https://qgis.org") (home-page "https://qgis.org")
@ -2764,7 +2764,7 @@ using third-party geocoders and other data sources.")
python-3 python-3
python-numpy python-numpy
qtbase-5 qtbase-5
qtsvg qtsvg-5
qtxmlpatterns qtxmlpatterns
qwt qwt
zlib)) zlib))

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

@ -305,7 +305,7 @@ takes advantage of modern hardware using OpenGL.")
(define-public gnome-shell-extension-appindicator (define-public gnome-shell-extension-appindicator
(package (package
(name "gnome-shell-extension-appindicator") (name "gnome-shell-extension-appindicator")
(version "33") (version "42")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -314,13 +314,11 @@ takes advantage of modern hardware using OpenGL.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(sha256 (sha256
(base32 (base32
"0qm77s080nbf4gqnfzpwp8a7jf7lliz6fxbsd3lasvrr11pgsk87")) "1lf3aqb924nzhj87rhy2zvm5pcfqcklhfw21m6ic3i7wzd9r7cnc"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system copy-build-system) (build-system meson-build-system)
(arguments (native-inputs (list jq gnu-gettext
`(#:install-plan `(,glib "bin")))
'(("." ,(string-append "share/gnome-shell/extensions/"
"appindicatorsupport@rgcjonas.gmail.com")))))
(synopsis "Adds KStatusNotifierItem support to GNOME Shell") (synopsis "Adds KStatusNotifierItem support to GNOME Shell")
(description "This extension integrates Ubuntu AppIndicators (description "This extension integrates Ubuntu AppIndicators
and KStatusNotifierItems (KDE's successor of the systray) into and KStatusNotifierItems (KDE's successor of the systray) into

160
gnu/packages/gnome.scm
View file

@ -3204,6 +3204,98 @@ the GNOME desktop environment.")
(variable "GLADE_MODULE_SEARCH_PATH") (variable "GLADE_MODULE_SEARCH_PATH")
(files '("lib/glade/modules"))))))) (files '("lib/glade/modules")))))))
(define-public cambalache
(package
(name "cambalache")
(version "0.10.2")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.gnome.org/jpu/cambalache")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1mw5gk98zx03yal3p8slaqwhwkc9p2vnh0cssnmg6ivxsjscqhgz"))))
(build-system meson-build-system)
(arguments
(list
#:glib-or-gtk? #t
#:imported-modules `((guix build python-build-system)
,@%meson-build-system-modules)
#:modules '((guix build meson-build-system)
((guix build python-build-system) #:prefix python:)
(guix build utils))
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'patch-source
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "cambalache/cmb_view.py"
(("GLib\\.find_program_in_path\\('(.*)'\\)" all cmd)
(string-append "'"
(search-input-file inputs
(string-append "/bin/" cmd))
"'")))))
(add-after 'unpack 'patch-build
(lambda _
(substitute* "postinstall.py"
(("update-desktop-database") "true"))))
(add-after 'wrap 'python-wrap (assoc-ref python:%standard-phases 'wrap))
(delete 'check)
(add-after 'install 'add-install-to-pythonpath
(assoc-ref python:%standard-phases 'add-install-to-pythonpath))
(add-after 'add-install-to-pythonpath 'pre-check
(lambda _
(system "Xvfb :1 &")
(setenv "DISPLAY" ":1")))
(add-after 'pre-check 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(with-directory-excursion ".."
(invoke "python3" "-m" "pytest")))))
(add-after 'glib-or-gtk-wrap 'wrap-typelib
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(for-each
(lambda (prog)
(unless (wrapped-program? prog)
(wrap-program prog
`("GI_TYPELIB_PATH" suffix
(,(string-append out "/lib/girepository-1.0")
,(getenv "GI_TYPELIB_PATH")))
;; icons and schemas
`("XDG_DATA_DIRS" suffix
#$(map
(lambda (input)
(file-append (this-package-input input) "/share"))
'("adwaita-icon-theme" "hicolor-icon-theme"
"gsettings-desktop-schemas")))
;; Wrapping GDK_PIXBUF_MODULE_FILE allows Cambalache to
;; load its own icons in pure environments.
`("GDK_PIXBUF_MODULE_FILE" =
(,(getenv "GDK_PIXBUF_MODULE_FILE"))))))
(find-files (string-append out "/bin")))))))))
(inputs (list bash-minimal
adwaita-icon-theme hicolor-icon-theme
gsettings-desktop-schemas
gtk
`(,gtk+ "bin") ; broadwayd
`(,gtk "bin")
libadwaita
libhandy
(librsvg-for-system)
python python-pygobject python-lxml
webkitgtk-with-libsoup2))
(native-inputs (list `(,glib "bin") gobject-introspection
gettext-minimal pkg-config
python-pytest xorg-server-for-tests))
(home-page "https://gitlab.gnome.org/jpu/cambalache")
(synopsis "Rapid application development tool")
(description "Cambalache is a rapid application development (RAD) tool for
Gtk 4 and 3 with a clear model-view-controller (MVC) design and
data model first philosophy.")
(license (list license:lgpl2.1
license:gpl2)))) ; tools
(define-public libcroco (define-public libcroco
(package (package
(name "libcroco") (name "libcroco")
@ -4229,42 +4321,6 @@ engineering.")
"Drawing is a basic image editor aiming at the GNOME desktop.") "Drawing is a basic image editor aiming at the GNOME desktop.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public gnome-themes-standard
(package
(name "gnome-themes-standard")
(version "3.22.3")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/" name "-"
version ".tar.xz"))
(sha256
(base32
"0smmiamrgcgf5sa88bsn8hwmvsyx4gczzs359nwxbkv14b2qgp31"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags
;; Don't create 'icon-theme.cache'.
(let* ((coreutils (assoc-ref %build-inputs "coreutils"))
(true (string-append coreutils "/bin/true")))
(list (string-append "GTK_UPDATE_ICON_CACHE=" true)))))
(inputs
`(("gtk+" ,gtk+)
("gtk+-2" ,gtk+-2)
("librsvg" ,librsvg)
("libxml2" ,libxml2)
("glib" ,glib)))
(native-inputs
`(("intltool" ,intltool)
("glib:bin" ,glib "bin")
("pkg-config" ,pkg-config)))
(home-page "https://launchpad.net/gnome-themes-standard")
(synopsis "Default GNOME 3 themes")
(description
"The default GNOME 3 themes (Adwaita and some accessibility themes).")
(license license:lgpl2.1+)))
(define-public seahorse (define-public seahorse
(package (package
(name "seahorse") (name "seahorse")
@ -8832,7 +8888,7 @@ easy, safe, and automatic.")
(define-public tracker (define-public tracker
(package (package
(name "tracker") (name "tracker")
(version "3.3.1") (version "3.3.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/tracker/" (uri (string-append "mirror://gnome/sources/tracker/"
@ -8840,7 +8896,7 @@ easy, safe, and automatic.")
"tracker-" version ".tar.xz")) "tracker-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1lkf353xvwc0hfyi03aq2qjikx3zmva7r56nxiavy7kqjyygbmjs")))) "0r144kdqxdzs51qn495vablzf1zxkhkk6imrlrzj9wiqwc2gg520"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:glib-or-gtk? #t `(#:glib-or-gtk? #t
@ -8871,7 +8927,8 @@ easy, safe, and automatic.")
(invoke "dbus-run-session" "--" "meson" "test" (invoke "dbus-run-session" "--" "meson" "test"
"--print-errorlogs"))))))) "--print-errorlogs")))))))
(native-inputs (native-inputs
(list `(,glib "bin") (list gettext-minimal
`(,glib "bin")
gobject-introspection gobject-introspection
docbook-xsl docbook-xsl
docbook-xml docbook-xml
@ -8881,7 +8938,6 @@ easy, safe, and automatic.")
cmake-minimal cmake-minimal
python-pygobject python-pygobject
gtk-doc/stable gtk-doc/stable
intltool
dbus dbus
pkg-config pkg-config
python python
@ -9473,7 +9529,6 @@ world.")
("dconf" ,dconf) ("dconf" ,dconf)
("desktop-file-utils" ,desktop-file-utils) ("desktop-file-utils" ,desktop-file-utils)
("gnome-default-applications" ,gnome-default-applications) ("gnome-default-applications" ,gnome-default-applications)
("gnome-themes-standard" ,gnome-themes-standard)
("gst-plugins-base" ,gst-plugins-base) ("gst-plugins-base" ,gst-plugins-base)
("gst-plugins-good" ,gst-plugins-good) ("gst-plugins-good" ,gst-plugins-good)
("gucharmap" ,gucharmap) ("gucharmap" ,gucharmap)
@ -9944,7 +9999,7 @@ functionality and behavior.")
(define-public folks (define-public folks
(package (package
(name "folks") (name "folks")
(version "0.15.3") (version "0.15.5")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -9953,7 +10008,7 @@ functionality and behavior.")
"folks-" version ".tar.xz")) "folks-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"19a4qp9ry8y24jx1v5456qn9lnw843571vkkah3bxx4ky3x3gmr1")))) "11lhfn6b7gml4ckj2dkm6g889j21wpvj90srwjp85k9hcf4qmzqg"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
'(#:phases '(#:phases
@ -9972,10 +10027,10 @@ functionality and behavior.")
readline readline
telepathy-glib)) telepathy-glib))
(native-inputs (native-inputs
(list `(,glib "bin") (list gettext-minimal
`(,glib "bin")
gobject-introspection gobject-introspection
python-dbusmock python-dbusmock
intltool
pkg-config pkg-config
python python
vala)) vala))
@ -10296,7 +10351,7 @@ Bluefish supports many programming and markup languages.")
(define-public gnome-system-monitor (define-public gnome-system-monitor
(package (package
(name "gnome-system-monitor") (name "gnome-system-monitor")
(version "41.0") (version "42.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -10305,7 +10360,7 @@ Bluefish supports many programming and markup languages.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0pwy2c95rm0ym3x5pr6rqg7zh58crjxyns4r52q99ds937349z67")))) "1p3mq32pfd9260aql5nys806g0c4nrswacwqs8ms40920ci9s8qk"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
'(#:glib-or-gtk? #t '(#:glib-or-gtk? #t
@ -10851,7 +10906,7 @@ configurable file renaming.")
(define-public workrave (define-public workrave
(package (package
(name "workrave") (name "workrave")
(version "1.10.48") (version "1.10.50")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -10862,7 +10917,7 @@ configurable file renaming.")
version))))) version)))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0qcknxylk9mr0xzszsd1rkgh2zpnix20m998dfclkm9x8zh9pvyr")))) (base32 "0fj3fqmdn4nsjgvbbvzpxw2mgiihcr1zpb08amg2p6hg9n11y9bx"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(arguments (arguments
;; The only tests are maintainer tests (in po/), which fail. ;; The only tests are maintainer tests (in po/), which fail.
@ -11487,6 +11542,9 @@ versions of Adwaita, Adwaita-dark and HighContrast themes. It also provides
index files needed for Adwaita to be used outside of GNOME.") index files needed for Adwaita to be used outside of GNOME.")
(license license:lgpl2.1+))) (license license:lgpl2.1+)))
(define-public gnome-themes-standard
(deprecated-package "gnome-themes-standard" gnome-themes-extra))
(define-public gnote (define-public gnote
(package (package
(name "gnote") (name "gnote")
@ -12345,7 +12403,7 @@ profiler via Sysprof, debugging support, and more.")
(define-public komikku (define-public komikku
(package (package
(name "komikku") (name "komikku")
(version "0.39.0") (version "0.40.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -12355,7 +12413,7 @@ profiler via Sysprof, debugging support, and more.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1g765kbgimfpvma67j1gscj046n2q9a9nr2pczlw65qwlm0418c5")))) "12l6qks4kwi75ss61yx1f515nb30d987qw3yhi4a36w5xz721p5z"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:glib-or-gtk? #t `(#:glib-or-gtk? #t

10
gnu/packages/gnupg.scm
View file

@ -285,6 +285,7 @@ compatible to GNU Pth.")
;; Note2: 2.2.33 currently suffers from regressions, so do not update to it ;; Note2: 2.2.33 currently suffers from regressions, so do not update to it
;; (see: https://dev.gnupg.org/T5742). ;; (see: https://dev.gnupg.org/T5742).
(version "2.2.32") (version "2.2.32")
(replacement gnupg/fixed)
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-" version (uri (string-append "ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-" version
@ -352,6 +353,15 @@ libskba (working with X.509 certificates and CMS data).")
(properties '((ftp-server . "ftp.gnupg.org") (properties '((ftp-server . "ftp.gnupg.org")
(ftp-directory . "/gcrypt/gnupg"))))) (ftp-directory . "/gcrypt/gnupg")))))
(define gnupg/fixed
(package
(inherit gnupg)
(source (origin
(inherit (package-source gnupg))
(patches
(append (origin-patches (package-source gnupg))
(search-patches "gnupg-CVE-2022-34903.patch")))))))
(define-public gnupg-1 (define-public gnupg-1
(package (inherit gnupg) (package (inherit gnupg)
(version "1.4.23") (version "1.4.23")

8
gnu/packages/gnuzilla.scm
View file

@ -972,11 +972,11 @@ standards of the IceCat project.")
(cpe-version . ,(first (string-split version #\-))))))) (cpe-version . ,(first (string-split version #\-)))))))
;; Update this together with icecat! ;; Update this together with icecat!
(define %icedove-build-id "20220624000000") ;must be of the form YYYYMMDDhhmmss (define %icedove-build-id "20220726000000") ;must be of the form YYYYMMDDhhmmss
(define-public icedove (define-public icedove
(package (package
(name "icedove") (name "icedove")
(version "91.11.0") (version "91.12.0")
(source icecat-source) (source icecat-source)
(properties (properties
`((cpe-name . "thunderbird_esr"))) `((cpe-name . "thunderbird_esr")))
@ -1255,7 +1255,7 @@ standards of the IceCat project.")
;; in the Thunderbird release tarball. We don't use the release ;; in the Thunderbird release tarball. We don't use the release
;; tarball because it duplicates the Icecat sources and only adds the ;; tarball because it duplicates the Icecat sources and only adds the
;; "comm" directory, which is provided by this repository. ;; "comm" directory, which is provided by this repository.
,(let ((changeset "da48e7ecf800ec7761a3b6e0ca81e0c90adc30f7")) ,(let ((changeset "bd3da11e22d0070699026cb5f4e31b44b35580f0"))
(origin (origin
(method hg-fetch) (method hg-fetch)
(uri (hg-reference (uri (hg-reference
@ -1264,7 +1264,7 @@ standards of the IceCat project.")
(file-name (string-append "thunderbird-" version "-checkout")) (file-name (string-append "thunderbird-" version "-checkout"))
(sha256 (sha256
(base32 (base32
"0lg8z0zk05w8jah364lm7vkc95j1nkg93gf46byz0kd4nslg05nx"))))) "14na1n37sqjqcxmhbp0c56a1j70gnyqgrhlrk5jkblml47x4i35w")))))
("cargo" ,rust "cargo") ("cargo" ,rust "cargo")
("clang" ,clang) ("clang" ,clang)
("llvm" ,llvm) ("llvm" ,llvm)

6
gnu/packages/gps.scm
View file

@ -84,7 +84,7 @@
(inputs (inputs
(list expat libusb qtbase-5 zlib)) (list expat libusb qtbase-5 zlib))
(native-inputs (native-inputs
(list which qttools libxml2)) ;'xmllint' needed for the KML tests (list which qttools-5 libxml2)) ;'xmllint' needed for the KML tests
(home-page "https://www.gpsbabel.org/") (home-page "https://www.gpsbabel.org/")
(synopsis "Convert and exchange data with GPS and map programs") (synopsis "Convert and exchange data with GPS and map programs")
(description (description
@ -194,9 +194,9 @@ coordinates as well as partial support for adjustments in global coordinate syst
(string-append "PREFIX=" (string-append "PREFIX="
(assoc-ref outputs "out")))))))) (assoc-ref outputs "out"))))))))
(inputs (inputs
(list qtbase-5 qtlocation qtsvg)) (list qtbase-5 qtlocation qtsvg-5))
(native-inputs (native-inputs
(list qttools)) (list qttools-5))
(home-page "https://www.gpxsee.org") (home-page "https://www.gpxsee.org")
(synopsis "GPS log file viewer and analyzer") (synopsis "GPS log file viewer and analyzer")
(description (description

130
gnu/packages/graphics.scm
View file

@ -31,6 +31,7 @@
;;; Copyright © 2022 John Kehayias <john.kehayias@protonmail.com> ;;; Copyright © 2022 John Kehayias <john.kehayias@protonmail.com>
;;; Copyright © 2022 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2022 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2022 Tobias Kortkamp <tobias.kortkamp@gmail.com> ;;; Copyright © 2022 Tobias Kortkamp <tobias.kortkamp@gmail.com>
;;; Copyright © 2022 Paul A. Patience <paul@apatience.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -584,6 +585,45 @@ vertices, sorting by primitive type, merging of redundant materials and many
more.") more.")
(license license:bsd-3))) (license license:bsd-3)))
(define-public mikktspace
;; The latest commit is used as there is no release.
(let ((commit "3e895b49d05ea07e4c2133156cfa94369e19e409")
(revision "0"))
(package
(name "mikktspace")
(version (git-version "0.0.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/mmikk/MikkTSpace")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1rjh9zflx51hdhnfadal87v4hhkrbprkv692hjkg9wkxx0ch39zi"))))
(build-system gnu-build-system)
(arguments
(list #:tests? #f
#:phases
#~(modify-phases %standard-phases
(delete 'configure)
(replace 'build
(lambda* (#:key make-flags parallel-build? #:allow-other-keys)
(invoke #$(cc-for-target) "mikktspace.c" "-O2" "-g" "-fPIC"
"-shared" "-o" "libmikktspace.so")))
(replace 'install
(lambda _
(install-file "mikktspace.h"
(string-append #$output "/include"))
(install-file "libmikktspace.so"
(string-append #$output "/lib")))))))
(home-page "http://www.mikktspace.com/")
(synopsis "Library for a common standard for tangent spaces")
(description
"This package provides a common standard tangent space library used in
baking tools to produce normal maps.")
(license license:zlib))))
(define-public openshadinglanguage (define-public openshadinglanguage
(package (package
(name "openshadinglanguage") (name "openshadinglanguage")
@ -810,6 +850,20 @@ basic geometries.")
;; https://gitlab.com/inkscape/inkscape/issues/784). ;; https://gitlab.com/inkscape/inkscape/issues/784).
(license license:gpl3+))) (license license:gpl3+)))
(define-public lib2geom-1.2
(package
(inherit lib2geom)
(version "1.2")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.com/inkscape/lib2geom")
(commit version)))
(file-name (git-file-name "lib2geom" version))
(sha256
(base32
"0dq981g894hmvhd6rmfl1w32mksg9hpvpjs1qvfxrnz87rhkknj8"))))))
(define-public python-booleanoperations (define-public python-booleanoperations
(package (package
(name "python-booleanoperations") (name "python-booleanoperations")
@ -1438,7 +1492,7 @@ exec -a \"$0\" ~a/.brdf-real~%"
(chmod "brdf" #o555))) (chmod "brdf" #o555)))
#t))))) #t)))))
(native-inputs (native-inputs
(list qttools)) ;for 'qmake' (list qttools-5)) ;for 'qmake'
(inputs (inputs
(list qtbase-5 mesa glew freeglut zlib)) (list qtbase-5 mesa glew freeglut zlib))
(home-page "https://www.disneyanimation.com/technology/brdf.html") (home-page "https://www.disneyanimation.com/technology/brdf.html")
@ -1965,8 +2019,8 @@ Automated palette selection is supported.")
;; ("miniupnpc" ,miniupnpc) ;segfaults for some reason ;; ("miniupnpc" ,miniupnpc) ;segfaults for some reason
qtbase-5 qtbase-5
qtkeychain qtkeychain
qtmultimedia qtmultimedia-5
qtsvg qtsvg-5
qtx11extras)) qtx11extras))
(home-page "https://drawpile.net") (home-page "https://drawpile.net")
(synopsis "Collaborative drawing program") (synopsis "Collaborative drawing program")
@ -2120,3 +2174,73 @@ Features include:
@end itemize @end itemize
") ")
(license license:gpl3+))) (license license:gpl3+)))
(define-public f3d
;; There have been many improvements since the last tagged version (1.2.1,
;; released in December 2021), including support for the Alembic file
;; format.
(let ((commit "9cc79b65ed750b178f58012dbba091aa24722dab")
(revision "0"))
(package
(name "f3d")
(version (git-version "1.2.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/f3d-app/f3d")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "041gqi2wfny2br4j68vhifg0bd18kbl0qsaallkz7yywk47njxfi"))))
(build-system cmake-build-system)
(arguments
(list
;; Many tests require files supplied by git-lfs.
;; Also, some tests segfault (after an exception?) but the tested
;; behavior, i.e., when the program is run manually, does not (for
;; example, TestNonExistentConfigFile and TestInvalidConfigFile).
;; Upstream is aware of occasionally flaky tests (see
;; https://github.com/f3d-app/f3d/issues/92) but the tests run in CI
;; seem to be passing.
;; Anyway, the program runs and is able to open at least STL files
;; without issue.
#:tests? #f
#:configure-flags
#~(list "-DBUILD_TESTING=OFF"
"-DF3D_MODULE_ALEMBIC=ON"
"-DF3D_MODULE_ASSIMP=ON"
"-DF3D_MODULE_OCCT=ON"
;; Prefer Guix's versioned documentation directory to F3D's
;; unversioned one.
(string-append "-DCMAKE_INSTALL_DOCDIR=" #$output
"/share/doc/" #$name "-" #$version))))
(inputs
(list alembic
assimp
double-conversion
eigen
expat
fontconfig
freetype
glew
hdf5
imath
jsoncpp
libjpeg-turbo
libpng
libtiff
libx11
lz4
netcdf
opencascade-occt
vtk
zlib))
(home-page "https://f3d-app.github.io/f3d/")
(synopsis "VTK based 3D viewer")
(description "F3D (pronounced @samp{/fɛd/}) is a VTK-based 3D viewer, it
has simple interaction mechanisms and is fully controllable using arguments on
the command line. It supports a range of file formats (including animated
glTF, STL, STEP, PLY, OBJ, FBX), and provides numerous rendering and texturing
options.")
(license license:bsd-3))))

3
gnu/packages/graphviz.scm
View file

@ -12,6 +12,7 @@
;;; Copyright © 2021 Bonface Munyoki Kilyungi <me@bonfacemunyoki.com> ;;; Copyright © 2021 Bonface Munyoki Kilyungi <me@bonfacemunyoki.com>
;;; Copyright © 2021 Giacomo Leidi <goodoldpaul@autistici.org> ;;; Copyright © 2021 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2021 Justin Veilleux <terramorpha@cock.li> ;;; Copyright © 2021 Justin Veilleux <terramorpha@cock.li>
;;; Copyright © 2021 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -350,7 +351,7 @@ Graphviz and LaTeX.")
(,(dirname (search-input-file inputs "bin/dot")))))))))) (,(dirname (search-input-file inputs "bin/dot"))))))))))
(inputs (inputs
(list atk (list atk
librsvg (librsvg-for-system)
harfbuzz harfbuzz
graphviz graphviz
gtk+ gtk+

10
gnu/packages/gsasl.scm
View file

@ -3,7 +3,7 @@
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2017 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020, 2021 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2020-2022 Efraim Flashner <efraim@flashner.co.il>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -54,13 +54,13 @@
(define-public gss (define-public gss
(package (package
(name "gss") (name "gss")
(version "1.0.3") (version "1.0.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/gss/gss-" version (uri (string-append "mirror://gnu/gss/gss-" version
".tar.gz")) ".tar.gz"))
(sha256 (base32 (sha256 (base32
"1syyvh3k659xf1hdv9pilnnhbbhs6vfapayp4xgdcc8mfgf9v4gz")))) "0www841ax21f5f61pdjk9fjdn9s2xf1wnblb47kzrqyaykgapkpc"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (list nettle shishi zlib)) (inputs (list nettle shishi zlib))
(synopsis "Generic Security Service library") (synopsis "Generic Security Service library")
@ -77,14 +77,14 @@ the underlying security implementation.")
(define-public gsasl (define-public gsasl
(package (package
(name "gsasl") (name "gsasl")
(version "1.10.0") (version "2.0.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/gsasl/gsasl-" version (uri (string-append "mirror://gnu/gsasl/gsasl-" version
".tar.gz")) ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1lv8fp01aq4jjia9g4vkx90zacl8rgmjhfi6f1wdwnh9ws7bvg45")))) "0yhvq3n6smgnc7fp0smmly8d248248xr7q2apbcbqhc80117ab1j"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags '("--with-gssapi-impl=mit" `(#:configure-flags '("--with-gssapi-impl=mit"

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

@ -32,7 +32,7 @@
;;; Copyright © 2020 Jesse Gibbons <jgibbons2357@gmail.com> ;;; Copyright © 2020 Jesse Gibbons <jgibbons2357@gmail.com>
;;; Copyright © 2020 Mike Rosset <mike.rosset@gmail.com> ;;; Copyright © 2020 Mike Rosset <mike.rosset@gmail.com>
;;; Copyright © 2020 Liliana Marie Prikler <liliana.prikler@gmail.com> ;;; Copyright © 2020 Liliana Marie Prikler <liliana.prikler@gmail.com>
;;; Copyright © 2020, 2021 pukkamustard <pukkamustard@posteo.net> ;;; Copyright © 2020, 2021, 2022 pukkamustard <pukkamustard@posteo.net>
;;; Copyright © 2021 Bonface Munyoki Kilyungi <me@bonfacemunyoki.com> ;;; Copyright © 2021 Bonface Munyoki Kilyungi <me@bonfacemunyoki.com>
;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz> ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
;;; Copyright © 2021 Leo Le Bouter <lle-bout@zaclys.net> ;;; Copyright © 2021 Leo Le Bouter <lle-bout@zaclys.net>
@ -43,6 +43,7 @@
;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com> ;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com>
;;; Copyright © 2022 Antero Mejr <antero@mailbox.org> ;;; Copyright © 2022 Antero Mejr <antero@mailbox.org>
;;; Copyright © 2022 Taiju HIGASHI <higashi@taiju.info> ;;; Copyright © 2022 Taiju HIGASHI <higashi@taiju.info>
;;; Copyright © 2022 Zheng Junjie <873216071@qq.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -1329,7 +1330,7 @@ format.")
(define-public guile-newt (define-public guile-newt
(package (package
(name "guile-newt") (name "guile-newt")
(version "0.0.2") (version "0.0.3")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -1338,7 +1339,7 @@ format.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1gksd1lzgjjh1p9vczghg8jw995d22hm34kbsiv8rcryirv2xy09")))) "0hbznqigdkyh0kdkpnkp7sz2qd0g5dvmibcdi1rki02zg78mzypv"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:make-flags '(#:make-flags
@ -1346,7 +1347,7 @@ format.")
(inputs (inputs
(list guile-3.0 newt)) (list guile-3.0 newt))
(native-inputs (native-inputs
(list autoconf automake pkg-config)) (list autoconf automake pkg-config guile-3.0))
(synopsis "Guile bindings to Newt") (synopsis "Guile bindings to Newt")
(description (description
"This package provides bindings for Newt, a programming library for "This package provides bindings for Newt, a programming library for
@ -1392,7 +1393,7 @@ microblogging service.")
(define-public guile-parted (define-public guile-parted
(package (package
(name "guile-parted") (name "guile-parted")
(version "0.0.5") (version "0.0.6")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -1401,20 +1402,18 @@ microblogging service.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1ar6n38br3h1jm54yy6d54rpqdgsy7pmnj3nqdzqrfk8z0kx0rm9")) "12ygz0dw8zjr8g3z4g3sh4d1yw3fiphh0ssyqd4nllqa3sfwv21f"))
(modules '((guix build utils))))) (modules '((guix build utils)))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:make-flags '(#:make-flags
'("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings '("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings
(native-inputs
(list autoconf automake guile-3.0 guile-bytestructures pkg-config))
(inputs (inputs
;; XXX: Use Parted 3.4 to work around issues when using 3.5 in the Guix (list guile-3.0 parted))
;; System installer: <https://issues.guix.gnu.org/55549>.
(list guile-3.0 parted-3.4))
(propagated-inputs (propagated-inputs
(list guile-bytestructures)) (list guile-bytestructures))
(native-inputs
(list autoconf automake pkg-config))
(synopsis "Guile bindings to GNU Parted") (synopsis "Guile bindings to GNU Parted")
(description (description
"This package provides bindings for GNU Parted library, a C library "This package provides bindings for GNU Parted library, a C library
@ -3117,24 +3116,25 @@ denote the invalidity of certain code paths in a Scheme program.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public guile-srfi-158 (define-public guile-srfi-158
(let ((commit "13126d1ed37892c864337a600a43d6876625fb99")
(revision "0"))
(package (package
(name "guile-srfi-158") (name "guile-srfi-158")
(version "0.0.1") (version (git-version "0.0.1" revision commit))
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://gitlab.com/mjbecze/guile-srfi-158.git") (url "https://gitlab.com/mjbecze/guile-srfi-158.git")
(commit version))) (commit commit)))
(sha256 (sha256
(base32 (base32
"0b8hlv1bldbcwkcxi9y8mm6xp5gbgpg7b15bwqxv70iynl9d9a7c")) "0hg57l3w5qamip1clkab0q01np5nqln9y054q39smm4ki0svdl8w"))
(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
(list autoconf automake pkg-config)) (list guile-3.0 autoconf automake pkg-config))
(inputs (inputs (list guile-3.0))
(list guile-3.0))
(home-page "https://gitlab.com/samplet/guile-srfi-158") (home-page "https://gitlab.com/samplet/guile-srfi-158")
(synopsis "SRFI 158 (Generators and Accumulators) for Guile") (synopsis "SRFI 158 (Generators and Accumulators) for Guile")
(description "This package provides an implementation of SRFI 158 (description "This package provides an implementation of SRFI 158
@ -3142,7 +3142,7 @@ for Guile. SRFI 158 defines utility procedures that create,
transform, and consume generators. It also defines procedures that transform, and consume generators. It also defines procedures that
return accumulators. It is implemented by wrapping the sample return accumulators. It is implemented by wrapping the sample
implementation in a thin Guile compatibility layer.") implementation in a thin Guile compatibility layer.")
(license license:gpl3+))) (license license:gpl3+))))
(define-public guile-srfi-159 (define-public guile-srfi-159
(let ((commit "1bd98abda2ae4ef8f36761a167903e55c6bda7bb") (let ((commit "1bd98abda2ae4ef8f36761a167903e55c6bda7bb")
@ -3944,7 +3944,7 @@ as signed sessions, multipart message support, etc.")
(add-after 'unpack 'run-hall (add-after 'unpack 'run-hall
(lambda _ (lambda _
(setenv "HOME" "/tmp") ; for ~/.hall (setenv "HOME" "/tmp") ; for ~/.hall
(invoke "hall" "dist" "-x")))))) (invoke "hall" "build-system" "-x"))))))
(native-inputs (native-inputs
(list autoconf (list autoconf
automake automake

4
gnu/packages/guile.scm
View file

@ -733,7 +733,7 @@ Guile's foreign function interface.")
(define-public guile-sqlite3 (define-public guile-sqlite3
(package (package
(name "guile-sqlite3") (name "guile-sqlite3")
(version "0.1.2") (version "0.1.3")
(home-page "https://notabug.org/guile-sqlite3/guile-sqlite3.git") (home-page "https://notabug.org/guile-sqlite3/guile-sqlite3.git")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
@ -742,7 +742,7 @@ Guile's foreign function interface.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(sha256 (sha256
(base32 (base32
"1nryy9j3bk34i0alkmc9bmqsm0ayz92k1cdf752mvhyjjn8nr928")) "0qqygvlpz63phdi2p5p8ncp80dci230qfa3pwds8yfxqqaablmhb"))
(file-name (string-append name "-" version "-checkout")))) (file-name (string-append name "-" version "-checkout"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (list autoconf automake guile-3.0 pkg-config)) (native-inputs (list autoconf automake guile-3.0 pkg-config))

4
gnu/packages/hardware.scm
View file

@ -453,7 +453,7 @@ support.")
(wrap-qt-program "ckb-next" (wrap-qt-program "ckb-next"
#:output out #:output out
#:inputs inputs))))))) #:inputs inputs)))))))
(native-inputs (list qttools pkg-config)) (native-inputs (list qttools-5 pkg-config))
(inputs (list qtbase-5 (inputs (list qtbase-5
zlib zlib
libdbusmenu-qt libdbusmenu-qt
@ -534,7 +534,7 @@ calibrated, and restored when the calibration is applied.")
(arguments (arguments
'(#:tests? #f)) ; No test suite '(#:tests? #f)) ; No test suite
(native-inputs (native-inputs
(list pkg-config qttools)) (list pkg-config qttools-5))
(inputs (inputs
(list ddcutil glib qtbase-5)) (list ddcutil glib qtbase-5))
(home-page "https://www.ddcutil.com/") (home-page "https://www.ddcutil.com/")

284
gnu/packages/haxe.scm Normal file
View file

@ -0,0 +1,284 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2022 John Kehayias <john.kehayias@protonmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
;;; GNU Guix is free software; you can redistribute it and/or modify it
;;; under the terms of the GNU General Public License as published by
;;; the Free Software Foundation; either version 3 of the License, or (at
;;; your option) any later version.
;;;
;;; GNU Guix is distributed in the hope that it will be useful, but
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;;; GNU General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages haxe)
#:use-module (gnu packages)
#:use-module (gnu packages apr)
#:use-module (gnu packages audio)
#:use-module (gnu packages bdw-gc)
#:use-module (gnu packages compression)
#:use-module (gnu packages databases)
#:use-module (gnu packages gl)
#:use-module (gnu packages graphics)
#:use-module (gnu packages gtk)
#:use-module (gnu packages image)
#:use-module (gnu packages libevent)
#:use-module (gnu packages mp3)
#:use-module (gnu packages ocaml)
#:use-module (gnu packages pcre)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages sdl)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages tls)
#:use-module (gnu packages version-control)
#:use-module (gnu packages web)
#:use-module (gnu packages xiph)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
#:use-module (guix build-system dune)
#:use-module (guix download)
#:use-module (guix gexp)
#:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix utils))
(define-public neko
(package
(name "neko")
(version "2.3.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/HaxeFoundation/neko")
(commit (string-append
"v"
(string-map (lambda (x) (if (char=? x #\.) #\- x)) version)))))
(file-name (git-file-name name version))
(sha256
(base32 "1xgw646pghsjjbzd8qlaq17vq96swlrazpivrvyrhdj36vb3sci3"))))
(build-system cmake-build-system)
(arguments
(list #:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'prefix
(lambda _
(substitute* "CMakeLists.txt"
(("\\\\\\$ORIGIN")
(string-append #$output "/lib"))))))))
(inputs (list apr
apr-util
gtk+-2
httpd
libgc
mbedtls-apache
mysql
openssl
pcre
sqlite
zlib))
(native-inputs (list git pkg-config)) ; git for source_archive and applying patch
(home-page "https://nekovm.org/")
(synopsis "High-level dynamically typed programming language and virtual
machine")
(description
"The Neko programming language is a high-level dynamically typed
programming language. It can be used as an embedded scripting language. It
has been designed to provide a common runtime for several different languages.
You can easily extend the language with C libraries. You can also write
generators from your own language to Neko and then use the Neko Runtime to
compile, run, and access existing libraries.
Neko has a compiler and a virtual machine. The Virtual Machine is both very
lightweight and well optimized, so it can run very quickly. The VM can be
easily embedded into any application and your libraries can be accessed using
the C foreign function interface.
You can use the compiler as standalone command line executable separate from
the VM, or as a Neko library to perform compile-and-run funtions for
interactive languages.")
(license license:expat)))
(define haxelib-src
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/HaxeFoundation/haxelib")
;; This should match the haxelib submodule in haxe.
(commit "4b27f91d8a4ff279d9903091680fee2c93a0d574")
;; This repo includes some Haxe libs as well.
(recursive? #t)))
(sha256
(base32
"0mwrm6gxgclwziiprfiswmjbz6z3dnvdwl8gq3gaym18pvx4p3ny"))))
(define-public haxe
(package
(name "haxe")
(version "4.2.5")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/HaxeFoundation/haxe")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0pl8vpyb7gl2yqjg85yc4zxq9c3ipvw4yrrpliaxs25ynrj3l51n"))))
(build-system dune-build-system)
(arguments
(list #:phases
#~(modify-phases %standard-phases
;; Needs the haxelib sources for haxelib client
(add-after 'unpack 'copy-haxelib-src
(lambda _
(copy-recursively #$haxelib-src
"extra/haxelib_src")))
;; Change the default directory for the haxelib package
;; manager to be something writeable for a user.
(add-after 'copy-haxelib-src 'change-default-dir
(lambda _
(substitute* "extra/haxelib_src/src/haxelib/client/Main.hx"
(("'/usr/lib/haxe/\\$REPNAME'")
"Path.addTrailingSlash( getHomePath() ) + '.haxe/$REPNAME'"))))
(add-after 'unpack 'prefix
(lambda _
(substitute* "Makefile"
(("/usr/local")
(string-append #$output)))))
;; Haxe uses a straight forward make, dune runtest, and make
;; install process.
(replace 'build
(lambda* (#:key make-flags parallel-build? #:allow-other-keys)
(invoke "make" "-j" (if parallel-build?
(number->string (parallel-job-count))
"1"))))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "dune" "runtest"))))
(replace 'install
(lambda _
(invoke "make" "install"))))))
(inputs (list libuv
mbedtls-apache
neko
ocaml-extlib
ocaml-luv
ocaml-ptmap
ocaml-sedlex
ocaml-sha
ocaml-xml-light
pcre
zlib))
(native-inputs (list ocaml-findlib camlp5))
(home-page "https://haxe.org/")
(synopsis "Multi-target universal programming language")
(description
"Haxe is a toolkit based on a modern, high level, static-typed
programming language, a cross-compiler, a complete cross-platform standard
library and ways to access each platform's native capabilities. This package
includes the compiler and library manager.")
(license (list license:gpl2+ ; the compiler itself
license:expat)))) ; the standard library
(define-public hashlink
(package
(name "hashlink")
(version "1.12")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/HaxeFoundation/hashlink")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0i5f1mxpgjcdirx60kxrw0r0y15qh3j16a6fj8mzkq3k7j2hc982"))
(modules '((guix build utils)))
(snippet
'(begin
;; Remove bundled libraries (mainly used for Windows build).
(delete-file-recursively "include")
#t))))
(build-system gnu-build-system)
(arguments
;; Looks like there are tests with CMake, but there is confusion if this
;; is a supported way to build on Linux. See, e.g.
;; https://github.com/HaxeFoundation/hashlink/issues/397. Also, the
;; CMake build requires running the library manager haxelib in the build
;; process for the tests, likely requiring network access.
;; TODO: Use cmake-build-system instead and enable tests?
(list #:tests? #f
#:make-flags
;; The built hdll libraries need help finding libhl.so.
#~(list (string-append "LIBFLAGS=-Wl,-rpath=" #$output "/lib"))
#:phases
#~(modify-phases %standard-phases
;; Don't try to build the (removed) bundled libraries pcre,
;; minimp3, and mikktspace. Provide the approriate paths and
;; linking options.
(add-after 'unpack 'use-system-libs
(lambda _
(substitute* "Makefile"
(("\\$\\{PCRE\\}") "")
(("-lpthread") "-lpthread -lpcre16")
(("include/minimp3")
(string-append #$(this-package-input "minimp3") "/include"))
(("include/mikktspace ")
(string-append #$(this-package-input "mikktspace") "/include "))
(("include/mikktspace/mikktspace.o") "")
(("-lpng") "-lpng -lmikktspace"))))
(replace 'configure
(lambda* _
(setenv "CC" #$(cc-for-target))
(setenv "PREFIX" #$output)))
(replace 'build
(lambda* (#:key make-flags parallel-build? #:allow-other-keys)
(apply invoke "make" "-j" (if parallel-build?
(number->string (parallel-job-count))
"1")
make-flags))))))
(inputs (list glu
haxe
libjpeg-turbo
libpng
libuv
libvorbis
mbedtls-apache
mikktspace
minimp3
openal
pcre
sdl2
sqlite
zlib))
(native-inputs (list pkg-config))
(home-page "https://hashlink.haxe.org/")
(synopsis "Virtual machine for the Haxe language")
(description
"HashLink (HL) is a virtual machine for the Haxe language. It can run
bytecode produced by the Haxe compiler, or converted to C by HL. The HashLink runtime
includes the following features:
@itemize
@item Fully compatible with the Haxe specification
@item Support file I/O, regular expressions, network, etc.
@item Unicode strings by default
@item Mark-and-not-sweep Garbage Collector
@item x86 and x86-64 HL/C compilation
@item x86 and x86-64 HL/JIT compilation
@end itemize
While the standard HL runtime provides support for Haxe standard library,
HashLink also provides several libraries that can optionally be used to build
HL-specific applications. This includes the FMT library for compression and
image support and SDL for mouse, keyboard, and game controller support,
OpenGL, and more.")
(license license:expat)))

2
gnu/packages/hunspell.scm
View file

@ -46,7 +46,7 @@
(string-append "libreoffice-" version)))) (string-append "libreoffice-" version))))
(file-name (git-file-name "libreoffice-dictionaries" version)) (file-name (git-file-name "libreoffice-dictionaries" version))
(sha256 (sha256
(base32 "0h1sz8haqwpis4af1vy7jvivl4rr9g53l4l680qa7yn0691gkiv3")))) (base32 "1qyn56kcn2scdlssjgi5b33hnsh20mmnd60w78z0gp7bs0mv0wcs"))))
(build-system trivial-build-system) (build-system trivial-build-system)
(native-inputs (native-inputs
`(("source" ,source))) `(("source" ,source)))

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

@ -358,6 +358,7 @@ many popular formats.")
"-DVTK_MODULE_USE_EXTERNAL_VTK_theora=ON" "-DVTK_MODULE_USE_EXTERNAL_VTK_theora=ON"
"-DVTK_MODULE_USE_EXTERNAL_VTK_tiff=ON" "-DVTK_MODULE_USE_EXTERNAL_VTK_tiff=ON"
"-DVTK_MODULE_USE_EXTERNAL_VTK_zlib=ON" "-DVTK_MODULE_USE_EXTERNAL_VTK_zlib=ON"
"-DVTK_MODULE_ENABLE_VTK_RenderingExternal=YES" ; For F3D
"-DVTK_WRAP_PYTHON=ON" "-DVTK_WRAP_PYTHON=ON"
"-DVTK_PYTHON_VERSION:STRING=3" "-DVTK_PYTHON_VERSION:STRING=3"
) )
@ -770,7 +771,7 @@ including 2D color images.")
(add-after 'unpack 'qt-chdir (add-after 'unpack 'qt-chdir
(lambda _ (chdir "gmic-qt") #t)))))) (lambda _ (chdir "gmic-qt") #t))))))
(native-inputs (native-inputs
(list pkg-config qttools)) (list pkg-config qttools-5))
(inputs (inputs
(modify-inputs (package-inputs gmic) (modify-inputs (package-inputs gmic)
(prepend gmic qtbase-5))) (prepend gmic qtbase-5)))
@ -1091,7 +1092,7 @@ combine the information contained in both.")
,(map (lambda (label) ,(map (lambda (label)
(string-append (assoc-ref inputs label) (string-append (assoc-ref inputs label)
"/lib/qt5/plugins")) "/lib/qt5/plugins"))
'("qtbase" "qtdeclarative")))))))))) '("qtbase" "qtdeclarative-5"))))))))))
(inputs (inputs
(list curl (list curl
fftw fftw
@ -1104,12 +1105,12 @@ combine the information contained in both.")
insight-toolkit-4.12 insight-toolkit-4.12
vtk-7 vtk-7
qtbase-5 qtbase-5
qtdeclarative qtdeclarative-5
vxl-1 vxl-1
zlib)) zlib))
(native-inputs (native-inputs
`(("googletest" ,googletest) `(("googletest" ,googletest)
("qttools" ,qttools) ("qttools-5" ,qttools-5)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("c3d-src" ("c3d-src"
,(let* ((commit "f521358db26e00002c911cc47bf463b043942ad3") ,(let* ((commit "f521358db26e00002c911cc47bf463b043942ad3")
@ -1224,14 +1225,14 @@ substituted by matching images.")
"0kixwjb2x457dq7927hkh34c803p7yh1pmn6n61rk9shqrcg492h")))) "0kixwjb2x457dq7927hkh34c803p7yh1pmn6n61rk9shqrcg492h"))))
(build-system qt-build-system) (build-system qt-build-system)
(native-inputs (native-inputs
(list qttools)) (list qttools-5))
(inputs (inputs
`(("boost" ,boost) `(("boost" ,boost)
("libjpeg" ,libjpeg-turbo) ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng) ("libpng" ,libpng)
("libtiff" ,libtiff) ("libtiff" ,libtiff)
("qtbase" ,qtbase-5) ("qtbase" ,qtbase-5)
("qtsvg" ,qtsvg) ("qtsvg-5" ,qtsvg-5)
("zlib" ,zlib))) ("zlib" ,zlib)))
(arguments (arguments
`(#:phases `(#:phases

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

@ -516,11 +516,11 @@ It supports JPEG, PNG and GIF formats.")
"188q0l63nfasqfvwbq4mwx2vh7wsfi2bq9n5nksddspl1qz01lnp")))) "188q0l63nfasqfvwbq4mwx2vh7wsfi2bq9n5nksddspl1qz01lnp"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
(list pkg-config qttools)) (list pkg-config qttools-5))
(inputs (inputs
(list qtbase-5 (list qtbase-5
qtdeclarative qtdeclarative-5
qtsvg qtsvg-5
boost boost
eigen eigen
;; gtest ;; gtest
@ -531,9 +531,9 @@ It supports JPEG, PNG and GIF formats.")
libjpeg-turbo libjpeg-turbo
lcms lcms
openexr-2 openexr-2
qtwebengine qtwebengine-5
qtdeclarative qtdeclarative-5
qtwebchannel qtwebchannel-5
fftwf fftwf
gsl gsl
libtiff)) libtiff))
@ -671,9 +671,9 @@ For PDF support, install the @emph{mupdf} package.")
(invoke "qmake" "tests.pro") (invoke "qmake" "tests.pro")
(invoke "make" "tests")))))))) (invoke "make" "tests"))))))))
(native-inputs (native-inputs
(list qttools)) (list qttools-5))
(inputs (inputs
(list qtbase-5 qtimageformats qtsvg)) (list qtbase-5 qtimageformats qtsvg-5))
(home-page "https://interversehq.com/qview/") (home-page "https://interversehq.com/qview/")
(synopsis "Convenient and minimal image viewer") (synopsis "Convenient and minimal image viewer")
(description "qView is a Qt image viewer designed with visually (description "qView is a Qt image viewer designed with visually
@ -921,10 +921,10 @@ archives.")
("python" ,python-wrapper) ("python" ,python-wrapper)
("quazip" ,quazip-0) ("quazip" ,quazip-0)
("qtbase" ,qtbase-5) ("qtbase" ,qtbase-5)
("qtsvg" ,qtsvg))) ("qtsvg-5" ,qtsvg-5)))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("qtlinguist" ,qttools))) ("qtlinguist" ,qttools-5)))
(synopsis "Image viewer supporting all common formats") (synopsis "Image viewer supporting all common formats")
(description "Nomacs is a simple to use image lounge featuring (description "Nomacs is a simple to use image lounge featuring
semi-transparent widgets that display additional information such as metadata, semi-transparent widgets that display additional information such as metadata,

61
gnu/packages/image.scm
View file

@ -19,7 +19,7 @@
;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com> ;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com>
;;; Copyright © 2018 Fis Trivial <ybbs.daans@hotmail.com> ;;; Copyright © 2018 Fis Trivial <ybbs.daans@hotmail.com>
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2018, 2019, 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2018-2020, 2022 Marius Bakke <marius@gnu.org>
;;; Copyright © 2018 Pierre-Antoine Rouby <contact@parouby.fr> ;;; Copyright © 2018 Pierre-Antoine Rouby <contact@parouby.fr>
;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2018 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2018 Rutger Helling <rhelling@mykolab.com>
@ -98,6 +98,7 @@
#:use-module (gnu packages fonts) #:use-module (gnu packages fonts)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix gexp)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix utils) #:use-module (guix utils)
@ -1106,8 +1107,9 @@ supplies a generic doubly-linked list and some string functions.")
"0cwjxjz0f4gs6igvwqg0p99mnrsrwzkal1l2n08yvz2xq9s5khki")))))))) "0cwjxjz0f4gs6igvwqg0p99mnrsrwzkal1l2n08yvz2xq9s5khki"))))))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases (list
(modify-phases %standard-phases #:phases
#~(modify-phases %standard-phases
;; According to Fedora these files depend on private headers, but their ;; According to Fedora these files depend on private headers, but their
;; presence is required for building, so we replace them with empty files. ;; presence is required for building, so we replace them with empty files.
(add-after 'unpack 'delete-unbuildable-files (add-after 'unpack 'delete-unbuildable-files
@ -1116,8 +1118,7 @@ supplies a generic doubly-linked list and some string functions.")
(delete-file file) (delete-file file)
(close (open file O_CREAT))) (close (open file O_CREAT)))
'("Source/FreeImage/PluginG3.cpp" '("Source/FreeImage/PluginG3.cpp"
"Source/FreeImageToolkit/JPEGTransform.cpp")) "Source/FreeImageToolkit/JPEGTransform.cpp"))))
#t))
;; These scripts generate the Makefiles. ;; These scripts generate the Makefiles.
(replace 'configure (replace 'configure
(lambda _ (lambda _
@ -1127,33 +1128,33 @@ supplies a generic doubly-linked list and some string functions.")
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(substitute* "Makefile.gnu" (substitute* "Makefile.gnu"
(("/usr") (assoc-ref outputs "out")) (("/usr") (assoc-ref outputs "out"))
(("-o root -g root") "")) (("-o root -g root") "")))))
#t)))
#:make-flags #:make-flags
(list ,(string-append "CC=" (cc-for-target)) #~(let ((jxrlib (search-input-directory %build-inputs "include/jxrlib")))
(list (string-append "CC=" #$(cc-for-target))
;; We need '-fpermissive' for Source/FreeImage.h. ;; We need '-fpermissive' for Source/FreeImage.h.
;; libjxr doesn't have a pkg-config file. ;; libjxr doesn't have a pkg-config file.
(string-append "CFLAGS+=-O2 -fPIC -fvisibility=hidden -fpermissive " (string-append "CFLAGS+=-O2 -fPIC -fvisibility=hidden "
"-I" (assoc-ref %build-inputs "libjxr") "/include/jxrlib")) "-fpermissive -I" jxrlib)))
#:tests? #f)) ; no check target #:tests? #f)) ; no check target
(native-inputs (native-inputs
(list pkg-config unzip)) (list pkg-config unzip))
(inputs (inputs
`(("libjpeg" ,libjpeg-turbo) (list libjpeg-turbo
("libjxr" ,libjxr) libjxr
("libpng" ,libpng) libpng
("libraw" ,libraw) libraw
("libtiff" ,libtiff) libtiff
("libwebp" ,libwebp) libwebp
("openexr" ,openexr-2) openexr-2
("openjpeg" ,openjpeg) openjpeg
("zlib" ,zlib))) zlib))
(synopsis "Library for handling popular graphics image formats") (synopsis "Library for handling popular graphics image formats")
(description (description
"FreeImage is a library for developers who would like to support popular "FreeImage is a library for developers who would like to support popular
graphics image formats like PNG, BMP, JPEG, TIFF and others.") graphics image formats like PNG, BMP, JPEG, TIFF and others.")
(license license:gpl2+) (license license:gpl2+)
(home-page "http://freeimage.sourceforge.net"))) (home-page "https://freeimage.sourceforge.io/")))
(define-public vigra (define-public vigra
(let ((commit "9b514fa00a136f5fd81bb57ee9f6293c333ffc1f") (let ((commit "9b514fa00a136f5fd81bb57ee9f6293c333ffc1f")
@ -1344,7 +1345,7 @@ channels.")
(base32 "1qm6bvj28l42km009nc60gffn1qhngc0m2wjlhf90si3mcc8d99m")))) (base32 "1qm6bvj28l42km009nc60gffn1qhngc0m2wjlhf90si3mcc8d99m"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:test-target "tests" `(#:test-target "tests"
#:configure-flags (list "-DEXIV2_BUILD_UNIT_TESTS=ON" #:configure-flags (list "-DEXIV2_BUILD_UNIT_TESTS=ON"
;; darktable needs BMFF to support ;; darktable needs BMFF to support
;; CR3 files. ;; CR3 files.
@ -1355,7 +1356,19 @@ channels.")
(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"))) (lib (string-append out "/lib")))
(for-each delete-file (find-files lib "\\.a$")))))))) (for-each delete-file (find-files lib "\\.a$")))))
,@(if (or (target-ppc64le?) (target-aarch64?))
'((add-after 'unpack 'adjust-tests
(lambda _
;; Adjust test on ppc64 and aarch64, where no exception
;; is raised and thus the return value is different. See
;; <https://github.com/Exiv2/exiv2/issues/365> and
;; <https://github.com/Exiv2/exiv2/issues/933>.
(substitute* "tests/bugfixes/github/test_CVE_2018_12265.py"
(("\\$uncaught_exception \\$addition_overflow_message\n") "")
(("retval = \\[1\\]") "retval = [0]")))))
'()))))
(propagated-inputs (propagated-inputs
(list expat zlib)) (list expat zlib))
(native-inputs (native-inputs
@ -1826,9 +1839,9 @@ parsing, viewing, modifying, and saving this metadata.")
"1p7gqs5vqzbddlgl38lbanchwb14m6lx8f2cn2c5p0vyqwvqqv52")))) "1p7gqs5vqzbddlgl38lbanchwb14m6lx8f2cn2c5p0vyqwvqqv52"))))
(build-system qt-build-system) (build-system qt-build-system)
(native-inputs (native-inputs
(list qttools)) (list qttools-5))
(inputs (inputs
(list qtbase-5 qtsvg)) (list qtbase-5 qtsvg-5))
(arguments (arguments
`(#:tests? #f)) ;no tests `(#:tests? #f)) ;no tests
(home-page "https://github.com/flameshot-org/flameshot") (home-page "https://github.com/flameshot-org/flameshot")

15
gnu/packages/inkscape.scm
View file

@ -244,7 +244,7 @@ as the native format.")
(package (package
(inherit inkscape/stable) (inherit inkscape/stable)
(name "inkscape") (name "inkscape")
(version "1.2") (version "1.2.1")
(source (source
(origin (origin
(inherit (package-source inkscape/stable)) (inherit (package-source inkscape/stable))
@ -253,22 +253,12 @@ as the native format.")
"resources/file/" "resources/file/"
"inkscape-" version ".tar.xz")) "inkscape-" version ".tar.xz"))
(sha256 (sha256
(base32 "1bg6rlflzhq726kpcwazfscm02liammjvzpyxmj5d52l4la336wd")))) (base32 "06scilds4p4bw337ss22nfdxy2kynv5yjw6vq6nlpjm7xfh7vkj6"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
(substitute-keyword-arguments (package-arguments inkscape/stable) (substitute-keyword-arguments (package-arguments inkscape/stable)
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases `(modify-phases ,phases
(add-after 'unpack 'disable-problematic-tests
;; The UnionOutside and UnionOutsideSwap tests fail, comparing
;; e.g. the result "M 0 1.5 V 0 H 2 V 2 H 0.5 V 2.5 H 0 V 2 V 1.5 H
;; 0.5 V 2 z" to the expected string "M 0 0 V 1.5 V 2 V 2.5 H 0.5 V
;; 2 H 2 V 0 z" (see:
;; https://gitlab.com/inkscape/inkscape/-/issues/3689).
(lambda _
(substitute* "testfiles/src/path-boolop-test.cpp"
(("PathBoolopTest, UnionOutside(Swap)?.*" all)
(string-append all " GTEST_SKIP();\n")))))
(replace 'wrap-program (replace 'wrap-program
;; Ensure Python is available at runtime. ;; Ensure Python is available at runtime.
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
@ -281,6 +271,7 @@ as the native format.")
`("GDK_PIXBUF_MODULE_FILE" = `("GDK_PIXBUF_MODULE_FILE" =
(,(getenv "GDK_PIXBUF_MODULE_FILE"))))))))))) (,(getenv "GDK_PIXBUF_MODULE_FILE")))))))))))
(inputs (modify-inputs (package-inputs inkscape/stable) (inputs (modify-inputs (package-inputs inkscape/stable)
(replace "lib2geom" lib2geom-1.2)
(append bash-minimal (append bash-minimal
librsvg))) ;for the pixbuf loader librsvg))) ;for the pixbuf loader
(properties (alist-delete 'hidden? (package-properties inkscape/stable))))) (properties (alist-delete 'hidden? (package-properties inkscape/stable)))))

9
gnu/packages/installers.scm
View file

@ -34,16 +34,15 @@
(xgcc (cross-gcc triplet #:libc xlibc))) (xgcc (cross-gcc triplet #:libc xlibc)))
(package (package
(name (string-append "nsis-" machine)) (name (string-append "nsis-" machine))
(version "3.05") (version "3.08")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://prdownloads.sourceforge.net/nsis/nsis-" (uri (string-append "http://prdownloads.sourceforge.net/nsis/nsis-"
version "-src.tar.bz2")) version "-src.tar.bz2"))
(sha256 (sha256
(base32 (base32
"1sbwx5vzpddharkb7nj4q5z3i5fbg4lan63ng738cw4hmc4v7qdn")) "11qy1n1qdcqwal9hn8cmzm7gxjdyx7by6w14rfz2l646afnp0lm8"))
(patches (search-patches "nsis-env-passthru.patch" (patches (search-patches "nsis-env-passthru.patch"))))
"nsis-source-date-epoch.patch"))))
(build-system scons-build-system) (build-system scons-build-system)
(native-inputs `(("xgcc" ,xgcc) (native-inputs `(("xgcc" ,xgcc)
("xbinutils" ,xbinutils) ("xbinutils" ,xbinutils)
@ -125,7 +124,7 @@
(lambda _ (lambda _
;; NSIS target detection is screwed up, manually change ;; NSIS target detection is screwed up, manually change
;; it ourselves ;; it ourselves
(substitute* "Source/build.cpp" (("m_target_type=TARGET_X86ANSI") (substitute* "Source/build.cpp" (("m_target_type=TARGET_X86UNICODE")
(string-append "m_target_type=" ,nsis-target-type)))))))) (string-append "m_target_type=" ,nsis-target-type))))))))
(home-page "https://nsis.sourceforge.io/Main_Page") (home-page "https://nsis.sourceforge.io/Main_Page")
(synopsis "System to create Windows installers") (synopsis "System to create Windows installers")

58
gnu/packages/instrumentation.scm
View file

@ -18,13 +18,17 @@
(define-module (gnu packages instrumentation) (define-module (gnu packages instrumentation)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages bash)
#:use-module (gnu packages bison) #:use-module (gnu packages bison)
#:use-module (gnu packages boost) #:use-module (gnu packages boost)
#:use-module (gnu packages commencement)
#:use-module (gnu packages datastructures) #:use-module (gnu packages datastructures)
#:use-module (gnu packages documentation) #:use-module (gnu packages documentation)
#:use-module (gnu packages elf) #:use-module (gnu packages elf)
#:use-module (gnu packages engineering) #:use-module (gnu packages engineering)
#:use-module (gnu packages file)
#:use-module (gnu packages flex) #:use-module (gnu packages flex)
#:use-module (gnu packages gawk)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
#:use-module (gnu packages haskell-xyz) #:use-module (gnu packages haskell-xyz)
#:use-module (gnu packages libunwind) #:use-module (gnu packages libunwind)
@ -290,6 +294,60 @@ line for tracing control, a @code{lttng-ctl} library for tracing control and a
@code{lttng-relayd} for network streaming.") @code{lttng-relayd} for network streaming.")
(license (list license:gpl2 license:lgpl2.1)))) (license (list license:gpl2 license:lgpl2.1))))
(define-public perf-tools
(package
(name "perf-tools")
(version "1.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/brendangregg/perf-tools")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1ab735idi0h62yvhzd7822jj3555vygixv4xjrfrdvi8d2hhz6qn"))))
(build-system copy-build-system)
(arguments
`(#:install-plan
',(append
(map (cut list <> "bin/")
'("disk/bitesize"
"fs/cachestat"
"execsnoop"
"kernel/funccount"
"kernel/funcgraph"
"kernel/funcslower"
"kernel/functrace"
"iolatency"
"iosnoop"
"killsnoop"
"kernel/kprobe"
"opensnoop"
"misc/perf-stat-hist"
"tools/reset-ftrace"
"syscount"
"net/tcpretrans"
"system/tpoint"
"user/uprobe"))
'(("man/man8/" "share/man/man8")))))
(propagated-inputs
(list
bash
coreutils ; cat + rm
gawk
gcc-toolchain ; objdump + ldconfig
file
perf
perl
procps ; sysctl
which))
(home-page "https://github.com/brendangregg/perf-tools")
(synopsis "Performance analysis tools")
(description "Perf-tools is a collection of scripts for performance
analysis and instrumentation based on Linux perf_events (aka perf) and
ftrace.")
(license (list license:gpl2))))
(define-public uftrace (define-public uftrace
(package (package
(name "uftrace") (name "uftrace")

6
gnu/packages/irc.scm
View file

@ -126,7 +126,7 @@
(let ((inxi (search-input-file inputs "/bin/inxi"))) (let ((inxi (search-input-file inputs "/bin/inxi")))
(symlink inxi "data/scripts/inxi"))))))) (symlink inxi "data/scripts/inxi")))))))
(native-inputs (native-inputs
(list extra-cmake-modules pkg-config qttools)) (list extra-cmake-modules pkg-config qttools-5))
(inputs (inputs
(list boost (list boost
inxi-minimal inxi-minimal
@ -134,9 +134,9 @@
perl perl
qca qca
qtbase-5 qtbase-5
qtmultimedia qtmultimedia-5
qtscript qtscript
qtsvg qtsvg-5
snorenotify snorenotify
sonnet sonnet
zlib)) zlib))

221
gnu/packages/jami.scm
View file

@ -51,7 +51,9 @@
#:use-module (gnu packages upnp) #:use-module (gnu packages upnp)
#:use-module (gnu packages version-control) #:use-module (gnu packages version-control)
#:use-module (gnu packages video) #:use-module (gnu packages video)
#:use-module (gnu packages vulkan)
#:use-module (gnu packages webkit) #:use-module (gnu packages webkit)
#:use-module (gnu packages xdisorg)
#:use-module (gnu packages xiph) #:use-module (gnu packages xiph)
#:use-module (gnu packages xorg) #:use-module (gnu packages xorg)
#:use-module (gnu packages) #:use-module (gnu packages)
@ -64,7 +66,7 @@
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix utils)) #:use-module (guix utils))
(define %jami-version "20211223.2.37be4c3") (define %jami-version "20220726.1515.da8d1da")
(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
@ -85,14 +87,11 @@
(for-each delete-file-recursively '("client-android" (for-each delete-file-recursively '("client-android"
"client-ios" "client-ios"
"client-macosx" "client-macosx"
"client-uwp")))) "plugins"))))
(patches (search-patches "jami-libclient-audio-managers.patch"
"jami-fix-crash-on-quit.patch"
"jami-images-loading.patch"
"jami-memory-usage.patch"))
(sha256 (sha256
(base32 (base32
"12h4a0nj3gh05w64gkywrrb64agrhn6y3q4b9cqnhvr1vdkzlj0h")))) "1zx0i9aw8jsba3bjc5r4pkkybm8c0lyz420ciq89vsswd48gfdhg"))
(patches (search-patches "jami-fix-esc-bug.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.
@ -104,7 +103,7 @@
(invoke "tar" "-xvf" #$%jami-sources (invoke "tar" "-xvf" #$%jami-sources
"-C" patches-directory "-C" patches-directory
"--strip-components=5" "--strip-components=5"
(string-append "ring-project/daemon/contrib/src/" (string-append "jami-project/daemon/contrib/src/"
dep-name)) dep-name))
(for-each (for-each
(lambda (file) (lambda (file)
@ -178,6 +177,8 @@
"--disable-muxers" "--disable-muxers"
"--enable-muxer=rtp" "--enable-muxer=rtp"
"--enable-muxer=g722" "--enable-muxer=g722"
"--enable-muxer=g726"
"--enable-muxer=g726le"
"--enable-muxer=h263" "--enable-muxer=h263"
"--enable-muxer=h264" "--enable-muxer=h264"
"--enable-muxer=hevc" "--enable-muxer=hevc"
@ -202,6 +203,9 @@
"--enable-demuxer=wav" "--enable-demuxer=wav"
"--enable-demuxer=ac3" "--enable-demuxer=ac3"
"--enable-demuxer=g722" "--enable-demuxer=g722"
"--enable-demuxer=g723_1"
"--enable-demuxer=g726"
"--enable-demuxer=g726le"
"--enable-demuxer=pcm_mulaw" "--enable-demuxer=pcm_mulaw"
"--enable-demuxer=pcm_alaw" "--enable-demuxer=pcm_alaw"
"--enable-demuxer=pcm_s16be" "--enable-demuxer=pcm_s16be"
@ -222,6 +226,13 @@
;; Encoders/decoders. ;; Encoders/decoders.
"--enable-encoder=adpcm_g722" "--enable-encoder=adpcm_g722"
"--enable-decoder=adpcm_g722" "--enable-decoder=adpcm_g722"
"--enable-encoder=adpcm_g726"
"--enable-decoder=adpcm_g726"
"--enable-encoder=adpcm_g726le"
"--enable-decoder=adpcm_g726le"
"--enable-decoder=g729"
"--enable-encoder=g723_1"
"--enable-decoder=g723_1"
"--enable-encoder=rawvideo" "--enable-encoder=rawvideo"
"--enable-decoder=rawvideo" "--enable-decoder=rawvideo"
"--enable-encoder=libx264" "--enable-encoder=libx264"
@ -387,7 +398,7 @@
"change-RTCP-ratio" "change-RTCP-ratio"
"rtp_ext_abs_send_time" "rtp_ext_abs_send_time"
"libopusdec-enable-FEC" "libopusdec-enable-FEC"
"libopusenc-enable-FEC" "libopusenc-reload-packet-loss-at-encode"
"screen-sharing-x11-fix")))))))))) "screen-sharing-x11-fix"))))))))))
(define-public libjami (define-public libjami
@ -399,18 +410,21 @@
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list (list
;; The test suite fails to link when building libjami as a shared library: ;; The test suite fails to link when building libjami as a shared
;; "testAccount_factory.cpp:(.text+0xc52): undefined reference to ;; library: "sip_account/sip_empty_offer.cpp:228:1: error: no
;; `jami::AccountFactory::AccountFactory()'. ;; declaration matches ‘void
;; jami::test::SipEmptyOfferTest::onCallStateChange(const string&, const
;; string&, jami::test::CallData&)’".
#:tests? #f #:tests? #f
;; The agent links the daemon binary with libguile, which enables the ;; The agent links the daemon binary with libguile, which enables the
;; execution of test plans described in Scheme. It may be useful in ;; execution of test plans described in Scheme. It may be useful in
;; user scripts too, until more generalized Scheme bindings are made ;; user scripts too, until more general purpose Scheme bindings are made
;; (see: test/agent/README.md). ;; available (see: test/agent/README.md).
;; FIXME: Fails to link when building libjami as a shared library: #:configure-flags #~(list "--enable-agent"
;; bindings.cpp:(.text+0x24): undefined reference to `jami::Logger::log "--enable-debug"
;; [...]. ;; Disable static libraries to avoid
#:configure-flags #~(list "--disable-agent" "--enable-debug") ;; installing a 98 MiB archive.
"--disable-static")
#:make-flags #~(list "V=1") ;build verbosely #:make-flags #~(list "V=1") ;build verbosely
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
@ -461,111 +475,6 @@ protocols, as well as decentralized calling using P2P-DHT.")
(define-public libring (define-public libring
(deprecated-package "libring" libjami)) (deprecated-package "libring" libjami))
;;; Note: this package will eventually be absorbed into jami itself (the Qt
;;; client).
(define-public jami-libclient
(package
(name "jami-libclient")
(version %jami-version)
(source %jami-sources)
(build-system cmake-build-system)
(outputs '("out" "debug"))
(arguments
(list
#:tests? #f ;no test suite
#:configure-flags
#~(list (string-append "-DRING_XML_INTERFACES_DIR="
#$(this-package-input "libjami")
"/share/dbus-1/interfaces")
(string-append "-DRING_BUILD_DIR="
#$(this-package-input "libjami")
"/include")
;; Call to the libraries directly instead of going through DBus
;; to avoid issues (see: https://issues.guix.gnu.org/48538).
"-DENABLE_LIBWRAP=true")
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'change-directory/maybe
(lambda _
;; Allow building from the tarball or a git checkout.
(false-if-exception (chdir "lrc")))))))
(inputs
(list libjami network-manager))
(propagated-inputs
(list qtbase-5)) ;Qt is included in several installed headers
(synopsis "Jami client library")
(description "This package provides a library common to all Jami clients.
Jami is a secure and distributed voice, video and chat communication platform
that requires no centralized server and leaves the power of privacy in the
hands of the user. It supports the SIP and IAX protocols, as well as
decentralized calling using P2P-DHT.")
(home-page "https://jami.net")
(license license:gpl3+)))
;;; Remove when 2023 comes.
(define-public libringclient
(deprecated-package "libringclient" jami-libclient))
(define-public jami-gnome
(package
(name "jami-gnome")
(version %jami-version)
(source %jami-sources)
(outputs '("out" "debug"))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ;no test suite
#:imported-modules (,@%cmake-build-system-modules
(guix build glib-or-gtk-build-system))
#:modules ((guix build cmake-build-system)
((guix build glib-or-gtk-build-system) #:prefix gtk:)
(guix build utils))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'change-directory/maybe
(lambda _
;; Allow building from the tarball or a git checkout.
(false-if-exception (chdir "client-gnome"))))
(add-after 'change-directory/maybe 'fix-webkit-detection
(lambda _
(substitute* "CMakeLists.txt"
(("WEBKIT webkit2gtk-4.0")
"WEBKIT webkit2gtk-4.1"))))
(add-after 'change-directory/maybe 'fix-version-string
(lambda _
(substitute* "CMakeLists.txt"
(("^# Set VERSION.*" anchor)
(string-append anchor
"set(PROJECT_VERSION \"" ,version "\")\n")))))
(add-after 'install 'glib-or-gtk-compile-schemas
(assoc-ref gtk:%standard-phases 'glib-or-gtk-compile-schemas))
(add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap
(assoc-ref gtk:%standard-phases 'glib-or-gtk-wrap)))))
(inputs
(list clutter
clutter-gtk
gtk+
jami-libclient
libcanberra
libappindicator
libnotify
network-manager
qrencode
sqlite
webkitgtk))
(native-inputs
(list pkg-config
gettext-minimal
`(,glib "bin"))) ;for glib-compile-resources
(synopsis "Jami client for GNOME")
(description "This package provides a Jami client for the GNOME desktop.
Jami is a secure and distributed voice, video and chat communication platform
that requires no centralized server and leaves the power of privacy in the
hands of the user. It supports the SIP and IAX protocols, as well as
decentralized calling using P2P-DHT.")
(home-page "https://jami.net")
(license license:gpl3+)))
(define-public jami (define-public jami
(package (package
(name "jami") (name "jami")
@ -574,44 +483,68 @@ decentralized calling using P2P-DHT.")
(build-system qt-build-system) (build-system qt-build-system)
(outputs '("out" "debug")) (outputs '("out" "debug"))
(arguments (arguments
`(#:tests? #f ;no test suite (list
#:qtbase qtbase
#:tests? #f ;see comment below
#:configure-flags
;; The test suite fails to build with:
;; "../../../client-qt/src/app/utils.h:29:10: fatal error: QLabel: No
;; such file or directory".
#~(list "-DENABLE_TESTS=OFF"
"-DWITH_WEBENGINE=OFF" ;reduce transitive closure size by 450 MiB
;; Use libwrap to link directly to libjami instead of
;; communicating via D-Bus to jamid, the Jami daemon.
"-DENABLE_LIBWRAP=ON"
(string-append "-DLIBJAMI_XML_INTERFACES_DIR="
#$(this-package-input "libjami")
"/share/dbus-1/interfaces")
(string-append "-DLIBJAMI_INCLUDE_DIR="
#$(this-package-input "libjami") "/include/jami"))
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'change-directory/maybe (add-after 'unpack 'change-directory/maybe
(lambda _ (lambda _
;; Allow building from the tarball or a git checkout. ;; Allow building from the tarball or a git checkout.
(false-if-exception (chdir "client-qt")))) (false-if-exception (chdir "client-qt"))))
(add-after 'change-directory/maybe 'fix-version-string (add-after 'change-directory/maybe 'fix-version-string
(lambda _ (lambda _
(substitute* "src/version.h" (substitute* "src/app/version.h"
(("VERSION_STRING") (("VERSION_STRING")
"BUILD_DATE") ;to avoid a redefinition error "BUILD_DATE") ;to avoid a redefinition error
(("// clang-format on.*" anchor) (("// clang-format on.*" anchor)
(string-append "const char VERSION_STRING[] = \"" (string-append "const char VERSION_STRING[] = \""
,version "\";\n" #$version "\";\n"
anchor))))) anchor)))))
(add-after 'change-directory/maybe 'use-desktop-opengl (add-after 'change-directory/maybe 'patch-source
;; TODO: Remove after next release; this is no longer specified in
;; the source following the update to Qt 6.
(lambda _ (lambda _
(substitute* "src/main.cpp" (substitute* "src/libclient/CMakeLists.txt"
(("Qt::AA_UseOpenGLES") ;; Fix submitted upstream (see:
"Qt::AA_UseDesktopOpenGL"))))))) ;; https://review.jami.net/c/jami-client-qt/+/21830).
(("target_link_libraries\\(\\$\\{LIBCLIENT_NAME} qtwrapper.*" all)
(string-append
all " target_link_libraries(${LIBCLIENT_NAME} avutil)\n"))))))))
(native-inputs (native-inputs
(list pkg-config python qttools doxygen graphviz)) (list googletest
pkg-config
python
qttools
doxygen
graphviz
vulkan-headers))
(inputs (inputs
(list jami-libclient (list ffmpeg-jami
libjami
libnotify libnotify
libxkbcommon
network-manager network-manager
qrencode qrencode
qtsvg qt5compat
qtwebengine
qtwebchannel
qtmultimedia
qtdeclarative qtdeclarative
qtgraphicaleffects qtmultimedia
qtquickcontrols qtnetworkauth
qtquickcontrols2)) qtpositioning
qtsvg
vulkan-loader))
(home-page "https://jami.net") (home-page "https://jami.net")
(synopsis "Qt Jami client") (synopsis "Qt Jami client")
(description "This package provides the Jami Qt client. Jami is a secure (description "This package provides the Jami Qt client. Jami is a secure
@ -621,6 +554,10 @@ It supports the SIP and IAX protocols, as well as decentralized calling using
P2P-DHT.") P2P-DHT.")
(license license:gpl3+))) (license license:gpl3+)))
;;; Remove when 2023 comes.
(define-public jami-gnome
(deprecated-package "jami-gnome" jami))
;;; Remove when 2023 comes. ;;; Remove when 2023 comes.
(define-public jami-qt (define-public jami-qt
(deprecated-package "jami-qt" jami)) (deprecated-package "jami-qt" jami))

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

@ -185,7 +185,7 @@ common build settings used in software produced by the KDE community.")
(native-inputs (native-inputs
;; TODO: Think about adding pulseaudio. Is it required for sound? ;; TODO: Think about adding pulseaudio. Is it required for sound?
;; TODO: Add building the super experimental QML support ;; TODO: Add building the super experimental QML support
(list extra-cmake-modules pkg-config qttools)) (list extra-cmake-modules pkg-config qttools-5))
(inputs (inputs
(list qtbase-5)) (list qtbase-5))
(arguments (arguments
@ -222,7 +222,7 @@ common build settings used in software produced by the KDE community.")
"1wk1ip2w7fkh65zk6rilj314dna0hgsv2xhjmpr5w08xa8sii1y5")))) "1wk1ip2w7fkh65zk6rilj314dna0hgsv2xhjmpr5w08xa8sii1y5"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
(list extra-cmake-modules pkg-config qttools)) (list extra-cmake-modules pkg-config qttools-5))
(inputs (inputs
(list qtbase-5 (list qtbase-5
phonon phonon
@ -304,7 +304,7 @@ http://freedesktop.org/wiki/Specifications/open-collaboration-services/")
(native-inputs (native-inputs
(list dbus extra-cmake-modules)) (list dbus extra-cmake-modules))
(inputs (inputs
;; TODO: qtdeclarative (yields one failing test) ;; TODO: qtdeclarative-5 (yields one failing test)
(list qtbase-5)) (list qtbase-5))
(arguments (arguments
(list #:configure-flags (list #:configure-flags
@ -489,7 +489,7 @@ and the older vCalendar.")
"0y9n2a5n18pasdmrp0xb84hla9l27yj2x3k4p1c041sd9nkwixpk")))) "0y9n2a5n18pasdmrp0xb84hla9l27yj2x3k4p1c041sd9nkwixpk"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
(list extra-cmake-modules gperf qttools)) (list extra-cmake-modules gperf qttools-5))
(inputs (inputs
(list qtbase-5)) (list qtbase-5))
(home-page "https://community.kde.org/Frameworks") (home-page "https://community.kde.org/Frameworks")
@ -523,7 +523,7 @@ Internet).")
"1s3h4hfpw7c0894cifj66bj1yhx8g94ckvl71jm7qqsb5x5h6y9n")))) "1s3h4hfpw7c0894cifj66bj1yhx8g94ckvl71jm7qqsb5x5h6y9n"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
(list dbus extra-cmake-modules inetutils qttools (list dbus extra-cmake-modules inetutils qttools-5
xorg-server-for-tests)) xorg-server-for-tests))
(inputs (inputs
(list qtbase-5)) (list qtbase-5))
@ -585,7 +585,7 @@ propagate their changes to their respective configuration files.")
"10a7zys3limsawl7lk9ggymk3msk2bp0y8hp0jmsvk3l405pd1ps")))) "10a7zys3limsawl7lk9ggymk3msk2bp0y8hp0jmsvk3l405pd1ps"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
(list extra-cmake-modules qttools shared-mime-info (list extra-cmake-modules qttools-5 shared-mime-info
;; TODO: FAM: File alteration notification http://oss.sgi.com/projects/fam ;; TODO: FAM: File alteration notification http://oss.sgi.com/projects/fam
xorg-server-for-tests)) ; for the tests xorg-server-for-tests)) ; for the tests
(inputs (inputs
@ -641,7 +641,7 @@ many more.")
(patches (search-patches "kdbusaddons-kinit-file-name.patch")))) (patches (search-patches "kdbusaddons-kinit-file-name.patch"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
(list extra-cmake-modules dbus qttools)) (list extra-cmake-modules dbus qttools-5))
(inputs (inputs
(list qtbase-5 qtx11extras kinit-bootstrap)) ;; kinit-bootstrap: kinit package which does not depend on kdbusaddons. (list qtbase-5 qtx11extras kinit-bootstrap)) ;; kinit-bootstrap: kinit package which does not depend on kdbusaddons.
(arguments (arguments
@ -681,7 +681,7 @@ as well as an API to create KDED modules.")
"0wadknnf472rqg2xnqzs5v23qzqfr336wj6d96yg2ayqm0chbppy")))) "0wadknnf472rqg2xnqzs5v23qzqfr336wj6d96yg2ayqm0chbppy"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
(list extra-cmake-modules qttools)) (list extra-cmake-modules qttools-5))
(inputs (inputs
(list avahi ; alternativly dnssd could be used (list avahi ; alternativly dnssd could be used
qtbase-5)) qtbase-5))
@ -712,7 +712,7 @@ infrastructure.")
graphviz graphviz
kiconthemes kiconthemes
kparts kparts
qtsvg)) qtsvg-5))
(native-inputs (native-inputs
(list pkg-config extra-cmake-modules kdoctools)) (list pkg-config extra-cmake-modules kdoctools))
(home-page "https://apps.kde.org/en/kgraphviewer") (home-page "https://apps.kde.org/en/kgraphviewer")
@ -773,9 +773,9 @@ interfaces in the areas of colors, fonts, text, images, keyboard input.")
(display "[testDefaultRegions]\n*\n"))) (display "[testDefaultRegions]\n*\n")))
#t))))) #t)))))
(native-inputs (native-inputs
(list extra-cmake-modules qttools)) (list extra-cmake-modules qttools-5))
(inputs (inputs
(list qtbase-5 qtdeclarative)) (list qtbase-5 qtdeclarative-5))
(home-page "https://invent.kde.org/frameworks/kholidays") (home-page "https://invent.kde.org/frameworks/kholidays")
(synopsis "Library for regional holiday information") (synopsis "Library for regional holiday information")
(description "This library provides a C++ API that determines holiday and (description "This library provides a C++ API that determines holiday and
@ -802,7 +802,7 @@ other special events for a geographical region.")
(native-inputs (native-inputs
(list extra-cmake-modules)) (list extra-cmake-modules))
(inputs (inputs
(list qtbase-5 qtdeclarative qtscript)) (list qtbase-5 qtdeclarative-5 qtscript))
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
@ -868,16 +868,16 @@ or user activity.")
(properties `((upstream-name . "kirigami2"))) (properties `((upstream-name . "kirigami2")))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
(list extra-cmake-modules qttools)) (list extra-cmake-modules qttools-5))
(inputs (inputs
(list kwindowsystem (list kwindowsystem
;; TODO: Find a way to activate this optional include without ;; TODO: Find a way to activate this optional include without
;; introducing a recursive dependency. ;; introducing a recursive dependency.
;;("plasma-frameworks" ,plasma-framework) ;; Tier 3! ;;("plasma-frameworks" ,plasma-framework) ;; Tier 3!
qtbase-5 qtbase-5
qtdeclarative qtdeclarative-5
qtquickcontrols2 qtquickcontrols2-5
qtsvg qtsvg-5
;; Run-time dependency ;; Run-time dependency
qtgraphicaleffects)) qtgraphicaleffects))
(home-page "https://community.kde.org/Frameworks") (home-page "https://community.kde.org/Frameworks")
@ -904,7 +904,7 @@ of applications that follow the Kirigami Human Interface Guidelines.")
(native-inputs (native-inputs
(list extra-cmake-modules)) (list extra-cmake-modules))
(inputs (inputs
(list qtbase-5 qtdeclarative)) (list qtbase-5 qtdeclarative-5))
(home-page "https://community.kde.org/Frameworks") (home-page "https://community.kde.org/Frameworks")
(synopsis "Set of item models extending the Qt model-view framework") (synopsis "Set of item models extending the Qt model-view framework")
(description "KItemModels provides the following models: (description "KItemModels provides the following models:
@ -952,7 +952,7 @@ model to observers
"04vlmkvc3y5h7cpb6kdv9gha5axxkimhqh44mdg2ncyn4sas6j68")))) "04vlmkvc3y5h7cpb6kdv9gha5axxkimhqh44mdg2ncyn4sas6j68"))))
(build-system qt-build-system) (build-system qt-build-system)
(native-inputs (native-inputs
(list extra-cmake-modules qttools)) (list extra-cmake-modules qttools-5))
(inputs (inputs
(list qtbase-5)) (list qtbase-5))
(home-page "https://community.kde.org/Frameworks") (home-page "https://community.kde.org/Frameworks")
@ -977,7 +977,7 @@ to flat and hierarchical lists.")
"1wj4n2a8iz9ml1y0012xkpsx3dfp5gl2dn80sifrzvkxjxrhwach")))) "1wj4n2a8iz9ml1y0012xkpsx3dfp5gl2dn80sifrzvkxjxrhwach"))))
(build-system qt-build-system) (build-system qt-build-system)
(native-inputs (native-inputs
(list extra-cmake-modules qttools)) (list extra-cmake-modules qttools-5))
(inputs (inputs
(list qtbase-5)) (list qtbase-5))
(home-page "https://community.kde.org/Frameworks") (home-page "https://community.kde.org/Frameworks")
@ -1004,7 +1004,7 @@ pixel units.")
"12jn7lqsp86329spai7n1n8i65nwhxh8gp33wkq543h7w3i2a3jb")))) "12jn7lqsp86329spai7n1n8i65nwhxh8gp33wkq543h7w3i2a3jb"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
(list extra-cmake-modules perl qttools (list extra-cmake-modules perl qttools-5
;; Optional, for compile-time validation of syntax definition files: ;; Optional, for compile-time validation of syntax definition files:
qtxmlpatterns)) qtxmlpatterns))
(inputs (inputs
@ -1088,7 +1088,7 @@ represented by a QPoint or a QSize.")
"03l37lh219np7pqfa56r2v7n5s5xg4rjq005qng4b5izd95ri56j")))) "03l37lh219np7pqfa56r2v7n5s5xg4rjq005qng4b5izd95ri56j"))))
(build-system qt-build-system) (build-system qt-build-system)
(native-inputs (native-inputs
(list extra-cmake-modules qttools xorg-server-for-tests)) (list extra-cmake-modules qttools-5 xorg-server-for-tests))
(inputs (inputs
(list qtbase-5)) (list qtbase-5))
(arguments (arguments
@ -1127,7 +1127,7 @@ configuration pages, message boxes, and password requests.")
pkg-config pkg-config
dbus ; for the tests dbus ; for the tests
openbox ; for the tests openbox ; for the tests
qttools qttools-5
xorg-server-for-tests)) ; for the tests xorg-server-for-tests)) ; for the tests
(inputs (inputs
`(("libxrender" ,libxrender) `(("libxrender" ,libxrender)
@ -1306,7 +1306,7 @@ provides uniform access to generation of barcodes with data.")
(native-inputs (native-inputs
(list extra-cmake-modules pkg-config)) (list extra-cmake-modules pkg-config))
(inputs (inputs
(list glib pulseaudio qtdeclarative qtbase-5)) (list glib pulseaudio qtdeclarative-5 qtbase-5))
(home-page "https://invent.kde.org/libraries/pulseaudio-qt/") (home-page "https://invent.kde.org/libraries/pulseaudio-qt/")
(synopsis "Qt bindings for PulseAudio") (synopsis "Qt bindings for PulseAudio")
(description (description
@ -1341,8 +1341,8 @@ libpulse.")
kiconthemes ; optional kiconthemes ; optional
kirigami kirigami
qtbase-5 qtbase-5
qtdeclarative qtdeclarative-5
qtquickcontrols2)) qtquickcontrols2-5))
(home-page "https://community.kde.org/Frameworks") (home-page "https://community.kde.org/Frameworks")
(synopsis "QtQuickControls2 style that integrates with the desktop") (synopsis "QtQuickControls2 style that integrates with the desktop")
(description "This is a style for QtQuickControls2 which is using (description "This is a style for QtQuickControls2 which is using
@ -1373,10 +1373,10 @@ feel.")
(setenv "DBUS_FATAL_WARNINGS" "0") (setenv "DBUS_FATAL_WARNINGS" "0")
(invoke "dbus-launch" "ctest" ".")))))) (invoke "dbus-launch" "ctest" "."))))))
(native-inputs (native-inputs
(list bison dbus extra-cmake-modules flex qttools)) (list bison dbus extra-cmake-modules flex qttools-5))
(inputs (inputs
`(("qtbase" ,qtbase-5) `(("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative) ("qtdeclarative-5" ,qtdeclarative-5)
("udev" ,eudev))) ("udev" ,eudev)))
;; TODO: Add runtime-only dependency MediaPlayerInfo ;; TODO: Add runtime-only dependency MediaPlayerInfo
(home-page "https://community.kde.org/Frameworks") (home-page "https://community.kde.org/Frameworks")
@ -1401,7 +1401,7 @@ system.")
"0b88h5fw1n8zyrg0vq3lj2jbjjyh0mk64lj6ab3643kxzqxbn30w")))) "0b88h5fw1n8zyrg0vq3lj2jbjjyh0mk64lj6ab3643kxzqxbn30w"))))
(build-system qt-build-system) (build-system qt-build-system)
(native-inputs (native-inputs
(list extra-cmake-modules pkg-config qttools)) (list extra-cmake-modules pkg-config qttools-5))
(inputs (inputs
(list hunspell (list hunspell
;; TODO: hspell (for Hebrew), Voikko (for Finish) ;; TODO: hspell (for Hebrew), Voikko (for Finish)
@ -1476,7 +1476,7 @@ uses a job-based interface to queue tasks and execute them in an efficient way."
kwindowsystem kwindowsystem
kxmlgui kxmlgui
qtbase-5 qtbase-5
qtdeclarative qtdeclarative-5
solid)) solid))
(home-page "https://community.kde.org/Frameworks") (home-page "https://community.kde.org/Frameworks")
(synopsis "Core components for the KDE Activity concept") (synopsis "Core components for the KDE Activity concept")
@ -1503,7 +1503,7 @@ with other frameworks.")
"0nmdz7ra3hpg0air4lfkzilv7cwx3zxs29k7sh8l3i1fs3qpjwxm")))) "0nmdz7ra3hpg0air4lfkzilv7cwx3zxs29k7sh8l3i1fs3qpjwxm"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
(list dbus extra-cmake-modules qttools)) (list dbus extra-cmake-modules qttools-5))
(inputs (inputs
(list kcoreaddons polkit-qt qtbase-5)) (list kcoreaddons polkit-qt qtbase-5))
(arguments (arguments
@ -1546,7 +1546,7 @@ utilities.")
"1pjgya8wi28jx63hcdi9v5f5487gzbkw2j1iganhd7bhcb8s7zpy")))) "1pjgya8wi28jx63hcdi9v5f5487gzbkw2j1iganhd7bhcb8s7zpy"))))
(build-system qt-build-system) (build-system qt-build-system)
(native-inputs (native-inputs
(list extra-cmake-modules qttools)) (list extra-cmake-modules qttools-5))
(inputs (inputs
(list kconfig kwidgetsaddons qtbase-5)) (list kconfig kwidgetsaddons qtbase-5))
(home-page "https://community.kde.org/Frameworks") (home-page "https://community.kde.org/Frameworks")
@ -1715,7 +1715,7 @@ from DocBook files.")
karchive karchive
kcoreaddons kcoreaddons
ki18n ki18n
qtmultimedia qtmultimedia-5
qtbase-5 qtbase-5
;; Required run-time packages ;; Required run-time packages
catdoc catdoc
@ -1800,7 +1800,7 @@ formats.")
"13kdczzyyh17hf6vlhh4li5bn4yq5bab5xa8mm63r9rynxihgclf")))) "13kdczzyyh17hf6vlhh4li5bn4yq5bab5xa8mm63r9rynxihgclf"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
(list extra-cmake-modules qttools)) (list extra-cmake-modules qttools-5))
(inputs (inputs
(list kcoreaddons kwidgetsaddons qtbase-5 qtx11extras)) (list kcoreaddons kwidgetsaddons qtbase-5 qtx11extras))
(home-page "https://community.kde.org/Frameworks") (home-page "https://community.kde.org/Frameworks")
@ -1824,7 +1824,7 @@ asynchronous jobs.")
"01bn23xw2n53h9nl99lm3cjnqs8s66bmwkzf6fkpg9rzkykizbyc")))) "01bn23xw2n53h9nl99lm3cjnqs8s66bmwkzf6fkpg9rzkykizbyc"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
(list extra-cmake-modules dbus qttools)) (list extra-cmake-modules dbus qttools-5))
(inputs (inputs
(list kcodecs (list kcodecs
kconfig kconfig
@ -2053,7 +2053,7 @@ between feed formats.")
kxmlgui kxmlgui
lmdb lmdb
qtbase-5 qtbase-5
qtdeclarative qtdeclarative-5
solid)) solid))
(arguments (arguments
`(#:phases `(#:phases
@ -2108,7 +2108,7 @@ maintaining an index of the contents of your files.")
(native-inputs (native-inputs
(list extra-cmake-modules)) (list extra-cmake-modules))
(inputs (inputs
(list boost kactivities kconfig qtbase-5 qtdeclarative)) (list boost kactivities kconfig qtbase-5 qtdeclarative-5))
(home-page "https://community.kde.org/Frameworks") (home-page "https://community.kde.org/Frameworks")
(synopsis "Access usage statistics collected by the activity manager") (synopsis "Access usage statistics collected by the activity manager")
(description "The KActivitiesStats library provides a querying mechanism for (description "The KActivitiesStats library provides a querying mechanism for
@ -2134,7 +2134,7 @@ by which applications, and what documents have been linked to which activity.")
(propagated-inputs (propagated-inputs
(list kwidgetsaddons)) (list kwidgetsaddons))
(native-inputs (native-inputs
(list extra-cmake-modules qttools)) (list extra-cmake-modules qttools-5))
(inputs (inputs
(list kauth (list kauth
kcodecs kcodecs
@ -2205,7 +2205,7 @@ using the XBEL format.")
kwidgetsaddons kwidgetsaddons
kxmlgui kxmlgui
qtbase-5 qtbase-5
qtdeclarative)) qtdeclarative-5))
(home-page "https://community.kde.org/Frameworks") (home-page "https://community.kde.org/Frameworks")
(synopsis "Utilities for KDE System Settings modules") (synopsis "Utilities for KDE System Settings modules")
(description "KCMUtils provides various classes to work with KCModules. (description "KCMUtils provides various classes to work with KCModules.
@ -2236,7 +2236,7 @@ KCModules can be created with the KConfigWidgets framework.")
ki18n ki18n
;; todo: PythonModuleGeneration ;; todo: PythonModuleGeneration
qtbase-5 qtbase-5
qttools)) qttools-5))
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
@ -2293,7 +2293,7 @@ their settings.")
kxmlgui kxmlgui
libepoxy libepoxy
qtbase-5 qtbase-5
qtdeclarative qtdeclarative-5
solid)) solid))
(arguments (arguments
`(#:phases `(#:phases
@ -2362,7 +2362,7 @@ started on demand.")
"0dr6gcag2yzx8fvxis4x403jrcisywds95cywmiyz3pb5727cak2")))) "0dr6gcag2yzx8fvxis4x403jrcisywds95cywmiyz3pb5727cak2"))))
(build-system qt-build-system) (build-system qt-build-system)
(native-inputs (native-inputs
(list extra-cmake-modules qttools)) (list extra-cmake-modules qttools-5))
(inputs (inputs
(list kconfig (list kconfig
kcoreaddons kcoreaddons
@ -2431,7 +2431,7 @@ with su and ssh respectively.")
"0y9ja3znkvzdbjfs91dwr4cmvl9fk97zpz2lkf0f9zhm2nw6q008")))) "0y9ja3znkvzdbjfs91dwr4cmvl9fk97zpz2lkf0f9zhm2nw6q008"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
(list extra-cmake-modules qttools)) (list extra-cmake-modules qttools-5))
(inputs (inputs
(list kconfig (list kconfig
kcoreaddons kcoreaddons
@ -2500,7 +2500,7 @@ emoticons coming from different providers.")
"0hmqigc8myiwwh7m6y2cm4vn0d3kmrhia179hyb84vpvvn3lm93z")))) "0hmqigc8myiwwh7m6y2cm4vn0d3kmrhia179hyb84vpvvn3lm93z"))))
(build-system qt-build-system) (build-system qt-build-system)
(native-inputs (native-inputs
(list extra-cmake-modules pkg-config qttools)) (list extra-cmake-modules pkg-config qttools-5))
(inputs (inputs
(list kconfig (list kconfig
kcrash kcrash
@ -2534,7 +2534,7 @@ window does not need focus for them to be activated.")
"09bqpf3drqyfc81vgab9bsh1wm5qbzdwqjlczhax38660nnvh0r9")))) "09bqpf3drqyfc81vgab9bsh1wm5qbzdwqjlczhax38660nnvh0r9"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
(list extra-cmake-modules qttools shared-mime-info)) (list extra-cmake-modules qttools-5 shared-mime-info))
(inputs (inputs
(list karchive (list karchive
kauth kauth
@ -2546,7 +2546,7 @@ window does not need focus for them to be activated.")
kitemviews kitemviews
kwidgetsaddons kwidgetsaddons
qtbase-5 qtbase-5
qtsvg)) qtsvg-5))
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
@ -2661,7 +2661,7 @@ consumption.")
kxmlgui kxmlgui
solid)) solid))
(native-inputs (native-inputs
(list dbus qttools extra-cmake-modules)) (list dbus qttools-5 extra-cmake-modules))
(inputs (inputs
`(;; TODO: LibACL , <ftp://oss.sgi.com/projects/xfs/cmd_tars> `(;; TODO: LibACL , <ftp://oss.sgi.com/projects/xfs/cmd_tars>
("krb5" ,mit-krb5) ("krb5" ,mit-krb5)
@ -2761,7 +2761,7 @@ KIO enabled infrastructure.")
ktextwidgets ktextwidgets
kwidgetsaddons kwidgetsaddons
qtbase-5 qtbase-5
qtdeclarative qtdeclarative-5
solid solid
sonnet)) sonnet))
(arguments (arguments
@ -2897,7 +2897,7 @@ widgets with a user-interface defined in terms of actions.")
kservice kservice
kwidgetsaddons kwidgetsaddons
qtbase-5 qtbase-5
qtdeclarative)) qtdeclarative-5))
(arguments (arguments
`(#:tests? #f)) ; FIXME: 1/3 tests fail. `(#:tests? #f)) ; FIXME: 1/3 tests fail.
(home-page "https://community.kde.org/Frameworks") (home-page "https://community.kde.org/Frameworks")
@ -2947,7 +2947,7 @@ to easily extend the contacts collection.")
kwindowsystem kwindowsystem
kxmlgui kxmlgui
qtbase-5 qtbase-5
qtdeclarative qtdeclarative-5
solid solid
threadweaver)) threadweaver))
(arguments (arguments
@ -3078,7 +3078,7 @@ types or handled by application specific code.")
libgit2 libgit2
perl perl
qtbase-5 qtbase-5
qtdeclarative qtdeclarative-5
qtscript qtscript
qtxmlpatterns qtxmlpatterns
solid solid
@ -3133,7 +3133,7 @@ library.")
(propagated-inputs (propagated-inputs
(list ki18n sonnet)) (list ki18n sonnet))
(native-inputs (native-inputs
(list extra-cmake-modules qttools)) (list extra-cmake-modules qttools-5))
(inputs (inputs
(list kauth (list kauth
kcodecs kcodecs
@ -3213,7 +3213,7 @@ the passwords on KDE work spaces.")
(propagated-inputs (propagated-inputs
(list kconfig kconfigwidgets)) (list kconfig kconfigwidgets))
(native-inputs (native-inputs
(list extra-cmake-modules qttools)) (list extra-cmake-modules qttools-5))
(inputs (inputs
(list attica (list attica
kauth kauth
@ -3337,9 +3337,9 @@ setUrl, setUserAgent and call.")
("kxmlgui" ,kxmlgui) ("kxmlgui" ,kxmlgui)
("phonon" ,phonon) ("phonon" ,phonon)
("qtbase" ,qtbase-5) ("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative) ("qtdeclarative-5" ,qtdeclarative-5)
("qtquickcontrols2" ,qtquickcontrols2) ("qtquickcontrols2-5" ,qtquickcontrols2-5)
("qtsvg" ,qtsvg) ("qtsvg-5" ,qtsvg-5)
("qtx11extras" ,qtx11extras) ("qtx11extras" ,qtx11extras)
("solid" ,solid))) ("solid" ,solid)))
(arguments (arguments
@ -3384,7 +3384,7 @@ script engines.")
kio kio
kirigami kirigami
qtbase-5 qtbase-5
qtdeclarative)) qtdeclarative-5))
(arguments (arguments
`(#:tests? #f ;; seem to require network; don't find QTQuick components `(#:tests? #f ;; seem to require network; don't find QTQuick components
#:phases #:phases
@ -3548,8 +3548,8 @@ workspace.")
libsm libsm
networkmanager-qt networkmanager-qt
openssl openssl
qtsvg qtsvg-5
qttools qttools-5
qtx11extras)) qtx11extras))
;; FIXME: Use Guix ca-bundle.crt in etc/xdg/ksslcalist and ;; FIXME: Use Guix ca-bundle.crt in etc/xdg/ksslcalist and
;; share/kf5/kssl/ca-bundle.crt ;; share/kf5/kssl/ca-bundle.crt
@ -3698,9 +3698,9 @@ support.")
(base32 "0976faazhxhhi1wpvpcs8hwb2knz0z7j44v3ay3hw73rq4p3bipm")))) (base32 "0976faazhxhhi1wpvpcs8hwb2knz0z7j44v3ay3hw73rq4p3bipm"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
(list extra-cmake-modules kdoctools qttools)) (list extra-cmake-modules kdoctools qttools-5))
(inputs (inputs
(list ki18n kjs qtbase-5 qtsvg)) (list ki18n kjs qtbase-5 qtsvg-5))
(home-page "https://community.kde.org/Frameworks") (home-page "https://community.kde.org/Frameworks")
(synopsis "KDE Frameworks 5 embedded Javascript engine for Qt") (synopsis "KDE Frameworks 5 embedded Javascript engine for Qt")
(description "KJSEmbed provides a method of binding Javascript objects to (description "KJSEmbed provides a method of binding Javascript objects to
@ -3722,7 +3722,7 @@ QObjects, so you can script your applications.")
(base32 "0lrm4y727nhwaivl37zpmnrwx048gfhyjw19m6q5z9p37lk43jja")))) (base32 "0lrm4y727nhwaivl37zpmnrwx048gfhyjw19m6q5z9p37lk43jja"))))
(build-system qt-build-system) (build-system qt-build-system)
(native-inputs (native-inputs
(list extra-cmake-modules kdoctools qttools)) (list extra-cmake-modules kdoctools qttools-5))
(inputs (inputs
(list kcompletion (list kcompletion
kcoreaddons kcoreaddons
@ -3758,7 +3758,7 @@ KParts instead.")
(base32 "12b527l12rcf421p613ydbacilp9v9iy90ma35w21sdf9a15k675")))) (base32 "12b527l12rcf421p613ydbacilp9v9iy90ma35w21sdf9a15k675"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
(list extra-cmake-modules kdoctools qttools)) (list extra-cmake-modules kdoctools qttools-5))
(inputs (inputs
(list kcompletion (list kcompletion
kcoreaddons kcoreaddons

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

@ -88,7 +88,7 @@
qca qca
qoauth qoauth
qtbase-5 qtbase-5
qtnetworkauth qtnetworkauth-5
sonnet)) sonnet))
(home-page "https://kde.org/applications/internet/org.kde.choqok") (home-page "https://kde.org/applications/internet/org.kde.choqok")
(synopsis "Micro-Blogging Client") (synopsis "Micro-Blogging Client")

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

@ -172,12 +172,12 @@ This package is part of the KDE multimedia module.")
oxygen-icons ; default icon set oxygen-icons ; default icon set
phonon phonon
qtbase-5 qtbase-5
qtdeclarative qtdeclarative-5
qtgraphicaleffects ; not listed as dependency qtgraphicaleffects ; not listed as dependency
qtmultimedia qtmultimedia-5
qtquickcontrols qtquickcontrols-5
qtquickcontrols2 qtquickcontrols2-5
qtsvg qtsvg-5
qtx11extras qtx11extras
;; TODO: upnpqt https://gitlab.com/homeautomationqt/upnp-player-qt ;; TODO: upnpqt https://gitlab.com/homeautomationqt/upnp-player-qt
vlc)) vlc))
@ -269,7 +269,7 @@ This package is part of the KDE multimedia module.")
phonon phonon
phonon-backend-gstreamer phonon-backend-gstreamer
qtbase-5 qtbase-5
qtsvg qtsvg-5
taglib)) taglib))
(home-page "https://kde.org/applications/multimedia/org.kde.juk") (home-page "https://kde.org/applications/multimedia/org.kde.juk")
(synopsis "Music jukebox / music player") (synopsis "Music jukebox / music player")
@ -322,7 +322,7 @@ This package is part of the KDE multimedia module.")
kdoctools kdoctools
libxslt libxslt
python-wrapper python-wrapper
qttools)) qttools-5))
(inputs (inputs
(list chromaprint (list chromaprint
flac flac
@ -335,8 +335,8 @@ This package is part of the KDE multimedia module.")
kxmlgui kxmlgui
libvorbis libvorbis
qtbase-5 qtbase-5
qtdeclarative qtdeclarative-5
qtmultimedia qtmultimedia-5
readline readline
taglib taglib
zlib)) zlib))
@ -529,10 +529,10 @@ autoloading of subtitle files for use while playing video.")
oxygen-icons ; default icon set oxygen-icons ; default icon set
purpose purpose
qtbase-5 qtbase-5
qtdeclarative qtdeclarative-5
qtgraphicaleffects qtgraphicaleffects
qtquickcontrols qtquickcontrols-5
qtquickcontrols2 ; not listed as dependency qtquickcontrols2-5 ; not listed as dependency
qtx11extras)) qtx11extras))
(arguments (arguments
(list #:tests? #f ; test program gets built, but is not found (list #:tests? #f ; test program gets built, but is not found
@ -625,7 +625,7 @@ This package is part of the KDE multimedia module.")
phonon phonon
qtbase-5 qtbase-5
cairo cairo
qtsvg qtsvg-5
qtx11extras qtx11extras
xcb-util xcb-util
xcb-util-cursor xcb-util-cursor
@ -698,7 +698,7 @@ Some features:
oxygen-icons ; default icon set oxygen-icons ; default icon set
pulseaudio pulseaudio
qtbase-5 qtbase-5
qtmultimedia qtmultimedia-5
zlib)) zlib))
(home-page "https://kde.org/applications/multimedia/org.kde.kwave") (home-page "https://kde.org/applications/multimedia/org.kde.kwave")
(synopsis "Sound editor for KDE") (synopsis "Sound editor for KDE")

54
gnu/packages/kde-pim.scm
View file

@ -58,7 +58,7 @@
"akonadi-not-relocatable.patch")))) "akonadi-not-relocatable.patch"))))
(build-system qt-build-system) (build-system qt-build-system)
(native-inputs (native-inputs
(list extra-cmake-modules qttools shared-mime-info)) (list extra-cmake-modules qttools-5 shared-mime-info))
(inputs (inputs
(list boost (list boost
kconfig kconfig
@ -537,7 +537,7 @@ one of the APIs mentioned above.")
(properties `((upstream-name . "calendarsupport"))) (properties `((upstream-name . "calendarsupport")))
(build-system qt-build-system) (build-system qt-build-system)
(native-inputs (native-inputs
(list extra-cmake-modules qttools)) (list extra-cmake-modules qttools-5))
(inputs (inputs
(list akonadi (list akonadi
akonadi-calendar akonadi-calendar
@ -724,11 +724,11 @@ for KDE PIM.")
;; TODO: libkolab ;; TODO: libkolab
qca qca
qtbase-5 qtbase-5
qtdeclarative qtdeclarative-5
qtnetworkauth qtnetworkauth-5
qtspeech qtspeech
qtwebchannel qtwebchannel-5
qtwebengine qtwebengine-5
qtxmlpatterns)) qtxmlpatterns))
(arguments (arguments
;; TODO: 5/45 tests fail for quite different reasons, even with ;; TODO: 5/45 tests fail for quite different reasons, even with
@ -769,7 +769,7 @@ package.")
(properties `((upstream-name . "eventviews"))) (properties `((upstream-name . "eventviews")))
(build-system qt-build-system) (build-system qt-build-system)
(native-inputs (native-inputs
(list extra-cmake-modules qttools)) (list extra-cmake-modules qttools-5))
(inputs (inputs
(list akonadi (list akonadi
akonadi-calendar akonadi-calendar
@ -1070,9 +1070,9 @@ and retrieving certificates from LDAP servers.")
oxygen-icons ; default icon set, required for tests oxygen-icons ; default icon set, required for tests
qgpgme qgpgme
qtbase-5 qtbase-5
qtdeclarative qtdeclarative-5
qtwebchannel qtwebchannel-5
qtwebengine qtwebengine-5
sonnet)) sonnet))
(arguments (arguments
`(#:phases `(#:phases
@ -1108,7 +1108,7 @@ manager from KDE.")
(properties `((upstream-name . "mailcommon"))) (properties `((upstream-name . "mailcommon")))
(build-system qt-build-system) (build-system qt-build-system)
(native-inputs (native-inputs
(list extra-cmake-modules dbus gnupg qttools)) (list extra-cmake-modules dbus gnupg qttools-5))
(inputs (inputs
(list akonadi (list akonadi
akonadi-contacts akonadi-contacts
@ -1322,9 +1322,9 @@ using a Qt/KMime C++ API.")
qca qca
qgpgme qgpgme
qtbase-5 qtbase-5
qtdeclarative qtdeclarative-5
qtwebchannel qtwebchannel-5
qtwebengine qtwebengine-5
qtwebkit qtwebkit
sonnet)) sonnet))
(arguments (arguments
@ -1496,7 +1496,7 @@ application \"Parts\" to be embedded as a Kontact component (or plugin).")
(base32 "04lz3ldrr0lpy9zpsg9ja1i9gxzlcjpqcwn3g7l4jjdky4frcr2r")))) (base32 "04lz3ldrr0lpy9zpsg9ja1i9gxzlcjpqcwn3g7l4jjdky4frcr2r"))))
(build-system qt-build-system) (build-system qt-build-system)
(native-inputs (native-inputs
(list extra-cmake-modules dbus qttools kdoctools)) (list extra-cmake-modules dbus qttools-5 kdoctools))
(inputs (inputs
(list akonadi (list akonadi
akonadi-calendar akonadi-calendar
@ -1620,7 +1620,7 @@ Virtual Contact File}) files to the KPeople contact management library.")
(properties `((upstream-name . "pimcommon"))) (properties `((upstream-name . "pimcommon")))
(build-system qt-build-system) (build-system qt-build-system)
(native-inputs (native-inputs
(list extra-cmake-modules qttools)) (list extra-cmake-modules qttools-5))
(inputs (inputs
(list karchive (list karchive
akonadi akonadi
@ -1656,7 +1656,7 @@ Virtual Contact File}) files to the KPeople contact management library.")
libxslt libxslt
purpose purpose
qtbase-5 qtbase-5
qtwebengine)) qtwebengine-5))
(arguments (arguments
`(#:tests? #f)) ;; TODO tests hang `(#:tests? #f)) ;; TODO tests hang
(home-page "https://invent.kde.org/pim/pimcommon") (home-page "https://invent.kde.org/pim/pimcommon")
@ -1678,7 +1678,7 @@ Virtual Contact File}) files to the KPeople contact management library.")
(base32 "0j6d4sv405c3x0ww75qsww94apidsb8aaqf59akhv96zmv0vx5wy")))) (base32 "0j6d4sv405c3x0ww75qsww94apidsb8aaqf59akhv96zmv0vx5wy"))))
(build-system qt-build-system) (build-system qt-build-system)
(native-inputs (native-inputs
(list extra-cmake-modules qttools)) (list extra-cmake-modules qttools-5))
(inputs (inputs
(list grantlee (list grantlee
kcodecs kcodecs
@ -1791,7 +1791,7 @@ and allows one to view/extract message formatted text in Rich Text Format.")
(base32 "0bask561laxgkgm3rxfpyxqs6jx1l9xjk058lhycq0pik6vwhdha")))) (base32 "0bask561laxgkgm3rxfpyxqs6jx1l9xjk058lhycq0pik6vwhdha"))))
(build-system qt-build-system) (build-system qt-build-system)
(native-inputs (native-inputs
(list extra-cmake-modules qttools)) (list extra-cmake-modules qttools-5))
(inputs (inputs
(list akonadi (list akonadi
akonadi-contacts akonadi-contacts
@ -1838,7 +1838,7 @@ and allows one to view/extract message formatted text in Rich Text Format.")
(base32 "0nvd5fqrvyb7c3g7rf1lxbbv38q9sqnhd6irgx7awwgw92inxky4")))) (base32 "0nvd5fqrvyb7c3g7rf1lxbbv38q9sqnhd6irgx7awwgw92inxky4"))))
(build-system qt-build-system) (build-system qt-build-system)
(native-inputs (native-inputs
(list extra-cmake-modules qttools)) (list extra-cmake-modules qttools-5))
(inputs (inputs
(list cyrus-sasl (list cyrus-sasl
ki18n ki18n
@ -1848,9 +1848,9 @@ and allows one to view/extract message formatted text in Rich Text Format.")
kwallet kwallet
kwindowsystem kwindowsystem
qtbase-5 qtbase-5
qtdeclarative qtdeclarative-5
qtwebchannel qtwebchannel-5
qtwebengine)) qtwebengine-5))
(arguments (arguments
`(#:tests? #f)) ;; TODO 6/48 tests fail `(#:tests? #f)) ;; TODO 6/48 tests fail
(home-page "https://invent.kde.org/pim/libkgapi") (home-page "https://invent.kde.org/pim/libkgapi")
@ -1873,7 +1873,7 @@ various Google services.")
(base32 "0rijpmqyx4mrr7csik3vkfcra7kfywk6yz548fmq3ha8wa9ax8fv")))) (base32 "0rijpmqyx4mrr7csik3vkfcra7kfywk6yz548fmq3ha8wa9ax8fv"))))
(build-system qt-build-system) (build-system qt-build-system)
(native-inputs (native-inputs
(list extra-cmake-modules kdoctools qttools)) (list extra-cmake-modules kdoctools qttools-5))
(inputs (inputs
(list boost (list boost
gpgme gpgme
@ -1931,9 +1931,9 @@ KDE using certificate-based crypto.")
kwindowsystem kwindowsystem
libkdepim libkdepim
qtbase-5 qtbase-5
qtdeclarative qtdeclarative-5
qtwebchannel qtwebchannel-5
qtwebengine)) qtwebengine-5))
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases

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

@ -78,7 +78,7 @@
kwayland ; optional kwayland ; optional
kwindowsystem kwindowsystem
qtbase-5 qtbase-5
qtdeclarative ; optional qtdeclarative-5 ; optional
qtx11extras)) qtx11extras))
(home-page "https://invent.kde.org/plasma/breeze") (home-page "https://invent.kde.org/plasma/breeze")
(synopsis "Default KDE Plasma theme") (synopsis "Default KDE Plasma theme")
@ -209,7 +209,7 @@ call it if it is not associated to a terminal.")
("linux-pam" ,linux-pam) ("linux-pam" ,linux-pam)
("logind" ,elogind) ;optional loginctl support ("logind" ,elogind) ;optional loginctl support
("qtbase" ,qtbase-5) ("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative) ("qtdeclarative-5" ,qtdeclarative-5)
("qtx11extras" ,qtx11extras) ("qtx11extras" ,qtx11extras)
("solid" ,solid) ("solid" ,solid)
("wayland" ,wayland) ("wayland" ,wayland)
@ -276,7 +276,7 @@ basic needs and easy to configure for those who want special setups.")
("kwidgetsaddons" ,kwidgetsaddons) ("kwidgetsaddons" ,kwidgetsaddons)
("kservice" ,kservice) ("kservice" ,kservice)
("qtbase" ,qtbase-5) ("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative) ("qtdeclarative-5" ,qtdeclarative-5)
("qtscript" ,qtscript) ("qtscript" ,qtscript)
("qtwebkit" ,qtwebkit) ("qtwebkit" ,qtwebkit)
("qtx11extras" ,qtx11extras) ("qtx11extras" ,qtx11extras)

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

@ -346,7 +346,7 @@ This package is part of the KDE administration module.")
kwidgetsaddons kwidgetsaddons
kwindowsystem kwindowsystem
qtbase-5 qtbase-5
qtsvg qtsvg-5
qtx11extras)) qtx11extras))
(home-page "https://www.kde.org/applications/system/yakuake/") (home-page "https://www.kde.org/applications/system/yakuake/")
(synopsis "Quad-style terminal emulator for KDE") (synopsis "Quad-style terminal emulator for KDE")

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

@ -407,7 +407,7 @@ either be created or generated from a image.")
(base32 "03wsv83l1cay2dpcsksad124wzan7kh8zxdw1h0yicn398kdbck4")))) (base32 "03wsv83l1cay2dpcsksad124wzan7kh8zxdw1h0yicn398kdbck4"))))
(build-system qt-build-system) (build-system qt-build-system)
(native-inputs (native-inputs
(list extra-cmake-modules kdoctools qttools shared-mime-info)) (list extra-cmake-modules kdoctools qttools-5 shared-mime-info))
(inputs (inputs
(list kbookmarks (list kbookmarks
kcmutils kcmutils
@ -531,7 +531,7 @@ remind you to take a break now and then.")
oxygen-icons ;; default icon set oxygen-icons ;; default icon set
plasma-framework plasma-framework
qtbase-5 qtbase-5
qtdeclarative qtdeclarative-5
solid)) solid))
(home-page "https://kde.org/applications/utilities/org.kde.smb4k") (home-page "https://kde.org/applications/utilities/org.kde.smb4k")
(synopsis "Samba (SMB) share advanced browser") (synopsis "Samba (SMB) share advanced browser")

82
gnu/packages/kde.scm
View file

@ -170,7 +170,7 @@ This package contains GUI widgets for baloo.")
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin/akregator")) (bin (string-append out "/bin/akregator"))
(qt-process-path (string-append (qt-process-path (string-append
(assoc-ref inputs "qtwebengine") (assoc-ref inputs "qtwebengine-5")
"/lib/qt5/libexec/QtWebEngineProcess"))) "/lib/qt5/libexec/QtWebEngineProcess")))
(wrap-program bin (wrap-program bin
`("QTWEBENGINEPROCESS_PATH" = (,qt-process-path))) `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path)))
@ -205,9 +205,9 @@ This package contains GUI widgets for baloo.")
libkleo libkleo
qgpgme qgpgme
qtbase-5 qtbase-5
qtdeclarative qtdeclarative-5
qtwebchannel qtwebchannel-5
qtwebengine qtwebengine-5
syndication)) syndication))
(home-page "https://apps.kde.org/en/akregator") (home-page "https://apps.kde.org/en/akregator")
(synopsis "KDE Feed Reader") (synopsis "KDE Feed Reader")
@ -261,7 +261,7 @@ browser for easy news reading.")
`("MLT_PREFIX" ":" = `("MLT_PREFIX" ":" =
(,#$(this-package-input "mlt")))))))))) (,#$(this-package-input "mlt"))))))))))
(native-inputs (native-inputs
(list extra-cmake-modules pkg-config qttools)) (list extra-cmake-modules pkg-config qttools-5))
(inputs (inputs
(list bash-minimal (list bash-minimal
breeze ; make dark them available easily breeze ; make dark them available easily
@ -285,14 +285,14 @@ browser for easy news reading.")
mlt mlt
purpose purpose
qtbase-5 qtbase-5
qtdeclarative qtdeclarative-5
qtgraphicaleffects qtgraphicaleffects
qtmultimedia qtmultimedia-5
qtnetworkauth qtnetworkauth-5
qtquickcontrols qtquickcontrols-5
qtquickcontrols2 qtquickcontrols2-5
qtscript qtscript
qtsvg qtsvg-5
shared-mime-info)) shared-mime-info))
(home-page "https://kdenlive.org") (home-page "https://kdenlive.org")
(synopsis "Non-linear video editor") (synopsis "Non-linear video editor")
@ -318,7 +318,7 @@ projects.")
(base32 "02ip5r67hjfpywkm3mz86n6wbqcr7996ifzfd2fyzsvm4998hi4y")))) (base32 "02ip5r67hjfpywkm3mz86n6wbqcr7996ifzfd2fyzsvm4998hi4y"))))
(build-system qt-build-system) (build-system qt-build-system)
(native-inputs (native-inputs
(list extra-cmake-modules pkg-config shared-mime-info qttools)) (list extra-cmake-modules pkg-config shared-mime-info qttools-5))
(inputs (inputs
`(("boost" ,boost) `(("boost" ,boost)
("clang" ,clang) ("clang" ,clang)
@ -345,9 +345,9 @@ projects.")
("libkomparediff2" ,libkomparediff2) ("libkomparediff2" ,libkomparediff2)
("oxygen-icons" ,oxygen-icons) ("oxygen-icons" ,oxygen-icons)
("qtbase" ,qtbase-5) ("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative) ("qtdeclarative-5" ,qtdeclarative-5)
("qtquickcontrols" ,qtquickcontrols) ;; not checked as requirement ("qtquickcontrols-5" ,qtquickcontrols-5) ;; not checked as requirement
("qtquickcontrols2" ,qtquickcontrols2) ;; not checked as requirement ("qtquickcontrols2-5" ,qtquickcontrols2-5) ;; not checked as requirement
("qtwebkit" ,qtwebkit) ("qtwebkit" ,qtwebkit)
("threadweaver" ,threadweaver) ("threadweaver" ,threadweaver)
@ -436,9 +436,9 @@ for some KDevelop language plugins (Ruby, PHP, CSS...).")
"kdiagram-Fix-missing-link-libraries.patch")))) "kdiagram-Fix-missing-link-libraries.patch"))))
(build-system qt-build-system) (build-system qt-build-system)
(native-inputs (native-inputs
(list extra-cmake-modules qttools)) (list extra-cmake-modules qttools-5))
(inputs (inputs
(list qtbase-5 qtsvg)) (list qtbase-5 qtsvg-5))
(home-page "https://invent.kde.org/graphics/kdiagram") (home-page "https://invent.kde.org/graphics/kdiagram")
(synopsis "Libraries for creating business diagrams") (synopsis "Libraries for creating business diagrams")
(description "This package provides libraries for integrating business (description "This package provides libraries for integrating business
@ -539,9 +539,9 @@ expression library, that is used in Krita.")
perl perl
poppler-qt5 poppler-qt5
qtbase-5 qtbase-5
qtdeclarative qtdeclarative-5
qtmultimedia qtmultimedia-5
qtsvg qtsvg-5
qtx11extras qtx11extras
quazip-0 quazip-0
zlib)) zlib))
@ -577,7 +577,7 @@ features include brush stabilizers, brush engines and wrap-around mode.")
kio kio
ki18n ki18n
qtbase-5 qtbase-5
qtsvg qtsvg-5
qtxmlpatterns)) qtxmlpatterns))
(home-page "https://apps.kde.org/en/massif-visualizer") (home-page "https://apps.kde.org/en/massif-visualizer")
(synopsis "Visualize massif data generated by Valgrind") (synopsis "Visualize massif data generated by Valgrind")
@ -690,7 +690,7 @@ cards.")
(inputs (inputs
(list qtbase-5)) (list qtbase-5))
(native-inputs (native-inputs
(list extra-cmake-modules qttools)) (list extra-cmake-modules qttools-5))
(home-page "https://techbase.kde.org/Projects/Snorenotify") (home-page "https://techbase.kde.org/Projects/Snorenotify")
(synopsis "Qt notification framework") (synopsis "Qt notification framework")
(description "Snorenotify is a multi platform Qt notification framework. (description "Snorenotify is a multi platform Qt notification framework.
@ -745,11 +745,11 @@ different notification systems.")
pulseaudio-qt pulseaudio-qt
qca qca
qtbase-5 qtbase-5
qtdeclarative qtdeclarative-5
qtgraphicaleffects qtgraphicaleffects
qtmultimedia qtmultimedia-5
qtquickcontrols qtquickcontrols-5
qtquickcontrols2 qtquickcontrols2-5
qtx11extras)) qtx11extras))
(home-page "https://community.kde.org/KDEConnect") (home-page "https://community.kde.org/KDEConnect")
(synopsis "Enable your devices to communicate with each other") (synopsis "Enable your devices to communicate with each other")
@ -804,7 +804,7 @@ communicate with each other. Here's a few things KDE Connect can do:
("extra-cmake-modules" ,extra-cmake-modules) ("extra-cmake-modules" ,extra-cmake-modules)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("python" ,python-wrapper) ("python" ,python-wrapper)
("qttools" ,qttools))) ("qttools-5" ,qttools-5)))
(inputs (inputs
(list breeze ;for dark themes (list breeze ;for dark themes
breeze-icons ;for icons breeze-icons ;for icons
@ -828,7 +828,7 @@ communicate with each other. Here's a few things KDE Connect can do:
kwidgetsaddons kwidgetsaddons
kxmlgui kxmlgui
qtbase-5 qtbase-5
qtsvg qtsvg-5
shared-mime-info shared-mime-info
;; Optional. ;; Optional.
cfitsio cfitsio
@ -863,7 +863,7 @@ to perform data analysis.")
(native-inputs (native-inputs
(list extra-cmake-modules)) (list extra-cmake-modules))
(inputs (inputs
(list qtbase-5 qtdeclarative)) (list qtbase-5 qtdeclarative-5))
(home-page "https://phabricator.kde.org/source/kqtquickcharts/") (home-page "https://phabricator.kde.org/source/kqtquickcharts/")
(synopsis "Interactive charts for Qt Quick") (synopsis "Interactive charts for Qt Quick")
(description (description
@ -917,7 +917,7 @@ unmount drives and view them in a file manager.")
"0fx17s6fj1pxl1mgfrqhchk8sihkbji1x8y3nhb1r0971wzd1nsc")))) "0fx17s6fj1pxl1mgfrqhchk8sihkbji1x8y3nhb1r0971wzd1nsc"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
(list extra-cmake-modules perl python qttools kdoctools)) (list extra-cmake-modules perl python qttools-5 kdoctools))
(inputs (inputs
(list qtbase-5 karchive ki18n kio kdbusaddons)) (list qtbase-5 karchive ki18n kio kdbusaddons))
;; Note: The 'hotshot2calltree' and 'pprof2calltree' scripts depend on ;; Note: The 'hotshot2calltree' and 'pprof2calltree' scripts depend on
@ -977,8 +977,8 @@ Python, PHP, and Perl.")
libsndfile libsndfile
openal openal
qtbase-5 qtbase-5
qtdeclarative qtdeclarative-5
qtsvg)) qtsvg-5))
(home-page "https://games.kde.org/") (home-page "https://games.kde.org/")
(synopsis "Runtime library for kdegames") (synopsis "Runtime library for kdegames")
(description "Runtime library for kdegames") (description "Runtime library for kdegames")
@ -1007,7 +1007,7 @@ Python, PHP, and Perl.")
"-DBUILD_TOUCH=YES" "-DBUILD_TOUCH=YES"
"-DBUILD_MARBLE_TESTS=FALSE"))) "-DBUILD_MARBLE_TESTS=FALSE")))
(native-inputs (native-inputs
(list extra-cmake-modules qttools)) (list extra-cmake-modules qttools-5))
;; One optional dependency missing: libwlocate. ;; One optional dependency missing: libwlocate.
(inputs (inputs
(list gpsd (list gpsd
@ -1024,12 +1024,12 @@ Python, PHP, and Perl.")
phonon phonon
protobuf protobuf
qtbase-5 qtbase-5
qtdeclarative qtdeclarative-5
qtlocation qtlocation
qtserialport qtserialport
qtsvg qtsvg-5
qtwebchannel qtwebchannel-5
qtwebengine qtwebengine-5
shapelib shapelib
shared-mime-info shared-mime-info
zlib)) zlib))
@ -1094,8 +1094,8 @@ creating routes by drag and drop and more.")
phonon phonon
poppler-qt5 poppler-qt5
qca qca
qtdeclarative qtdeclarative-5
qtsvg qtsvg-5
threadweaver threadweaver
kcrash kcrash
kjs)) kjs))
@ -1216,7 +1216,7 @@ or Bonjour by other projects).")
(build-system qt-build-system) (build-system qt-build-system)
(native-inputs (native-inputs
(list extra-cmake-modules (list extra-cmake-modules
qttools qttools-5
;; For optional component "Survey target expression parser" ;; For optional component "Survey target expression parser"
bison bison
flex flex
@ -1225,7 +1225,7 @@ or Bonjour by other projects).")
;;("phpunit" ,phpunit) ;;("phpunit" ,phpunit)
)) ))
(inputs (inputs
(list qtbase-5 qtcharts qtdeclarative qtsvg)) (list qtbase-5 qtcharts qtdeclarative-5 qtsvg-5))
(arguments (arguments
`(#:tests? #f)) ;; 4/17 fail `(#:tests? #f)) ;; 4/17 fail
(home-page "https://api.kde.org/frameworks/kuserfeedback/html/") (home-page "https://api.kde.org/frameworks/kuserfeedback/html/")

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