me/guix
Archived
1
0
Fork 0
Code Activity

Merge branch 'ungrafting' into staging

Browse source
This commit is contained in:
Marius Bakke 2020-12-13 20:50:50 +01:00
commit d13ed52da2
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
151 changed files with 6677 additions and 2566 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Makefile.am
View file

@ -39,6 +39,7 @@ do_subst = $(SED) \
-e 's,[@]GUILE[@],$(GUILE),g' \
-e 's,[@]guilemoduledir[@],$(guilemoduledir),g' \
-e 's,[@]guileobjectdir[@],$(guileobjectdir),g' \
-e 's,[@]abs_top_builddir[@],$(abs_top_builddir),g' \
-e 's,[@]localedir[@],$(localedir),g'
scripts/guix: scripts/guix.in Makefile

3
config-daemon.ac
View file

@ -13,7 +13,7 @@ if test "x$guix_build_daemon" = "xyes"; then
GUIX_ASSERT_CXX11
AC_PROG_RANLIB
AC_CONFIG_HEADER([nix/config.h])
AC_CONFIG_HEADERS([nix/config.h])
dnl Use 64-bit file system calls so that we can support files > 2 GiB.
AC_SYS_LARGEFILE
@ -34,7 +34,6 @@ if test "x$guix_build_daemon" = "xyes"; then
dnl Look for SQLite, a required dependency.
PKG_CHECK_MODULES([SQLITE3], [sqlite3 >= 3.6.19])
AC_DEFINE([NIX_VERSION], ["0.0.0"], [Fake Nix version number.])
AC_DEFINE_UNQUOTED([SYSTEM], ["$guix_system"],
[Guix host system type--i.e., platform and OS kernel tuple.])

12
configure.ac
View file

@ -1,7 +1,7 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.68)
AC_PREREQ([2.69])
AC_INIT([GNU Guix],
[m4_esyscmd([build-aux/git-version-gen .tarball-version])],
[bug-guix@gnu.org], [guix],
@ -29,35 +29,35 @@ GUIX_ASSERT_SUPPORTED_SYSTEM
AM_CONDITIONAL([CROSS_COMPILING], [test "x$cross_compiling" = "xyes"])
AC_ARG_WITH(store-dir,
AC_HELP_STRING([--with-store-dir=PATH],
AS_HELP_STRING([--with-store-dir=PATH],
[file name of the store (defaults to /gnu/store)]),
[storedir="$withval"],
[storedir="/gnu/store"])
AC_SUBST(storedir)
AC_ARG_WITH([bash-completion-dir],
AC_HELP_STRING([--with-bash-completion-dir=DIR],
AS_HELP_STRING([--with-bash-completion-dir=DIR],
[name of the Bash completion directory]),
[bashcompletiondir="$withval"],
[bashcompletiondir='${sysconfdir}/bash_completion.d'])
AC_SUBST([bashcompletiondir])
AC_ARG_WITH([zsh-completion-dir],
AC_HELP_STRING([--with-zsh-completion-dir=DIR],
AS_HELP_STRING([--with-zsh-completion-dir=DIR],
[name of the Zsh completion directory]),
[zshcompletiondir="$withval"],
[zshcompletiondir='${datadir}/zsh/site-functions'])
AC_SUBST([zshcompletiondir])
AC_ARG_WITH([fish-completion-dir],
AC_HELP_STRING([--with-fish-completion-dir=DIR],
AS_HELP_STRING([--with-fish-completion-dir=DIR],
[name of the Fish completion directory]),
[fishcompletiondir="$withval"],
[fishcompletiondir='${datadir}/fish/vendor_completions.d'])
AC_SUBST([fishcompletiondir])
AC_ARG_WITH([selinux-policy-dir],
AC_HELP_STRING([--with-selinux-policy-dir=DIR],
AS_HELP_STRING([--with-selinux-policy-dir=DIR],
[name of the SELinux policy directory]),
[selinux_policydir="$withval"],
[selinux_policydir='${datadir}/selinux/'])

80
doc/guix.texi
View file

@ -1606,6 +1606,14 @@ Servers may serve substitute over HTTP, unencrypted, so anyone on the
LAN can see what software you’re installing.
@end enumerate
It is also possible to enable or disable substitute server discovery at
run-time by running:
@example
herd discover guix-daemon on
herd discover guix-daemon off
@end example
@item --disable-deduplication
@cindex deduplication
Disable automatic file ``deduplication'' in the store.
@ -2383,9 +2391,9 @@ bootloaders.
Once you are done partitioning the target hard disk drive, you have to
create a file system on the relevant partition(s)@footnote{Currently
Guix System only supports ext4, btrfs, and JFS file systems. In particular,
code that reads file system UUIDs and labels only works for these file system
types.}. For the ESP, if you have one and assuming it is
Guix System only supports ext4, btrfs, JFS, and F2FS file systems. In
particular, code that reads file system UUIDs and labels only works for these
file system types.}. For the ESP, if you have one and assuming it is
@file{/dev/sda1}, run:
@example
@ -2778,7 +2786,7 @@ the command prints and, similar to what we saw above, paste these two
lines in your terminal and @file{.bash_profile}:
@example
GUIX_PROFILE="$HOME/.config/guix/current/etc/profile"
GUIX_PROFILE="$HOME/.config/guix/current"
. "$GUIX_PROFILE/etc/profile"
@end example
@ -11283,6 +11291,25 @@ in Guix.
@cindex OCaml
Import metadata from the @uref{https://opam.ocaml.org/, OPAM} package
repository used by the OCaml community.
Additional options include:
@table @code
@item --recursive
@itemx -r
Traverse the dependency graph of the given upstream package recursively
and generate package expressions for all those packages that are not yet
in Guix.
@item --repo
Select the given repository (a repository name). Possible values include:
@itemize
@item @code{opam}, the default opam repository,
@item @code{coq} or @code{coq-released}, the stable repository for coq packages,
@item @code{coq-core-dev}, the repository that contains development versions of coq,
@item @code{coq-extra-dev}, the repository that contains development versions
of coq packages.
@end itemize
@end table
@end table
The structure of the @command{guix import} code is modular. It would be
@ -15326,6 +15353,14 @@ The TCP port to listen for connections.
The host (and thus, network interface) to listen to. Use
@code{"0.0.0.0"} to listen on all the network interfaces.
@item @code{advertise?} (default: @code{#f})
When true, advertise the service on the local network @i{via} the DNS-SD
protocol, using Avahi.
This allows neighboring Guix devices with discovery on (see
@code{guix-configuration} above) to discover this @command{guix publish}
instance and to automatically download substitutes from it.
@item @code{compression} (default: @code{'(("gzip" 3))})
This is a list of compression method/level tuple used when compressing
substitutes. For example, to compress all substitutes with @emph{both} lzip
@ -18555,6 +18590,12 @@ This service adds the @code{xfce} package to the system profile, and
extends polkit with the ability for @code{thunar} to manipulate the file
system as root from within a user session, after the user has authenticated
with the administrator's password.
Note that @code{xfce4-panel} and its plugin packages should be installed in
the same profile to ensure compatibility. When using this service, you should
add extra plugins (@code{xfce4-whiskermenu-plugin},
@code{xfce4-weather-plugin}, etc.) to the @code{packages} field of your
@code{operating-system}.
@end defvr
@deftp {Data Type} xfce-desktop-configuration
@ -22021,13 +22062,10 @@ where monitoring these statistics is desirable.
@defvar {Scheme variable} prometheus-node-exporter-service-type
This is the service type for the
@uref{https://github.com/prometheus/node_exporter/, prometheus-node-exporter}
service, its value must be a @code{prometheus-node-exporter-configuration}
record as in this example:
service, its value must be a @code{prometheus-node-exporter-configuration}.
@lisp
(service prometheus-node-exporter-service-type
(prometheus-node-exporter-configuration
(web-listen-address ":9100")))
(service prometheus-node-exporter-service-type)
@end lisp
@end defvar
@ -22041,6 +22079,14 @@ The prometheus-node-exporter package to use.
@item @code{web-listen-address} (default: @code{":9100"})
Bind the web interface to the specified address.
@item @code{textfile-directory} (default: @code{"/var/lib/prometheus/node-exporter"})
This directory can be used to export metrics specific to this machine.
Files containing metrics in the text format, with the filename ending in
@code{.prom} should be placed in this directory.
@item @code{extra-options} (default: @code{'()})
Extra options to pass to the Prometheus node exporter.
@end table
@end deftp
@ -25676,6 +25722,9 @@ Owner's group of the @code{cuirass} process.
Number of seconds between the poll of the repositories followed by the
Cuirass jobs.
@item @code{queue-size} (default: @code{1})
Size of the database writer queue.
@item @code{database} (default: @code{"/var/lib/cuirass/cuirass.db"})
Location of sqlite database which contains the build results and previously
added specifications.
@ -32789,10 +32838,15 @@ Bootstrapping in our context refers to how the distribution gets built
``from nothing''. Remember that the build environment of a derivation
contains nothing but its declared inputs (@pxref{Introduction}). So
there's an obvious chicken-and-egg problem: how does the first package
get built? How does the first compiler get compiled? Note that this is
a question of interest only to the curious hacker, not to the regular
user, so you can shamelessly skip this section if you consider yourself
a ``regular user''.
get built? How does the first compiler get compiled?
It is tempting to think of this question as one that only die-hard
hackers may care about. However, while the answer to that question is
technical in nature, its implications are wide-ranging. How the
distribution is bootstrapped defines the extent to which we, as
individuals and as a collective of users and hackers, can trust the
software we run. It is a central concern from the standpoint of
@emph{security} and from a @emph{user freedom} viewpoint.
@cindex bootstrap binaries
The GNU system is primarily made of C code, with libc at its core. The

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

@ -167,7 +167,9 @@
(process (fork execmem setrlimit setpgid setsched)))
(allow guix_daemon_t
guix_daemon_exec_t
(file (execute execute_no_trans read open entrypoint map)))
(file (execute
execute_no_trans read write open entrypoint map
getattr link unlink)))
;; TODO: unknown
(allow guix_daemon_t

26
etc/news.scm
View file

@ -20,6 +20,7 @@
(entry (commit "79f9dee3c4c0e6d21066f142116a537207ae7ba4")
(title (en "Local substitute servers discovery is now supported")
(de "Substitutserver können jetzt im lokalen Netz erkannt werden")
(es "Los servidores de sustituciones se pueden descubrir localmente")
(fr "La découverte des serveurs de substituts locaux est désormais supportée"))
(body
(en "The @command{guix-daemon} can now discover local substitute
@ -34,6 +35,12 @@ gefunden, die mit der Befehlszeilenoption @option{--advertise} gestartet
wurden. Die Ermittlung im Netzwerk verfügbarer Substitutserver baut auf den
Protokollen mDNS und DNS-SD auf. Derzeit wird dazu die Bibliothek Guile-Avahi
benutzt.")
(es "El daemon @command{guix-daemon} ahora puede descubrir servidores
de sustituciones locales cuando se le proporciona la opción
@option{--discover}. Únicamente se descubrirán los servidores de
sustituciones que se hayan arrancado con la opción @option{--advertise}. La
búsqueda en la red se basa en los protocolos mDNS y DNS-SD, actualmente
mediante el uso de la biblioteca Guile-Avahi.")
(fr "Le @command{guix-daemon} peut désormais découvrir les serveurs
de substituts locaux lorsque l'option @option{--discover} est passée. Seuls
les serveurs de substituts démarrés avec l'option @option{--advertise} seront
@ -42,7 +49,8 @@ l'instant grâce à la librairie Guile-Avahi.")))
(entry (commit "a9a2fdaabcc78e7a54d9a6bcfa4ee3de308e9a90")
(title (en "Logical Volume Manager (LVM) now supported on Guix System")
(de "Logical Volume Manager (LVM) wird jetzt auf Guix System unterstützt"))
(de "Logical Volume Manager (LVM) wird jetzt auf Guix System unterstützt")
(es "El sistema Guix ahora implementa también volúmenes lógicos LVM"))
(body
(en "On Guix System, the new @code{lvm-device-mapping} variable
allows you to declare ``mapped devices'' for LVM, the Linux Logical Volume
@ -70,7 +78,21 @@ Datenträgergruppe (Volume Group) „vg0“ wie folgt deklariert werden:
(type lvm-device-mapping))
@end lisp
Siehe @command{info \"(guix.de) Zugeordnete Geräte\"} für nähere Informationen.")))
Siehe @command{info \"(guix.de) Zugeordnete Geräte\"} für nähere Informationen.")
(es "En el sistema Guix, la nueva variable @code{lvm-device-mapping}
le permite declarar «dispositivos traducidos» para LVM, el gestor de volúmenes
lógicos de Linux. A continuación se muestra un ejemplo con la declaración de
los volúmenes lógicos «alfa» y «beta» del grupo de volúmenes «vg0»:
@lisp
(mapped-device
(source \"vg0\")
(target (list \"vg0-alfa\" \"vg0-beta\"))
(type lvm-device-mapping))
@end lisp
Véase @command{info \"(guix.es) Dispositivos traducidos\"} para obtener más
información.")))
(entry (commit "3b6e4e5fd05e72b8a32ff1a2d5e21464260e21e6")
(title (en "List of substitute keys is now declarative on Guix System")

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

@ -44,7 +44,7 @@
(let ((userns-file "/proc/sys/kernel/unprivileged_userns_clone"))
(if (file-exists? userns-file)
(eqv? #\1 (call-with-input-file userns-file read-char))
#f)))
#t)))
(define (setgroups-supported?)
"Return #t if the setgroups proc file, introduced in Linux-libre 3.19,

7
gnu/installer.scm
View file

@ -266,6 +266,13 @@ selected keymap."
(compute (lambda _
((installer-network-page current-installer)))))
;; Ask whether to enable substitute server discovery.
(installer-step
(id 'substitutes)
(description (G_ "Substitute server discovery"))
(compute (lambda _
((installer-substitutes-page current-installer)))))
;; Prompt for users (name, group and home directory).
(installer-step
(id 'user)

5
gnu/installer/newt.scm
View file

@ -30,6 +30,7 @@
#:use-module (gnu installer newt page)
#:use-module (gnu installer newt partition)
#:use-module (gnu installer newt services)
#:use-module (gnu installer newt substitutes)
#:use-module (gnu installer newt timezone)
#:use-module (gnu installer newt user)
#:use-module (gnu installer newt utils)
@ -101,6 +102,9 @@ problem. The backtrace is displayed below. Please report it by email to \
(define (network-page)
(run-network-page))
(define (substitutes-page)
(run-substitutes-page))
(define (hostname-page)
(run-hostname-page))
@ -130,6 +134,7 @@ problem. The backtrace is displayed below. Please report it by email to \
(locale-page locale-page)
(menu-page menu-page)
(network-page network-page)
(substitutes-page substitutes-page)
(timezone-page timezone-page)
(hostname-page hostname-page)
(user-page user-page)

43
gnu/installer/newt/substitutes.scm Normal file
View file

@ -0,0 +1,43 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020 Mathieu Othacehe <othacehe@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
;;; GNU Guix is free software; you can redistribute it and/or modify it
;;; under the terms of the GNU General Public License as published by
;;; the Free Software Foundation; either version 3 of the License, or (at
;;; your option) any later version.
;;;
;;; GNU Guix is distributed in the hope that it will be useful, but
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;;; GNU General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu installer newt substitutes)
#:use-module (gnu installer substitutes)
#:use-module (gnu installer utils)
#:use-module (guix i18n)
#:use-module (newt)
#:use-module (ice-9 match)
#:export (run-substitutes-page))
(define* (run-substitutes-page)
(match (current-clients)
(()
(case (choice-window
(G_ "Substitute server discovery.")
(G_ "Enable") (G_ "Disable")
(G_ " By turning this option on, you allow Guix to fetch \
substitutes (pre-built binaries) during installation from servers \
discovered on your local area network (LAN) in addition to the official \
server. This can increase download throughput.
There are no security risks: only genuine substitutes may be retrieved from \
those servers. However, eavesdroppers on your LAN may be able to see what \
software you are installing."))
((1) (enable-discovery))
((2) (disable-discovery))))
(_ #f)))

6
gnu/installer/proxy.scm
View file

@ -17,15 +17,11 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu installer proxy)
#:use-module (gnu installer utils)
#:use-module (gnu services herd)
#:export (set-http-proxy
clear-http-proxy))
(define-syntax-rule (with-silent-shepherd exp ...)
(parameterize ((shepherd-message-port
(%make-void-port "w")))
exp ...))
(define (set-http-proxy proxy)
(with-silent-shepherd
(with-shepherd-action 'guix-daemon

3
gnu/installer/record.scm
View file

@ -33,6 +33,7 @@
installer-locale-page
installer-menu-page
installer-network-page
installer-substitutes-page
installer-timezone-page
installer-hostname-page
installer-user-page
@ -73,6 +74,8 @@
(menu-page installer-menu-page)
;; procedure void -> void
(network-page installer-network-page)
;; procedure void -> void
(substitutes-page installer-substitutes-page)
;; procedure (zonetab) -> posix-timezone
(timezone-page installer-timezone-page)
;; procedure void -> void

41
gnu/installer/substitutes.scm Normal file
View file

@ -0,0 +1,41 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
;;; GNU Guix is free software; you can redistribute it and/or modify it
;;; under the terms of the GNU General Public License as published by
;;; the Free Software Foundation; either version 3 of the License, or (at
;;; your option) any later version.
;;;
;;; GNU Guix is distributed in the hope that it will be useful, but
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;;; GNU General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu installer substitutes)
#:use-module (gnu installer utils)
#:use-module (gnu services herd)
#:export (enable-discovery
disable-discovery))
(define (enable-discovery)
(with-silent-shepherd
(with-shepherd-action 'guix-daemon
('discover "on")
result
result)))
(define (disable-discovery)
(with-silent-shepherd
(with-shepherd-action 'guix-daemon
('discover "off")
result
result)))
;; Local Variables:
;; eval: (put 'with-silent-shepherd 'scheme-indent-function 0)
;; End:

11
gnu/installer/utils.scm
View file

@ -18,6 +18,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu installer utils)
#:use-module (gnu services herd)
#:use-module (guix utils)
#:use-module (guix build utils)
#:use-module (guix i18n)
@ -43,7 +44,9 @@
with-server-socket
current-server-socket
current-clients
send-to-clients))
send-to-clients
with-silent-shepherd))
(define* (read-lines #:optional (port (current-input-port)))
"Read lines from PORT and return them as a list."
@ -233,3 +236,9 @@ accepting socket."
(current-clients (reverse remainder))
exp)
(define-syntax-rule (with-silent-shepherd exp ...)
"Evaluate EXP while discarding shepherd messages."
(parameterize ((shepherd-message-port
(%make-void-port "w")))
exp ...))

15
gnu/local.mk
View file

@ -205,6 +205,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/erlang.scm \
%D%/packages/fabric-management.scm \
%D%/packages/fcitx.scm \
%D%/packages/fcitx5.scm \
%D%/packages/figlet.scm \
%D%/packages/file.scm \
%D%/packages/file-systems.scm \
@ -716,6 +717,7 @@ INSTALLER_MODULES = \
%D%/installer/record.scm \
%D%/installer/services.scm \
%D%/installer/steps.scm \
%D%/installer/substitutes.scm \
%D%/installer/tests.scm \
%D%/installer/timezone.scm \
%D%/installer/user.scm \
@ -732,6 +734,7 @@ INSTALLER_MODULES = \
%D%/installer/newt/page.scm \
%D%/installer/newt/partition.scm \
%D%/installer/newt/services.scm \
%D%/installer/newt/substitutes.scm \
%D%/installer/newt/timezone.scm \
%D%/installer/newt/user.scm \
%D%/installer/newt/utils.scm \
@ -856,7 +859,6 @@ dist_patch_DATA = \
%D%/packages/patches/blender-2.79-python-3.7-fix.patch \
%D%/packages/patches/blender-2.79-python-3.8-fix.patch \
%D%/packages/patches/bpftrace-disable-bfd-disasm.patch \
%D%/packages/patches/busybox-1.31.1-fix-build-with-glibc-2.31.patch \
%D%/packages/patches/byobu-writable-status.patch \
%D%/packages/patches/calibre-no-updates-dialog.patch \
%D%/packages/patches/calibre-remove-test-sqlite.patch \
@ -1055,6 +1057,8 @@ dist_patch_DATA = \
%D%/packages/patches/ghc-monad-par-fix-tests.patch \
%D%/packages/patches/ghc-pandoc-fix-html-tests.patch \
%D%/packages/patches/ghc-pandoc-fix-latex-test.patch \
%D%/packages/patches/ghostscript-CVE-2020-15900.patch \
%D%/packages/patches/ghostscript-freetype-compat.patch \
%D%/packages/patches/ghostscript-no-header-id.patch \
%D%/packages/patches/ghostscript-no-header-uuid.patch \
%D%/packages/patches/ghostscript-no-header-creationdate.patch \
@ -1159,7 +1163,6 @@ dist_patch_DATA = \
%D%/packages/patches/hubbub-sort-entities.patch \
%D%/packages/patches/hurd-cross.patch \
%D%/packages/patches/hurd-xattr.patch \
%D%/packages/patches/hplip-fix-bug-1898438.patch \
%D%/packages/patches/hplip-remove-imageprocessor.patch \
%D%/packages/patches/hydra-disable-darcs-test.patch \
%D%/packages/patches/icecat-makeicecat.patch \
@ -1222,7 +1225,6 @@ dist_patch_DATA = \
%D%/packages/patches/kmail-Fix-missing-link-libraries.patch \
%D%/packages/patches/kmod-module-directory.patch \
%D%/packages/patches/kmscon-runtime-keymap-switch.patch \
%D%/packages/patches/knot-resolver-fix-map-command-on-32-bit.patch \
%D%/packages/patches/kpackage-allow-external-paths.patch \
%D%/packages/patches/kpackage-fix-KF5PackageMacros.cmake.patch \
%D%/packages/patches/kmplayer-aarch64.patch \
@ -1282,6 +1284,7 @@ dist_patch_DATA = \
%D%/packages/patches/libmygpo-qt-missing-qt5-modules.patch \
%D%/packages/patches/libqalculate-3.8.0-libcurl-ssl-fix.patch \
%D%/packages/patches/libquicktime-ffmpeg.patch \
%D%/packages/patches/libssh2-CVE-2019-17498.patch \
%D%/packages/patches/libtar-CVE-2013-4420.patch \
%D%/packages/patches/libtgvoip-disable-sse2.patch \
%D%/packages/patches/libtgvoip-disable-webrtc.patch \
@ -1349,6 +1352,7 @@ dist_patch_DATA = \
%D%/packages/patches/mingw-w64-6.0.0-gcc.patch \
%D%/packages/patches/mingw-w64-dlltool-temp-prefix.patch \
%D%/packages/patches/mingw-w64-reproducible-gendef.patch \
%D%/packages/patches/minimap2-aarch64-support.patch \
%D%/packages/patches/minisat-friend-declaration.patch \
%D%/packages/patches/minisat-install.patch \
%D%/packages/patches/mit-krb5-hurd.patch \
@ -1432,9 +1436,9 @@ dist_patch_DATA = \
%D%/packages/patches/p7zip-CVE-2017-17969.patch \
%D%/packages/patches/p7zip-remove-unused-code.patch \
%D%/packages/patches/pam-krb5-CVE-2020-10595.patch \
%D%/packages/patches/pam-mount-luks2-support.patch \
%D%/packages/patches/pango-skip-libthai-test.patch \
%D%/packages/patches/pciutils-hurd-configure.patch \
%D%/packages/patches/pciutils-hurd-fix.patch \
%D%/packages/patches/plasma-framework-fix-KF5PlasmaMacros.cmake.patch \
%D%/packages/patches/ppsspp-disable-upgrade-and-gold.patch \
%D%/packages/patches/samba-fix-fcntl-hint-detection.patch \
@ -1514,6 +1518,7 @@ dist_patch_DATA = \
%D%/packages/patches/python-3-fix-tests.patch \
%D%/packages/patches/python-3.8-fix-tests.patch \
%D%/packages/patches/python-CVE-2018-14647.patch \
%D%/packages/patches/python-CVE-2020-26116.patch \
%D%/packages/patches/python-aionotify-0.2.0-py3.8.patch \
%D%/packages/patches/python-argcomplete-1.11.1-fish31.patch \
%D%/packages/patches/python-axolotl-AES-fix.patch \
@ -1568,6 +1573,7 @@ dist_patch_DATA = \
%D%/packages/patches/rct-add-missing-headers.patch \
%D%/packages/patches/readline-link-ncurses.patch \
%D%/packages/patches/readline-6.2-CVE-2014-2524.patch \
%D%/packages/patches/renpy-use-system-fribidi.patch \
%D%/packages/patches/reposurgeon-add-missing-docbook-files.patch \
%D%/packages/patches/r-httpuv-1.5.4-unvendor-libuv.patch \
%D%/packages/patches/ri-li-modernize_cpp.patch \
@ -1596,7 +1602,6 @@ dist_patch_DATA = \
%D%/packages/patches/rust-openssl-sys-no-vendor.patch \
%D%/packages/patches/rxvt-unicode-escape-sequences.patch \
%D%/packages/patches/sbcl-clml-fix-types.patch \
%D%/packages/patches/sbcl-geco-fix-organism-class.patch \
%D%/packages/patches/scalapack-blacs-mpi-deprecations.patch \
%D%/packages/patches/scheme48-tests.patch \
%D%/packages/patches/scotch-build-parallelism.patch \

19
gnu/packages/admin.scm
View file

@ -515,7 +515,7 @@ or via the @code{facter} Ruby library.")
(define-public htop
(package
(name "htop")
(version "3.0.2")
(version "3.0.3")
(source
(origin
(method git-fetch)
@ -523,7 +523,7 @@ or via the @code{facter} Ruby library.")
(url "https://github.com/htop-dev/htop")
(commit version)))
(sha256
(base32 "1qmqhbnc5yw4brd24yrp85k09770c1c00nl03mkv5pdz2bvqivk7"))
(base32 "0ylig6g2w4r3qfb16cf922iriqyn64frkzpk87vpga16kclvf08y"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(inputs
@ -3416,7 +3416,7 @@ make it a perfect utility on modern distros.")
(define-public thermald
(package
(name "thermald")
(version "2.4")
(version "2.4.1")
(source
(origin
(method git-fetch)
@ -3425,7 +3425,7 @@ make it a perfect utility on modern distros.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "08sy6v09drcy3nwv7za543vajn4bm8jvwk9iwwf7i9azmk47jgna"))))
(base32 "0rlac7v1b59m7gh767hkd8a0r4p001nd24786fnmryygbxynd2s6"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
@ -3934,19 +3934,14 @@ tcpdump and snoop.")
(define-public pam-mount
(package
(name "pam-mount")
(version "2.16")
(version "2.17")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/pam-mount/pam_mount/"
version "/pam_mount-" version ".tar.xz"))
"pam_mount-" version ".tar.xz"))
(sha256
(base32
"1rvi4irb7ylsbhvx1cr6islm2xxw1a4b19q6z4a9864ndkm0f0mf"))
(patches
;; Patch adding support for encrypted volumes in LUKS2 format.
;; It comes from the Gentoo package definition for sys-auth/pam_mount.
(search-patches "pam-mount-luks2-support.patch"))))
(base32 "1q2n6a2ah6nghdn8i6ad2wj247njwb5nx48cggxknaa6lqxylidy"))))
(build-system gnu-build-system)
(native-inputs
`(("perl" ,perl)

4
gnu/packages/audio.scm
View file

@ -301,7 +301,7 @@ Linux kernel.")
(define-public libopenmpt
(package
(name "libopenmpt")
(version "0.5.3")
(version "0.5.4")
(source
(origin
(method url-fetch)
@ -309,7 +309,7 @@ Linux kernel.")
(string-append "https://download.openmpt.org/archive/libopenmpt/src/"
"libopenmpt-" version "+release.autotools.tar.gz"))
(sha256
(base32 "1f155yf5v57dwhzb7z0kh67lckr3yq4x8040dm54qgbxw582la77"))))
(base32 "0h7gpjx1221jwsq3k91p8zhf1h77qaxyasakc88s3g57vawhckgk"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags

35
gnu/packages/autotools.scm
View file

@ -43,7 +43,7 @@
#:use-module (ice-9 match)
#:export (autoconf-wrapper))
(define-public autoconf
(define-public autoconf-2.69
(package
(name "autoconf")
(version "2.69")
@ -103,6 +103,39 @@ scripts are self-contained and portable, freeing the user from needing to
know anything about Autoconf or M4.")
(license gpl3+))) ; some files are under GPLv2+
(define-public autoconf-2.70
(package
(inherit autoconf-2.69)
(version "2.70")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://gnu/autoconf/autoconf-"
version ".tar.xz"))
(sha256
(base32
"1ipckz0wr2mvhj9n3ys54fmf2aksin6bhqvzl304bn6rc1w257ps"))))
(arguments
(substitute-keyword-arguments (package-arguments autoconf-2.69)
((#:tests? _ #f)
;; FIXME: To run the test suite, fix all the instances where scripts
;; generates "#! /bin/sh" shebangs.
#f)
((#:phases phases '%standard-phases)
`(modify-phases ,phases
(add-before 'check 'prepare-tests
(lambda _
(for-each patch-shebang
(append (find-files "tests"
(lambda (file stat)
(executable-file? file)))
(find-files "bin"
(lambda (file stat)
(executable-file? file)))))
#t))))))))
(define-public autoconf autoconf-2.69)
(define-public autoconf-2.68
(package (inherit autoconf)
(version "2.68")

46
gnu/packages/aux-files/guile-launcher.c
View file

@ -1,5 +1,5 @@
/* GNU Guix --- Functional package management for GNU
Copyright 1996-1997,2000-2001,2006,2008,2011,2013,2018
Copyright 1996-1997,2000-2001,2006,2008,2011,2013,2018,2020
Free Software Foundation, Inc.
Copyright (C) 2020 Ludovic Courtès <ludo@gnu.org>
@ -19,14 +19,47 @@
along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. */
/* This file implements a variant of the 'guile' executable that does not
complain about locale issues. */
complain about locale issues and arranges to reduce startup time by
ignoring GUILE_LOAD_PATH and GUILE_LOAD_COMPILED_PATH until it has
booted. */
#include <stdlib.h>
#include <string.h>
#include <locale.h>
#include <libguile.h>
/* Saved values of GUILE_LOAD_PATH and GUILE_LOAD_COMPILED_PATH. */
static const char *load_path, *load_compiled_path;
static void
inner_main (void *unused, int argc, char **argv)
{
if (load_path != NULL)
{
setenv ("GUILE_LOAD_PATH", load_path, 1);
SCM load_path_var =
scm_c_public_lookup ("guile", "%load-path");
SCM addition =
scm_parse_path (scm_from_locale_string (load_path), SCM_EOL);
scm_variable_set_x (load_path_var,
scm_append
(scm_list_2 (scm_variable_ref (load_path_var),
addition)));
}
if (load_compiled_path != NULL)
{
setenv ("GUILE_LOAD_COMPILED_PATH", load_compiled_path, 1);
SCM load_compiled_path_var =
scm_c_public_lookup ("guile", "%load-compiled-path");
SCM addition =
scm_parse_path (scm_from_locale_string (load_compiled_path), SCM_EOL);
scm_variable_set_x (load_compiled_path_var,
scm_append
(scm_list_2 (scm_variable_ref (load_compiled_path_var),
addition)));
}
scm_shell (argc, argv);
}
@ -40,6 +73,15 @@ main (int argc, char **argv)
which is always preferable over the C locale. */
setlocale (LC_ALL, "en_US.utf8");
const char *str;
str = getenv ("GUILE_LOAD_PATH");
load_path = str != NULL ? strdup (str) : NULL;
str = getenv ("GUILE_LOAD_COMPILED_PATH");
load_compiled_path = str ? strdup (str) : NULL;
unsetenv ("GUILE_LOAD_PATH");
unsetenv ("GUILE_LOAD_COMPILED_PATH");
scm_install_gmp_memory_functions = 1;
scm_boot_guile (argc, argv, inner_main, 0);
return 0; /* never reached */

44
gnu/packages/backup.scm
View file

@ -696,50 +696,6 @@ to not fully trusted targets. Borg is a fork of Attic.")
(home-page "https://www.borgbackup.org/")
(license license:bsd-3)))
(define-public attic
(package
(name "attic")
(version "0.16")
(source (origin
(method url-fetch)
(uri (pypi-uri "Attic" version))
(sha256
(base32
"0b5skd36r4c0915lwpkqg5hxm49gls9pprs1b7hc40910wlcsl36"))))
(build-system python-build-system)
(arguments
`(;; The tests assume they are run as root:
;; https://github.com/jborg/attic/issues/7
#:tests? #f
#:phases
(modify-phases %standard-phases
(add-before
'build 'set-openssl-prefix
(lambda* (#:key inputs #:allow-other-keys)
(setenv "ATTIC_OPENSSL_PREFIX" (assoc-ref inputs "openssl"))
#t)))))
(inputs
`(("acl" ,acl)
("openssl" ,openssl)
("python-msgpack" ,python-msgpack)
;; Attic is probably incompatible with llfuse > 0.41.
;; These links are to discussions of llfuse compatibility from
;; the borg project. Borg is a recent fork of attic, and attic
;; has not been updated since the fork, so it's likely that
;; llfuse compatibility requirements are still the same.
;; https://github.com/borgbackup/borg/issues/642
;; https://github.com/borgbackup/borg/issues/643
("python-llfuse" ,python-llfuse-0.41)))
(synopsis "Deduplicating backup program")
(description "Attic is a deduplicating backup program. The main goal of
Attic is to provide an efficient and secure way to backup data. The data
deduplication technique used makes Attic suitable for daily backups since only
changes are stored.")
(home-page "https://attic-backup.org/")
(license license:bsd-3)
(properties `((superseded . ,borg)))))
(define-public wimlib
(package
(name "wimlib")

4
gnu/packages/benchmark.scm
View file

@ -47,14 +47,14 @@
(define-public fio
(package
(name "fio")
(version "3.24")
(version "3.25")
(source (origin
(method url-fetch)
(uri (string-append "https://brick.kernel.dk/snaps/"
"fio-" version ".tar.bz2"))
(sha256
(base32
"0qshbyqpvm01hmpkmk0v0jhjz23sngqhy291kiz38z04s2df4vxn"))))
"16r734an459cz1ax3jyhxc269i3syzdkll4qbv18wqaxpm5y34v6"))))
(build-system gnu-build-system)
(arguments
'(#:test-target "test"

1383
gnu/packages/bioconductor.scm
View file

File diff suppressed because it is too large Load diff

507
gnu/packages/bioinformatics.scm
View file

File diff suppressed because it is too large Load diff

16
gnu/packages/busybox.scm
View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 John Darrington <jmd@gnu.org>
;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
@ -22,6 +22,7 @@
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix utils)
#:use-module (guix build-system gnu)
#:use-module (gnu packages)
#:use-module (gnu packages admin)
@ -32,7 +33,7 @@
(define-public busybox
(package
(name "busybox")
(version "1.31.1")
(version "1.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@ -40,10 +41,7 @@
version ".tar.bz2"))
(sha256
(base32
"1659aabzp8w4hayr4z8kcpbk2z1q2wqhw7i1yb0l72b45ykl1yfh"))
(patches
(search-patches
"busybox-1.31.1-fix-build-with-glibc-2.31.patch"))))
"12g63zsvzfz04wbyga8riyl8ils05riw4xf26cyiaasbs3qqfpf3"))))
(build-system gnu-build-system)
(arguments
'(#:phases
@ -90,7 +88,7 @@
;; true in guix build environment
(substitute* "testsuite/pidof.tests"
(("-s init") "-s $(cat /proc/1/comm)"))
;; This test cannot possibly pass.
;; It is trying to test that "which ls" returns "/bin/ls" when PATH is not set.
;; However, this relies on /bin/ls existing. Which it does not in guix.
@ -135,11 +133,11 @@ any small or embedded system.")
"00aw9d809wj1bqlb2fsssdgz7rj0363ya14py0gfdm0rkp98zcpa"))))
(build-system gnu-build-system)
(arguments
'(#:phases
`(#:phases
(modify-phases %standard-phases
(add-before 'configure 'set-environment-variables
(lambda _
(setenv "CC" (which "gcc"))
(setenv "CC" ,(cc-for-target))
(setenv "HOSTCC" (which "gcc"))
#t))
(replace 'configure

8
gnu/packages/ci.scm
View file

@ -68,8 +68,8 @@
(file-name (string-append name "-" version "-checkout")))))))
(define-public cuirass
(let ((commit "fd432b8e8f449d691773e96e7d90f44761e01aa3")
(revision "55"))
(let ((commit "697fa14584551d9595cd042f1ffeba240e45a127")
(revision "56"))
(package
(name "cuirass")
(version (git-version "0.0.1" revision commit))
@ -81,7 +81,7 @@
(file-name (git-file-name name version))
(sha256
(base32
"10j3w3px0250avwry2x8wsa0m0plvm957g4qqgnajsbc9gvka554"))))
"0gw9cja8fiyra9vnn3y384gwanvsqdq6gwjcvmz91sy5lvfwv34m"))))
(build-system gnu-build-system)
(arguments
'(#:modules ((guix build utils)
@ -94,7 +94,7 @@
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'disable-repo-tests
(λ _
(lambda _
;; Disable tests that use a connection to the Guix daemon.
(substitute* "Makefile.am"
(("tests/repo.scm \\\\") "\\"))

939
gnu/packages/cran.scm
View file

File diff suppressed because it is too large Load diff

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

@ -9,6 +9,7 @@
;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2020 Antoine Côté <antoine.cote@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@ -167,8 +168,38 @@ text or blue underlined text, on ANSI terminals.")
"1xif1bh938qpfc3d0f9xgidibpm65xix11w9gszwqnia00q7rb13"))))
(arguments `())))
(define-public rust-aom-sys-0.2
(package
(name "rust-aom-sys")
(version "0.2.1")
(source
(origin
(method url-fetch)
(uri (crate-uri "aom-sys" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
"03a0xhaafjn0hlpcf9ba73hv557m0jqnmj9wl57wzrcnka96zvgj"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-bindgen" ,rust-bindgen-0.54)
("rust-metadeps" ,rust-metadeps-1.1))))
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
`(("libaom" ,libaom)
("clang" ,clang)
("llvm" ,llvm)))
(home-page "https://github.com/rust-av/aom-rs")
(synopsis "FFI bindings to aom")
(description "This package provides FFI bindings to aom.")
(license license:expat)))
(define-public rust-aom-sys-0.1
(package
(inherit rust-aom-sys-0.2)
(name "rust-aom-sys")
(version "0.1.4")
(source
@ -190,11 +221,7 @@ text or blue underlined text, on ANSI terminals.")
(inputs
`(("libaom" ,libaom)
("clang" ,clang)
("llvm" ,llvm)))
(home-page "https://github.com/rust-av/aom-rs")
(synopsis "FFI bindings to aom")
(description "This package provides FFI bindings to aom.")
(license license:expat)))
("llvm" ,llvm)))))
(define-public rust-ascii-canvas-2
(package

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

@ -11,6 +11,7 @@
;;; Copyright © 2020 Gabriel Arazas <foo.dogsquared@gmail.com>
;;; Copyright © 2020 André Batista <nandre@riseup.net>
;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2020 Antoine Côté <antoine.cote@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@ -1080,6 +1081,29 @@ standard library.")
(description "Test CLI Applications.")
(license (list license:expat license:asl2.0))))
(define-public rust-assert-cmd-0.9
(package
(inherit rust-assert-cmd-1)
(name "rust-assert-cmd")
(version "0.9.1")
(source
(origin
(method url-fetch)
(uri (crate-uri "assert-cmd" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
"02gq7j9qzjkbyq4hk18cih3kylk3dyxwa2gc5k7lah9kdwkhrdn5"))))
(arguments
`(#:cargo-inputs
(("rust-escargot" ,rust-escargot-0.3)
("rust-predicates" ,rust-predicates-0.9)
("rust-predicates-core" ,rust-predicates-core-0.9)
("rust-predicates-tree" ,rust-predicates-tree-0.9))
#:cargo-development-inputs
(("rust-docmatic" ,rust-docmatic-0.1))))))
(define-public rust-assert-fs-0.11
(package
(name "rust-assert-fs")
@ -1306,6 +1330,32 @@ methods.")
"1chwgimpx5z7xbag7krr9d8asxfqbh683qhgl9kn3hxk2l0djj8x"))))
(arguments '(#:skip-build? #t))))
(define-public rust-automod-1
(package
(name "rust-automod")
(version "1.0.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "automod" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
"1z8kdbvvz0k8mfs45mvs16lr9xj59cdcp0sm45fawfh93gai4mhg"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-proc-macro2" ,rust-proc-macro2-1)
("rust-quote" ,rust-quote-1)
("rust-syn" ,rust-syn-1))
;; Tests not included in tar.
#:tests? #f))
(home-page "https://github.com/dtolnay/automod")
(synopsis "Pull in every source file in a directory as a module")
(description "Pull in every source file in a directory as a module.")
(license (list license:expat license:asl2.0))))
(define-public rust-average-0.10
(package
(name "rust-average")
@ -1727,6 +1777,29 @@ tracebacks.")
that uses Serde for transforming structs into bytes and vice versa!")
(license license:expat)))
(define-public rust-bincode-0.8
(package
(inherit rust-bincode-1)
(name "rust-bincode")
(version "0.8.1")
(source
(origin
(method url-fetch)
(uri (crate-uri "bincode" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
"0nbj0lwykwa1a7sa4303rxgpng9p2hcz9s5d5qcrckrpmcxjsjkf"))))
(arguments
`(#:cargo-inputs
(("rust-byteorder" ,rust-byteorder-1)
("rust-num-traits" ,rust-num-traits-0.1)
("rust-serde" ,rust-serde-1))
#:cargo-development-inputs
(("rust-serde-bytes" ,rust-serde-bytes-0.10)
("rust-serde-derive" ,rust-serde-derive-1))))))
(define-public rust-bindgen-0.55
(package
(name "rust-bindgen")
@ -1966,6 +2039,41 @@ bindings to C and C++ libraries.")
("rust-diff" ,rust-diff-0.1)
("rust-shlex" ,rust-shlex-0.1))))))
(define-public rust-bindgen-0.46
(package
(inherit rust-bindgen-0.50)
(name "rust-bindgen")
(version "0.46.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "bindgen" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
"1qclvj5pydn5camw396b0r3nz4nn3p5wpxg4fgg1favp043pyzwg"))))
(arguments
`(#:cargo-inputs
(("rust-bitflags" ,rust-bitflags-1)
("rust-cexpr" ,rust-cexpr-0.3)
("rust-cfg-if" ,rust-cfg-if-0.1)
("rust-clang-sys" ,rust-clang-sys-0.26)
("rust-clap" ,rust-clap-2)
("rust-env-logger" ,rust-env-logger-0.6)
("rust-hashbrown" ,rust-hashbrown-0.1)
("rust-lazy-static" ,rust-lazy-static-1)
("rust-log" ,rust-log-0.4)
("rust-peeking-take-while" ,rust-peeking-take-while-0.1)
("rust-proc-macro2" ,rust-proc-macro2-0.4)
("rust-quote" ,rust-quote-0.6)
("rust-regex" ,rust-regex-1)
("rust-which" ,rust-which-2.0))
#:cargo-development-inputs
(("rust-clap" ,rust-clap-2)
("rust-diff" ,rust-diff-0.1)
("rust-shlex" ,rust-shlex-0.1))))) )
(define-public rust-bindgen-0.37
(package
(inherit rust-bindgen-0.50)
@ -3216,6 +3324,32 @@ exposed as Reader/Writer streams.")
"The ChaCha family of stream ciphers.")
(license (list license:asl2.0 license:expat))))
(define-public rust-cachedir-0.1
(package
(name "rust-cachedir")
(version "0.1.1")
(source
(origin
(method url-fetch)
(uri (crate-uri "cachedir" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
"1j18j73fxrr82marcdrn86123vr9v5n0fgyjkf9mi9pzyk8hjrf0"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-tempfile" ,rust-tempfile-3))
;; Tests require a mutable home directory and access to /var/tmp.
#:tests? #f))
(home-page "https://github.com/lilianmoraru/cachedir")
(synopsis "Interact with cache directories and @file{CACHEDIR.TAG} files")
(description
"This package provides a library to help interacting with cache
directories and @code{CACHEDIR.TAG} files.")
(license (list license:expat license:asl2.0))))
(define-public rust-calloop-0.4
(package
(name "rust-calloop")
@ -3598,6 +3732,32 @@ archive to be linked into Rustcode.")
#:cargo-development-inputs
(("rust-clang-sys" ,rust-clang-sys-0.11))))))
(define-public rust-cfg-if-1
(package
(name "rust-cfg-if")
(version "1.0.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "cfg-if" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
"1za0vb97n4brpzpv8lsbnzmq5r8f2b0cpqqr0sy8h5bn751xxwds"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-compiler-builtins" ,rust-compiler-builtins-0.1)
("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1))))
(home-page "https://github.com/alexcrichton/cfg-if")
(synopsis "Define an item depending on parameters")
(description "This package provides a macro to ergonomically define an
item depending on a large number of @code{#[cfg]} parameters. Structured like
an @code{if-else} chain, the first matching branch is the item that gets
emitted.")
(license (list license:asl2.0 license:expat))))
(define-public rust-cfg-if-0.1
(package
(name "rust-cfg-if")
@ -3626,7 +3786,7 @@ depending on a large number of #[cfg] parameters. Structured like an
(define-public rust-chrono-0.4
(package
(name "rust-chrono")
(version "0.4.13")
(version "0.4.19")
(source
(origin
(method url-fetch)
@ -3635,28 +3795,30 @@ depending on a large number of #[cfg] parameters. Structured like an
(string-append name "-" version ".tar.gz"))
(sha256
(base32
"1dm0q1kmk2vq5djwhp1j9cm4aa38wr9vy1i1w19p2y0nj4188kf7"))))
"0wyfl6c00vhfl562spnfcna3zkw8jqvcp652m9iskhl8j26dc2k7"))))
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
#:cargo-inputs
(("rust-num-integer" ,rust-num-integer-0.1)
`(#:cargo-inputs
(("rust-js-sys" ,rust-js-sys-0.3)
("rust-libc" ,rust-libc-0.2)
("rust-num-integer" ,rust-num-integer-0.1)
("rust-num-traits" ,rust-num-traits-0.2)
("rust-js-sys" ,rust-js-sys-0.3)
("rust-pure-rust-locales" ,rust-pure-rust-locales-0.5)
("rust-rustc-serialize" ,rust-rustc-serialize-0.3)
("rust-serde" ,rust-serde-1)
("rust-time" ,rust-time-0.1)
("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2))
#:cargo-development-inputs
(;("rust-bincode" ,rust-bincode-0.8)
("rust-criterion" ,rust-criterion-0.2)
(("rust-bincode" ,rust-bincode-0.8)
("rust-criterion" ,rust-criterion-0.3)
("rust-doc-comment" ,rust-doc-comment-0.3)
("rust-num-iter" ,rust-num-iter-0.1)
("rust-serde-derive" ,rust-serde-derive-1)
("rust-serde-json" ,rust-serde-json-1)
("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.2))))
(home-page
"https://github.com/chronotope/chrono")
("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))
#:features '("unstable-locales")
#:tests? #f))
(home-page "https://github.com/chronotope/chrono")
(synopsis "Date and time library for Rust")
(description "Date and time library for Rust.")
(license (list license:expat license:asl2.0))))
@ -6528,7 +6690,7 @@ error-chain.")
(define-public rust-derive-more-0.99
(package
(name "rust-derive-more")
(version "0.99.9")
(version "0.99.11")
(source
(origin
(method url-fetch)
@ -6537,7 +6699,7 @@ error-chain.")
(string-append name "-" version ".tar.gz"))
(sha256
(base32
"0xizcpj39rx0474mbbx8m0xww98qh92zsg82gf52qnvbryqri299"))))
"131xrz5nmnh8zq3vcvv0wfpcaflypbxp3fin984fsqddc5hhxjs1"))))
(build-system cargo-build-system)
(arguments
`(#:tests? #f ; Some test files missing.
@ -6895,6 +7057,28 @@ on Linux, the Known Folder API on Windows, and the Standard
Directory guidelines on macOS.")
(license (list license:expat license:asl2.0))))
(define-public rust-directories-next-1
(package
(inherit rust-directories-3)
(name "rust-directories-next")
(version "1.0.3")
(source
(origin
(method url-fetch)
(uri (crate-uri "directories-next" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
"0mmym1h9vlyapwlzygfas3q9mx03mki8cnf5y1bmr713q7mwqa4a"))))
(arguments
`(#:cargo-inputs
(("rust-cfg-if" ,rust-cfg-if-1)
("rust-dirs-sys" ,rust-dirs-sys-next-0.1))
#:cargo-development-inputs
(("rust-bencher" ,rust-bencher-0.1))))
(home-page "https://github.com/xdg-rs/dirs/tree/master/directories")))
(define-public rust-dirs-3
(package
(name "rust-dirs")
@ -6954,6 +7138,28 @@ standard locations of directories for config, cache and other data.")
("rust-redox-users" ,rust-redox-users-0.3)
("rust-winapi" ,rust-winapi-0.3))))))
(define-public rust-dirs-next-1
(package
(inherit rust-dirs-1.0)
(name "rust-dirs-next")
(version "1.0.2")
(source
(origin
(method url-fetch)
(uri (crate-uri "dirs-next" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
"1dl2dqzsrcb7qigfiwpdpakhdkpz0629pvylbj2ylyrkh1dfcdng"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-cfg-if" ,rust-cfg-if-1)
("rust-dirs-sys" ,rust-dirs-sys-next-0.1))))
(home-page "https://github.com/xdg-rs/dirs")
(license (list license:expat license:asl2.0))))
(define-public rust-dirs-sys-0.3
(package
(name "rust-dirs-sys")
@ -6982,6 +7188,27 @@ standard locations of directories for config, cache and other data.")
and @code{directories} crates.")
(license (list license:asl2.0 license:expat))))
(define-public rust-dirs-sys-next-0.1
(package
(inherit rust-dirs-sys-0.3)
(name "rust-dirs-sys-next")
(version "0.1.1")
(source
(origin
(method url-fetch)
(uri (crate-uri "dirs-sys-next" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
"0zgy7is3h2dyf1l4sa7k065w2kvx0l12l40my4rswm2mc1gkdplr"))))
(arguments
`(#:cargo-inputs
(("rust-libc" ,rust-libc-0.2)
("rust-redox-users" ,rust-redox-users-0.3)
("rust-winapi" ,rust-winapi-0.3))))
(home-page "https://github.com/xdg-rs/dirs/tree/master/dirs-sys")))
(define-public rust-discard-1.0
(package
(name "rust-discard")
@ -8305,6 +8532,54 @@ variables.")
(description "Cargo API written in Paris.")
(license (list license:expat license:asl2.0))))
(define-public rust-escargot-0.3
(package
(inherit rust-escargot-0.5)
(name "rust-escargot")
(version "0.3.1")
(source
(origin
(method url-fetch)
(uri (crate-uri "escargot" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
"19fmn7bz1h6nlqy0mp825xwjwnrjn4xjdpwc06jl51j3fiz1znqr"))))
(arguments
`(#:cargo-inputs
(("rust-serde" ,rust-serde-1)
("rust-serde-json" ,rust-serde-json-1))))))
(define-public rust-exitfailure-0.5
(package
(name "rust-exitfailure")
(version "0.5.1")
(source
(origin
(method url-fetch)
(uri (crate-uri "exitfailure" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
"0585wix3b3pjjj90fkqj9x4ar46d24x82k8rdin3czzk5a1vvx9g"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-failure" ,rust-failure-0.1))
#:cargo-development-inputs
(("rust-assert-cmd" ,rust-assert-cmd-0.9)
("rust-predicates" ,rust-predicates-0.9))
;; Tests fail with "No such file or directory".
#:tests? #f))
(home-page "https://github.com/tismith/exitfailure")
(synopsis "Provide @code{newtype} wrappers for using @code{?} in @code{main}")
(description
"This package provides a basic @code{newtype} wrappers to help with using
@code{?} in @code{main}.")
(license (list license:expat license:asl2.0))))
(define-public rust-expat-sys-2.1
(package
(name "rust-expat-sys")
@ -8842,6 +9117,21 @@ streams.")
(base32
"03hmx3n48hjm0x1ig84n1j87kzp75lzr6cj1sgi6a6pykgn4n8km"))))))
(define-public rust-float-cmp-0.4
(package
(inherit rust-float-cmp-0.5)
(name "rust-float-cmp")
(version "0.4.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "float-cmp" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
"0036jb8ry4h83n319jb20b5yvyfyq8mx8dkxnyjm22nq8fl8yjhk"))))))
(define-public rust-float-cmp-0.3
(package
(inherit rust-float-cmp-0.5)
@ -11394,6 +11684,39 @@ hash map.")
("rust-rustc-hash" ,rust-rustc-hash-1)
("rust-serde-test" ,rust-serde-test-1))))))
(define-public rust-hashbrown-0.1
(package
(inherit rust-hashbrown-0.5)
(name "rust-hashbrown")
(version "0.1.8")
(source
(origin
(method url-fetch)
(uri (crate-uri "hashbrown" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
"1np350nrzysy021ndn2135q5vpzrp5nli78ywz114d1vcnv2kbiv"))
(modules '((guix build utils)))
(snippet
'(begin
(substitute* "Cargo.toml"
(("~1.2") "1.2"))
#t))))
(arguments
`(#:cargo-inputs
(("rust-byteorder" ,rust-byteorder-1)
("rust-rayon" ,rust-rayon-1)
("rust-scopeguard" ,rust-scopeguard-0.3)
("rust-serde" ,rust-serde-1))
#:cargo-development-inputs
(("rust-lazy-static" ,rust-lazy-static-1)
("rust-rand" ,rust-rand-0.5)
("rust-rayon" ,rust-rayon-1)
("rust-rustc-hash" ,rust-rustc-hash-1)
("rust-serde-test" ,rust-serde-test-1))))))
(define-public rust-hashlink-0.6
(package
(name "rust-hashlink")
@ -16180,8 +16503,32 @@ a default trait implementation you've defined.")
libmysqlclient.")
(license (list license:expat license:asl2.0))))
(define-public rust-nasm-rs-0.2
(package
(name "rust-nasm-rs")
(version "0.2.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "nasm-rs" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
"1lgc3gg32hj4pcbfp07vzwy013smdm27469fyy4rqgyil3x46vx7"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-arrayvec" ,rust-arrayvec-0.5)
("rust-rayon" ,rust-rayon-1))))
(home-page "https://github.com/medek/nasm-rs")
(synopsis "Run NASM during your Cargo build")
(description "Run NASM during your Cargo build.")
(license (list license:expat license:asl2.0))))
(define-public rust-nasm-rs-0.1
(package
(inherit rust-nasm-rs-0.2)
(name "rust-nasm-rs")
(version "0.1.7")
(source
@ -16197,11 +16544,7 @@ libmysqlclient.")
(arguments
`(#:skip-build? #t
#:cargo-inputs
(("rust-rayon" ,rust-rayon-1))))
(home-page "https://github.com/medek/nasm-rs")
(synopsis "Run NASM during your Cargo build")
(description "Run NASM during your Cargo build.")
(license (list license:expat license:asl2.0))))
(("rust-rayon" ,rust-rayon-1))))))
(define-public rust-nalgebra-0.21
(package
@ -16938,6 +17281,21 @@ combinators library.")
with all line endings.")
(license license:asl2.0)))
(define-public rust-normalize-line-endings-0.2
(package
(inherit rust-normalize-line-endings-0.3)
(name "rust-normalize-line-endings")
(version "0.2.2")
(source
(origin
(method url-fetch)
(uri (crate-uri "normalize-line-endings" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
"1a1knz9j1w5a1pl2q6whmjphm3z6p64r5njnam7syp5rx8wil2if"))))))
(define-public rust-notify-4
(package
(name "rust-notify")
@ -20257,6 +20615,30 @@ dependency to expose a precomputed hash.")
functions.")
(license (list license:expat license:asl2.0))))
(define-public rust-predicates-0.9
(package
(inherit rust-predicates-1)
(name "rust-predicates")
(version "0.9.1")
(source
(origin
(method url-fetch)
(uri (crate-uri "predicates" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
"085ysw5iigw9l7fdy0pxqs7h165m9hxaxdknmkyq868izivpj7pk"))))
(arguments
`(#:cargo-inputs
(("rust-difference" ,rust-difference-2)
("rust-float-cmp" ,rust-float-cmp-0.4)
("rust-normalize-line-endings" ,rust-normalize-line-endings-0.2)
("rust-predicates-core" ,rust-predicates-core-0.9)
("rust-regex" ,rust-regex-1))
#:cargo-development-inputs
(("rust-predicates-tree" ,rust-predicates-tree-0.9))))))
(define-public rust-predicates-core-1
(package
(name "rust-predicates-core")
@ -20278,6 +20660,21 @@ functions.")
"An API for boolean-valued predicate functions.")
(license (list license:expat license:asl2.0))))
(define-public rust-predicates-core-0.9
(package
(inherit rust-predicates-core-1)
(name "rust-predicates-core")
(version "0.9.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "predicates-core" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
"1ig5wi3j2faxss6kshv5xdwnchiwbkq2fgx6v962mh6ij31hpy45"))))))
(define-public rust-predicates-tree-1
(package
(name "rust-predicates-tree")
@ -20304,6 +20701,25 @@ functions.")
"Render boolean-valued predicate functions results as a tree.")
(license (list license:expat license:asl2.0))))
(define-public rust-predicates-tree-0.9
(package
(inherit rust-predicates-tree-1)
(name "rust-predicates-tree")
(version "0.9.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "predicates-tree" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
"1ga0yyfmqbwi28naxlr6cvpmiig0qnwx5adc858hmjxxh6dxz1if"))))
(arguments
`(#:cargo-inputs
(("rust-predicates-core" ,rust-predicates-core-0.9)
("rust-treeline" ,rust-treeline-0.1))))))
(define-public rust-pretty-assertions-0.6
(package
(name "rust-pretty-assertions")
@ -21111,6 +21527,31 @@ compliant email address validation.")
(description "This package provides a library for async wake signals.")
(license license:asl2.0)))
(define-public rust-pure-rust-locales-0.5
(package
(name "rust-pure-rust-locales")
(version "0.5.3")
(source
(origin
(method url-fetch)
(uri (crate-uri "pure-rust-locales" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
"0ryjj0gs4hfadqx9vl4sgi32zyb2dlvwpxca1m1kmrw9hk1g7gv5"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-itertools" ,rust-itertools-0.8)
("rust-nom" ,rust-nom-5))))
(home-page "https://github.com/cecton/pure-rust-locales")
(synopsis "Pure Rust locales imported directly from the GNU C Library")
(description
"Pure Rust locales imported directly from the GNU C Library.
@code{LC_COLLATE} and @code{LC_CTYPE} are not yet supported.")
(license license:expat)))
(define-public rust-quantiles-0.7
(package
(name "rust-quantiles")

7
gnu/packages/cups.scm
View file

@ -415,17 +415,16 @@ should only be used as part of the Guix cups-pk-helper service.")
(define-public hplip
(package
(name "hplip")
(version "3.20.9")
(version "3.20.11")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/hplip/hplip/" version
"/hplip-" version ".tar.gz"))
(sha256
(base32
"1prdbp410405xrfggjc7y34nzljg7jnbgjzalgv4khwwma4i299n"))
"04fvdyjyjbkviy3awgm7g43p3lrvrsmgaqz8bwra22g7v2rpa5hb"))
(modules '((guix build utils)))
(patches (search-patches "hplip-fix-bug-1898438.patch"
"hplip-remove-imageprocessor.patch"))
(patches (search-patches "hplip-remove-imageprocessor.patch"))
(snippet
'(begin
;; Delete non-free blobs: .so files, pre-compiled

58
gnu/packages/curl.scm
View file

@ -2,7 +2,7 @@
;;; Copyright © 2013, 2014, 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Tomáš Čech <sleep_walker@suse.cz>
;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017, 2019 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017, 2019, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
@ -53,16 +53,15 @@
(define-public curl
(package
(name "curl")
(version "7.69.1")
(replacement curl-7.71.0)
(version "7.73.0")
(replacement curl-7.74.0)
(source (origin
(method url-fetch)
(uri (string-append "https://curl.haxx.se/download/curl-"
version ".tar.xz"))
(sha256
(base32
"0kwxh76iq9fblk7iyv4f75bmcmasarp2bcm1mm07wyvzd7kdbiq3"))
(patches (search-patches "curl-use-ssl-cert-env.patch"))))
(method url-fetch)
(uri (string-append "https://curl.haxx.se/download/curl-"
version ".tar.xz"))
(sha256
(base32
"12j0qaij1ppgspray8xvs2qk3h3m23wdqh27x87y1aw8xaj7qk3w"))))
(build-system gnu-build-system)
(outputs '("out"
"doc")) ;1.2 MiB of man3 pages
@ -126,25 +125,6 @@
(substitute* "tests/runtests.pl"
(("/bin/sh") (which "sh")))
;; XXX FIXME: Test #1510 seems to work on some machines and not
;; others, possibly based on the kernel version. It works on Guix System
;; on x86_64 with linux-libre-4.1, but fails on Hydra for both i686
;; and x86_64 with the following error:
;;
;; test 1510...[HTTP GET connection cache limit (CURLOPT_MAXCONNECTS)]
;;
;; 1510: output (log/stderr1510) FAILED:
;; --- log/check-expected 2015-06-27 07:45:53.166720834 +0000
;; +++ log/check-generated 2015-06-27 07:45:53.166720834 +0000
;; @@ -1,5 +1,5 @@
;; * Connection #0 to host server1.example.com left intact[LF]
;; * Connection #1 to host server2.example.com left intact[LF]
;; * Connection #2 to host server3.example.com left intact[LF]
;; -* Closing connection 0[LF]
;; +* Closing connection 1[LF]
;; * Connection #3 to host server4.example.com left intact[LF]
(delete-file "tests/data/test1510")
;; The top-level "make check" does "make -C tests quiet-test", which
;; is too quiet. Use the "test" target instead, which is more
;; verbose.
@ -171,30 +151,18 @@ tunneling, and so on.")
(name "curl-minimal")
(inputs (alist-delete "openldap" (package-inputs curl))))))
;; Replacement package to fix CVE-2020-8169 and CVE-2020-8177.
(define curl-7.71.0
;; Replacement package to fix multiple security vulnerabilities.
(define curl-7.74.0
(package
(inherit curl)
(version "7.71.0")
(version "7.74.0")
(source (origin
(inherit (package-source curl))
(uri (string-append "https://curl.haxx.se/download/curl-"
version ".tar.xz"))
(sha256
(base32
"0wlppmx9iry8slh4pqcxj7lwc6fqwnlhh9ri2pcym2rx76a8gwfd"))))
(arguments
(substitute-keyword-arguments (package-arguments curl)
((#:phases phases)
`(modify-phases ,phases
(replace 'check
(lambda _
;; Test 1510 is now disabled upstream, and the test runner
;; complains that it can not disable a non-existing test.
;; Thus, override the phase to not delete the test.
(substitute* "tests/runtests.pl"
(("/bin/sh") (which "sh")))
(invoke "make" "-C" "tests" "test")))))))))
"12w7gskrglg6qrmp822j37fmbr0icrcxv7rib1fy5xiw80n5z7cr"))))))
(define-public kurly
(package

5
gnu/packages/cybersecurity.scm
View file

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@ -26,13 +27,13 @@
(define-public ropgadget
(package
(name "ropgadget")
(version "6.3")
(version "6.4")
(source
(origin
(method url-fetch)
(uri (pypi-uri "ROPGadget" version))
(sha256
(base32 "0v34w88if3p4vn46aby24msfnxj6znmkf4848n4d24jnykxcsqk9"))))
(base32 "1hz6y5a8d4gc2sryz5alpz9mivrk8kj4l3dw00zkz2xca7gwpmsi"))))
(build-system python-build-system)
(propagated-inputs
`(("python-capstone" ,python-capstone)))

12
gnu/packages/databases.scm
View file

@ -1206,6 +1206,18 @@ pictures, sounds, or video.")
(define-public postgresql-10 postgresql)
(define-public postgresql-13
(package
(inherit postgresql)
(version "13.1")
(source (origin
(inherit (package-source postgresql))
(uri (string-append "https://ftp.postgresql.org/pub/source/v"
version "/postgresql-" version ".tar.bz2"))
(sha256
(base32
"07z6zwr58dckaa97yl9ml240z83d1lhgaxw9aq49i8lsp21mqd0j"))))))
(define-public postgresql-11
(package
(inherit postgresql)

4
gnu/packages/dictionaries.scm
View file

@ -211,14 +211,14 @@ It comes with a German-English dictionary with approximately 270,000 entries.")
(define-public grammalecte
(package
(name "grammalecte")
(version "1.12.2")
(version "2.0.0")
(source
(origin
(method url-fetch/zipbomb)
(uri (string-append "https://grammalecte.net/grammalecte/zip/"
"Grammalecte-fr-v" version ".zip"))
(sha256
(base32 "1qny2l5dr08pfj2dnzmvm5gmwqz8m879ryxfaw4k8dhaacrrrf62"))))
(base32 "1mcpqglndcafiz9bnz69vjxncl5k98yzcy8pr8rmn738hgpzb53v"))))
(build-system python-build-system)
(home-page "https://grammalecte.net")
(synopsis "French spelling and grammar checker")

4
gnu/packages/diffoscope.scm
View file

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

11
gnu/packages/dns.scm
View file

@ -533,14 +533,14 @@ asynchronous fashion.")
(define-public nsd
(package
(name "nsd")
(version "4.3.3")
(version "4.3.4")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.nlnetlabs.nl/downloads/nsd/nsd-"
version ".tar.gz"))
(sha256
(base32 "0lgdiqnkfvy245h6kkiqic586qjwmg51lsfs86vlc0kwjwddiijz"))))
(base32 "0l4ba80ihwg3s2ifhnkmk7rjabrcy5zw6sz4hn0vm9sif6lk9s1v"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
@ -937,17 +937,14 @@ synthesis, and on-the-fly re-configuration.")
(define-public knot-resolver
(package
(name "knot-resolver")
(version "5.2.0")
(version "5.2.1")
(source (origin
(method url-fetch)
(uri (string-append "https://secure.nic.cz/files/knot-resolver/"
"knot-resolver-" version ".tar.xz"))
(sha256
(base32
"0cwlipib3x88dr6cijqv2aps13b4ijv524wc85ns07rkldy2c948"))
(patches
(search-patches
"knot-resolver-fix-map-command-on-32-bit.patch"))))
"09jqy23q1pgj76y2qd1xfk72wwmypnyawm3span3gx00qi2bfdxa"))))
(build-system meson-build-system)
(outputs '("out" "doc"))
(arguments

28
gnu/packages/ebook.scm
View file

@ -7,6 +7,7 @@
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2020 Zheng Junjie <873216071@qq.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -29,6 +30,7 @@
#:use-module (guix download)
#:use-module (guix utils)
#:use-module (guix git-download)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
#:use-module (guix build-system meson)
#:use-module (guix build-system python)
@ -314,6 +316,32 @@ e-books for convenient reading.")
license:silofl1.1
license:cc-by-sa3.0))))
(define-public ebook-tools
(package
(name "ebook-tools")
(version "0.2.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/ebook-tools/ebook-tools/"
version "/ebook-tools-" version ".tar.gz"))
(sha256
(base32
"1bi7wsz3p5slb43kj7lgb3r6lb91lvb6ldi556k4y50ix6b5khyb"))))
(arguments
`(#:tests? #f)) ; No 'test' target
(build-system cmake-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
`(("libzip" ,libzip)
("libxml2" ,libxml2)))
(home-page "http://ebook-tools.sourceforge.net")
(synopsis "Tools and library for dealing with various ebook file formats")
(description "This package provides command-line tools and a library for
accessing and converting various ebook file formats.")
(license license:expat)))
(define-public liblinebreak
(package
(name "liblinebreak")

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

@ -86,6 +86,7 @@
;;; Copyright © 2020 Tim Howes <timhowes@lavabit.com>
;;; Copyright © 2020 Noah Landis <noahlandis@posteo.net>
;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz>
;;; Copyright © 2020 André A. Gomes <andremegafone@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -362,42 +363,38 @@ configuration files, such as .gitattributes, .gitignore, and .git/config.")
(license license:gpl3+)))
(define-public emacs-with-editor
;; This commit fixes an (magit) issue with emacs 28, see
;; https://lists.gnu.org/archive/html/help-gnu-emacs/2020-10/msg00211.html
(let ((commit "c4768f51c7415119519b4626d8643d60e584098c")
(revision "1"))
(package
(name "emacs-with-editor")
(version (git-version "2.9.4" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/magit/with-editor")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "01ysb9pnscpmingay6njdywkqgj4hn5l5d9igsg3x7p7061jwwix"))))
(build-system emacs-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-before 'install 'make-info
(lambda _
(invoke "makeinfo" "--no-split"
"-o" "with-editor.info" "with-editor.texi"))))))
(native-inputs
`(("texinfo" ,texinfo)))
(propagated-inputs
`(("emacs-dash" ,emacs-dash)))
(home-page "https://github.com/magit/with-editor")
(synopsis "Emacs library for using Emacsclient as EDITOR")
(description
"This package provides an Emacs library to use the Emacsclient as
(package
(name "emacs-with-editor")
(version "3.0.2")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/magit/with-editor")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0hw6i5r3adkm4988badi94825lywkrh3sddiff4z04kj1nj15d0k"))))
(build-system emacs-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-before 'install 'make-info
(lambda _
(invoke "makeinfo" "--no-split"
"-o" "with-editor.info" "with-editor.texi"))))))
(native-inputs
`(("texinfo" ,texinfo)))
(propagated-inputs
`(("emacs-async" ,emacs-async)))
(home-page "https://github.com/magit/with-editor")
(synopsis "Emacs library for using Emacsclient as EDITOR")
(description
"This package provides an Emacs library to use the Emacsclient as
@code{$EDITOR} of child processes, making sure they know how to call home.
For remote processes a substitute is provided, which communicates with Emacs
on stdout instead of using a socket as the Emacsclient does.")
(license license:gpl3+))))
(license license:gpl3+)))
(define-public emacs-libgit
(let ((commit "0ef8b13aef011a98b7da756e4f1ce3bb18e4d55a")
@ -682,16 +679,16 @@ Alternatively the menu can be bound globally, for example:
(define-public emacs-moody
(package
(name "emacs-moody")
(version "0.5.3")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/tarsius/moody")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1xyw4l42053595r76lj8safsx6pj25as0107wd96by3h7dg9m586"))))
(version "0.5.4")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/tarsius/moody")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0n8p864yj5m3n7f9qiq9hy24dwfvv0a0wchx2818rppff6vfq3hf"))))
(build-system emacs-build-system)
(home-page "https://github.com/tarsius/moody")
(synopsis "Tabs and ribbons for Emacs mode-line")
@ -1813,7 +1810,8 @@ mode, Rmail, Gnus, MH-E, and VM). BBDB is fully customizable.")
(base32 "1dq04p6ms0zx4awlypp4crkz7dzal4xg8ac7p8fqacz196rczssp"))))
(build-system emacs-build-system)
(inputs
`(("bluez" ,bluez)))
`(("bluez" ,bluez)
("dbus" ,dbus)))
(propagated-inputs
`(("emacs-dash" ,emacs-dash)))
(home-page "https://gitlab.com/rstocker/emacs-bluetooth")
@ -2767,20 +2765,21 @@ type, for example: packages, buffers, files, etc.")
(license license:gpl3+)))
(define-public emacs-guix
(let ((commit "58a840d0671091e3064e36244790ef8839da87d6")
(revision "2"))
(let* ((commit "a694fdbcedb6edd2239a31d326e475c763ee32f8")
(revision "3"))
(package
(name "emacs-guix")
(version (git-version "0.5.2" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.com/emacs-guix/emacs-guix")
;; TODO: Use the official version when it has a new home
(url "https://github.com/jsoo1/guix.el")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1qnr5sixmvrhr9rinrhfy7sy20mikjvvwbdixwkbx30qpcdwgwj1"))))
"1pqw7zbgxzwpig4xr0izc3z8h80c72i6bl5yi12br0d7aq6dbkvj"))))
(build-system gnu-build-system)
(native-inputs
`(("autoconf" ,autoconf)
@ -2789,7 +2788,8 @@ type, for example: packages, buffers, files, etc.")
("texinfo" ,texinfo)
("emacs" ,emacs-minimal)))
(inputs
`(("guile" ,@(assoc-ref (package-native-inputs guix) "guile"))
`(("guile"
,@(assoc-ref (package-native-inputs guix) "guile"))
("guix" ,guix)))
(propagated-inputs
`(("geiser" ,emacs-geiser)
@ -3248,7 +3248,7 @@ files and directories.")
(define-public emacs-fountain-mode
(package
(name "emacs-fountain-mode")
(version "3.3.0")
(version "3.3.3")
(source
(origin
(method git-fetch)
@ -3257,7 +3257,7 @@ files and directories.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "04jrv6i4ah3i8c9hcd9wyaw2vrxr46f50qb9qwna2v7qa5vaway3"))))
(base32 "095nrkg2bap6rcg9hy3bh0nis4v2f8w8d9hnahkzsa3njlpqa4ka"))))
(build-system emacs-build-system)
(home-page "https://github.com/rnkn/fountain-mode")
(synopsis "Major mode for screenwriting in Fountain markup")
@ -4843,14 +4843,14 @@ source code using IPython.")
(define-public emacs-debbugs
(package
(name "emacs-debbugs")
(version "0.26")
(version "0.27")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/debbugs-"
version ".tar"))
(sha256
(base32 "14n2rrs3ccvlp8fhxs08awlqdfawxwbj8nq1xpa0wwlbfvxnf24c"))))
(base32 "1zn9p9vmfv5ihrp8d06b6abs48q225v42cgwa01s39hld6zg6wbv"))))
(build-system emacs-build-system)
(arguments '(#:include '("\\.el$" "\\.wsdl$" "\\.info$")))
(propagated-inputs
@ -6627,14 +6627,14 @@ board and goal value can be customized.")
(define-public emacs-chess
(package
(name "emacs-chess")
(version "2.0.4")
(version "2.0.5")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/"
"chess-" version ".tar"))
(sha256
(base32 "1sq1bjmp513vldfh7hc2bbfc54665abqiz0kqgqq3gijckaxn5js"))))
(base32 "1a4iwjdh6k348df6qywjws9z9f862d62m0b2sz57z4xhywiyxpr7"))))
(build-system emacs-build-system)
(arguments
`(#:phases
@ -7783,6 +7783,33 @@ The purpose of this library is to wrap all the quirks and hassle of
@code{package.el} into a sane API.")
(license license:gpl3+)))
(define-public emacs-counsel-jq
(let ((release "1.0.0")
(revision "0")
(commit "aaf33fc2447096cd0d03b77395fe2a95c9fe1481"))
(package
(name "emacs-counsel-jq")
(version (git-version release revision commit))
(home-page "https://github.com/200ok-ch/counsel-jq")
(source
(origin
(method git-fetch)
(uri (git-reference
(url home-page)
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "10rz0qm8a4bl0m86kx19zq8lri047p4sxqyny08bgm9pbam0wvwn"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-swiper" ,emacs-swiper)
("jq" ,jq)))
(synopsis "Live preview @code{jq} queries using counsel")
(description
"This Emacs package provides the ability to live preview @code{jq}
queries using counsel.")
(license license:gpl3+))))
(define-public emacs-counsel-notmuch
;; Upstream provides no release. Extract version for main file.
(let ((commit "a4a1562935e4180c42524c51609d1283e9be0688")
@ -10240,6 +10267,30 @@ lists, and project planning with a fast and effective plain-text system.
This package is equivalent to org-plus-contrib, but only includes additional
files that you would find in @file{contrib/} from the git repository.")))
(define-public emacs-org-pretty-table
;; There is no release yet.
(let ((commit "1331c600b83d95b28730b1bfcb48369ac1cf12ef")
(revision "0"))
(package
(name "emacs-org-pretty-table")
(version (git-version "0.0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Fuco1/org-pretty-table")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "0yvqxh66y400n2n5ykmb1zrzd80bakffpwn6nmf37728x4cj8krh"))))
(build-system emacs-build-system)
(home-page "https://github.com/Fuco1/org-pretty-table")
(synopsis "Make tables in Org mode and OrgTbl mode prettier")
(description
"This package displays tables in Org mode and OrgTbl mode using Unicode
characters.")
(license license:gpl3+))))
(define-public emacs-ob-sclang
(package
(inherit emacs-org-contrib)
@ -15211,6 +15262,14 @@ and @code{erc-send-modify-hook} to download and show images.")
(sha256
(base32 "07hbz2md52ccy95gv4d5n6szrfmpfqf3w4kwqdg2cf54c7kgf7hw"))))
(build-system emacs-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-require-cl
(lambda _
(substitute* "list-utils.el"
(("\\(require 'cl\\)") "(require 'cl-lib)"))
#t)))))
(home-page "https://github.com/rolandwalker/list-utils")
(synopsis "List-manipulation utility functions")
(description "This package provides a list manipulation library for Emacs.")
@ -20987,31 +21046,29 @@ and code peeking.")
(license license:gpl3+))))
(define-public emacs-lsp-ivy
(let ((commit "caf1e1d7e22ed0b5fe18dd508d1a6f83dd163288")
(revision "2"))
(package
(name "emacs-lsp-ivy")
(version (git-version "0.1" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/emacs-lsp/lsp-ivy")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"084ds4qhzhivfnicy3h7z4mblxgcqx8pfnkbjr9qjrfng7cisy4z"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-ivy" ,emacs-ivy)
("emacs-lsp-mode" ,emacs-lsp-mode)
("emacs-dash" ,emacs-dash)))
(home-page "https://github.com/emacs-lsp/lsp-ivy")
(synopsis "Provide LSP-enhanced completion for symbols")
(description
"This package enhances @code{ivy} with completion for symbols from
(package
(name "emacs-lsp-ivy")
(version "0.4")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/emacs-lsp/lsp-ivy")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "08dpn0vcfdwwysijwdpnnj91m69yw0q464i0wmp51zpj3dyd4kb1"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-dash" ,emacs-dash)
("emacs-ivy" ,emacs-ivy)
("emacs-lsp-mode" ,emacs-lsp-mode)))
(home-page "https://github.com/emacs-lsp/lsp-ivy")
(synopsis "Provide LSP-enhanced completion for symbols")
(description
"This package enhances @code{ivy} with completion for symbols from
workspaces with a LSP-compliant server running.")
(license license:gpl3+))))
(license license:gpl3+)))
(define-public emacs-helm-lsp
(let ((commit "3a58ca4cfd94b9ab1e15e819d3b16ef568e8889b")
@ -21922,8 +21979,8 @@ copied into @code{org-mode} buffers.")
(license license:gpl3+))))
(define-public emacs-dash-docs
(let ((commit "111fd9b97001f1ad887b45e5308a14ddd68ce70a")
(revision "1"))
(let ((commit "dafc8fc9f1ddb2e4e39e0b8d066c42d5d7ce8d06")
(revision "2"))
(package
(name "emacs-dash-docs")
(version (git-version "1.4.0" revision commit))
@ -21936,7 +21993,7 @@ copied into @code{org-mode} buffers.")
(file-name (git-file-name name version))
(sha256
(base32
"0sckb7z0ylflva212bns7iq9mfnffgjghi0qspsbfwra35zb9xng"))))
"0n6d3mm43gj16v8kjjradcfik93wb89dsqnfcbskb28bvcamafid"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-async" ,emacs-async)))
@ -22656,10 +22713,10 @@ it forcibly
(lambda _
(invoke "makeinfo" "elpher.texi"))))))
(home-page "gopher://thelambdalab.xyz/1/projects/elpher/")
(synopsis "Gopher client for Emacs")
(description "Elpher is a full-featured gopher client for Emacs. Its
features include intuitive keyboard and mouse-driven browsing, out-of-the-box
compatibility with evil-mode, clickable web and gopher links in plain text,
(synopsis "Gopher and gemini client for Emacs")
(description "Elpher is a full-featured gopher and gemini client for
Emacs. Its features include intuitive keyboard and mouse-driven browsing,
out-of-the-box compatibility with evil-mode, clickable links in plain text,
caching of visited sites, pleasant and configurable visualization of Gopher
directories, direct visualisation of image files, jumping directly to links by
name (with autocompletion), a simple bookmark management system and
@ -23201,10 +23258,10 @@ Emacs that integrate with major modes like Org-mode.")
(home-page "https://github.com/hlissner/emacs-doom-themes")
(license license:expat))))
(define-public emacs-modus-operandi-theme
(define-public emacs-modus-themes
(package
(name "emacs-modus-operandi-theme")
(version "0.13.0")
(name "emacs-modus-themes")
(version "1.0.2")
(source
(origin
(method git-fetch)
@ -23213,56 +23270,27 @@ Emacs that integrate with major modes like Org-mode.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0i6n3pzrmlgabsijy6z0hhs71q7g99yagwr2m33lr30skqc9rvdn"))))
(base32 "1v82payjgx8z0qdklsrkim7xkb6hqrbs34d5qpq0sii43jwhiy5j"))))
(build-system emacs-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'remove-other-theme
(lambda _
(delete-file "modus-vivendi-theme.el")
#t)))))
(home-page "https://gitlab.com/protesilaos/modus-themes")
(synopsis "Accessible light theme (WCAG AAA)")
(home-page "https://protesilaos.com/modus-themes/")
(synopsis "Accessible themes (WCAG AAA)")
(description
"Modus operandi is the light version of the Modus accessible themes for
GNU Emacs. The contrast ratio between foreground and background values should
always be greater than 7:1, which conforms with the WCAG AAA accessibility
standard. This is the highest standard of its kind.")
"The Modus themes are designed for accessible readability. They conform
with the highest standard for color contrast between any given combination of
background and foreground values. This corresponds to the WCAG AAA standard,
which specifies a minimum rate of distance in relative luminance of 7:1.
Modus Operandi (modus-operandi) is a light theme, while Modus
Vivendi (modus-vivendi) is dark. Each theme’s color palette is designed to
meet the needs of the numerous interfaces that are possible in the Emacs
computing environment.")
(license license:gpl3+)))
(define-public emacs-modus-operandi-theme
(deprecated-package "emacs-modus-operandi-theme" emacs-modus-themes))
(define-public emacs-modus-vivendi-theme
(package
(name "emacs-modus-vivendi-theme")
(version "0.13.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.com/protesilaos/modus-themes")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0i6n3pzrmlgabsijy6z0hhs71q7g99yagwr2m33lr30skqc9rvdn"))))
(build-system emacs-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'remove-other-theme
(lambda _
(delete-file "modus-operandi-theme.el")
#t)))))
(home-page "https://gitlab.com/protesilaos/modus-themes")
(synopsis "Accessible dark theme (WCAG AAA)")
(description
"Modus vivendi is the dark version of the Modus accessible themes for GNU
Emacs. The contrast ratio between foreground and background values should
always be greater than 7:1, which conforms with the WCAG AAA accessibility
standard. This is the highest standard of its kind.")
(license license:gpl3+)))
(define-public emacs-modus-themes
(deprecated-package "emacs-modus-themes" emacs-modus-operandi-theme))
(deprecated-package "emacs-modus-vivendi-theme" emacs-modus-themes))
(define-public emacs-punpun-theme
(let ((commit "2f78125609277b2478abdebd8f9d5ee10a823b65")
@ -23541,6 +23569,30 @@ Google guidelines.")
fish-completion. It can be used in both Eshell and M-x shell.")
(license license:gpl3+)))
(define-public emacs-helm-switch-to-repl
(package
(name "emacs-helm-switch-to-repl")
(version "0.1.0")
(home-page "https://github.com/emacs-helm/helm-switch-to-repl")
(source
(origin
(method git-fetch)
(uri (git-reference
(url home-page)
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0n19brymwnawhi0y10m54cas3qg64pmkqq1ajvjw1rfibmw3n6nk"))))
(build-system emacs-build-system)
(propagated-inputs
`(("helm" ,emacs-helm)))
(synopsis "Helm action to switch directory in Emacs REPLs")
(description "Helm \"Switch-to-REPL\" offers the
@code{helm-switch-to-repl} action, a generalized and extensible version of
@code{helm-ff-switch-to-shell}. It can be added to @code{helm-find-files} and
other @code{helm-type-file} sources such as @code{helm-locate}.")
(license license:gpl3+)))
(define-public emacs-telega
;; This package has versions newer than indicated on MELPA.
;; Get the current version from `telega-version` in telega.el.
@ -24821,7 +24873,7 @@ variables.")
(define-public emacs-company-emoji
(package
(name "emacs-company-emoji")
(version "2.5.2")
(version "2.6.0")
(source
(origin
(method git-fetch)
@ -24830,7 +24882,7 @@ variables.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0r9zcbm3nb3zw5cwrkl098v5b49jbga5404bj7j55g6k4rwkjar2"))))
(base32 "0pa67yfcr8lrxdbvln8hs663gsxz38ggwpva7121ngascqgx42wp"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-company" ,emacs-company)))
@ -25728,3 +25780,112 @@ syntax highlighting and UI components.")
"This Emacs package provides a Janet REPL to evaluate @code{janet-mode}
s-expression.")
(license license:expat))))
(define-public emacs-map
(package
(name "emacs-map")
(version "2.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/map-"
version ".el"))
(sha256
(base32
"0ydz5w1n4vwhhzxxj003s7jv8n1wjijwfryk5z93bwhnr0cak0i0"))))
(build-system emacs-build-system)
(home-page "http://elpa.gnu.org/packages/map.html")
(synopsis "Map manipulation functions")
(description "This package provides Emacs map-manipulation functions that
work on alists, hash-table and arrays. All functions are prefixed with
@code{map-}.")
(license license:gpl3+)))
(define-public emacs-burly
(package
(name "emacs-burly")
(version "0.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/alphapapa/burly.el")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1vaikknjzmhpszyi4yxjjkp1ihgmhpbnbx1s5pjy4mnhl1ibi33b"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-map" ,emacs-map)))
(home-page "https://github.com/alphapapa/burly.el")
(synopsis "Save and restore frame/window configurations with buffers")
(description "This package provides tools to save and restore frame and
window configurations in Emacs, including buffers that may not be live
anymore. In this way, it's like a lightweight \"workspace\" manager, allowing
you to easily restore one or more frames, including their windows, the
windows' layout, and their buffers.")
(license license:gpl3+)))
(define-public emacs-smart-hungry-delete
(let ((commit "7c1d56a92481594e14d40b5fdf6c48657a0108a0"))
(package
(name "emacs-smart-hungry-delete")
(version "0.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/hrehfeld/emacs-smart-hungry-delete")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0mxaslx5823s68a8ggbbnmfk1jiswjvip5s4sg7ihfagnci72wni"))))
(build-system emacs-build-system)
(home-page "https://github.com/hrehfeld/emacs-smart-hungry-delete")
(synopsis "Smart hungry deletion of whitespace")
(description "@code{emacs-smart-hungry-delete} hungrily deletes whitespace
between cursor and next word, parenthesis or delimiter while honoring some
rules about where space should be left to separate words and parentheses.")
(license license:gpl2+))))
(define-public emacs-webpaste
(package
(name "emacs-webpaste")
(version "3.2.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/etu/webpaste.el")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"08545ihkzflw80rwklnxiswrpdrl8kr74xzxm5wsgrf36fkj9rn2"))))
(build-system emacs-build-system)
(arguments
`(#:tests? #t
#:test-command '("make" "unit" "integration")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-tests
(lambda _
;; Do not use cask to run tests.
(substitute* "Makefile"
(("\\$\\{CASK\\} exec ") ""))
;; Disable tests that need network access.
(substitute* (list "tests/unit/test-webpaste-provider-creation.el"
"tests/integration/test-webpaste-providers.el")
(("describe") "xdescribe")))))))
(native-inputs
`(("emacs-buttercup" ,emacs-buttercup)))
(propagated-inputs
`(("emacs-request" ,emacs-request)))
(home-page "https://github.com/etu/webpaste.el")
(synopsis "Paste to pastebin-like services")
(description "This mode allows to paste whole buffers or parts of buffers
to pastebin-like services. It supports more than one service and will
failover if one service fails. More services can easily be added over time
and prefered services can easily be configured.")
(license license:gpl3+)))

2
gnu/packages/emulators.scm
View file

@ -1330,7 +1330,7 @@ multi-system game/emulator system.")
(source
(origin
(method url-fetch)
(uri (string-append "http://www.scummvm.org/frs/scummvm/" version
(uri (string-append "https://downloads.scummvm.org/frs/scummvm/" version
"/scummvm-" version ".tar.xz"))
(sha256
(base32 "11vknasm5dna2vqr6gk343qynh7nhsq3kf60zayarn1vb5z6as8l"))))

35
gnu/packages/engineering.scm
View file

@ -1133,22 +1133,23 @@ use on a given system.")
(define-public libredwg
(package
(name "libredwg")
(version "0.11")
(version "0.11.1")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://gnu/libredwg/libredwg-"
version ".tar.xz"))
(sha256
(base32 "1vd7ii32k5447z7k4w9s005hv1ffpj6dyf1w40x6c53qksrblny2"))))
(base32 "1xx6y6ckm4mzqln8y8lqf5frcn2b32ypc0d0h9dzpz6363zh7pdn"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags '("--disable-bindings")))
(native-inputs
`(("libxml2" ,libxml2)
("parallel" ,parallel)
("perl" ,perl)
("pkg-config" ,pkg-config)
("python" ,python)
("python" ,python-wrapper)
("python-libxml2" ,python-libxml2)))
(inputs
`(("pcre2" ,pcre2)))
@ -2434,7 +2435,7 @@ full programmatic control over your models.")
(define-public freecad
(package
(name "freecad")
(version "0.18.4")
(version "0.18.5")
(source
(origin
(method git-fetch)
@ -2453,7 +2454,7 @@ full programmatic control over your models.")
(file-name (git-file-name name version))
(sha256
(base32
"170hk1kgrvsddrwykp24wyj0cha78zzmzbf50gn98x7ngqqs395s"))))
"0r31jzzkamf76l19fb175hhv48irk06fpi8ldxdlr31w8c1ix4aa"))))
(build-system qt-build-system)
(native-inputs
`(("doxygen" ,doxygen)
@ -2496,8 +2497,28 @@ full programmatic control over your models.")
#:configure-flags
(list
"-DBUILD_QT5=ON"
(string-append "-DCMAKE_INSTALL_LIBDIR="
(assoc-ref %outputs "out") "/lib"))
(string-append "-DCMAKE_INSTALL_LIBDIR=" (assoc-ref %outputs "out") "/lib")
(string-append "-DPYSIDE2UICBINARY="
(assoc-ref %build-inputs "python-pyside-2-tools")
"/bin/uic")
(string-append "-DPYSIDE2RCCBINARY="
(assoc-ref %build-inputs "python-pyside-2-tools")
"/bin/rcc")
"-DPYSIDE_LIBRARY=PySide2::pyside2"
(string-append
"-DPYSIDE_INCLUDE_DIR="
(assoc-ref %build-inputs "python-pyside-2") "/include;"
(assoc-ref %build-inputs "python-pyside-2") "/include/PySide2;"
(assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtCore;"
(assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtWidgets;"
(assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtGui;")
"-DSHIBOKEN_LIBRARY=Shiboken2::libshiboken"
(string-append "-DSHIBOKEN_INCLUDE_DIR="
(assoc-ref %build-inputs "python-shiboken-2")
"/include/shiboken2"))
#:phases
(modify-phases %standard-phases
(add-before 'configure 'restore-pythonpath

450
gnu/packages/fcitx5.scm Normal file
View file

@ -0,0 +1,450 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020 Zhu Zihao <all_but_last@163.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 fcitx5)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system cmake)
#:use-module (guix build-system copy)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages boost)
#:use-module (gnu packages curl)
#:use-module (gnu packages datastructures)
#:use-module (gnu packages enchant)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages gcc)
#:use-module (gnu packages gettext)
#:use-module (gnu packages glib)
#:use-module (gnu packages gtk)
#:use-module (gnu packages iso-codes)
#:use-module (gnu packages kde-frameworks)
#:use-module (gnu packages libevent)
#:use-module (gnu packages linux)
#:use-module (gnu packages lua)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages pretty-print)
#:use-module (gnu packages python)
#:use-module (gnu packages qt)
#:use-module (gnu packages textutils)
#:use-module (gnu packages unicode)
#:use-module (gnu packages web)
#:use-module (gnu packages xdisorg)
#:use-module (gnu packages xml)
#:use-module (gnu packages xorg))
(define-public xcb-imdkit
(package
(name "xcb-imdkit")
(version "1.0.1")
(source
(origin
(method url-fetch)
(uri (string-append
"https://download.fcitx-im.org/fcitx5/xcb-imdkit/xcb-imdkit-"
version ".tar.xz"))
(sha256
(base32 "1qgbbp8y8ci7haz99vgbrgpjsbrwwyjianyhdvxcirnbm5bybvmz"))
(modules '((guix build utils)))
(snippet
'(begin
;; Remove bundled uthash.
(delete-file-recursively "uthash")
#t))))
(build-system cmake-build-system)
(inputs
`(("uthash" ,uthash)
("libxcb" ,libxcb)
("xcb-util" ,xcb-util)
("xcb-util-keysyms" ,xcb-util-keysyms)))
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
("pkg-config" ,pkg-config)))
(home-page "https://github.com/fcitx/xcb-imdkit")
(synopsis "Input method development support for XCB")
(description "Xcb-imdkit is an implementation of xim protocol in XCB,
comparing with the implementation of IMDkit with Xlib, and xim inside Xlib, it
has less memory foot print, better performance, and safer on malformed
client.")
(license license:lgpl2.1)))
(define-public fcitx5
(package
(name "fcitx5")
(version "5.0.3")
(source
(origin
(method url-fetch)
(uri (string-append
"https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-"
version "_dict.tar.xz"))
(sha256
(base32 "06zkb33m2rnhg385iy79n3r4svz5jbav74di61xqa3lhbv7534s3"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags
(list (string-append "-DCLDR_DIR="
(assoc-ref %build-inputs "unicode-cldr-common")
"/share/unicode/cldr"))))
(inputs
`(("cairo" ,cairo)
("cairo-xcb" ,cairo-xcb)
("dbus" ,dbus)
("enchant" ,enchant)
("expat" ,expat)
("fmt" ,fmt)
("gdk-pixbuf" ,gdk-pixbuf)
("gettext" ,gettext-minimal)
("glib" ,glib)
("iso-codes" ,iso-codes)
("json-c" ,json-c)
("libevent" ,libevent)
("libpthread-stubs" ,libpthread-stubs)
("libuuid" ,util-linux "lib")
("libx11" ,libx11)
("libxcb" ,libxcb)
("libxfixes" ,libxfixes)
("libxinerama" ,libxinerama)
("libxkbcommon" ,libxkbcommon)
("libxkbfile" ,libxkbfile)
("pango" ,pango)
("unicode-cldr-common" ,unicode-cldr-common)
("wayland" ,wayland)
("wayland-protocols" ,wayland-protocols)
("xcb-imdkit" ,xcb-imdkit)
("xcb-util" ,xcb-util)
("xcb-util-keysyms" ,xcb-util-keysyms)
("xcb-util-wm" ,xcb-util-wm)
("xkeyboard-config" ,xkeyboard-config)))
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
("pkg-config" ,pkg-config)))
(native-search-paths
(list (search-path-specification
(variable "FCITX_ADDON_DIRS")
(files '("lib/fcitx5")))))
(home-page "https://github.com/fcitx/fcitx5")
(synopsis "Input method framework")
(description "Fcitx 5 is a generic input method framework.")
(license license:lgpl2.1+)))
(define-public fcitx5-lua
(package
(name "fcitx5-lua")
(version "5.0.1")
(source
(origin
(method url-fetch)
(uri (string-append
"https://download.fcitx-im.org/fcitx5/fcitx5-lua/fcitx5-lua-"
version ".tar.xz"))
(sha256
(base32 "177mj56j8yrl79hvk7bbrifvm137np23pwalv83ibgk4l51z92hf"))))
(build-system cmake-build-system)
(inputs
`(("fcitx5" ,fcitx5)
("lua" ,lua)
("gettext" ,gettext-minimal)
("libpthread-stubs" ,libpthread-stubs)))
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
(home-page "https://github.com/fcitx/fcitx5-lua")
(synopsis "Lua support for Fcitx 5")
(description "Fcitx5-lua allows writing Fcitx5 extension in Lua.")
(license license:lgpl2.1+)))
(define-public libime
(package
(name "libime")
(version "1.0.2")
(source
(origin
(method url-fetch)
(uri (string-append "https://download.fcitx-im.org/fcitx5/libime/libime-"
version "_dict.tar.xz"))
(sha256
(base32 "006pncby7p6h3rnicckzjwi6jzsrqiqbj6p9bpic80lanlllgw31"))))
(build-system cmake-build-system)
(inputs
`(("fcitx5" ,fcitx5)
("boost" ,boost)))
(native-inputs
`(("gcc" ,gcc-9) ;for #include <filesystem> and ld support
("extra-cmake-modules" ,extra-cmake-modules)
("python" ,python))) ;needed to run test
(home-page "https://github.com/fcitx/libime")
(synopsis "Library for implementing generic input method")
(description "Libime is a library for implmenting various input methods
editors.")
(license license:lgpl2.1+)))
(define-public fcitx5-gtk
(package
(name "fcitx5-gtk")
(version "5.0.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://download.fcitx-im.org/fcitx5"
"/fcitx5-gtk/fcitx5-gtk-"
version ".tar.xz"))
(sha256
(base32 "0h53liraqc5nz4nyi3ixdfdw3zzkdcsiff7j25acc3gmaa5gyij7"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ;No test
#:configure-flags
(list (string-append "-DGOBJECT_INTROSPECTION_GIRDIR="
%output "/share/gir-1.0")
(string-append "-DGOBJECT_INTROSPECTION_TYPELIBDIR="
%output "/lib/girepository-1.0"))
#:phases
(modify-phases %standard-phases
(add-before 'configure 'patch-install-prefix
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(gtk2 (assoc-ref outputs "gtk2")))
;; Install GTK+ 2 input method module to its own output.
(substitute* "gtk2/CMakeLists.txt"
(("\\$\\{CMAKE_INSTALL_LIBDIR\\}")
(string-append gtk2 "/lib")))))))))
(inputs
`(("fcitx5" ,fcitx5)
("libxkbcommon" ,libxkbcommon)
("gobject-introspection" ,gobject-introspection)
("gtk2" ,gtk+-2)
("gtk3" ,gtk+)
("glib" ,glib)
("libx11" ,libx11)
("gettext" ,gettext-minimal)))
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
("pkg-config" ,pkg-config)
("glib" ,glib "bin"))) ;for glib-genmarshal
;; TODO: Add "lib" output to reduce the closure size of "gtk2".
(outputs '("out" "gtk2"))
(home-page "https://github.com/fcitx/fcitx5-gtk")
(synopsis "Glib based D-Bus client and GTK IM module for Fcitx 5")
(description "Fcitx5-gtk provides a Glib based D-Bus client and IM module
for GTK+2/GTK+3 application.")
(license license:lgpl2.1+)))
(define-public fcitx5-qt
(package
(name "fcitx5-qt")
(version "5.0.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://download.fcitx-im.org/fcitx5"
"/fcitx5-qt/fcitx5-qt-"
version ".tar.xz"))
(sha256
(base32 "0ilhb4yw9k3m1c4fidnv3nd5dgm9xxds11dgdys6gswjjnmcgqqm"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags
(list (string-append "-DCMAKE_INSTALL_QT5PLUGINDIR="
%output "/lib/qt5/plugins")
"-DENABLE_QT4=Off")))
(inputs
`(("fcitx5" ,fcitx5)
("libxcb" ,libxcb)
("libxkbcommon" ,libxkbcommon)
("qtbase" ,qtbase)
("gettext" ,gettext-minimal)))
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
(home-page "https://github.com/fcitx/fcitx5-qt")
(synopsis "Qt library and IM module for Fcitx 5")
(description "Fcitx5-qt provides Qt library for development and IM module
for Qt based application.")
(license (list license:lgpl2.1+
;; Files under qt4(Fcitx5Qt4DBusAddons), qt5/dbusaddons
;; and qt5/platforminputcontext.
license:bsd-3))))
(define-public fcitx5-chinese-addons
(package
(name "fcitx5-chinese-addons")
(version "5.0.2")
(source
(origin
(method url-fetch)
(uri (string-append "https://download.fcitx-im.org/fcitx5"
"/fcitx5-chinese-addons/fcitx5-chinese-addons-"
version "_dict.tar.xz"))
(sha256
(base32 "0mf91gzwzhfci0jn6g3l516xjw8r4v40ginnbl70h1zx6vr24rfp"))))
(build-system cmake-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-before 'configure 'split-outputs
;; Build with GUI supports requires Qt and increase package closure
;; by 800M on x86_64, so place it under another output.
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "gui/pinyindictmanager/CMakeLists.txt"
(("\\$\\{CMAKE_INSTALL_LIBDIR\\}" _)
(string-append (assoc-ref outputs "gui") "/lib"))))))))
(inputs
`(("fcitx5" ,fcitx5)
("fcitx5-lua" ,fcitx5-lua)
("boost" ,boost)
("libime",libime)
("curl" ,curl)
("gettext" ,gettext-minimal)
("fmt" ,fmt)
("libpthread-stubs" ,libpthread-stubs)
("opencc" ,opencc)
("qtbase" ,qtbase)
("fcitx5-qt" ,fcitx5-qt)
("qtwebkit" ,qtwebkit)))
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
("pkg-config" ,pkg-config)))
(outputs '("out" "gui"))
(home-page "https://github.com/fcitx/fcitx5-chinese-addons")
(synopsis "Chinese related addons for Fcitx 5")
(description "Fcitx5-chinese-addons provides Chinese related addons,
including input methods previous bundled inside Fcitx 4:
@itemize
@item Bingchan
@item Cangjie
@item Erbi
@item Pinyin
@item Shuangpin
@item Wanfeng
@item Wubi
@item Wubi Pinyin
@item Ziranma
@end itemize\n")
(license (list license:lgpl2.1+
license:gpl2+
;; im/pinyin/emoji.txt
license:unicode))))
(define-public fcitx5-configtool
(package
(name "fcitx5-configtool")
(version "5.0.1")
(source
(origin
(method url-fetch)
(uri (string-append
"https://download.fcitx-im.org/fcitx5"
"/fcitx5-configtool/fcitx5-configtool-" version ".tar.xz"))
(sha256
(base32 "0mrqhzvab41hkvhkz7vkb8d2mv5bgx4aqp9jpz4kf3kskwm1q14b"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags
;; KDE is currently not working on Guix, KCM supports doesn't make sense.
'("-DENABLE_KCM=Off")))
(inputs
`(("fcitx5" ,fcitx5)
("fcitx5-qt" ,fcitx5-qt)
("qtbase" ,qtbase)
("qtx11extras" ,qtx11extras)
("kitemviews" ,kitemviews)
("kwidgetsaddons" ,kwidgetsaddons)
("libx11" ,libx11)
("xkeyboard-config" ,xkeyboard-config)
("libxkbfile" ,libxkbfile)
("gettext" ,gettext-minimal)
("iso-codes" ,iso-codes)))
(native-inputs
`(("gcc" ,gcc-9)
("extra-cmake-modules" ,extra-cmake-modules)
("pkg-config" ,pkg-config)))
(home-page "https://github.com/fcitx/fcitx5-configtool")
(synopsis "Graphical configuration tool for Fcitx 5")
(description "Fcitx5-configtool is a graphical configuration tool
to manage different input methods in Fcitx 5.")
(license license:gpl2+)))
(define-public fcitx5-material-color-theme
(package
(name "fcitx5-material-color-theme")
(version "0.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/hosxy/Fcitx5-Material-Color")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1mgc722521jmfx0xc3ibmiycd3q2w7xg2956xcpc07kz90gcdjaa"))))
(build-system copy-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(use-modules (srfi srfi-26))
(let* ((out (assoc-ref outputs "out"))
(assets-dir (string-append
out "/share/fcitx5-material-color-theme"))
(themes-prefix (string-append out "/share/fcitx5/themes")))
(define (install-theme-variant variant target)
(let ((dir (string-append themes-prefix "/" target))
(png (string-append "panel-" variant ".png"))
(conf (string-append "theme-" variant ".conf")))
(format #t "install: Installing color variant \"~a\" to ~a~%"
variant dir)
(substitute* conf
(("^Name=.*")
(string-append "Name=" target "\n")))
(mkdir-p dir)
(install-file png dir)
(copy-file conf (string-append dir "/theme.conf"))
(symlink (string-append assets-dir "/arrow.png")
(string-append dir "/arrow.png"))))
(mkdir-p assets-dir)
(install-file "arrow.png" assets-dir)
(for-each
(lambda (x)
(install-theme-variant
x (string-append "Material-Color-" (string-capitalize x))))
'("black" "blue" "brown" "indigo"
"orange" "pink" "red" "teal"))
(install-theme-variant
"deepPurple" "Material-Color-DeepPurple")))))))
(home-page "https://github.com/hosxy/Fcitx5-Material-Color")
(synopsis "Material Design for Fcitx 5")
(description "Fcitx5-material-color-theme is a Material Design theme
for Fcitx 5 with following color variants:
@itemize
@item Black
@item Blue
@item Brown
@item Indigo
@item Orange
@item Pink
@item Red
@item teal
@item DeepPurple
@end itemize\n")
(license license:asl2.0)))

74
gnu/packages/finance.scm
View file

@ -21,6 +21,7 @@
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2020 Carlo Holl <carloholl@gmail.com>
;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -69,6 +70,7 @@
#:use-module (gnu packages dbm)
#:use-module (gnu packages gettext)
#:use-module (gnu packages gnome)
#:use-module (gnu packages golang)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages graphviz)
@ -623,7 +625,7 @@ other machines/servers. Electroncash does not download the Bitcoin Cash blockch
;; the system's dynamically linked library.
(package
(name "monero")
(version "0.17.1.5")
(version "0.17.1.6")
(source
(origin
(method git-fetch)
@ -643,7 +645,7 @@ other machines/servers. Electroncash does not download the Bitcoin Cash blockch
"external/unbound"))
#t))
(sha256
(base32 "0yy9n2qng02j314h8fh5n0mcy6vpdks0yk4d8ifn8hj03f3g2c8b"))))
(base32 "0b6zyr3mzqvcxf48i2g45gr649x6nhppik5598jsvg0z7i2hxb9q"))))
(build-system cmake-build-system)
(native-inputs
`(("doxygen" ,doxygen)
@ -733,7 +735,7 @@ the Monero command line client and daemon.")
(define-public monero-gui
(package
(name "monero-gui")
(version "0.17.1.5")
(version "0.17.1.6")
(source
(origin
(method git-fetch)
@ -742,7 +744,7 @@ the Monero command line client and daemon.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0qlcqli0wvrjfy89mbgh1hpmk60dxgn5sws93h8lhgyfwx557iw0"))))
(base32 "0kn5wvx2psbdaqmy1cxlbf5l1mdpvh0b6hh9drah3s7nj3654a3r"))))
(build-system qt-build-system)
(native-inputs
`(,@(package-native-inputs monero)
@ -1229,20 +1231,25 @@ trezord as a regular user instead of needing to it run as root.")
(define-public trezord
(package
(name "trezord")
(version "2.0.29")
(version "2.0.30")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/trezor/trezord-go")
(commit (string-append "v" version))))
(url "https://github.com/trezor/trezord-go")
(commit (string-append "v" version))))
(sha256
(base32
"1ks1fa0027s3xp0z6qp0dxmayvrb4dwwscfhbx7da0khp153f2cp"))
"1hzvk0wfgg7b4wpqjk3738yqxlv3pj5i7zxwm0jady2h97hmrqrr"))
(file-name (git-file-name name version))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/trezor/trezord-go"))
(native-inputs
`(("github.com/gorilla-csrf" ,go-github-com-gorilla-csrf)
("github.com/gorilla/handlers" ,go-github-com-gorilla-handlers)
("github.com/gorilla/mux" ,go-github-com-gorilla-mux)
("gopkg.in/natefinch/lumberjack.v2" ,go-gopkg-in-natefinch-lumberjack.v2)))
(home-page "https://trezor.io")
(synopsis "Trezor Communication Daemon aka Trezor Bridge (written in Go)")
(description "This allows a Trezor hardware wallet to communicate to the
@ -1648,3 +1655,54 @@ generate a variety of reports from them, and provides a web interface.")
(synopsis "Emacs mode for beancount")
(description
"Emacs-beancount is an Emacs mode for the Beancount accounting tool.")))
(define-public hledger-web
(package
(name "hledger-web")
(version "1.14.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"hledger-web/hledger-web-" version ".tar.gz"))
(sha256
(base32
"0w59nr7mj0nx8z44cvhy1rhlj5rmx0wq4p5nfl4dycfmp7jwvsm1"))))
(build-system haskell-build-system)
(inputs
`(("ghc-decimal" ,ghc-decimal)
("ghc-aeson" ,ghc-aeson)
("ghc-blaze-html" ,ghc-blaze-html)
("ghc-blaze-markup" ,ghc-blaze-markup)
("ghc-case-insensitive" ,ghc-case-insensitive)
("ghc-clientsession" ,ghc-clientsession)
("ghc-cmdargs" ,ghc-cmdargs)
("ghc-conduit" ,ghc-conduit)
("ghc-conduit-extra" ,ghc-conduit-extra)
("ghc-data-default" ,ghc-data-default)
("ghc-hjsmin" ,ghc-hjsmin)
("hledger" ,hledger)
("ghc-hledger-lib" ,ghc-hledger-lib)
("ghc-http-client" ,ghc-http-client)
("ghc-http-conduit" ,ghc-http-conduit)
("ghc-http-types" ,ghc-http-types)
("ghc-json" ,ghc-json)
("ghc-megaparsec" ,ghc-megaparsec)
("ghc-semigroups" ,ghc-semigroups)
("ghc-shakespeare" ,ghc-shakespeare)
("ghc-wai" ,ghc-wai)
("ghc-wai-extra" ,ghc-wai-extra)
("ghc-wai-handler-launch" ,ghc-wai-handler-launch)
("ghc-warp" ,ghc-warp)
("ghc-yaml" ,ghc-yaml)
("ghc-yesod" ,ghc-yesod)
("ghc-yesod-core" ,ghc-yesod-core)
("ghc-yesod-form" ,ghc-yesod-form)
("ghc-yesod-static" ,ghc-yesod-static)))
(home-page "https://hledger.org")
(synopsis "Web-based user interface for the hledger accounting system")
(description "This package provides a simple Web-based User
Interface (UI) for the hledger accounting system. It can be used as a
local, single-user UI, or as a multi-user UI for viewing, adding, and
editing on the Web.")
(license license:gpl3)))

73
gnu/packages/fontutils.scm
View file

@ -8,7 +8,7 @@
;;; Copyright © 2017 Nikita <nikita@n0.is>
;;; Copyright © 2017, 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2019, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020 Roel Janssen <roel@gnu.org>
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
@ -73,14 +73,14 @@
(define-public freetype
(package
(name "freetype")
(version "2.10.1")
(replacement freetype/fixed)
(source (origin
(method url-fetch)
(uri (string-append "mirror://savannah/freetype/freetype-"
version ".tar.xz"))
(sha256 (base32
"0vx2dg1jh5kq34dd6ifpjywkpapp8a7p1bvyq9yq5zi1i94gmnqn"))))
(version "2.10.4")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://savannah/freetype/freetype-"
version ".tar.xz"))
(sha256
(base32 "112pyy215chg7f7fmp2l9374chhhpihbh8wgpj5nj6avj3c59a46"))))
(build-system gnu-build-system)
(arguments
;; The use of "freetype-config" is deprecated, but other packages still
@ -103,19 +103,6 @@ anti-aliased glyph bitmap generation with 256 gray levels.")
(license license:freetype) ; some files have other licenses
(home-page "https://www.freetype.org/")))
(define freetype/fixed
;; Security fix for CVE-2020-15999.
(package
(inherit freetype)
(version "2.10.4")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://savannah/freetype/freetype-"
version ".tar.xz"))
(sha256
(base32 "112pyy215chg7f7fmp2l9374chhhpihbh8wgpj5nj6avj3c59a46"))))))
(define-public ttfautohint
(package
(name "ttfautohint")
@ -331,12 +318,6 @@ Font Format (WOFF).")
(define-public fontconfig
(package
(name "fontconfig")
;; This replacement is not security-related, but works around the fact
;; that gs-fonts are not recognized by newer versions of Pango, causing
;; many applications to fail to find fonts otherwise.
(replacement fontconfig/font-dejavu)
(version "2.13.1")
(source (origin
(method url-fetch)
@ -351,16 +332,19 @@ Font Format (WOFF).")
(propagated-inputs `(("expat" ,expat)
("freetype" ,freetype)
("libuuid" ,util-linux "lib")))
(inputs `(("gs-fonts" ,gs-fonts)))
(inputs
;; We use to use 'gs-fonts' but they are not recognized by newer versions
;; of Pango, causing many applications to fail to find fonts otherwise.
`(("font-dejavu" ,font-dejavu)))
(native-inputs
`(("gperf" ,gperf)
("pkg-config" ,pkg-config)))
(arguments
`(#:configure-flags
(list "--with-cache-dir=/var/cache/fontconfig"
;; register gs-fonts as default fonts
;; register the default fonts
(string-append "--with-default-fonts="
(assoc-ref %build-inputs "gs-fonts")
(assoc-ref %build-inputs "font-dejavu")
"/share/fonts")
;; Register fonts from user and system profiles.
@ -393,13 +377,6 @@ high quality, anti-aliased and subpixel rendered text on a display.")
"See COPYING in the distribution."))
(home-page "https://www.freedesktop.org/wiki/Software/fontconfig")))
(define fontconfig/font-dejavu
(package
(inherit fontconfig)
(inputs
;; XXX: Reuse the name to avoid having to override the configure flags.
`(("gs-fonts" ,font-dejavu)))))
(define-public t1lib
(package
(name "t1lib")
@ -575,16 +552,15 @@ using the above tables.")
(define-public libspiro
(package
(name "libspiro")
(version "20190731")
(replacement libspiro-20200505)
(version "20200505")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/fontforge/libspiro/releases"
"/download/" version "/libspiro-" version ".tar.gz"))
"/download/" version "/libspiro-dist-" version ".tar.gz"))
(sha256
(base32
"0m63x97b7aciviijprvy85gm03p2jsgslxn323zl9zn7qz6d3ir4"))))
"0j8fmyj4wz6mqk17dqs6f8jx0i52n68gv5px17qbrjnbilg9mih6"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags '("--disable-static")))
@ -595,19 +571,6 @@ smooth contours with constant curvature at the spline joins.")
(license license:gpl2+)
(home-page "http://libspiro.sourceforge.net/")))
(define libspiro-20200505
(package
(inherit libspiro)
(version "20200505")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/fontforge/libspiro/releases"
"/download/" version "/libspiro-dist-" version ".tar.gz"))
(sha256
(base32
"0j8fmyj4wz6mqk17dqs6f8jx0i52n68gv5px17qbrjnbilg9mih6"))))))
(define-public libuninameslist
(package
(name "libuninameslist")

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

@ -1071,7 +1071,14 @@ to create fully featured games and multimedia programs in the python language.")
(method url-fetch)
(uri (string-append "https://www.renpy.org/dl/" renpy-version
"/pygame_sdl2-" version ".tar.gz"))
(sha256 (base32 "1bmr7j9mlsc4czpgw70ld15ymyp4wxrk9hdsqad40wjwdxvvg2dr"))))
(sha256 (base32 "1bmr7j9mlsc4czpgw70ld15ymyp4wxrk9hdsqad40wjwdxvvg2dr"))
(modules '((guix build utils)))
(snippet
'(begin
;; drop generated sources
(delete-file-recursively "gen")
(delete-file-recursively "gen3")
#t))))
(build-system python-build-system)
(arguments
`(#:tests? #f ; tests require pygame to be installed first
@ -1090,11 +1097,6 @@ to create fully featured games and multimedia programs in the python language.")
"/lib -Wl,-rpath,"
(assoc-ref inputs "sdl-union")
"/lib -Wl,--enable-new-dtags -lSDL2"))
#t))
(add-before 'build 'drop-generated-files
(lambda args
(delete-file-recursively "gen")
(delete-file-recursively "gen3")
#t)))))
(inputs
`(("sdl-union"
@ -1118,7 +1120,18 @@ developed mainly for Ren'py.")
(method url-fetch)
(uri (string-append "https://www.renpy.org/dl/" version
"/renpy-" version "-source.tar.bz2"))
(sha256 (base32 "1anr5cfbvbsbik4v4rvrkdkciwhg700k4lydfbs4n85raimz9mw4"))))
(sha256 (base32 "1anr5cfbvbsbik4v4rvrkdkciwhg700k4lydfbs4n85raimz9mw4"))
(modules '((guix build utils)))
(patches
(search-patches
"renpy-use-system-fribidi.patch"))
(snippet
'(with-directory-excursion "module"
;; drop generated sources
(delete-file-recursively "gen")
;; drop fribidi sources
(delete-file-recursively "fribidi-src")
#t))))
(build-system python-build-system)
(arguments
`(#:tests? #f ; Ren'py doesn't seem to package tests
@ -1131,6 +1144,13 @@ developed mainly for Ren'py.")
(("xdg-open")
(which "xdg-open")))
#t))
(add-after 'unpack 'fix-include-paths
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "module/setup.py"
(("/usr/include/fribidi")
(string-append (assoc-ref inputs "fribidi")
"/include/fribidi")))
#t))
(add-after 'set-paths 'set-build-vars
(lambda* (#:key inputs #:allow-other-keys)
(setenv "RENPY_CYTHON"
@ -1168,6 +1188,7 @@ developed mainly for Ren'py.")
(inputs
`(("ffmpeg" ,ffmpeg)
("freetype" ,freetype)
("fribidi" ,fribidi)
("glew" ,glew)
("libpng" ,libpng)
("python2-pygame" ,python2-pygame-sdl2)

4
gnu/packages/games.scm
View file

@ -7927,7 +7927,7 @@ their own levels.")
(define-public libmanette
(package
(name "libmanette")
(version "0.2.5")
(version "0.2.6")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/libmanette/"
@ -7935,7 +7935,7 @@ their own levels.")
"libmanette-" version ".tar.xz"))
(sha256
(base32
"0awsl0d34k3w18jdiyh377r7qi00s4kmh5gc97vx9jy0h22f01l0"))))
"1b3bcdkk5xd5asq797cch9id8692grsjxrc1ss87vv11m1ck4rb3"))))
(build-system meson-build-system)
(native-inputs
`(("glib" ,glib "bin") ; for glib-compile-resources

4
gnu/packages/ghostscript.scm
View file

@ -170,7 +170,9 @@ printing, and psresize, for adjusting page sizes.")
(sha256
(base32
"0z1w42y2jmcpl2m1l3z0sfii6zmvzcwcgzn6bydklia6ig7jli2p"))
(patches (search-patches "ghostscript-no-header-creationdate.patch"
(patches (search-patches "ghostscript-freetype-compat.patch"
"ghostscript-CVE-2020-15900.patch"
"ghostscript-no-header-creationdate.patch"
"ghostscript-no-header-id.patch"
"ghostscript-no-header-uuid.patch"))
(modules '((guix build utils)))

95
gnu/packages/gimp.scm
View file

@ -3,7 +3,7 @@
;;; Copyright © 2016, 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Leo Famulari <leo@famulari.name>
;;; Copyright © 2018, 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2018 Thorsten Wilms <t_w_@freenet.de>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
@ -409,7 +409,7 @@ inverse fourier transform.")
(define-public libmypaint
(package
(name "libmypaint")
(version "1.5.1")
(version "1.6.1")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/mypaint/libmypaint/"
@ -417,7 +417,7 @@ inverse fourier transform.")
version ".tar.xz"))
(sha256
(base32
"0aqcv4fyscpfhknxgfpq0v84aj2nzigqvpi4zgv2zkl41h51by5f"))))
"0priwpmc7dizccqvn21ig6d649bprl3xl1hmjj7nddznjgr585vl"))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)
@ -538,3 +538,92 @@ tools for healing selections (content-aware fill), enlarging the canvas and
healing the border, increasing the resolution while adding detail, and
transferring the style of an image.")
(license license:gpl3+)))
(define-public glimpse
(package
(name "glimpse")
(version "0.2.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/glimpse-editor/Glimpse")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0drngj2xqzxfaag6pc4xjffiw003n4y43x5rb5bf4ziv1ac51dm9"))))
(build-system gnu-build-system)
(outputs '("out"
"doc")) ; 9 MiB of gtk-doc HTML
(arguments
'(#:configure-flags
(list (string-append "--with-html-dir="
(assoc-ref %outputs "doc")
"/share/gtk-doc/html")
"--enable-gtk-doc"
;; Prevent the build system from running 'gtk-update-icon-cache'
;; which is not needed during the build because Guix runs it at
;; profile creation time.
"ac_cv_path_GTK_UPDATE_ICON_CACHE=true"
;; Disable automatic network request on startup to check for
;; version updates.
"--disable-check-update"
;; ./configure requests not to annoy upstream with packaging bugs.
"--with-bug-report-url=https://bugs.gnu.org/guix")
#:phases
(modify-phases %standard-phases
(add-after 'install 'install-sitecustomize.py
;; Install 'sitecustomize.py' into glimpse's python directory to
;; add pygobject and pygtk to pygimp's search path.
(lambda* (#:key outputs #:allow-other-keys)
(let* ((pythonpath (getenv "PYTHONPATH"))
(out (assoc-ref outputs "out"))
(sitecustomize.py
(string-append
out "/lib/glimpse/2.0/python/sitecustomize.py")))
(call-with-output-file sitecustomize.py
(lambda (port)
(format port "import site~%")
(format port "for dir in '~a'.split(':'):~%" pythonpath)
(format port " site.addsitedir(dir)~%")))))))))
(native-inputs
`(("autoconf" ,autoconf-wrapper)
("automake" ,automake)
("gtk-doc" ,gtk-doc)
("intltool" ,intltool)
("libtool" ,libtool)
("libxslt" ,libxslt) ; for xsltproc
("pkg-config" ,pkg-config)
("glib:bin" ,glib "bin"))) ; for gdbus-codegen
(inputs
`(("babl" ,babl)
("glib" ,glib)
("glib-networking" ,glib-networking)
("libtiff" ,libtiff)
("libwebp" ,libwebp)
("libjpeg" ,libjpeg-turbo)
("atk" ,atk)
("gexiv2" ,gexiv2)
("gtk+" ,gtk+-2)
("libmypaint" ,libmypaint)
("mypaint-brushes" ,mypaint-brushes-1.3)
("exif" ,libexif) ; optional, EXIF + XMP support
("lcms" ,lcms) ; optional, color management
("librsvg" ,librsvg) ; optional, SVG support
("libxcursor" ,libxcursor) ; optional, Mouse Cursor support
("poppler" ,poppler) ; optional, PDF support
("poppler-data" ,poppler-data)
("python" ,python-2) ; optional, Python support
("python2-pygtk" ,python2-pygtk) ; optional, Python support
("gegl" ,gegl)))
(home-page "https://glimpse-editor.github.io/")
(synopsis "Glimpse Image Editor")
(description "The Glimpse Image Editor is an application for image
manipulation tasks such as photo retouching, composition and authoring.
It supports all common image formats as well as specialized ones. It
features a highly customizable interface that is extensible via a plugin
system. It was forked from the GNU Image Manipulation Program.")
(license license:gpl3+)))

61
gnu/packages/gl.scm
View file

@ -13,6 +13,7 @@
;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2020 Kei Kebreau <kkebreau@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@ -60,6 +61,7 @@
#:use-module (guix build-system gnu)
#:use-module (guix build-system cmake)
#:use-module (guix build-system meson)
#:use-module (guix build-system waf)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix utils)
@ -1013,3 +1015,62 @@ the glProgramViewportFlip before it was replaced with glProgramViewportInfo.")
The C# wrapper was written to be used for FNA's platform support. However, this
is written in a way that can be used for any general C# application.")
(license license:zlib))))
(define-public glmark2
(package
(name "glmark2")
(version "2020.04")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/glmark2/glmark2")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0ywpzp0imi3f8iyp7d1739576zx2nsr3db5hp2as4yhflfyq1as2"))
(modules '((guix build utils)))
;; Fix Python 3 incompatibility.
(snippet
'(begin
(substitute* "wscript"
(("(sorted\\()FLAVORS\\.keys\\(\\)(.*)" _ beginning end)
(string-append beginning "list(FLAVORS)" end)))
#t))))
(build-system waf-build-system)
(arguments
'(#:tests? #f ; no check target
#:configure-flags
(list (string-append "--with-flavors="
(string-join '("x11-gl" "x11-glesv2"
"drm-gl" "drm-glesv2"
"wayland-gl" "wayland-glesv2")
",")))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-paths
(lambda* (#:key inputs #:allow-other-keys)
(let ((mesa (assoc-ref inputs "mesa")))
(substitute* (find-files "src" "gl-state-.*\\.cpp$")
(("libGL.so") (string-append mesa "/lib/libGL.so"))
(("libEGL.so") (string-append mesa "/lib/libEGL.so"))
(("libGLESv2.so") (string-append mesa "/lib/libGLESv2.so")))
#t))))))
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
`(("eudev" ,eudev)
("libdrm" ,libdrm)
("libjpeg-turbo" ,libjpeg-turbo)
("libpng" ,libpng)
("libx11" ,libx11)
("libxcb" ,libxcb)
("mesa" ,mesa)
("wayland" ,wayland)
("wayland-protocols" ,wayland-protocols)))
(home-page "https://github.com/glmark2/glmark2")
(synopsis "OpenGL 2.0 and OpenGL ES 2.0 benchmark")
(description
"glmark2 is an OpenGL 2.0 and OpenGL ES 2.0 benchmark based on the
original glmark benchmark by Ben Smith.")
(license license:gpl3+)))

29
gnu/packages/glib.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2016, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013, 2014, 2015, 2016, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2014, 2015, 2016, 2017, 2018 Mark H Weaver <mhw@netris.org>
@ -91,7 +91,6 @@
(package
(name "dbus")
(version "1.12.16")
(replacement dbus/fixed)
(source (origin
(method url-fetch)
(uri (string-append
@ -100,7 +99,8 @@
(sha256
(base32
"107ckxaff1cv4q6kmfdi2fb1nlsv03312a7kf6lb4biglhpjv8jl"))
(patches (search-patches "dbus-helper-search-path.patch"))))
(patches (search-patches "dbus-CVE-2020-12049.patch"
"dbus-helper-search-path.patch"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags
@ -168,20 +168,10 @@ or through unencrypted TCP/IP suitable for use behind a firewall with
shared NFS home directories.")
(license license:gpl2+))) ; or Academic Free License 2.1
;; Replacement package to fix CVE-2020-12049.
(define dbus/fixed
(package
(inherit dbus)
(source (origin
(inherit (package-source dbus))
(patches (append (search-patches "dbus-CVE-2020-12049.patch")
(origin-patches (package-source dbus))))))))
(define glib
(package
(name "glib")
(version "2.62.6")
(replacement glib-with-gio-patch)
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/"
@ -190,7 +180,8 @@ shared NFS home directories.")
(sha256
(base32
"174bsmbmcvaw69ff9g60q5sx0fn23rkhqcwqz17h5s7sprps4kqh"))
(patches (search-patches "glib-tests-timer.patch"))
(patches (search-patches "glib-appinfo-watch.patch"
"glib-tests-timer.patch"))
(modules '((guix build utils)))
(snippet
'(begin
@ -388,16 +379,6 @@ dynamic loading, and an object system.")
(home-page "https://developer.gnome.org/glib/")
(license license:lgpl2.1+)))
(define glib-with-gio-patch
;; GLib with a fix for <https://bugs.gnu.org/35594>.
;; TODO: Fold into 'glib' above in the next rebuild cycle.
(package
(inherit glib)
(source (origin
(inherit (package-source glib))
(patches (cons (search-patch "glib-appinfo-watch.patch")
(origin-patches (package-source glib))))))))
(define-public glib-with-documentation
;; glib's doc must be built in a separate package since it requires gtk-doc,
;; which in turn depends on glib.

4
gnu/packages/gnome.scm
View file

@ -11504,7 +11504,7 @@ and toolbars.")
(define-public setzer
(package
(name "setzer")
(version "0.3.6")
(version "0.3.8")
(source
(origin
(method git-fetch)
@ -11513,7 +11513,7 @@ and toolbars.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "118gip6bv4mcsq4nrai7kl0vmqqbyzpsd4ky9vhxb1x2cvg048s8"))))
(base32 "1f5qmkz4hzn54sh56z3hw8zrvg93xlz62ggzlzyg7vgsr83kpns9"))))
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t

18
gnu/packages/gnucash.scm
View file

@ -7,6 +7,7 @@
;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2020 Prafulla Giri <pratheblackdiamond@gmail.com>
;;; Copyright © 2020 Christopher Lam <christopher.lck@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -51,6 +52,7 @@
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages swig)
#:use-module (gnu packages tls)
#:use-module (gnu packages web)
#:use-module (gnu packages webkit)
@ -61,25 +63,24 @@
;; directory.
(package
(name "gnucash")
(version "3.8")
(version "4.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/gnucash/gnucash%20%28stable%29/"
version "/gnucash-" version "b" ".tar.bz2"))
version "/gnucash-" version ".tar.bz2"))
(sha256
(base32
"0dvzm3bib7jcj685sklpzyy9mrak9mxyvih2k9fk4sl3v21wlphg"))))
"020k1mm909dcgs52ls4v7xx3yn8gqazi9awyr81l6y7pkq1spn2n"))))
(build-system cmake-build-system)
(inputs
`(("guile" ,guile-2.2)
`(("guile" ,guile-3.0)
("boost" ,boost)
("icu4c" ,icu4c)
("glib" ,glib)
("gtk" ,gtk+)
("libdbi" ,libdbi)
("libdbi-drivers" ,libdbi-drivers)
("libgnomecanvas" ,libgnomecanvas)
("libofx" ,libofx)
("libxml2" ,libxml2)
("libxslt" ,libxslt)
@ -95,6 +96,7 @@
("googlemock" ,(package-source googletest))
("googletest" ,googletest)
("gnucash-docs" ,gnucash-docs)
("swig" ,swig)
("pkg-config" ,pkg-config)))
(propagated-inputs
;; dconf is required at runtime according to README.dependencies.
@ -134,8 +136,8 @@
;; execute them with perl, so execute them directly instead.
(add-after 'unpack 'fix-finance-quote-check
(lambda _
(substitute* "libgnucash/scm/price-quotes.scm"
(("\"perl\" \"-w\" ") ""))
(substitute* "gnucash/price-quotes.scm"
(("\"perl\" \"-w\" ") ""))
#t))
;; The qof test requires the en_US, en_GB, and fr_FR locales.
(add-before 'check 'install-locales
@ -230,7 +232,7 @@ installed as well as Yelp, the Gnome help browser.")
version "/gnucash-docs-" version revision ".tar.gz"))
(sha256
(base32
"19v6kchda724xkkgwlw5rg21jcpirhch12j9sr6ibnv61sd4ql52"))))
"1p1rbv0gyi07nh5pzhk3xm46w66kjyaipb6rpaq9yb9gil1nl7q5"))))
(build-system gnu-build-system)
;; These are native-inputs because they are only required for building the
;; documentation.

4
gnu/packages/gnuzilla.scm
View file

@ -791,7 +791,7 @@ from forcing GEXP-PROMISE."
("llvm" ,llvm)
("clang" ,clang)
("perl" ,perl)
("node" ,node-10.22)
("node" ,node)
("python" ,python)
("python-2" ,python-2)
("python2-pysqlite" ,python2-pysqlite)
@ -1460,7 +1460,7 @@ standards of the IceCat project.")
("clang" ,clang)
("llvm" ,llvm)
("nasm" ,nasm)
("node" ,node-10.22)
("node" ,node)
("perl" ,perl)
("pkg-config" ,pkg-config)
("python" ,python)

256
gnu/packages/golang.scm
View file

@ -22,6 +22,7 @@
;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
;;; Copyright © 2020 raingloom <raingloom@riseup.net>
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
;;;
;;; This file is part of GNU Guix.
;;;
@ -511,6 +512,35 @@ way of specifying command line options.")
(home-page "https://github.com/jessevdk/go-flags")
(license license:bsd-3)))
(define-public go-github-com-aws-sdk
(package
(name "go-github-com-aws-sdk")
(version "1.35.2")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/aws/aws-sdk-go")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1ky5lw2s2zpslnnqcs6hgsrwvwbxwgflb5jwf16dd4aga3vrg10c"))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/aws/aws-sdk-go/aws"
#:unpack-path "github.com/aws/aws-sdk-go"))
(propagated-inputs
`(("go-github-com-go-sql-driver-mysql" ,go-github-com-go-sql-driver-mysql)
("go-github-com-jmespath-go-jmespath" ,go-github-com-jmespath-go-jmespath)
("go-github-com-pkg-errors" ,go-github-com-pkg-errors)
("go-golang-org-x-net" ,go-golang-org-x-net)))
(home-page "https://github.com/aws/aws-sdk-go")
(synopsis "Library to access Amazon Web Services (AWS)")
(description
"This is the official AWS SDK for the Go programming language.")
(license license:asl2.0)))
(define-public go-gopkg.in-tomb.v2
(let ((commit "d5d1b5820637886def9eef33e03a27a9f166942c")
(revision "0"))
@ -545,6 +575,32 @@ termination.")
(home-page "https://gopkg.in/tomb.v2")
(license license:bsd-3))))
(define-public go-gopkg-in-natefinch-lumberjack.v2
(package
(name "go-gopkg-in-natefinch-lumberjack.v2")
(version "2.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/natefinch/lumberjack")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1l3vlv72b7rfkpy1164kwd3qzrqmmjnb67akzxqp2mlvc66k6p3d"))))
(build-system go-build-system)
(arguments
'(#:import-path "gopkg.in/natefinch/lumberjack.v2"))
(propagated-inputs
`(("github.com/burntsush/toml" ,go-github-com-burntsushi-toml)
("gopkg.in/yaml.v2" ,go-gopkg-in-yaml-v2)))
(home-page "https://github.com/natefinch/lumberjack")
(synopsis "Rolling logger for Go")
(description
"Lumberjack is a Go package for writing logs to rolling files.")
(license license:expat)))
(define-public go-github.com-jtolds-gls
(package
(name "go-github.com-jtolds-gls")
@ -1307,30 +1363,106 @@ values for the purpose of fuzz testing.")
(license license:bsd-3))))
(define-public go-github-com-gorilla-mux
(let ((commit "599cba5e7b6137d46ddf58fb1765f5d928e69604")
(revision "0"))
(package
(name "go-github-com-gorilla-mux")
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/gorilla/mux")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0wd6jjii1kg5s0nk3ri6gqriz6hbd6bbcn6x4jf8n7ncrb8qsxyz"))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/gorilla/mux"))
(home-page "https://github.com/gorilla/mux")
(synopsis "URL router and dispatcher for Go")
(description
"Gorilla/Mux implements a request router and dispatcher for matching
(package
(name "go-github-com-gorilla-mux")
(version "1.8.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/gorilla/mux")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"18f0q9qxgq1yh4ji07mqhiydfcwvi56z9d775v7dc7yckj33kpdk"))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/gorilla/mux"))
(home-page "https://github.com/gorilla/mux")
(synopsis "URL router and dispatcher for Go")
(description
"Gorilla/Mux implements a request router and dispatcher for matching
incoming requests with their respective handler.")
(license license:bsd-3))))
(license license:bsd-3)))
(define-public go-github-com-gorilla-handlers
(package
(name "go-github-com-gorilla-handlers")
(version "1.5.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/gorilla/handlers")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"15gycdz9lkjnsvvichsbdf25vf6pi1sfn41khhz53iqf300l0w0s"))))
(build-system go-build-system)
(propagated-inputs
`(("github.com/felixge/httpsnoop" ,go-github-com-felixge-httpsnoop)))
(arguments
'(#:tests? #f ; Tries to download from the internet
#:import-path "github.com/gorilla/handlers"))
(home-page "https://github.com/gorilla/handlers")
(synopsis "Middleware for Go HTTP services and web applications")
(description "A collection of useful middleware for Go HTTP services
and web applications.")
(license license:bsd-3)))
(define-public go-github-com-gorilla-securecookie
(package
(name "go-github-com-gorilla-securecookie")
(version "1.1.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/gorilla/securecookie")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"16bqimpxs9vj5n59vm04y04v665l7jh0sddxn787pfafyxcmh410"))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/gorilla/securecookie"))
(home-page "https://github.com/gorilla/securecookie")
(synopsis "Encodes and decodes authenticated and optionally encrypted
cookie values")
(description
"Gorilla/securecookie encodes and decodes authenticated and optionally
encrypted cookie values for Go web applications.")
(license license:bsd-3)))
(define-public go-github-com-gorilla-csrf
(package
(name "go-github-com-gorilla-csrf")
(version "1.7.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/gorilla/csrf")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0iryq0z48yi7crfbd8jxyn7lh1gsglpiglvjgnf23bz6xfisssav"))))
(build-system go-build-system)
(propagated-inputs
`(("github.com/gorilla/securecookie" ,go-github-com-gorilla-securecookie)
("github.com/pkg/errors" ,go-github-com-pkg-errors)))
(arguments
'(#:import-path "github.com/gorilla/csrf"))
(home-page "https://github.com/gorilla/csrf")
(synopsis "Cross Site Request Forgery (CSRF) prevention middleware")
(description
"Gorilla/csrf provides Cross Site Request Forgery (CSRF) prevention
middleware for Go web applications and services.")
(license license:bsd-3)))
(define-public go-github-com-jonboulle-clockwork
(let ((commit "e3653ace2d63753697e0e5b07b9393971c0bba9d")
@ -1524,6 +1656,31 @@ GNU extensions} to the POSIX recommendations for command-line options.")
all types of configuration needs and formats.")
(license license:expat)))
(define-public go-github-com-felixge-httpsnoop
(package
(name "go-github-com-felixge-httpsnoop")
(version "1.0.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/felixge/httpsnoop")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0ncd8lar5zxiwjhsp315s4hsl4bhnm271h49jhyxc66r5yffgmac"))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/felixge/httpsnoop"))
(home-page "https://github.com/felixge/httpsnoop/")
(synopsis "Capture http related metrics")
(description
"Httpsnoop provides an easy way to capture http related
metrics (i.e. response time, bytes written, and http status code) from your
application's http.Handlers.")
(license license:expat)))
(define-public go-github-com-fsnotify-fsnotify
(package
(name "go-github-com-fsnotify-fsnotify")
@ -3454,6 +3611,31 @@ without requiring a real database connection.")
(home-page "https://github.com/DATA-DOG/go-sqlmock")
(license license:expat))))
(define-public go-github-com-go-sql-driver-mysql
(package
(name "go-github-com-go-sql-driver-mysql")
(version "1.5.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/go-sql-driver/mysql")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"11x0m9yf3kdnf6981182r824psgxwfaqhn3x3in4yiidp0w0hk3v"))))
(build-system go-build-system)
(arguments
'(#:tests? #f ;; tests require a network connection
#:import-path "github.com/go-sql-driver/mysql"))
(home-page "https://github.com/go-sql-driver/mysql")
(synopsis "MySQL driver for golang")
(description
"This is a pure Go implementaton of the MySQL API, compatible with
golang's database/sql package.")
(license license:mpl2.0)))
(define-public go-golang-org-colorful
(package
(name "go-golang-org-colorful")
@ -4976,6 +5158,34 @@ the parse trees produced by the html package.")
to jQuery to the Go language.")
(license license:bsd-3)))
(define-public go-github-com-jmespath-go-jmespath
(package
(name "go-github-com-jmespath-go-jmespath")
(version "0.4.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/jmespath/go-jmespath")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"18zyr9nlywmwp3wpzcjxrgq9s9d2mmc6zg6xhsna00m663nkyc3n"))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/jmespath/go-jmespath"))
(native-inputs
`(("go-github-com-davecgh-go-spew" ,go-github-com-davecgh-go-spew)
("go-github-com-pmezard-go-difflib" ,go-github-com-pmezard-go-difflib)
("go-gopkg-in-yaml-v2" ,go-gopkg-in-yaml-v2)))
(home-page "https://github.com/jmespath/go-jmespath")
(synopsis "Golang implementation of JMESPath")
(description
"This package implements JMESPath, a query language for JSON. It
transforms one JSON document into another through a JMESPath expression.")
(license license:asl2.0)))
(define-public go-github-com-aymerick-douceur
(package
(name "go-github-com-aymerick-douceur")

13
gnu/packages/gtk.scm
View file

@ -357,7 +357,18 @@ used throughout the world.")
(base32
"17bwb7dgbncrfsmchlib03k9n3xaalirb39g3yb43gg8cg6p8aqx"))))
(build-system gnu-build-system)
(arguments '())))
(arguments
'(#:phases (modify-phases %standard-phases
(add-after 'configure 'disable-layout-test
(lambda _
;; This test requires that fontconfig uses bitmap fonts
;; such as "gs-fonts"; however providing such a package
;; alone is not enough, as the requirement comes from
;; deeper in the font stack. Since this version of Pango
;; is only used for librsvg, simply disable the test.
(substitute* "tests/Makefile"
(("test-layout\\$\\(EXEEXT\\)") ""))
#t)))))))
(define-public pangox-compat
(package

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

@ -32,6 +32,7 @@
;;; Copyright © 2020 Jesse Gibbons <jgibbons2357@gmail.com>
;;; Copyright © 2020 Mike Rosset <mike.rosset@gmail.com>
;;; Copyright © 2020 Leo Prikler <leo.prikler@student.tugraz.at>
;;; Copyright © 2020 pukkamustard <pukkamustard@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@ -58,6 +59,7 @@
#:use-module (gnu packages base)
#:use-module (gnu packages bash)
#:use-module (gnu packages compression)
#:use-module (gnu packages crypto)
#:use-module (gnu packages databases)
#:use-module (gnu packages disk)
#:use-module (gnu packages emacs)
@ -886,8 +888,8 @@ Vicare Scheme and IronScheme. Right now it contains:
(license license:bsd-3)))
(define-public guile-prometheus
(let ((commit "2549c482fb04db84481d595f0bf99a1c8bb97c4c")
(revision "3"))
(let ((commit "35dc26c0ea44c3d70f1819f240d84e2cbb4b7b4c")
(revision "5"))
(package
(name "guile-prometheus")
(version (git-version "0" revision commit))
@ -898,7 +900,7 @@ Vicare Scheme and IronScheme. Right now it contains:
(commit commit)))
(sha256
(base32
"0wfaspy3gvn2bkfzlvgx9ncz6114ldxxj25vnj4frcgbzqbdsair"))
"07822jj4appw37lf444kc4xlgl7nm64mgldag56072l55kwashgb"))
(file-name (string-append name "-" version "-checkout"))))
(build-system gnu-build-system)
(native-inputs
@ -966,8 +968,8 @@ convenient nested tree operations.")
(license license:gpl3+)))
(define-public guile-simple-zmq
(let ((commit "5fc3b7190d31c258ce969c2a5d2ad38c66a09d09")
(revision "4"))
(let ((commit "f8b7d81afb38525750f8818ed2956ca18c828ee8")
(revision "5"))
(package
(name "guile-simple-zmq")
(version (git-version "0.0.0" revision commit))
@ -979,7 +981,7 @@ convenient nested tree operations.")
(commit commit)))
(sha256
(base32
"0inhvl5jssvbw3nd129wdahfwyvy1iciq403wzf0algbvl1fqs7z"))
"1gpzlpcq7bxw7sxyrg8zslwb3631vizw56lgg1aavw4gafh0hxb3"))
(file-name (git-file-name name version))))
(build-system guile-build-system)
(arguments
@ -2126,8 +2128,11 @@ library.")
"godir = \
$(libdir)/guile/@GUILE_EFFECTIVE_VERSION@/site-ccache\n"))
#t)))))
(native-inputs `(("pkg-config" ,pkg-config)))
(inputs `(("guile" ,guile-3.0)))
(native-inputs
`(("guile" ,guile-3.0)
("pkg-config" ,pkg-config)))
(inputs
`(("guile" ,guile-3.0)))
(home-page "https://www.nongnu.org/guile-lib/")
(synopsis "Collection of useful Guile Scheme modules")
(description
@ -2145,12 +2150,14 @@ for Guile\".")
(package
(inherit guile-lib)
(name "guile2.0-lib")
(native-inputs `(("pkg-config" ,pkg-config)))
(inputs `(("guile" ,guile-2.0)))))
(define-public guile2.2-lib
(package
(inherit guile-lib)
(name "guile2.2-lib")
(native-inputs `(("pkg-config" ,pkg-config)))
(inputs `(("guile" ,guile-2.2)))))
(define-public guile3.0-lib
@ -4171,3 +4178,65 @@ recursively. It also provides new versions of @code{open-output-file},
directory of its argument if it does not exist.")
(home-page "https://mkdir-p.divoplade.fr")
(license license:asl2.0)))
(define-public guile-sodium
(package
(name "guile-sodium")
(version "0.1.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://inqlab.net/git/guile-sodium.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256 (base32 "189jsj87hycs57a54x0b9lifwvhr63nypb9vfxdrq7rwrpcvi5f8"))))
(build-system gnu-build-system)
(arguments `())
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("pkg-config" ,pkg-config)
("texinfo" ,texinfo)))
(inputs `(("guile" ,guile-3.0)))
(propagated-inputs `(("libsodium" ,libsodium)))
(synopsis "Guile bindings to the libsodium cryptographic library")
(description
"This package provides Guile bindings to the libsodium cryptographic library
which provides core cryptographic primitives needed to build higher-level
tools.")
(home-page "https://inqlab.net/git/guile-sodium.git")
(license license:gpl3+)))
(define-public guile-eris
(package
(name "guile-eris")
(version "0.2.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://inqlab.net/git/eris.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256 (base32 "1ijglmwkdy1l87gj429qfjis0v8b1zlxhbyfhx5za8664h68nqka"))))
(build-system gnu-build-system)
(arguments '())
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("pkg-config" ,pkg-config)
("texinfo" ,texinfo)
;; test dependency
("guile-srfi-180" ,guile-srfi-180)))
(inputs `(("guile" ,guile-3.0)))
(propagated-inputs
`(("guile-sodium" ,guile-sodium)))
(synopsis "Guile implementation of the Encoding for Robust Immutable Storage (ERIS)")
(description
"Guile-ERIS is the reference implementation of the Encoding for Robust
Immutable Storage (ERIS). ERIS allows arbirtary content to be encoded into
uniformly sized, encrypted blocks that can be reassembled using a short
read-capability.")
(home-page "https://inqlab.net/git/eris.git")
(license license:gpl3+)))

36
gnu/packages/haskell-crypto.scm
View file

@ -4,6 +4,7 @@
;;; Copyright © 2016 Nikita <nikita@n0.is>
;;; Copyright © 2017 rsiddharth <s@ricketyspace.net>
;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -838,3 +839,38 @@ implementation of SSL.")
(description "This library contains io-streams routines for secure
networking using OpenSSL (by way of HsOpenSSL).")
(license license:bsd-3)))
(define-public ghc-cryptonite-conduit
(package
(name "ghc-cryptonite-conduit")
(version "0.2.2")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"cryptonite-conduit/cryptonite-conduit-"
version ".tar.gz"))
(sha256
(base32
"1bldcmda4xh52mw1wfrjljv8crhw3al7v7kv1j0vidvr7ymnjpbh"))))
(build-system haskell-build-system)
(inputs
`(("ghc-conduit" ,ghc-conduit)
("ghc-conduit-extra" ,ghc-conduit-extra)
("ghc-cryptonite" ,ghc-cryptonite)
("ghc-exceptions" ,ghc-exceptions)
("ghc-memory" ,ghc-memory)
("ghc-resourcet" ,ghc-resourcet)))
(native-inputs
`(("ghc-conduit-combinators" ,ghc-conduit-combinators)
("ghc-tasty" ,ghc-tasty)
("ghc-tasty-hunit" ,ghc-tasty-hunit)
("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck)))
(arguments
`(#:cabal-revision
("1" "1hh2nzfz4qpxgivfilgk4ll416lph8b2fdkzpzrmqfjglivydfmz")))
(home-page "https://github.com/haskell-crypto/cryptonite-conduit")
(synopsis "Cryptonite bridge for conduit")
(description "This package provides conduit interfaces for some of
cryptonite's implementations of cryptographic primitives.")
(license license:bsd-3)))

250
gnu/packages/haskell-web.scm
View file

@ -11,6 +11,7 @@
;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
;;; Copyright © 2020 Kyle Meyer <kyle@kyleam.com>
;;; Copyright © 2020 Alexandru-Sergiu Marton <brown121407@member.fsf.org>
;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -1258,7 +1259,7 @@ avoid any issues with characters.")
(define-public ghc-yesod-core
(package
(name "ghc-yesod-core")
(version "1.6.16.1")
(version "1.6.17.2")
(source
(origin
(method url-fetch)
@ -1267,7 +1268,7 @@ avoid any issues with characters.")
"yesod-core-" version ".tar.gz"))
(sha256
(base32
"0a0yv7wkwvb0n6iia532y9nzrirgnm09pjc8hpm0lx4ff609pgd2"))))
"0rcfksbxnwcpg5qh9vjkddv39q95mx4nxzgix51bbwa128hhzcwf"))))
(build-system haskell-build-system)
(inputs `(("ghc-wai" ,ghc-wai)
("ghc-extra" ,ghc-extra)
@ -2024,3 +2025,248 @@ Bower's package manifest file, bower.json.")
Authoring and Versioning (WebDAV) extensions to HTTP as well an executable,
@command{hdav}, for command-line operation.")
(license license:gpl3)))
(define-public ghc-yesod-test
(package
(name "ghc-yesod-test")
(version "1.6.9")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"yesod-test/yesod-test-" version ".tar.gz"))
(sha256
(base32
"0v25lqq7hgd5lggnyfd9kamkzd4126rd7vlhc131n253n4by4yak"))))
(build-system haskell-build-system)
(inputs
`(("ghc-hunit" ,ghc-hunit)
("ghc-aeson" ,ghc-aeson)
("ghc-attoparsec" ,ghc-attoparsec)
("ghc-blaze-builder" ,ghc-blaze-builder)
("ghc-blaze-html" ,ghc-blaze-html)
("ghc-case-insensitive" ,ghc-case-insensitive)
("ghc-conduit" ,ghc-conduit)
("ghc-cookie" ,ghc-cookie)
("ghc-hspec-core" ,ghc-hspec-core)
("ghc-html-conduit" ,ghc-html-conduit)
("ghc-http-types" ,ghc-http-types)
("ghc-network" ,ghc-network)
("ghc-memory" ,ghc-memory)
("ghc-pretty-show" ,ghc-pretty-show)
("ghc-semigroups" ,ghc-semigroups)
("ghc-wai" ,ghc-wai)
("ghc-wai-extra" ,ghc-wai-extra)
("ghc-xml-conduit" ,ghc-xml-conduit)
("ghc-xml-types" ,ghc-xml-types)
("ghc-yesod-core" ,ghc-yesod-core)))
(native-inputs
`(("ghc-hspec" ,ghc-hspec)
("ghc-yesod-form" ,ghc-yesod-form)
("ghc-unliftio" ,ghc-unliftio)
("ghc-unliftio-core" ,ghc-unliftio-core)))
(home-page "https://www.yesodweb.com")
(synopsis "Integration testing for WAI/Yesod Applications")
(description "This package's main goal is to encourage integration
and system testing of web applications by making everything easy to
test. Tests are like browser sessions that keep track of cookies and
the last visited page. You can perform assertions on the content of
HTML responses using CSS selectors.")
(license license:expat)))
(define-public ghc-wai-app-static
(package
(name "ghc-wai-app-static")
(version "3.1.7.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"wai-app-static/wai-app-static-"
version ".tar.gz"))
(sha256
(base32
"10k6jb450p89r6dgpnwh428gg0wfw2qbx9n126jkvbchcjr1f4v8"))))
(build-system haskell-build-system)
(inputs
`(("ghc-wai" ,ghc-wai)
("ghc-http-types" ,ghc-http-types)
("ghc-unix-compat" ,ghc-unix-compat)
("ghc-old-locale" ,ghc-old-locale)
("ghc-file-embed" ,ghc-file-embed)
("ghc-cryptonite" ,ghc-cryptonite)
("ghc-memory" ,ghc-memory)
("ghc-http-date" ,ghc-http-date)
("ghc-blaze-html" ,ghc-blaze-html)
("ghc-blaze-markup" ,ghc-blaze-markup)
("ghc-mime-types" ,ghc-mime-types)
("ghc-unordered-containers" ,ghc-unordered-containers)
("ghc-zlib" ,ghc-zlib)
("ghc-wai-extra" ,ghc-wai-extra)
("ghc-optparse-applicative" ,ghc-optparse-applicative)
("ghc-warp" ,ghc-warp)))
(native-inputs
`(("ghc-hspec" ,ghc-hspec)
("ghc-network" ,ghc-network)
("ghc-temporary" ,ghc-temporary)
("ghc-mockery" ,ghc-mockery)))
(arguments
`(#:cabal-revision
("1" "0bkmml30rzifvb7nxddj3pxczk0kniahra19mjn0qrkzy1n5752p")))
(home-page "https://www.yesodweb.com/book/web-application-interface")
(synopsis "WAI application for static serving")
(description "This package provides a Web Application
Interface (WAI) application for static serving. It also provides some
helper functions and datatypes for use outside of WAI.")
(license license:expat)))
(define-public ghc-hjsmin
(package
(name "ghc-hjsmin")
(version "0.2.0.4")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"hjsmin/hjsmin-" version ".tar.gz"))
(sha256
(base32
"1r2p5rjdjr25j3w4s57q5hxw2c3ymw12x7ms18yvglnq2ivr9fc1"))))
(build-system haskell-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-before 'build 'fix-dist-directory-for-tests
(lambda _
(substitute* '("test/test-cli.hs" "test/cli/core/runner")
(("dist-newstyle") "dist")))))))
(inputs
`(("ghc-language-javascript" ,ghc-language-javascript)
("ghc-optparse-applicative" ,ghc-optparse-applicative)))
(native-inputs
`(("ghc-extra" ,ghc-extra)))
(home-page "https://github.com/erikd/hjsmin")
(synopsis "Haskell implementation of a JavaScript minifier")
(description "This library provides tools reduce the size of
JavaScript files by stripping out extraneous whitespace and other
syntactic elements, without changing the semantics.")
(license license:bsd-3)))
(define-public ghc-yesod-static
(package
(name "ghc-yesod-static")
(version "1.6.0.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"yesod-static/yesod-static-" version ".tar.gz"))
(sha256
(base32
"1jd0ryfr2vyrwasyvbqmc6j4ngv1lgz78w427f169l7gyl1firxb"))))
(build-system haskell-build-system)
(inputs
`(("ghc-async" ,ghc-async)
("ghc-attoparsec" ,ghc-attoparsec)
("ghc-base64-bytestring" ,ghc-base64-bytestring)
("ghc-blaze-builder" ,ghc-blaze-builder)
("ghc-conduit" ,ghc-conduit)
("ghc-cryptonite" ,ghc-cryptonite)
("ghc-cryptonite-conduit" ,ghc-cryptonite-conduit)
("ghc-css-text" ,ghc-css-text)
("ghc-data-default" ,ghc-data-default)
("ghc-file-embed" ,ghc-file-embed)
("ghc-hashable" ,ghc-hashable)
("ghc-hjsmin" ,ghc-hjsmin)
("ghc-http-types" ,ghc-http-types)
("ghc-memory" ,ghc-memory)
("ghc-mime-types" ,ghc-mime-types)
("ghc-unix-compat" ,ghc-unix-compat)
("ghc-unordered-containers" ,ghc-unordered-containers)
("ghc-wai" ,ghc-wai)
("ghc-wai-app-static" ,ghc-wai-app-static)
("ghc-yesod-core" ,ghc-yesod-core)))
(native-inputs
`(("ghc-hspec" ,ghc-hspec)
("ghc-yesod-test" ,ghc-yesod-test)
("ghc-wai-extra" ,ghc-wai-extra)
("ghc-hunit" ,ghc-hunit)
("ghc-rio" ,ghc-rio)))
(home-page "https://www.yesodweb.com/")
(synopsis "Static file serving subsite for Yesod")
(description "This package provides a static file serving subsite
for the Yesod Web Framework.")
(license license:expat)))
(define-public ghc-wai-handler-launch
(package
(name "ghc-wai-handler-launch")
(version "3.0.3.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"wai-handler-launch/wai-handler-launch-"
version ".tar.gz"))
(sha256
(base32
"1ifqgyc1ccig5angh5l1iq7vyms4lvi8wzvysg5dw82nml49n02m"))))
(build-system haskell-build-system)
(inputs
`(("ghc-wai" ,ghc-wai)
("ghc-warp" ,ghc-warp)
("ghc-http-types" ,ghc-http-types)
("ghc-streaming-commons" ,ghc-streaming-commons)
("ghc-async" ,ghc-async)))
(home-page "https://hackage.haskell.org/package/wai-handler-launch")
(synopsis "Launch a Web application in the default browser")
(description "This package handles cross-platform Web browser
launching and inserts JavaScript code to ping the server. When the
server no longer receives pings, it shuts down.")
(license license:expat)))
(define-public ghc-wai-cors
(package
(name "ghc-wai-cors")
(version "0.2.7")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"wai-cors/wai-cors-" version ".tar.gz"))
(sha256
(base32
"10gv3jjlkcb13031frr818p56v2s0qf6dqjsfpwlhwdxdssvx5r5"))))
(build-system haskell-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
;; As of version 0.2.7, there are two test suites: "unit-tests"
;; and "phantomjs". Since we do not have a PhantomJS package,
;; we only run the unit tests.
(replace 'check
(lambda _
(invoke "runhaskell" "Setup.hs" "test" "unit-tests"))))))
(inputs
`(("ghc-attoparsec" ,ghc-attoparsec)
("ghc-base-unicode-symbols" ,ghc-base-unicode-symbols)
("ghc-case-insensitive" ,ghc-case-insensitive)
("ghc-http-types" ,ghc-http-types)
("ghc-wai" ,ghc-wai)))
(native-inputs
`(("ghc-network" ,ghc-network)
("ghc-wai-websockets" ,ghc-wai-websockets)
("ghc-warp" ,ghc-warp)
("ghc-websockets" ,ghc-websockets)
("ghc-tasty" ,ghc-tasty)
("ghc-tasty-hunit" ,ghc-tasty-hunit)
("ghc-wai-extra" ,ghc-wai-extra)
("ghc-wai-websockets" ,ghc-wai-websockets)
("ghc-warp" ,ghc-warp)
("ghc-websockets" ,ghc-websockets)))
(home-page "https://github.com/larskuhtz/wai-cors")
(synopsis "Cross-Origin Resource Sharing (CORS) for WAI")
(description "This package provides an implemenation of Cross-Origin
Resource Sharing (CORS) for the Web Application Framework (WAI) that
aims to be compliant with @url{https://www.w3.org/TR/cors}.")
(license license:expat)))

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

@ -74,7 +74,7 @@
(define-public feh
(package
(name "feh")
(version "3.6")
(version "3.6.1")
(home-page "https://feh.finalrewind.org/")
(source (origin
(method url-fetch)
@ -82,7 +82,7 @@
name "-" version ".tar.bz2"))
(sha256
(base32
"1n6gbyzlc3kx2cq9wfz7azn7mrjmcc9pq436k1n4mrh0lik5sxw7"))))
"1a0ygdpyvpcsr0hdi9ai7ycbkgvacq8dpd8cacbppsds5k2xw7lv"))))
(build-system gnu-build-system)
(arguments
'(#:phases (modify-phases %standard-phases (delete 'configure))

80
gnu/packages/image.scm
View file

@ -59,8 +59,10 @@
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages gettext)
#:use-module (gnu packages ghostscript)
#:use-module (gnu packages gimp)
#:use-module (gnu packages gl)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
#:use-module (gnu packages graphics)
#:use-module (gnu packages gtk)
#:use-module (gnu packages lua)
@ -76,6 +78,7 @@
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages qt)
#:use-module (gnu packages sphinx)
#:use-module (gnu packages swig)
#:use-module (gnu packages textutils)
#:use-module (gnu packages video)
#:use-module (gnu packages web)
@ -1610,15 +1613,14 @@ is hereby granted."))))
(define-public libjpeg-turbo
(package
(name "libjpeg-turbo")
(version "2.0.4")
(replacement libjpeg-turbo/fixed)
(version "2.0.5")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/libjpeg-turbo/"
version "/libjpeg-turbo-" version ".tar.gz"))
(sha256
(base32
"01ill8bgjyk582wipx7sh7gj2nidylpbzvwhx0wkcm6mxx3qbp9k"))))
"0pbv6pc97kbj7ib31qcwi7lnmm9xg5y3b11aasmkhfjvf7rgdy0n"))))
(build-system cmake-build-system)
(native-inputs
`(("nasm" ,nasm)))
@ -1668,18 +1670,6 @@ and decompress to 32-bit and big-endian pixel buffers (RGBX, XBGR, etc.).")
license:ijg ;the libjpeg library and associated tools
license:zlib)))) ;the libjpeg-turbo SIMD extensions
(define libjpeg-turbo/fixed
(package
(inherit libjpeg-turbo)
(version "2.0.5")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/libjpeg-turbo/"
version "/libjpeg-turbo-" version ".tar.gz"))
(sha256
(base32
"0pbv6pc97kbj7ib31qcwi7lnmm9xg5y3b11aasmkhfjvf7rgdy0n"))))))
(define-deprecated libjpeg libjpeg-turbo)
(export libjpeg)
@ -2163,6 +2153,66 @@ painting and palette manipulation tools. It also handles JPEG, JPEG2000,
GIF, TIFF, WEBP, BMP, PNG, XPM formats.")
(license license:gpl3+)))
(define-public mypaint
(package
(name "mypaint")
(version "2.0.1")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/mypaint/mypaint/"
"releases/download/v" version "/mypaint-"
version ".tar.xz"))
(sha256
(base32
"05mvay73vb9d2sh1ckv4vny45n059dmsps1jcppjizfmrpbkgr7k"))))
(build-system python-build-system)
(arguments
`(#:imported-modules ((guix build glib-or-gtk-build-system)
,@%python-build-system-modules)
#:modules ((guix build python-build-system)
((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
(guix build utils))
#:phases
(modify-phases %standard-phases
(add-after 'install 'glib-or-gtk-wrap
(assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))
(add-after 'install 'wrap-program
(lambda* (#:key outputs inputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(gdk-pixbuf (assoc-ref inputs "gdk-pixbuf"))
(gtk+ (assoc-ref inputs "gtk+")))
(wrap-program (string-append out "/bin/mypaint")
`("GI_TYPELIB_PATH" ":" prefix
(,(getenv "GI_TYPELIB_PATH"))))
#t)))
(add-before 'check 'pre-check
(lambda _
;; Tests need writing access
(setenv "HOME" "/tmp")
#t)))))
(native-inputs
`(("pkg-config" ,pkg-config)
("gobject-introspection" ,gobject-introspection)
("swig" ,swig)
("gettext" ,gettext-minimal)))
(inputs
`(("gtk+" ,gtk+)
("gdk-pixbuf" ,gdk-pixbuf+svg)
("hicolor-icon-theme" ,hicolor-icon-theme)
("libmypaint" ,libmypaint)
("mypaint-brushes" ,mypaint-brushes)
("json-c" ,json-c)
("lcms" ,lcms)
("python-numpy" ,python-numpy)
("python-pycairo" ,python-pycairo)
("python-pygobject" ,python-pygobject)))
(home-page "http://mypaint.org/")
(synopsis "Fast and simple painting app for artists")
(description
"MyPaint is a simple drawing and painting program that works well with
Wacom-style graphics tablets.")
(license license:gpl2+)))
(define-public phockup
(package
(name "phockup")

21
gnu/packages/javascript.scm
View file

@ -31,10 +31,31 @@
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system gnu)
#:use-module (guix build-system cmake)
#:use-module (guix build-system trivial)
#:use-module (guix build-system minify)
#:use-module (guix utils))
(define-public cjson
(package
(name "cjson")
(version "1.7.14")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/DaveGamble/cJSON")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1rlnailhjm180zb6pc17jwphjwivw8kfpqgixjfgq4iyryq46sah"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags '("-DENABLE_CJSON_UTILS=On")))
(home-page "https://github.com/DaveGamble/cJSON")
(synopsis "JSON parser written in ANSI C")
(description "This library provides a portable embeddable JSON parser.")
(license license:expat)))
(define-public font-mathjax
(package
(name "font-mathjax")

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

@ -811,7 +811,7 @@ interfaces in the areas of colors, fonts, text, images, keyboard input.")
(inputs
`(("qtbase" ,qtbase)
("qtdeclarative" ,qtdeclarative)))
(home-page "https://cgit.kde.org/kholidays.git")
(home-page "https://invent.kde.org/frameworks/kholidays")
(synopsis "Library for regional holiday information")
(description "This library provides a C++ API that determines holiday and
other special events for a geographical region.")

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

@ -450,7 +450,7 @@ a full-featured client for BitTorrent.")
("qtbase" ,qtbase)))
(arguments
`(#:tests? #f)) ;; 2/7 tests fail (due to network issues?)
(home-page "https://cgit.kde.org/libgravatar.git")
(home-page "https://invent.kde.org/pim/libgravatar")
(synopsis "Online avatar lookup library")
(description "This library retrieves avatar images based on a
hash from a person's email address, as well as local caching to avoid
@ -484,7 +484,7 @@ unnecessary network operations.")
("qca" ,qca)
("qtbase" ,qtbase)
("solid" ,solid)))
(home-page "https://cgit.kde.org/libktorrent.git")
(home-page "https://invent.kde.org/network/libktorrent")
(synopsis "BitTorrent protocol library for C++ / Qt 5 / KDE Frameworks")
(description "The KTorrent library supports connectivity to HTTP and UDP
trackers, mainline DHT and the new generation Micro Transport

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

@ -695,7 +695,7 @@ Its features include:
("qtbase" ,qtbase)))
(arguments
`(#:tests? #f)) ; Most tests require network
(home-page "https://cgit.kde.org/libkcddb.git")
(home-page "https://invent.kde.org/multimedia/libkcddb")
(synopsis "CDDB library for KDE Platform (runtime)")
(description "A library for retrieving and sending cddb information.")
(license ;; GPL for programs, LGPL for libraries, FDL for documentation
@ -722,7 +722,7 @@ Its features include:
("phonon" ,phonon)
("qtbase" ,qtbase)
("solid" ,solid)))
(home-page "https://cgit.kde.org/libkcompactdisc.git/")
(home-page "https://invent.kde.org/multimedia/libkcompactdisc")
(synopsis "KDE library for playing & ripping CDs")
(description "The KDE Compact Disc library provides an API for
applications using the KDE Platform to interface with the CD drives for audio

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

@ -391,7 +391,7 @@ Akonadi PIM data server. It uses Xapian for indexing and querying.")
("kwallat" ,kwallet)
("libkdepim" ,libkdepim)
("qtbase" ,qtbase)))
(home-page "https://cgit.kde.org/incidenceeditor.git")
(home-page "https://invent.kde.org/pim/incidenceeditor")
(synopsis "KDE PIM library for editing incidences")
(description "This library provides an incidence editor for KDE PIM.")
(license ;; GPL for programs, LGPL for libraries
@ -518,7 +518,7 @@ calendar data.")
("qtbase" ,qtbase)
("syndication" ,syndication)))
;; Note: Some tests take up to 90 sec.
(home-page "https://cgit.kde.org/kblog.git")
(home-page "https://invent.kde.org/pim/kblog")
(synopsis "Client-side support library for web application remote blogging
APIs")
(description "KBlog is a library for calling functions on Blogger 1.0,
@ -634,7 +634,7 @@ functions for accessing calendar data using the kcalcore API.")
("kio" ,kio)
("qtbase" ,qtbase)
("qtxmlpatterns" ,qtxmlpatterns)))
(home-page "https://cgit.kde.org/kdav.git")
(home-page "https://invent.kde.org/frameworks/kdav")
(synopsis "DAV protocol implementation with KJobs")
(description "This is a DAV protocol implementation with KJobs. Calendars
and todos are supported, using either GroupDAV or CalDAV, and contacts are
@ -679,7 +679,7 @@ supported using GroupDAV or CardDAV.")
("prison" ,prison)
("qgpgme" ,qgpgme)
("qtbase" ,qtbase)))
(home-page "https://cgit.kde.org/kdepim-apps-libs.git")
(home-page "https://invent.kde.org/pim/kdepim-apps-libs")
(synopsis "KDE PIM mail related libraries and data files")
(description "This package provides mail related libraries and data files
for KDE PIM.")
@ -761,7 +761,7 @@ for KDE PIM.")
"/include/KF5:"
(or (getenv "CPLUS_INCLUDE_PATH") "")))
#t)))))
(home-page "https://cgit.kde.org/kdepim-runtime.git")
(home-page "https://invent.kde.org/pim/kdepim-runtime")
(synopsis "Runtime components for Akonadi KDE")
(description "This package contains Akonadi agents written using KDE
Development Platform libraries. Any package that uses Akonadi should probably
@ -816,7 +816,7 @@ package.")
("kxmlgui" ,kxmlgui)
("libkdepim" ,libkdepim)
("qtbase" ,qtbase)))
(home-page "https://cgit.kde.org/eventviews.git")
(home-page "https://invent.kde.org/pim/eventviews")
(synopsis "KDE PIM library for creating events")
(description "This library provides an event creator for KDE PIM.")
(license ;; GPL for programs, LGPL for libraries
@ -1180,7 +1180,7 @@ manager from KDE.")
("qtbase" ,qtbase)))
(arguments
`(#:tests? #f)) ;; TODO: 4/56 tests fail, even with "offscreen" and dbus
(home-page "https://cgit.kde.org/mailcommon.git")
(home-page "https://invent.kde.org/pim/mailcommon")
(synopsis "KDE email utility library")
(description "The mail common library provides utility functions for
dealing with email.")
@ -1219,7 +1219,7 @@ dealing with email.")
("kxmlgui" ,kxmlgui)
("libkdepim" ,libkdepim)
("qtbase" ,qtbase)))
(home-page "https://cgit.kde.org/mailimporter.git")
(home-page "https://invent.kde.org/pim/mailimporter")
(synopsis "KDE mail importer library")
(description "This package provides libraries for importing mails other
e-mail client programs into KMail and KDE PIM.")
@ -1373,7 +1373,7 @@ using a Qt/KMime C++ API.")
"/include/KF5:"
(or (getenv "CPLUS_INCLUDE_PATH") "")))
#t)))))
(home-page "https://cgit.kde.org/messagelib.git")
(home-page "https://invent.kde.org/pim/messagelib")
(synopsis "KDE PIM messaging libraries")
(description "This package provides several libraries for messages,
e.g. a message list, a mime tree parse, a template parser and the
@ -1701,7 +1701,7 @@ Virtual Contact File}) files to the KPeople contact management library.")
("qtwebengine" ,qtwebengine)))
(arguments
`(#:tests? #f)) ;; TODO tests hang
(home-page "https://cgit.kde.org/pimcommon.git")
(home-page "https://invent.kde.org/pim/pimcommon")
(synopsis "Common libraries for KDE PIM")
(description "This package provides common libraries for KDE PIM.")
(license ;; GPL for programs, LGPL for libraries
@ -1782,7 +1782,7 @@ text in the text edit to all kinds of markup, like HTML or BBCODE.")
_ prefix)
(string-append prefix "${KDE_INSTALL_TARGETS_DEFAULT_ARGS})")))
#t)))))
(home-page "https://cgit.kde.org/ksmtp.git")
(home-page "https://invent.kde.org/pim/ksmtp")
(synopsis "Library for sending email through an SMTP server")
(description "This library provides an API for handling SMTP
services. SMTP (Simple Mail Transfer Protocol) is the most prevalent Internet
@ -1863,7 +1863,7 @@ and allows one to view/extract message formatted text in Rich Text Format.")
("kwallet" ,kwallet)
("kwidgetsaddons" ,kwidgetsaddons)
("qtbase" ,qtbase)))
(home-page "https://cgit.kde.org/libkdepim.git")
(home-page "https://invent.kde.org/pim/libkdepim")
(synopsis "Libraries for common KDE PIM apps")
(description "This package provided libraries for common KDE PIM apps.")
(license ;; GPL for programs, LGPL for libraries
@ -1898,7 +1898,7 @@ and allows one to view/extract message formatted text in Rich Text Format.")
("qtwebengine" ,qtwebengine)))
(arguments
`(#:tests? #f)) ;; TODO 6/48 tests fail
(home-page "https://cgit.kde.org/libkgapi.git")
(home-page "https://invent.kde.org/pim/libkgapi")
(synopsis "Library for accessing various Google services via their public
API")
(description "@code{LibKGAPI} is a C++ library that implements APIs for
@ -1936,7 +1936,7 @@ various Google services.")
("kpimtextedit" ,kpimtextedit)
("qgpgme" ,qgpgme)
("qtbase" ,qtbase)))
(home-page "https://cgit.kde.org/libkleo.git/")
(home-page "https://invent.kde.org/pim/libkleo")
(synopsis "KDE PIM cryptographic library")
(description "@code{libkleo} is a library for Kleopatra and other parts of
KDE using certificate-based crypto.")
@ -1999,7 +1999,7 @@ KDE using certificate-based crypto.")
((".*sieveeditorgraphicalmodewidgettest\\.cpp.*")
""))
#t)))))
(home-page "https://cgit.kde.org/libksieve.git")
(home-page "https://invent.kde.org/pim/libksieve")
(synopsis "KDE Sieve library")
(description "Sieve is a language that can be used filter emails. KSieve
is a Sieve parser and interpreter library for KDE.")

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

@ -52,7 +52,7 @@
(inputs
`(("ki18n" ,ki18n)
("qtbase" ,qtbase)))
(home-page "https://cgit.kde.org/kdecoration.git")
(home-page "https://invent.kde.org/plasma/kdecoration")
(synopsis "Plugin based library to create window decorations")
(description "KDecoration is a library to create window decorations.
These window decorations can be used by for example an X11 based window
@ -119,7 +119,7 @@ manager which re-parents a Client window to a window decoration frame.")
("solid" ,solid)
("wayland" ,wayland)
("xcb-util-keysyms" ,xcb-util-keysyms)))
(home-page "https://cgit.kde.org/kscreenlocker.git")
(home-page "https://invent.kde.org/plasma/kscreenlocker")
(synopsis "Screen locking library")
(description
"@code{kscreenlocker} is a library for creating secure lock screens.")

53
gnu/packages/kde.scm
View file

@ -11,6 +11,7 @@
;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020 Prafulla Giri <pratheblackdiamond@gmail.com>
;;; Copyright © 2020 Zheng Junjie <873216071@qq.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -130,7 +131,7 @@ This package contains GUI widgets for baloo.")
("kiconthemes" ,kiconthemes)
("knewstuff" ,knewstuff)
("qtbase" ,qtbase)))
(home-page "https://cgit.kde.org/grantleetheme.git")
(home-page "https://invent.kde.org/pim/grantleetheme")
(synopsis "Library providing Grantlee theme support")
(description "This library provides Grantlee theme support.")
(license ;; LGPL for libraries, FDL for documentation
@ -362,7 +363,7 @@ for some KDevelop language plugins (Ruby, PHP, CSS...).")
(inputs
`(("qtbase" ,qtbase)
("qtsvg" ,qtsvg)))
(home-page "https://cgit.kde.org/kdiagram.git/")
(home-page "https://invent.kde.org/graphics/kdiagram")
(synopsis "Libraries for creating business diagrams")
(description "This package provides libraries for integrating business
diagrams in Qt-based applications.
@ -518,7 +519,7 @@ used in KDE development tools Kompare and KDevelop.")
straightforward and cross-platform API for a range of cryptographic features,
including SSL/TLS, X.509 certificates, SASL, OpenPGP, S/MIME CMS, and smart
cards.")
(license license:lgpl2.1)))
(license license:lgpl2.1+)))
(define-public kpmcore
(package
@ -765,6 +766,52 @@ Python, PHP, and Perl.")
(description "Runtime library for kdegames")
(license (list license:gpl2+ license:fdl1.2+))))
(define-public kdegraphics-mobipocket
(package
(name "kdegraphics-mobipocket")
(version "20.12.0")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/" name "-" version ".tar.xz"))
(sha256
(base32 "0fm880lp9g60zgrkjyh4jxws6x0s77l9ia4f8pza3w8sxcbbswk5"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
(inputs
`(("kio" ,kio)
("qtbase" ,qtbase)))
(home-page "https://apps.kde.org/en/kdegraphics_mobipocket")
(synopsis "KDE thumbnailer for Mobipocket files")
(description "This package provides a KDE plugin that shows thumbnails of
Mobipocket e-books in Dolphin and other KDE apps.")
(license license:gpl2+)))
(define-public libkexiv2
(package
(name "libkexiv2")
(version "20.12.0")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/" name "-" version ".tar.xz"))
(sha256
(base32 "0k0iinf7s8qlk3fwvq7iic1b4zn2gm65rfd58q7d3wb1i1j2hjjk"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
(inputs
`(("exiv2" ,exiv2)
("qtbase" ,qtbase)))
(home-page "https://invent.kde.org/graphics/libkexiv2")
(synopsis "Manipulate the metadata of images")
(description "Libkexiv2 wraps the Exiv2 library, allowing to manipulate
picture metadata as EXIF/IPTC and XMP.")
(license license:gpl2+)))
(define-public zeroconf-ioslave
(package
(name "zeroconf-ioslave")

44
gnu/packages/linux.scm
View file

@ -352,7 +352,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
;; The current "stable" kernel. That is, the most recently released major
;; version.
(define-public linux-libre-5.9-version "5.9.12")
(define-public linux-libre-5.9-version "5.9.14")
(define deblob-scripts-5.9
(linux-libre-deblob-scripts
linux-libre-5.9-version
@ -360,7 +360,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "0yb04a4j2wq3mwvks3cj7kcm2pscmfs29lrz3falkxpbvjxbbgq2")))
(define-public linux-libre-5.9-pristine-source
(let ((version linux-libre-5.9-version)
(hash (base32 "1gfrn3sz3h4cbsf3r8f9jxja400qsmbrk8sclk4cjx1l5qcmczyr")))
(hash (base32 "0jbb3rzbkh0l75zq9bnc60w55ryvrvcg7vw85fsbcwfzvi0zpz1r")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-5.9)))
@ -368,7 +368,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
;; The "longterm" kernels — the older releases with long-term upstream support.
;; Here are the support timelines:
;; <https://www.kernel.org/category/releases.html>
(define-public linux-libre-5.4-version "5.4.81")
(define-public linux-libre-5.4-version "5.4.83")
(define deblob-scripts-5.4
(linux-libre-deblob-scripts
linux-libre-5.4-version
@ -376,12 +376,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "167zcfkw62pm6nv1xdvvhxw0ca724sywcywnv3z00189f8f8p3vg")))
(define-public linux-libre-5.4-pristine-source
(let ((version linux-libre-5.4-version)
(hash (base32 "09w4bpr3v9rzcvxics5wddabplwbpk1mynl45lh9csbjfpjbsw4l")))
(hash (base32 "1ik14pfgynkn1sjhgyhgmxjvviq0mgvk0ygj76w8mplkpc5rgv5y")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-5.4)))
(define-public linux-libre-4.19-version "4.19.161")
(define-public linux-libre-4.19-version "4.19.163")
(define deblob-scripts-4.19
(linux-libre-deblob-scripts
linux-libre-4.19-version
@ -389,12 +389,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "1jiaw0as1ippkrjdpd52657w5mz9qczg3y2hlra7m9k0xawwiqlf")))
(define-public linux-libre-4.19-pristine-source
(let ((version linux-libre-4.19-version)
(hash (base32 "0h9wskmz9wridwnicnjlcmj1112qnlvqk01bhjkxv6b8jsajjh87")))
(hash (base32 "1z65iwwyx2b01fncygckmhpxirzs52qfqmv3agirn4laxgjw9viy")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-4.19)))
(define-public linux-libre-4.14-version "4.14.210")
(define-public linux-libre-4.14-version "4.14.212")
(define deblob-scripts-4.14
(linux-libre-deblob-scripts
linux-libre-4.14-version
@ -402,12 +402,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "1qij18inijj6c3ma8hv98yjagnzxdxyn134da9fd23ky8q6hbvky")))
(define-public linux-libre-4.14-pristine-source
(let ((version linux-libre-4.14-version)
(hash (base32 "067xqi6sgf50p7s3n6y77cgf5bj5062s3bz3kqpp6f9wnk85267r")))
(hash (base32 "0y8ck8pfxm8862wi4cz8qp9x9b18yl448i8m7bpbphs290nc66qf")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-4.14)))
(define-public linux-libre-4.9-version "4.9.247")
(define-public linux-libre-4.9-version "4.9.248")
(define deblob-scripts-4.9
(linux-libre-deblob-scripts
linux-libre-4.9-version
@ -415,12 +415,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "0fxajshb75siq39lj5h8xvhdj8lcmddkslwlyj65rhlwk6g2r4b2")))
(define-public linux-libre-4.9-pristine-source
(let ((version linux-libre-4.9-version)
(hash (base32 "1mngdbsq8pdzd0x9hif4715cc7wzc3ahgp1yrknnqk598q0fnfpp")))
(hash (base32 "1kzczy0lz3lnjkhvx90dgjmzn3d3y55qxlihiclkr4y9c602d1s6")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-4.9)))
(define-public linux-libre-4.4-version "4.4.247")
(define-public linux-libre-4.4-version "4.4.248")
(define deblob-scripts-4.4
(linux-libre-deblob-scripts
linux-libre-4.4-version
@ -428,7 +428,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "0hhin1jpfkd6nwrb6xqxjzl3hdxy4pn8a15hy2d3d83yw6pflbsf")))
(define-public linux-libre-4.4-pristine-source
(let ((version linux-libre-4.4-version)
(hash (base32 "1jh7vmyx55krk6y2r9v48liifs5wwkgns3gp8rs5sm4klfm36r2a")))
(hash (base32 "1z1xbkm0z0v6k3scszii5hi24pn391332g0li93p3n1rnv74jap5")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-4.4)))
@ -4050,18 +4050,18 @@ thanks to the use of namespaces.")
(modify-phases %standard-phases
(add-after 'unpack 'patch-references
(lambda _
(substitute* "libexec/cli/build.exec"
(("if ! singularity_which mksquashfs") "if 0")
(("if ! mksquashfs")
(string-append "if ! " (which "mksquashfs"))))
(substitute* (list "libexec/cli/help.exec"
"libexec/bootstrap-scripts/functions"
"libexec/bootstrap-scripts/post.sh"
"libexec/functions")
(substitute* "libexec/cli/build.exec.in"
(("-mksquashfs") (string-append "-" (which "mksquashfs"))))
(substitute* (append
(find-files "libexec" "functions")
(find-files "libexec/bootstrap-scripts" ".*sh$")
(find-files "libexec/cli" ".*exec$"))
(("\\| grep ")
(string-append "| " (which "grep") " "))
(("egrep ")
(string-append (which "egrep") " ")))
(string-append (which "egrep") " "))
((" sed ")
(string-append " " (which "sed") " ")))
#t))
(add-after 'install 'set-PATH
(lambda* (#:key inputs outputs #:allow-other-keys)
@ -4549,7 +4549,7 @@ arrays when needed.")
;; For tests.
("cmocka" ,cmocka)))
(inputs
`(("json-c" ,json-c-0.13)
`(("json-c" ,json-c)
("libaio" ,libaio)
("liburcu" ,liburcu)
("lvm2" ,lvm2)

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

@ -309,6 +309,45 @@ streams which are similar to string streams.")
(define-public ecl-flexi-streams
(sbcl-package->ecl-package sbcl-flexi-streams))
(define-public sbcl-cl-abnf
;; There are no releases
(let ((commit "ba1fbb104dedbdaddb1ef93d2e4da711bd96cd70")
(revision "1"))
(package
(name "sbcl-cl-abnf")
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/dimitri/cl-abnf")
(commit commit)))
(file-name (git-file-name "cl-abnf" version))
(sha256
(base32 "0f09nsndxa90acm71zd4qdnp40v705a4sqm04mnv9x76h6dlggmz"))))
(build-system asdf-build-system/sbcl)
(inputs
`(("cl-ppcre" ,sbcl-cl-ppcre)
("esrap" ,sbcl-esrap)))
(arguments
`(#:asd-systems '("abnf")))
(home-page "https://github.com/dimitri/cl-abnf")
(synopsis "ABNF parser generator for Common Lisp")
(description "This Common Lisp library implements a parser generator for
the ABNF grammar format as described in RFC2234. The generated parser is a
regular expression scanner provided by the cl-ppcre lib, which means that we
can't parse recursive grammar definition. One such definition is the ABNF
definition as given by the RFC. Fortunately, as you have this lib, you most
probably don't need to generate another parser to handle that particular ABNF
grammar.")
(license license:expat))))
(define-public cl-abnf
(sbcl-package->cl-source-package sbcl-cl-abnf))
(define-public ecl-cl-abnf
(sbcl-package->ecl-package sbcl-cl-abnf))
(define-public sbcl-cl-ppcre
(package
(name "sbcl-cl-ppcre")
@ -2725,7 +2764,11 @@ Lisp, featuring:
(sbcl-package->cl-source-package sbcl-lparallel))
(define-public ecl-lparallel
(sbcl-package->ecl-package sbcl-lparallel))
(package
(inherit (sbcl-package->ecl-package sbcl-lparallel))
(arguments
;; TODO: Find why the tests get stuck forever; disable them for now.
`(#:tests? #f))))
(define-public sbcl-cl-markup
(let ((commit "e0eb7debf4bdff98d1f49d0f811321a6a637b390"))
@ -5638,6 +5681,41 @@ extension-points via the concept of hooks.")
(define-public ecl-cl-hooks
(sbcl-package->ecl-package sbcl-cl-hooks))
(define-public sbcl-cl-autowrap
(let ((revision "1")
(commit "ae846d6968fc0d000de0c541638929a157f3009e"))
;; no taged branches
(package
(name "sbcl-cl-autowrap")
(version (git-version "1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rpav/cl-autowrap")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "1gisldp2zns92kdcaikghm7c38ldy2d884n8bfg0wcjvbz78p3ar"))))
(build-system asdf-build-system/sbcl)
(inputs
`(("alexandria" ,sbcl-alexandria)
("cffi" ,sbcl-cffi)
("cl-json" ,sbcl-cl-json)
("cl-ppcre" ,sbcl-cl-ppcre)
("defpackage-plus" ,sbcl-defpackage-plus)
("trivial-features" ,sbcl-trivial-features)))
(home-page "https://github.com/rpav/cl-autowrap")
(synopsis "FFI wrapper generator for Common Lisp")
(description "This is a c2ffi-based wrapper generator for Common Lisp.")
(license license:bsd-2))))
(define-public cl-autowrap
(sbcl-package->cl-source-package sbcl-cl-autowrap))
(define-public ecl-cl-autowrap
(sbcl-package->ecl-package sbcl-cl-autowrap))
(define-public sbcl-s-sysdeps
;; No release since 2013.
(let ((commit "9aa23bbdceb24bcdbe0e7c39fa1901858f823106")
@ -11234,17 +11312,18 @@ XML to Lisp structures or s-expressions and back.")
(define-public sbcl-geco
(package
(name "sbcl-geco")
(version "2.01a")
(version "2.1.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://common-lisp.net/project/geco/download/"
"geco-" version ".tar.gz"))
(method git-fetch)
(uri (git-reference
(url "https://github.com/gpwwjr/GECO")
(commit (string-append "v" version))))
(file-name (git-file-name "geco" version))
(sha256
(base32 "0kk0bzr1019cfmf2b1jl1rk9shv3gx5z1znifxllg9mb98yqsgw0"))
(patches (search-patches "sbcl-geco-fix-organism-class.patch"))))
(base32 "1rc8a4mk40hjx5qy980hjylv6xxqdbq38hg8c4w30y93abfd519s"))))
(build-system asdf-build-system/sbcl)
(home-page "https://common-lisp.net/project/geco/")
(home-page "http://hiwaay.net/~gpw/geco/geco.html")
(synopsis "Genetic algorithm toolkit for Common Lisp")
(description
"GECO (Genetic Evolution through Combination of Objects) is an extensible,
@ -12405,3 +12484,44 @@ Service (S3) and CloudFront service from Common Lisp.")
(define-public ecl-zs3
(sbcl-package->ecl-package sbcl-zs3))
(define-public sbcl-simple-neural-network
(package
(name "sbcl-simple-neural-network")
(version "3.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/glv2/simple-neural-network")
(commit (string-append "v" version))))
(file-name (git-file-name "simple-neural-network" version))
(sha256
(base32 "1jj1c90fr5clwka0jv32hv6xp1bkdlpa6x5jh19an13rhx8ll4zr"))))
(build-system asdf-build-system/sbcl)
(native-inputs
`(("chipz" ,sbcl-chipz)
("fiveam" ,sbcl-fiveam)))
(inputs
`(("cl-store" ,sbcl-cl-store)
("lparallel" ,sbcl-lparallel)))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'check 'remove-test-data
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(for-each delete-file (find-files out "\\.gz$"))))))))
(synopsis "Simple neural network in Common Lisp")
(description
"@code{simple-neural-network} is a Common Lisp library for creating,
training and using basic neural networks. The networks created by this
library are feedforward neural networks trained using backpropagation.")
(home-page "https://github.com/glv2/simple-neural-network")
(license license:gpl3+)))
(define-public cl-simple-neural-network
(sbcl-package->cl-source-package sbcl-simple-neural-network))
(define-public ecl-simple-neural-network
(sbcl-package->ecl-package sbcl-simple-neural-network))

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

@ -582,7 +582,7 @@ in terms of new algorithms.")
(define-public python-onnx
(package
(name "python-onnx")
(version "1.7.0")
(version "1.8.0")
(source
(origin
(method url-fetch)
@ -591,7 +591,7 @@ in terms of new algorithms.")
;; to use googletest from Guix and enable tests by default.
(patches (search-patches "python-onnx-use-system-googletest.patch"))
(sha256
(base32 "0j6rgfbhsw3a8id8pyg18y93k68lbjbj1kq6qia36h69f6pvlyjy"))))
(base32 "0365zkikq6v3cl5hh2daa5z1alhij8xpn8rmlcny340jrv9pyy2z"))))
(build-system python-build-system)
(native-inputs
`(("cmake" ,cmake)

19
gnu/packages/mail.scm
View file

@ -39,6 +39,7 @@
;;; Copyright © 2020 Alexandru-Sergiu Marton <brown121407@posteo.ro>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 B. Wilson <elaexuotee@wilsonb.com>
;;; Copyright © 2020 divoplade <d@divoplade.fr>
;;;
;;; This file is part of GNU Guix.
;;;
@ -444,7 +445,7 @@ aliasing facilities to work just as they would on normal mail.")
(define-public mutt
(package
(name "mutt")
(version "2.0.2")
(version "2.0.3")
(source (origin
(method url-fetch)
(uri (list
@ -454,7 +455,7 @@ aliasing facilities to work just as they would on normal mail.")
version ".tar.gz")))
(sha256
(base32
"1j0i2jmlk5sc78af9flj3ynj0iiwa8biw7jgf12qm5lppsx1h4j7"))
"1vf1ab3mnx7p4s4n4pssajj211s3zr4730bwgsjx9gxcnyppqclw"))
(patches (search-patches "mutt-store-references.patch"))))
(build-system gnu-build-system)
(inputs
@ -1700,7 +1701,13 @@ delivery.")
(("(ZCAT_COMMAND=).*" all var)
(string-append var gzip "/bin/zcat\n"))
(("# (USE_GNUTLS(|_PC)=.*)" all line)
(string-append line "\n")))
(string-append line "\n"))
(("# (AUTH_CRAM_MD5=yes)" all line) line)
(("# (AUTH_DOVECOT=yes)" all line) line)
(("# (AUTH_EXTERNAL=yes)" all line) line)
(("# (AUTH_PLAINTEXT=yes)" all line) line)
(("# (AUTH_SPA=yes)" all line) line)
(("# (AUTH_TLS=yes)" all line) line))
;; This file has hard-coded relative file names for tools despite
;; the zcat configuration above.
(substitute* '("src/exigrep.src")
@ -1993,7 +2000,7 @@ hashing scheme (such as scrypt) plug-in for @code{Dovecot}.")
(inputs
`(("bdb" ,bdb)
("cyrus-sasl" ,cyrus-sasl)
("openssl" ,openssl-1.0)
("openssl" ,openssl)
("zlib" ,zlib)))
(home-page "https://isync.sourceforge.io/")
(synopsis "Mailbox synchronization program")
@ -3746,7 +3753,7 @@ PGP handling, multiple servers, and secure connections.")
(define-public imapfilter
(package
(name "imapfilter")
(version "2.7.4")
(version "2.7.5")
(source
(origin
(method git-fetch)
@ -3755,7 +3762,7 @@ PGP handling, multiple servers, and secure connections.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0nb0ysdp91r6dr3jgx24halbf4f56g4imx9112hkbz1abzgrmxs3"))))
(base32 "0a7f85r3axwclzw1s79zl2l8222nj2gklvvq33w9qv0dz5n71dcx"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f

64
gnu/packages/maths.scm
View file

@ -518,7 +518,7 @@ numbers.")
(define-public sleef
(package
(name "sleef")
(version "3.4.1")
(version "3.5.1")
(source
(origin
(method git-fetch)
@ -527,7 +527,7 @@ numbers.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1gvf7cfvszmgjrsqivwmyy1jnp3hy80dmszxx827lhjz8yqq5019"))))
(base32 "1jybqrl2dvjxzg30xrhh847s375n2jr1pix644wi6hb5wh5mx3f7"))))
(build-system cmake-build-system)
(arguments
'(#:configure-flags (list "-DCMAKE_BUILD_TYPE=Release"
@ -2211,13 +2211,13 @@ ASCII text files using Gmsh's own scripting language.")
(define-public veusz
(package
(name "veusz")
(version "3.2.1")
(version "3.3.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "veusz" version))
(sha256
(base32 "00vmfpvyd6f33l5awlf02qdik3gmbhzyfizfwwbx7qnam2i9bbwy"))))
(base32 "1q7hi1qwwg4pgiz62isvv1pia85m13bspdpp1q3mrnwl11in0ag0"))))
(build-system python-build-system)
(arguments
`(;; Tests will fail because they depend on optional packages like
@ -4194,7 +4194,7 @@ revised simplex and the branch-and-bound methods.")
(define-public dealii
(package
(name "dealii")
(version "9.1.1")
(version "9.2.0")
(source
(origin
(method url-fetch)
@ -4202,7 +4202,7 @@ revised simplex and the branch-and-bound methods.")
"download/v" version "/dealii-" version ".tar.gz"))
(sha256
(base32
"0xhjv0gzswpjbc43xbrpwfc5848g508l01855nszx3g5gwzlhnzw"))
"0fm4xzrnb7dfn4415j24d8v3jkh0lssi86250x2f5wgi83xq4nnh"))
(modules '((guix build utils)))
(snippet
;; Remove bundled sources: UMFPACK, TBB, muParser, and boost
@ -4987,6 +4987,58 @@ be fed to @command{tcalc} through the command line.")
(home-page "https://sites.google.com/site/mohammedisam2000/tcalc")
(license license:gpl3+)))
(define-public tiny-bignum
(let ((commit "1d7a1f9b8e77316187a6b3eae8e68d60a6f9a4d4"))
(package
(name "tiny-bignum")
(version (git-version "0" "0" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/kokke/tiny-bignum-c")
(commit commit)))
(file-name (git-file-name "tiny-bignum" commit))
(sha256
(base32 "0vj71qlhlaa7d92bfar1kwqv6582dqrby8x3kdw0yzh82k2023g6"))))
(build-system gnu-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(delete 'configure)
(add-after 'unpack 'patch-tests
(lambda _
(substitute* "scripts/test_rand.py"
(("\t") " ")
(("\" % (\\w+)" _ symbol) (string-append "\" % int(" symbol ")")))
#t))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "make" "test"))
#t))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((share (string-append (assoc-ref outputs "out") "/share"))
(doc (string-append (assoc-ref outputs "out") "/doc")))
(mkdir-p share)
(install-file "bn.c" share)
(install-file "bn.h" share)
(mkdir-p doc)
(install-file "LICENSE" doc)
(install-file "README.md" doc))
#t)))))
(native-inputs
`(("python" ,python-wrapper)))
(home-page "https://github.com/kokke/tiny-bignum-c")
(synopsis "Small portable multiple-precision unsigned integer arithmetic in C")
(description
"This library provides portable Arbitrary-precision unsigned integer
arithmetic in C, for calculating with large numbers. Basic arithmetic (+, -,
*, /, %) and bitwise operations (&, |, ^. <<, >>) plus increments, decrements
and comparisons are supported.")
(license license:unlicense))))
(define-public sundials
(package
(name "sundials")

4
gnu/packages/matrix.scm
View file

@ -61,13 +61,13 @@ an LDAP server.")
(define-public synapse
(package
(name "synapse")
(version "1.22.1")
(version "1.24.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "matrix-synapse" version))
(sha256
(base32
"1pbxdqpfa7wzdz61p6x58x7841vng1g65qayxgcw73bn1shl50jb"))))
"0pmn8aqc7jj2xdrwljjz2vwg58hlyxp9axac471pcmg2vqais5yb"))))
(build-system python-build-system)
;; TODO Run tests with ‘PYTHONPATH=. trial3 tests’.
(propagated-inputs

4
gnu/packages/monitoring.scm
View file

@ -158,7 +158,7 @@ etc. via a Web interface. Features include:
(define-public zabbix-agentd
(package
(name "zabbix-agentd")
(version "5.2.1")
(version "5.2.2")
(source
(origin
(method url-fetch)
@ -166,7 +166,7 @@ etc. via a Web interface. Features include:
"https://cdn.zabbix.com/zabbix/sources/stable/"
(version-major+minor version) "/zabbix-" version ".tar.gz"))
(sha256
(base32 "0rz5hg0r2m6qc0dj9b57g96dgilbg8i0rjhm4v9025v51jkby3xq"))))
(base32 "16sqx5hrqkciwnl6xs1b8mwf0fz7x9f4214jhj9s86w0mqiscw8g"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags

13
gnu/packages/networking.scm
View file

@ -3024,6 +3024,19 @@ asynchronous model using a modern C++ approach.")
(base32
"1idd9b4f2pnhcpk1bh030hqg5zq25gkwxd53xi3c0cj242w7sp2j"))
(file-name (git-file-name name version))))
(inputs
`(("openssl" ,openssl)))
(arguments
'(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-crypto-paths
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "shadowsocks/shell.py"
(("config\\.get\\('libopenssl', None\\)")
(format #f "config.get('libopenssl', ~s)"
(string-append
(assoc-ref inputs "openssl")
"/lib/libssl.so")))))))))
(build-system python-build-system)
(synopsis "Fast tunnel proxy that helps you bypass firewalls")
(description

5
gnu/packages/nfs.scm
View file

@ -117,10 +117,11 @@
`(("keyutils" ,keyutils)
("libevent" ,libevent)
("libnfsidmap" ,libnfsidmap)
("rpcsvc-proto" ,rpcsvc-proto) ;for 'rpcgen'
("rpcsvc-proto" ,rpcsvc-proto) ;for 'rpcgen'
("sqlite" ,sqlite)
("lvm2" ,lvm2)
("util-linux" ,util-linux "lib")
("util-linux" ,util-linux) ; only for above substitutions
("util-linux:lib" ,util-linux "lib") ; for libblkid
("mit-krb5" ,mit-krb5)
("libtirpc" ,libtirpc)
("python-wrapper" ,python-wrapper))) ;for the Python based tools

22
gnu/packages/node.scm
View file

@ -48,14 +48,14 @@
(define-public node
(package
(name "node")
(version "10.20.0")
(version "10.22.1")
(source (origin
(method url-fetch)
(uri (string-append "https://nodejs.org/dist/v" version
"/node-v" version ".tar.xz"))
(sha256
(base32
"0cvjwnl0wkcsyw3kannbdv01s235wrnp11n2s6swzjx95gpichfi"))
"0pr569qiabr4m7k38s7rwi3iyzrc5jmx19z2z0k7n4xfvhjlfzzl"))
(modules '((guix build utils)))
(snippet
`(begin
@ -201,24 +201,6 @@ devices.")
(properties '((max-silent-time . 7200) ;2h, needed on ARM
(timeout . 21600))))) ;6h
;; TODO: Make this the default node on core-updates. This cannot be done on
;; master since this version of node requires a newer nghttp2 library at link
;; time.
(define-public node-10.22
(package
(inherit node)
(version "10.22.1")
(source (origin
(inherit (package-source node))
(uri (string-append "https://nodejs.org/dist/v" version
"/node-v" version ".tar.xz"))
(sha256
(base32
"0pr569qiabr4m7k38s7rwi3iyzrc5jmx19z2z0k7n4xfvhjlfzzl"))))
(inputs
(alist-replace "nghttp2" (list nghttp2-1.41 "lib")
(package-inputs node)))))
(define-public libnode
(package
(inherit node)

4
gnu/packages/ntp.scm
View file

@ -166,14 +166,14 @@ computers over a network.")
(define-public openntpd
(package
(name "openntpd")
(version "6.2p3")
(version "6.8p1")
(source (origin
(method url-fetch)
(uri (string-append
"mirror://openbsd/OpenNTPD/openntpd-" version ".tar.gz"))
(sha256
(base32
"0fn12i4kzsi0zkr4qp3dp9bycmirnfapajqvdfx02zhr4hanj0kv"))))
"0ijsylc7a4jlpxsqa0jq1w1c7333id8pcakzl7a5749ria1xp0l5"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags `( "--with-privsep-user=ntpd"

16
gnu/packages/ocaml.scm
View file

@ -739,8 +739,7 @@ Emacs.")
(define-public ocaml-menhir
(package
(name "ocaml-menhir")
;; More recent versions can be built after we have dune >= 2.0
(version "20190626")
(version "20200211")
(source
(origin
(method git-fetch)
@ -749,19 +748,12 @@ Emacs.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0v8av4pw6rykzb7wx54xhbsx0jhh8xyb4x0k4yrxi0w5ylkck6mb"))))
(build-system ocaml-build-system)
(base32 "019izf51kdc7pzkw68zg8a2alc8lxw1gwdp7in970mr90n16b5zj"))))
(build-system dune-build-system)
(inputs
`(("ocaml" ,ocaml)))
(native-inputs
`(("ocamlbuild" ,ocamlbuild)))
(arguments
`(#:make-flags `("USE_OCAMLFIND=true"
,(string-append "PREFIX=" (assoc-ref %outputs "out")))
#:tests? #f ; No check target
#:phases
(modify-phases %standard-phases
(delete 'configure))))
`(#:tests? #f)) ; No check target
(home-page "http://gallium.inria.fr/~fpottier/menhir/")
(synopsis "Parser generator")
(description "Menhir is a parser generator. It turns high-level grammar

49
gnu/packages/openldap.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013, 2014, 2015, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
@ -61,25 +61,23 @@
(define-public openldap
(package
(name "openldap")
(replacement openldap-2.4.50)
(version "2.4.49")
(version "2.4.50")
(source (origin
(method url-fetch)
;; See <http://www.openldap.org/software/download/> for a list of
;; mirrors.
(uri (list (string-append
"ftp://mirror.switch.ch/mirror/OpenLDAP/"
"openldap-release/openldap-" version ".tgz")
(string-append
"https://www.openldap.org/software/download/OpenLDAP/"
"openldap-release/openldap-" version ".tgz")
(string-append
"ftp://ftp.dti.ad.jp/pub/net/OpenLDAP/"
"openldap-release/openldap-" version ".tgz")))
(sha256
(base32
"0vp524rsngdcykf6ki7vprsyg7gj8z7hszg8xwxz50219fa1gcg3"))))
(method url-fetch)
;; See <http://www.openldap.org/software/download/> for a list of
;; mirrors.
(uri (list (string-append
"ftp://mirror.switch.ch/mirror/OpenLDAP/"
"openldap-release/openldap-" version ".tgz")
(string-append
"https://www.openldap.org/software/download/OpenLDAP/"
"openldap-release/openldap-" version ".tgz")
(string-append
"ftp://ftp.dti.ad.jp/pub/net/OpenLDAP/"
"openldap-release/openldap-" version ".tgz")))
(sha256
(base32
"1f46nlfwmys110j36sifm7ah8m8f3s10c3vaiikmmigmifapvdaw"))))
(build-system gnu-build-system)
(inputs `(("bdb" ,bdb-5.3)
("cyrus-sasl" ,cyrus-sasl)
@ -127,19 +125,6 @@
(license openldap2.8)
(home-page "https://www.openldap.org/")))
(define openldap-2.4.50
(package
(inherit openldap)
(version "2.4.50")
(source (origin
(method url-fetch)
(uri (string-append "https://www.openldap.org/software/download/"
"OpenLDAP/openldap-release/openldap-" version
".tgz"))
(sha256
(base32
"1f46nlfwmys110j36sifm7ah8m8f3s10c3vaiikmmigmifapvdaw"))))))
(define-public nss-pam-ldapd
(package
(name "nss-pam-ldapd")

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

@ -131,8 +131,8 @@
;; Note: the 'update-guix-package.scm' script expects this definition to
;; start precisely like this.
(let ((version "1.2.0")
(commit "c952a9312a94bb236495ec654bf184685cf9fe79")
(revision 5))
(commit "799f066768bacb321ebad84c75b2bbfd269e7cd8")
(revision 6))
(package
(name "guix")
@ -148,7 +148,7 @@
(commit commit)))
(sha256
(base32
"1k32p37ikwls086mgxjhz9qhrbc7lgvfpbnk0ikfg4p40rxjp4w8"))
"04k8q5yjmxazskl13ap210jki2zh73zlzd0xdx06v08liskgz10q"))
(file-name (string-append "guix-" version "-checkout"))))
(build-system gnu-build-system)
(arguments
@ -405,7 +405,7 @@ $(prefix)/etc/init.d\n")))
("glibc-utf8-locales" ,glibc-utf8-locales)))
(propagated-inputs
`(("gnutls" ,(if (%current-target-system) gnutls/fixed gnutls))
`(("gnutls" ,gnutls)
;; Avahi requires "glib" which doesn't cross-compile yet.
,@(if (%current-target-system)
'()
@ -1026,8 +1026,8 @@ environments.")
(license (list license:gpl3+ license:agpl3+ license:silofl1.1))))
(define-public guix-build-coordinator
(let ((commit "49c0596c6d5589f0e46268c9b28e7e31932a7964")
(revision "9"))
(let ((commit "79e28fbfd7298eecd754f75170c09c59c0943f67")
(revision "10"))
(package
(name "guix-build-coordinator")
(version (git-version "0" revision commit))
@ -1038,7 +1038,7 @@ environments.")
(commit commit)))
(sha256
(base32
"16mdf4fw83ni5qwx48f8z4p8fwln4q92nk5fljlx726inyrx451k"))
"02yk56iisfwg8k4l1allxlanisp1cm13v6yifgl90b7msvy7qz3a"))
(file-name (string-append name "-" version "-checkout"))))
(build-system gnu-build-system)
(arguments
@ -1097,9 +1097,13 @@ environments.")
(inputs
`(("guile" ,@(assoc-ref (package-native-inputs guix) "guile"))
("sqlite" ,sqlite)
("sqitch" ,sqitch)))
,@(if (hurd-target?)
'()
`(("sqitch" ,sqitch)))))
(propagated-inputs
`(("guile-fibers" ,guile-fibers)
`(,@(if (hurd-target?)
'()
`(("guile-fibers" ,guile-fibers)))
("guile-prometheus" ,guile-prometheus)
("guile-gcrypt" ,guile-gcrypt)
("guile-json" ,guile-json-4)

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

@ -307,15 +307,19 @@ applications, there is xclip integration." )
(define-public yapet
(package
(name "yapet")
(version "2.4")
(version "2.5")
(source
(origin
(method url-fetch)
(uri (string-append "https://yapet.guengel.ch/downloads/yapet-"
version ".tar.xz"))
(sha256
(base32 "0b1v0whf70dfjzlwqwwvfv526s828skjvm4xvwly3vcvcmpz59sh"))))
(base32 "0hpibsdry259cmvps35isr6jn9cd9fsk3r1h0ppjx9zxfrpqwldg"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
(list (string-append "--docdir=" (assoc-ref %outputs "out")
"/share/doc",name "-" ,version))))
(inputs
`(("argon2" ,argon2)
("ncurses" ,ncurses)

68
gnu/packages/patches/busybox-1.31.1-fix-build-with-glibc-2.31.patch
View file

@ -1,68 +0,0 @@
See: https://bugs.gentoo.org/708350
Author: Patrick McLean <patrick.mclean@sony.com>
Date: 2020-02-06 23:06:22 +0000
diff --git a/coreutils/date.c b/coreutils/date.c
index 3414d38ae..4ade6abb4 100644
--- a/coreutils/date.c
+++ b/coreutils/date.c
@@ -279,6 +279,9 @@ int date_main(int argc UNUSED_PARAM, char **argv)
time(&ts.tv_sec);
#endif
}
+#if !ENABLE_FEATURE_DATE_NANO
+ ts.tv_nsec = 0;
+#endif
localtime_r(&ts.tv_sec, &tm_time);
/* If date string is given, update tm_time, and maybe set date */
@@ -301,9 +304,10 @@ int date_main(int argc UNUSED_PARAM, char **argv)
if (date_str[0] != '@')
tm_time.tm_isdst = -1;
ts.tv_sec = validate_tm_time(date_str, &tm_time);
+ ts.tv_nsec = 0;
/* if setting time, set it */
- if ((opt & OPT_SET) && stime(&ts.tv_sec) < 0) {
+ if ((opt & OPT_SET) && clock_settime(CLOCK_REALTIME, &ts) < 0) {
bb_perror_msg("can't set date");
}
}
diff --git a/libbb/missing_syscalls.c b/libbb/missing_syscalls.c
index 87cf59b3d..dc40d9155 100644
--- a/libbb/missing_syscalls.c
+++ b/libbb/missing_syscalls.c
@@ -15,14 +15,6 @@ pid_t getsid(pid_t pid)
return syscall(__NR_getsid, pid);
}
-int stime(const time_t *t)
-{
- struct timeval tv;
- tv.tv_sec = *t;
- tv.tv_usec = 0;
- return settimeofday(&tv, NULL);
-}
-
int sethostname(const char *name, size_t len)
{
return syscall(__NR_sethostname, name, len);
diff --git a/util-linux/rdate.c b/util-linux/rdate.c
index 70f829e7f..878375d78 100644
--- a/util-linux/rdate.c
+++ b/util-linux/rdate.c
@@ -95,9 +95,13 @@ int rdate_main(int argc UNUSED_PARAM, char **argv)
if (!(flags & 2)) { /* no -p (-s may be present) */
if (time(NULL) == remote_time)
bb_error_msg("current time matches remote time");
- else
- if (stime(&remote_time) < 0)
+ else {
+ struct timespec ts;
+ ts.tv_sec = remote_time;
+ ts.tv_nsec = 0;
+ if (clock_settime(CLOCK_REALTIME, &ts) < 0)
bb_perror_msg_and_die("can't set time of day");
+ }
}
if (flags != 1) /* not lone -s */

36
gnu/packages/patches/ghostscript-CVE-2020-15900.patch Normal file
View file

@ -0,0 +1,36 @@
Fix CVE-2020-15900.
https://cve.circl.lu/cve/CVE-2020-15900
https://artifex.com/security-advisories/CVE-2020-15900
Taken from upstream:
https://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=5d499272b95a6b890a1397e11d20937de000d31b
diff --git a/psi/zstring.c b/psi/zstring.c
--- a/psi/zstring.c
+++ b/psi/zstring.c
@@ -142,13 +142,18 @@ search_impl(i_ctx_t *i_ctx_p, bool forward)
return 0;
found:
op->tas.type_attrs = op1->tas.type_attrs;
- op->value.bytes = ptr;
- r_set_size(op, size);
+ op->value.bytes = ptr; /* match */
+ op->tas.rsize = size; /* match */
push(2);
- op[-1] = *op1;
- r_set_size(op - 1, ptr - op[-1].value.bytes);
- op1->value.bytes = ptr + size;
- r_set_size(op1, count + (!forward ? (size - 1) : 0));
+ op[-1] = *op1; /* pre */
+ op[-3].value.bytes = ptr + size; /* post */
+ if (forward) {
+ op[-1].tas.rsize = ptr - op[-1].value.bytes; /* pre */
+ op[-3].tas.rsize = count; /* post */
+ } else {
+ op[-1].tas.rsize = count; /* pre */
+ op[-3].tas.rsize -= count + size; /* post */
+ }
make_true(op);
return 0;
}

35
gnu/packages/patches/ghostscript-freetype-compat.patch Normal file
View file

@ -0,0 +1,35 @@
Fix build with FreeType 2.10.3 and newer.
Taken from upstream:
https://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=41ef9a0bc36b9db7115fbe9623f989bfb47bbade
diff --git a/base/fapi_ft.c b/base/fapi_ft.c
--- a/base/fapi_ft.c
+++ b/base/fapi_ft.c
@@ -125,7 +125,7 @@ static void
delete_inc_int_info(gs_fapi_server * a_server,
FT_IncrementalRec * a_inc_int_info);
-FT_CALLBACK_DEF(void *)
+static void *
FF_alloc(FT_Memory memory, long size)
{
gs_memory_t *mem = (gs_memory_t *) memory->user;
@@ -133,7 +133,7 @@ FF_alloc(FT_Memory memory, long size)
return (gs_malloc(mem, size, 1, "FF_alloc"));
}
-FT_CALLBACK_DEF(void *)
+static void *
FF_realloc(FT_Memory memory, long cur_size, long new_size, void *block)
{
gs_memory_t *mem = (gs_memory_t *) memory->user;
@@ -153,7 +153,7 @@ FT_CALLBACK_DEF(void *)
return (tmp);
}
-FT_CALLBACK_DEF(void)
+static void
FF_free(FT_Memory memory, void *block)
{
gs_memory_t *mem = (gs_memory_t *) memory->user;

19
gnu/packages/patches/hplip-fix-bug-1898438.patch
View file

@ -1,19 +0,0 @@
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 04 Oct 2020 13:28:49 +0200
Subject: [PATCH] gnu: hplip: Fix non-network builds (bug #1898438)
Reported as <https://bugs.launchpad.net/hplip/+bug/1898438>.
diff -Naur a/scan/sane/hpaio.c b/scan/sane/hpaio.c
--- a/scan/sane/hpaio.c 1970-01-01 01:00:01.000000000 +0100
+++ b/scan/sane/hpaio.c 2020-10-04 13:26:34.665244052 +0200
@@ -36,7 +36,9 @@
#include <string.h>
#include <cups/cups.h>
#include "hpmud.h"
+#ifdef HAVE_LIBNETSNMP
#include "avahiDiscovery.h"
+#endif
#include "hp_ipp.h"
#include "soap.h"
#include "soapht.h"

146
gnu/packages/patches/knot-resolver-fix-map-command-on-32-bit.patch
View file

@ -1,146 +0,0 @@
commit e01979620025666633250b3e2d545fe59c629f73
Author: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Fri Nov 13 14:16:32 2020 +0100
fix map() command on 32-bit platforms; regressed in 5.2.0
LuaJIT FFI was using opendir() (etc.) variants with 32-bit inodes
but the C parts was using them as 64-bit inode variants.
Consequently the `struct dirent` layout didn't match and we were getting
filenames shifted by eight bytes.
Now the whole dir-listing lua function is written in C.
diff --git a/.luacheckrc b/.luacheckrc
index 0cf0b884..67bc18f6 100644
--- a/.luacheckrc
+++ b/.luacheckrc
@@ -20,6 +20,7 @@ new_read_globals = {
'user',
'verbose',
'worker',
+ 'kluautil_list_dir',
-- Sandbox declarations
'kB',
'MB',
diff --git a/NEWS b/NEWS
index 2eae3082..9d8cde99 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,10 @@
Knot Resolver X.Y.X (yyyy-mm-dd)
================================
+Bugfixes
+--------
+- fix map() command on 32-bit platforms; regressed in 5.2.0 (!1093)
+
Knot Resolver 5.2.0 (2020-11-11)
================================
diff --git a/daemon/bindings/impl.c b/daemon/bindings/impl.c
index d10f4525..d9ad0774 100644
--- a/daemon/bindings/impl.c
+++ b/daemon/bindings/impl.c
@@ -2,6 +2,7 @@
* SPDX-License-Identifier: GPL-3.0-or-later
*/
+#include <dirent.h>
#include <lua.h>
#include <lauxlib.h>
#include <string.h>
@@ -29,6 +30,29 @@ const char * lua_table_checkindices(lua_State *L, const char *keys[])
return NULL;
}
+/** Return table listing filenames in a given directory (ls -A). */
+static int kluautil_list_dir(lua_State *L)
+{
+ lua_newtable(L); // empty table even on errors
+
+ const char *path = lua_tolstring(L, 1, NULL);
+ if (!path) return 1;
+ DIR *dir = opendir(path);
+ if (!dir) return 1;
+
+ struct dirent *entry;
+ int lua_i = 1;
+ while ((entry = readdir(dir)) != NULL) {
+ if (strcmp(entry->d_name, ".") && strcmp(entry->d_name, "..")) {
+ lua_pushstring(L, entry->d_name);
+ lua_rawseti(L, -2, lua_i++);
+ }
+ }
+
+ closedir(dir);
+ return 1;
+}
+
/* Each of these just creates the correspondingly named lua table of functions. */
int kr_bindings_cache (lua_State *L); /* ./cache.c */
@@ -44,6 +68,9 @@ void kr_bindings_register(lua_State *L)
kr_bindings_modules(L);
kr_bindings_net(L);
kr_bindings_worker(L);
+
+ /* Finally some lua utils *written in C*, not really a binding. */
+ lua_register(L, "kluautil_list_dir", kluautil_list_dir);
}
void lua_error_p(lua_State *L, const char *fmt, ...)
diff --git a/daemon/lua/kluautil.lua b/daemon/lua/kluautil.lua
index 57912e7b..e73e952c 100644
--- a/daemon/lua/kluautil.lua
+++ b/daemon/lua/kluautil.lua
@@ -1,6 +1,5 @@
-- SPDX-License-Identifier: GPL-3.0-or-later
-local ffi = require('ffi')
local kluautil = {}
-- Get length of table
@@ -28,14 +27,6 @@ function kluautil.kr_table_unpack(tab)
return unpack(tab, 1, tab.n)
end
-ffi.cdef([[
- typedef struct __dirstream DIR;
- DIR *opendir(const char *name);
- struct dirent *readdir(DIR *dirp);
- int closedir(DIR *dirp);
- char *strerror(int errnum);
-]])
-
-- Fetch over HTTPS
function kluautil.kr_https_fetch(url, out_file, ca_file)
local http_ok, http_request = pcall(require, 'http.request')
@@ -88,26 +79,6 @@ function kluautil.kr_https_fetch(url, out_file, ca_file)
return true
end
--- List directory
-function kluautil.list_dir (path)
- local results = {}
- local dir = ffi.C.opendir(path)
- if dir == nil then
- return results
- end
-
- local entry = ffi.C.readdir(dir)
- while entry ~= nil do
- local entry_name = ffi.string(ffi.C.kr_dirent_name(entry))
- if entry_name ~= '.' and entry_name ~= '..' then
- table.insert(results, entry_name)
- end
- entry = ffi.C.readdir(dir)
- end
-
- ffi.C.closedir(dir)
-
- return results
-end
+kluautil.list_dir = kluautil_list_dir
return kluautil

126
gnu/packages/patches/libssh2-CVE-2019-17498.patch Normal file
View file

@ -0,0 +1,126 @@
https://github.com/libssh2/libssh2/commit/dedcbd106f8e52d5586b0205bc7677e4c9868f9c.patch
From dedcbd106f8e52d5586b0205bc7677e4c9868f9c Mon Sep 17 00:00:00 2001
From: Will Cosgrove <will@panic.com>
Date: Fri, 30 Aug 2019 09:57:38 -0700
Subject: [PATCH] packet.c: improve message parsing (#402)
* packet.c: improve parsing of packets
file: packet.c
notes:
Use _libssh2_get_string API in SSH_MSG_DEBUG/SSH_MSG_DISCONNECT. Additional uint32 bounds check in SSH_MSG_GLOBAL_REQUEST.
---
src/packet.c | 68 ++++++++++++++++++++++------------------------------
1 file changed, 29 insertions(+), 39 deletions(-)
diff --git a/src/packet.c b/src/packet.c
index 38ab62944..2e01bfc5d 100644
--- a/src/packet.c
+++ b/src/packet.c
@@ -419,8 +419,8 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data,
size_t datalen, int macstate)
{
int rc = 0;
- char *message = NULL;
- char *language = NULL;
+ unsigned char *message = NULL;
+ unsigned char *language = NULL;
size_t message_len = 0;
size_t language_len = 0;
LIBSSH2_CHANNEL *channelp = NULL;
@@ -472,33 +472,23 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data,
case SSH_MSG_DISCONNECT:
if(datalen >= 5) {
- size_t reason = _libssh2_ntohu32(data + 1);
+ uint32_t reason = 0;
+ struct string_buf buf;
+ buf.data = (unsigned char *)data;
+ buf.dataptr = buf.data;
+ buf.len = datalen;
+ buf.dataptr++; /* advance past type */
- if(datalen >= 9) {
- message_len = _libssh2_ntohu32(data + 5);
+ _libssh2_get_u32(&buf, &reason);
+ _libssh2_get_string(&buf, &message, &message_len);
+ _libssh2_get_string(&buf, &language, &language_len);
- if(message_len < datalen-13) {
- /* 9 = packet_type(1) + reason(4) + message_len(4) */
- message = (char *) data + 9;
-
- language_len =
- _libssh2_ntohu32(data + 9 + message_len);
- language = (char *) data + 9 + message_len + 4;
-
- if(language_len > (datalen-13-message_len)) {
- /* bad input, clear info */
- language = message = NULL;
- language_len = message_len = 0;
- }
- }
- else
- /* bad size, clear it */
- message_len = 0;
- }
if(session->ssh_msg_disconnect) {
- LIBSSH2_DISCONNECT(session, reason, message,
- message_len, language, language_len);
+ LIBSSH2_DISCONNECT(session, reason, (const char *)message,
+ message_len, (const char *)language,
+ language_len);
}
+
_libssh2_debug(session, LIBSSH2_TRACE_TRANS,
"Disconnect(%d): %s(%s)", reason,
message, language);
@@ -539,24 +529,24 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data,
int always_display = data[1];
if(datalen >= 6) {
- message_len = _libssh2_ntohu32(data + 2);
-
- if(message_len <= (datalen - 10)) {
- /* 6 = packet_type(1) + display(1) + message_len(4) */
- message = (char *) data + 6;
- language_len = _libssh2_ntohu32(data + 6 +
- message_len);
-
- if(language_len <= (datalen - 10 - message_len))
- language = (char *) data + 10 + message_len;
- }
+ struct string_buf buf;
+ buf.data = (unsigned char *)data;
+ buf.dataptr = buf.data;
+ buf.len = datalen;
+ buf.dataptr += 2; /* advance past type & always display */
+
+ _libssh2_get_string(&buf, &message, &message_len);
+ _libssh2_get_string(&buf, &language, &language_len);
}
if(session->ssh_msg_debug) {
- LIBSSH2_DEBUG(session, always_display, message,
- message_len, language, language_len);
+ LIBSSH2_DEBUG(session, always_display,
+ (const char *)message,
+ message_len, (const char *)language,
+ language_len);
}
}
+
/*
* _libssh2_debug will actually truncate this for us so
* that it's not an inordinate about of data
@@ -579,7 +569,7 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data,
uint32_t len = 0;
unsigned char want_reply = 0;
len = _libssh2_ntohu32(data + 1);
- if(datalen >= (6 + len)) {
+ if((len <= (UINT_MAX - 6)) && (datalen >= (6 + len))) {
want_reply = data[5 + len];
_libssh2_debug(session,
LIBSSH2_TRACE_CONN,

52
gnu/packages/patches/minimap2-aarch64-support.patch Normal file
View file

@ -0,0 +1,52 @@
This patch should be removed with the next release. There is WIP upstream
support for proper support of more architectures, including aarch64 and powerpc64le.
diff --git a/Makefile b/Makefile
index ed341f6..94dbd85 100644
--- a/Makefile
+++ b/Makefile
@@ -6,20 +6,18 @@ PROG= minimap2
PROG_EXTRA= sdust minimap2-lite
LIBS= -lm -lz -lpthread
-ifeq ($(arm_neon),) # if arm_neon is not defined
-ifeq ($(sse2only),) # if sse2only is not defined
- OBJS+=ksw2_extz2_sse41.o ksw2_extd2_sse41.o ksw2_exts2_sse41.o ksw2_extz2_sse2.o ksw2_extd2_sse2.o ksw2_exts2_sse2.o ksw2_dispatch.o
-else # if sse2only is defined
- OBJS+=ksw2_extz2_sse.o ksw2_extd2_sse.o ksw2_exts2_sse.o
-endif
-else # if arm_neon is defined
+ifneq ($(arm_neon),) # if arm_neon is defined
OBJS+=ksw2_extz2_neon.o ksw2_extd2_neon.o ksw2_exts2_neon.o
- INCLUDES+=-Isse2neon
-ifeq ($(aarch64),) #if aarch64 is not defined
CFLAGS+=-D_FILE_OFFSET_BITS=64 -mfpu=neon -fsigned-char
-else #if aarch64 is defined
+ INCLUDES+=-Isse2neon
+else ifneq ($(aarch64),) #if aarch64 is defined
+ OBJS+=ksw2_extz2_neon.o ksw2_extd2_neon.o ksw2_exts2_neon.o
CFLAGS+=-D_FILE_OFFSET_BITS=64 -fsigned-char
-endif
+ INCLUDES+=-Isse2neon
+else ifneq ($(sse2only),) # if sse2only is defined
+ OBJS+=ksw2_extz2_sse.o ksw2_extd2_sse.o ksw2_exts2_sse.o
+else # none of the above
+ OBJS+=ksw2_extz2_sse41.o ksw2_extd2_sse41.o ksw2_exts2_sse41.o ksw2_extz2_sse2.o ksw2_extd2_sse2.o ksw2_exts2_sse2.o ksw2_dispatch.o
endif
.PHONY:all extra clean depend
@@ -46,9 +44,12 @@ sdust:sdust.c kalloc.o kalloc.h kdq.h kvec.h kseq.h ketopt.h sdust.h
# SSE-specific targets on x86/x86_64
-ifeq ($(arm_neon),) # if arm_neon is defined, compile this target with the default setting (i.e. no -msse2)
+ifneq ($(arm_neon),) # if arm_neon is defined, compile this target with the default setting (i.e. no -msse2)
+ksw2_ll_sse.o:ksw2_ll_sse.c ksw2.h kalloc.h
+else ifneq ($(aarch64),)
ksw2_ll_sse.o:ksw2_ll_sse.c ksw2.h kalloc.h
- $(CC) -c $(CFLAGS) -msse2 $(CPPFLAGS) $(INCLUDES) $< -o $@
+else
+ $(CC) -c $(CFLAGS) -msse2 $(CPPFLAGS) $(INCLUDES) $< -o $@
endif
ksw2_extz2_sse41.o:ksw2_extz2_sse.c ksw2.h kalloc.h

51
gnu/packages/patches/pam-mount-luks2-support.patch
View file

@ -1,51 +0,0 @@
From d4434c05e7c0cf05d87089404cfa2deedc60811a Mon Sep 17 00:00:00 2001
From: Ingo Franzki <ifranzki@linux.ibm.com>
Date: Mon, 29 Oct 2018 16:47:40 +0100
Subject: [PATCH] crypto: Add support for LUKS2
Cryptsetup version 2.0 added support for LUKS2.
This patch adds support for mounting LUKS2 volumes with
pam_mount.
Signed-off-by: Ingo Franzki <ifranzki@linux.ibm.com>
---
src/crypto-dmc.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/crypto-dmc.c b/src/crypto-dmc.c
index d0ab6ca..abd0358 100644
--- a/src/crypto-dmc.c
+++ b/src/crypto-dmc.c
@@ -21,6 +21,12 @@
#include "libcryptmount.h"
#include "pam_mount.h"
+#ifndef CRYPT_LUKS
+ #define CRYPT_LUKS NULL /* Passing NULL to crypt_load will
+ default to LUKS(1) on older
+ libcryptsetup versions. */
+#endif
+
/**
* dmc_is_luks - check if @path points to a LUKS volume (cf. normal dm-crypt)
* @path: path to the crypto container
@@ -48,7 +54,7 @@ EXPORT_SYMBOL int ehd_is_luks(const char *path, bool blkdev)
ret = crypt_init(&cd, device);
if (ret == 0) {
- ret = crypt_load(cd, CRYPT_LUKS1, NULL);
+ ret = crypt_load(cd, CRYPT_LUKS, NULL);
if (ret == -EINVAL)
ret = false;
else if (ret == 0)
@@ -106,7 +112,7 @@ static bool dmc_run(const struct ehd_mount_request *req,
#endif
}
- ret = crypt_load(cd, CRYPT_LUKS1, NULL);
+ ret = crypt_load(cd, CRYPT_LUKS, NULL);
if (ret == 0) {
ret = crypt_activate_by_passphrase(cd, mt->crypto_name,
CRYPT_ANY_SLOT, req->key_data, req->key_size, flags);
--
2.21.0

23
gnu/packages/patches/pciutils-hurd-fix.patch Normal file
View file

@ -0,0 +1,23 @@
Fix a build error on GNU/Hurd for pciutils 3.7.0.
commit 053cf6c8b2acafadf828912828336d90fe9b8696
Author: Martin Mares <mj@ucw.cz>
Date: Sun May 31 11:53:28 2020 +0200
HURD backend should compile again
Fixes a bug introduced by commit 82c06b47dea5a38075ce9d56f743360bc47b4c78.
diff --git a/lib/hurd.c b/lib/hurd.c
index 7b3b2ae..ccd92f6 100644
--- a/lib/hurd.c
+++ b/lib/hurd.c
@@ -307,7 +307,6 @@ hurd_fill_regions(struct pci_dev *d)
d->base_addr[i] |= regions[i].is_64 << 2;
d->base_addr[i] |= regions[i].is_prefetchable << 3;
- if (flags & PCI_FILL_SIZES)
- d->size[i] = regions[i].size;
+ d->size[i] = regions[i].size;
}
}

47
gnu/packages/patches/python-CVE-2020-26116.patch Normal file
View file

@ -0,0 +1,47 @@
Fix CVE-2020-26116:
https://cve.circl.lu/cve/CVE-2020-26116
https://bugs.python.org/issue39603
Taken from upstream (sans test and NEWS update):
https://github.com/python/cpython/commit/668d321476d974c4f51476b33aaca870272523bf
diff --git a/Lib/http/client.py b/Lib/http/client.py
--- a/Lib/http/client.py
+++ b/Lib/http/client.py
@@ -147,6 +147,10 @@
# _is_allowed_url_pchars_re = re.compile(r"^[/!$&'()*+,;=:@%a-zA-Z0-9._~-]+$")
# We are more lenient for assumed real world compatibility purposes.
+# These characters are not allowed within HTTP method names
+# to prevent http header injection.
+_contains_disallowed_method_pchar_re = re.compile('[\x00-\x1f]')
+
# We always set the Content-Length header for these methods because some
# servers will otherwise respond with a 411
_METHODS_EXPECTING_BODY = {'PATCH', 'POST', 'PUT'}
@@ -1087,6 +1091,8 @@ def putrequest(self, method, url, skip_host=False,
else:
raise CannotSendRequest(self.__state)
+ self._validate_method(method)
+
# Save the method for use later in the response phase
self._method = method
@@ -1177,6 +1183,15 @@ def _encode_request(self, request):
# ASCII also helps prevent CVE-2019-9740.
return request.encode('ascii')
+ def _validate_method(self, method):
+ """Validate a method name for putrequest."""
+ # prevent http header injection
+ match = _contains_disallowed_method_pchar_re.search(method)
+ if match:
+ raise ValueError(
+ f"method can't contain control characters. {method!r} "
+ f"(found at least {match.group()!r})")
+
def _validate_path(self, url):
"""Validate a url for putrequest."""
# Prevent CVE-2019-9740.

52
gnu/packages/patches/renpy-use-system-fribidi.patch Normal file
View file

@ -0,0 +1,52 @@
See also [Arch] and [Gentoo] for similar patches in other distros.
[Arch] https://github.com/archlinux/svntogit-community/blob/packages/renpy/trunk/renpy-system-fribidi.patch
[Gentoo] https://gitweb.gentoo.org/repo/gentoo.git/tree/games-engines/renpy/files/renpy-7.3.5-use-system-fribidi.patch
Index: renpy-7.3.5-source/module/renpybidicore.c
===================================================================
--- renpy-7.3.5-source.orig/module/renpybidicore.c
+++ renpy-7.3.5-source/module/renpybidicore.c
@@ -1,5 +1,5 @@
#include <Python.h>
-#include <fribidi-src/lib/fribidi.h>
+#include <fribidi.h>
#include <stdlib.h>
#ifndef alloca
Index: renpy-7.3.5-source/module/setup.py
===================================================================
--- renpy-7.3.5-source.orig/module/setup.py
+++ renpy-7.3.5-source/module/setup.py
@@ -119,30 +119,13 @@ cython(
sdl + [ png, 'z', 'm' ])
FRIBIDI_SOURCES = """
-fribidi-src/lib/fribidi.c
-fribidi-src/lib/fribidi-arabic.c
-fribidi-src/lib/fribidi-bidi.c
-fribidi-src/lib/fribidi-bidi-types.c
-fribidi-src/lib/fribidi-deprecated.c
-fribidi-src/lib/fribidi-joining.c
-fribidi-src/lib/fribidi-joining-types.c
-fribidi-src/lib/fribidi-mem.c
-fribidi-src/lib/fribidi-mirroring.c
-fribidi-src/lib/fribidi-run.c
-fribidi-src/lib/fribidi-shape.c
renpybidicore.c
""".split()
cython(
"_renpybidi",
FRIBIDI_SOURCES,
- includes=[
- BASE + "/fribidi-src/",
- BASE + "/fribidi-src/lib/",
- ],
- define_macros=[
- ("FRIBIDI_ENTRY", ""),
- ("HAVE_CONFIG_H", "1"),
- ])
+ includes=["/usr/include/fribidi"],
+ libs=["fribidi"])
cython("_renpysteam", language="c++", compile_if=steam_sdk, libs=["steam_api"])

13
gnu/packages/patches/sbcl-geco-fix-organism-class.patch
View file

@ -1,13 +0,0 @@
Fix the ORGANISM class so that SBCL >= 2.0.9 can compile it without error.
--- a/classes.lisp 2020-10-28 12:11:10.725659464 +0100
+++ b/classes.lisp 2020-10-31 17:34:36.822752447 +0100
@@ -148,7 +148,7 @@
:accessor score
:initarg :score
:initform 'nil
- :type number)
+ :type (or number null))
(NORMALIZED-SCORE
:accessor normalized-score
:initarg :normalized-score

15
gnu/packages/pciutils.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2015, 2017 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2015, 2017, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
@ -92,7 +92,15 @@
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
;; Install the commands, library, and .pc files.
(invoke "make" "install" "install-lib"))))
(invoke "make" "install" "install-lib")))
,@(if (hurd-target?)
'((add-after 'unpack 'apply-hurd-patch
(lambda* (#:key inputs #:allow-other-keys)
(let ((patch (assoc-ref inputs "hurd-patch")))
(invoke "patch" "-p1" "--batch" "-i"
patch)))))
'()))
;; Make sure programs have an RPATH so they can find libpciutils.so.
#:make-flags (list (string-append "LDFLAGS=-Wl,-rpath="
@ -109,6 +117,9 @@
(package-supported-systems kmod))
`(("kmod" ,kmod))
'())
,@(if (hurd-target?)
`(("hurd-patch" ,(search-patch "pciutils-hurd-fix.patch")))
'())
("zlib" ,zlib)))
(home-page "https://mj.ucw.cz/sw/pciutils/")
(synopsis "Programs for inspecting and manipulating PCI devices")

4
gnu/packages/python-web.scm
View file

@ -4989,7 +4989,7 @@ Some things HTTP Core does do:
(define-public python-httpx
(package
(name "python-httpx")
(version "0.15.4")
(version "0.16.1")
(source
(origin
;; PyPI tarball does not contain tests.
@ -4999,7 +4999,7 @@ Some things HTTP Core does do:
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1qr91xw6jxynvihmw953bi5446ssm9ffmb2c4nhfa77v7883sp21"))))
(base32 "00gmq45fckcqkj910bvd7pyqz1mvgsdvz4s0k7dzbnc5czzq1f4a"))))
(build-system python-build-system)
(arguments
`(#:phases

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

@ -719,18 +719,6 @@ etc. ")
(define-public python2-babel
(package-with-python2 python-babel))
;; Sphinx < 2.0 requires this version. Remove once no longer needed.
(define-public python2-babel-2.6
(package
(inherit python2-babel)
(version "2.6.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "Babel" version))
(sha256
(base32
"08rxmbx2s4irp0w0gmn498vns5xy0fagm0fg33xa772jiks51flc"))))))
(define-public python2-backport-ssl-match-hostname
(package
(name "python2-backport-ssl-match-hostname")
@ -2184,14 +2172,14 @@ backported for previous versions of Python from 2.4 to 3.3.")
(define-public python-parse
(package
(name "python-parse")
(version "1.8.4")
(version "1.18.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "parse" version))
(sha256
(base32
"0f8997xr8nq2nq35iiviq8ningd1zvy59fg503xfpbi2dwhgdkf3"))))
"19063x4xdjpaf7rfxai6jpgm2k4yvkq7wha8aa8cagbjsqr60rli"))))
(build-system python-build-system)
(arguments
`(#:phases
@ -8813,13 +8801,13 @@ third-party code.")
(define-public python-llfuse
(package
(name "python-llfuse")
(version "1.3.6")
(version "1.3.8")
(source (origin
(method url-fetch)
(uri (pypi-uri "llfuse" version ".tar.bz2"))
(uri (pypi-uri "llfuse" version))
(sha256
(base32
"1j9fzxpgmb4rxxyl9jcf84zvznhgi3hnh4hg5vb0qaslxkvng8ii"))))
"1g2cdhdqrb6m7655qp61pn61pwj1ql61cdzhr2jvl3w4i8877ddr"))))
(build-system python-build-system)
(inputs
`(("fuse" ,fuse)
@ -8838,22 +8826,6 @@ third-party code.")
(strip-python2-variant python-llfuse)))
(propagated-inputs `(("python2-contextlib2" ,python2-contextlib2)))))
;; For attic-0.16
(define-public python-llfuse-0.41
(package (inherit python-llfuse)
(version "0.41.1")
(source (origin
(method url-fetch)
(uri (string-append
"https://bitbucket.org/nikratio/python-llfuse/downloads/"
"llfuse-" version ".tar.bz2"))
(sha256
(base32
"1imlqw9b73086y97izr036f58pgc5akv4ihc2rrf8j5h75jbrlaa"))))
;; Python-LLFUSE < 0.42 includes underscore.js, which is MIT (expat)
;; licensed. The rest of the package is licensed under LGPL2.0 or later.
(license (list license:expat license:lgpl2.0+))))
(define-public python-msgpack
(package
(name "python-msgpack")

1
gnu/packages/python.scm
View file

@ -370,6 +370,7 @@ data types.")
(uri (string-append "https://www.python.org/ftp/python/"
version "/Python-" version ".tar.xz"))
(patches (search-patches
"python-CVE-2020-26116.patch"
"python-3-fix-tests.patch"
"python-3.8-fix-tests.patch"
"python-3-deterministic-build-info.patch"

4
gnu/packages/ruby.scm
View file

@ -228,7 +228,7 @@ a focus on simplicity and productivity.")
(define-public mruby
(package
(name "mruby")
(version "2.0.0")
(version "2.1.2")
(source
(origin
(method git-fetch)
@ -238,7 +238,7 @@ a focus on simplicity and productivity.")
(file-name (git-file-name name version))
(sha256
(base32
"1r6w1asjshff43ymdwa6xmrkggza99mi2kw88k7ic6ag2j81hcj5"))))
"0fhfv8pi7i8jn2vgk2n2rjnbnfa12nhj514v8i4k353n7q4pmkh3"))))
(build-system gnu-build-system)
(arguments
`(#:test-target "test"

5
gnu/packages/ssh.scm
View file

@ -2,7 +2,7 @@
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013, 2014 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015, 2016, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2015, 2016, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2019 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
@ -165,7 +165,8 @@ applications.")
version ".tar.gz"))
(sha256
(base32
"1zfsz9nldakfz61d2j70pk29zlmj7w2vv46s9l3x2prhcgaqpyym"))))
"1zfsz9nldakfz61d2j70pk29zlmj7w2vv46s9l3x2prhcgaqpyym"))
(patches (search-patches "libssh2-CVE-2019-17498.patch"))))
(build-system gnu-build-system)
;; The installed libssh2.pc file does not include paths to libgcrypt and
;; zlib libraries, so we need to propagate the inputs.

92
gnu/packages/statistics.scm
View file

@ -503,14 +503,14 @@ Hubert, based on Kaufman and Rousseeuw (1990) \"Finding Groups in Data\".")
(define-public r-codetools
(package
(name "r-codetools")
(version "0.2-16")
(version "0.2-18")
(source
(origin
(method url-fetch)
(uri (cran-uri "codetools" version))
(sha256
(base32
"00bmhzqprqfn3w6ghx7sakai6s7il8gbksfiawj8in5mbhbncypn"))))
"0a2c115glq8jxixwfigrpvjabhxchn9r4mc40y41dg9dg6wsd7hs"))))
(build-system r-build-system)
(home-page "https://cran.r-project.org/web/packages/codetools")
(synopsis "Code analysis tools for R")
@ -889,14 +889,18 @@ algorithms.")
(define-public r-magrittr
(package
(name "r-magrittr")
(version "1.5")
(version "2.0.1")
(source
(origin
(method url-fetch)
(uri (cran-uri "magrittr" version))
(sha256
(base32 "1s1ar6rag8m277qcqmdp02gn4awn9bdj9ax0r8s32i59mm1mki05"))))
(base32 "0pxd99fvg406whqsk9wh756rayrwh84xn3h44zmlpcy23kanbhkm"))))
(build-system r-build-system)
;; knitr needs magrittr
#;
(native-inputs
`(("r-knitr" ,r-knitr)))
(home-page "https://cran.r-project.org/web/packages/magrittr/index.html")
(synopsis "A forward-pipe operator for R")
(description
@ -1579,26 +1583,36 @@ R packages that praise their users.")
(define-public r-testthat
(package
(name "r-testthat")
(version "2.3.2")
(version "3.0.0")
(source (origin
(method url-fetch)
(uri (cran-uri "testthat" version))
(sha256
(base32
"0v70v2fs0f2ir962z9csbjlj8snrq9mbjfyhhb9dhz3zy26qs9hs"))))
"069ixg03r1s85my9dbc9c1261i4gz8fc1mv67whi2l6kpbp4cjzh"))))
(build-system r-build-system)
(propagated-inputs
`(("r-cli" ,r-cli)
`(("r-brio" ,r-brio)
("r-callr" ,r-callr)
("r-cli" ,r-cli)
("r-crayon" ,r-crayon)
("r-desc" ,r-desc)
("r-digest" ,r-digest)
("r-ellipsis" ,r-ellipsis)
("r-evaluate" ,r-evaluate)
("r-jsonlite" ,r-jsonlite)
("r-lifecycle" ,r-lifecycle)
("r-magrittr" ,r-magrittr)
("r-pkgload" ,r-pkgload)
("r-praise" ,r-praise)
("r-processx" ,r-processx)
("r-ps" ,r-ps)
("r-r6" ,r-r6)
("r-rlang" ,r-rlang)
("r-waldo" ,r-waldo)
("r-withr" ,r-withr)))
(native-inputs
`(("r-knitr" ,r-knitr)))
(home-page "https://github.com/hadley/testthat")
(synopsis "Unit testing for R")
(description
@ -1631,13 +1645,13 @@ defined in different packages.")
(define-public r-rlang
(package
(name "r-rlang")
(version "0.4.8")
(version "0.4.9")
(source (origin
(method url-fetch)
(uri (cran-uri "rlang" version))
(sha256
(base32
"0z8hnwbzpwal66svwp04csjm49vdb9rmwzvn8hyqn93qy6pd9015"))))
"0qix6jigz3qqjx151fpv1k5hq2miqyakvm3jql2qqsyr9d1028yr"))))
(build-system r-build-system)
(home-page "http://rlang.tidyverse.org")
(synopsis "Functions for base types, core R and Tidyverse features")
@ -1717,14 +1731,14 @@ database.")
(define-public r-dbplyr
(package
(name "r-dbplyr")
(version "1.4.4")
(version "2.0.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "dbplyr" version))
(sha256
(base32
"1v0p0557n6bz84nq9jc4182k00mdd1hvz7h4w3bbg81z0fmpj0d8"))))
"0sa0ggirvfn8j9y4cvhj04z93h6979jm4knjzahdvyzyxhv1kmzc"))))
(build-system r-build-system)
(propagated-inputs
`(("r-assertthat" ,r-assertthat)
@ -1738,7 +1752,8 @@ database.")
("r-r6" ,r-r6)
("r-rlang" ,r-rlang)
("r-tibble" ,r-tibble)
("r-tidyselect" ,r-tidyselect)))
("r-tidyselect" ,r-tidyselect)
("r-withr" ,r-withr)))
(native-inputs
`(("r-knitr" ,r-knitr)))
(home-page "https://github.com/tidyverse/dbplyr")
@ -1835,13 +1850,13 @@ times.")
(define-public r-data-table
(package
(name "r-data-table")
(version "1.13.2")
(version "1.13.4")
(source (origin
(method url-fetch)
(uri (cran-uri "data.table" version))
(sha256
(base32
"011qsjfybvlpy2sjn9b6hfkcgwx2xrnpxlaqq3y3baps8n1lgnr7"))))
"0jrvl5b8qbzmiymhjgbj4l2nai87ijvv33aw24xvzjx0rkys9dv1"))))
(build-system r-build-system)
(inputs
`(("zlib" ,zlib)))
@ -2110,14 +2125,14 @@ limited to R.")
(define-public r-backports
(package
(name "r-backports")
(version "1.1.10")
(version "1.2.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "backports" version))
(sha256
(base32
"1pq16bf40zx441ylmqqqilj3xp39r707h56kwqp5yqklq9yln2z1"))))
"1xgp4i6yxkh2viia96hlf004hn47yrhfivwf8wv63xdldqa8yj9v"))))
(build-system r-build-system)
(home-page "https://cran.r-project.org/web/packages/backports")
(synopsis "Reimplementations of functions introduced since R 3.0.0")
@ -2418,14 +2433,16 @@ pure C implementation of the Git core methods.")
(define-public r-rstudioapi
(package
(name "r-rstudioapi")
(version "0.11")
(version "0.13")
(source (origin
(method url-fetch)
(uri (cran-uri "rstudioapi" version))
(sha256
(base32
"0srh0m4mw4k6s7spwb84l4cx4xnn04cp5cjxi0fwza7bwavpzq0k"))))
"12vdfzzjc6mv4h105l8cp108j3hjk0mqmg23m6mqr3jarfymphxa"))))
(build-system r-build-system)
(native-inputs
`(("r-knitr" ,r-knitr)))
(home-page "https://cran.r-project.org/web/packages/rstudioapi")
(synopsis "Safely access the RStudio API")
(description
@ -2613,13 +2630,13 @@ well as additional utilities such as panel and axis annotation functions.")
(define-public r-rcpparmadillo
(package
(name "r-rcpparmadillo")
(version "0.10.1.0.0")
(version "0.10.1.2.0")
(source (origin
(method url-fetch)
(uri (cran-uri "RcppArmadillo" version))
(sha256
(base32
"0m0f4viw3r6zfk85b7v7h5dqydhdkjdacpl0bqxkmcndlzq8jnsb"))))
"0nzi6plhdijx3khavmywzw9wbch0hj8kygphw35wdlslm4cnqcj1"))))
(properties `((upstream-name . "RcppArmadillo")))
(build-system r-build-system)
(propagated-inputs
@ -2682,17 +2699,17 @@ encoder/decoder, round-off-error-free sum and cumsum, etc.")
(define-public r-rprojroot
(package
(name "r-rprojroot")
(version "1.3-2")
(version "2.0.2")
(source
(origin
(method url-fetch)
(uri (cran-uri "rprojroot" version))
(sha256
(base32
"12r3fdxmi2pmwn6ic3rhg0b20ll5z420m0d8fziv1n21961namnz"))))
"07wy07yhms8zln9qb0iwx69dq08h4lrdi8kavjcplfxcskq638az"))))
(build-system r-build-system)
(propagated-inputs
`(("r-backports" ,r-backports)))
(native-inputs
`(("r-knitr" ,r-knitr)))
(home-page "https://github.com/krlmlr/rprojroot")
(synopsis "Finding files in project subdirectories")
(description
@ -2723,7 +2740,8 @@ certain criterion, e.g., it contains a certain regular file.")
("r-tinytex" ,r-tinytex)
("r-xfun" ,r-xfun)
("r-yaml" ,r-yaml)
("pandoc" ,pandoc)))
("pandoc" ,pandoc)
("pandoc-citeproc" ,pandoc-citeproc)))
(native-inputs
`(("r-knitr" ,r-knitr)))
(home-page "https://rmarkdown.rstudio.com")
@ -4012,13 +4030,13 @@ package instead.")
(define-public r-hmisc
(package
(name "r-hmisc")
(version "4.4-1")
(version "4.4-2")
(source
(origin
(method url-fetch)
(uri (cran-uri "Hmisc" version))
(sha256
(base32 "0mm3r2kv0kgrhg7salk2hw0s37d4i2mghwk0l0qxaw2ny0w8w5z6"))))
(base32 "1j7vkckmahdh90ndcl646sjpxq82y4x55ngxqvkni22mv16wc2j9"))))
(properties `((upstream-name . "Hmisc")))
(build-system r-build-system)
(native-inputs
@ -4208,14 +4226,14 @@ including:
(define-public r-gplots
(package
(name "r-gplots")
(version "3.1.0")
(version "3.1.1")
(source
(origin
(method url-fetch)
(uri (cran-uri "gplots" version))
(sha256
(base32
"05rislwgaw6v5dmhcwyvc04hi1fgaxrpb61f66kx483px45w6f24"))))
"0f8khaymz383w2ksnk80d4kpnvgmdk37pbycpsnl2vabaz11kbpr"))))
(build-system r-build-system)
(propagated-inputs
`(("r-catools" ,r-catools)
@ -4700,14 +4718,14 @@ models, generalized linear models and model-based clustering.")
(define-public r-mclust
(package
(name "r-mclust")
(version "5.4.6")
(version "5.4.7")
(source
(origin
(method url-fetch)
(uri (cran-uri "mclust" version))
(sha256
(base32
"1z46qask09x3xpv0wzvhn09218vwyrip4f5jrhnx96khpwvczzyl"))))
"08scl72llpinfijiyx14yqvmx8lma9jvh8h92v9ynnzfr9kadxa5"))))
(build-system r-build-system)
(native-inputs
`(("gfortran" ,gfortran)
@ -4919,14 +4937,14 @@ of the points.")
(define-public r-fpc
(package
(name "r-fpc")
(version "2.2-8")
(version "2.2-9")
(source
(origin
(method url-fetch)
(uri (cran-uri "fpc" version))
(sha256
(base32
"07a125pji1flmybn6iidcnizwnqyl6chnrckxa5jp4qxxfdqx658"))))
"0f7sfmpcycr9y7cy5gasyjm2ardxa62kglqms92mcr68jrp01c19"))))
(build-system r-build-system)
(propagated-inputs
`(("r-class" ,r-class)
@ -5144,14 +5162,14 @@ algorithms.")
(define-public r-lme4
(package
(name "r-lme4")
(version "1.1-25")
(version "1.1-26")
(source
(origin
(method url-fetch)
(uri (cran-uri "lme4" version))
(sha256
(base32
"0vvjac7hnn5lfbyl92zi8qxyc8kkjcwsg94z0p2s2q311in4gnp4"))))
"0ls2krph4pfjn45vf9fn3ln3x98s85wxrkvm5pnxyx55n1pnsjrn"))))
(build-system r-build-system)
(propagated-inputs
`(("r-boot" ,r-boot)
@ -5480,14 +5498,14 @@ is supported.")
(define-public r-lubridate
(package
(name "r-lubridate")
(version "1.7.9")
(version "1.7.9.2")
(source
(origin
(method url-fetch)
(uri (cran-uri "lubridate" version))
(sha256
(base32
"0wnjzvfkrgp2hkr8g5r5vcgcxmsq8bhdmkzkk0m93wr3fgh5xyfb"))))
"0yfvlgksasmia7rsp83lsipjpgvlly5qkldcfxj68lfaz9l2sspf"))))
(build-system r-build-system)
(propagated-inputs
`(("r-generics" ,r-generics)

41
gnu/packages/text-editors.scm
View file

@ -11,6 +11,7 @@
;;; Copyright © 2019, 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020 Tom Zander <tomz@freedommail.ch>
;;; Copyright © 2020 Mark Meyer <mark@ofosos.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -62,6 +63,7 @@
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages qt)
#:use-module (gnu packages regex)
@ -1029,3 +1031,42 @@ files. It was originally developed on the Amiga 3000T.")
systems that displays its buffer(s) as a hex dump. The user interface is kept
similar to vi/ex.")
(license license:bsd-3)))
(define-public virtaal
(package
(name "virtaal")
(version "0.7.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/translate/Virtaal/"
version "/virtaal-" version ".tar.bz2"))
(sha256
(base32
"0cyimjp3191qlmw6n0ipqdr9xr0cq4f6dqvz4rl9q31h6l3kywf9"))))
(build-system python-build-system)
(arguments
`(#:python ,python-2
#:use-setuptools? #f
#:tests? #f ;; Failing tests
#:phases
(modify-phases %standard-phases
(add-before 'build 'configure
(lambda* (#:key outputs #:allow-other-keys)
;; Set data file path to absolute store path.
(substitute* "virtaal/common/pan_app.py"
(("file_discovery\\.get_abs_data_filename.*")
(string-append "os.path.join('"
(assoc-ref outputs "out")
"/share', *path_parts)"))))))))
(inputs
`(("python2-lxml" ,python2-lxml)
("python2-pygtk" ,python2-pygtk)
("python2-simplejson" ,python2-simplejson)
("python2-translate-toolkit" ,python2-translate-toolkit)
("python2-pycurl" ,python2-pycurl)))
(synopsis "Graphical translation tool")
(description "Virtaal is a powerful yet simple translation tool with an
uncluttered user interface. It supports a multitude of translation formats
provided by the Translate Toolkit, including XLIFF and PO.")
(home-page "https://virtaal.translatehouse.org/")
(license license:gpl2+)))

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