diff options
192 files changed, 6399 insertions, 2867 deletions
@@ -63,7 +63,8 @@ To do so: - Re-run the 'configure' script passing it the option '--localstatedir=/somewhere', where '/somewhere' is the 'localstatedir' value of the currently installed Guix (failing to do that would lead the - new Guix to consider the store to be empty!). + new Guix to consider the store to be empty!). We recommend to use the + value '/var'. - Run "make", "make check", and "make install". diff --git a/build-aux/run-system-tests.scm b/build-aux/run-system-tests.scm index 18f7393d81..b0cb3bd2bf 100644 --- a/build-aux/run-system-tests.scm +++ b/build-aux/run-system-tests.scm @@ -18,10 +18,15 @@ (define-module (run-system-tests) #:use-module (gnu tests) + #:use-module (gnu packages package-management) + #:use-module ((gnu ci) #:select (channel-instance->package)) #:use-module (guix store) #:use-module ((guix status) #:select (with-status-verbosity)) #:use-module (guix monads) + #:use-module (guix channels) #:use-module (guix derivations) + #:use-module ((guix git-download) #:select (git-predicate)) + #:use-module (guix utils) #:use-module (guix ui) #:use-module (srfi srfi-1) #:use-module (srfi srfi-34) @@ -46,28 +51,48 @@ lst) (lift1 reverse %store-monad)))) -(define (run-system-tests . args) - (define tests - ;; Honor the 'TESTS' environment variable so that one can select a subset - ;; of tests to run in the usual way: - ;; - ;; make check-system TESTS=installed-os +(define (tests-for-channel-instance instance) + "Return a list of tests for perform, using Guix from INSTANCE, a channel +instance." + ;; Honor the 'TESTS' environment variable so that one can select a subset + ;; of tests to run in the usual way: + ;; + ;; make check-system TESTS=installed-os + (parameterize ((current-guix-package + (channel-instance->package instance))) (match (getenv "TESTS") (#f (all-system-tests)) ((= string-tokenize (tests ...)) (filter (lambda (test) (member (system-test-name test) tests)) - (all-system-tests))))) + (all-system-tests)))))) + - (format (current-error-port) "Running ~a system tests...~%" - (length tests)) + +(define (run-system-tests . args) + (define source + (string-append (current-source-directory) "/..")) (with-store store (with-status-verbosity 2 (run-with-store store - (mlet* %store-monad ((drv (mapm %store-monad system-test-value tests)) + ;; Intern SOURCE so that 'build-from-source' in (guix channels) sees + ;; "fresh" file names and thus doesn't find itself loading .go files + ;; from ~/.cache/guile when it loads 'build-aux/build-self.scm'. + ;; XXX: It would be best to not do it upfront because we may need it. + (mlet* %store-monad ((source (interned-file source "guix-source" + #:recursive? #t + #:select? + (or (git-predicate source) + (const #t)))) + (instance -> (checkout->channel-instance source)) + (tests -> (tests-for-channel-instance instance)) + (drv (mapm %store-monad system-test-value tests)) (out -> (map derivation->output-path drv))) + (format (current-error-port) "Running ~a system tests...~%" + (length tests)) + (mbegin %store-monad (show-what-to-build* drv) (set-build-options* #:keep-going? #t #:keep-failed? #t diff --git a/config-daemon.ac b/config-daemon.ac index bf94815966..848e1e58da 100644 --- a/config-daemon.ac +++ b/config-daemon.ac @@ -115,9 +115,6 @@ if test "x$guix_build_daemon" = "xyes"; then dnl to do i686-linux builds on x86_64-linux machines. AC_CHECK_HEADERS([sys/personality.h]) - dnl Check for <linux/fs.h> (for immutable file support). - AC_CHECK_HEADERS([linux/fs.h]) - dnl Determine the appropriate default list of substitute URLs (GnuTLS dnl is required so we can default to 'https'.) guix_substitute_urls="https://ci.guix.gnu.org" diff --git a/configure.ac b/configure.ac index 689b28d984..69ab9a97b8 100644 --- a/configure.ac +++ b/configure.ac @@ -280,9 +280,14 @@ dnl Documentation translation. AM_MISSING_PROG([PO4A_TRANSLATE], [po4a-translate]) AM_MISSING_PROG([PO4A_UPDATEPO], [po4a-updatepo]) -dnl Emacs (optional), for 'etc/indent-package.el'. -AC_PATH_PROG([EMACS], [emacs], [/usr/bin/emacs]) -AC_SUBST([EMACS]) +dnl Emacs (optional), for 'etc/indent-code.el'. +AC_PATH_PROG([EMACS], [emacs]) +if test "x$EMACS" = x; then + AC_MSG_WARN([Please install GNU Emacs to use etc/indent-code.el.]) +else + AC_SUBST([EMACS]) + AC_CONFIG_FILES([etc/indent-code.el], [chmod +x etc/indent-code.el]) +fi case "$storedir" in /gnu/store) @@ -302,6 +307,5 @@ AC_CONFIG_FILES([Makefile AC_CONFIG_FILES([test-env:build-aux/test-env.in], [chmod +x test-env]) AC_CONFIG_FILES([pre-inst-env:build-aux/pre-inst-env.in], [chmod +x pre-inst-env]) -AC_CONFIG_FILES([etc/indent-code.el], [chmod +x etc/indent-code.el]) AC_OUTPUT diff --git a/doc/contributing.texi b/doc/contributing.texi index 655c8283e5..ee72b2f94d 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -94,7 +94,8 @@ more information. Then, run @command{./configure} as usual. Make sure to pass @code{--localstatedir=@var{directory}} where @var{directory} is the @code{localstatedir} value used by your current installation (@pxref{The -Store}, for information about this). +Store}, for information about this). We recommend to use the value +@code{/var}. Finally, you have to invoke @code{make check} to run tests (@pxref{Running the Test Suite}). If anything diff --git a/doc/guix.texi b/doc/guix.texi index f6dcb2ac63..ed88778016 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -66,6 +66,8 @@ Copyright @copyright{} 2019 Josh Holland@* Copyright @copyright{} 2019 Diego Nicola Barbato@* Copyright @copyright{} 2019 Ivan Petkov@* Copyright @copyright{} 2019 Jakob L. Kreuze@* +Copyright @copyright{} 2019 Kyle Andrews@* +Copyright @copyright{} 2019 Alex Griffin@* Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or @@ -791,8 +793,9 @@ When configuring Guix on a system that already has a Guix installation, be sure to specify the same state directory as the existing installation using the @code{--localstatedir} option of the @command{configure} script (@pxref{Directory Variables, @code{localstatedir},, standards, -GNU Coding Standards}). The @command{configure} script protects against -unintended misconfiguration of @var{localstatedir} so you do not +GNU Coding Standards}). Usually, this @var{localstatedir} option is +set to the value @file{/var}. The @command{configure} script protects +against unintended misconfiguration of @var{localstatedir} so you do not inadvertently corrupt your store (@pxref{The Store}). @node Running the Test Suite @@ -2110,7 +2113,7 @@ ifconfig -a @dots{} or, using the GNU/Linux-specific @command{ip} command: @example -ip a +ip address @end example @c https://cgit.freedesktop.org/systemd/systemd/tree/src/udev/udev-builtin-net_id.c#n20 @@ -2128,6 +2131,13 @@ To configure a wired network run the following command, substituting ifconfig @var{interface} up @end example +@noindent +@dots{} or, using the GNU/Linux-specific @command{ip} command: + +@example +ip link set @var{interface} up +@end example + @item Wireless connection @cindex wireless @cindex WiFi @@ -8310,6 +8320,11 @@ The returned source tarball is the result of applying any patches and code snippets specified in the package @code{origin} (@pxref{Defining Packages}). +Note that @command{guix build -S} compiles the sources only of the +specified packages. They do not include the sources of statically +linked dependencies and by themselves are insufficient for reproducing +the packages. + @item --sources Fetch and return the source of @var{package-or-derivation} and all their dependencies, recursively. This is a handy way to obtain a local copy @@ -9899,7 +9914,18 @@ The package dependency graph is largely architecture-independent, but there are some architecture-dependent bits that this option allows you to visualize. @end table +On top of that, @command{guix graph} supports all the usual package +transformation options (@pxref{Package Transformation Options}). This +makes it easy to view the effect of a graph-rewriting transformation +such as @option{--with-input}. For example, the command below outputs +the graph of @code{git} once @code{openssl} has been replaced by +@code{libressl} everywhere in the graph: +@example +guix graph git --with-input=openssl=libressl +@end example + +So many possibilities, so much fun! @node Invoking guix publish @section Invoking @command{guix publish} @@ -10107,7 +10133,7 @@ of the @code{operating-system} declaration (@pxref{guix-publish-service-type, @code{guix-publish-service-type}}). If you are instead running Guix on a ``foreign distro'', follow these -instructions:” +instructions: @itemize @item @@ -13953,6 +13979,52 @@ Package object of the Open vSwitch. @end table @end deftp +@defvr {Scheme Variable} pagekite-service-type +This is the service type for the @uref{https://pagekite.net, PageKite} service, +a tunneling solution for making localhost servers publicly visible, even from +behind NAT or restrictive firewalls. The value for this service type is a +@code{pagekite-configuration} record. + +Here's an example exposing the local HTTP and SSH daemons: + +@lisp +(service pagekite-service-type + (pagekite-configuration + (kites '("http:@@kitename:localhost:80:@@kitesecret" + "raw/22:@@kitename:localhost:22:@@kitesecret")) + (extra-file "/etc/pagekite.rc"))) +@end lisp +@end defvr + +@deftp {Data Type} pagekite-configuration +Data type representing the configuration of PageKite. + +@table @asis +@item @code{package} (default: @var{pagekite}) +Package object of PageKite. + +@item @code{kitename} (default: @code{#f}) +PageKite name for authenticating to the frontend server. + +@item @code{kitesecret} (default: @code{#f}) +Shared secret for authenticating to the frontend server. You should probably +put this inside @code{extra-file} instead. + +@item @code{frontend} (default: @code{#f}) +Connect to the named PageKite frontend server instead of the +@uref{https://pagekite.net,,pagekite.net} service. + +@item @code{kites} (default: @code{'("http:@@kitename:localhost:80:@@kitesecret")}) +List of service kites to use. Exposes HTTP on port 80 by default. The format +is @code{proto:kitename:host:port:secret}. + +@item @code{extra-file} (default: @code{#f}) +Extra configuration file to read, which you are expected to create manually. +Use this to add additional options and manage shared secrets out-of-band. + +@end table +@end deftp + @node X Window @subsection X Window @@ -15530,8 +15602,9 @@ notifications and ways to mount/unmount disks. Programs that talk to UDisks include the @command{udisksctl} command, part of UDisks, and GNOME Disks. @end deffn -@deffn {Scheme Procedure} colord-service [#:colord @var{colord}] -Return a service that runs @command{colord}, a system service with a D-Bus +@deffn {Scheme Variable} colord-service-type +This is the type of the service that runs @command{colord}, a system +service with a D-Bus interface to manage the color profiles of input and output devices such as screens and scanners. It is notably used by the GNOME Color Manager graphical tool. See @uref{https://www.freedesktop.org/software/colord/, the colord web @@ -19745,6 +19818,17 @@ use the size of the processors cache line. @item @code{server-names-hash-bucket-max-size} (default: @code{#f}) Maximum bucket size for the server names hash tables. +@item @code{modules} (default: @code{'()}) +List of nginx dynamic modules to load. This should be a list of file +names of loadable modules, as in this example: + +@lisp +(modules + (list + (file-append nginx-accept-language-module "\ +/etc/nginx/modules/ngx_http_accept_language_module.so"))) +@end lisp + @item @code{extra-content} (default: @code{""}) Extra content for the @code{http} block. Should be string or a string valued G-expression. @@ -21049,6 +21133,44 @@ The list of knot-zone-configuration used by this configuration. @end table @end deftp +@subsubheading Knot Resolver Service + +@deffn {Scheme Variable} knot-resolver-service-type +This this the type of the knot resolver service, whose value should be +an @code{knot-resolver-configuration} object as in this example: + +@lisp +(service knot-resolver-service-type + (knot-resolver-configuration + (kresd-config-file (plain-file "kresd.conf" " +net.listen('192.168.0.1', 5353) +user('knot-resolver', 'knot-resolver') +modules = @{ 'hints > iterate', 'stats', 'predict' @} +cache.size = 100 * MB +")))) +@end lisp + +For more information, refer its @url{https://knot-resolver.readthedocs.org/en/stable/daemon.html#configuration, manual}. +@end deffn + +@deftp {Data Type} knot-resolver-configuration +Data type representing the configuration of knot-resolver. + +@table @asis +@item @code{package} (default: @var{knot-resolver}) +Package object of the knot DNS resolver. + +@item @code{kresd-config-file} (default: %kresd.conf) +File-like object of the kresd configuration file to use, by default it +will listen on @code{127.0.0.1} and @code{::1}. + +@item @code{garbage-collection-interval} (default: 1000) +Number of milliseconds for @code{kres-cache-gc} to periodically trim the cache. + +@end table +@end deftp + + @subsubheading Dnsmasq Service @deffn {Scheme Variable} dnsmasq-service-type diff --git a/etc/news.scm b/etc/news.scm index 5bcd075057..b04e24a589 100644 --- a/etc/news.scm +++ b/etc/news.scm @@ -9,9 +9,33 @@ (channel-news (version 0) + (entry (commit "3e962e59d849e4300e447d94487684102d9d412e") + (title (en "@command{guix graph} now supports package +transformations") + (de "@command{guix graph} unterstützt nun Paketumwandlungen")) + (body + (en "The @command{guix graph} command now supports the common package +transformation options (see @command{info \"(guix) Package Transformation +Options\"}). This is useful in particular to see the effect of the +@option{--with-input} dependency graph rewriting option.") + (de "Der Befehl @command{guix graph} unterstützt nun die mit anderen +Befehlen gemeinsamen Umwandlungsoptionen (siehe @command{info \"(guix.de) +Paketumwandlungsoptionen\"}). Sie helfen insbesondere dabei, die Wirkung der +Befehlszeilenoption @option{--with-input} zum Umschreiben des +Abhängigkeitsgraphen zu sehen.") + (es "La orden @command{guix graph} ahora implementa las opciones +comunes de transformación de paquetes (véase @command{info \"(guix.es) +Opciones de transformación de paquetes\"}). Esto es particularmente +útil para comprobar el efecto de la opción de reescritura del grafo +de dependencias @option{--with-input}."))) + (entry (commit "49af34cfac89d384c46269bfd9388b2c73b1220a") (title (en "@command{guix pull} now honors @file{/etc/guix/channels.scm}") + (de "@command{guix pull} berücksichtigt nun +@file{/etc/guix/channels.scm}") + (es "Ahora @command{guix pull} tiene en cuenta +@file{/etc/guix/channels.scm}") (fr "@command{guix pull} lit maintenant @file{/etc/guix/channels.scm}")) (body @@ -19,6 +43,16 @@ @file{/etc/guix/channels.scm} file if it exists and if the per-user @file{~/.config/guix/channels.scm} is not present. This allows administrators of multi-user systems to define site-wide defaults.") + (de "Der Befehl @command{guix pull} liest nun die Datei +@file{/etc/guix/channels.scm}, wenn sie existiert und es für den jeweiligen +Benutzer keine @file{~/.config/guix/channels.scm} gibt. Dadurch können +Administratoren von Mehrbenutzersystemen systemweite Voreinstellungen +vornehmen.") + (es "Ahora la orden @command{guix pull} lee el fichero +@file{/etc/guix/channels.scm} si existe y el fichero personalizable +@file{~/.config/guix/channels.scm} no está presente. Esto permite a quienes +administran sistemas con múltiples usuarias definir valores predeterminados +en el sistema.") (fr "La commande @command{guix pull} lira maintenant le fichier @file{/etc/guix/channels.scm} s'il existe et si le fichier @file{~/.config/guix/channels.scm} par utilisateur·rice n'est pas présent. @@ -28,6 +62,7 @@ définir les canaux par défaut."))) (entry (commit "81c580c8664bfeeb767e2c47ea343004e88223c7") (title (en "Insecure @file{/var/guix/profiles/per-user} permissions (CVE-2019-18192)") (de "Sicherheitslücke in @file{/var/guix/profiles/per-user}-Berechtigungen (CVE-2019-18192)") + (es "Vulnerabilidad en los permisos de @file{/var/guix/profiles/per-user} (CVE-2019-18192)") (fr "Permissions laxistes pour @file{/var/guix/profiles/per-user} (CVE-2019-18192)") (nl "Onveilige @file{/var/guix/profiles/per-user}-rechten (CVE-2019-18192)")) (body @@ -71,6 +106,25 @@ einer Fremddistribution führen Sie dazu @code{sudo guix pull} aus; auf einem Guix-System führen Sie @code{guix pull && sudo guix system reconfigure …} aus. Achten Sie in beiden Fällen darauf, den Dienst mit @code{herd} oder @code{systemctl} neuzustarten.") + (es "El perfil predeterminado de la usuaria, @file{~/.guix-profile}, +apunta a @file{/var/guix/profiles/per-user/$USUARIA}. Hasta ahora cualquiera +podía escribir en @file{/var/guix/profiles/per-user}, lo cual permitía +a la orden @command{guix} crear el subdirectorio @code{$USUARIA}. + +En un sistema con múltiples usuarias, esto permitiría a cualquiera con +intención de causar daño crear ese subdirectorio @code{$USUARIA} con el nombre +de alguien que no hubiese ingresado en el sistema. Puesto que ese +subdirectorio @code{/var/@dots{}/$USUARIA} se encuentra en la ruta de binarios +predeterminada @code{$PATH}, el objetivo del ataque podría ejecutar código +proporcionado por la parte atacante. Véase +@uref{https://issues.guix.gnu.org/issue/37744} para obtener más información. + +Se ha solucionando delegando en @command{guix-daemon} la creación de esos +directorios y eliminando los permisos de escritura para todo el mundo en +@code{per-user}. En sistemas con múltiples usuarias recomendamos actualizar +cuanto antes el daemon. Para hacerlo ejecute @code{sudo guix pull} si se +encuentra en una distribución distinta, o ejecute @code{guix pull && sudo guix system reconfigure @dots{}} en el sistema Guix. En ambos casos, asegurese de +reiniciar el servicio tras ello, con @code{herd} o @code{systemctl}.") (fr "Le profil utilisateur par défaut, @file{~/.guix-profile}, pointe vers @file{/var/guix/profiles/per-user/$USER}. Jusqu'à maintenant, @file{/var/guix/profiles/per-user} était disponible en @@ -114,6 +168,7 @@ met @code{sudo guix pull}. Herstart vervolgens in beide gevallen (entry (commit "5f3f70391809f8791c55c05bd1646bc58508fa2c") (title (en "GNU C Library upgraded") (de "GNU-C-Bibliothek aktualisiert") + (es "Actualización de la biblioteca C de GNU") (fr "Mise à jour de la bibliothèque C de GNU") (nl "GNU C-bibliotheek bijgewerkt")) (body @@ -140,6 +195,18 @@ guix install glibc-locales glibc-locales-2.28 Auf Guix System genügt es, das @code{locale-libcs}-Feld Ihrer @code{operating-system}-Form anzupassen. Führen Sie @code{info \"(guix.de) Locales\"} aus, um weitere Informationen dazu zu erhalten.") + (es "Se ha actualizado la biblioteca de C de GNU (glibc) a la versión +2.29. Para ejecutar programas instalados previamente que se encuentren +enlazados con glibc 2.28, es necesario que instale los datos de localización +de la versión 2.28 junto a los datos de localización de la versión 2.29: + +@example +guix install glibc-locales glibc-locales-2.28 +@end example + +En el sistema Guix, puede ajustar el campo @code{locale-libcs} de su +declaración @code{operating-system}. Ejecute @code{info \"(guix.es) +Localizaciones\"} para obtener más información.") (fr "La bibliothèque C de GNU (glibc) a été mise à jour en version 2.29. Pour pouvoir lancer tes programmes déjà installés et liés à glibc 2.28, tu dois installer les données pour la version 2.28 en plus des données de @@ -163,10 +230,11 @@ guix install glibc-locales glibc-locales-2.28 Op Guix System kunt u het @code{locale-libcs}-veld van uw @code{operating-system}-vorm aanpassen. Voer @code{info \"(guix) Locales\"} -uit voor verdere uitleg." ))) +uit voor verdere uitleg."))) (entry (commit "cdd3bcf03883d129581a79e6d6611b2afd3b277b") (title (en "New reduced binary seed bootstrap") (de "Neues Bootstrapping mit kleinerem Seed") + (es "Nueva reducción de la semilla binaria para el lanzamiento inicial") (fr "Nouvel ensemble de binaires de bootstrap réduit") (nl "Nieuwe bootstrap met verkleinde binaire kiem")) (body @@ -187,6 +255,12 @@ binaires à partir desquels les paquets sont construits pèse maintenant environ 130 Mio, soit la moitié par rapport à l'ensemble précédent. Tu peux lancer @code{info \"(guix) Bootstrapping\"} pour plus de détails, ou regarder la présentation sur @uref{https://archive.fosdem.org/2019/schedule/event/gnumes/}.") + (es "El grafo de paquetes en x86_64 y i686 ahora tiene su raíz en un +@dfn{conjunto reducido de semillas binarias}. El conjunto inicial de binarios +desde el que se construyen los paquetes ahora tiene un tamaño aproximado de +130_MiB , la mitad de su tamaño anterior. Ejecute @code{info \"(guix.es) +Lanzamiento inicial\"} para aprender más, o puede ver la charla en inglés +en@uref{https://archive.fosdem.org/2019/schedule/event/gnumes/}.") (nl "Het netwerk van pakketten voor x86_64 en i686 is nu geworteld in een @dfn{verkleinde verzameling van binaire kiemen}. Die beginverzameling van binaire bestanden waaruit pakketten gebouwd worden is nu zo'n 130 MiB @@ -197,6 +271,7 @@ Bootstrapping\"} uit voor meer details, of bekijk de presentatie op (entry (commit "dcc90d15581189dbc30e201db2b807273d6484f0") (title (en "New channel news mechanism") (de "Neuer Mechanismus, um Neuigkeiten über Kanäle anzuzeigen.") + (es "Nuevo mecanismo de noticias de los canales") (fr "Nouveau mécanisme d'information sur les canaux") (nl "Nieuw mechanisme voor nieuwsberichten per kanaal")) (body @@ -210,6 +285,11 @@ Mechanismus können Kanalautoren Ihren Nutzern @dfn{Einträge zu Neuigkeiten} mitteilen, die diese sich mit @command{guix pull --news} anzeigen lassen können. Führen Sie @command{info \"(guix.de) Aufruf von guix pull\"} aus, um weitere Informationen zu erhalten.") + (es "Está leyendo este mensaje a través del mecanismo de noticias del +canal, ¡enhorabuena! Este mecanismo permite a las autoras de canales +proporcionar @dfn{entradas de noticias} que las usuarias pueden ver con +@command{guix pull --news}. Ejecute @command{info \"(guix.es) Invocación de +guix pull\"} para obtener más información.") (fr "Ce message t'arrive à travers le nouveau mécanisme d'information des canaux, bravo ! Ce mécanisme permet aux auteur·rice·s de canaux de fournir des informations qu'on peut visualiser avec @command{guix pull diff --git a/gnu/ci.scm b/gnu/ci.scm index 5d5a826647..f24049e772 100644 --- a/gnu/ci.scm +++ b/gnu/ci.scm @@ -54,7 +54,8 @@ #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) #:use-module (ice-9 match) - #:export (hydra-jobs)) + #:export (channel-instance->package + hydra-jobs)) ;;; Commentary: ;;; diff --git a/gnu/local.mk b/gnu/local.mk index 0208513168..f394b2f24f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -22,6 +22,7 @@ # Copyright © 2018 Maxim Cournoyer <maxim.cournoyer@gmail.com> # Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net> # Copyright © 2019 John Soo <jsoo1@asu.edu> +# Copyright © 2019 Jonathan Brielmaier <jonathan.brielmaier@web.de> # # This file is part of GNU Guix. # @@ -212,6 +213,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/gl.scm \ %D%/packages/glib.scm \ %D%/packages/gnome.scm \ + %D%/packages/gnome-xyz.scm \ %D%/packages/gnu-doc.scm \ %D%/packages/gnucash.scm \ %D%/packages/gnunet.scm \ @@ -759,7 +761,6 @@ dist_patch_DATA = \ %D%/packages/patches/coda-use-system-libs.patch \ %D%/packages/patches/combinatorial-blas-awpm.patch \ %D%/packages/patches/combinatorial-blas-io-fix.patch \ - %D%/packages/patches/cpio-CVE-2016-2037.patch \ %D%/packages/patches/cpufrequtils-fix-aclocal.patch \ %D%/packages/patches/crawl-upgrade-saves.patch \ %D%/packages/patches/crda-optional-gcrypt.patch \ @@ -781,6 +782,7 @@ dist_patch_DATA = \ %D%/packages/patches/docbook-xsl-nonrecursive-string-subst.patch \ %D%/packages/patches/doc++-include-directives.patch \ %D%/packages/patches/doc++-segfault-fix.patch \ + %D%/packages/patches/docker-adjust-tests-for-changes-in-go.patch \ %D%/packages/patches/docker-engine-test-noinstall.patch \ %D%/packages/patches/docker-fix-tests.patch \ %D%/packages/patches/docker-use-fewer-modprobes.patch \ @@ -836,6 +838,7 @@ dist_patch_DATA = \ %D%/packages/patches/flint-ldconfig.patch \ %D%/packages/patches/foomatic-filters-CVE-2015-8327.patch \ %D%/packages/patches/foomatic-filters-CVE-2015-8560.patch \ + %D%/packages/patches/fribidi-CVE-2019-18397.patch \ %D%/packages/patches/freeimage-unbundle.patch \ %D%/packages/patches/fuse-overlapping-headers.patch \ %D%/packages/patches/gawk-shell.patch \ @@ -997,11 +1000,13 @@ dist_patch_DATA = \ %D%/packages/patches/java-jeromq-fix-tests.patch \ %D%/packages/patches/java-powermock-fix-java-files.patch \ %D%/packages/patches/java-simple-xml-fix-tests.patch \ + %D%/packages/patches/java-svg-salamander-Fix-non-det.patch \ %D%/packages/patches/java-xerces-bootclasspath.patch \ %D%/packages/patches/java-xerces-build_dont_unzip.patch \ %D%/packages/patches/java-xerces-xjavac_taskdef.patch \ %D%/packages/patches/jbig2dec-ignore-testtest.patch \ %D%/packages/patches/kdbusaddons-kinit-file-name.patch \ + %D%/packages/patches/libvirt-create-machine-cgroup.patch \ %D%/packages/patches/libziparchive-add-includes.patch \ %D%/packages/patches/localed-xorg-keyboard.patch \ %D%/packages/patches/kiki-level-selection-crash.patch \ @@ -1189,6 +1194,7 @@ dist_patch_DATA = \ %D%/packages/patches/opencv-rgbd-aarch64-test-fix.patch \ %D%/packages/patches/openfoam-4.1-cleanup.patch \ %D%/packages/patches/openjdk-10-idlj-reproducibility.patch \ + %D%/packages/patches/openmpi-psm2-priority.patch \ %D%/packages/patches/openocd-nrf52.patch \ %D%/packages/patches/opensmtpd-fix-crash.patch \ %D%/packages/patches/openssl-runpath.patch \ @@ -1204,8 +1210,6 @@ dist_patch_DATA = \ %D%/packages/patches/p7zip-CVE-2016-9296.patch \ %D%/packages/patches/p7zip-CVE-2017-17969.patch \ %D%/packages/patches/p7zip-remove-unused-code.patch \ - %D%/packages/patches/patchelf-page-size.patch \ - %D%/packages/patches/patchelf-rework-for-arm.patch \ %D%/packages/patches/patchutils-test-perms.patch \ %D%/packages/patches/patch-hurd-path-max.patch \ %D%/packages/patches/pcre2-fix-jit_match-crash.patch \ @@ -1273,6 +1277,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-configobj-setuptools.patch \ %D%/packages/patches/python-faker-fix-build-32bit.patch \ %D%/packages/patches/python-keras-integration-test.patch \ + %D%/packages/patches/python-pep8-stdlib-tokenize-compat.patch \ %D%/packages/patches/python-pyfakefs-remove-bad-test.patch \ %D%/packages/patches/python-flint-includes.patch \ %D%/packages/patches/python-libxml2-utf8.patch \ @@ -1390,6 +1395,7 @@ dist_patch_DATA = \ %D%/packages/patches/tuxpaint-stamps-path.patch \ %D%/packages/patches/txr-shell.patch \ %D%/packages/patches/u-boot-fix-mkimage-header-verification.patch \ + %D%/packages/patches/udiskie-no-appindicator.patch \ %D%/packages/patches/unzip-CVE-2014-8139.patch \ %D%/packages/patches/unzip-CVE-2014-8140.patch \ %D%/packages/patches/unzip-CVE-2014-8141.patch \ @@ -1415,6 +1421,7 @@ dist_patch_DATA = \ %D%/packages/patches/vinagre-newer-freerdp.patch \ %D%/packages/patches/vinagre-newer-rdp-parameters.patch \ %D%/packages/patches/virglrenderer-CVE-2017-6386.patch \ + %D%/packages/patches/vlc-fix-test_libvlc_slaves.patch \ %D%/packages/patches/vorbis-tools-CVE-2014-9638+CVE-2014-9639.patch \ %D%/packages/patches/vorbis-tools-CVE-2014-9640.patch \ %D%/packages/patches/vorbis-tools-CVE-2015-6749.patch \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 08dac76a41..c4723c5a9d 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1599,6 +1599,7 @@ system is under heavy load.") (uri (git-reference (url "https://github.com/dharple/detox.git") (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 "1dd608c7g65s5lj02cddvani3q9kzirddgkjqa22ap9d4f8b9xgr")))) @@ -2421,13 +2422,13 @@ a new command using the matched rule, and runs it.") (define-public di (package (name "di") - (version "4.47.1") + (version "4.47.2") (source (origin (method url-fetch) (uri (string-append "https://gentoo.com/di/di-" version ".tar.gz")) (sha256 - (base32 "1bdbl9k3gqf4h6g21difqc0w17pjid6r587y19wi37vx36aava7f")))) + (base32 "1g97pp2hznskqlkhl6ppyzgdmv878bcqiwh633kdnm70d1pvh192")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; obscure test failures @@ -2834,6 +2835,7 @@ tool for remote execution and deployment.") (uri (git-reference (url "https://github.com/dylanaraps/neofetch") (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 "022xzn9jk18k2f4b6011d8jk5nbl84i3mw3inlz4q52p2hvk8fch")))) diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 6a9784f551..f626c0de97 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -201,6 +201,7 @@ the real span of the lattice.") (uri (git-reference (url "https://github.com/fplll/fpylll.git") (commit (string-append version "dev")))) + (file-name (git-file-name name version)) (sha256 (base32 "01x2sqdv0sbjj4g4waj0hj4rcn4bq7h17442xaqwbznym9azmn9w")))) @@ -987,7 +988,7 @@ features, and more.") (define-public xtensor (package (name "xtensor") - (version "0.20.9") + (version "0.20.10") (source (origin (method git-fetch) (uri (git-reference @@ -995,7 +996,7 @@ features, and more.") (commit version))) (sha256 (base32 - "1rw04bdi7mzp362dhkxr9m4rafnvb47xjsi9p3fp4vfif8v0jij8")) + "1fmv2hpx610xwhxrndfsfvlbqfyk4l3gi5q5d7pa9m82kblxjj9l")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (native-inputs diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index 993d18a3eb..e4dbade64c 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2017 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2017 Maxim Cournoyer <maxim.cournoyer@gmail.com> -;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2019 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net> @@ -674,16 +674,16 @@ file system.") (define-public android-udev-rules (package (name "android-udev-rules") - (version "20180112") + (version "20191103") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/M0Rf30/android-udev-rules") (commit version))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 - (base32 "13gj79nnd04szqlrrzzkdr6wi1fky08pi7x8xfbg0jj3d3v0giah")))) + (base32 "0x2f2sv0x0ry7kccp47s0hlxps3hbpg37dj3xjjgpdm5hmn2cjq3")))) (build-system trivial-build-system) (native-inputs `(("source" ,source))) (arguments diff --git a/gnu/packages/aspell.scm b/gnu/packages/aspell.scm index 9482e641cf..af38c149c2 100644 --- a/gnu/packages/aspell.scm +++ b/gnu/packages/aspell.scm @@ -158,11 +158,20 @@ dictionaries, including personal ones.") "1svls9p7rsfi3hs0afh0cssj006qb4v1ik2yzqgj8hm10c6as2sm"))) (define-public aspell-dict-ca - (aspell-dictionary "ca" "Catalan" - #:version "2.1.5-1" - #:sha256 - (base32 - "1fb5y5kgvk25nlsfvc8cai978hg66x3pbp9py56pldc7vxzf9npb"))) + (let ((version "2.5.0") + (sha256 + (base32 "0kbi8fi7a1bys31kfqrlh332gyik0cfdmxgl7n15sa9c305rkgwq"))) + (package + (inherit (aspell-dictionary "ca" "Catalan" + #:version version + #:sha256 sha256)) + (source + (origin + (method url-fetch) + (uri (string-append "https://www.softcatala.org/pub/softcatala/aspell/" + version "/aspell6-ca-" version ".tar.bz2")) + (sha256 sha256))) + (home-page "https://www.softcatala.org/pub/softcatala/aspell/")))) (define-public aspell-dict-de (aspell-dictionary "de" "German" diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 88b5696a9b..d59b4eb87e 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -23,6 +23,7 @@ ;;; Copyright © 2019 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2019 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com> +;;; Copyright © 2019 Alexandros Theodotou <alex@zrythm.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -63,6 +64,7 @@ #:use-module (gnu packages compression) #:use-module (gnu packages curl) #:use-module (gnu packages dbm) + #:use-module (gnu packages documentation) #:use-module (gnu packages emacs) #:use-module (gnu packages file) #:use-module (gnu packages flex) @@ -1107,7 +1109,7 @@ follower.") (define-public fluidsynth (package (name "fluidsynth") - (version "2.0.8") + (version "2.0.9") (source (origin (method git-fetch) (uri (git-reference @@ -1116,7 +1118,7 @@ follower.") (file-name (git-file-name name version)) (sha256 (base32 - "1s32c0jxjica2agy0mp36vgvpgj2vl5i5zvacd6igmbam0x4gs7c")))) + "08bhwv0gw7zq1z0b36m2dzxl6zcgvmvaa60nly2wif7rinkprp5n")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; no check target @@ -1167,28 +1169,17 @@ also play midifiles using a Soundfont.") (define-public faad2 (package (name "faad2") - (version "2.7") + (version "2.8.6") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/faac/faad2-src/faad2-" - version "/faad2-" version ".zip")) + (version-major+minor version) ".0/" + "faad2-" version ".tar.gz")) (sha256 (base32 - "16f3l16c00sg0wkrkm3vzv0gy3g97x309vw788igs0cap2x1ak3z")))) + "089zqykqgmmysznvk0bi2pfvdqwclnn540d0zks83sv2pynpfjb5")))) (build-system gnu-build-system) - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool) - ("unzip" ,unzip))) - (arguments - '(#:phases - (modify-phases %standard-phases - (replace 'bootstrap - (lambda _ - (substitute* "bootstrap" (("\r\n") "\n")) - (invoke "sh" "bootstrap")))))) - (home-page "http://www.audiocoding.com/faad2.html") + (home-page "https://www.audiocoding.com/faad2.html") (synopsis "MPEG-4 and MPEG-2 AAC decoder") (description "FAAD2 is an MPEG-4 and MPEG-2 AAC decoder supporting LC, Main, LTP, SBR, @@ -1583,24 +1574,26 @@ synchronous execution of all clients, and low latency operation.") (define-public jalv (package (name "jalv") - (version "1.6.0") + (version "1.6.4") (source (origin (method url-fetch) (uri (string-append "https://download.drobilla.net/jalv-" version ".tar.bz2")) (sha256 (base32 - "1x2wpzzx2cgvz3dgdcgsj8dr0w3zsasy62mvl199bsdj5fbjaili")))) + "1wwfn7yzbs37s2rdlfjgks63svd5g14yyzd2gdl7h0z12qncwsy2")))) (build-system waf-build-system) (arguments - `(#:tests? #f ; no check target + `(#:tests? #f ; no check target #:python ,python-2)) (inputs `(("lv2" ,lv2) ("lilv" ,lilv) ("suil" ,suil) - ("gtk" ,gtk+) - ("gtkmm" ,gtkmm) + ("gtk2" ,gtk+-2) + ("gtk3" ,gtk+) + ("gtkmm" ,gtkmm-2) + ("qtbase" ,qtbase) ("jack" ,jack-1))) (native-inputs `(("pkg-config" ,pkg-config))) @@ -1814,26 +1807,32 @@ included are the command line utilities @code{send_osc} and @code{dump_osc}.") (define-public lilv (package (name "lilv") - (version "0.24.4") + (version "0.24.6") (source (origin (method url-fetch) (uri (string-append "https://download.drobilla.net/lilv-" version ".tar.bz2")) (sha256 (base32 - "0f24cd7wkk5l969857g2ydz2kjjrkvvddg1g87xzzs78lsvq8fy3")))) + "1p3hafsxgs5d4za7n66lf5nz74qssfqpmk520cm7iq2njvvlqm2z")))) (build-system waf-build-system) (arguments `(#:tests? #f ; no check target #:phases (modify-phases %standard-phases - (add-before - 'configure 'set-ldflags + (add-before 'configure 'set-ldflags (lambda* (#:key outputs #:allow-other-keys) (setenv "LDFLAGS" (string-append "-Wl,-rpath=" (assoc-ref outputs "out") "/lib")) - #t))))) + #t)) + (add-after 'unpack 'full-store-path-to-shared-library + (lambda* (#:key outputs #:allow-other-keys) + (with-directory-excursion "bindings/python" + (substitute* "lilv.py" + (("liblilv-0.so") (string-append (assoc-ref outputs "out") + "/lib/liblilv-0.so")))) + #t))))) ;; Required by lilv-0.pc. (propagated-inputs `(("lv2" ,lv2) @@ -1841,8 +1840,9 @@ included are the command line utilities @code{send_osc} and @code{dump_osc}.") ("sord" ,sord) ("sratom" ,sratom))) (native-inputs - `(("pkg-config" ,pkg-config))) - (home-page "https://drobilla.net/software/lilv/") + `(("python" ,python) + ("pkg-config" ,pkg-config))) + (home-page "https://drobilla.net/software/lilv") (synopsis "Library to simplify use of LV2 plugins in applications") (description "Lilv is a C library to make the use of LV2 plugins as simple as possible @@ -2341,33 +2341,22 @@ tempo and pitch of an audio recording independently of one another.") (define-public rtmidi (package (name "rtmidi") - (version "2.1.0") + (version "4.0.0") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/powertab/rtmidi.git") - (commit version))) - (file-name (git-file-name name version)) + (method url-fetch) + (uri (string-append "https://www.music.mcgill.ca/~gary/rtmidi" + "/release/rtmidi-" version ".tar.gz")) + (file-name (string-append "rtmidi-" version ".tar.gz")) (sha256 (base32 - "106v177y3nrjv2l1yskch4phpqd8h97b67zj0jiq9pc3c69jr1ay")))) + "1k962ljpnwyjw9jjiky2372khhri1wqvrj5qsalfpys31xqzw31p")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ;no "check" target - #:phases + `(#:phases (modify-phases %standard-phases - (add-before 'build 'fix-makefile + (add-before 'bootstrap 'noconfigure (lambda _ - (substitute* "Makefile" - (("/bin/ln") "ln") - (("RtMidi.h RtError.h") "RtMidi.h")) - #t)) - (add-before 'install 'make-target-dirs - (lambda _ - (let ((out (assoc-ref %outputs "out"))) - (mkdir-p (string-append out "/bin")) - (mkdir (string-append out "/lib")) - (mkdir (string-append out "/include"))) + (setenv "NOCONFIGURE" "yes") #t))))) (inputs `(("jack" ,jack-1) @@ -2377,7 +2366,7 @@ tempo and pitch of an audio recording independently of one another.") ("automake" ,automake) ("libtool" ,libtool) ("pkg-config" ,pkg-config))) - (home-page "https://github.com/powertab/rtmidi") + (home-page "https://www.music.mcgill.ca/~gary/rtmidi") (synopsis "Cross-platform MIDI library for C++") (description "RtMidi is a set of C++ classes (RtMidiIn, RtMidiOut, and API specific @@ -2388,17 +2377,18 @@ input/output.") (define-public sratom (package (name "sratom") - (version "0.6.2") + (version "0.6.4") (source (origin - (method url-fetch) - (uri (string-append "https://download.drobilla.net/sratom-" - version ".tar.bz2")) - (sha256 - (base32 - "0lz883ravxjf7r9wwbx2gx9m8vhyiavxrl9jdxfppjxnsralll8a")))) + (method url-fetch) + (uri (string-append "https://download.drobilla.net/sratom-" + version ".tar.bz2")) + (sha256 + (base32 + "0vh0biy3ngpzzgdml309c2mqz8xq9q0hlblczb4c6alhp0a8yv0l")))) (build-system waf-build-system) - (arguments `(#:tests? #f)) ; no check target - (inputs + (arguments `(#:tests? #f)) ;no check target + (propagated-inputs + ;; In Requires of sratom-0.pc. `(("lv2" ,lv2) ("serd" ,serd) ("sord" ,sord))) @@ -2414,14 +2404,14 @@ the Turtle syntax.") (define-public suil (package (name "suil") - (version "0.10.4") + (version "0.10.6") (source (origin (method url-fetch) (uri (string-append "https://download.drobilla.net/suil-" version ".tar.bz2")) (sha256 (base32 - "0ay7hl6nr6ip1nn9k2m8ri3b52b6sx9mhixmcy4fy3kr2a88ksd1")))) + "0z4v01pjw4wh65x38w6icn28wdwxz13ayl8hvn4p1g9kmamp1z06")))) (build-system waf-build-system) (arguments `(#:tests? #f)) ;no check target @@ -2946,7 +2936,7 @@ result.") (define-public zita-convolver (package (name "zita-convolver") - (version "3.1.0") + (version "4.0.3") (source (origin (method url-fetch) (uri (string-append @@ -2956,31 +2946,33 @@ result.") (snippet ;; Don't optimize for a specific processor architecture. '(begin - (substitute* "libs/Makefile" + (substitute* "source/Makefile" (("^CXXFLAGS \\+= -march=native") "")) #t)) (modules '((guix build utils))) (sha256 (base32 - "14qrnczhp5mbwhky64il7kxc4hl1mmh495v60va7i2qnhasr6zmz")))) + "0prji66p86z2bzminywkwchr5bfgxcg2i8y803pydd1hzf2198cs")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no "check" target - #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:make-flags + (list (string-append "PREFIX=" (assoc-ref %outputs "out")) + (string-append "SUFFIX=")) #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-makefile-and-enter-directory (lambda _ - (substitute* "libs/Makefile" + (substitute* "source/Makefile" (("ldconfig") "true") (("^LIBDIR =.*") "LIBDIR = lib\n")) - (chdir "libs") + (chdir "source") #t)) (add-after 'install 'install-symlink (lambda _ (symlink "libzita-convolver.so" (string-append (assoc-ref %outputs "out") - "/lib/libzita-convolver.so.3")) + "/lib/libzita-convolver.so.4")) #t)) ;; no configure script (delete 'configure)))) @@ -3680,16 +3672,16 @@ library.") (define-public faudio (package (name "faudio") - (version "19.09") + (version "19.11") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/FNA-XNA/FAudio.git") (commit version))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 - (base32 "0fagik55jmy3qmb27nhg0zxash1ahfkxphx8m8gs0pimqqrdrd9d")))) + (base32 "0ckpr6ffz8ssfh1y850dhip5s5jv0j6n90qz5yx1v9d6gpwf08rp")))) (arguments '(#:tests? #f ; No tests. #:configure-flags '("-DFFMPEG=ON"))) @@ -3764,3 +3756,58 @@ other Gnaural instances, allowing synchronous sessions between many users.") a sound card, encodes it into Ogg Vorbis and/or mp3, and sends the audio stream to one or more IceCast and/or ShoutCast servers.") (license license:gpl3+))) + +(define-public libltc + (package + (name "libltc") + (version "1.3.1") + (source + (origin + (method url-fetch) + (uri + (string-append "https://github.com/x42/libltc/releases/download/v" + version "/libltc-" version ".tar.gz")) + (sha256 + (base32 + "173h9dgmain3nyrwk6q2d7yl4fnh4vacag4s2p01n5b7nyrkxrjh")))) + (build-system gnu-build-system) + (arguments + `(#:parallel-tests? #f)) ;tests fail otherwise + (native-inputs + `(("doxygen" ,doxygen) + ("pkg-config" ,pkg-config))) + (synopsis "Encode or decode Linear/Longitudinal Time Code (LTC) audio") + (description "Libltc is a POSIX-C Library for handling +@dfn{Linear/Longitudinal Time Code} (LTC) data.") + (home-page "https://x42.github.io/libltc/") + (license license:lgpl3+))) + +(define-public redkite + (package + (name "redkite") + (version "0.6.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/geontime/redkite.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1i874izajbdhlfacwwj84qrsxf7g4y6nblzxalrkzaap9sa7d1r6")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f)) ;no tests included + (inputs + `(("cairo" ,cairo))) + (native-inputs + `(("pkg-config", pkg-config))) + (synopsis "Small GUI toolkit") + (description "Redkite is a small GUI toolkit developed in C++17 and +inspired from other well known GUI toolkits such as Qt and GTK. It is +minimal on purpose and is intended to be statically linked to applications, +therefore satisfying any requirements they may have to be self contained, +as is the case with audio plugins.") + (home-page "https://gitlab.com/geontime/redkite") + (license license:gpl3+))) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index fc43f93d7d..0894cb38bf 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -292,13 +292,13 @@ random access nor for in-place modification.") (version "1.1.15") (source (origin - (method url-fetch) - (file-name (string-append name "-" version ".tar.gz")) - (uri (string-append "https://github.com/miekg/rdup/archive/" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/miekg/rdup.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 - "1jr91hgcf0rrpanqlwws72ql9db6d6grs2i122ki1s4bx0vqqyvq")))) + (base32 "0bzyv6qmnivxnv9nw7lnfn46k0m1dlxcjj53zcva6v8y8084l1iw")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) @@ -308,11 +308,14 @@ random access nor for in-place modification.") ;; For tests. ("dejagnu" ,dejagnu))) (inputs + ;; XXX Compiling with nettle (encryption) support requires patching out + ;; -Werror from GNUmakefile.in. Then, rdup-tr-{en,de}crypt tests fail: + ;; free(): invalid pointer + ;; ** rdup-tr: SIGPIPE received, exiting `(("glib" ,glib) ("pcre" ,pcre) ("libarchive" ,libarchive) - ("mcrypt" ,mcrypt) - ("nettle" ,nettle))) + ("mcrypt" ,mcrypt))) (arguments `(#:parallel-build? #f ;race conditions #:phases @@ -328,6 +331,13 @@ random access nor for in-place modification.") ;; Avoid frivolous dependency on ‘which’ with a shell builtin. (("which") "command -v")) #t)) + (add-before 'check 'disable-encryption-tests + (lambda _ + (for-each delete-file + (list "testsuite/rdup/rdup.rdup-tr-crypt.exp" + "testsuite/rdup/rdup.rdup-tr-decrypt.exp" + "testsuite/rdup/rdup.rdup-tr-encrypt.exp")) + #t)) (add-before 'check 'pre-check (lambda _ (setenv "HOME" (getcwd)) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 1d1e126b6a..e8150708c0 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -981,18 +981,23 @@ with the Linux kernel.") (substitute-keyword-arguments (ensure-keyword-arguments (package-arguments base-gcc) '(#:implicit-inputs? #f)) - ((#:make-flags flags) - `(let ((libc (assoc-ref %build-inputs "libc"))) - ;; FLAGS_FOR_TARGET are needed for the target libraries to receive - ;; the -Bxxx for the startfiles. - (cons (string-append "FLAGS_FOR_TARGET=-B" libc "/lib") - ,flags))))) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'configure 'treat-glibc-as-system-header + (lambda _ + (let ((libc (assoc-ref %build-inputs "libc"))) + ;; GCCs build processes requires that the libc + ;; we're building against is on the system header + ;; search path. + (for-each (lambda (var) + (setenv var (string-append libc "/include"))) + '("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH")) + #t))))))) (native-inputs - `(("libc" ,libc) - ("libc:static" ,libc "static") - ,@(append (package-inputs base-gcc) - (fold alist-delete (%final-inputs) '("libc" "libc:static"))))) - (inputs '()))) + `(,@(package-native-inputs base-gcc) + ,@(append (fold alist-delete (%final-inputs) '("libc" "libc:static"))) + ("libc" ,libc) + ("libc:static" ,libc "static"))))) (define-public (make-glibc-locales glibc) (package diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index d3abeec6e6..bb2397fafa 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015, 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> -;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com> ;;; ;;; This file is part of GNU Guix. @@ -31,6 +31,7 @@ #:use-module (gnu packages linux) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix utils) #:use-module (guix gexp) #:use-module (guix monads) @@ -309,14 +310,15 @@ completion for many common commands.") (package (name "bash-tap") (version "1.0.2") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/illusori/bash-tap/" - "archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0qs1qi38bl3ns4mpagcawv618dsk2q1lgrbddgvs0wl3ia12cyz5")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/illusori/bash-tap.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "13zz9h6bhhnk3hiwhlpafrnf2isws249h3fz785dcgymk02arz9c")))) ;; There is no compilation process to use this package, however, the bash ;; scripts installed by this package start with "#!/bin/bash". To fix ;; these lines, we use the patch-shebangs of the GNU build system. The diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 6467fecb8c..89547be66d 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -6133,7 +6133,7 @@ features (e.g. genes, microRNAs).") (home-page "https://bioconductor.org/packages/unifiedWMWqPCR") (synopsis "Unified Wilcoxon-Mann Whitney Test for differential expression in qPCR data") (description - "This packages implements the unified Wilcoxon-Mann-Whitney Test for qPCR + "This package implements the unified Wilcoxon-Mann-Whitney Test for qPCR data. This modified test allows for testing differential expression in qPCR data.") (license license:gpl2+))) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index f55740e231..01566d37df 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10031,14 +10031,14 @@ interval to data view, mismatch pileup, and several splicing summaries.") (define-public r-gprofiler (package (name "r-gprofiler") - (version "0.6.8") + (version "0.7.0") (source (origin (method url-fetch) (uri (cran-uri "gProfileR" version)) (sha256 (base32 - "05d6y6b7vkkzp2qhs1cwlvp02djij1b28dbwxnrms08f8qi35iaj")))) + "1h1v0kgpsn04ald2izznh7fr2riwisj5hcgz4k7h3qc931rf0r4k")))) (properties `((upstream-name . "gProfileR"))) (build-system r-build-system) (propagated-inputs @@ -12850,6 +12850,7 @@ HTML reports with interesting findings about your samples.") (uri (git-reference (url "https://github.com/jsh58/Genrich.git") (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 "0x0q6z0208n3cxzqjla4rgjqpyqgwpmz27852lcvzkzaigymq4zp")))) @@ -14799,6 +14800,7 @@ and reflect the fast5 file schema, and tools to convert between (uri (git-reference (url "https://github.com/phoenixding/tbsp.git") (commit commit))) + (file-name (git-file-name name version)) (sha256 (base32 "025ym14x8gbd6hb55lsinqj6f5qzw36i10klgs7ldzxxd7s39ki1")))) diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 6b6998b323..8ef017845f 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -416,7 +416,7 @@ desktops.") (define-public qbittorrent (package (name "qbittorrent") - (version "4.1.9") + (version "4.1.9.1") (source (origin (method git-fetch) @@ -425,7 +425,7 @@ desktops.") (commit (string-append "release-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "044r3y3vvm2rqagmwlqlhvb4kkyqpkmpnlhv68hzkl3w5bvf8zl8")))) + (base32 "19zgqlby7i1kr20wa4zd99qzd062a879xxxbmlf40rnqiqy4bhyi")))) (build-system gnu-build-system) (arguments `(#:configure-flags diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index a2253a9efc..2ef0591223 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2018, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2018 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -128,6 +129,55 @@ across a broad spectrum of applications.") (license (license:x11-style "https://www.boost.org/LICENSE_1_0.txt" "Some components have other similar licences.")))) +;; TODO: Merge with 'Boost' in the next rebuild cycle. +(define-public boost-with-python3 + (package + (inherit boost) + (name "boost-python3") + (native-inputs + `(("perl" ,perl) + ("python" ,python) + ("tcsh" ,tcsh))) + (arguments (substitute-keyword-arguments (package-arguments boost) + ((#:phases phases) + `(modify-phases ,phases + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((icu (assoc-ref inputs "icu4c")) + (python (assoc-ref inputs "python")) + (out (assoc-ref outputs "out"))) + (substitute* '("libs/config/configure" + "libs/spirit/classic/phoenix/test/runtest.sh" + "tools/build/src/engine/execunix.c" + "tools/build/src/engine/Jambase" + "tools/build/src/engine/jambase.c") + (("/bin/sh") (which "sh"))) + + (setenv "SHELL" (which "sh")) + (setenv "CONFIG_SHELL" (which "sh")) + + (substitute* "tools/build/src/tools/python.jam" + (("include/python\\$\\(version\\)") + "include/python$(version)m")) + + (invoke "./bootstrap.sh" + (string-append "--prefix=" out) + ;; Auto-detection looks for dependencies only + ;; in traditional install locations. + (string-append "--with-icu=" icu) + (string-append "--with-python=" python "/bin/python3") + (string-append "--with-python-root=" python) + "--with-python-version=3.7" + "--with-toolset=gcc")))) + (replace 'provide-libboost_python + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (with-directory-excursion (string-append out "/lib") + (symlink "libboost_python37.so" "libboost_python.so") + ;; Some packages also look for libboost_python3.so + (symlink "libboost_python37.so" "libboost_python3.so")) + #t))))))))) + (define-public boost-for-mysql ;; Older version for MySQL 5.7.23. (package diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 438f404e1a..156e4c4cdd 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -554,9 +554,9 @@ board-independent tools."))) "_" "-"))) (native-inputs `(,@(if (not (same-arch?)) - `(("cross-gcc" ,(cross-gcc triplet #:xgcc gcc-7)) + `(("cross-gcc" ,(cross-gcc triplet)) ("cross-binutils" ,(cross-binutils triplet))) - `(("gcc-7" ,gcc-7))) + `()) ,@(package-native-inputs u-boot))) (arguments `(#:modules ((ice-9 ftw) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index c6e3c697e6..d6995f104c 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -149,41 +149,42 @@ for system '~a'") ;;; Helper procedures. ;;; -(define (bootstrap-origin source) - "Return a variant of SOURCE, an <origin> instance, whose method uses +(define bootstrap-origin + (mlambdaq (source) + "Return a variant of SOURCE, an <origin> instance, whose method uses %BOOTSTRAP-GUILE to do its job." - (define (boot fetch) - (lambda* (url hash-algo hash - #:optional name #:key system) - (fetch url hash-algo hash name - #:guile %bootstrap-guile - #:system system))) - - (define %bootstrap-patch-inputs - ;; Packages used when an <origin> has a non-empty 'patches' field. - `(("tar" ,%bootstrap-coreutils&co) - ("xz" ,%bootstrap-coreutils&co) - ("bzip2" ,%bootstrap-coreutils&co) - ("gzip" ,%bootstrap-coreutils&co) - ("patch" ,%bootstrap-coreutils&co))) - - (let ((orig-method (origin-method source))) - (if (or (not (null? (origin-patches source))) - (origin-snippet source)) - (origin (inherit source) - (method (if (eq? orig-method url-fetch) - (boot url-fetch) - orig-method)) - (patch-guile %bootstrap-guile) - (patch-inputs %bootstrap-patch-inputs) - - ;; Patches can be origins as well, so process them. - (patches (map (match-lambda - ((? origin? patch) - (bootstrap-origin patch)) - (patch patch)) - (origin-patches source)))) - source))) + (define (boot fetch) + (lambda* (url hash-algo hash + #:optional name #:key system) + (fetch url hash-algo hash name + #:guile %bootstrap-guile + #:system system))) + + (define %bootstrap-patch-inputs + ;; Packages used when an <origin> has a non-empty 'patches' field. + `(("tar" ,%bootstrap-coreutils&co) + ("xz" ,%bootstrap-coreutils&co) + ("bzip2" ,%bootstrap-coreutils&co) + ("gzip" ,%bootstrap-coreutils&co) + ("patch" ,%bootstrap-coreutils&co))) + + (let ((orig-method (origin-method source))) + (if (or (not (null? (origin-patches source))) + (origin-snippet source)) + (origin (inherit source) + (method (if (eq? orig-method url-fetch) + (boot url-fetch) + orig-method)) + (patch-guile %bootstrap-guile) + (patch-inputs %bootstrap-patch-inputs) + + ;; Patches can be origins as well, so process them. + (patches (map (match-lambda + ((? origin? patch) + (bootstrap-origin patch)) + (patch patch)) + (origin-patches source)))) + source)))) (define* (package-from-tarball name source program-to-test description #:key snippet) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index a694a7ddad..5c11266c89 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -102,8 +102,8 @@ generate such a compilation database.") (license license:gpl3+))) (define-public gn - (let ((commit "1ab6fa2cab7ec64840db720a56018ca8939329f9") - (revision "1530")) ;as returned by `git describe`, used below + (let ((commit "6e5ba2e7210823cf7ccce3eb2a23336a4e7f1349") + (revision "1666")) ;as returned by `git describe`, used below (package (name "gn") (version (git-version "0.0" revision commit)) @@ -113,17 +113,15 @@ generate such a compilation database.") (uri (git-reference (url home-page) (commit commit))) (sha256 (base32 - "06h974d1lag3wwsz6s5asmpv0njmf671ag4la2fpnbh494m97lfk")) + "157ax65sixjm0i1j89wvny48v1mbsl4pbvv5vqinjc6r0fryaf2r")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments - `(#:tests? #f ;FIXME: How to run? - #:phases (modify-phases %standard-phases + `(#:phases (modify-phases %standard-phases (add-before 'configure 'set-build-environment (lambda _ (setenv "CC" "gcc") (setenv "CXX" "g++") (setenv "AR" "ar") - (setenv "LDFLAGS" "-pthread") #t)) (replace 'configure (lambda _ @@ -143,6 +141,14 @@ generate such a compilation database.") (lambda _ (invoke "ninja" "-C" "out" "gn" "-j" (number->string (parallel-job-count))))) + (replace 'check + (lambda* (#:key (tests? #t) #:allow-other-keys) + (if tests? + (lambda () + (invoke "ninja" "-C" "out" "gn_unittests" + "-j" (number->string (parallel-job-count))) + (invoke "./out/gn_unittests")) + (format #t "test suite not run~%")))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 8d495aa1c9..cccdb72d10 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -288,7 +288,7 @@ format.") (define-public cppcheck (package (name "cppcheck") - (version "1.87") + (version "1.89") (source (origin (method git-fetch) (uri (git-reference @@ -296,7 +296,7 @@ format.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1xiy54rz99nzbpwj35jiyssd2nc6k5k0lw5ml6nh2qnmbfkl8swl")))) + (base32 "07yn1zycsb7sn1v7fprihbl0ih4n2zkd7l9jvmkjcskvwn4n21h0")))) (build-system cmake-build-system) (arguments '(#:configure-flags '("-DBUILD_TESTS=ON"))) diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index aad1fd9203..225a301a65 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -69,12 +69,11 @@ #:use-module (gnu packages xiph) #:use-module (gnu packages xml) #:use-module (gnu packages xdisorg) - #:use-module (gnu packages xorg) - #:use-module (srfi srfi-1)) + #:use-module (gnu packages xorg)) (define %preserved-third-party-files '("base/third_party/cityhash" ;Expat - "base/third_party/dmg_fp" ;X11-style + "base/third_party/double_conversion" ;BSD-3 "base/third_party/dynamic_annotations" ;BSD-2 "base/third_party/icu" ;Unicode, X11-style "base/third_party/superfasthash" ;BSD-3 @@ -125,6 +124,7 @@ "third_party/catapult/tracing/third_party/pako" ;Expat "third_party/ced" ;BSD-3 "third_party/cld_3" ;ASL2.0 + "third_party/closure_compiler" ;ASL2.0 "third_party/crashpad" ;ASL2.0 "third_party/crashpad/crashpad/third_party/lss" ;ASL2.0 "third_party/crashpad/crashpad/third_party/zlib/zlib_crashpad.h" ;Zlib @@ -132,6 +132,7 @@ "third_party/cros_system_api" ;BSD-3 "third_party/dav1d" ;BSD-2 "third_party/dawn" ;ASL2.0 + "third_party/depot_tools/owners.py" ;BSD-3 "third_party/dom_distiller_js" ;BSD-3 "third_party/emoji-segmenter" ;ASL2.0 "third_party/flatbuffers" ;ASL2.0 @@ -169,7 +170,9 @@ "third_party/nasm" ;BSD-2 "third_party/node" ;Expat "third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2" ;BSD-2 + "third_party/one_euro_filter" ;BSD-3 "third_party/openscreen" ;BSD-3 + "third_party/openscreen/src/third_party/tinycbor" ;Expat "third_party/ots" ;BSD-3 "third_party/pdfium" ;BSD-3 "third_party/pdfium/third_party/agg23" ;Expat @@ -180,6 +183,7 @@ "third_party/pffft" ;the "FFTPACK" license, similar to BSD-3 "third_party/ply" ;BSD-3 "third_party/polymer" ;BSD-3 + "third_party/private-join-and-compute" ;ASL2.0 "third_party/protobuf" ;BSD-3 "third_party/protobuf/third_party/six" ;Expat "third_party/pyjson5" ;ASL2.0 @@ -238,9 +242,9 @@ from forcing GEXP-PROMISE." #:system system #:guile-for-build guile))) -(define %chromium-version "76.0.3809.132") -(define %ungoogled-revision "8eba5c0df1a318012e3deab39a9add252a0d56a3") -(define %debian-revision "debian/76.0.3809.87-2") +(define %chromium-version "78.0.3904.97") +(define %ungoogled-revision "acaf16383f264d8a2f24142ad054c9b4355771d3") +(define %debian-revision "e43d74632091324774a5049668782dba7b09cf72") (define package-revision "0") (define %package-version (string-append %chromium-version "-" package-revision "." @@ -254,7 +258,7 @@ from forcing GEXP-PROMISE." %chromium-version ".tar.xz")) (sha256 (base32 - "0hajwjf7swlgh1flpf8ljfrb2zhmcpzvrigvvxqd36g3nm04cknm")))) + "01wx5bi397d80za0sdfwgfbjj6n2ad2i31zmcrhm6wzryjwrmx6i")))) (define %ungoogled-origin (origin @@ -265,7 +269,7 @@ from forcing GEXP-PROMISE." (string-take %ungoogled-revision 7))) (sha256 (base32 - "08fd9whfc1qky44xqxbypr7jz1rg6cma017wj4b5c5b14grxz6k6")))) + "1gqbch6dnww3c3vn1i4nb07iz1f78mws9dsxscj3rsrkcgwhsdz8")))) (define %debian-origin (origin @@ -279,7 +283,7 @@ from forcing GEXP-PROMISE." (string-take %debian-revision 7)))) (sha256 (base32 - "1fjhpzrxmgjr7i31li1vsfmp0qkbi0cpyc7p1zjwvf2x4da0v907")))) + "1l1ajjkn1y7ql5w4zb3c3vw57hkydvy1mac7y81rycx4g5djasaz")))) (define (gentoo-patch name hash revision) (origin @@ -289,20 +293,6 @@ from forcing GEXP-PROMISE." (file-name name) (sha256 (base32 hash)))) -(define-syntax-rule (gentoo-patches (name hash) ...) - (list (gentoo-patch name hash "9fd80e7d75aa63843ec33c9d44fee32596ae8f25") - ...)) - -(define %auxiliary-patches - ;; XXX: Debians "gcc/wrong-namespace.patch" and "fixes/inspector.patch" does - ;; not work for us, so we take these upstream fixes via Gentoo instead. - (gentoo-patches - ("chromium-76-quiche.patch" "1cs0y16jn7r1nxh0j36vqcsdvigl902kdcqfmyivnxgblrx66l2i") - ("chromium-76-gcc-blink-namespace1.patch" - "0k7nrn0dhvqxj4sg2gndzxih0l1f77h6pv7jhcdz7h69sm4xci2z") - ("chromium-76-gcc-blink-namespace2.patch" - "014y2d8ii9sr340sjbv1fhsjd5s3dl0vbmq5wzlkdjsp91dcn9ch"))) - ;; This is a "computed" origin that does the following: ;; *) Runs the Ungoogled scripts on a pristine Chromium tarball. ;; *) Applies Debians Chromium patches, for their unbundling and GCC work. @@ -374,12 +364,19 @@ from forcing GEXP-PROMISE." ;; Skip the Debian-specific ones. (not (string-prefix? "debianization/" line)) (not (string-prefix? "buster/" line)) - ;; And those that conflict with Ungoogled. (not (any (cute string-suffix? <> line) + ;; These conflict with Ungoogled. '("widevine-buildflag.patch" "signin.patch" "third-party-cookies.patch" + ;; Disable workarounds for the + ;; Chromium "-lite" tarball. We + ;; use the "full" version and don't + ;; need these patches. + "closure.patch" + "owners.patch" + ;; XXX: 'fixes/inspector.patch' ;; makes v8 reuse the top-level ;; third_party/inspector_protocol @@ -387,21 +384,12 @@ from forcing GEXP-PROMISE." ;; but that does not work here for ;; some reason. Ignore that patch ;; and those that depend on it. - "wrong-namespace.patch" - "explicit-specialization.patch" "inspector.patch")))) (invoke "patch" "--force" "-p1" "--input" (string-append patches "/" line) "--no-backup-if-mismatch")) (loop (read-line))))))) - (format #t "Applying Guix-specific patches...~%") - (force-output) - (for-each (lambda (patch) - (invoke "patch" "--force" "-p1" "--input" - patch "--no-backup-if-mismatch")) - '#+%auxiliary-patches) - (format #t "Pruning third party files...~%") (force-output) (apply invoke "python" @@ -441,6 +429,21 @@ from forcing GEXP-PROMISE." `(cons "--enable-custom-modes" ,flags)))))) +;; Chromium 78 requires libvpx features that are not in any release. +(define libvpx/chromium + (package/inherit + libvpx + (version "m78-3904") + (source (origin + (inherit (package-source libvpx)) + (uri (git-reference + (url "https://chromium.googlesource.com/webm/libvpx") + (commit version))) + (file-name (git-file-name "libvpx" version)) + (sha256 + (base32 + "1pphjfmg0aqq93n5cq790884v1h84di8p9mk3r28sm053wszhm7g")))))) + (define-public ungoogled-chromium (package (name "ungoogled-chromium") @@ -590,8 +593,14 @@ from forcing GEXP-PROMISE." ;; TODO: Add ~/.guix-profile. "/run/current-system/profile/share/chromium/extensions")) + ;; Many files try to include ICU headers from "third_party/icu/...". + ;; Remove the "third_party/" prefix to use system headers instead. + (substitute* (find-files "chrome" "\\.cc$") + (("third_party/icu/source/(common|i18n)/") + "")) + ;; XXX: Should be unnecessary when use_system_lcms2=true. - (substitute* "third_party/pdfium/core/fxcodec/codec/ccodec_iccmodule.h" + (substitute* "third_party/pdfium/core/fxcodec/icc/iccmodule.h" (("include \"third_party/lcms/include/lcms2\\.h\"") "include \"lcms2.h\"")) @@ -631,10 +640,6 @@ from forcing GEXP-PROMISE." ;; Prevent GCC from optimizing away null pointer safety checks. (setenv "CXXFLAGS" "-fno-delete-null-pointer-checks") - ;; Work around <https://bugs.gnu.org/30756>. - (unsetenv "C_INCLUDE_PATH") - (unsetenv "CPLUS_INCLUDE_PATH") - ;; TODO: pre-compile instead. Avoids a race condition. (setenv "PYTHONDONTWRITEBYTECODE" "1") @@ -657,6 +662,22 @@ from forcing GEXP-PROMISE." (invoke "gn" "args" "out/Release" "--list")))) (replace 'build (lambda* (#:key (parallel-build? #t) #:allow-other-keys) + ;; XXX: Chromiums linking step requires a lot of simultaneous file + ;; accesses. Having a too low ulimit will result in bogus linker + ;; errors such as "foo.a: error adding symbols: malformed archive". + + ;; Try increasing the soft resource limit of max open files to 4096, + ;; or equal to the hard limit, whichever is lower. + (call-with-values (lambda () (getrlimit 'nofile)) + (lambda (soft hard) + (when (and soft (< soft 4096)) + (if hard + (setrlimit 'nofile (min hard 4096) hard) + (setrlimit 'nofile 4096 #f)) + (format #t + "increased maximum number of open files from ~d to ~d~%" + soft (if hard (min hard 4096) 4096))))) + (invoke "ninja" "-C" "out/Release" "-j" (if parallel-build? (number->string (parallel-job-count)) @@ -727,7 +748,7 @@ from forcing GEXP-PROMISE." (mkdir-p icons) (copy-file (string-append "product_logo_" size ".png") (string-append icons "/chromium.png")))) - '("22" "24" "48" "64" "128" "256"))) + '("24" "48" "64" "128" "256"))) #t)))))) (native-inputs `(("bison" ,bison) @@ -770,7 +791,7 @@ from forcing GEXP-PROMISE." ("libjpeg-turbo" ,libjpeg-turbo) ("libpng" ,libpng) ("libva" ,libva) - ("libvpx" ,libvpx) + ("libvpx" ,libvpx/chromium) ("libwebp" ,libwebp) ("libx11" ,libx11) ("libxcb" ,libxcb) @@ -832,12 +853,7 @@ disabled in order to protect the users privacy.") (inputs `(("wayland" ,wayland) ("wayland-protocols" ,wayland-protocols) - ;; Remove inputs only needed for X11. - ,@(fold alist-delete (package-inputs ungoogled-chromium) - '("libx11" "libxcb" "libxcomposite" "libxcursor" - "libxdamage" "libxext" "libxfixes" "libxi" - "libxrender" "libxtst" "libxext" "libxrandr" - "libxscrnsaver")))) + ,@(package-inputs ungoogled-chromium))) (arguments (substitute-keyword-arguments (package-arguments ungoogled-chromium) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 64349be444..e2c244c1a7 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -219,6 +219,22 @@ and workspaces that can be used in the compiler environment of your choice.") (append (search-patches "cmake-curl-certificates.patch") (origin-patches (package-source cmake)))))))) +(define-public cmake-3.15.5 + ;; CMake 3.15.5 fixes some issues, but declare another version to + ;; avoid triggering the rebuild of all CMake-based packages. + ;; See <https://issues.guix.gnu.org/issue/38060>. + (package + (inherit cmake) + (version "3.15.5") + (source (origin + (inherit (package-source cmake)) + (uri (string-append "https://www.cmake.org/files/v" + (version-major+minor version) + "/cmake-" version ".tar.gz")) + (sha256 + (base32 + "1d5y8d92axcc6rfqlsxamayfs3fc1vdby91hn5mx1kn02ppprpgv")))))) + (define-public emacs-cmake-mode (package (inherit cmake) diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 512ca5d365..20726cfebc 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -320,18 +320,21 @@ features that are not supported by the standard @code{stdio} implementation.") (package (name "withershins") (version "0.1") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/cameronwhite/withershins/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "08z3lyvswx7sad10637vfpwglbcbgzzcpfihw0x8lzr74f3b70bh")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cameronwhite/withershins.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1cviqvbbcwljm1zx12j6511hazr3kscwrvcyifrkfi4fpy5z985m")))) (build-system cmake-build-system) (arguments `(#:out-of-source? #f + #:configure-flags + ;; XXX A (justified!) misleading-indentation error breaks the build. + (list "-DENABLE_WERROR=OFF") #:phases (modify-phases %standard-phases (add-after @@ -458,30 +461,24 @@ importantly we give you proper follow-symbol and find-references support.") (version "0.9.20140503") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/pagekite/Colormake/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/pagekite/Colormake.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 - "08ldss9zd8ls6bjahvxhffpsjcysifr720yf3jz9db2mlklzmyd3")))) + (base32 "1f9v5s0viq4yc9iv6701h3pv7j21zz1ckl37lpp9hsnliiizv03p")))) (build-system trivial-build-system) (native-inputs `(("bash" ,bash) - ("gzip" ,gzip) - ("perl" ,perl) - ("tar" ,tar))) + ("perl" ,perl))) (arguments `(#:modules ((guix build utils)) #:builder (begin (use-modules (guix build utils)) - ;; bootstrap - (setenv "PATH" (string-append - (assoc-ref %build-inputs "tar") "/bin" ":" - (assoc-ref %build-inputs "gzip") "/bin")) - (invoke "tar" "xvf" (assoc-ref %build-inputs "source")) - (chdir (string-append (string-capitalize ,name) "-" ,version)) + (copy-recursively (assoc-ref %build-inputs "source") "source") + (chdir "source") (patch-shebang "colormake.pl" (list (string-append (assoc-ref %build-inputs "perl") "/bin"))) @@ -502,7 +499,7 @@ importantly we give you proper follow-symbol and find-references support.") "clmake-short" "colormake.pl") bin) #t)))) - (home-page "http://bre.klaki.net/programs/colormake/") + (home-page "https://bre.klaki.net/programs/colormake/") (synopsis "Wrapper around @command{make} to produce colored output") (description "This package provides a wrapper around @command{make} to produce colored output.") @@ -512,14 +509,15 @@ produce colored output.") (package (name "makefile2graph") (version "1.5.0") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/lindenb/" name - "/archive/v" version ".tar.gz")) - (sha256 - (base32 - "0h1vchkpmm9h6s87p5nf0ksjxcmsxpx8k62a508w428n570wcr4l")) - (file-name (string-append name "-" version ".tar.gz")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/lindenb/makefile2graph.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1gjfk3d8qg3cla7qd2y7r9s03whlfwy83q8k76xfcnqrjjfavdgk")))) (build-system gnu-build-system) (arguments '(#:test-target "test" diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 54746151ce..6a382c7517 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2070,12 +2070,13 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ("bash" ,bash))) (inputs '()))) -(define (gcc-boot0-intermediate-wrapped) - ;; Make the cross-tools GCC-BOOT0 and BINUTILS-BOOT0 available under the - ;; non-cross names. - (cross-gcc-wrapper gcc-boot0 binutils-boot0 - glibc-final-with-bootstrap-bash - (car (assoc-ref (%boot1-inputs) "bash")))) +(define gcc-boot0-intermediate-wrapped + (mlambda () + ;; Make the cross-tools GCC-BOOT0 and BINUTILS-BOOT0 available under the + ;; non-cross names. + (cross-gcc-wrapper gcc-boot0 binutils-boot0 + glibc-final-with-bootstrap-bash + (car (assoc-ref (%boot1-inputs) "bash"))))) (define static-bash-for-glibc ;; A statically-linked Bash to be used by GLIBC-FINAL in system(3) & co. @@ -2166,11 +2167,12 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ,@(package-arguments glibc-final-with-bootstrap-bash))))) -(define (gcc-boot0-wrapped) - ;; Make the cross-tools GCC-BOOT0 and BINUTILS-BOOT0 available under the - ;; non-cross names. - (cross-gcc-wrapper gcc-boot0 binutils-boot0 glibc-final - (car (assoc-ref (%boot1-inputs) "bash")))) +(define gcc-boot0-wrapped + (mlambda () + ;; Make the cross-tools GCC-BOOT0 and BINUTILS-BOOT0 available under the + ;; non-cross names. + (cross-gcc-wrapper gcc-boot0 binutils-boot0 glibc-final + (car (assoc-ref (%boot1-inputs) "bash"))))) (define (%boot2-inputs) ;; 3rd stage inputs. @@ -2400,7 +2402,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ;; PKG-CONFIG. ;; TODO: Fix that on the next rebuild cycle. (let ((pkg-config (package - (inherit pkg-config) + (inherit %pkg-config) ;the native pkg-config (inputs `(("guile" ,guile-final) ,@(%boot5-inputs))) (arguments diff --git a/gnu/packages/cpio.scm b/gnu/packages/cpio.scm index 77a0c82d2e..58b2f45937 100644 --- a/gnu/packages/cpio.scm +++ b/gnu/packages/cpio.scm @@ -28,15 +28,14 @@ (define-public cpio (package (name "cpio") - (version "2.12") + (version "2.13") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/cpio/cpio-" version ".tar.bz2")) (sha256 (base32 - "0vi9q475h1rki53100zml75vxsykzyhrn70hidy41s5c2rc8r6bh")) - (patches (search-patches "cpio-CVE-2016-2037.patch")))) + "0vbgnhkawdllgnkdn6zn1f56fczwk0518krakz2qbwhxmv2vvdga")))) (build-system gnu-build-system) (home-page "https://www.gnu.org/software/cpio/") (synopsis "Manage cpio and tar file archives") diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index f40f547781..3981f962d7 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -28,6 +28,7 @@ #:use-module (guix git-download) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (guix build-system python) #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages check) @@ -254,7 +255,7 @@ intuitive syntax and trivial integration.") (define-public xtl (package (name "xtl") - (version "0.6.7") + (version "0.6.8") (source (origin (method git-fetch) (uri @@ -263,7 +264,7 @@ intuitive syntax and trivial integration.") (commit version))) (sha256 (base32 - "0dds2fzyis42b1c3biqr3ir9l96csyyfkwrkm3fqjksdhgdklzmj")) + "13gm8vm1b9nzvlcc632f9khnjw1xdjqj6c7k51r173y1hlk0div7")) (file-name (git-file-name name version)))) (native-inputs `(("googletest" ,googletest) @@ -350,3 +351,27 @@ tools: @item CPU checker. @end itemize\n") (license license:bsd-3))) + +(define-public cpplint + (package + (name "cpplint") + (version "1.4.4") + (source + (origin + (method git-fetch) + ;; Fetch from github instead of pypi, since the test cases are not in + ;; the pypi archive. + (uri (git-reference + (url "https://github.com/cpplint/cpplint") + (commit version))) + (sha256 + (base32 "1ns9wbizr10w7rpyp106d7ip68s5nyskr54vw9bij11sci9z0v3j")) + (file-name (git-file-name name version)))) + (build-system python-build-system) + (home-page "https://github.com/cpplint/cpplint") + (synopsis "Static code checker for C++") + (description "@code{cpplint} is a command-line tool to check C/C++ files +for style issues following Google’s C++ style guide. While Google maintains +it's own version of the tool, this is a fork that aims to be more responsive +and make @code{cpplint} usable in wider contexts.") + (license license:bsd-3))) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 1509ff5d0d..ce36a6a8da 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -290,14 +290,13 @@ single step.") (define-public r-rvest (package (name "r-rvest") - (version "0.3.4") + (version "0.3.5") (source (origin (method url-fetch) (uri (cran-uri "rvest" version)) (sha256 - (base32 - "0ji5lk8g1gbv4d9c4jg1fg6rgsqrrwkm05j1id7drdw9kqdifgj1")))) + (base32 "0r0a5jic09xw5pk0x42pr99r3zab5m9s4x85ymx1sl769jz42zqf")))) (build-system r-build-system) (propagated-inputs `(("r-httr" ,r-httr) @@ -1296,14 +1295,14 @@ including functions for geolocation and routing.") (define-public r-haven (package (name "r-haven") - (version "2.1.1") + (version "2.2.0") (source (origin (method url-fetch) (uri (cran-uri "haven" version)) (sha256 (base32 - "12h64r2v2451igyl7v4w2kg0hzw9rnanph0m7smffq29ybkv9g4h")))) + "0g9d6mxqmrw2zdms78jpx2sx73pczlyy771v1h5hmxqz9sqyk7hr")))) (build-system r-build-system) (inputs `(("zlib" ,zlib))) @@ -1311,8 +1310,10 @@ including functions for geolocation and routing.") `(("r-forcats" ,r-forcats) ("r-hms" ,r-hms) ("r-rcpp" ,r-rcpp) + ("r-rlang" ,r-rlang) ("r-readr" ,r-readr) - ("r-tibble" ,r-tibble))) + ("r-tibble" ,r-tibble) + ("r-tidyselect" ,r-tidyselect))) (home-page "https://haven.tidyverse.org") (synopsis "Import and Export 'SPSS', 'Stata' and 'SAS' Files") (description @@ -1586,13 +1587,13 @@ you to rapidly iterate while developing a package.") (define-public r-rcpp (package (name "r-rcpp") - (version "1.0.2") + (version "1.0.3") (source (origin (method url-fetch) (uri (cran-uri "Rcpp" version)) (sha256 - (base32 "170jlmjrs92z5qdv58badhxycjvfjpqwwpic7rm13pc9zkb3i4xd")))) + (base32 "03h3zyjq948y0hrrs95lfk4zgx6wfrg64hjlrfrzf5na7bfh0d9b")))) (build-system r-build-system) (native-inputs `(("r-knitr" ,r-knitr))) ; for vignettes @@ -2056,14 +2057,13 @@ most popular ones.") (define-public r-sp (package (name "r-sp") - (version "1.3-1") + (version "1.3-2") (source (origin (method url-fetch) (uri (cran-uri "sp" version)) (sha256 - (base32 - "17xm1ig80p9wc860hm3bgishz6lj9fxgwqidj7rkbk4ap99qp62p")))) + (base32 "0kpjsqh3lzqp1m0avsvm54lazlgwfx3hyf0av3mvbyslsanj42ll")))) (build-system r-build-system) (propagated-inputs `(("r-lattice" ,r-lattice))) @@ -2584,14 +2584,14 @@ regression using Kernel Ridge Regression.") (define-public r-prodlim (package (name "r-prodlim") - (version "2018.04.18") + (version "2019.10.13") (source (origin (method url-fetch) (uri (cran-uri "prodlim" version)) (sha256 (base32 - "1aslq87sqwikh8chxc378r38146y7kv79zz0kcq3j93ivx7va8jb")))) + "0rsyfpz667y5cijmq33l318mrdw8r340khp72gcg8n490b1g0176")))) (build-system r-build-system) (propagated-inputs `(("r-kernsmooth" ,r-kernsmooth) @@ -3886,13 +3886,13 @@ iVAT).") (define-public r-xfun (package (name "r-xfun") - (version "0.10") + (version "0.11") (source (origin (method url-fetch) (uri (cran-uri "xfun" version)) (sha256 - (base32 "065ygh046ah43p5aqyrkv2vkxcnvnb4j7blfdygysg6hmqzp4pbv")))) + (base32 "0dncw6bqkal7nyarrrrj9arxy0y3nkdzmrbibcjh84m1cxd4phiw")))) (build-system r-build-system) (home-page "https://github.com/yihui/xfun") (synopsis "Miscellaneous functions") @@ -4030,14 +4030,14 @@ terminals.") (define-public r-tinytex (package (name "r-tinytex") - (version "0.16") + (version "0.17") (source (origin (method url-fetch) (uri (cran-uri "tinytex" version)) (sha256 (base32 - "1dadq9l0527v038b1k1dyfs0dklsgxnmplls3qhqprfgskif8mga")))) + "0mgxrbj4gam2gvxfk26nq820vsfjggj81m2l7j9m8vp361k15r0w")))) (build-system r-build-system) (propagated-inputs `(("r-xfun" ,r-xfun))) @@ -5266,17 +5266,19 @@ additional external tools on any platform.") (define-public r-openxlsx (package (name "r-openxlsx") - (version "4.1.0.1") + (version "4.1.3") (source (origin (method url-fetch) (uri (cran-uri "openxlsx" version)) (sha256 (base32 - "1lflygpi1z4rlb1c6g6wsmi334maiiy7jhpg6ph4sw8lpvg12w4b")))) + "087zivh9xdh1kk8zci67ys0m2xq0slzwgnf0jl05yy4gsgb6nmyx")))) (build-system r-build-system) (propagated-inputs `(("r-rcpp" ,r-rcpp) + ("r-rlang" ,r-rlang) + ("r-stringi" ,r-stringi) ("r-zip" ,r-zip))) (home-page "https://github.com/awalker89/openxlsx") (synopsis "Read, write and edit XLSX files") @@ -5467,26 +5469,52 @@ user's computer should be used to save data, caches and logs. It is a port of Python's @url{https://github.com/ActiveState/appdirs,Appdirs} to R.") (license license:expat))) +(define-public r-renv + (package + (name "r-renv") + (version "0.8.3") + (source + (origin + (method url-fetch) + (uri (cran-uri "renv" version)) + (sha256 + (base32 + "0034jlaq7z40q3hcpkjlaff37dpn46kvxvzw4scbwlw4x9q8sx9j")))) + (properties `((upstream-name . "renv"))) + (build-system r-build-system) + (home-page "https://rstudio.github.io/renv") + (synopsis "Project environments") + (description + "This package provides a dependency management toolkit for R. Using +renv, you can create and manage project-local R libraries, save the state of +these libraries to a lockfile, and later restore your library as required. +Together, these tools can help make your projects more isolated, portable, and +reproducible.") + (license license:expat))) + (define-public r-learnr (package (name "r-learnr") - (version "0.9.2.1") + (version "0.10.0") (source (origin (method url-fetch) (uri (cran-uri "learnr" version)) (sha256 (base32 - "0jbk0g6fkw7zs8ykzhsvh9vvz8xmc4v03bqzjsa5mmpxpqan5vx5")))) + "0278q9nbkc4nb0rp930kjrwyidf0v7y38d1s187m4f4bs7ha82k6")))) (build-system r-build-system) (propagated-inputs - `(("r-evaluate" ,r-evaluate) + `(("r-checkmate" ,r-checkmate) + ("r-ellipsis" ,r-ellipsis) + ("r-evaluate" ,r-evaluate) ("r-htmltools" ,r-htmltools) ("r-htmlwidgets" ,r-htmlwidgets) ("r-jsonlite" ,r-jsonlite) ("r-knitr" ,r-knitr) ("r-markdown" ,r-markdown) ("r-rappdirs" ,r-rappdirs) + ("r-renv" ,r-renv) ("r-rmarkdown" ,r-rmarkdown) ("r-rprojroot" ,r-rprojroot) ("r-shiny" ,r-shiny) @@ -5654,14 +5682,14 @@ and adds the annotation to the plot.") (define-public r-ggpubr (package (name "r-ggpubr") - (version "0.2.3") + (version "0.2.4") (source (origin (method url-fetch) (uri (cran-uri "ggpubr" version)) (sha256 (base32 - "0i81mmz4qn9yzcgfa6dhkcrx4ddlflkm2c3b40isc8all43rm8rn")))) + "0ln1gh3zlfx5s7zqcpvfdiksq74v1pma5kwkhc6r0riqnjjd19pf")))) (build-system r-build-system) (propagated-inputs `(("r-cowplot" ,r-cowplot) @@ -5936,14 +5964,14 @@ functions.") (define-public r-rjags (package (name "r-rjags") - (version "4-9") + (version "4-10") (source (origin (method url-fetch) (uri (cran-uri "rjags" version)) (sha256 (base32 - "1vrmxxfnia2mkmfkp5yaq5qrlh4xg3ggab6fnj14mrp1231wb91a")))) + "1nhaim84ww8fd6m8xlpmngqcnp2qpql29ahc38366fxja3ghngmx")))) (build-system r-build-system) (propagated-inputs `(("r-coda" ,r-coda))) @@ -5989,14 +6017,14 @@ references and Rd files.") (define-public r-officer (package (name "r-officer") - (version "0.3.5") + (version "0.3.6") (source (origin (method url-fetch) (uri (cran-uri "officer" version)) (sha256 (base32 - "005kaxjhr40shpav2pg7s7gj8f49579r7rbgwlncbwv16nn0rbbg")))) + "1i6jmnbkx7gd0qyf6akhizmxp7y1dh3h7a886mcbmrzka9d60zh4")))) (build-system r-build-system) (propagated-inputs `(("r-base64enc" ,r-base64enc) @@ -6309,14 +6337,14 @@ functions.") (define-public r-flextable (package (name "r-flextable") - (version "0.5.5") + (version "0.5.6") (source (origin (method url-fetch) (uri (cran-uri "flextable" version)) (sha256 (base32 - "1q6x9mfk5gikqjbbra1dn8hs1rq5ws99jdjav3m113gx9f2j5yxh")))) + "1f869f2dfqkzhf6yix7xcbs8rn1nwq3sg623h74zg6h1pl6px66w")))) (build-system r-build-system) (propagated-inputs `(("r-base64enc" ,r-base64enc) @@ -6685,14 +6713,14 @@ bootstrap. Confidence intervals can be computed for (p)AUC or ROC curves.") (define-public r-rootsolve (package (name "r-rootsolve") - (version "1.7") + (version "1.8.1") (source (origin (method url-fetch) (uri (cran-uri "rootSolve" version)) (sha256 (base32 - "08ic6ggcc5dw4nv9xsqkm3vnvswmxyhnqnv1rdjv1h2gy1ivpcq8")))) + "0skrspq7sd7gaq73w91km14v8znc8chncgy64hvjgcng2xw15phx")))) (properties `((upstream-name . "rootSolve"))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) @@ -6880,13 +6908,13 @@ second male (P2) based on the best fit distribution.") (define-public r-abcrf (package (name "r-abcrf") - (version "1.8") + (version "1.8.1") (source (origin (method url-fetch) (uri (cran-uri "abcrf" version)) (sha256 - (base32 "0r31ki89z8zzcffm0yvd2zw3q96rk6g6fnwwkql902mgajbrha1f")))) + (base32 "1ghbd24yhqy3xhdxas6ccn84nkavqpgldx5ck8kijknc7qjm8k27")))) (build-system r-build-system) (propagated-inputs `(("r-doparallel" ,r-doparallel) @@ -8275,14 +8303,14 @@ effects models and Bayesian models.") (define-public r-ggeffects (package (name "r-ggeffects") - (version "0.12.0") + (version "0.13.0") (source (origin (method url-fetch) (uri (cran-uri "ggeffects" version)) (sha256 (base32 - "0idfycjk05gyykfp9ibmhxfcjvd01ikh1dl0fb4nqw6znw3ar0xp")))) + "0ryfbaav0k874kbwmhbiv7fan93dmkpaimm1iw5kryjhhs3917lb")))) (build-system r-build-system) (propagated-inputs `(("r-dplyr" ,r-dplyr) @@ -8291,7 +8319,6 @@ effects models and Bayesian models.") ("r-mass" ,r-mass) ("r-purrr" ,r-purrr) ("r-rlang" ,r-rlang) - ("r-scales" ,r-scales) ("r-sjlabelled" ,r-sjlabelled) ("r-sjmisc" ,r-sjmisc))) (home-page "https://github.com/strengejacke/ggeffects") @@ -8922,14 +8949,14 @@ address a bug.") (define-public r-rcppannoy (package (name "r-rcppannoy") - (version "0.0.13") + (version "0.0.14") (source (origin (method url-fetch) (uri (cran-uri "RcppAnnoy" version)) (sha256 (base32 - "1jibp9b07c5ka1kif0nl7f168hxfvysj32wnmnxg85l663hmvm8j")))) + "1wiigx5g5788j6lyc3f6bs1rsvc4alyc3052g35hxl1giinxmhn4")))) (properties `((upstream-name . "RcppAnnoy"))) (build-system r-build-system) (propagated-inputs @@ -9124,14 +9151,13 @@ isosurfaces.") (define-public r-ks (package (name "r-ks") - (version "1.11.5") + (version "1.11.6") (source (origin (method url-fetch) (uri (cran-uri "ks" version)) (sha256 - (base32 - "06ymx244yknmpl6935l4pafqbm4gcbpnhqg7rinql6rrfr9mcrag")))) + (base32 "0hcccjfqnzdxkmnfzq8c5a7yhc138azwyl7rp29d1vl1jawwrwfq")))) (build-system r-build-system) (propagated-inputs `(("r-fnn" ,r-fnn) @@ -9583,13 +9609,13 @@ manipulate tree data.") (define-public r-rvcheck (package (name "r-rvcheck") - (version "0.1.5") + (version "0.1.6") (source (origin (method url-fetch) (uri (cran-uri "rvcheck" version)) (sha256 - (base32 "15222q3sglq0mad5q806p99fhrb96qizmpqw35fa1rb148f95paf")))) + (base32 "11n3qxapxcqsa0771s9q8n95kxmfyflya1d6wz4mm0lz0i6q55ia")))) (build-system r-build-system) (propagated-inputs `(("r-biocmanager" ,r-biocmanager) @@ -9987,14 +10013,13 @@ creating color scales and calculating color distances.") (define-public r-ore (package (name "r-ore") - (version "1.6.2") + (version "1.6.3") (source (origin (method url-fetch) (uri (cran-uri "ore" version)) (sha256 - (base32 - "1l1ziljgm5gwjhvjq42wi5vcwbxlaj5dl9w8bhz0wh8vx4ajj07m")))) + (base32 "1vh6w3arrhgkfjjjw7ci91xmz4wpfr3cmwd5zkqch89dgn07skkv")))) (build-system r-build-system) (home-page "https://github.com/jonclayden/ore") (synopsis "R interface to the Onigmo regular expression library") @@ -10878,13 +10903,13 @@ This makes it a convenient and fast interface to C/C++ and Fortran code.") (define-public r-spam (package (name "r-spam") - (version "2.3-0.2") + (version "2.4-0") (source (origin (method url-fetch) (uri (cran-uri "spam" version)) (sha256 - (base32 "0czmzwhvcs0shm1asvphhz366df3n7vrlls4cfpq5b3i19fak3w4")))) + (base32 "0xb7a0x1i93kzijr518m9plzmg8s3mxh5anwfx9xrkg5ipldvz10")))) (build-system r-build-system) (propagated-inputs `(("r-dotcall64" ,r-dotcall64))) @@ -10907,13 +10932,13 @@ Differences with other sparse matrix packages are: (define-public r-fields (package (name "r-fields") - (version "9.9") + (version "10.0") (source (origin (method url-fetch) (uri (cran-uri "fields" version)) (sha256 - (base32 "1qbqdqq76xgnlbc9z643zn4s8k493h1jmav2f465hfvp63306br6")))) + (base32 "173zm5vr236ydiq0v27qy0l3x7h9fc7jly38iakg77j26i0a01il")))) (build-system r-build-system) (propagated-inputs `(("r-maps" ,r-maps) @@ -11100,14 +11125,14 @@ putative directions).") (define-public r-rbamtools (package (name "r-rbamtools") - (version "2.16.11.2") + (version "2.16.17") (source (origin (method url-fetch) (uri (cran-uri "rbamtools" version)) (sha256 (base32 - "0gzkb1xyrkriv45wq8gv7qfwjslnvwkfkk5jjc4wg5kmm0ydpdzj")))) + "0qj37ljdva3v29s01dkrbg31mcfzy3bl145cp40d54v4h9xhcghc")))) (build-system r-build-system) (inputs `(("zlib" ,zlib))) (propagated-inputs @@ -11383,14 +11408,14 @@ them in distributed compute environments.") (define-public r-future (package (name "r-future") - (version "1.14.0") + (version "1.15.0") (source (origin (method url-fetch) (uri (cran-uri "future" version)) (sha256 (base32 - "1jyv2wlmpfqbk3hw269h4xg36na3wh1kd1lxmwdb40bsv4850lqa")))) + "1cbp7agb9lipjxsh7xm1yphh8a4hrjy7wrbkvhsxn1swh0c4s3b7")))) (build-system r-build-system) (propagated-inputs `(("r-digest" ,r-digest) @@ -13080,13 +13105,13 @@ either PDF/EPS files.") (define-public r-polspline (package (name "r-polspline") - (version "1.1.16") + (version "1.1.17") (source (origin (method url-fetch) (uri (cran-uri "polspline" version)) (sha256 - (base32 "0d49h7if8h6d784nsnqqxakg19kvl8cmz8k53901m2h0c0amlfxa")))) + (base32 "0c7fnxpqpy3hibiim4yib6l6bq363s97wwvllxp4lp8h06fjcyyn")))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) (home-page "https://cran.r-project.org/web/packages/polspline/") @@ -13336,13 +13361,13 @@ SELECT or UPDATE queries to an end-point.") (define-public r-bookdown (package (name "r-bookdown") - (version "0.14") + (version "0.15") (source (origin (method url-fetch) (uri (cran-uri "bookdown" version)) (sha256 (base32 - "1jiq2d292y0l3f4npyfzfpnmb0sqxsl212kkjfbjg5301h0na762")))) + "0pgkabaqsckaz8z1nlza84jp172jyzv17kx5dily43jfx5psy2ap")))) (build-system r-build-system) (propagated-inputs `(("r-htmltools" ,r-htmltools) @@ -13421,14 +13446,13 @@ data manipulation and visualization.") (define-public r-kernlab (package (name "r-kernlab") - (version "0.9-27") + (version "0.9-29") (source (origin (method url-fetch) (uri (cran-uri "kernlab" version)) (sha256 - (base32 - "1m0xqf6gyvwayz7w3c83y32ayvnlz0jicj8ijk808zq9sh7dbbgn")))) + (base32 "0vqhndl4zm7pvkfvq0f6i9cbrm7pij6kmdp7d7w39pa100x6knn3")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/kernlab") (synopsis "Kernel-based machine learning tools") @@ -13784,16 +13808,15 @@ consists of @code{grid} grobs and viewports that can then be manipulated with (define-public r-farver (package (name "r-farver") - (version "1.1.0") + (version "2.0.1") (source (origin (method url-fetch) (uri (cran-uri "farver" version)) (sha256 (base32 - "1dllgx121al374gyp9pjv1m8ip4imm8zhbgyh1970dsz2c4z71i0")))) + "0aq1hk561pz3s3lpay1adwsihha6mxp7zbj4n1m6307g34awlhhn")))) (build-system r-build-system) - (propagated-inputs `(("r-rcpp" ,r-rcpp))) (home-page "https://github.com/thomasp85/farver") (synopsis "Vectorized color conversion and comparison") (description @@ -14862,14 +14885,14 @@ includes data sets from oceanography.") (define-public r-ggfortify (package (name "r-ggfortify") - (version "0.4.7") + (version "0.4.8") (source (origin (method url-fetch) (uri (cran-uri "ggfortify" version)) (sha256 (base32 - "1wk9j0xg5hj9i1vf62qjiphv8cbsgq7y6baay3pfl3wyb2dwgci0")))) + "191q2z7w0l4v7swjlxs2hjgbjngw2838688s7ygnj0kigsm310f3")))) (build-system r-build-system) (propagated-inputs `(("r-dplyr" ,r-dplyr) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index a8f60f1665..2ae867f45b 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -132,7 +132,7 @@ communication, encryption, decryption, signatures, etc.") (define-public signify (package (name "signify") - (version "26") + (version "27") (home-page "https://github.com/aperezdc/signify") (source (origin (method url-fetch) @@ -140,7 +140,7 @@ communication, encryption, decryption, signatures, etc.") "/download/v" version "/signify-" version ".tar.xz")) (sha256 (base32 - "16sl1yq5bbsads5q4a0fbrf31b0x8r1hi4wagl90nbrhrca98baw")))) + "0ngjsqz95yb0knlw9zs02fnclif40s63r1mydgiv17ii3mds82df")))) (build-system gnu-build-system) ;; TODO Build with libwaive (described in README.md), to implement something ;; like OpenBSD's pledge(). @@ -734,14 +734,14 @@ SHA256, SHA512, SHA3, AICH, ED2K, Tiger, DC++ TTH, BitTorrent BTIH, GOST R (define-public botan (package (name "botan") - (version "2.7.0") + (version "2.12.1") (source (origin (method url-fetch) (uri (string-append "https://botan.randombit.net/releases/" - "Botan-" version ".tgz")) + "Botan-" version ".tar.xz")) (sha256 (base32 - "142aqabwc266jxn8wrp0f1ffrmcvdxwvyh8frb38hx9iaqazjbg4")))) + "1ada3ga7b0z4m0vjmxlvfi4nsic2l8kjcy85jwss3z2i58a5y0vy")))) (build-system gnu-build-system) (arguments '(#:phases @@ -750,12 +750,17 @@ SHA256, SHA512, SHA3, AICH, ED2K, Tiger, DC++ TTH, BitTorrent BTIH, GOST R (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref %outputs "out")) (lib (string-append out "/lib"))) + ;; Upstream tests and benchmarks with -O3. + (setenv "CXXFLAGS" "-O3") (invoke "python" "./configure.py" (string-append "--prefix=" out) ;; Otherwise, the `botan` executable cannot find ;; libbotan. (string-append "--ldflags=-Wl,-rpath=" lib) + + "--with-os-feature=getentropy" "--with-rst2man" + ;; Recommended by upstream "--with-zlib" "--with-bzip2" "--with-sqlite3")))) (replace 'check @@ -947,6 +952,7 @@ utility/testing functions.") (uri (git-reference (url "https://github.com/vstakhov/hpenc") (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 "1fb5yi3d2k8kd4zm7liiqagpz610y168xrr1cvn7cbq314jm2my1")))) diff --git a/gnu/packages/cryptsetup.scm b/gnu/packages/cryptsetup.scm index 3bb1388910..2a824d416e 100644 --- a/gnu/packages/cryptsetup.scm +++ b/gnu/packages/cryptsetup.scm @@ -35,7 +35,7 @@ (define-public cryptsetup (package (name "cryptsetup") - (version "2.2.1") + (version "2.2.2") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/utils/cryptsetup/v" @@ -43,7 +43,7 @@ "/cryptsetup-" version ".tar.xz")) (sha256 (base32 - "0q8w3khiwsw708169vahm0nccajsc2hwqz5gv6nb1g9qxlqrmrwl")))) + "0ija889kfhg4n2fshpq9yh2b1jl2ipvd7sfafh08g75ba6ayrw1a")))) (build-system gnu-build-system) (arguments `(#:configure-flags diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 72a75829fb..1f8e7bd179 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -420,14 +420,14 @@ should only be used as part of the Guix cups-pk-helper service.") (define-public hplip (package (name "hplip") - (version "3.19.8") + (version "3.19.11") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/hplip/hplip/" version "/hplip-" version ".tar.gz")) (sha256 (base32 - "0cmshi5dkmc1n5yiahhp0cv5p94zg61018piiqa2sna10ahgx1d3")) + "0lfmym225dr4qnssglqd0gyf0nmm7jpbzkdr1s2wyknmx8z7fx9x")) (modules '((guix build utils))) (patches (search-patches "hplip-remove-imageprocessor.patch")) (snippet @@ -492,54 +492,83 @@ should only be used as part of the Guix cups-pk-helper service.") (guix build utils) ((guix build python-build-system) #:prefix python:)) - #:phases (modify-phases %standard-phases - (add-after 'unpack 'fix-hard-coded-file-names - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - ;; FIXME: use merged ppds (I think actually only - ;; drvs need to be merged). - (cupsdir (assoc-ref inputs "cups-minimal"))) - (substitute* "base/g.py" - (("'/usr/share;[^']*'") - (string-append "'" cupsdir "/share'")) - (("'/etc/hp/hplip.conf'") - (string-append "'" out - "/etc/hp/hplip.conf" "'"))) - - (substitute* "Makefile.in" - (("[[:blank:]]check-plugin\\.py[[:blank:]]") " ") - ;; FIXME Use beginning-of-word in regexp. - (("[[:blank:]]plugin\\.py[[:blank:]]") " ") - (("/usr/include/libusb-1.0") - (string-append (assoc-ref inputs "libusb") - "/include/libusb-1.0")) - (("hplip_statedir =.*$") - ;; Don't bail out while trying to create - ;; /var/lib/hplip. We can safely change its value - ;; here because it's hard-coded in the code anyway. - "hplip_statedir = $(prefix)\n") - (("hplip_confdir = /etc/hp") - ;; This is only used for installing the default config. - (string-append "hplip_confdir = " out - "/etc/hp")) - (("halpredir = /usr/share/hal/fdi/preprobe/10osvendor") - ;; We don't use hal. - (string-append "halpredir = " out - "/share/hal/fdi/preprobe/10osvendor")) - (("rulesdir = /etc/udev/rules.d") - ;; udev rules will be merged by base service. - (string-append "rulesdir = " out - "/lib/udev/rules.d")) - (("rulessystemdir = /usr/lib/systemd/system") - ;; We don't use systemd. - (string-append "rulessystemdir = " out - "/lib/systemd/system")) - (("/etc/sane.d") - (string-append out "/etc/sane.d")))))) - - ;; Wrap bin/* so that the Python libraries are found. - (add-after 'install 'wrap-binaries - (assoc-ref python:%standard-phases 'wrap))))) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-hard-coded-file-names + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + ;; FIXME: use merged ppds (I think actually only + ;; drvs need to be merged). + (cupsdir (assoc-ref inputs "cups-minimal"))) + (substitute* "base/g.py" + (("'/usr/share;[^']*'") + (string-append "'" cupsdir "/share'")) + (("'/etc/hp/hplip.conf'") + (string-append "'" out + "/etc/hp/hplip.conf" "'"))) + + (substitute* "Makefile.in" + (("[[:blank:]]check-plugin\\.py[[:blank:]]") " ") + ;; FIXME Use beginning-of-word in regexp. + (("[[:blank:]]plugin\\.py[[:blank:]]") " ") + (("/usr/include/libusb-1.0") + (string-append (assoc-ref inputs "libusb") + "/include/libusb-1.0")) + (("hplip_statedir =.*$") + ;; Don't bail out while trying to create + ;; /var/lib/hplip. We can safely change its value + ;; here because it's hard-coded in the code anyway. + "hplip_statedir = $(prefix)\n") + (("hplip_confdir = /etc/hp") + ;; This is only used for installing the default config. + (string-append "hplip_confdir = " out + "/etc/hp")) + (("halpredir = /usr/share/hal/fdi/preprobe/10osvendor") + ;; We don't use hal. + (string-append "halpredir = " out + "/share/hal/fdi/preprobe/10osvendor")) + (("rulesdir = /etc/udev/rules.d") + ;; udev rules will be merged by base service. + (string-append "rulesdir = " out + "/lib/udev/rules.d")) + (("rulessystemdir = /usr/lib/systemd/system") + ;; We don't use systemd. + (string-append "rulessystemdir = " out + "/lib/systemd/system")) + (("/etc/sane.d") + (string-append out "/etc/sane.d")))))) + (add-after 'install 'wrap-binaries + ;; Scripts in /bin are all symlinks to .py files in /share/hplip. + ;; Symlinks are immune to the Python build system's 'WRAP phase, + ;; and the .py files can't be wrapped because they are reused as + ;; modules. Replacing the symlinks in /bin with copies and + ;; wrapping them also doesn't work (“ModuleNotFoundError: + ;; No module named 'base'”). Behold: a custom WRAP-PROGRAM. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (python (assoc-ref inputs "python"))) + (with-directory-excursion bin + (for-each (lambda (file) + (let ((target (readlink file))) + (delete-file file) + (with-output-to-file file + (lambda _ + (format #t + "#!~a~@ + export PYTHONPATH=\"~a:~a\"~@ + exec -a \"$0\" \"~a/~a\" \"$@\"~%" + (which "bash") + (string-append + out "/lib/python" + (python:python-version python) + "/site-packages") + (getenv "PYTHONPATH") + bin target))) + (chmod file #o755))) + (find-files "." (lambda (file stat) + (eq? 'symlink (stat:type stat))))) + #t))))))) ;; Note that the error messages printed by the tools in the case of ;; missing dependencies are often downright misleading. diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 669ee93819..9bf379ba27 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -324,7 +324,7 @@ ElasticSearch server") `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON" "-DLEVELDB_BUILD_TESTS=ON"))) (inputs `(("snappy" ,snappy))) - (home-page "http://leveldb.org/") + (home-page "https://github.com/google/leveldb") (synopsis "Fast key-value storage library") (description "LevelDB is a fast key-value storage library that provides an ordered @@ -2376,7 +2376,7 @@ implementation for Python.") #:configure-flags '("--without-internal-zlib" "--with-readline"))) (inputs - `(("openssl" ,openssl) + `(("openssl" ,openssl-1.0) ("net-tools" ,net-tools) ("readline" ,readline) ("zlib" ,zlib))) diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index 3372fc89e1..e4f79d8250 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -52,7 +52,7 @@ (origin (method url-fetch) (uri (list - (string-append "http://ftp.de.debian.org/debian/pool/main/d/delta/" + (string-append "mirror://debian/pool/main/d/delta/" "delta_" version ".orig.tar.gz") ;; This uri seems to send guix download into an infinite loop (string-append "http://delta.tigris.org/files/documents/3103/" diff --git a/gnu/packages/digest.scm b/gnu/packages/digest.scm index d5533bc474..7ec4ca1495 100644 --- a/gnu/packages/digest.scm +++ b/gnu/packages/digest.scm @@ -32,6 +32,7 @@ (uri (git-reference (url "https://github.com/Cyan4973/xxHash") (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 "137hifc3f3cb4ib64rd6y83arc9hmbyncgrij2v8m94mx66g2aks")))) (build-system gnu-build-system) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index ec4008bf19..8b3c180ebe 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -34,7 +34,9 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages bash) + #:use-module (gnu packages check) #:use-module (gnu packages databases) + #:use-module (gnu packages documentation) #:use-module (gnu packages compression) #:use-module (gnu packages crypto) #:use-module (gnu packages datastructures) @@ -46,6 +48,7 @@ #:use-module (gnu packages libevent) #:use-module (gnu packages libidn) #:use-module (gnu packages linux) + #:use-module (gnu packages lua) #:use-module (gnu packages ncurses) #:use-module (gnu packages nettle) #:use-module (gnu packages networking) @@ -54,6 +57,7 @@ #:use-module (gnu packages protobuf) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages sphinx) #:use-module (gnu packages swig) #:use-module (gnu packages tls) #:use-module (gnu packages web) @@ -65,6 +69,7 @@ #:use-module (guix git-download) #:use-module (guix utils) #:use-module (guix build-system gnu) + #:use-module (guix build-system meson) #:use-module (guix build-system trivial)) (define-public dnsmasq @@ -662,6 +667,73 @@ synthesis, and on-the-fly re-configuration.") license:public-domain ; src/contrib/fnv and possibly murmurhash3 license:gpl3+)))) ; everything else +(define-public knot-resolver + (package + (name "knot-resolver") + (version "4.2.2") + (source (origin + (method url-fetch) + (uri (string-append "https://secure.nic.cz/files/knot-resolver/" + "knot-resolver-" version ".tar.xz")) + (sha256 + (base32 + "0n0llpclhparq9wbcrymxkl5d03c4y4p3shcbdxfv6j22vzqvdh3")))) + (build-system meson-build-system) + (arguments + '(#:configure-flags + '("-Dmanaged_ta=disabled" ; We'll manage the DNS root data ourself. + "-Ddoc=enabled") + #:phases + (modify-phases %standard-phases + (add-after 'build 'build-doc + (lambda _ + (invoke "ninja" "doc"))) + (add-after 'install 'wrap-binary + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lua-* (map cdr (filter + (lambda (input) + (string-prefix? "lua-" (car input))) + inputs))) + (lua-path (lambda (p) + (string-append p "/share/lua/5.1/?.lua"))) + (lua-cpath (lambda (p) + (string-append p "/lib/lua/5.1/?.so")))) + (wrap-program (string-append out "/sbin/kresd") + `("LUA_PATH" ";" prefix ,(map lua-path lua-*)) + `("LUA_CPATH" ";" prefix ,(map lua-cpath lua-*))) + #t)))))) + (native-inputs + `(("cmocka" ,cmocka) ; for unit tests + ("doxygen" ,doxygen) + ("protobuf-c" ,protobuf-c) + ("pkg-config" ,pkg-config) + ("python-breathe" ,python-breathe) + ("python-sphinx" ,python-sphinx) + ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme))) + (inputs + `(("fstrm" ,fstrm) + ("gnutls" ,gnutls) + ("knot" ,knot) + ("libuv" ,libuv) + ("lmdb" ,lmdb) + ("luajit" ,luajit) + ;; TODO: Add optional lua modules: basexx, cqueues and psl. + ("lua-bitop" ,lua5.1-bitop) + ("lua-filesystem" ,lua5.1-filesystem) + ("lua-sec" ,lua5.1-sec) + ("lua-socket" ,lua5.1-socket))) + (home-page "https://www.knot-resolver.cz/") + (synopsis "Caching validating DNS resolver") + (description + "Knot Resolver is a caching full resolver implementation written in C and +LuaJIT, both a resolver library and a daemon.") + (license (list license:gpl3+ + ;; Some 'contrib' files are under MIT, CC0 and LGPL2. + license:expat + license:cc0 + license:lgpl2.0)))) + (define-public ddclient (package (name "ddclient") diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 69325449a1..70d2062448 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -317,7 +317,8 @@ built-in registry server of Docker.") (patches (search-patches "docker-engine-test-noinstall.patch" "docker-fix-tests.patch" - "docker-use-fewer-modprobes.patch")))) + "docker-use-fewer-modprobes.patch" + "docker-adjust-tests-for-changes-in-go.patch")))) (build-system gnu-build-system) (arguments `(#:modules diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 00d3d11813..5d7ddd2004 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -253,7 +253,7 @@ easy.") (define-public snap (package (name "snap") - (version "5.1.0") + (version "5.2.5") (source (origin (method git-fetch) @@ -263,7 +263,7 @@ easy.") (file-name (git-file-name name version)) (sha256 (base32 - "11fqbbvrv4zqbdz176ahczb2d797inq5n7zg74335d96m377si3f")))) + "0smlqxd8gqy26dlsal197848lhynv74m8myxs6fdlnzgva1f3zzw")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) @@ -487,14 +487,14 @@ letters of the alphabet, spelling, eye-hand coordination, etc.") (define-public fet (package (name "fet") - (version "5.39.0") + (version "5.40.2") (source (origin (method url-fetch) (uri (string-append "https://www.lalescu.ro/liviu/fet/download/" "fet-" version ".tar.bz2")) (sha256 (base32 - "100bmggkychqs2cavqxy7015lr4icw6k99qb03im0v4jasqqmyix")))) + "068zdvb3rys7vvkq33i2jh89c7svvdaqp0548k99jmhbd24xnhgh")))) (build-system gnu-build-system) (arguments `(#:phases diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm index 2261cb9fda..8bee8354e4 100644 --- a/gnu/packages/electronics.scm +++ b/gnu/packages/electronics.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Theodoros Foradis <theodoros@foradis.org> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2019 Clément Lassieur <clement@lassieur.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,10 +26,13 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) #:use-module (gnu packages) + #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages boost) #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages documentation) + #:use-module (gnu packages gawk) #:use-module (gnu packages glib) #:use-module (gnu packages graphviz) #:use-module (gnu packages libftdi) @@ -111,8 +115,18 @@ to take care of the OS-specific details when writing software that uses serial p (sha256 (base32 "18x5zj3xbcylvb651dia6n4zxbdnv0j62r5af60d0l2g68knkjg4")))) + (arguments + `(#:implicit-inputs? #f)) (native-inputs - `(("sdcc" ,sdcc))) + `(("awk" ,gawk) + ("bash" ,bash) + ("coreutils" ,coreutils) + ("grep" ,grep) + ("gzip" ,gzip) + ("make" ,gnu-make) + ("sdcc" ,sdcc) + ("sed" ,sed) + ("tar" ,tar))) (build-system gnu-build-system) (home-page "https://www.sigrok.org/wiki/Fx2lafw") (synopsis "Firmware for Cypress FX2 chips") diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm index 4f365cf205..75caa54296 100644 --- a/gnu/packages/elf.scm +++ b/gnu/packages/elf.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr> -;;; Copyright © 2017, 2018 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com> @@ -31,6 +31,7 @@ #:use-module (gnu packages) #:use-module (gnu packages compression) #:use-module (gnu packages documentation) + #:use-module (gnu packages gcc) #:use-module (gnu packages m4) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -198,7 +199,7 @@ static analysis of the ELF binaries at hand.") (define-public patchelf (package (name "patchelf") - (version "0.8") + (version "0.10") (source (origin (method url-fetch) (uri (string-append @@ -207,28 +208,24 @@ static analysis of the ELF binaries at hand.") "/patchelf-" version ".tar.bz2")) (sha256 (base32 - "1rqpg84wrd3fa16wa9vqdvasnc05yz49w207cz1l0wrl4k8q97y9")) - (patches (search-patches "patchelf-page-size.patch")))) + "1wzwvnlyf853hw9zgqq5522bvf8gqadk8icgqa41a5n7593csw7n")))) (build-system gnu-build-system) - - ;; XXX: The upstream 'patchelf' doesn't support ARM. The only available - ;; patch makes significant changes to the algorithm, possibly - ;; introducing bugs. So, we apply the patch only on ARM systems. - (inputs - (if (target-arm32?) - `(("patch/rework-for-arm" ,(search-patch - "patchelf-rework-for-arm.patch"))) - '())) (arguments - (if (target-arm32?) - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch/rework-for-arm - (lambda* (#:key inputs #:allow-other-keys) - (let ((patch-file (assoc-ref inputs "patch/rework-for-arm"))) - (invoke "patch" "--force" "-p1" "--input" patch-file)))))) - '())) - + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-tests + ;; Our GCC code ensures that RUNPATH is never empty, it includes + ;; at least glibc/lib and gcc:lib/lib. + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "tests/no-rpath.sh" + ;; Disable checking for an empty runpath: + (("^if test.*") "") + ;; Find libgcc_s.so, which is necessary for the test: + (("/xxxxxxxxxxxxxxx") (string-append (assoc-ref inputs "gcc:lib") + "/lib"))) + #t))))) + (native-inputs + `(("gcc:lib" ,gcc "lib"))) (home-page "https://nixos.org/patchelf.html") (synopsis "Modify the dynamic linker and RPATH of ELF executables") (description diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 36b1c6aa13..1bd596bd06 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -55,6 +55,8 @@ ;;; Copyright © 2019 Jelle Licht <jlicht@fsfe.org> ;;; Copyright © 2019 Björn Höfling <bjoern.hoefling@bjoernhoefling.de> ;;; Copyright © 2019 Stephen Webber <montokapro@gmail.com> +;;; Copyright © 2019 Leo Prikler <leo.prikler@student.tugraz.at> +;;; Copyright © 2019 David Wilson <david@daviwil.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -89,6 +91,7 @@ #:use-module (gnu packages bash) #:use-module (gnu packages cmake) #:use-module (gnu packages code) + #:use-module (gnu packages cpp) #:use-module (gnu packages curl) #:use-module (gnu packages databases) #:use-module (gnu packages dictionaries) @@ -620,6 +623,7 @@ handful of functions that are not resource-specific.") (uri (git-reference (url "https://github.com/emacs-pe/scribble-mode.git") (commit commit))) + (file-name (git-file-name name version)) (sha256 (base32 "1s5ccw1a5ack01wd94ywfcrar9j98agchwdh30q7iyxr0d2z4sii")))) @@ -1219,14 +1223,14 @@ or unexpected behavior inside an elisp configuration file (typically (define-public emacs-emms (package (name "emacs-emms") - (version "5.2") + (version "5.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/emms/emms-" version ".tar.gz")) (sha256 (base32 - "0cvpfdkagkpi8g02w8f7wzrpdk2ihas0mn5m9fr882xjdfshl21z")) + "00hnv7jjgb2simgrf7gf2y1cyg2syk7kj1hkbac146hlgxk8ngj1")) (modules '((guix build utils))) (snippet '(begin @@ -1578,17 +1582,14 @@ as a library for other Emacs packages.") (define-public emacs-auctex (package (name "emacs-auctex") - (version "12.1.2") + (version "12.2.0") (source (origin (method url-fetch) - (uri (string-append - "https://elpa.gnu.org/packages/auctex-" - version - ".tar")) + (uri (string-append "https://elpa.gnu.org/packages/auctex-" + version ".tar")) (sha256 - (base32 - "1yibg2anpmyr2a27wm4xqjsvsi9km2jzb56bf7cwyj8dnjfsd11n")))) + (base32 "0j919l3q5sq6h1k1kmk4kyv0vkzl4f98fxcd64v34x5q1ahjhg48")))) (build-system emacs-build-system) ;; We use 'emacs' because AUCTeX requires dbus at compile time ;; ('emacs-minimal' does not provide dbus). @@ -4817,6 +4818,7 @@ package provides a light and a dark variant.") (uri (git-reference (url "https://github.com/kunalb/poet.git") (commit commit))) + (file-name (git-file-name name version)) (sha256 (base32 "0a84jdaj619mb59a46dmkk2sfs42rylqk9ryl1drgs8d3lia79mz")))) @@ -4878,6 +4880,30 @@ is to keep colors easily distinguishable, contrast enough and still pleasant for the eyes.") (license license:expat))) ; MIT license +(define-public emacs-spacegray-theme + (let ((commit "9826265c2bceb2ebc1c5e16a45021da0253ace97") + (revision "0")) + (package + (name "emacs-spacegray-theme") + (version (git-version "0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/bruce/emacs-spacegray-theme.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0aplwmm17ypbns5blc4rf5rr6dasj0zp5ibykpfl43fh4bd8z89n")))) + (build-system emacs-build-system) + (home-page "https://github.com/bruce/emacs-spacegray-theme") + (synopsis "Port of Sublime Text's Spacegray theme for Emacs") + (description + "@code{spacegray-theme} is an Emacs port of the Spacegray theme from +Sublime Text. It features a dark blue/gray background and soft blue, green, +orange and red as accent colors.") + (license license:expat)))) ; MIT license + (define-public emacs-2048-game (package (name "emacs-2048-game") @@ -7439,8 +7465,8 @@ extensions.") (license license:gpl3+))) (define-public emacs-evil-collection - (let ((commit "38e916d5d56b391f1ad4c72ad3909491e86cda3c") - (revision "12")) + (let ((commit "eb36c82a84d313e961777dc78fd4ff1d718efdf6") + (revision "13")) (package (name "emacs-evil-collection") (version (git-version "0.0.3" revision commit)) @@ -7452,7 +7478,7 @@ extensions.") (file-name (git-file-name name version)) (sha256 (base32 - "00a1ya3c92ymhfj4ai1ygljnxa147d4cgi6jmvccngicphn99782")))) + "0wi84x9176y4xjl7zpn882achfamx3a2ixlj4nvflxfh6q1qg7bz")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-evil" ,emacs-evil) @@ -8898,6 +8924,7 @@ actually changing the buffer's text.") (uri (git-reference (url "https://github.com/dgutov/diff-hl") (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 "1xlsg728mz3cwhrsqvisa0aidic67nymd9g7h4c1h3q63j39yb2s")))) @@ -8959,6 +8986,36 @@ configuration in your @file{.emacs} file in a way that is both performance-oriented and tidy.") (license license:gpl2+))) +(define-public emacs-leaf + (package + (name "emacs-leaf") + (version "3.5.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/conao3/leaf.el.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1rgd59146wad92yc64las0qgx67k2ifgsw1vwhp40xvkd7kb0r6d")))) + (build-system emacs-build-system) + (home-page "https://github.com/conao3/leaf.el") + (arguments + `(#:tests? #t + #:test-command '("emacs" "--batch" + "-l" "leaf-tests.el" + "-f" "cort-test-run"))) + (synopsis + "Simplify your init.el configuration, extended use-package") + (description + "This package provides macros that allows you to declaratively configure +settings typical of an Elisp package with various keywords. The syntax is +similar, but not identical to use-package -- overall, leaf aims at a cleaner +and more predictable implementation.") + (license license:agpl3+))) + (define-public emacs-strace-mode (let* ((commit "6a69b4b06db6797af56f33eda5cb28af94e59f11") (revision "1")) @@ -10368,7 +10425,7 @@ the nick color and the background color (define-public emacs-engine-mode (package (name "emacs-engine-mode") - (version "2.0.0") + (version "2.1.1") (source (origin (method git-fetch) @@ -10377,7 +10434,7 @@ the nick color and the background color (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "02xas46nl28mascqsyr1zcd4hn15bh0fjv2xlxv1kmrj0pis94ml")))) + (base32 "1xka8i4cdvp5r2v2mkli1zz17x1sdsnmszbhqav2rf94v656d91i")))) (build-system emacs-build-system) (synopsis "Minor mode for defining and querying search engines") (description "@code{engine-mode} is a global minor mode for Emacs. It @@ -10488,6 +10545,7 @@ It supports dired buffers and opens them in tree mode at destination.") (uri (git-reference (url "https://github.com/abo-abo/tiny.git") (commit commit))) + (file-name (git-file-name name version)) (sha256 (base32 "1498j392ap2mk4zmsm2id16pfgvj78r428da9vw7hdrzzibai2cx")))) @@ -10543,6 +10601,7 @@ well as Github-style emojis like @code{:smile:}. It provides a minor mode (uri (git-reference (url "https://github.com/abo-abo/make-it-so") (commit commit))) + (file-name (git-file-name name version)) (sha256 (base32 "0p6xhyinzzkrwzbpxqfm8hlii0ikvmmylya240bwsa77w0g1k6xq")))) @@ -10572,6 +10631,7 @@ included by default, and more can be readily added.") (uri (git-reference (url "https://github.com/sindikat/unidecode") (commit commit))) + (file-name (git-file-name name version)) (sha256 (base32 "03x3nakbhmakwm977mwrf8jifvjnfwzpjv6wrwpizbqjnkgfchmn")))) @@ -11418,6 +11478,7 @@ functionality is inherited from @code{hcl-mode}.") (uri (git-reference (url "https://github.com/purcell/exec-path-from-shell") (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 "1ga8bpxngd3ph2hdiik92c612ki71qxw818i6rgx6f6a5r0sbf3p")))) @@ -11498,6 +11559,7 @@ to with quicklink-style selections.") (uri (git-reference (url "https://github.com/jrblevin/deft.git") (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 "0z7cilgiz6krvl5h2z72hkch43qxmypb0k6p5vxn5lx1p6v0mrf2")))) @@ -11587,6 +11649,7 @@ used with SGML-like languages: XML, HTML, XHTML, XSL, etc.") (uri (git-reference (url "https://github.com/ergoemacs/ergoemacs-mode.git") (commit commit))) + (file-name (git-file-name name version)) (sha256 (base32 "1s3b9bridl78hh1mxmdk9nqlmqhibbaxk0a1cixmsf23s06w8w6l")))) @@ -15088,7 +15151,7 @@ cohesion with the Emacs Way.") (define-public emacs-fish-completion (package (name "emacs-fish-completion") - (version "1.1") + (version "1.2") (source (origin (method git-fetch) @@ -15098,7 +15161,7 @@ cohesion with the Emacs Way.") (file-name (git-file-name name version)) (sha256 (base32 - "1pjqnbyjmj64q5nwq1mrdxcls4fp5y0b6zqs785i0s6wdvrm4021")))) + "17lqip1i1rrsvxzz4bx9rqf1fvwd3hriwg3sj6qxmfc8pylnp37q")))) (build-system emacs-build-system) (inputs `(("fish" ,fish))) (arguments @@ -15147,6 +15210,7 @@ try completing. See @code{fish-completion-fallback-on-bash-p}.") (uri (git-reference (url "https://gitlab.com/Ambrevar/emacs-gif-screencast.git") (commit commit))) + (file-name (git-file-name name version)) (sha256 (base32 "19xqi5mgalnnhb4hw0fh7py2s2dllldx1xxbhwhknkdpifai8hl8")))) @@ -15303,6 +15367,7 @@ from @code{emms-source-file-default-directory}.") (uri (git-reference (url "https://github.com/emacs-helm/helm-exwm.git") (commit commit))) + (file-name (git-file-name name version)) (sha256 (base32 "064ziinqa5sdv7rfjn0y278l12kld176fr88k4h78pgf2f2n7cd8")))) (build-system emacs-build-system) @@ -15393,6 +15458,7 @@ projects unrelated to current-buffer. (uri (git-reference (url "https://github.com/emacs-helm/helm-mu.git") (commit commit))) + (file-name (git-file-name name version)) (sha256 (base32 "1lh0ahxdc5b2z18m9p30gwg8sbg33sjwkjr38p7h5xsm5fm7i0fz")))) (build-system emacs-build-system) @@ -15870,13 +15936,41 @@ and 'text viewing modes' respectively.") (version "0.6.6") (source (origin - (method url-fetch) - (uri (string-append "https://stable.melpa.org/packages/adoc-mode-" - version ".el")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/sensorflo/adoc-mode.git") + (commit (string-append "V" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1c6hrgxxsnl2c19rgjykpm7r4xg9lp6bmk5z6bi7g8pqlrgwffcy")))) + "0kp2aafjhqxz3mjr9hkkss85r4n51chws5a2qj1xzb63dh36liwm")))) (build-system emacs-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; See: https://github.com/sensorflo/adoc-mode/issues/39. + (add-after 'unpack 'disable-failing-tests + (lambda _ + (let-syntax + ((disable-tests + (syntax-rules () + ((_ file ()) + (syntax-error "test names list must not be empty")) + ((_ file (test-name ...)) + (substitute* file + (((string-append "^\\(ert-deftest " test-name ".*") all) + (string-append all "(skip-unless nil)\n")) ...))))) + (disable-tests "adoc-mode-test.el" + ("adoctest-test-tempo-delimited-blocks" + "adoctest-test-tempo-macros" + "adoctest-test-tempo-paragraphs" + "adoctest-test-tempo-passthroug-macros" + "adoctest-test-tempo-quotes"))) + #t))) + #:tests? #t + #:test-command '("emacs" "-Q" "-batch" + "-l" "adoc-mode-test.el" + "-f" "ert-run-tests-batch-and-exit"))) (propagated-inputs `(("emacs-markup-faces" ,emacs-markup-faces))) (home-page "https://github.com/sensorflo/adoc-mode/wiki") @@ -17753,7 +17847,7 @@ a suffix) we prefer to call it just a \"transient\".") (invoke "makeinfo" "forge.texi") (install-file "forge.info" info) #t))))))) - (home-page "https://github.com/magit/ghub/") + (home-page "https://github.com/magit/forge/") (synopsis "Access Git forges from Magit") (description "Work with Git forges, such as Github and Gitlab, from the comfort of @@ -18672,6 +18766,29 @@ well as an option for visually flashing evaluated s-expressions.") SSH servers.") (license license:gpl3+))) +(define-public emacs-tramp-auto-auth + (let ((commit "f15a12dfab651aff60f4a9d70f868030a12344ac")) + (package + (name "emacs-tramp-auto-auth") + (version (git-version "20191027" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/oitofelix/tramp-auto-auth.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "09nkjgwppjfgv04q0gv468qihgx4y3p39lpwbd6vbh3wgbccas9k")))) + (build-system emacs-build-system) + (home-page "https://github.com/oitofelix/tramp-auto-auth") + (synopsis "TRAMP automatic authentication library") + (description "This package provides @code{tramp-auto-auth-mode} Emacs +global minor mode whose purpose is to automatically feed TRAMP sub-processes +with passwords for paths matching regexps.") + (license license:gpl3+)))) + (define-public emacs-eacl (package (name "emacs-eacl") @@ -19623,3 +19740,159 @@ minibuffer or an each area message). The contents and aspect is controlled by the @code{minibuffer-line-format} variable and the @code{minibuffer-line} face.") (license license:gpl3+))) + +(define-public emacs-eshell-prompt-extras + (package + (name "emacs-eshell-prompt-extras") + (version "1.0") + (home-page "https://github.com/zwild/eshell-prompt-extras") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0gb07mns23dgqqr6qfy7d6ndizy15sqgbgfaig6k5xbjnwi02v9g")))) + (build-system emacs-build-system) + (synopsis "Display extra information and color for your Eshell prompt") + (description "This library displays various customizable elements for +@code{eshell} prompts: remote user, remote host, python virtual environment +info, git branch, git dirty info and git unpushed number. Multiple themes are +available.") + (license license:gpl3+))) + +(define-public emacs-eshell-did-you-mean + (package + (name "emacs-eshell-did-you-mean") + (version "0.1") + (home-page "https://github.com/xuchunyang/eshell-did-you-mean") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0v0wshck5n4hspcv1zk1g2nm6xiigcjp16lx0dc8wzkl6ymljvbg")))) + (build-system emacs-build-system) + (synopsis "Display suggestions on 'command not found' in Eshell") + (description "This library adds a list of 'Did you mean...' suggestions +when the command was not found in Eshell. The suggestions are found after the +commands that bear resemblance to the input command.") + (license license:gpl3+))) + +(define-public emacs-unfill + (package + (name "emacs-unfill") + (version "0.2") + (home-page "https://github.com/purcell/unfill") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0wyradin5igp25nsd3n22i2ppxhmy49ac1iq1w2715v8pfmiydnc")))) + (build-system emacs-build-system) + (synopsis "Inverse of Emacs' @code{fill-paragraph} and @code{fill-region}") + (description + "The functions in this package provide the inverse of Emacs' +@code{fill-paragraph} and @code{fill-region}.") + (license license:gpl3+))) + +(define-public emacs-windower + (package + (name "emacs-windower") + (version "0.0.1") + (home-page "https://gitlab.com/ambrevar/emacs-windower") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0h24gb1ip0czfasxm8wwcc3v19g7mznzw2sxkmmfb5iis59p7dfy")))) + (build-system emacs-build-system) + (synopsis "Helper functions for window manipulation in Emacs") + (description + "This package provides helper functions for window manipulation in Emacs, +such as: + +@itemize +- switch to last buffer, +- toggle single window display, +- toggle between horizontal and vertical splits, +- move borders more naturally, +- swap windows à-la @code{windmove}. +@end itemize\n") + (license license:gpl3+))) + +(define-public emacs-flycheck-cpplint + (let ((commit "1d8a090861572258ab704915263feeb3a436c3d2") + (revision "1")) + (package + (name "emacs-flycheck-cpplint") + (version (git-version "0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/flycheck/flycheck-google-cpplint") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0l6sg83f6z8x2alnblpv03rj442sbnkkkcbf8i0agjmx3713a5yx")))) + (build-system emacs-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'set-cpplint-path + (lambda _ + (substitute* "flycheck-google-cpplint.el" + (("\"cpplint.py\"") + (string-append "\"" (which "cpplint") "\""))) + #t))))) + (inputs + `(("cpplint" ,cpplint))) + (propagated-inputs + `(("flycheck-mode" ,emacs-flycheck))) + (synopsis "Google C++ checker for Flycheck") + (description "This package provides a interface for @code{cpplint} over +Flycheck plugin. @code{cpplint} is a static code checker for C++, following +Google guidelines.") + (home-page "https://github.com/flycheck/flycheck-google-cpplint") + (license license:gpl3+)))) + +(define-public emacs-helm-fish-completion + (let ((commit "ef764dd123040fe67ef8b62a1c13842e940b0963") + (revision "1")) + (package + (name "emacs-helm-fish-completion") + (version (git-version "0.1" revision commit)) + (home-page "https://github.com/emacs-helm/helm-fish-completion") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0k80kpapwfq2rv1lb0r994d0w6czl92xrmnkmrg0a05f4b3q0lb4")))) + (build-system emacs-build-system) + (propagated-inputs + `(("helm" ,emacs-helm) + ("fish-completion" ,emacs-fish-completion))) + (synopsis "Helm interface for Emacs fish-completion") + (description "Helm Fish Completion is a Helm interface for Emacs +fish-completion. It can be used in both Eshell and M-x shell.") + (license license:gpl3+)))) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index b7ad855a8c..72a9b6e40d 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1053,7 +1053,7 @@ emulation community. It provides highly accurate emulation.") (define-public retroarch (package (name "retroarch") - (version "1.8.0") + (version "1.8.1") (source (origin (method git-fetch) @@ -1062,7 +1062,7 @@ emulation community. It provides highly accurate emulation.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1mgszd8gb5nk08kfykap9b1l5rl4qfy39dbba8crjj0zkc4z1jga")))) + (base32 "0y7rcpz7psf8k3agsrq277jdm651vbnn9xpqvmj2in1a786idya7")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests @@ -1188,7 +1188,7 @@ play them on systems for which they were never designed!") (define-public mame (package (name "mame") - (version "0.214") + (version "0.215") (source (origin (method git-fetch) @@ -1198,7 +1198,7 @@ play them on systems for which they were never designed!") (file-name (git-file-name name version)) (sha256 (base32 - "129yk3ybcviscy2xk1mkkzxm4h4nh5p6ndfgqbmcx547p1s6hbja")) + "1fj2qahi0fpn41zxph06wdgjashy6vsgj0gqfly8hvcmv99r3d65")) (modules '((guix build utils))) (snippet ;; Remove bundled libraries. diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index d1626f0342..294105a757 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -767,48 +767,27 @@ language.") (define-public kicad (package (name "kicad") - (version "5.0.2") + (version "5.1.4") (source (origin (method url-fetch) (file-name (string-append name "-" version ".tar.xz")) (uri (string-append - "https://launchpad.net/kicad/" (version-major+minor version) - "/" version "/+download/kicad-" version ".tar.xz")) + "https://launchpad.net/kicad/" (version-major version) + ".0/" version "/+download/kicad-" version ".tar.xz")) (sha256 - (base32 "10605rr10x0353n6yk2z095ydnkd1i6j1ncbq64pfxdn5vkhcd1g")))) + (base32 "1r60dgh6aalbpq1wsmpyxkz0nn4ck8ydfdjcrblpl69k5rks5k2j")))) (build-system cmake-build-system) (arguments `(#:out-of-source? #t #:tests? #f ; no tests #:build-type "Release" #:configure-flags - (list "-DKICAD_STABLE_VERSION=ON" - "-DKICAD_REPO_NAME=stable" - "-DKICAD_SKIP_BOOST=ON"; Use our system's boost library. - "-DKICAD_SCRIPTING=ON" - "-DKICAD_SCRIPTING_MODULES=ON" - "-DKICAD_SCRIPTING_WXPYTHON=ON" - ;; Has to be set explicitly, as we don't have the wxPython - ;; headers in the wxwidgets store item, but in wxPython. - (string-append "-DCMAKE_CXX_FLAGS=-I" - (assoc-ref %build-inputs "wxpython") - "/include/wx-" - ,(version-major+minor - (package-version python2-wxpython))) - "-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE" - "-DKICAD_SPICE=TRUE" - ;; TODO: Enable this when CA certs are working with curl. - "-DBUILD_GITHUB_PLUGIN=OFF") + (list "-DKICAD_SCRIPTING_PYTHON3=ON" + "-DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON" + "-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE") #:phases (modify-phases %standard-phases - (add-after 'unpack 'adjust-boost-include - (lambda _ - ;; The location of this header changed in Boost 1.66. - (substitute* "3d-viewer/3d_cache/3d_cache.cpp" - (("boost/uuid/sha1\\.hpp") - "boost/uuid/detail/sha1.hpp")) - #t)) (add-after 'install 'wrap-program ;; Ensure correct Python at runtime. (lambda* (#:key inputs outputs #:allow-other-keys) @@ -845,9 +824,9 @@ language.") ("mesa" ,mesa) ("opencascade-oce" ,opencascade-oce) ("openssl" ,openssl) - ("python" ,python-2) - ("wxwidgets" ,wxwidgets-gtk2) - ("wxpython" ,python2-wxpython))) + ("python" ,python) + ("wxwidgets" ,wxwidgets) + ("wxpython" ,python-wxpython))) (home-page "http://kicad-pcb.org/") (synopsis "Electronics Design Automation Suite") (description "Kicad is a program for the formation of printed circuit @@ -921,7 +900,7 @@ render model libraries.") (define-public kicad-symbols (package (name "kicad-symbols") - (version "5.0.2") + (version "5.1.4") (source (origin (method git-fetch) (uri (git-reference @@ -930,7 +909,7 @@ render model libraries.") (file-name (git-file-name name version)) (sha256 (base32 - "1rjh2pjcrc3bhcgyyskj5pssm7vffrjk0ymwr70fb7sjpmk96yjk")))) + "1lna4xlvzrxif3569pkp6mrg7fj62z3a3ri5j97lnmnnzhiddnh3")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; No tests exist @@ -2007,6 +1986,7 @@ editors.") (uri (git-reference (url "https://github.com/markwal/GPX.git") (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 "1yab269x8qyf7rd04vaxyqyjv4pzz9lp4sc4dwh927k23avr3rw5")))) @@ -2224,7 +2204,7 @@ full programmatic control over your models.") (define-public freecad (package (name "freecad") - (version "0.18.3") + (version "0.18.4") (source (origin (method git-fetch) @@ -2234,7 +2214,7 @@ full programmatic control over your models.") (file-name (git-file-name name version)) (sha256 (base32 - "1ny29y0h8smg1bwi5yn4kcnyfprqh3v7v2z8837cmmhcwp8dr95m")))) + "170hk1kgrvsddrwykp24wyj0cha78zzmzbf50gn98x7ngqqs395s")))) (build-system cmake-build-system) (native-inputs `(("doxygen" ,doxygen) @@ -2427,7 +2407,7 @@ or the official 3dxserv, as if they were using the magellan SDK. Also, libspnav provides a magellan API wrapper on top of the new API. So, any applications that were using the magellan library, can switch to libspnav -without any changes. And programmers that are familliar with the magellan API +without any changes. And programmers that are familiar with the magellan API can continue using it with a free library without the restrictions of the official SDK.") (license license:bsd-3))) diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index c49e6cf66b..262a39d828 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -69,7 +69,7 @@ (define-public efl (package (name "efl") - (version "1.23.1") + (version "1.23.2") (source (origin (method url-fetch) (uri (string-append @@ -77,7 +77,7 @@ version ".tar.xz")) (sha256 (base32 - "0q9g4j7k10s1a8rv2ca9v9lydh7ml3zsrqvgncc4qhvdl76208nn")))) + "14yljnnmb89s8j6ip08ip5d01zkgzbzr1h4fr4bwk9lh8r59x3ds")))) (build-system meson-build-system) (native-inputs `(("check" ,check) diff --git a/gnu/packages/fabric-management.scm b/gnu/packages/fabric-management.scm index 56ff18f4c5..becf877f08 100644 --- a/gnu/packages/fabric-management.scm +++ b/gnu/packages/fabric-management.scm @@ -195,6 +195,8 @@ testing InfiniBand networks.") (arguments '( ;; These are some of the flags found in 'contrib/configure-release'. #:configure-flags (list + "--disable-static" + ;; XXX: Disable optimizations specific to the build ;; machine (AVX, etc.) There's apparently no way to ;; have them picked up at load time. @@ -205,6 +207,10 @@ testing InfiniBand networks.") "--disable-assertions" "--disable-params-check" + (string-append "--with-verbs=" + (assoc-ref %build-inputs + "rdma-core")) + (string-append "--with-rdmacm=" (assoc-ref %build-inputs "rdma-core"))) diff --git a/gnu/packages/fcitx.scm b/gnu/packages/fcitx.scm index b05d9b7146..e699d7d59d 100644 --- a/gnu/packages/fcitx.scm +++ b/gnu/packages/fcitx.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com> -;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,20 +30,21 @@ #:use-module (gnu packages icu4c) #:use-module (gnu packages iso-codes) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages web) #:use-module (gnu packages xml) #:use-module (gnu packages xorg)) (define-public fcitx (package (name "fcitx") - (version "4.2.9.6") + (version "4.2.9.7") (source (origin (method url-fetch) (uri (string-append "http://download.fcitx-im.org/fcitx/" - name "-" version "_dict.tar.xz")) + "fcitx-" version "_dict.tar.xz")) (sha256 (base32 - "0hyrh3v82a32ylnlvzrp6cmq56x4p1a42q5xc6njmmj2msxm34x5")))) + "13vg7yzfq0vj2r8zdf9ly3n243nwwggkhd5qv3z6yqdyj0m3ncyg")))) (build-system cmake-build-system) (outputs '("out" "gtk2" "gtk3")) (arguments @@ -81,6 +82,7 @@ ("gtk3" ,gtk+) ("icu4c" ,icu4c) ("iso-codes" ,iso-codes) + ("json-c" ,json-c) ("libxkbfile" ,libxkbfile) ("libxml2" ,libxml2) ("xkeyboard-config" ,xkeyboard-config))) @@ -99,7 +101,7 @@ built-in.") (source (origin (method url-fetch) (uri (string-append "https://download.fcitx-im.org/fcitx-configtool/" - name "-" version ".tar.xz")) + "fcitx-configtool-" version ".tar.xz")) (sha256 (base32 "1yyi9jhkwn49lx9a47k1zbvwgazv4y4z72gnqgzdpgdzfrlrgi5w")))) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 68bd2f97c5..8a3b5402d4 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2019 Tanguy Le Carrour <tanguy@bioneland.org> ;;; Copyright © 2019 Martin Becze <mjbecze@riseup.net> +;;; Copyright © 2019 Sebastian Schott <sschott@mailbox.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -152,6 +153,34 @@ of the bitcoin protocol. This package provides the Bitcoin Core command line client and a client based on Qt.") (license license:expat))) +(define-public homebank + (package + (name "homebank") + (version "5.2.8") + (source (origin + (method url-fetch) + (uri (string-append "http://homebank.free.fr/public/homebank-" + version ".tar.gz")) + (sha256 + (base32 + "13ampiv68y30kc0p2560g3yz8whqpwnidfcnb9lndv93b9ca767y")))) + (build-system glib-or-gtk-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("intltool" ,intltool))) + (inputs + `(("gtk+" ,gtk+) + ("libsoup" ,libsoup))) + (arguments + `(#:configure-flags (list "-without-ofx"))) ; libofx is not available yet + (home-page "http://homebank.free.fr/") + (synopsis "Graphical personal accounting application") + (description "HomeBank allows you to manage your personal accounts at +home. The seeks to be lightweight, simple and easy to use. It brings +features that allow you to analyze your finances in a detailed way instantly +and dynamically with report tools based on filtering and graphical charts.") + (license license:gpl2+))) + (define-public ledger (package (name "ledger") @@ -453,7 +482,7 @@ other machines/servers. Electroncash does not download the Bitcoin Cash blockch ;; the system's dynamically linked library. (package (name "monero") - (version "0.14.1.2") + (version "0.15.0.0") (source (origin (method git-fetch) @@ -474,7 +503,7 @@ other machines/servers. Electroncash does not download the Bitcoin Cash blockch #t)) (sha256 (base32 - "00zl883c7lcd9z7g4y3vv7rxmr7ppzrxdblnhk32r9l3qzyw55r6")))) + "19y4kcj4agws7swfa3draysb1y18c3xb13r8cg0faxx1dlm0zbnr")))) (build-system cmake-build-system) (native-inputs `(("doxygen" ,doxygen) @@ -547,13 +576,18 @@ other machines/servers. Electroncash does not download the Bitcoin Cash blockch (invoke "tests/unit_tests/unit_tests" (string-append "--gtest_filter=-" excluded-unit-tests))))) + (add-after 'install 'install-librandomx + (lambda* (#:key outputs #:allow-other-keys) + (let ((lib (string-append (assoc-ref outputs "out") "/lib"))) + (install-file "external/randomx/librandomx.a" lib) + #t))) (add-after 'install 'delete-dead-links (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (delete-file (string-append out "/lib/libprotobuf.so")) (delete-file (string-append out "/lib/libusb-1.0.so")) #t)))))) - (home-page "https://getmonero.org/") + (home-page "https://web.getmonero.org/") (synopsis "Command-line interface to the Monero currency") (description "Monero is a secure, private, untraceable currency. This package provides @@ -563,7 +597,7 @@ the Monero command line client and daemon.") (define-public monero-gui (package (name "monero-gui") - (version "0.14.1.2") + (version "0.15.0.0") (source (origin (method git-fetch) @@ -573,7 +607,7 @@ the Monero command line client and daemon.") (file-name (git-file-name name version)) (sha256 (base32 - "1rm043r6y2mzy8pclnzbjjfxgps8pkfa2b92p66k8y8rdmgq6m1k")))) + "1shpnly2dym5jhvk8zk10p69mz062dihx979djg74q6hgkhhhqsh")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -675,7 +709,7 @@ the Monero command line client and daemon.") (let ((out (assoc-ref outputs "out"))) (wrap-qt-program out "monero-wallet-gui")) #t))))) - (home-page "https://getmonero.org/") + (home-page "https://web.getmonero.org/") (synopsis "Graphical user interface for the Monero currency") (description "Monero is a secure, private, untraceable currency. This package provides @@ -1138,15 +1172,35 @@ Trezor wallet.") (package (inherit bitcoin-core) (name "bitcoin-abc") - (version "0.19.8") + (version "0.20.4") (source (origin (method url-fetch) (uri (string-append "https://download.bitcoinabc.org/" - version "/linux/src/bitcoin-abc-" + version "/src/bitcoin-abc-" version ".tar.gz")) (sha256 (base32 - "0ndvkxv5m8346bdhfqzgdiz1k9wyjycj05jp7daf9pml3cw79sz5")))) + "0fld54z3l7z7k5n35rrjichjnx37j9xp0rv8i69m3x4qfj1xk2np")))) + (inputs + `(("bdb" ,bdb-5.3) + ("boost" ,boost) + ("libevent" ,libevent) + ("miniupnpc" ,miniupnpc) + ("openssl" ,openssl) + ("protobuf" ,protobuf) + ("qtbase" ,qtbase))) + (arguments + (substitute-keyword-arguments (package-arguments bitcoin-core) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'fix-tests + ;; Disable 'check-devtools' test which tries to run a + ;; python script that doesn't exist. + (lambda _ + (substitute* "Makefile.in" + (("^check-local: check-devtools") + "check-local:")) + #t)))))) (home-page "https://www.bitcoinabc.org/") (synopsis "Bitcoin ABC peer-to-peer full node for the Bitcoin Cash protocol") (description diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index b4f259bf3a..556eae3624 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -120,7 +120,7 @@ For synthesis, the compiler generates netlists in the desired format.") (define-public yosys (package (name "yosys") - (version "0.8") + (version "0.9") (source (origin (method git-fetch) (uri (git-reference @@ -129,7 +129,7 @@ For synthesis, the compiler generates netlists in the desired format.") (recursive? #t))) ; for the ‘iverilog’ submodule (sha256 (base32 - "1qwbp8gynlklawzvpa4gdn2x0hs8zln0s3kxjqkhfcjfxffdcpvv")) + "0lb9r055h8y1vj2z8gm4ip0v06j5mk7f9zx9gi67kkqb7g4rhjli")) (file-name (git-file-name name version)) (modules '((guix build utils))) (snippet diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 15c098bc45..a8b469f313 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2018 Stefan Stefanović <stefanx2ovic@gmail.com> ;;; Copyright © 2019 Reza Alizadeh Majd <r.majd@pantherx.org> +;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -74,6 +75,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages polkit) #:use-module (gnu packages python) + #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-xyz) #:use-module (gnu packages sqlite) #:use-module (gnu packages valgrind) @@ -615,6 +617,7 @@ applications, X servers (rootless or fullscreen) or other display servers.") (source (origin (method git-fetch) (uri (git-reference (url home-page) (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 "16h57hzd688664qcyznzhjp3hxipdkzgv46x82yhkww24av8b55n")))) @@ -926,7 +929,7 @@ interfaces, based on the useradd, usermod and userdel commands.") (define-public libmbim (package (name "libmbim") - (version "1.20.0") + (version "1.20.2") (source (origin (method url-fetch) (uri (string-append @@ -934,7 +937,7 @@ interfaces, based on the useradd, usermod and userdel commands.") "libmbim-" version ".tar.xz")) (sha256 (base32 - "0rm8j4zh9gnb3yi324cnxy91gdimc1vg5gv1kxc2m5lymb3wdxrc")))) + "16q550sy84izi5ic3sbbhjnnka2fwhj8vvdrirpn9xspbsgbc3sm")))) (build-system gnu-build-system) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-mkenums @@ -1439,3 +1442,64 @@ encoding names are iconv-compatible.") ;; This combines code under MPL 1.1, LGPL 2.1+, and GPL 2.0+, so the ;; combination is GPL 2.0+. (license license:gpl2+))) + +(define-public udiskie + (package + (name "udiskie") + (version "1.7.7") + (source + (origin + (method url-fetch) + (uri (pypi-uri "udiskie" version)) + (sha256 + (base32 + "121g9dkr7drv9igpdbcbkj59x15mm72rzp3198bp50zj0lr4wbvi")) + ;; Remove support for the libappindicator library of the + ;; Unity desktop environment which is not in Guix. + (patches (search-patches "udiskie-no-appindicator.patch")))) + (build-system python-build-system) + (native-inputs + `(("asciidoc" ,asciidoc) + ("gettext" ,gettext-minimal) + ("gobject-introspection" ,gobject-introspection))) + (inputs + `(("gobject-introspection" ,gobject-introspection) + ("gtk+" ,gtk+) + ("libnotify" ,libnotify) + ("udisks" ,udisks))) + (propagated-inputs + `(("python-docopt" ,python-docopt) + ("python-pygobject" ,python-pygobject) + ("python-keyutils" ,python-keyutils) + ("python-pyxdg" ,python-pyxdg) + ("python-pyyaml" ,python-pyyaml))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'wrap-gi-typelib + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (gi-typelib-path (getenv "GI_TYPELIB_PATH"))) + (wrap-program (string-append out "/bin/udiskie") + `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))) + #t))))) + (home-page "https://github.com/coldfix/udiskie") + (synopsis "Automounter for removable media") + (description + "The @command{udiskie} program is a udisks2 front-end that allows to +manage removable media such as CDs or flash drives from userspace. + +Its features include: + +@itemize +@item automount removable media, +@item notifications, +@item tray icon, +@item command line tools for manual (un)mounting, +@item LUKS encrypted devices, +@item unlocking with keyfiles, +@item loop devices (mounting ISO archives), +@item password caching. +@end itemize +") + (license license:expat))) diff --git a/gnu/packages/fribidi.scm b/gnu/packages/fribidi.scm index dfd2a77c20..61aa6fd726 100644 --- a/gnu/packages/fribidi.scm +++ b/gnu/packages/fribidi.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 Marek Benc <merkur32@gmail.com> -;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. @@ -22,10 +22,12 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) - #:use-module (guix licenses)) + #:use-module (guix licenses) + #:use-module (gnu packages)) (define-public fribidi (package + (replacement fribidi/fixed) (name "fribidi") (version "1.0.5") (source @@ -45,3 +47,10 @@ Algorithm. This algorithm is used to properly display text in left-to-right or right-to-left ordering as necessary.") (home-page "https://github.com/fribidi/fribidi") (license lgpl2.1+))) + +(define fribidi/fixed + (package + (inherit fribidi) + (source + (origin (inherit (package-source fribidi)) + (patches (search-patches "fribidi-CVE-2019-18397.patch")))))) diff --git a/gnu/packages/fvwm.scm b/gnu/packages/fvwm.scm index ad0720a60c..88f6e24a99 100644 --- a/gnu/packages/fvwm.scm +++ b/gnu/packages/fvwm.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017 ng0 <ng0@n0.is> +;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -35,15 +36,15 @@ (define-public fvwm (package (name "fvwm") - (version "2.6.8") + (version "2.6.9") (source (origin (method url-fetch) (uri (string-append "https://github.com/fvwmorg/fvwm/releases/download/" - version "/" name "-" version ".tar.gz")) + version "/fvwm-" version ".tar.gz")) (sha256 (base32 - "0hgkkdzcqjnaabvv9cnh0bz90nnjskbhjg9qnzpi2x0mbliwjdpv")))) + "1bliqcnap7vb3m2rn8wvxyfhbf35h9x34s41fl4301yhrkrlrihv")))) (build-system gnu-build-system) (arguments `(#:phases diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 54d2f32f94..833f00b77c 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2017, 2019 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz> -;;; Copyright © 2019 Comrade Yuri <yuri@nijino> +;;; Copyright © 2019 Leo Prikler <leo.prikler@student.tugraz.at> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1851,7 +1851,7 @@ projects.") (define-public openvr (package (name "openvr") - (version "1.4.18") + (version "1.8.19") (home-page "https://github.com/ValveSoftware/openvr/") (source (origin @@ -1861,8 +1861,7 @@ projects.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "0m92634j6g0f2xybbzklm79cnq20vidbk1jc62pnz12aabwixvyh")))) + (base32 "1b8cppvw6ib0kvx0vjq7jsk3plg1vh171w8xr230vjn05381wp52")))) (build-system cmake-build-system) (arguments ;; No tests. diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index d0a5d28f04..07bef94c51 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -500,7 +500,7 @@ tired of cows, a variety of other ASCII-art messengers are available.") (define-public freedoom (package (name "freedoom") - (version "0.11.3") + (version "0.12.1") (source (origin (method git-fetch) @@ -509,38 +509,19 @@ tired of cows, a variety of other ASCII-art messengers are available.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0k4dlgr82qk6i7dchp3nybq6awlfag2ivy3zzl1v6vhcrnbvssgl")))) + (base32 "1mq60lfwaaxmch7hsz8403pwafnlsmsd5z2df2j77ppwndwcrypb")))) (build-system gnu-build-system) (arguments '(#:make-flags (list (string-append "prefix=" (assoc-ref %outputs "out"))) - #:parallel-build? #f #:tests? #f ; no check target #:phases (modify-phases %standard-phases (delete 'bootstrap) (replace 'configure (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((dejavu (assoc-ref inputs "font-dejavu")) - (freedoom (assoc-ref outputs "out")) + (let* ((freedoom (assoc-ref outputs "out")) (wad-dir (string-append freedoom "/share/games/doom"))) - ;; Replace the font-searching function in a shell - ;; script with a direct path to the required font. - ;; This is necessary because ImageMagick can only find the - ;; most basic fonts while in the build environment. - (substitute* "graphics/titlepic/create_caption" - (("font=\\$\\(find_font.*$") - (string-append - "font=" dejavu - "/share/fonts/truetype/DejaVuSansCondensed-Bold.ttf\n"))) - ;; Make icon creation reproducible. - (substitute* "dist/Makefile" - (("freedm.png") - "-define png:exclude-chunks=date freedm.png") - (("freedoom1.png") - "-define png:exclude-chunks=date freedoom1.png") - (("freedoom2.png") - "-define png:exclude-chunks=date freedoom2.png")) ;; Make sure that the install scripts know where to find ;; the appropriate WAD files. (substitute* "dist/freedoom" @@ -554,11 +535,8 @@ tired of cows, a variety of other ASCII-art messengers are available.") (native-inputs `(("asciidoc" ,asciidoc) ("deutex" ,deutex) - ("font-dejavu" ,font-dejavu) - ("imagemagick" ,imagemagick) - ("python" ,python-2))) - (inputs - `(("prboom-plus" ,prboom-plus))) + ("python" ,python) + ("python-pillow" ,python-pillow))) (home-page "https://freedoom.github.io/") (synopsis "Free content game based on the Doom engine") (native-search-paths @@ -1438,14 +1416,23 @@ fight Morgoth, the Lord of Darkness.") (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Pingus/pingus.git") + (url "https://gitlab.com/pingus/pingus.git") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 "0wp06kcmknsnxz7bjnsndb8x062z7r23fb3yrnbfnj68qhz18y74")) (patches (search-patches "pingus-boost-headers.patch" - "pingus-sdl-libs-config.patch")))) + "pingus-sdl-libs-config.patch")) + (modules '((guix build utils))) + (snippet + '(begin + (substitute* "src/pingus/screens/demo_session.cpp" + (("#include <iostream>") + ;; std::function moved to <functional> with C++ 11. + ;; Remove this for versions newer than 0.7.6. + "#include <iostream>\n#include <functional>")) + #t)))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("scons-python2" ,scons-python2))) @@ -1855,7 +1842,7 @@ match, cannon keep, and grave-itation pit.") (define minetest-data (package (name "minetest-data") - (version "5.0.1") + (version "5.1.0") (source (origin (method git-fetch) (uri (git-reference @@ -1864,7 +1851,7 @@ match, cannon keep, and grave-itation pit.") (file-name (git-file-name name version)) (sha256 (base32 - "1hw3n7qqpasq6bivxhq01kr0d58w0gp46s0baxixp1fakd79p8a7")))) + "1r9fxz2j24q74a9injvbxbf2xk67fzabv616i676zw2cvgv9hn39")))) (build-system trivial-build-system) (native-inputs `(("source" ,source))) @@ -1889,7 +1876,7 @@ match, cannon keep, and grave-itation pit.") (define-public minetest (package (name "minetest") - (version "5.0.1") + (version "5.1.0") (source (origin (method git-fetch) (uri (git-reference @@ -1898,7 +1885,7 @@ match, cannon keep, and grave-itation pit.") (file-name (git-file-name name version)) (sha256 (base32 - "11i8fqjpdggqfdlx440k5758zy0nbf9phxan9r63mavc7mph88ay")) + "184n9gxfa7yr0j85z2x736maaymsnppd5jzm326wlqri3c0qqy3z")) (modules '((guix build utils))) (snippet '(begin @@ -4746,7 +4733,7 @@ fish. The whole game is accompanied by quiet, comforting music.") (define-public crawl (package (name "crawl") - (version "0.23.2") + (version "0.24.0") (source (origin (method url-fetch) @@ -4759,7 +4746,7 @@ fish. The whole game is accompanied by quiet, comforting music.") (string-append "http://crawl.develz.org/release/stone_soup-" version "-nodeps.tar.xz"))) (sha256 - (base32 "1hw10hqhh688mrqs9vxrl17y1dzfjzsmxz6izg1a9dzmjlhrc01a")) + (base32 "0kdq6s12myxfdg75ma9x3ys2nd0xwb3xm2ynlmhg4628va0pnixr")) (patches (search-patches "crawl-upgrade-saves.patch")))) (build-system gnu-build-system) (inputs diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 5796db3eb9..477e9a460a 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -6,9 +6,10 @@ ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com> -;;; Copyright © 2018 Julien Lepiller <julien@lepiller.eu> +;;; Copyright © 2018, 2019 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2019 Wiktor Żelazny <wzelazny@vurv.cz> ;;; ;;; This file is part of GNU Guix. ;;; @@ -26,6 +27,7 @@ ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. (define-module (gnu packages geo) + #:use-module (guix build-system ant) #:use-module (guix build-system cmake) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) @@ -36,6 +38,7 @@ #:use-module (guix build-system r) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix svn-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils) @@ -54,6 +57,7 @@ #:use-module (gnu packages gtk) #:use-module (gnu packages image) #:use-module (gnu packages icu4c) + #:use-module (gnu packages java) #:use-module (gnu packages lua) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) @@ -122,6 +126,12 @@ topology functions.") `(#:glib-or-gtk? #t #:phases (modify-phases %standard-phases + (add-after 'unpack 'skip-gtk-update-icon-cache + ;; Don't create 'icon-theme.cache'. + (lambda _ + (substitute* "meson_post_install.py" + (("gtk-update-icon-cache") "true")) + #t)) (add-after 'install 'wrap (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) @@ -151,8 +161,7 @@ topology functions.") ,geocode-glib-path))) #t)))))) (native-inputs - `(("gtk+" ,gtk+ "bin") ; gtk-update-icon-cache - ("gobject-introspection" ,gobject-introspection) + `(("gobject-introspection" ,gobject-introspection) ("intltool" ,intltool) ("pkg-config" ,pkg-config))) (inputs @@ -997,3 +1006,210 @@ XyGrib is the continuation of the zyGrib software package with a new team of volunteers.") (home-page "https://opengribs.org") (license license:gpl3+))) + +(define-public libspatialindex + (package + (name "libspatialindex") + (version "1.8.5") + (source + (origin + (method url-fetch) + (uri (string-append "https://download.osgeo.org/libspatialindex/" + "spatialindex-src-" version ".tar.gz")) + (sha256 + (base32 + "1vxzm7kczwnb6qdmc0hb00z8ykx11zk3sb68gc7rch4vrfi4dakw")))) + (build-system gnu-build-system) + (home-page "https://libspatialindex.org") + (synopsis "Spatial indexing library") + (description "The purpose of this library is to provide: + +@itemize + @item An extensible framework that will support robust spatial indexing +methods. + @item Support for sophisticated spatial queries. Range, point location, + nearest neighbor and k-nearest neighbor as well as parametric queries (defined +by spatial constraints) should be easy to deploy and run. + @item Easy to use interfaces for inserting, deleting and updating information. + @item Wide variety of customization capabilities. Basic index and storage +characteristics like the page size, node capacity, minimum fan-out, splitting +algorithm, etc. should be easy to customize. + @item Index persistence. Internal memory and external memory structures +should be supported. Clustered and non-clustered indices should be easy to be +persisted. +@end itemize +") + (license license:expat))) + +(define-public java-jmapviewer + (package + (name "java-jmapviewer") + (version "2.12") + (source (origin + (method url-fetch) + (uri (string-append "https://svn.openstreetmap.org/applications/" + "viewer/jmapviewer/releases/" version + "/JMapViewer-" version "-Source.zip")) + (sha256 + (base32 + "08hbqsbs859v4m5d90560fdifavd1apnpz9v9iry1v31dsvy5707")))) + (build-system ant-build-system) + (native-inputs + `(("unzip" ,unzip))) + (arguments + `(#:build-target "pack" + #:tests? #f; No tests + #:phases + (modify-phases %standard-phases + (add-before 'build 'clean + (lambda* _ + (invoke "ant" "clean"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((dir (string-append (assoc-ref outputs "out") "/share/java/"))) + (mkdir-p dir) + (copy-file "JMapViewer.jar" (string-append dir "JMapViewer.jar")))))))) + (home-page "https://wiki.openstreetmap.org/wiki/JMapViewer") + (synopsis "OSM map integration in Java") + (description "JMapViewer is a Java component which allows to easily +integrate an OSM map view into your Java application. It is maintained as +an independent project by the JOSM team.") + (license license:gpl2))) + +(define-public josm + (package + (name "josm") + (version "15492") + (source (origin + (method svn-fetch) + (uri (svn-reference + (url "https://josm.openstreetmap.de/svn/trunk") + (revision (string->number version)) + (recursive? #f))) + (sha256 + (base32 + "12xkwcv77as30a61w1c8a0i2b0kiiks71d487gbdfv7azlj4vqia")) + (file-name (string-append name "-" version "-checkout")) + (modules '((guix build utils))) + (snippet + '(begin + (for-each delete-file (find-files "." ".*.jar$")) + #t)))) + (build-system ant-build-system) + (native-inputs + `(("javacc" ,javacc))) + (inputs + `(("java-commons-jcs" ,java-commons-jcs) + ("java-commons-compress" ,java-commons-compress) + ("java-jmapviewer" ,java-jmapviewer) + ("java-jsonp-api" ,java-jsonp-api) + ("java-jsonp-impl" ,java-jsonp-impl); runtime dependency + ("java-metadata-extractor" ,java-metadata-extractor) + ("java-openjfx-media" ,java-openjfx-media) + ("java-signpost-core" ,java-signpost-core) + ("java-svg-salamander" ,java-svg-salamander))) + (arguments + `(#:tests? #f + #:jar-name "josm.jar" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'rm-build.xml + (lambda* _ + (delete-file "build.xml") + #t)) + (add-before 'build 'fix-revision + (lambda* _ + (with-output-to-file "REVISION.XML" + (lambda _ + (display + (string-append "<info><entry><commit revision=\"" ,version "\">" + "<date>1970-01-01 00:00:00 +0000</date>" + "</commit></entry></info>")))) + #t)) + (add-before 'build 'fix-classpath + (lambda* (#:key inputs #:allow-other-keys) + (setenv "CLASSPATH" + (string-join + (filter + (lambda (s) + (let ((source (assoc-ref inputs "source"))) + (not (equal? (substring s 0 (string-length source)) source)))) + (string-split (getenv "CLASSPATH") #\:)) + ":")) + #t)) + (add-before 'build 'generate-parser + (lambda* _ + (let* ((dir "src/org/openstreetmap/josm/gui/mappaint/mapcss") + (out (string-append dir "/parsergen")) + (file (string-append dir "/MapCSSParser.jj"))) + (mkdir-p "src/org/openstreetmap/josm/gui/mappaint/mapcss/parsergen") + (invoke "javacc" "-DEBUG_PARSER=false" + "-DEBUG_TOKEN_MANAGER=false" "-JDK_VERSION=1.8" + "-GRAMMAR_ENCODING=UTF-8" + (string-append "-OUTPUT_DIRECTORY=" out) + file)) + #t)) + (add-after 'build 'generate-epsg + (lambda _ + (system* "javac" "scripts/BuildProjectionDefinitions.java" + "-cp" "build/classes") + (mkdir-p "data/projection") + (with-output-to-file "data/projection/custom-epsg" + (lambda _ (display ""))) + (invoke "java" "-cp" "build/classes:scripts:." + "BuildProjectionDefinitions" ".") + #t)) + (add-after 'generate-epsg 'copy-data + (lambda _ + (mkdir-p "build/classes") + (rename-file "data" "build/classes/data") + #t)) + (add-before 'install 'regenerate-jar + (lambda _ + ;; We need to regenerate the jar file to add data. + (delete-file "build/jar/josm.jar") + (invoke "jar" "-cf" "build/jar/josm.jar" "-C" + "build/classes" ".") + #t)) + (add-before 'build 'copy-styles + (lambda _ + (mkdir-p "build/classes") + (rename-file "styles" "build/classes/styles") + #t)) + (add-before 'build 'copy-images + (lambda _ + (mkdir-p "build/classes") + (rename-file "images" "build/classes/images") + #t)) + (add-before 'build 'copy-revision + (lambda _ + (mkdir-p "build/classes") + (with-output-to-file "build/classes/REVISION" + (lambda _ + (display + (string-append "Revision: " ,version "\n" + "Is-Local-Build: true\n" + "Build-Date: 1970-01-01 00:00:00 +0000\n")))) + #t)) + (add-after 'install 'install-bin + (lambda* (#:key outputs inputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (mkdir-p bin) + (with-output-to-file (string-append bin "/josm") + (lambda _ + (display + (string-append "#!/bin/sh\n" + (assoc-ref inputs "jdk") "/bin/java" + " -cp " out "/share/java/josm.jar:" + (getenv "CLASSPATH") + " org.openstreetmap.josm.gui.MainApplication")))) + (chmod (string-append bin "/josm") #o755)) + #t))))) + (home-page "https://josm.openstreetmap.de") + (synopsis "OSM editor") + (description "JOSM is an extensible editor for OpenStreetMap (OSM). It +supports loading GPX tracks, background imagery and OSM data from local +sources as well as from online sources and allows to edit the OSM data (nodes, +ways, and relations) and their metadata tags.") + (license license:gpl2+))) diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index 70bc8db4c1..42a55cff33 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -29,6 +29,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix build-system gnu) #:use-module (guix build-system glib-or-gtk) + #:use-module (guix build-system meson) #:use-module (gnu packages) #:use-module (gnu packages algebra) #:use-module (gnu packages autotools) @@ -49,22 +50,30 @@ (define-public babl (package (name "babl") - (version "0.1.66") + (version "0.1.72") (source (origin (method url-fetch) (uri (list (string-append "https://download.gimp.org/pub/babl/" (version-major+minor version) - "/babl-" version ".tar.bz2") + "/babl-" version ".tar.xz") (string-append "https://ftp.gtk.org/pub/babl/" (version-major+minor version) - "/babl-" version ".tar.bz2") + "/babl-" version ".tar.xz") (string-append "ftp://ftp.gtk.org/pub/babl/" (version-major+minor version) - "/babl-" version ".tar.bz2"))) + "/babl-" version ".tar.xz"))) (sha256 (base32 - "0qx1dwbinxihwl2lmxi60qiqi402jlrdcnixx14kk6j88n9xi79n")))) - (build-system gnu-build-system) + "0hkagjrnza77aasa1kss5hvy37ndm50y6i7hkdn2z8hzgc4i3qb4")))) + (build-system meson-build-system) + (arguments + `(#:configure-flags + (list "-Denable-gir=false"))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (propagated-inputs + ;; Propagated to satisfy ‘babl.pc’. + `(("lcms" ,lcms))) (home-page "http://gegl.org/babl/") (synopsis "Image pixel format conversion library") (description @@ -80,18 +89,25 @@ provided, as well as a framework to add new color models and data types.") (define-public gegl (package (name "gegl") - (version "0.4.16") + (version "0.4.18") (source (origin (method url-fetch) (uri (list (string-append "https://download.gimp.org/pub/gegl/" (string-take version 3) - "/gegl-" version ".tar.bz2"))) + "/gegl-" version ".tar.xz") + (string-append "https://ftp.gtk.org/pub/gegl/" + (version-major+minor version) + "/gegl-" version ".tar.xz") + (string-append "ftp://ftp.gtk.org/pub/gegl/" + (version-major+minor version) + "/gegl-" version ".tar.xz"))) (sha256 (base32 - "0njydcr6qdmfzh4fxx544681qxdpf7y6b2f47jcypn810dlxy4h1")))) - (build-system gnu-build-system) + "0r6akqnrkvxizyhyi8sv40mxm7j4bcwjb6mqjpxy0zzbbfsdyin9")))) + (build-system meson-build-system) (arguments - '(#:configure-flags '("LDFLAGS=-lm"))) + `(#:configure-flags + (list "-Dintrospection=false"))) ;; These are propagated to satisfy 'gegl-0.4.pc'. (propagated-inputs `(("babl" ,babl) @@ -118,7 +134,7 @@ buffers.") (define-public gimp (package (name "gimp") - (version "2.10.12") + (version "2.10.14") (source (origin (method url-fetch) (uri (string-append "https://download.gimp.org/pub/gimp/v" @@ -126,7 +142,7 @@ buffers.") "/gimp-" version ".tar.bz2")) (sha256 (base32 - "0wdcr8d2ink4swn5r4v13bsiya6s3xm4ya97sdbhs4l40y7bb03x")))) + "0m6wdnfvsxyhimdd4v3351g4r1fklllnbipbwcfym3h7q88hz6yz")))) (build-system gnu-build-system) (outputs '("out" "doc")) ; 9 MiB of gtk-doc HTML diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 33e569a5d3..b3e85f8df9 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -199,7 +199,10 @@ shared NFS home directories.") ("perl" ,perl) ; needed by GIO tests ("tzdata" ,tzdata-for-tests))) ; for tests/gdatetime.c (arguments - `(#:phases + `(;; TODO: Uncomment on the next rebuild cycle. + ;; #:disallowed-references (,tzdata-for-tests) + + #:phases (modify-phases %standard-phases (add-before 'build 'pre-build (lambda* (#:key inputs outputs #:allow-other-keys) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm new file mode 100644 index 0000000000..760131b83d --- /dev/null +++ b/gnu/packages/gnome-xyz.scm @@ -0,0 +1,213 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2019 Leo Prikler <leo.prikler@student.tugraz.at> +;;; Copyright © 2019 Alexandros Theodotou <alex@zrythm.org> +;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.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 packages gnome-xyz) + #:use-module (guix build-system trivial) + #:use-module (guix build-system gnu) + #:use-module (guix git-download) + #:use-module (guix packages) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (gnu packages base) + #:use-module (gnu packages bash) + #:use-module (gnu packages glib) + #:use-module (gnu packages gnome) + #:use-module (gnu packages gtk) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages ruby) + #:use-module (gnu packages xml)) + +(define-public matcha-theme + (package + (name "matcha-theme") + (version "2019-11-02") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/vinceliuice/matcha") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0wci9ahap8kynq8cbyxr7aba9ndb1d4kiq42xvzr34vw1rhcahrr")))) + (build-system trivial-build-system) + (arguments + '(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let* ((out (assoc-ref %outputs "out")) + (source (assoc-ref %build-inputs "source")) + (bash (assoc-ref %build-inputs "bash")) + (coreutils (assoc-ref %build-inputs "coreutils")) + (themesdir (string-append out "/share/themes"))) + (setenv "PATH" + (string-append coreutils "/bin:" + (string-append bash "/bin:"))) + (copy-recursively source (getcwd)) + (patch-shebang "Install") + (mkdir-p themesdir) + (invoke "./Install" "-d" themesdir) + #t)))) + (inputs + `(("gtk-engines" ,gtk-engines))) + (native-inputs + `(("bash" ,bash) + ("coreutils" ,coreutils))) + (synopsis "Flat design theme for GTK 3, GTK 2 and GNOME-Shell") + (description "Matcha is a flat Design theme for GTK 3, GTK 2 and +Gnome-Shell which supports GTK 3 and GTK 2 based desktop environments +like Gnome, Unity, Budgie, Pantheon, XFCE, Mate and others.") + (home-page "https://github.com/vinceliuice/matcha") + (license license:gpl3+))) + +(define-public delft-icon-theme + (package + (name "delft-icon-theme") + (version "1.10") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/madmaxms/iconpack-delft.git") + (commit (string-append "v" version)))) + (sha256 + (base32 + "0vw3yw9f9ygzfd2k3zrfih3r0vkzlhk1bmsk8sapvk7np24i1z9s")) + (file-name (git-file-name name version)))) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (copy-recursively (assoc-ref %build-inputs "source") "icons") + (delete-file "icons/README.md") + (delete-file "icons/LICENSE") + (delete-file "icons/logo.jpg") + (copy-recursively "icons" (string-append %output "/share/icons"))))) + (home-page "https://www.gnome-look.org/p/1199881/") + (synopsis "Continuation of Faenza icon theme with up to date app icons") + (description "Delft is a fork of the popular icon theme Faenza with up to +date app icons. It will stay optically close to the original Faenza icons, +which haven't been updated for some years. The new app icons are ported from +the Obsidian icon theme.") + (license license:gpl3))) + +(define-public gnome-shell-extension-dash-to-dock + (package + (name "gnome-shell-extension-dash-to-dock") + (version "65") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/micheleg/dash-to-dock.git") + (commit (string-append "extensions.gnome.org-v" + version)))) + (sha256 + (base32 + "0ln49l9s0yfl30pi77pz7xlmh63l9vjppi863kry5lay10dsvz47")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (arguments + '(#:tests? #f + #:make-flags (list (string-append "INSTALLBASE=" + (assoc-ref %outputs "out") + "/share/gnome-shell/extensions")) + #:phases + (modify-phases %standard-phases + (delete 'bootstrap) + (delete 'configure)))) + (native-inputs + `(("intltool" ,intltool) + ("pkg-config" ,pkg-config))) + (propagated-inputs + `(("glib" ,glib) + ("glib" ,glib "bin"))) + (synopsis "Transforms GNOME's dash into a dock") + (description "This extension moves the dash out of the +overview, transforming it into a dock for easier application launching and +faster window switching.") + (home-page "https://micheleg.github.io/dash-to-dock/") + (license license:gpl2+))) + +(define-public gnome-shell-extension-noannoyance + (package + (name "gnome-shell-extension-noannoyance") + (version "5") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/BjoernDaase/noannoyance.git") + (commit "e37b5b3c31f577b4698bc6659bc9fec5ea9ac5d4"))) + (sha256 + (base32 + "0fa8l3xlh8kbq07y4385wpb908zm6x53z81q16xlmin97dln32hh")) + (file-name (git-file-name name version)))) + (build-system trivial-build-system) + (arguments + '(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let ((dst (string-append + (assoc-ref %outputs "out") + "/share/gnome-shell/extensions/" + "noannoyance@daase.net"))) + (mkdir-p dst) + (copy-recursively (assoc-ref %build-inputs "source") dst))))) + (synopsis "Removes 'Window is ready' annotation") + (description "One of the many extensions, that remove this message. +It uses ES6 syntax and claims to be more actively maintained than others.") + (home-page "https://extensions.gnome.org/extension/2182/noannoyance/") + (license license:gpl2))) + +(define-public numix-theme + (package + (name "numix-theme") + (version "2.6.7") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/numixproject/numix-gtk-theme.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "12mw0kr0kkvg395qlbsvkvaqccr90cmxw5rrsl236zh43kj8grb7")))) + (build-system gnu-build-system) + (arguments + '(#:make-flags (list (string-append "DESTDIR=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'check)))) + (native-inputs + `(("glib:bin" ,glib "bin") ; for glib-compile-schemas + ("gnome-shell" ,gnome-shell) + ("gtk+" ,gtk+) + ("xmllint" ,libxml2) + ("ruby-sass" ,ruby-sass))) + (synopsis "Flat theme with light and dark elements") + (description "Numix is a modern flat theme with a combination of light and +dark elements. It supports GNOME, Unity, Xfce, and Openbox.") + (home-page "https://numixproject.github.io") + (license license:gpl3+))) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 276fa56138..f51d366f44 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -569,9 +569,17 @@ and keep up to date translations of documentation.") (base32 "1365fabz3q7n3bl775z82m1nzg18birxxyd7l2ssbbkqrx3h7wgi")))) (build-system meson-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'skip-gtk-update-icon-cache + ;; Don't create 'icon-theme.cache'. + (lambda _ + (substitute* "meson_post_install.py" + (("gtk-update-icon-cache") "true")) + #t))))) (native-inputs `(("glib:bin" ,glib "bin") - ("gtk+" ,gtk+ "bin") ; gtk-update-icon-cache ("intltool" ,intltool) ("pkg-config" ,pkg-config) ("docbook-xml" ,docbook-xml) @@ -2062,14 +2070,14 @@ Hints specification (EWMH).") (define-public goffice (package (name "goffice") - (version "0.10.45") + (version "0.10.46") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/goffice/" (version-major+minor version) "/" "goffice-" version ".tar.xz")) (sha256 - (base32 "0iqrygv2bh8kiw98kjx6ay6qdd288v91q5m8n7cvs2zcx5ksaavh")))) + (base32 "1a8kba36zwzr0ilafc0d1nsxxma1qibviiifd0jhbxp180x6v385")))) (build-system gnu-build-system) (outputs '("out" "doc")) ; 4.0 MiB of gtk-doc @@ -2126,7 +2134,7 @@ Hints specification (EWMH).") (define-public gnumeric (package (name "gnumeric") - (version "1.12.45") + (version "1.12.46") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/gnumeric/" @@ -2134,7 +2142,7 @@ Hints specification (EWMH).") "gnumeric-" version ".tar.xz")) (sha256 (base32 - "0c8dl1kvnj3g32qy3s92qpqpqfy0in59cx005gjvvzsflahav61h")))) + "1qdmw2dp7rmq8fmjapgwaks7ajh270wm6kyvlxlzwbgmg8vngp4z")))) (build-system glib-or-gtk-build-system) (arguments `(;; The gnumeric developers don't worry much about failing tests. @@ -3059,7 +3067,16 @@ keyboard shortcuts.") (substitute* "rules/meson.build" (("udev.get_pkgconfig_variable\\('udevdir'\\)") (string-append "'" (assoc-ref outputs "out") "/lib/udev'"))) - #t))))) + #t)) + (add-before 'configure 'set-sqlite3-file-name + (lambda* (#:key inputs #:allow-other-keys) + ;; "colormgr dump" works by invoking the "sqlite3" command. + ;; Record its absolute file name. + (let ((sqlite (assoc-ref inputs "sqlite"))) + (substitute* "client/cd-util.c" + (("\"sqlite3\"") + (string-append "\"" sqlite "/bin/sqlite3\""))) + #t)))))) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-compile-resources, etc. ("gobject-introspection" ,gobject-introspection) @@ -3455,12 +3472,20 @@ both a traditional UI or a modern UI with a GtkHeaderBar.") (base32 "036sddvhs0blqpc2ixmjdl9vxynvkn5jpgn0jxr1fxcm4rh3q07a")))) (build-system meson-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'skip-gtk-update-icon-cache + ;; Don't create 'icon-theme.cache'. + (lambda _ + (substitute* "meson_post_install.py" + (("gtk-update-icon-cache") "true")) + #t))))) (native-inputs `(("intltool" ,intltool) ("itstool" ,itstool) ("gobject-introspection" ,gobject-introspection) ("glib:bin" ,glib "bin") ; for glib-mkmenus - ("gtk+:bin" ,gtk+ "bin") ; for gtk-update-icon-cache ("pkg-config" ,pkg-config))) (inputs `(("amtk" ,amtk) @@ -3922,7 +3947,6 @@ for application developers.") ("desktop-file-utils" ,desktop-file-utils) ("gobject-introspection" ,gobject-introspection) ("glib:bin" ,glib "bin") ;for 'glib-mkenums' - ("gtk:bin" ,gtk+ "bin") ;for 'gtk-update-icon-cache' ("intltool" ,intltool) ("itstool" ,itstool) ("xmllint" ,libxml2))) @@ -3978,6 +4002,12 @@ for application developers.") #:phases (modify-phases %standard-phases + (add-after 'unpack 'skip-gtk-update-icon-cache + ;; Don't create 'icon-theme.cache'. + (lambda _ + (substitute* "meson_post_install.py" + (("gtk-update-icon-cache") "true")) + #t)) (add-before 'install 'disable-cache-generation (lambda _ @@ -4111,6 +4141,12 @@ supports playlists, song ratings, and any codecs installed through gstreamer.") (assoc-ref %outputs "out") "/lib/eog")) #:phases (modify-phases %standard-phases + (add-after 'unpack 'skip-gtk-update-icon-cache + ;; Don't create 'icon-theme.cache'. + (lambda _ + (substitute* "meson_post_install.py" + (("gtk-update-icon-cache") "true")) + #t)) (add-after 'install 'wrap-eog (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) @@ -4124,7 +4160,6 @@ supports playlists, song ratings, and any codecs installed through gstreamer.") `(("intltool" ,intltool) ("itstool" ,itstool) ("glib" ,glib "bin") - ("gtk+:bin" ,gtk+ "bin") ; for gtk-update-icon-cache ("gobject-introspection" ,gobject-introspection) ("pkg-config" ,pkg-config) ("xmllint" ,libxml2))) @@ -4294,12 +4329,14 @@ DAV, and others.") (name "gusb") (version "0.3.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/hughsie/libgusb/archive/" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/hughsie/libgusb.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1wa9787ww7s1kl9jml6kiyrjgimlgagq4jmgdj7xcpsx83w10qxk")))) + "002pg0p4qzzk5dkyiynm483ir26zxrn4k71c7f6j85mfsdzbgli7")))) (build-system meson-build-system) (native-inputs `(("gobject-introspection" ,gobject-introspection) @@ -4378,6 +4415,12 @@ almost all of them.") `(#:glib-or-gtk? #t #:phases (modify-phases %standard-phases + (add-after 'unpack 'skip-gtk-update-icon-cache + ;; Don't create 'icon-theme.cache'. + (lambda _ + (substitute* "meson_post_install.py" + (("gtk-update-icon-cache") "true")) + #t)) (add-after 'wrap 'wrap-more (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -4400,8 +4443,7 @@ almost all of them.") ("itstool" ,itstool) ("pkg-config" ,pkg-config) ("python" ,python) - ("glib:bin" ,glib "bin") - ("gtk+" ,gtk+ "bin"))) + ("glib:bin" ,glib "bin"))) (inputs `(("gobject-introspection" ,gobject-introspection) ("glib-networking" ,glib-networking) @@ -4447,6 +4489,14 @@ a secret password store, an adblocker, and a modern UI.") ;; FAIL '(#:tests? #f #:glib-or-gtk? #t + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'skip-gtk-update-icon-cache + ;; Don't create 'icon-theme.cache'. + (lambda _ + (substitute* "post_install.py" + (("gtk-update-icon-cache") "true")) + #t))) #:configure-flags ;; Otherwise, the RUNPATH will lack the final 'epiphany' path component. (list (string-append "-Dc_link_args=-Wl,-rpath=" @@ -4456,7 +4506,6 @@ a secret password store, an adblocker, and a modern UI.") (native-inputs `(("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database ("glib:bin" ,glib "bin") ; for glib-mkenums - ("gtk+:bin" ,gtk+ "bin") ; for gtk-update-icon-cache ("intltool" ,intltool) ("itstool" ,itstool) ("pkg-config" ,pkg-config) @@ -6672,6 +6721,7 @@ associations for GNOME.") ("gnome-default-applications" ,gnome-default-applications) ("gnome-keyring" ,gnome-keyring) ("gnome-online-accounts" ,gnome-online-accounts) + ("gnome-screenshot" ,gnome-screenshot) ("gnome-session" ,gnome-session) ("gnome-settings-daemon" ,gnome-settings-daemon) ("gnome-shell" ,gnome-shell) @@ -7064,38 +7114,6 @@ functionality and behavior.") (home-page "https://extensions.gnome.org/") (license license:gpl3+))) -(define-public numix-theme - (package - (name "numix-theme") - (version "2.6.7") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/numixproject/numix-gtk-theme.git") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "12mw0kr0kkvg395qlbsvkvaqccr90cmxw5rrsl236zh43kj8grb7")))) - (build-system gnu-build-system) - (arguments - '(#:make-flags (list (string-append "DESTDIR=" (assoc-ref %outputs "out"))) - #:phases - (modify-phases %standard-phases - (delete 'configure) - (delete 'check)))) - (native-inputs - `(("glib:bin" ,glib "bin") ; for glib-compile-schemas - ("gnome-shell" ,gnome-shell) - ("gtk+" ,gtk+) - ("xmllint" ,libxml2) - ("ruby-sass" ,ruby-sass))) - (synopsis "Flat theme with light and dark elements") - (description "Numix is a modern flat theme with a combination of light and -dark elements. It supports GNOME, Unity, Xfce, and Openbox.") - (home-page "https://numixproject.github.io") - (license license:gpl3+))) - (define-public arc-theme (package (name "arc-theme") @@ -7784,15 +7802,15 @@ views can be printed as PDF or PostScript files, or exported to HTML.") (define-public lollypop (package (name "lollypop") - (version "1.2.2") + (version "1.2.7") (source (origin (method url-fetch) (uri (string-append "https://gitlab.gnome.org/World/lollypop/uploads/" - "aa4fbd92bf338296c28e54710271ccab/" + "08f973788c7ca46d9285eec2ac818edb/" "lollypop-" version ".tar.xz")) (sha256 - (base32 "1wz5fna24qr3v7h29ijwhdxza85r9srz9xsqz4f4df3p5f8rfyql")))) + (base32 "0hvq6m4i62i0m63bg4gzpfb9rv1fk6vq5jl2g3ppcgm4srmfm77j")))) (build-system meson-build-system) (arguments `(#:imported-modules ((guix build python-build-system) @@ -8400,6 +8418,73 @@ higher level porcelain stuff.") (home-page "https://wiki.gnome.org/Projects/Libgit2-glib") (license license:gpl2+))) +(define-public gitg + (package + (name "gitg") + (version "3.32.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0npg4kqpwl992fgjd2cn3fh84aiwpdp9kd8z7rw2xaj2iazsm914")))) + (build-system meson-build-system) + (arguments + `(#:glib-or-gtk? #t + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-post-install-partially + (lambda _ + (substitute* "meson_post_install.py" + (("'python'") ; there are no python sources to compile + (string-append "'" (which "true") "'")) + (("gtk-update-icon-cache") (which "true"))) + #t)) + (add-after 'unpack 'fix-test-sources + (lambda _ + (substitute* "tests/libgitg/test-commit.vala" + (("/bin/bash") (which "bash"))) + #t)) + (add-after 'glib-or-gtk-wrap 'wrap-typelib + (lambda* (#:key outputs #:allow-other-keys) + (let ((prog (string-append (assoc-ref outputs "out") + "/bin/gitg"))) + (wrap-program prog + `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))) + #t)))))) + (inputs + `(("glib" ,glib) + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + ("gtk+" ,gtk+) + ("gtkspell3" ,gtkspell3) + ("gtksourceview" ,gtksourceview-3) + ("json-glib" ,json-glib) + ("libdazzle" ,libdazzle) + ("libgee" ,libgee) + ("libgit2" ,libgit2) ; propagated by libgit2-glib + ("libgit2-glib" ,libgit2-glib) + ("libpeas" ,libpeas) + ("libsecret" ,libsecret) + ("libsoup" ,libsoup) + ("libxml2" ,libxml2))) + (native-inputs + `(("glib:bin" ,glib "bin") + ("gtk+:bin" ,gtk+ "bin") + ("gobject-introspection" ,gobject-introspection) + ("intltool" ,intltool) + ("pkg-config" ,pkg-config) + ("vala" ,vala))) + (synopsis "Graphical user interface for git") + (description + "gitg is a graphical user interface for git. It aims at being a small, +fast and convenient tool to visualize the history of git repositories. +Besides visualization, gitg also provides several utilities to manage your +repository and commit your work.") + (home-page "https://wiki.gnome.org/Apps/Gitg") + (license license:gpl2+))) + (define-public gnome-mahjongg (package (name "gnome-mahjongg") diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index ed89b2661b..f71c627781 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -65,6 +65,7 @@ #:use-module (gnu packages tls) #:use-module (gnu packages tor) #:use-module (gnu packages web) + #:use-module (gnu packages xorg) #:use-module (gnu packages xml) #:use-module (guix packages) #:use-module (guix download) @@ -995,7 +996,7 @@ files, to verify signatures, and to manage the private and public keys.") (define-public parcimonie (package (name "parcimonie") - (version "0.10.3") + (version "0.11.0") (source (origin (method url-fetch) (uri (string-append "https://gaffer.boum.org/intrigeri/files/" @@ -1003,10 +1004,10 @@ files, to verify signatures, and to manage the private and public keys.") version ".tar.gz")) (sha256 (base32 - "1kf891117s1f3k6lxvbjdb21va9gxh29vlp9bd664ssgw266rcyb")))) + "14pvapvzrxh1yh8zgcj1llmc2dd8g1fgzskxlja21gmw8c88aqdk")))) (build-system perl-build-system) (inputs - `(("gnupg" ,gnupg-1) ; This is the version used by perl-gnupg-interface + `(("gnupg" ,gnupg) ("perl-config-general" ,perl-config-general) ("perl-clone" ,perl-clone) ("perl-data" ,perl-data) @@ -1026,10 +1027,12 @@ files, to verify signatures, and to manage the private and public keys.") ("perl-moox-handlesvia" ,perl-moox-handlesvia) ("perl-moox-late" ,perl-moox-late) ("perl-moox-options" ,perl-moox-options) + ("perl-moox-strictconstructor" ,perl-moox-strictconstructor) ("perl-namespace-clean" ,perl-namespace-clean) ("perl-net-dbus" ,perl-net-dbus) ("perl-net-dbus-glib" ,perl-net-dbus-glib) ("perl-path-tiny" ,perl-path-tiny) + ("perl-strictures" ,perl-strictures-2) ("perl-test-most" ,perl-test-most) ("perl-test-trap" ,perl-test-trap) ("perl-time-duration" ,perl-time-duration) @@ -1041,24 +1044,29 @@ files, to verify signatures, and to manage the private and public keys.") ("perl-xml-parser" ,perl-xml-parser) ("perl-xml-twig" ,perl-xml-twig) ("torsocks" ,torsocks))) + (native-inputs + `(("xorg-server" ,xorg-server))) (arguments `(#:phases (modify-phases %standard-phases ;; Needed for using gpg-connect-agent during tests. - (add-before 'check 'set-HOME - (lambda _ (setenv "HOME" "/tmp") #t)) + (add-before 'check 'prepare-for-tests + (lambda* (#:key inputs #:allow-other-keys) + (let ((xorg-server (assoc-ref inputs "xorg-server"))) + (system (string-append xorg-server "/bin/Xvfb :1 &")) + (setenv "DISPLAY" ":1") + (setenv "HOME" "/tmp") + ;; These tests are known to fail + (delete-file "t/32-keyserver_defined_on_command_line.t") + (delete-file "t/33-checkGpgHasDefinedKeyserver.t") + ;; The applet is deprecated upstream. + (delete-file "t/00-load_all.t") + #t))) (add-before 'install 'fix-references (lambda* (#:key inputs outputs #:allow-other-keys) (substitute* "lib/App/Parcimonie/GnuPG/Interface.pm" - (("gpg2") "gpg") ;; Skip check whether dependencies are in the PATH - (("defined which.*") "") - (("call\\('parcimonie-torified-gpg'\\)") - (string-append "call('" (assoc-ref outputs "out") - "/bin/parcimonie-torified-gpg')"))) - (substitute* "bin/parcimonie-torified-gpg" - (("torsocks") (string-append (assoc-ref inputs "torsocks") - "/bin/torsocks"))) + (("defined which.*") "")) #t)) (add-after 'install 'wrap-program (lambda* (#:key inputs outputs #:allow-other-keys) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 71cffa64f5..c68b2884f7 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -550,8 +550,8 @@ from forcing GEXP-PROMISE." #:system system #:guile-for-build guile))) -(define %icecat-version "68.2.0-guix0-preview2") -(define %icecat-build-id "20191028000000") ;must be of the form YYYYMMDDhhmmss +(define %icecat-version "68.2.0-guix0-preview3") +(define %icecat-build-id "20191031000000") ;must be of the form YYYYMMDDhhmmss ;; 'icecat-source' is a "computed" origin that generates an IceCat tarball ;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat' @@ -575,19 +575,21 @@ from forcing GEXP-PROMISE." (base32 "0f3gf5gwhxabm6xs29nlxmfqdw3fs7v458vq1fydrglfyvmc5wc5")))) - (upstream-icecat-base-version "68.1.0") ; maybe older than base-version + (upstream-icecat-base-version "68.2.0") ; maybe older than base-version ;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version)) - (gnuzilla-commit "aa7ab9483a64c43e77736917dd83841ccc437300") + (gnuzilla-commit "930298e1efff3e40721659d8fd7118cdd2477bd4") (gnuzilla-source (origin (method git-fetch) (uri (git-reference (url "git://git.savannah.gnu.org/gnuzilla.git") (commit gnuzilla-commit))) - (file-name (git-file-name "gnuzilla" upstream-icecat-base-version)) + (file-name (git-file-name "gnuzilla" + ;;upstream-icecat-base-version + (string-take gnuzilla-commit 8))) (sha256 (base32 - "03jygq1zna621y0ba6370cff4v2g9l57g3015y3vxbahnmzn9msa")))) + "14g57b0262qq5s0w8b1lrk8wkvg7m068dfi0ilvhg2q5jrxk3cd0")))) (gnuzilla-fixes-patch (local-file (search-patch "icecat-gnuzilla-fixes.patch"))) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index e3b22c13a2..76b93c0d14 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -220,7 +220,7 @@ in the style of communicating sequential processes (@dfn{CSP}).") (package (inherit go-1.4) (name "go") - (version "1.12.10") + (version "1.12.13") (source (origin (method url-fetch) @@ -228,7 +228,7 @@ in the style of communicating sequential processes (@dfn{CSP}).") name version ".src.tar.gz")) (sha256 (base32 - "0m1rvawvpdl7kd0asw10m50xbxlhykix6dng9p4x6ih6x3y4hvpm")))) + "19zmrhydd52vhdnzlhxqklzg1mnav434dcgw9wl4iajbvfwd70sk")))) (arguments (substitute-keyword-arguments (package-arguments go-1.4) ((#:phases phases) @@ -1166,6 +1166,7 @@ GNU extensions} to the POSIX recommendations for command-line options.") (uri (git-reference (url "https://github.com/sirupsen/logrus.git") (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 "0g5z7al7kky11ai2dhac6gkp3b5pxsvx72yj3xg4wg3265gbn7yz")))) @@ -3022,6 +3023,7 @@ a cron spec parser and job runner.") (uri (git-reference (url "https://github.com/shirou/gopsutil") (commit commit))) ; XXX + (file-name (git-file-name name version)) (sha256 (base32 "0x1g4r32q4201nr2b754xnrrndmwsrhfr7zg37spya86qrmijnws")))) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 917e7ba397..4f1c50b272 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -291,7 +291,7 @@ more.") (define-public cgal (package (name "cgal") - (version "4.8.1") + (version "4.14.2") (source (origin (method url-fetch) (uri (string-append @@ -299,19 +299,15 @@ more.") "CGAL-" version "/CGAL-" version ".tar.xz")) (sha256 (base32 - "1c41yzl2jg3d6zx5k0iccwqwibp950q7dr7z7pp4xi9wlph3c87s")))) + "08lrp3hfwdypggz4138bnkh6bjxn441zg2y9xnq5mrjfc5ini6w1")))) (build-system cmake-build-system) (arguments - '(;; "RelWithDebInfo" is not supported. - #:build-type "Release" - - ;; No 'test' target. - #:tests? #f)) + '(#:tests? #f)) ; no test target (inputs `(("mpfr" ,mpfr) ("gmp" ,gmp) ("boost" ,boost))) - (home-page "http://cgal.org/") + (home-page "https://www.cgal.org/") (synopsis "Computational geometry algorithms library") (description "CGAL provides easy access to efficient and reliable geometric algorithms diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index c22ab0b9f1..3ed01d1967 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -44,6 +44,7 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system meson) #:use-module (guix build-system perl) @@ -1729,7 +1730,7 @@ independent of your desktop environment, and supports global key bindings.") (define-public yad (package (name "yad") - (version "0.41.0") + (version "5.0") (source (origin (method git-fetch) @@ -1738,24 +1739,24 @@ independent of your desktop environment, and supports global key bindings.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1hkxiich898sbacpg3jflf6i8l4hkfnc0zh10rr376v0mnzbn6jn")))) - (build-system gnu-build-system) + (base32 "07rd61hvilsxxrj7lf8c9k0a8glj07s48m7ya8d45030r90g3lvc")))) + (build-system glib-or-gtk-build-system) (arguments `(#:configure-flags - '("--with-gtk=gtk3" - "--enable-html" - "--enable-gio" - "--enable-spell" - "--enable-icon-browser") + ;; Passing --enable-foo will silently disable foo if prerequisite + ;; inputs are missing, not abort the build as one might expect. + ;; ‘--enable-html’ adds a huge webkitgtk dependency. It was never + ;; present in the past and nobody complained. + '("--enable-icon-browser" + "--enable-spell") ; gspell checking support #:phases (modify-phases %standard-phases - (replace 'bootstrap + (add-after 'bootstrap 'intltoolize (lambda _ - (invoke "autoreconf" "-vif") - (invoke "intltoolize" "--force" "--automake") - #t))))) + (invoke "intltoolize" "--force" "--automake")))))) (inputs - `(("gtk+" ,gtk+))) + `(("gspell" ,gspell) + ("gtk+" ,gtk+))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index d5c7325ba4..49ef5f2892 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -779,6 +779,7 @@ messaging library.") (uri (git-reference (url "https://github.com/jerry40/guile-kernel") (commit commit))) + (file-name (git-file-name name version)) (sha256 (base32 "0aj04853bqm47ivfcmrgpb7w3wkis847kc7qrwsa5zcn9h38qh2f")))) @@ -1595,14 +1596,14 @@ many readers as needed).") (define-public guile-ncurses (package (name "guile-ncurses") - (version "2.2") + (version "3.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/guile-ncurses/guile-ncurses-" version ".tar.gz")) (sha256 (base32 - "1wvggbr4xv8idh1hzd8caj4xfp4pln78a7w1wqzd4zgzwmnzxr2f")))) + "038xbffalhymg26lvmzgf7ljilxz2f2zmqg5r5nfzbipfbprwjhf")))) (build-system gnu-build-system) (inputs `(("ncurses" ,ncurses) ("guile" ,guile-2.2))) @@ -1857,11 +1858,14 @@ interface for reading articles in any format.") (version "1.3.0") (home-page "https://github.com/aconchillo/guile-redis") (source (origin - (method url-fetch) - (uri (string-append home-page "/archive/" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url home-page) + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1li70a2716my9q9zfq0qn2x5d1cir9k2vx0jm9glm464yaf1vj39")))) + "14izs8daxh7pb7vwpxi5g427qa31137jkaxrb1cy5rpjkwchy723")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) @@ -1975,6 +1979,7 @@ format is also supported.") (uri (git-reference (url "https://git.elephly.net/software/guile-picture-language.git") (commit commit))) + (file-name (git-file-name name version)) (sha256 (base32 "1ydvw9dvssdvlvhh1dr8inyzy2x6m41qgp8hsivca1xysr4gc23a")))) @@ -2005,6 +2010,7 @@ The picture values can directly be displayed in Geiser.") (uri (git-reference (url "https://git.elephly.net/software/guile-studio.git") (commit commit))) + (file-name (git-file-name name version)) (sha256 (base32 "0rxl5gv2mavycwkl33lcwyb3z71j2f4zyzk60k7vl3hzszpr08iq")))) diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index 0fab912f4f..eac07ca9b8 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -247,14 +247,14 @@ unique algebra of patches called @url{http://darcs.net/Theory,Patchtheory}. (define-public git-annex (package (name "git-annex") - (version "7.20191024") + (version "7.20191114") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "git-annex/git-annex-" version ".tar.gz")) (sha256 - (base32 "11n0wvw7i1rgrsmm2wkv01rfa0azgaw1ib7jbmy4fyg9pw0s27y1")))) + (base32 "1afrn5g3b80f3n6ncfph6pmf9jdpc7a6ay55k2pmkn96pyv4hfmm")))) (build-system haskell-build-system) (arguments `(#:configure-flags @@ -564,7 +564,7 @@ Wayland, and Linux console environments alike.") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/Raincat/" + (uri (string-append "mirror://hackage/package/Raincat/" "Raincat-" version ".tar.gz")) (sha256 (base32 @@ -599,6 +599,37 @@ proved to be an excellent learning experience for the programmers. Everything is programmed in Haskell.") (license license:bsd-3))) +(define-public scroll + (package + (name "scroll") + (version "1.20180421") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/scroll/scroll-" + version ".tar.gz")) + (sha256 + (base32 + "0apzrvf99rskj4dbmn57jjxrsf19j436s8a09m950df5aws3a0wj")))) + (build-system haskell-build-system) + (inputs + `(("ghc-case-insensitive" ,ghc-case-insensitive) + ("ghc-data-default" ,ghc-data-default) + ("ghc-ifelse" ,ghc-ifelse) + ("ghc-monad-loops" ,ghc-monad-loops) + ("ghc-ncurses" ,ghc-ncurses) + ("ghc-optparse-applicative" ,ghc-optparse-applicative) + ("ghc-random" ,ghc-random) + ("ghc-vector" ,ghc-vector))) + (home-page "https://joeyh.name/code/scroll/") + (synopsis "scroll(6), a roguelike game") + (description + "You're a bookworm that's stuck on a scroll. You have to dodge between +words and use spells to make your way down the page as the scroll is read. Go +too slow and you'll get wound up in the scroll and crushed.") + (license license:gpl2))) + (define-public shellcheck (package (name "shellcheck") diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 217c78a08c..37b9b262fc 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -55,6 +55,7 @@ #:use-module (gnu packages linux) #:use-module (gnu packages lua) #:use-module (gnu packages maths) + #:use-module (gnu packages ncurses) #:use-module (gnu packages pcre) #:use-module (gnu packages pkg-config) #:use-module (gnu packages sdl) @@ -6753,6 +6754,43 @@ between 2 and 3 times faster than the Mersenne Twister.") `(("ghc-hashable" ,ghc-hashable-bootstrap))) (properties '((hidden? #t))))) +(define-public ghc-ncurses + (package + (name "ghc-ncurses") + (version "0.2.16") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/ncurses/ncurses-" + version ".tar.gz")) + (sha256 + (base32 + "0gsyyaqyh5r9zc0rhwpj5spyd6i4w2vj61h4nihgmmh0yyqvf3z5")))) + (build-system haskell-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-before 'build 'fix-includes + (lambda _ + (substitute* '("cbits/hsncurses-shim.h" + "lib/UI/NCurses.chs" + "lib/UI/NCurses/Enums.chs" + "lib/UI/NCurses/Panel.chs") + (("<ncursesw/") "<")) + #t))) + #:cabal-revision + ("1" + "1wfdy716s5p1sqp2gsg43x8wch2dxg0vmbbndlb2h3d8c9jzxnca"))) + (inputs `(("ncurses" ,ncurses))) + (native-inputs `(("ghc-c2hs" ,ghc-c2hs))) + (home-page "https://john-millikin.com/software/haskell-ncurses/") + (synopsis "Modernised bindings to GNU ncurses") + (description "GNU ncurses is a library for creating command-line application +with pseudo-graphical interfaces. This package is a nice, modern binding to GNU +ncurses.") + (license license:gpl3))) + (define-public ghc-network (package (name "ghc-network") diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 96fded0f4e..5057927174 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com> ;;; Copyright © 2017, 2018 Efraim Flashner <efraim@flashner.co.il> -;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019 Meiyo Peng <meiyo@disroot.org> ;;; ;;; This file is part of GNU Guix. @@ -179,7 +179,7 @@ may also simplify input method development.") (define-public ibus-libpinyin (package (name "ibus-libpinyin") - (version "1.11.0") + (version "1.11.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/libpinyin/ibus-libpinyin/" @@ -187,7 +187,7 @@ may also simplify input method development.") "/ibus-libpinyin-" version ".tar.gz")) (sha256 (base32 - "1sypbr5n96sf7mgqhxrwbawdmszgb6yi28iqkmfmb8xr93pwq7fq")))) + "1bl1cgicd2df797dx1x0q904438bsn8i23djzcfcai4dp3631xc0")))) (build-system glib-or-gtk-build-system) (arguments `(#:phases diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 51062df7a3..d237a27c4a 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -460,6 +460,7 @@ including CBZ, CB7, CBT, LHA.") (uri (git-reference (url "https://github.com/jurplel/qView.git") (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 "1s29hz44rb5dwzq8d4i4bfg77dr0v3ywpvidpa6xzg7hnnv3mhi5")))) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 3237071e03..5a2bb97ce8 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1283,7 +1283,7 @@ ISO/IEC 15444-1).") (define-public zimg (package (name "zimg") - (version "2.5") + (version "2.9.2") (source (origin (method git-fetch) @@ -1292,8 +1292,7 @@ ISO/IEC 15444-1).") (commit (string-append "release-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "05krggiifbl6hyg2j3z8qz2k7si84g1qg9snhsnf1ml7mrhqhhlr")))) + (base32 "0jlgrlfs9maixd8mx7gk2kfawz8ixnihkxi7vhyzfy1gq49vmxm2")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) diff --git a/gnu/packages/installers.scm b/gnu/packages/installers.scm index c987254d61..9229359fdf 100644 --- a/gnu/packages/installers.scm +++ b/gnu/packages/installers.scm @@ -28,7 +28,10 @@ #:use-module (guix utils)) (define (make-nsis machine target-arch nsis-target-type) - (let ((triplet (string-append machine "-" "w64-mingw32"))) + (let* ((triplet (string-append machine "-" "w64-mingw32")) + (xbinutils (cross-binutils triplet)) + (xlibc (cross-libc triplet)) + (xgcc (cross-gcc triplet #:libc xlibc))) (package (name (string-append "nsis-" machine)) (version "3.04") @@ -41,13 +44,14 @@ "1xgllk2mk36ll2509hd31mfq6blgncmdzmwxj3ymrwshdh23d5b0")) (patches (search-patches "nsis-env-passthru.patch")))) (build-system scons-build-system) - (native-inputs `(("xgcc" ,(cross-gcc triplet #:libc (cross-libc triplet))) - ("xbinutils" ,(cross-binutils triplet)) - ("mingw-w64" ,(cross-libc triplet)))) + (native-inputs `(("xgcc" ,xgcc) + ("xbinutils" ,xbinutils) + ("mingw-w64" ,xlibc))) (inputs `(("zlib" ,zlib))) (arguments `(#:scons ,scons-python2 #:modules ((srfi srfi-1) + (srfi srfi-26) (guix build utils) (guix build scons-build-system)) #:tests? #f @@ -92,7 +96,20 @@ ;; CROSS_-prefixed version of env vars (setenv (string-append "CROSS_" env-name) (filter-delimited-string env-val mingw-path?)))) - '("CPLUS_INCLUDE_PATH" "LIBRARY_PATH" "C_INCLUDE_PATH")))) + '("CPATH" "LIBRARY_PATH")) + ;; Hack to place mingw-w64 path at the end of search + ;; paths. Could probably use a specfile and dirafter + (setenv "CROSS_CPLUS_INCLUDE_PATH" + (string-join + `(,@(map (cut string-append (assoc-ref %build-inputs "xgcc") <>) + `("/include/c++" + ,(string-append "/include/c++/" ,triplet) + "/include/c++/backward" + ,@(map (cut string-append "/lib/gcc/" ,triplet "/" ,(package-version xgcc) <>) + '("/include" + "/include-fixed")))) + ,(getenv "CROSS_CPATH")) + ":")))) (add-before 'build 'fix-target-detection (lambda _ ;; NSIS target detection is screwed up, manually diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index e3418c1fec..4a2e33d8fc 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -327,14 +327,13 @@ using a mouse. It is customizable and extensible with plugins and scripts.") (define-public limnoria (package (name "limnoria") - (version "2017.10.01") + (version "2019.11.09") (source (origin (method url-fetch) (uri (pypi-uri "limnoria" version)) (sha256 - (base32 - "1hd8h257x7a0s4rvb4aqvfi77qfcyv6jaz70nndg7y6p4yhvjmy6")))) + (base32 "1ni25jmri0928jj2c24xw5f2fzljjla54zh80fimks1aa5752j29")))) (build-system python-build-system) (inputs `(("python-pytz" ,python-pytz) diff --git a/gnu/packages/java-maths.scm b/gnu/packages/java-maths.scm index 6c22f2938d..748ae67b58 100644 --- a/gnu/packages/java-maths.scm +++ b/gnu/packages/java-maths.scm @@ -39,6 +39,7 @@ (uri (git-reference (url "https://github.com/mikiobraun/jblas.git") (commit (string-append "jblas-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 "0afh48hq8i8li5z11x415c8slwsfrlib0w1xjfbg186mximqvv3g")))) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 15e814441f..955625b0c5 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3,13 +3,13 @@ ;;; Copyright © 2016 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016, 2017 Roel Janssen <roel@gnu.org> ;;; Copyright © 2017, 2019 Carlo Zancanaro <carlo@zancanaro.id.au> -;;; Copyright © 2017, 2018 Julien Lepiller <julien@lepiller.eu> +;;; Copyright © 2017, 2018, 2019 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2016, 2017, 2018 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019 Gábor Boskovits <boskovits@gmail.com> ;;; Copyright © 2018 Chris Marusich <cmmarusich@gmail.com> -;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2018, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2019 Björn Höfling <bjoern.hoefling@bjoernhoefling.de> ;;; ;;; This file is part of GNU Guix. @@ -2321,6 +2321,114 @@ new Date();")) `(("java-junit" ,java-junit) ,@(package-inputs ant/java8))))) +(define-public java-openjfx-build + (package + (name "java-openjfx-build") + ;; This is a java-8 version + (version "8.202") + (source (origin + (method hg-fetch) + (uri (hg-reference + (url "http://hg.openjdk.java.net/openjfx/8u-dev/rt") + (changeset (string-append + (string-join (string-split version #\.) "u") + "-ga")))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "0yg38mwpivswccv9n96k06x3iv82i4px1a9xg9l8dswzwmfj259f")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "java-openjfx.jar" + #:source-dir "buildSrc/src/main/java" + #:test-dir "buildSrc/src/test" + #:phases + (modify-phases %standard-phases + (add-before 'configure 'generate-jsl-parser + (lambda _ + (invoke "antlr3" "-o" + "buildSrc/src/main/java/com/sun/scenario/effect/compiler" + "buildSrc/src/main/antlr/JSL.g")))))) + (inputs + `(("antlr3" ,antlr3) + ("java-stringtemplate" ,java-stringtemplate))) + (native-inputs + `(("java-junit" ,java-junit) + ("java-hamcrest-core" ,java-hamcrest-core))) + (home-page "https://openjfx.io") + (synopsis "Graphical application toolkit in Java") + (description "OpenJFX is a client application platform for desktop, +mobile and embedded systems built on Java. Its goal is to produce a +modern, efficient, and fully featured toolkit for developing rich client +applications. This package contains base classes for the OpenJFX +distribution and helper classes for building other parts of the +distribution.") + (license license:gpl2))) ;gpl2 only, with classpath exception + +(define-public java-openjfx-base + (package (inherit java-openjfx-build) + (name "java-openjfx-base") + (arguments + `(#:jar-name "java-openjfx-base.jar" + #:source-dir "modules/base/src/main/java:modules/base/src/main/java8:modules/base/src/main/version-info" + #:test-dir "modules/base/src/test" + #:phases + (modify-phases %standard-phases + (add-before 'check 'remove-empty-file + (lambda _ + (with-directory-excursion "modules/base/src/test/java" + ;; These files are completely commented, but junit expects them to + ;; contain a class, so tests fail. + (delete-file + "com/sun/javafx/property/adapter/PropertyDescriptorTest.java") + (delete-file + "com/sun/javafx/property/adapter/ReadOnlyPropertyDescriptorTest.java") + (delete-file "javafx/beans/property/PropertiesTest.java") + (delete-file + "javafx/beans/property/adapter/ReadOnlyJavaBeanPropertyBuilder_General_Test.java") + ;; This one fails + (delete-file "com/sun/javafx/runtime/VersionInfoTest.java")) + #t))))) + (propagated-inputs + `(("java-openjfx-build" ,java-openjfx-build))) + (description "OpenJFX is a client application platform for desktop, +mobile and embedded systems built on Java. Its goal is to produce a +modern, efficient, and fully featured toolkit for developing rich client +applications. This package contains base classes for the OpenJFX +distribution."))) + +(define-public java-openjfx-graphics + (package (inherit java-openjfx-build) + (name "java-openjfx-graphics") + (arguments + `(#:jar-name "java-openjfx-graphics.jar" + #:source-dir "modules/graphics/src/main/java" + #:tests? #f; require X + #:test-dir "modules/graphics/src/test")) + (propagated-inputs + `(("java-openjfx-base" ,java-openjfx-base) + ("java-swt" ,java-swt))) + (description "OpenJFX is a client application platform for desktop, +mobile and embedded systems built on Java. Its goal is to produce a +modern, efficient, and fully featured toolkit for developing rich client +applications. This package contains graphics-related classes for the +OpenJFX distribution."))) + +(define-public java-openjfx-media + (package (inherit java-openjfx-build) + (name "java-openjfx-media") + (propagated-inputs + `(("java-openjxf-graphics" ,java-openjfx-graphics))) + (arguments + `(#:jar-name "java-openjfx-media.jar" + #:source-dir "modules/media/src/main/java" + #:tests? #f)); no tests + (description "OpenJFX is a client application platform for desktop, +mobile and embedded systems built on Java. Its goal is to produce a +modern, efficient, and fully featured toolkit for developing rich client +applications. This package contains media-related classes for the +OpenJFX distribution."))) + (define-public javacc-4 (package (name "javacc") @@ -2395,7 +2503,27 @@ debugging, etc.") #:test-target "test" #:phases (modify-phases %standard-phases - (replace 'install (install-jars "target"))))) + (replace 'install (install-jars "target")) + (add-after 'install 'install-bin + (lambda* (#:key outputs inputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (dir (string-append out "/share/java")) + (bin (string-append out "/bin")) + (javacc (string-append bin "/javacc"))) + (mkdir-p bin) + (with-output-to-file javacc + (lambda _ + (display + (string-append "#!/bin/sh\n" + (assoc-ref inputs "jdk") "/bin/java" + " -cp " dir "/javacc.jar" " `basename $0`" " $*")))) + (chmod javacc #o755) + ;; symlink to different names to affect the first argument and + ;; change the behavior of the jar file. + (symlink javacc (string-append bin "/jjdoc")) + (symlink javacc (string-append bin "/jjtree")) + #t)))))) + (native-inputs `(("javacc" ,javacc-4))))) @@ -5040,6 +5168,115 @@ expressions to graphs of objects of all kinds: JavaBeans, Maps, Servlet contexts, DOM etc, including mixtures thereof.") (license license:asl2.0))) +(define-public java-commons-pool + (package + (name "java-commons-pool") + (version "2.6.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://apache/commons/pool/source/" + "commons-pool2-" version "-src.tar.gz")) + (sha256 + (base32 + "1fi1hgqmq01bs6azbj3sfswxzadp2r8sjjfiq6ryilz1m50kvrv6")))) + (arguments + `(#:jar-name "common-pool.jar" + #:source-dir "src/main/java" + #:test-exclude + (list "**/PerformanceTest.java"))) + (build-system ant-build-system) + (inputs + `(("java-cglib" ,java-cglib))) + (native-inputs + `(("java-junit" ,java-junit) + ("java-hamcrest-core" ,java-hamcrest-core) + ("java-asm" ,java-asm) + ("java-objenesis" ,java-objenesis))) + (home-page "https://commons.apache.org/proper/commons-pool/") + (synopsis "Object-pooling API in Java") + (description "The commons-pool package provides an object-pooling API +and a number of object pool implementations. This package defines a +handful of pooling interfaces and some base classes that may be useful when +creating new pool implementations.") + (license license:asl2.0))) + +(define-public java-commons-dbcp + (package + (name "java-commons-dbcp") + (version "2.6.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://apache/commons/dbcp/source/" + "commons-dbcp2-" version "-src.tar.gz")) + (sha256 + (base32 + "0axbvcbnf2l70fc3ybrlp3siw2w4ka9mia2pnx4py8gz54cpw3rc")))) + (arguments + `(#:source-dir "src/main/java" + #:jar-name "java-commons-dbcp.jar" + #:tests? #f)); requires apache-geronimo + (inputs + `(("java-commons-pool" ,java-commons-pool) + ("java-commons-logging" ,java-commons-logging-minimal) + ("java-jboss-transaction-api-spec" ,java-jboss-transaction-api-spec))) + (native-inputs + `(("java-junit" ,java-junit))) + (build-system ant-build-system) + (home-page "https://commons.apache.org/proper/commons-dbcp/") + (synopsis "Database Connection Pool for Java") + (description "Commons-dbcp allows you to share a pool of database +connections between users. Creating a new connection for each user can be +time consuming and even unfeasible when the number of simultaneous users is +very large. This package provides a way to share a poole of connections to +reduce that load.") + (license license:asl2.0))) + +(define-public java-commons-jcs + (package + (name "java-commons-jcs") + (version "2.2.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://apache/commons/jcs/source/" + "commons-jcs-dist-" version "-src.tar.gz")) + (sha256 + (base32 + "0syhq2npjbrl0azqfjm0gvash1qd5qjy4qmysxcrqjsk0nf9fa1q")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "commons-jcs.jar" + #:source-dir "commons-jcs-core/src/main/java" + #:test-dir "commons-jcs-core/src/test" + #:tests? #f; requires hsqldb + #:phases + (modify-phases %standard-phases + (add-before 'build 'prepare + (lambda _ + (with-directory-excursion + "commons-jcs-core/src/main/java/org/apache/commons/jcs" + (substitute* + "auxiliary/disk/jdbc/dsfactory/SharedPoolDataSourceFactory.java" + (("commons.dbcp") "commons.dbcp2") + ((".*\\.setMaxActive.*") "")) + ;;; Remove dependency on velocity-tools + (delete-file "admin/servlet/JCSAdminServlet.java")) + #t))))) + (propagated-inputs + `(("java-classpathx-servletapi" ,java-classpathx-servletapi) + ("java-commons-logging-minimal" ,java-commons-logging-minimal) + ("java-commons-httpclient" ,java-commons-httpclient) + ("java-commons-dbcp" ,java-commons-dbcp))) + (native-inputs + `(("java-junit" ,java-junit))) + (home-page "https://commons.apache.org/proper/commons-jcs/") + (synopsis "Distributed caching system in Java") + (description "JCS is a distributed caching system written in Java. It +is intended to speed up applications by providing a means to manage cached +data of various dynamic natures. Like any caching system, JCS is most useful +for high read, low put applications. Latency times drop sharply and +bottlenecks move away from the database in an effectively cached system.") + (license license:asl2.0))) + (define-public java-jsr250 (package (name "java-jsr250") @@ -6801,14 +7038,16 @@ import org.antlr.grammar.v3.ANTLRTreePrinter;")) (add-before 'build 'fix-build-xml (lambda _ (substitute* "build.xml" - (("<exec") "<copy todir=\"${classes.dir}\"> + (("target name=\"compile\">") + "target name=\"compile\"> +<copy todir=\"${classes.dir}\"> <fileset dir=\"tool/src/main/resources\"> <include name=\"**/*.stg\"/> <include name=\"**/*.st\"/> <include name=\"**/*.sti\"/> <include name=\"**/STLexer.tokens\"/> </fileset> -</copy><exec")) +</copy>")) #t))))) (native-inputs `(("antlr" ,antlr2) @@ -6914,14 +7153,16 @@ import org.antlr.grammar.v2.ANTLRTreePrinter;")) (add-before 'build 'fix-build-xml (lambda _ (substitute* "build.xml" - (("<exec") "<copy todir=\"${classes.dir}\"> + (("target name=\"compile\">") + "target name=\"compile\"> +<copy todir=\"${classes.dir}\"> <fileset dir=\"tool/src/main/resources\"> <include name=\"**/*.stg\"/> <include name=\"**/*.st\"/> <include name=\"**/*.sti\"/> <include name=\"**/STLexer.tokens\"/> </fileset> -</copy><exec")) +</copy>")) #t))))) (native-inputs `(("antlr" ,antlr2) @@ -6933,7 +7174,7 @@ import org.antlr.grammar.v2.ANTLRTreePrinter;")) ("antlr" ,antlr2) ("antlr3" ,antlr3-3.1))))) -(define antlr3-3.1 +(define-public antlr3-3.1 (package (inherit antlr3) (version "3.1") @@ -6991,14 +7232,16 @@ import org.antlr.grammar.v2.ANTLRTreePrinter;")) (add-before 'build 'fix-build-xml (lambda _ (substitute* "build.xml" - (("<exec") "<copy todir=\"${classes.dir}\"> + (("target name=\"compile\">") + "target name=\"compile\"> +<copy todir=\"${classes.dir}\"> <fileset dir=\"src\"> <include name=\"**/*.stg\"/> <include name=\"**/*.st\"/> <include name=\"**/*.sti\"/> <include name=\"**/STLexer.tokens\"/> </fileset> -</copy><exec")) +</copy>")) #t))))) (native-inputs `(("antlr" ,antlr2))) @@ -10878,14 +11121,16 @@ OSGi Service Registry is a goal of this project.") (define-public java-eclipse-sisu-plexus (package (name "java-eclipse-sisu-plexus") - (version "0.3.3") + (version "0.3.4") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/eclipse/sisu.plexus/" - "archive/releases/" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/eclipse/sisu.plexus.git") + (commit (string-append "releases/" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0lbj7nxy5j0z71k407zbb82icfqh7midrfk0fb3fa3jzdjz0d9d9")) + "17mjlajnsqnk07cc58h1qpxrif85yb2m2y0pyba48yjjgikk8r9f")) (modules '((guix build utils))) (snippet '(begin @@ -11281,3 +11526,206 @@ the application using Java to Lisp integration APIs.") license:bsd-3 ;; jfli is released under CPL 1.0 license:cpl1.0)))) + +(define-public java-jsonp-api + (package + (name "java-jsonp-api") + (version "1.1.5") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/eclipse-ee4j/jsonp") + (commit (string-append version "-RELEASE")))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0nxq16lrx7i87hgyj5rzcwilvr67h0i299gygfn8f5vs4n7n59vy")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "jsonp-api.jar" + #:tests? #f + #:source-dir "api/src/main/java" + #:test-dir "api/src/test")) + (home-page "https://eclipse-ee4j.github.io/jsonp/") + (synopsis "JSON Processing in Java") + (description "JSON Processing (JSON-P) is a Java API to process (e.g. +parse, generate, transform and query) JSON messages. It produces and +consumes JSON text in a streaming fashion (similar to StAX API for XML) +and allows to build a Java object model for JSON text using API classes +(similar to DOM API for XML).") + ;; either gpl2 only with classpath exception, or epl2.0. + (license (list license:gpl2 + license:epl2.0)))) + +(define-public java-jsonp-impl + (package + (inherit java-jsonp-api) + (name "java-jsonp-impl") + (arguments + `(#:jar-name "jsonp-impl.jar" + #:tests? #f + #:source-dir "impl/src/main/java" + #:test-dir "impl/src/test")) + (propagated-inputs + `(("java-jsonp-api" ,java-jsonp-api))) + (description "JSON Processing (JSON-P) is a Java API to process (e.g. +parse, generate, transform and query) JSON messages. This package contains +a reference implementation of that API."))) + +(define-public java-xmp + (package + (name "java-xmp") + (version "5.1.3") + (source (origin + (method url-fetch) + (uri (string-append "http://download.macromedia.com/pub/developer" + "/xmp/sdk/XMPCoreJava-" version ".zip")) + (sha256 + (base32 + "14nai2mmsg7l5ya2y5mx4w4lr1az3sk2fjz6hiy4zdrsavgvl1g7")))) + (build-system ant-build-system) + (arguments + `(#:build-target "build" + #:tests? #f; no tests + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "XMPCore") + #t)) + (add-before 'build 'fix-timestamp + (lambda _ + (substitute* "build.xml" + (("\\$\\{BuildDate\\}") "1970 Jan 01 00:00:00-GMT")) + #t)) + (replace 'install + (install-jars ".")) + (add-after 'install 'install-doc + (lambda* (#:key outputs #:allow-other-keys) + (copy-recursively + "docs" + (string-append (assoc-ref outputs "out") "/share/doc/java-xmp")) + #t))))) + (native-inputs + `(("unzip" ,unzip))) + (home-page "https://www.adobe.com/devnet/xmp.html") + (synopsis "Extensible Metadat Platform (XMP) support in Java") + (description "Adobe's Extensible Metadata Platform (XMP) is a labeling +technology that allows you to embed data about a file, known as metadata, +into the file itself. The XMP Toolkit for Java is based on the C++ XMPCore +library and the API is similar.") + (license license:bsd-3))) + +(define-public java-metadata-extractor + (package + (name "java-metadata-extractor") + (version "2.11.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/drewnoakes/metadata-extractor") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "06yrq0swrl1r40yjbk5kqzjxr04jlkq9lfi711jvfgjf5kp2qinj")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "metadata-extractor.jar" + #:source-dir "Source" + #:test-dir "Tests" + #:phases + (modify-phases %standard-phases + (add-before 'check 'fix-test-dir + (lambda _ + (substitute* "build.xml" + (("/java\">") "\">")) + #t))))) + (propagated-inputs + `(("java-xmp" ,java-xmp))) + (native-inputs + `(("java-hamcrest-core" ,java-hamcrest-core) + ("java-junit" ,java-junit))) + (home-page "https://github.com/drewnoakes/metadata-extractor") + (synopsis "Extract metadata from image and video files") + (description "Metadata-extractor is a straightforward Java library for +reading metadata from image files. It is able to read metadata in Exif, +IPTC, XMP, ICC and more formats.") + (license license:asl2.0))) + +(define-public java-svg-salamander + (package + (name "java-svg-salamander") + (version "1.1.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/blackears/svgSalamander") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1zv3kjdkf6iqf02x6ln76254y634j2ji448y706a65lsbfjmmicf")) + (modules '((guix build utils))) + (snippet + `(for-each delete-file (find-files "." ".*.jar"))) + (patches + (search-patches "java-svg-salamander-Fix-non-det.patch")))) + (build-system ant-build-system) + (arguments + `(#:tests? #f; no tests + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "svg-core") + #t)) + (add-before 'build 'copy-jars + (lambda* (#:key inputs #:allow-other-keys) + (copy-file (car (find-files (assoc-ref inputs "javacc") "\\.jar$")) + "../libraries/javacc.jar") + (copy-file (car (find-files (assoc-ref inputs "ant") "ant\\.jar$")) + "../libraries/ant.jar") + #t)) + (replace 'install + (install-jars "dist"))))) + (native-inputs + `(("javacc" ,javacc))) + (home-page "https://github.com/blackears/svgSalamander") + (synopsis "SVG engine for Java") + (description "SVG Salamander is an SVG engine for Java that's designed +to be small, fast, and allow programmers to use it with a minimum of fuss. +It's in particular targeted for making it easy to integrate SVG into Java +games and making it much easier for artists to design 2D game content - from +rich interactive menus to charts and graphcs to complex animations.") + (license license:bsd-2))) + +(define-public java-jboss-transaction-api-spec + (package + (name "java-jboss-transaction-api-spec") + (version "1.2+1.1.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jboss/jboss-transaction-api_spec") + (commit "jboss-transaction-api_1.2_spec-1.1.1.Final"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1xbfq5hvb86izflydxrqqv3k26c1ba2m0ap6m97shqrsdi9by4wy")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "java-jboss-transaction-api_spec.jar" + #:source-dir "src/main/java" + #:tests? #f)); no tests + (inputs + `(("java-cdi-api" ,java-cdi-api) + ("java-jboss-interceptors-api-spec" ,java-jboss-interceptors-api-spec))) + (home-page "https://github.com/jboss/jboss-transaction-api_spec") + (synopsis "Generic transaction management API in Java") + (description "Java-jboss-transaction-api-spec implements the Transactions +API. A transaction is a unit of work containing one or more operations +involving one or more shared resources having ACID (Atomicity, Consistency, +Isolation and Durability) properties.") + ;; either gpl2 only with classpath exception or cddl. + (license (list license:gpl2 license:cddl1.0)))) diff --git a/gnu/packages/jrnl.scm b/gnu/packages/jrnl.scm index 6393ea9105..e5e2a4ba4f 100644 --- a/gnu/packages/jrnl.scm +++ b/gnu/packages/jrnl.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2014 Eric Bavier <address@hidden> ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,7 +22,7 @@ (define-module (gnu packages jrnl) #:use-module (guix packages) #:use-module (guix licenses) - #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix build-system python) #:use-module (gnu packages check) #:use-module (gnu packages python) @@ -35,13 +36,13 @@ (version "1.9.7") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/maebert/jrnl/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0mfq7hhw5np2dj9jlxpyyk2cg9i0xgz2brb894d928hczszy97bq")))) + (method git-fetch) + (uri (git-reference + (url "https://github.com/maebert/jrnl.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1bjjyfc3fnsy0h299s3jj42wnigj43xdyp5ppi1cvkqbwl369935")))) (build-system python-build-system) (native-inputs `(("behave" ,behave))) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 9755f66aca..79eb20cb59 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2018 Gábor Boskovits <boskovits@gmail.com> ;;; Copyright © 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2018, 2019 Hartmut Goebel <h.goebel@crazy-compilers.com> +;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -626,3 +627,45 @@ communicate with each other. Here's a few things KDE Connect can do: "Kqtquickcharts is a QtQuick plugin to render beautiful and interactive charts.") (license license:lgpl2.1+))) + +(define-public kcachegrind + (package + (name "kcachegrind") + (version "19.04.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/kcachegrind-" version ".tar.xz")) + (sha256 + (base32 + "1hhsk64yp6q2xh8j269j4wp9y24ggmii861r6gf02mj1mbn2p1jb")))) + (build-system cmake-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("perl" ,perl) + ("python" ,python) + ("qttools" ,qttools) + ("kdoctools" ,kdoctools))) + (inputs + `(("qtbase" ,qtbase) + ("karchive" ,karchive) + ("ki18n" ,ki18n) + ("kio" ,kio) + ("kdbusaddons" ,kdbusaddons))) + ;; Note: The 'hotshot2calltree' and 'pprof2calltree' scripts depend on + ;; Python and PHP, respectively. These are optional and we ignore them + ;; for now. + (home-page "https://kcachegrind.github.io/html/Home.html") + (synopsis "Visualize profiles produces by Valgrind's Cachegrind tool") + (description + "The data files generated by the Callgrind of Valgrind, an application +profiler, can be loaded into KCachegrind for browsing the performance results. +There is also a command-line tool to get ASCII reports from data files without +the need to use KCachegrind. + +The format of Callgrind output is documented. With conversion scripts, +KCachegrind is able to visualize output of other profilers like OProfile, a +system-wide profiler for Linux using statistical sampling with hardware +performance counters. There also exist converters for profiling output of +Python, PHP, and Perl.") + (license license:gpl2))) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 6d83d633f9..4476e5a4ad 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -929,7 +929,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") (define-public libreoffice (package (name "libreoffice") - (version "6.2.8.2") + (version "6.3.3.2") (source (origin (method url-fetch) @@ -939,7 +939,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") (version-prefix version 3) "/libreoffice-" version ".tar.xz")) (sha256 (base32 - "1npxyj0hklls3jnaxx9kj3r6bgydgrbz6nacy05n0zhq8i6zb5ir")) + "1kz5950vhjc33rx7pyl5sw9lxxm90hxrj7v8y86jy34skjrfa3nl")) (patches (search-patches "libreoffice-icu.patch" "libreoffice-glm.patch")) (modules '((guix build utils))) @@ -969,6 +969,8 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") ("gconf" ,gconf) ("glew" ,glew) ("glm" ,glm) + ("gnupg" ,gnupg) + ("gobject-introspection" ,gobject-introspection) ("gperf" ,gperf) ("gpgme" ,gpgme) ("graphite2" ,graphite2) @@ -1112,7 +1114,6 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") #:configure-flags (list "--enable-release-build" - "--enable-verbose" ;; Avoid using all cpu cores by default (format #f "--with-parallelism=~d" (parallel-job-count)) "--disable-fetch-external" ; disable downloads diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 0344f5b37c..242918caad 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -100,6 +100,7 @@ #:use-module (gnu packages popt) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages readline) #:use-module (gnu packages rrdtool) #:use-module (gnu packages samba) @@ -351,42 +352,42 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." "linux-" version ".tar.xz")) (sha256 hash))) -(define-public linux-libre-5.3-version "5.3.8") +(define-public linux-libre-5.3-version "5.3.11") (define-public linux-libre-5.3-pristine-source (let ((version linux-libre-5.3-version) - (hash (base32 "0jb6yya9yx4z52p5m32dqj0kgc6aaz9df8mvq0hzy40bqb3czwvq"))) + (hash (base32 "1dxfh0l4inpjd17pyxfsskjsphs43r8lg6nhhr3y4whxdna5cwbf"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.3))) -(define-public linux-libre-4.19-version "4.19.81") +(define-public linux-libre-4.19-version "4.19.84") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "17g2wiaa7l7mxi72k79drxij2zqk3nsj8wi17bl4nfvb1ypc2gi9"))) + (hash (base32 "0q06mhz170x1lkx6c6qdh82rcnsj03q6f2m28aqhmc4wc694m2w6"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.151") +(define-public linux-libre-4.14-version "4.14.154") (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "1bizb1wwni5r4m5i0mrsqbc5qw73lwrfrdadm09vbfz9ir19qlgz"))) + (hash (base32 "00q662s8mgnzqfgk5gkzqfv9ws3vryf28blbq1zxcy4s6wj4mpl6"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.198") +(define-public linux-libre-4.9-version "4.9.201") (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "1b05jra6q695s1d4rzdr39i6m8xsi5xjrdn73sgwzvx0dgxfnwlm"))) + (hash (base32 "125xmh5h1zmfniidpjljny53qkl4phpxaali69i66lajscxx8grq"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.198") +(define-public linux-libre-4.4-version "4.4.201") (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "04pkryy1lc75c88vq5wcjjcxs43i7bb8hhplbfi6s204ipc0iy7c"))) + (hash (base32 "120kci4kmc48zcw16lhxmh71kaxm9ac5qxik36q3a20czg28b2m7"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) @@ -1061,14 +1062,14 @@ at login. Local and dynamic reconfiguration are its key features.") (define-public psmisc (package (name "psmisc") - (version "23.2") + (version "23.3") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/psmisc/psmisc/psmisc-" version ".tar.xz")) (sha256 - (base32 "103qp3f8jvz07x8r8zgsqwyw84g5g92w6pdq97d78d1pr7yvyz2b")))) + (base32 "16i7qzjmm6g0lzha8yzpfrlcxnvkgh95hkq9gdjd4zmzb8d0wxa1")))) (build-system gnu-build-system) (inputs `(("ncurses" ,ncurses))) (home-page "https://gitlab.com/psmisc/psmisc") @@ -4306,7 +4307,7 @@ The package provides additional NTFS tools.") (define-public rdma-core (package (name "rdma-core") - (version "22.3") + (version "26.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/linux-rdma/rdma-core" @@ -4314,15 +4315,27 @@ The package provides additional NTFS tools.") version ".tar.gz")) (sha256 (base32 - "0jgp1xh328x0kr6lkn4vq71cc627zd05wczr74b3j3151flhj828")))) + "14raqwx4pkzghiwkx1v0dq338f7xqqx8rnsxlpdnngvjy1p5l79j")))) (build-system cmake-build-system) (arguments - '(#:tests? #f ; no tests + `(#:tests? #f ; no tests ;; Upstream uses the "ninja" build system and encourage distros ;; to do the same for consistency. They also recommend using the ;; "Release" build type. #:build-type "Release" - #:configure-flags (list "-GNinja") + #:configure-flags (list "-GNinja" + + (string-append "-DRST2MAN_EXECUTABLE=" + (assoc-ref %build-inputs + "python-docutils") + "/bin/rst2man.py") + + ;; On some configurations, the + ;; IB_USER_MAD_REGISTER_AGENT ioctl, which is + ;; used by default, would return ENODEV. To + ;; avoid that, use 'write' instead of ioctls, + ;; as suggested in 'CMakeList.txt'. + "-DIOCTL_MODE=write") #:phases (modify-phases %standard-phases (replace 'build @@ -4335,7 +4348,8 @@ The package provides additional NTFS tools.") (native-inputs `(("ninja" ,ninja) ("pkg-config" ,pkg-config) - ("python" ,python-wrapper))) + ("python" ,python-wrapper) + ("python-docutils" ,python-docutils))) ;for 'rst2man' (inputs `(("libnl" ,libnl) ("udev" ,eudev))) @@ -4414,7 +4428,7 @@ The collection contains a set of bandwidth and latency benchmark such as: (package (name "rng-tools") (home-page "https://github.com/nhorman/rng-tools") - (version "6.7") + (version "6.8") (source (origin (method git-fetch) (uri (git-reference (url home-page) @@ -4422,7 +4436,7 @@ The collection contains a set of bandwidth and latency benchmark such as: (file-name (git-file-name name version)) (sha256 (base32 - "19f75m6mzg8h7b4snzg7d6ypvkz6nq32lrpi9ja95gqz4wsd18a5")))) + "1clm9i9xg3j79q0d6vinn6dx0nwh1fvzcmkqpcbay7mwsgkknvw2")))) (build-system gnu-build-system) (arguments `(;; Avoid using OpenSSL, curl, and libxml2, reducing the closure by 166 MiB. @@ -4960,16 +4974,16 @@ monitoring tools for Linux. These include @code{mpstat}, @code{iostat}, (define-public light (package (name "light") - (version "1.2") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/haikarainen/light/archive/v" - version ".tar.gz")) - (sha256 - (base32 - "1gfvsw7gh5pis733l7j54vzp272pvjyzbg8a0pvapfmg0s7mip97")) - (file-name (string-append name "-" version ".tar.gz")))) + (version "1.2.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/haikarainen/light.git") + (commit (string-append "v" version)))) + (sha256 + (base32 "0zrjipd392bzjvxx0rjrb0cgi0ix1d83fwgw1mcy8kc4d16cgyjg")) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) @@ -5523,6 +5537,7 @@ libraries, which are often integrated directly into libfabric.") "psm-ldflags.patch" ; build shared lib with LDFLAGS "psm-repro.patch")))) ; reproducibility (build-system gnu-build-system) + (outputs '("out" "debug")) (inputs `(("libuuid" ,util-linux))) (arguments '(#:make-flags `("PSM_USE_SYS_UUID=1" "CC=gcc" "WERROR=" diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 9a42d4fe07..33fb53d65e 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -201,10 +201,12 @@ compiler. In LLVM this library is called \"compiler-rt\".") 'unpack 'set-glibc-file-names (lambda* (#:key inputs #:allow-other-keys) (let ((libc (assoc-ref inputs "libc")) - (compiler-rt (assoc-ref inputs "clang-runtime"))) - (case (string->number ,(version-major - (package-version clang-runtime))) - ((or 6 7) + (compiler-rt (assoc-ref inputs "clang-runtime")) + (version + (string->number + ,(version-major (package-version clang-runtime))))) + (cond + ((> version 3) ;; Link to libclang_rt files from clang-runtime. (substitute* "lib/Driver/ToolChain.cpp" (("getDriver\\(\\)\\.ResourceDir") @@ -220,7 +222,7 @@ compiler. In LLVM this library is called \"compiler-rt\".") ;; allow crt1.o & co. to be found. (("@GLIBC_LIBDIR@") (string-append libc "/lib")))) - ((3) + (else (substitute* "lib/Driver/Tools.cpp" ;; Patch the 'getLinuxDynamicLinker' function so that ;; it uses the right dynamic linker file name. @@ -321,6 +323,7 @@ use with Clang, targeting C++11, C++14 and above.") (uri (git-reference (url "https://github.com/llvm/llvm-project.git") (commit (string-append "llvmorg-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 "052h16wjcnqginzp7ki4il2xmm25v9nyk0wcz7cg03gbryhl7aqa")))) diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm index 1481f5b5ee..d75c44aea6 100644 --- a/gnu/packages/logging.scm +++ b/gnu/packages/logging.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2017 Stefan Reichör <stefan@xsteve.at> ;;; Copyright © 2017 Eric Bavier <bavier@member.fsf.org> -;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019 Gábor Boskovits <boskovits@gmail.com> ;;; Copyright © 2019 Meiyo Peng <meiyo@riseup.net> ;;; @@ -142,15 +142,14 @@ commands, displaying the results via a web interface.") (define-public multitail (package (name "multitail") - (version "6.4.2") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "https://vanheusden.com/multitail/multitail-" version ".tgz")) (sha256 - (base32 - "1zd1r89xkxngl1pdrvsc877838nwkfqkbcgfqm3vglwalxc587dg")))) + (base32 "1vd9vdxyxsccl64ilx542ya5vlw2bpg6gnkq1x8cfqy6vxvmx7dj")))) (build-system gnu-build-system) (arguments `(#:make-flags @@ -187,6 +186,7 @@ windows in a terminal, colorize, filter and merge.") (uri (git-reference (url "https://github.com/gabime/spdlog.git") (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 "1rd4zmrlkcdjx0m0wpmjm1g9srj7jak6ai08qkhbn2lsn0niifzd")))) diff --git a/gnu/packages/lolcode.scm b/gnu/packages/lolcode.scm index e55a36c509..84ae83dcc8 100644 --- a/gnu/packages/lolcode.scm +++ b/gnu/packages/lolcode.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 ng0 <ng0@n0.is> +;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,7 +22,7 @@ #:use-module (gnu packages python) #:use-module (gnu packages readline) #:use-module (guix build-system cmake) - #:use-module (guix download) + #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages)) @@ -29,19 +30,20 @@ (package (name "lci") (version "0.11.2") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/justinmeza/lci/archive/v" - version ".tar.gz")) - (sha256 - (base32 - "1li7ikcrs7wqah7gqkirg0k61n6pm12w7pydin966x1sdn9na46b")) - (file-name (string-append name "-" version ".tar.gz")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/justinmeza/lci.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0syw60b93iajgh91ffchirwwhm2kix2753ibx845kyrhzggmdh2l")))) (build-system cmake-build-system) (inputs `(("readline" ,readline))) (native-inputs - `(("python-2" ,python-2))) ; for the tests + `(("python-2" ,python-2))) ; for the tests (synopsis "LOLCODE interpreter written in C") (description "@code{lci} is a LOLCODE interpreter written in C and is designed to be diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 8d5d3522ec..6b9ab051b4 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -158,7 +158,7 @@ itself as well as other components maintained by the LXQt project.") (define-public libqtxdg (package (name "libqtxdg") - (version "3.3.1") + (version "3.4.0") (source (origin (method url-fetch) @@ -166,7 +166,7 @@ itself as well as other components maintained by the LXQt project.") "https://github.com/lxqt/libqtxdg/releases/download/" version "/libqtxdg-" version ".tar.xz")) (sha256 - (base32 "1mnnq8vbf5xjlrzajzfkay0yzzxri0zz0xi8x8rmxpw38xmglq8h")))) + (base32 "0vmn59653dmy79mnbnibhdq9jmh11091zkfx0y0qh58rj2xvpdbv")))) (build-system cmake-build-system) (arguments '(#:configure-flags @@ -181,10 +181,12 @@ itself as well as other components maintained by the LXQt project.") #t))))) (propagated-inputs ;; required by Qt5XdgIconLoader.pc - `(("qtbase" ,qtbase) + `(("glib" ,glib) + ("qtbase" ,qtbase) ("qtsvg" ,qtsvg))) (native-inputs - `(("lxqt-build-tools" ,lxqt-build-tools))) + `(("lxqt-build-tools" ,lxqt-build-tools) + ("pkg-config" ,pkg-config))) (home-page "https://github.com/lxqt/libqtxdg") (synopsis "Qt implementation of freedesktop.org xdg specifications") (description "Libqtxdg implements the freedesktop.org xdg specifications @@ -415,14 +417,15 @@ configuration of both LXQt and the underlying operating system.") (define-public lxqt-globalkeys (package (name "lxqt-globalkeys") - (version "0.14.1") + (version "0.14.3") (source (origin (method url-fetch) - (uri (string-append "https://github.com/lxqt/" name "/releases/download/" - version "/" name "-" version ".tar.xz")) + (uri (string-append "https://github.com/lxqt/lxqt-globalkeys/" + "releases/download/" version "/" + "lxqt-globalkeys-" version ".tar.xz")) (sha256 - (base32 "0m6svwy20bfy9d21g5l0qzjndph3rd8zqagmqgdjzjhh3lxwrsrk")))) + (base32 "0mgl05qxvq4pdqvcw34i2cbyy87x605wy3np62mrbbb1kdfjrfg6")))) (build-system cmake-build-system) (inputs `(("kwindowsystem" ,kwindowsystem) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index f753e3756f..80f7c91f06 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -28,6 +28,7 @@ ;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2018 Gábor Boskovits <boskovits@gmail.com> ;;; Copyright © 2018, 2019 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2019 Tanguy Le Carrour <tanguy@bioneland.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -399,101 +400,98 @@ operating systems.") (license gpl2+))) (define-public neomutt - (let ((tag "2019-10-25")) - (package - (name "neomutt") - ;; Upstream now uses YYYY-MM-DD instead of YYYYMMDD, but we're forever - ;; wed to the latter through ‘guix upgrade’. - (version (apply string-append (string-split tag #\-))) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/neomutt/neomutt.git") - (commit tag))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0hy6rxgm3acjqxpf4ss7391kps4g06fbjhbpgv1jdrj1y9kv0rm1")))) - (build-system gnu-build-system) - (inputs - `(("cyrus-sasl" ,cyrus-sasl) - ("gdbm" ,gdbm) - ("gpgme" ,gpgme) - ("ncurses" ,ncurses) - ("gnutls" ,gnutls) - ("openssl" ,openssl) ; for S/MIME - ("perl" ,perl) - ("kyotocabinet" ,kyotocabinet) - ("libxslt" ,libxslt) - ("libidn2" ,libidn2) - ("libxml2" ,libxml2) - ("lmdb" ,lmdb) - ("notmuch" ,notmuch))) - (native-inputs - `(("automake" ,automake) - ("gettext-minimal" ,gettext-minimal) - ("pkg-config" ,pkg-config) - ("docbook-xsl" ,docbook-xsl) - ("docbook-xml" ,docbook-xml-4.2) - ("w3m" ,w3m) - ("tcl" ,tcl))) - (arguments - `(#:test-target "test" - #:configure-flags - (list "--gpgme" - - ;; Database, implies header caching. - "--disable-tokyocabinet" - "--disable-qdbm" - "--disable-bdb" - "--lmdb" - "--kyotocabinet" - - "--gdbm" - - "--gnutls" - "--disable-ssl" - "--sasl" - (string-append "--with-sasl=" - (assoc-ref %build-inputs "cyrus-sasl")) - - - "--smime" - "--notmuch" - "--disable-idn" - "--idn2" - - ;; If we do not set this, neomutt wants to check - ;; whether the path exists, which it does not - ;; in the chroot. - "--with-mailpath=/var/mail" - - "--with-ui=ncurses" - (string-append "--with-ncurses=" - (assoc-ref %build-inputs "ncurses")) - (string-append "--prefix=" - (assoc-ref %outputs "out")) - "--debug") - #:phases - (modify-phases %standard-phases - ;; TODO: autosetup is meant to be included in the source, - ;; but we should package autosetup and use our own version of it. - (replace 'configure - (lambda* (#:key outputs inputs configure-flags #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (flags `(,@configure-flags)) - (bash (which "bash"))) - (setenv "SHELL" bash) - (setenv "CONFIG_SHELL" bash) - (apply invoke bash - (string-append (getcwd) "/configure") - flags))))))) - (home-page "https://www.neomutt.org/") - (synopsis "Command-line mail reader based on Mutt") - (description - "NeoMutt is a command-line mail reader which is based on mutt. + (package + (name "neomutt") + (version "20191102") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/neomutt/neomutt.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0x5f9zbvxsxg5y2ir4xq4xw1q2snaxkidhdyhcxw5ljw3qqwhlyq")))) + (build-system gnu-build-system) + (inputs + `(("cyrus-sasl" ,cyrus-sasl) + ("gdbm" ,gdbm) + ("gpgme" ,gpgme) + ("ncurses" ,ncurses) + ("gnutls" ,gnutls) + ("openssl" ,openssl) ; for S/MIME + ("perl" ,perl) + ("kyotocabinet" ,kyotocabinet) + ("libxslt" ,libxslt) + ("libidn2" ,libidn2) + ("libxml2" ,libxml2) + ("lmdb" ,lmdb) + ("notmuch" ,notmuch))) + (native-inputs + `(("automake" ,automake) + ("gettext-minimal" ,gettext-minimal) + ("pkg-config" ,pkg-config) + ("docbook-xsl" ,docbook-xsl) + ("docbook-xml" ,docbook-xml-4.2) + ("w3m" ,w3m) + ("tcl" ,tcl))) + (arguments + `(#:test-target "test" + #:configure-flags + (list "--gpgme" + + ;; Database, implies header caching. + "--disable-tokyocabinet" + "--disable-qdbm" + "--disable-bdb" + "--lmdb" + "--kyotocabinet" + + "--gdbm" + + "--gnutls" + "--disable-ssl" + "--sasl" + (string-append "--with-sasl=" + (assoc-ref %build-inputs "cyrus-sasl")) + + + "--smime" + "--notmuch" + "--disable-idn" + "--idn2" + + ;; If we do not set this, neomutt wants to check + ;; whether the path exists, which it does not + ;; in the chroot. + "--with-mailpath=/var/mail" + + "--with-ui=ncurses" + (string-append "--with-ncurses=" + (assoc-ref %build-inputs "ncurses")) + (string-append "--prefix=" + (assoc-ref %outputs "out")) + "--debug") + #:phases + (modify-phases %standard-phases + ;; TODO: autosetup is meant to be included in the source, + ;; but we should package autosetup and use our own version of it. + (replace 'configure + (lambda* (#:key outputs inputs configure-flags #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (flags `(,@configure-flags)) + (bash (which "bash"))) + (setenv "SHELL" bash) + (setenv "CONFIG_SHELL" bash) + (apply invoke bash + (string-append (getcwd) "/configure") + flags))))))) + (home-page "https://www.neomutt.org/") + (synopsis "Command-line mail reader based on Mutt") + (description + "NeoMutt is a command-line mail reader which is based on mutt. It adds a large amount of new and improved features to mutt.") - (license gpl2+)))) + (license gpl2+))) (define-public gmime (package @@ -1096,7 +1094,7 @@ compresses it.") (define-public claws-mail (package (name "claws-mail") - (version "3.17.3") + (version "3.17.4") (source (origin (method url-fetch) (uri (string-append @@ -1104,7 +1102,7 @@ compresses it.") ".tar.xz")) (sha256 (base32 - "1wnj6c9cbmhphs2l6wfvndkk2g08rmxw0sl2c8k1k008dxd1ykjh")))) + "00mfhaac16sv67rwiq98hr4nl5zmd1h2afswwwksdcsi3q9x23jr")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("bogofilter" ,bogofilter) @@ -1293,7 +1291,7 @@ facilities for checking incoming mail.") (define-public dovecot (package (name "dovecot") - (version "2.3.7.2") + (version "2.3.8") (source (origin (method url-fetch) @@ -1301,8 +1299,7 @@ facilities for checking incoming mail.") (version-major+minor version) "/" "dovecot-" version ".tar.gz")) (sha256 - (base32 - "0q0jgcv3ni2znkgyhc966ffphj1wk73y76wssh0yciqafs2f0v36")))) + (base32 "0jdng27hqqagjy6v7ymd0xflbv5dbc1rhh450nk39ar6pw1qsxy5")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) @@ -1830,13 +1827,13 @@ maintained.") (define-public khard (package (name "khard") - (version "0.13.0") + (version "0.15.1") (source (origin (method url-fetch) (uri (pypi-uri name version)) (sha256 (base32 - "1lyjiskc6ckjjylzr04dnm66p3cnn7vlysw9c27qls3y3ywx14zw")))) + "18ba2xgfq8sw0bg6xmlfjpizid1hkzgswcfcc54gl21y2dwfda2w")))) (build-system python-build-system) (arguments `(#:phases @@ -1847,6 +1844,8 @@ maintained.") (doc (string-append out "/share/doc/khard"))) (copy-recursively "misc/khard" doc) #t)))))) + (native-inputs + `(("python-setuptools-scm" ,python-setuptools-scm))) (propagated-inputs `(("python-atomicwrites" ,python-atomicwrites) ("python-configobj" ,python-configobj) @@ -1927,7 +1926,7 @@ Authentication-Results header seen in the wild.") (define-public perl-mail-dkim (package (name "perl-mail-dkim") - (version "0.57") + (version "0.58") (source (origin (method url-fetch) (uri (string-append @@ -1936,7 +1935,7 @@ Authentication-Results header seen in the wild.") ".tar.gz")) (sha256 (base32 - "0fmfhwn4sh98w62rc8j584l23vlhr7vii8glm2njx14f81a56lvb")))) + "0cgkal65qqcy57b21lgij90ba36wl66byw9i76g5yhwaa8ms8hqa")))) (build-system perl-build-system) (propagated-inputs `(("perl-crypt-openssl-rsa" ,perl-crypt-openssl-rsa) @@ -2278,14 +2277,14 @@ e-mails with other systems speaking the SMTP protocol.") (define-public opensmtpd-next (package (name "opensmtpd-next") - (version "6.6.0p1") + (version "6.6.1p1") (source (origin (method url-fetch) (uri (string-append "https://www.opensmtpd.org/archives/" "opensmtpd-" version ".tar.gz")) (sha256 - (base32 "1sgwbvc28h9nyyj4lv8d9b4ilzz03p2j1j763yr759k336a2193m")))) + (base32 "1ngil8j13m2rq07g94j4yjr6zmaimzy8wbfr17shi7rxnazys6zb")))) (build-system gnu-build-system) (inputs `(("bdb" ,bdb) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 4b8387a65f..b8d1b2af3e 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -88,23 +88,56 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." ;; contain store file names, so the CRC changes at every rebuild.) (outputs (delete "debug" (package-outputs base)))))) +(define gcc-for-bootstrap + (mlambdaq (glibc) + "Return a variant of GCC that uses the bootstrap variant of GLIBC." + (package + (inherit gcc) + (outputs '("out")) ;all in one so libgcc_s is easily found + (native-search-paths + ;; Set CPLUS_INCLUDE_PATH so GCC is able to find the libc + ;; C++ headers. + (cons (search-path-specification + (variable "CPLUS_INCLUDE_PATH") + (files '("include"))) + (package-native-search-paths gcc))) + (inputs + `( ;; Distinguish the name so we can refer to it below. + ("bootstrap-libc" ,(glibc-for-bootstrap glibc)) + ("libc:static" ,(glibc-for-bootstrap glibc) "static") + ,@(package-inputs gcc))) + (arguments + (substitute-keyword-arguments (package-arguments gcc) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'configure 'treat-glibc-as-system-header + (lambda* (#:key inputs #:allow-other-keys) + (let ((libc (assoc-ref inputs "bootstrap-libc"))) + ;; GCCs build processes requires that the libc + ;; we're building against is on the system header + ;; search path. + (for-each (lambda (var) + (setenv var (string-append libc "/include"))) + '("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH")) + #t)))))))))) + (define (package-with-relocatable-glibc p) "Return a variant of P that uses the libc as defined by `glibc-for-bootstrap'." - (define (cross-bootstrap-libc) - (let ((target (%current-target-system))) - (glibc-for-bootstrap - ;; `cross-libc' already returns a cross libc, so clear - ;; %CURRENT-TARGET-SYSTEM. - (parameterize ((%current-target-system #f)) - (cross-libc target))))) + (define (cross-bootstrap-libc target) + (glibc-for-bootstrap + ;; `cross-libc' already returns a cross libc, so clear + ;; %CURRENT-TARGET-SYSTEM. + (parameterize ((%current-target-system #f)) + (cross-libc target)))) ;; Standard inputs with the above libc and corresponding GCC. (define (inputs) (if (%current-target-system) ; is this package cross built? - `(("cross-libc" ,(cross-bootstrap-libc))) + `(("cross-libc" + ,(cross-bootstrap-libc (%current-target-system)))) '())) (define (native-inputs) @@ -113,7 +146,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (xgcc (cross-gcc target #:xbinutils (cross-binutils target) - #:libc (cross-bootstrap-libc)))) + #:libc (cross-bootstrap-libc target)))) `(("cross-gcc" ,(package (inherit xgcc) (search-paths @@ -127,34 +160,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." ,@(%final-inputs))) `(("libc" ,(glibc-for-bootstrap glibc)) ("libc:static" ,(glibc-for-bootstrap glibc) "static") - ("gcc" ,(package (inherit gcc) - (outputs '("out")) ;all in one so libgcc_s is easily found - (native-search-paths - ;; Set CPLUS_INCLUDE_PATH so GCC is able to find the libc - ;; C++ headers. - (cons (search-path-specification - (variable "CPLUS_INCLUDE_PATH") - (files '("include"))) - (package-native-search-paths gcc))) - (inputs - `(;; Distinguish the name so we can refer to it below. - ("bootstrap-libc" ,(glibc-for-bootstrap glibc)) - ("libc:static" ,(glibc-for-bootstrap glibc) "static") - ,@(package-inputs gcc))) - (arguments - (substitute-keyword-arguments (package-arguments gcc) - ((#:phases phases) - `(modify-phases ,phases - (add-before 'configure 'treat-glibc-as-system-header - (lambda* (#:key inputs #:allow-other-keys) - (let ((libc (assoc-ref inputs "bootstrap-libc"))) - ;; GCCs build processes requires that the libc - ;; we're building against is on the system header - ;; search path. - (for-each (lambda (var) - (setenv var (string-append libc "/include"))) - '("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH")) - #t))))))))) + ("gcc" ,(gcc-for-bootstrap glibc)) ,@(fold alist-delete (%final-inputs) '("libc" "gcc"))))) (package-with-explicit-inputs p inputs diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 3174c0c115..1a55342279 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -204,3 +204,38 @@ get_machine.") ((#:make-flags _) `(list (string-append "PREFIX=" (assoc-ref %outputs "out")) "CC=gcc")))))) + +(define-public m2-planet + (let ((commit "b87ddb0051b168ea45f8d49a610dcd069263336a") + (revision "2")) + (package + (name "m2-planet") + (version (string-append "1.4.0-" revision "." (string-take commit 7))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/oriansj/m2-planet.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0yyc0fcbbxi9jqa1n76x0rwspdrwmc8g09jlmsw9c35nflrhmz8q")))) + (native-inputs + `(("mescc-tools" ,mescc-tools))) + (build-system gnu-build-system) + (arguments + `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:tests? #f + #:phases (modify-phases %standard-phases + (delete 'bootstrap) + (delete 'configure)))) + (synopsis "The PLAtform NEutral Transpiler") + (description + "M2-Planet, the PLAtform NEutral Transpiler, when combined with +mescc-tools, compiles a subset of the C language into working binaries with +introspective steps inbetween. It is self-hosting and for bootstrapping it +also has an implementation in the M1 macro assembly language. M2-Planet is +built as Phase-5 of the full source bootstrapping process and is capable of +building GNU Mes.") + (home-page "https://github.com/oriansj/m2-planet") + (license gpl3+)))) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index a6e9dcbbb3..3f223c2cfe 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -773,14 +773,14 @@ a graphical desktop environment like GNOME.") (define-public prosody (package (name "prosody") - (version "0.11.2") + (version "0.11.3") (source (origin (method url-fetch) (uri (string-append "https://prosody.im/downloads/source/" "prosody-" version ".tar.gz")) (sha256 (base32 - "0ca8ivqb4hxqka08pwnaqi1bqxrdl8zw47g6z7nw9q5r57fgc4c9")))) + "11xz4milv2962qf75vrdwsvd8sy2332nf69202rmvz5989pvvnng")))) (build-system gnu-build-system) (arguments `(#:tests? #f ;tests require "busted" @@ -1559,7 +1559,7 @@ is also scriptable and extensible via Guile.") (define-public libmesode (package (name "libmesode") - (version "0.9.2") + (version "0.9.3") (source (origin (method git-fetch) (uri (git-reference @@ -1568,7 +1568,7 @@ is also scriptable and extensible via Guile.") (file-name (git-file-name name version)) (sha256 (base32 - "06f5nfaypvxrbsinxa1k2vrxrs7kqmg38g4wwwk5d63hpn1pj8ak")))) + "0xzfg1xx88cn36352nnjlb1p7xyw32yqkhjzq10px88iaaqz1vv0")))) (build-system gnu-build-system) (inputs `(("expat" ,expat) @@ -1583,21 +1583,22 @@ is also scriptable and extensible via Guile.") XMPP Client. In particular, libmesode provides extra TLS functionality such as manual SSL certificate verification.") (home-page "https://github.com/boothj5/libmesode") - ;; Dual licensed. + ;; Dual-licensed. (license (list license:gpl3+ license:x11)))) (define-public libstrophe (package (name "libstrophe") - (version "0.9.2") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/strophe/libstrophe/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0vxfcyfnhnlaj6spm2b0ljw5i3knbphy6mvzpl5zv9b52ny4b08m")))) + (version "0.9.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/strophe/libstrophe.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1g1l0w9z9hdy5ncdvd9097gi7k7783did6py5h9camlpb2fnk5mk")))) (build-system gnu-build-system) (inputs `(("expat" ,expat) @@ -1612,7 +1613,7 @@ manual SSL certificate verification.") almost no external dependencies, only an XML parsing library (expat or libxml are both supported).") (home-page "http://strophe.im/libstrophe") - ;; Dual licensed. + ;; Dual-licensed. (license (list license:gpl3+ license:x11)))) (define-public profanity @@ -1843,7 +1844,7 @@ QMatrixClient project.") ("python-async-timeout" ,python-async-timeout) ("python-configargparse" ,python-configargparse) ("python-mechanicalsoup" ,python-mechanicalsoup) - ("python-protobuf" ,python-protobuf) + ("python-protobuf" ,python-protobuf-3.6) ("python-readlike" ,python-readlike) ("python-reparser" ,python-reparser) ("python-requests" ,python-requests) diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index b165e6952d..78f94bbe4b 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -152,7 +152,7 @@ etc. via a Web interface. Features include: (define-public zabbix-agentd (package (name "zabbix-agentd") - (version "4.2.7") + (version "4.4.1") (source (origin (method url-fetch) @@ -161,7 +161,7 @@ etc. via a Web interface. Features include: "/zabbix-" version ".tar.gz")) (sha256 (base32 - "09znh8x1sass5mw6wjrfmizjbfls8ad2c16y24ldfj40hlfxz6wx")))) + "0jjn2przn9s25slrcxmq8iqdgqkgxnqs45zy0n1ma6nlgmclxxqb")))) (build-system gnu-build-system) (arguments `(#:configure-flags diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index b8e54d4058..45bb6d7d48 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -473,13 +473,13 @@ compression format (.mpc files).") (define-public eyed3 (package (name "eyed3") - (version "0.8.10") + (version "0.8.11") (source (origin (method url-fetch) (uri (pypi-uri "eyeD3" version)) (sha256 - (base32 "1jb22n1jczxgbpcnfiw12r8dcs74556g1d09mzms44f52kgs7lgc")))) + (base32 "1347mhjysbdpmmvdqm6lhskdw0qj9vjdn4n172ffnz958adrnk0f")))) (build-system python-build-system) (arguments `(#:tests? #f)) ; the required test data contains copyrighted material diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 57ecef4913..c9a9c440d3 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -157,7 +157,7 @@ protocol.") (define-public mpd-mpc (package (name "mpd-mpc") - (version "0.32") + (version "0.33") (source (origin (method url-fetch) (uri @@ -166,7 +166,7 @@ protocol.") "/mpc-" version ".tar.xz")) (sha256 (base32 - "1irilgz64pny7b8zygy5i74nfmlhgsawz0djx9mrj6g0gidxjqbr")))) + "15hjpzqs83v1zx49x8nkpwy9hpl1jxd55z1w50vm82gm32zcqh2g")))) (build-system meson-build-system) (inputs `(("libmpdclient" ,libmpdclient))) (native-inputs diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index 914f8e975e..5fde6efae4 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2016 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2017 Dave Love <fx@gnu.org> ;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> -;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Paul Garlick <pgarlick@tourbillion-technology.com> ;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net> ;;; @@ -29,7 +29,9 @@ #:use-module ((guix licenses) #:hide (expat)) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix utils) + #:use-module (guix deprecation) #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (gnu packages) @@ -129,11 +131,11 @@ a powerful programming interface to gather information about the hardware, bind processes, and much more.") (license bsd-3))) -(define-public hwloc-2.0 +(define-public hwloc-2 ;; Note: 2.0 isn't the default yet, see above. (package (inherit hwloc) - (version "2.0.3") + (version "2.1.0") (source (origin (method url-fetch) (uri (string-append "https://www.open-mpi.org/software/hwloc/v" @@ -141,7 +143,7 @@ bind processes, and much more.") "/downloads/hwloc-" version ".tar.bz2")) (sha256 (base32 - "09f7ajak8wv5issr0hw72vs3jkldc7crcc7z5fd34sspkvrsm4z3")))) + "0qh8s7pphz0m5cwb7liqmc17xzfs23xhz5wn24r6ikvjyx99fhhr")))) ;; libnuma is no longer needed. (inputs (alist-delete "numactl" (package-inputs hwloc))) @@ -158,6 +160,9 @@ bind processes, and much more.") "-1")) #t)))))))) +(define-deprecated hwloc-2.0 'hwloc-2 + hwloc-2) + (define-public openmpi (package (name "openmpi") @@ -169,10 +174,11 @@ bind processes, and much more.") (version-major+minor version) "/downloads/openmpi-" version ".tar.bz2")) (sha256 - (base32 "0ms0zvyxyy3pnx9qwib6zaljyp2b3ixny64xvq3czv3jpr8zf2wh")))) + (base32 "0ms0zvyxyy3pnx9qwib6zaljyp2b3ixny64xvq3czv3jpr8zf2wh")) + (patches (search-patches "openmpi-psm2-priority.patch")))) (build-system gnu-build-system) (inputs - `(("hwloc" ,hwloc "lib") + `(("hwloc" ,hwloc-2 "lib") ("gfortran" ,gfortran) ("libfabric" ,libfabric) ("libevent" ,libevent) @@ -204,6 +210,12 @@ bind processes, and much more.") "--with-hwloc=external" "--with-libevent" + ;; Make sure ./configure fails if one of these is + ;; missing. + "--with-ucx" + "--with-psm" + "--with-psm2" + ;; InfiniBand support "--enable-openib-control-hdr-padding" "--enable-openib-dynamic-sl" @@ -338,17 +350,67 @@ only provides @code{MPI_THREAD_FUNNELED}."))) (setenv "OMPI_MCA_rmaps_base_mapping_policy" "core:OVERSUBSCRIBE") #t)) +(define-public intel-mpi-benchmarks + (package + (name "intel-mpi-benchmarks") + (version "2019.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/intel/mpi-benchmarks.git") + (commit (string-append "IMB-v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0si5xi6ilhd3w0gbsg124589pvp094hvf366rvjjb9pi7pdk5p4i")))) + (build-system gnu-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (delete 'configure) + (delete 'check) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (define (benchmark? file stat) + (and (string-prefix? "IMB-" (basename file)) + (executable-file? file))) + + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (for-each (lambda (file) + (install-file file bin)) + (find-files "." benchmark?)) + #t)))) + + ;; The makefile doesn't express all the dependencies, it seems. + #:parallel-build? #t + + #:make-flags (list (string-append "CC=" + (assoc-ref %build-inputs "openmpi") + "/bin/mpicc") + (string-append "CXX=" + (assoc-ref %build-inputs "openmpi") + "/bin/mpicxx")))) + (inputs + `(("openmpi" ,openmpi))) + (home-page "https://github.com/intel/mpi-benchmarks") + (synopsis "Benchmarks for the Message Passing Interface (MPI)") + (description + "Intel MPI Benchmarks (IMB) provides a set of elementary benchmarks that +conform with versions 1, 2, and 3 of the Message Passing Interface (MPI).") + (license + (fsf-free "https://directory.fsf.org/wiki/License:CPL-1.0" + "https://www.gnu.org/licenses/license-list.html#CommonPublicLicense10")))) + (define-public python-mpi4py (package (name "python-mpi4py") - (version "3.0.2") + (version "3.0.3") (source - (origin - (method url-fetch) - (uri (pypi-uri "mpi4py" version)) - (sha256 - (base32 - "1q28xl36difma1wq0acq111cqxjya32kn3lxp6fbidz3wg8jkmpq")))) + (origin + (method url-fetch) + (uri (pypi-uri "mpi4py" version)) + (sha256 + (base32 "07ssbhssv27rrjx1c5vd3vsr31vay5d8xcf4zh9yblcyidn72b81")))) (build-system python-build-system) (arguments `(#:phases diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 463f7fd9ef..241ede58d8 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -24,6 +24,7 @@ ;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.lonestar.org> ;;; Copyright © 2019 raingloom <raingloom@protonmail.com> ;;; Copyright © 2019 David Wilson <david@daviwil.com> +;;; Copyright © 2019 Alexandros Theodotou <alex@zrythm.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1283,6 +1284,14 @@ add_library( rapidjson INTERFACE IMPORTED )")) (("#include <QWidget>" m) (string-append m "\n#include <QButtonGroup>\n#include <QAction>"))) #t)) + ;; FIXME: Finding RtMidi was fixed upstream so we should be able to + ;; remove this hack when a release is made. + ;; See https://github.com/powertab/powertabeditor/issues/255 + (add-after 'unpack 'fix-rtmidi-header + (lambda _ + (substitute* "source/audio/midioutputdevice.cpp" + (("#include <RtMidi.h>") "#include <rtmidi/RtMidi.h>")) + #t)) (add-before 'configure 'remove-third-party-libs (lambda* (#:key inputs #:allow-other-keys) ;; Link with required static libraries, because we're not @@ -1371,7 +1380,7 @@ users to select LV2 plugins and run them with jalv.") (define-public synthv1 (package (name "synthv1") - (version "0.9.8") + (version "0.9.11") (source (origin (method url-fetch) (uri @@ -1379,7 +1388,7 @@ users to select LV2 plugins and run them with jalv.") "/synthv1-" version ".tar.gz")) (sha256 (base32 - "15kabmxp38wqvavs5hr1dqasjjf1j977kzqggxfmzyi3y5fan3hj")))) + "116k2vca9dygvsd684wvxm61p0l1xrrgdph4qrrprlsr6vj0llgm")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; there are no tests @@ -1403,7 +1412,7 @@ oscillators and stereo effects.") (define-public drumkv1 (package (name "drumkv1") - (version "0.9.8") + (version "0.9.11") (source (origin (method url-fetch) (uri @@ -1411,7 +1420,7 @@ oscillators and stereo effects.") "/drumkv1-" version ".tar.gz")) (sha256 (base32 - "010p8nwnmqgj5mw324psig3hxi1g2gylxrigd6sj6sgcpy3kdm23")))) + "1wnjn175l0mz51k9pjf3pdzv54c4jlh63saavld9lm6zfgfs13d7")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; there are no tests @@ -1436,7 +1445,7 @@ effects.") (define-public samplv1 (package (name "samplv1") - (version "0.9.8") + (version "0.9.11") (source (origin (method url-fetch) (uri @@ -1444,7 +1453,7 @@ effects.") "/samplv1-" version ".tar.gz")) (sha256 (base32 - "138kd9szgn3b97s7crhsyj8pgwb0bn4l9knd4zliqjgj2f1bs9x0")))) + "17zs8kvvwqv00bm4lxpn09a5hxjlbz7k5mkl3k7jspw7rqn3djf2")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; there are no tests @@ -1469,7 +1478,7 @@ effects.") (define-public padthv1 (package (name "padthv1") - (version "0.9.8") + (version "0.9.11") (source (origin (method url-fetch) (uri @@ -1477,7 +1486,7 @@ effects.") "/padthv1-" version ".tar.gz")) (sha256 (base32 - "1k4p2ir12qjcs62knvw2s6qyvb46203yx22fnwp341cjk171cxji")))) + "02yfwyirjqxa075yqdnci9b9k57kdmkjvn9gnpdbnjp887pds76g")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; there are no tests @@ -2142,7 +2151,7 @@ capabilities, custom envelopes, effects, etc.") (define-public yoshimi (package (name "yoshimi") - (version "1.6.0.1") + (version "1.6.0.3") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/yoshimi/" @@ -2150,7 +2159,7 @@ capabilities, custom envelopes, effects, etc.") "/yoshimi-" version ".tar.bz2")) (sha256 (base32 - "140f2k4akj39pny8c7i794q125415gyvmy4rday0il5ncp3glik4")))) + "1z2mnmm299ng6jcwa61dzr1ilwa5fjgsggxl2wa5smji6b4npmx7")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; there are no tests @@ -2344,14 +2353,14 @@ from the command line.") (define-public qtractor (package (name "qtractor") - (version "0.9.6") + (version "0.9.11") (source (origin (method url-fetch) (uri (string-append "http://downloads.sourceforge.net/qtractor/" "qtractor-" version ".tar.gz")) (sha256 (base32 - "06sa4wl8zr0k8dnjiil0gjwnhrkq95h50xv56ih1y8jgyzxchaxp")))) + "1482da0lr77i57jby80cnn4bb9ws3v1i1j6m2hbwdnvqab9csvnx")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; no "check" target @@ -3707,7 +3716,7 @@ are a C compiler and glib. Full API documentation and examples are included.") (define-public lmms (package (name "lmms") - (version "1.1.3") + (version "1.2.1") (source (origin (method git-fetch) @@ -3717,12 +3726,23 @@ are a C compiler and glib. Full API documentation and examples are included.") (file-name (git-file-name name version)) (sha256 (base32 - "03hhymc6d73fa3wbcqb7rm1l03zkw605k5i9kvkvjmv488bqh3pd")))) + "1gx730z361xx30iqbsm99aam1k2c8yf561gcay6sryyjksb4w1wy")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; no tests + ;; Qt 5 support must be explicitly enabled in the 1.2 stable versions of + ;; LMMS, so try removing "-DWANT_QT5=ON" in later versions. + ;; Also, explicitly disabling VST support gets rid of the in-tree + ;; dependency on qt5-x11embed. + #:configure-flags '("-DWANT_QT5=ON" + "-DWANT_VST=OFF") #:phases (modify-phases %standard-phases + (add-after 'unpack 'unpack-rpmalloc + (lambda* (#:key inputs #:allow-other-keys) + (copy-recursively (assoc-ref inputs "rpmalloc") + "src/3rdparty/rpmalloc/rpmalloc") + #t)) (add-before 'configure 'set-ldflags (lambda* (#:key outputs #:allow-other-keys) (setenv "LDFLAGS" @@ -3733,12 +3753,6 @@ are a C compiler and glib. Full API documentation and examples are included.") (assoc-ref outputs "out") "/lib/lmms/ladspa" "\"")) #t)) - (add-before 'configure 'remove-Werror - (lambda _ - (substitute* "CMakeLists.txt" - (("SET\\(WERROR_FLAGS \"\\$\\{WERROR_FLAGS\\} -Werror") - "SET(WERROR_FLAGS \"${WERROR_FLAGS}")) - #t)) (add-before 'reset-gzip-timestamps 'make-manpages-writable (lambda* (#:key outputs #:allow-other-keys) (map (lambda (file) @@ -3748,14 +3762,30 @@ are a C compiler and glib. Full API documentation and examples are included.") ".*\\.gz$")) #t))))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + ("qttools" ,qttools) + ;; rpmalloc is a public domain memory allocator. This version specified + ;; below is the version required by LMMS. + ;; To get the new commit of rpmalloc to use here, run + ;; `git submodule--helper list | grep rpmalloc | cut -f2 -d' '` + ;; in the cloned LMMS repository. + ("rpmalloc" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mjansson/rpmalloc.git") + (commit "b5bdc18051bb74a22f0bde4bcc90b01cf590b496"))) + (sha256 + (base32 + "0g9pls46iggg7rdm65vzfj8nyr3v2n5xkp54c4qbh9hhalpsw4ay")))))) (inputs `(("sdl" ,sdl) - ("qt" ,qt-4) + ("qtbase" ,qtbase) + ("qtx11extras" ,qtx11extras) ("fltk" ,fltk) ("libogg" ,libogg) ("libsamplerate" ,libsamplerate) - ("fluidsynth" ,fluidsynth-1) ;XXX: try using 2.x when updating + ("fluidsynth" ,fluidsynth) ("libvorbis" ,libvorbis) ("alsa-lib" ,alsa-lib) ("portaudio" ,portaudio) @@ -3774,7 +3804,7 @@ audio samples and various soft sythesizers. It can receive input from a MIDI ke (define-public musescore (package (name "musescore") - (version "3.2.3") + (version "3.3") (source (origin (method git-fetch) (uri (git-reference @@ -3783,7 +3813,7 @@ audio samples and various soft sythesizers. It can receive input from a MIDI ke (file-name (git-file-name name version)) (sha256 (base32 - "17wx1wl8ns2k31qvrr888dxnrsa13vazg04zh2sn2q4vzd869a7v")) + "15ckjwvp3xigjkzmp1ddzvlm4d0vlk9i1axyfxg3hr2sia84yxvi")) (modules '((guix build utils))) (snippet ;; Un-bundle OpenSSL and remove unused libraries. @@ -3801,8 +3831,7 @@ audio samples and various soft sythesizers. It can receive input from a MIDI ke (build-system cmake-build-system) (arguments `(#:configure-flags - `("-DBUILD_CRASH_REPORTER=OFF" - "-DBUILD_WEBENGINE=OFF" + `("-DBUILD_WEBENGINE=OFF" "-DDOWNLOAD_SOUNDFONT=OFF" "-DUSE_SYSTEM_FREETYPE=ON") ;; There are tests, but no simple target to run. The command used to @@ -4679,3 +4708,308 @@ You can also get metadata about the playing track such as the artist and title for integration into status line generators or other command-line tools.") (home-page "https://github.com/altdesktop/playerctl") (license license:lgpl3+))) + +(define-public artyfx + (package + (name "artyfx") + (version "1.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url + "https://github.com/openAVproductions/openAV-ArtyFX.git") + (commit (string-append "release-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "012hcy1mxl7gs2lipfcqp5x0xv1azb9hjrwf0h59yyxnzx96h7c9")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ; no tests included + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'remove-architecture-specific-flags + (lambda _ + (substitute* "CMakeLists.txt" + (("-msse2 -mfpmath=sse") "")) + #t))))) + (inputs + `(("cairo" ,cairo) + ("libsndfile" ,libsndfile))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("lv2" ,lv2))) + (home-page "http://openavproductions.com/artyfx/") + (synopsis "Audio effect LV2 plugin bundle") + (description "ArtyFX is an LV2 plugin bundle of artistic real-time audio +effects. It contains a bitcrusher, delay, distortion, equalizer, compressor, +and reverb.") + (license license:gpl2+))) + +(define-public sherlock-lv2 + (package + (name "sherlock-lv2") + (version "0.20.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://git.open-music-kontrollers.ch/lv2/" + "sherlock.lv2/snapshot/sherlock.lv2-" + version ".tar.xz")) + (sha256 + (base32 + "1c5xajpss9h8lbyx160bbzg8va50n2d74qwnxig9sf468rzmha1y")))) + (build-system meson-build-system) + (inputs + `(("libx11" ,libx11) + ("mesa" ,mesa) + ("sratom" ,sratom))) + (native-inputs + `(("flex" ,flex) + ("pkg-config" ,pkg-config))) + (synopsis "Investigative LV2 plugin bundle") + (description "The Sherlock plugin bundle contains LV2 plugins for +visualizing LV2 atom, MIDI and OSC events. They can be used for monitoring +and debugging of event signal flows inside plugin graphs.") + (home-page "https://open-music-kontrollers.ch/lv2/sherlock/") + (license license:artistic2.0))) + +(define-public x42-plugins + (package + (name "x42-plugins") + (version "20191013") + (source + (origin + (method url-fetch) + (uri + (string-append "http://gareus.org/misc/x42-plugins/x42-plugins-" + version ".tar.xz")) + (sha256 + (base32 + "18kn1bmc0s6dp834kc51ibifzzn3bxwya4p8s8yq9f4mpmkghi24")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no "check" target + #:make-flags + (list (string-append "PREFIX=" (assoc-ref %outputs "out")) + "LIBZITACONVOLVER=-lzita-convolver" + (string-append "FONTFILE=" + (assoc-ref %build-inputs "font-dejavu") + "/share/fonts/truetype/DejaVuSans-Bold.ttf")) + #:phases + (modify-phases %standard-phases + (add-before 'build 'set-CC-variable + (lambda _ + (setenv "CC" "gcc") + #t)) + (delete 'configure)))) + (inputs + `(("cairo" ,cairo) + ("fftwf" ,fftwf) + ("ftgl" ,ftgl) + ("glib" ,glib) + ("glu" ,glu) + ("hicolor-icon-theme" ,hicolor-icon-theme) + ("jack" ,jack-1) + ("libltc" ,libltc) + ("libsamplerate" ,libsamplerate) + ("libx11" ,libx11) + ("pango" ,pango) + ("zita-convolver" ,zita-convolver))) + (native-inputs + `(("help2man" ,help2man) + ("liblo" ,liblo) + ("lv2" ,lv2) + ("font-dejavu" ,font-dejavu) + ("pkg-config" ,pkg-config))) + (synopsis "Collection of LV2/JACK audio/MIDI processing plugins") + (description "x42-plugins is a collection of over 80 cross-platform LV2 +audio and MIDI plugins that can also run as standalone JACK applications.") + (home-page "https://x42-plugins.com/x42/") + (license license:gpl2+))) + +(define-public zam-plugins + (package + (name "zam-plugins") + (version "3.11") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/zamaudio/zam-plugins.git") + (commit version) + ;; Recursive to fetch the DISTRHO plugin framework. This + ;; framework is intended to be included in the sources + ;; and not to be used as a library. + (recursive? #t))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0jlbxm0g93plgd3g4r9rsr0c7868ms49bs0ljpqb6kw6132hsapp")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ;no "check" target + #:make-flags + (list (string-append "PREFIX=" (assoc-ref %outputs "out")) + "HAVE_ZITA_CONVOLVER=true") + #:phases + (modify-phases %standard-phases + (add-before 'build 'set-CC-variable + (lambda _ + (setenv "CC" "gcc") #t)) + (delete 'configure)))) + (inputs + `(("fftwf" ,fftwf) + ("jack" ,jack-1) ;for the standalone JACK application + ("liblo" ,liblo) + ("libsamplerate" ,libsamplerate) + ("mesa" ,mesa) + ("zita-convolver" ,zita-convolver))) + (native-inputs + `(("ladspa" ,ladspa) + ("lv2" ,lv2) + ("pkg-config" ,pkg-config))) + (synopsis "Collection of audio processing plugins") + (description + "Zam plugins is a collection of audio processing plugins in the LADSPA, +LV2 and VST2 formats, as well as standalone JACK versions. The collection +includes ZaMaximX2, ZamAutoSat, ZamComp, ZamCompX2, ZamEQ2, ZamGEQ31, +ZamHeadX2, ZamPhono, ZamGate, ZamGateX2, ZamTube, ZamDelay, ZamDynamicEQ, +ZaMultiComp, ZaMultiCompX2 and ZamSynth.") + (home-page "http://www.zamaudio.com/?p=976") + (license license:gpl2+))) + +(define-public geonkick + (package + (name "geonkick") + (version "1.9.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/geontime/geonkick.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "17mwxnmxszdm2wjbigciwh8qx0487q9qhf4sl92y6nqdb0dlghnl")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ;no tests included + #:configure-flags + (list (string-append "-DGKICK_REDKITE_SDK_PATH=" + (assoc-ref %build-inputs "redkite")) + (string-append "-DCMAKE_INSTALL_PREFIX=" + (assoc-ref %outputs "out"))))) + (inputs + `(("cairo" ,cairo) + ("hicolor-icon-theme" ,hicolor-icon-theme) + ("jack" ,jack-1) ;for the standalone JACK application + ("libsndfile" ,libsndfile) + ("libx11" ,libx11) + ("redkite" ,redkite) + ("rapidjson" ,rapidjson))) + (native-inputs + `(("lv2" ,lv2) + ("pkg-config" ,pkg-config) + ("sord" ,sord))) + (synopsis "Percussion synthesizer") + (description "Geonkick is a synthesizer that can synthesize elements +of percussion such as kicks, snares, hit-hats, shakers, claps and sticks. +It can also play and mix samples.") + (home-page "https://gitlab.com/geontime/geonkick") + (license license:gpl3+))) + +(define-public dpf-plugins + (package + (name "dpf-plugins") + (version "1.3") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/DISTRHO/DPF-Plugins.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1hsfmpv3kvpiwk8nfw9xpaipzy0n27i83y2v1yr93lznwm5rqrbs")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no "check" target + #:make-flags + (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (add-before 'build 'set-CC-variable + (lambda _ (setenv "CC" "gcc") #t)) + (delete 'configure)))) + (inputs + `(("cairo" ,cairo) + ("liblo" ,liblo) ; for dssi plugins + ("jack" ,jack-1) ; for standalone applications + ("mesa" ,mesa))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("dssi" ,dssi) + ("lv2" ,lv2))) + (home-page "https://github.com/DISTRHO/DPF-Plugins") + (synopsis "Audio plugin collection") + (description "Collection of audio plugins built with the DISTRHO Plugin +Framework (DPF) available in LADSPA, DSSI, LV2 and VST2 formats. This +package includes the following plugins: glBars, Kars, Max-Gen examples +(MaBitcrush, MaFreeverb, MaGigaverb, MaPitchshift), Mini-Series (3BandEQ, +3BandSplitter, PingPongPan), ndc-Plugs (Amplitude Imposer, Cycle Shifter, +Soul Force), MVerb, Nekobi, and ProM.") + ;; This package consists of several plugins refactored to use the + ;; DISTHRO Plugin Framework (DPF). Different copyrights and licenses + ;; apply to different plugins. The root LICENSE file has a table with + ;; license information for each plugin and paths to each license + (license (list license:isc license:gpl3 license:lgpl3 license:expat license:gpl2)))) + +(define-public avldrums-lv2 + (package + (name "avldrums-lv2") + (version "0.4.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/x42/avldrums.lv2.git") + (commit (string-append "v" version)) + ;; This plugin expects the robtk submodule's source files to be + ;; there in order to build. + (recursive? #t))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1z70rcq6z3gkb4fm8dm9hs31bslwr97zdh2n012fzki9b9rdj5qv")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no "check" target + #:make-flags + (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (add-before 'build 'set-CC-variable + (lambda _ + (setenv "CC" "gcc") #t)) + (delete 'configure)))) + (inputs + `(("cairo" ,cairo) + ("dssi" ,dssi) + ("glu" ,glu) + ("mesa" ,mesa) + ("pango" ,pango))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("lv2" ,lv2))) + (home-page "https://x42-plugins.com/x42/x42-avldrums") + (synopsis "Drum sample player LV2 plugin dedicated to the AVLinux Drumkits") + (description "AVLdrums is a drum sample player LV2 plugin dedicated to Glen +MacArthur's AVLdrums. This plugin provides a convenient way to sequence and mix +MIDI drums and comes as two separate drumkits: Black Pearl and Red Zeppelin.") + (license license:gpl2+))) diff --git a/gnu/packages/ncurses.scm b/gnu/packages/ncurses.scm index 78e9ba1377..75ad492822 100644 --- a/gnu/packages/ncurses.scm +++ b/gnu/packages/ncurses.scm @@ -244,7 +244,7 @@ ncursesw library provides wide character support.") (define-public dialog (package (name "dialog") - (version "1.3-20190211") + (version "1.3-20191110") (source (origin (method url-fetch) (uri (string-append @@ -252,7 +252,7 @@ ncursesw library provides wide character support.") version ".tgz")) (sha256 (base32 - "1lx0bvradzx1zl7znlrsnyljcs596r7wamkhyq37ikbxsy4y5h29")))) + "0qqf3l7a3brgsz3kcrawyhicivajqr57gkp3134h4k20204psanr")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; no test suite diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 9173871497..87cabee645 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -32,6 +32,7 @@ ;;; Copyright © 2019 Timotej Lazar <timotej.lazar@araneo.si> ;;; Copyright © 2019 Brice Waegeneire <brice@waegenei.re> ;;; Copyright © 2019 Tonton <tonton@riseup.net> +;;; Copyright © 2019 Alex Griffin <a@ajgrf.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1027,16 +1028,17 @@ reconfigured.") (define-public perl-danga-socket (package (name "perl-danga-socket") - (version "1.61") + (version "1.62") (source (origin (method url-fetch) - (uri (string-append "mirror://cpan/authors/id/B/BR/BRADFITZ/" + (uri (string-append "mirror://cpan/authors/id/N/NM/NML/" "Danga-Socket-" version ".tar.gz")) (sha256 - (base32 - "0nciapvxnc922ms304af0vavz1kgyr45ard8wc659k9srqar4hwf")))) + (base32 "0x4bvirmf0kphks19jwgva00zz73zx344218dfaiv8gigrw3yg4m")))) (build-system perl-build-system) + (native-inputs + `(("perl-test-tcp" ,perl-test-tcp))) (propagated-inputs `(("perl-sys-syscall" ,perl-sys-syscall))) (home-page "https://metacpan.org/release/Danga-Socket") @@ -2676,3 +2678,42 @@ maximum extent possible.") B.A.T.M.A.N. mesh networking routing protocol provided by the Linux kernel module @code{batman-adv}, for Layer 2.") (license license:gpl2+))) + +(define-public pagekite + (package + (name "pagekite") + (version "1.0.0.190721") + (source + (origin + (method url-fetch) + (uri (string-append "https://pagekite.net/pk/src/pagekite-" + version ".tar.gz")) + (sha256 + (base32 "0y4vaqd3pjr6if8jcnhjwignkxgrajmnx1rd1p37anj8xjg7l8zh")))) + (build-system python-build-system) + (arguments + ;; Python 3 support is a work-in-progress and should come soon: + ;; https://github.com/pagekite/PyPagekite/issues/40 + ;; https://github.com/pagekite/PyPagekite/pull/71 + `(#:python ,python-2 + #:phases + (modify-phases %standard-phases + (add-after 'install 'install-man-page + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (man (string-append out "/share/man"))) + (invoke "make" + (string-append "PYTHONPATH=" (getenv "PYTHONPATH")) + "doc/pagekite.1") + (install-file "doc/pagekite.1" (string-append man "/man1")) + #t)))))) + (inputs + `(("python2-socksipychain" ,python2-socksipychain))) + (home-page "https://pagekite.net/") + (synopsis "Make localhost servers publicly visible") + (description + "PageKite implements a tunneled reverse proxy which makes it easy to make +a service (such as an HTTP or SSH server) on localhost visible to the wider +Internet, even behind NAT or restrictive firewalls. A managed front-end relay +service is available at @url{https://pagekite.net/}, or you can run your own.") + (license license:agpl3+))) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 7984e40382..d820b855d8 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com> ;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org> -;;; Copyright © 2016, 2018 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016-2018 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2017 Ben Woodcroft <donttrustben@gmail.com> ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> @@ -1115,6 +1115,7 @@ files in these formats.") (uri (git-reference (url "https://github.com/ocaml/Zarith") (commit (string-append "release-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 "0hv5ywz1q2cgn8apfz490clwk5hcynr937g2v8i13x2ax4bnv0lz")))) @@ -2645,6 +2646,7 @@ big- and little-endian, with their unsafe counter-parts.") (uri (git-reference (url "https://github.com/mirage/ocaml-cstruct") (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 "0m4bz0digcsc8l2msfikwcbi1y371kccx6xnkwrz212mf5mp98bv")))) @@ -3043,7 +3045,9 @@ library is currently designed for Unicode Standard 3.2.") (version "1.1.0") (source (origin (method url-fetch) - (uri "https://bitbucket.org/zandoye/charinfo_width/get/1.1.0.tar.gz") + (uri (string-append "https://bitbucket.org/zandoye/charinfo_width" + "/get/" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "00bv4p1yqs8y0z4z07wd9w9yyv669dikp9b04dcjbwpiy2wy0086")))) diff --git a/gnu/packages/opencl.scm b/gnu/packages/opencl.scm index fc9c11caa5..50c99118c1 100644 --- a/gnu/packages/opencl.scm +++ b/gnu/packages/opencl.scm @@ -296,7 +296,7 @@ back-end for the LLVM compiler framework.") (define-public pocl (package (name "pocl") - (version "1.2") + (version "1.4") (source (origin (method git-fetch) @@ -304,7 +304,7 @@ back-end for the LLVM compiler framework.") (url "https://github.com/pocl/pocl.git") (commit (string-append "v" version)))) (sha256 - (base32 "0fyiwd9nrqhl0jsac0bx17p9acpfzhyxp50mmp28mzn7psb9qidg")) + (base32 "1c4y69zks6hkq5fqh9waxgb8g4ka7y6h3vacmsm720kba0h57g8a")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (native-inputs @@ -312,8 +312,8 @@ back-end for the LLVM compiler framework.") ("pkg-config" ,pkg-config))) (inputs `(("clang" ,clang) - ("hwloc" ,hwloc-2.0 "lib") - ("llvm" ,llvm) + ("hwloc" ,hwloc-2 "lib") + ("llvm" ,llvm-8) ("ocl-icd" ,ocl-icd))) (arguments `(#:configure-flags diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 202fb36174..1daab4e879 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -110,8 +110,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.0.1") - (commit "f63e49342bb8536d24b35ed57a2be978556f149e") - (revision 9)) + (commit "41b4b713f4892918a9a1950acdd89f33b977d143") + (revision 10)) (package (name "guix") @@ -127,7 +127,7 @@ (commit commit))) (sha256 (base32 - "18bxcbxcwxlgfgdapjyxg0d98c9g00ivjhhb2xyg42dbmbkh6nqy")) + "08sblj4xy78va6zlxmxdq2id58pjr8rjqxxycd77hiacsqbjh9g6")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments @@ -907,14 +907,14 @@ Microsoft cabinet (.@dfn{CAB}) files.") (define-public msitools (package (name "msitools") - (version "0.99") + (version "0.100") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/msitools/" version "/msitools-" version ".tar.xz")) (sha256 (base32 - "0d9nidn5zc81bc30w119933rn2g87mrsqyqkndg20srkbsd96xfl")))) + "1skq17qr2ic4qr3779j49byfm8rncwbsq9rj1a33ncn2m7isdwdv")))) (build-system gnu-build-system) (native-inputs `(("bison" ,bison) diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index d8338caffb..4fc2c9afb4 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -105,7 +105,7 @@ and they are executed on lists of files, hosts, users or other items.") (define-public slurm (package (name "slurm") - (version "17.11.3") + (version "19.05.3-2") (source (origin (method url-fetch) (uri (string-append @@ -113,24 +113,37 @@ and they are executed on lists of files, hosts, users or other items.") version ".tar.bz2")) (sha256 (base32 - "1x3i6z03d9m46fvj1cslrapm1drvgyqch9pn4xf23kvbz4gkhaps")) + "0qj4blfymrd2ry2qmb58l3jbr4jwygc3adcfw7my27rippcijlyc")) (modules '((guix build utils))) (snippet '(begin + ;; According to + ;; <https://lists.gnu.org/archive/html/guix-devel/2016-02/msg00534.html> + ;; there are non-free bits under contribs/, though it's not + ;; clear which ones. libpmi is clearly free (it used to be + ;; under src/api/), so remove all of contribs/ except + ;; contribs/pmi/. (substitute* "configure.ac" - (("^[[:space:]]+contribs/.*$") "")) + (("^[[:space:]]+contribs/(.*)$" all directory) + (if (and (string-prefix? "pmi" directory) + (not (string-prefix? "pmi2" directory))) + all + ""))) + + (rename-file "contribs/pmi" "tmp-pmi") (delete-file-recursively "contribs") + (mkdir "contribs") + (rename-file "tmp-pmi" "contribs/pmi") #t)))) ;; FIXME: More optional inputs could be added, ;; in particular mysql and gtk+. (inputs `(("expect" ,expect) ("freeipmi" ,freeipmi) - ("hwloc" ,hwloc "lib") + ("hwloc" ,hwloc-2 "lib") ("json-c" ,json-c) ("linux-pam" , linux-pam) ("munge" ,munge) ("numactl" ,numactl) - ("openssl" ,openssl) ("perl" ,perl) ("python" ,python-wrapper) ("readline" ,readline))) @@ -141,15 +154,19 @@ and they are executed on lists of files, hosts, users or other items.") (arguments `(#:configure-flags (list "--enable-pam" "--sysconfdir=/etc/slurm" + "--disable-static" (string-append "--with-freeipmi=" (assoc-ref %build-inputs "freeipmi")) (string-append "--with-hwloc=" (assoc-ref %build-inputs "hwloc")) (string-append "--with-json=" (assoc-ref %build-inputs "json-c")) - (string-append "--with-munge=" (assoc-ref %build-inputs "munge")) - (string-append "--with-ssl=" (assoc-ref %build-inputs "openssl"))) + (string-append "--with-munge=" (assoc-ref %build-inputs "munge"))) #:phases (modify-phases %standard-phases (add-after 'unpack 'autoconf - (lambda _ (invoke "autoconf")))))) ; configure.ac was patched + (lambda _ (invoke "autoconf"))) ;configure.ac was patched + (add-after 'install 'install-libpmi + (lambda _ + ;; Open MPI expects libpmi to be provided by Slurm so install it. + (invoke "make" "install" "-C" "contribs/pmi")))))) (home-page "https://slurm.schedmd.com/") (synopsis "Workload manager for cluster computing") (description diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 9bea0e68c1..dd4eeba0ac 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017 Jelle Licht <jlicht@fsfe.org> -;;; Copyright © 2017 Eric Bavier <bavier@member.fsf.org> +;;; Copyright © 2017, 2019 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2017 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2017 Manolis Fragkiskos Ragkousis <manolis837@gmail.com> ;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com> @@ -23,6 +23,7 @@ ;;; Copyright © 2018 Amirouche Boubekki <amirouche@hypermove.net> ;;; Copyright © 2018, 2019 Tim Gesthuizen <tim.gesthuizen@yahoo.de> ;;; Copyright © 2019 Jens Mølgaard <jens@zete.tk> +;;; Copyright © 2019 Tanguy Le Carrour <tanguy@bioneland.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -43,6 +44,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (guix build-system trivial) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix packages) @@ -76,6 +78,7 @@ #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages readline) + #:use-module (gnu packages ruby) #:use-module (gnu packages security-token) #:use-module (gnu packages suckless) #:use-module (gnu packages tcl) @@ -653,6 +656,49 @@ templates, clipboard handling, and per folder settings for multi-recipient encryption.") (license license:gpl3+))) +(define-public rofi-pass + (package + (name "rofi-pass") + (version "2.0.2") + (source + (origin + (method url-fetch) + (uri + (string-append "https://raw.githubusercontent.com/carnager/rofi-pass/" + version "/rofi-pass")) + (sha256 + (base32 "0msldkndqp40nx1s5s7ggcr97ir4nshpmnyzvj5hqw1l7m3gvw6j")) + (file-name name))) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let ((source (string-append (assoc-ref %build-inputs "source"))) + (script "rofi-pass") + (out (assoc-ref %outputs "out"))) + (copy-file source script) + (chmod script #o555) + (install-file script (string-append out "/bin")))))) + (propagated-inputs + `(("password-store" ,password-store) + ("rofi" ,rofi) + ("xdotool" ,xdotool))) + (home-page "https://github.com/carnager/rofi-pass") + (synopsis "Rofi frontend for password-store") + (description "Rofi-pass provides a way to manipulate information stored +using password-store through rofi interface: +@enumerate +@item open URLs of entries with hotkey; +@item type any field from entry; +@item auto-typing of user and/or password fields; +@item auto-typing username based on path; +@item auto-typing of more than one field, using the autotype entry; +@item bookmarks mode (open stored URLs in browser, default: Alt+x). +@end enumerate") + (license license:gpl3))) + (define-public argon2 (package (name "argon2") @@ -734,7 +780,7 @@ between hosts and entries in the password store.") (license license:lgpl3+))) (define-public john-the-ripper-jumbo - (let ((official-version "1.8.0") + (let ((official-version "1.9.0") (jumbo-version "1")) (package (name "john-the-ripper-jumbo") @@ -746,78 +792,86 @@ between hosts and entries in the password store.") official-version "-jumbo-" jumbo-version ".tar.xz")) (sha256 (base32 - "08q92sfdvkz47rx6qjn7qv57cmlpy7i7rgddapq5384mb413vjds")) - (patches - (list (origin - (method url-fetch) - (uri (string-append "https://github.com/magnumripper/" - "JohnTheRipper/commit/" - "e2e868db3e153b3f959e119a51703d4afb99c624.patch")) - (file-name "john-the-ripper-jumbo-gcc5-inline.patch") - (sha256 - (base32 - "1shvcf1y2097115mxhzdkm64dr106a8zr6pqjqyh171q5ng5vfra"))) - (origin - (method url-fetch) - (uri (string-append "https://github.com/magnumripper/" - "JohnTheRipper/commit/" - "480e95b0e449863be3e1a5b0bc634a67df28b618.patch")) - (file-name "john-the-ripper-jumbo-non-x86.patch") - (sha256 - (base32 - "1ffd9dvhk0sb6ss8dv5yalh01lz30i7rilqilf2xv68gax2hyjqx"))))))) + "0fvz3v41hnaiv1ggpxanfykyfjq79cwp9qcqqn63vic357w27lgm")))) (build-system gnu-build-system) + (native-inputs + `(("perl" ,perl))) (inputs `(("gmp" ,gmp) - ("krb5" ,mit-krb5) ("libpcap" ,libpcap) ("nss" ,nss) ("openssl" ,openssl-1.0) + ("python" ,python-2) ; For "python" and "python2" shebangs + ("ruby" ,ruby) ; For genincstats.rb ("zlib" ,zlib))) (arguments `(#:configure-flags - (list (string-append - "CFLAGS=-O2 -g " - "-DJOHN_SYSTEMWIDE=1 " - "-DJOHN_SYSTEMWIDE_EXEC='\"" %output "/libexec/john\"' " - "-DJOHN_SYSTEMWIDE_HOME='\"" %output "/share/john\"'") - ;; For now, do not test for instruction set in configure, and - ;; do not pass '-march=native' to gcc: + (list "--with-systemwide" + ;; Do not test for instruction set in configure, and do not + ;; pass '-march=native' to gcc: "--disable-native-tests" - "--disable-native-macro") - #:tests? #f ;tests try to create '.john' in the build user's $HOME + "--disable-native-march" + ,(string-append + "--enable-simd=" + (let ((system (or (%current-target-system) + (%current-system)))) + (cond + ((or (string-prefix? "x86_64" system) + (string-prefix? "i686" system)) "sse2") + ((string-prefix? "aarch" system) "neon") + (else "no"))))) #:phases (modify-phases %standard-phases (add-before 'configure 'chdir-src - (lambda _ (chdir "src"))) + (lambda _ (chdir "src") #t)) (replace 'install (lambda _ (let ((bindir (string-append %output "/bin")) (docdir (string-append %output "/share/doc/john")) (execdir (string-append %output "/libexec/john")) - (homedir (string-append %output "/share/john")) + (datadir (string-append %output "/share/john")) (install-file-to (lambda (dir) (lambda (f) (install-file f dir)))) (symlink? (lambda (_ s) (eq? (stat:type s) 'symlink)))) (with-directory-excursion "../run" + (for-each (install-file-to bindir) + (cons* + "john" "makechr" "cprepair" "SIPdump" "tgtsnarf" + "genmkvpwd" "mkvcalcproba" "calc_stat" "raw2dyna" + (find-files "." "(to|2)?john(-[^.]*)?$"))) + (for-each (lambda (f) ; Install symlinked aliases + (let ((tgt (string-append bindir "/" (basename f)))) + ;; The use of install-file above dereferences + ;; symlinks. We'd rather have the symlinks + ;; for clarity, so remove tgt before linking. + (when (file-exists? tgt) (delete-file tgt)) + (symlink "john" tgt))) + (find-files "." symlink?)) (for-each (install-file-to execdir) - (cons* "mailer" "benchmark-unify" - (find-files "." ".*\\.(py|rb|pl)"))) - (for-each (install-file-to homedir) + (cons* "mailer" "benchmark-unify" "relbench" + (find-files "." ".*\\.js"))) + (for-each (lambda (f) + (let* ((base (basename f)) + (name (substring base 0 (string-index base #\.))) + (link (string-append bindir "/" name))) + (install-file f execdir) + (when (and (executable-file? f) + (not (file-exists? link))) + (symlink (string-append execdir "/" base) link)))) + (find-files "." ".*\\.(pl|py|rb|lua)")) + (for-each (install-file-to datadir) (append (find-files "." "(stats|dictionary.*)") (find-files "." "(.*\\.chr|.*\\.lst)") (find-files "." ".*\\.conf"))) - (for-each (install-file-to bindir) - '("tgtsnarf" "genmkvpwd" "mkvcalcproba" - "raw2dyna" "luks2john" "vncpcap2john" - "uaf2john" "calc_stat" "wpapcap2john" - "cprepair" "relbench" "SIPdump" "john")) - (for-each (lambda (f) ;install symlinked aliases - (symlink "john" - (string-append bindir "/" (basename f)))) - (find-files "." symlink?))) + (copy-recursively "rules" (string-append datadir "/rules"))) (copy-recursively "../doc" docdir) - #t)))))) + #t))) + (delete 'check) ; Tests need installed .conf files; move after install + (add-after 'install 'check + (lambda args + (setenv "HOME" "/tmp") ; Some tests need to write to ~/.john + (setenv "OMP_NUM_THREADS" (number->string (parallel-job-count))) + (apply (assoc-ref %standard-phases 'check) args)))))) (home-page "http://www.openwall.com/john/") (synopsis "Password cracker") (description "John the Ripper is a fast password cracker. Its primary diff --git a/gnu/packages/patches/cpio-CVE-2016-2037.patch b/gnu/packages/patches/cpio-CVE-2016-2037.patch deleted file mode 100644 index f1e068fb45..0000000000 --- a/gnu/packages/patches/cpio-CVE-2016-2037.patch +++ /dev/null @@ -1,49 +0,0 @@ -Fix CVE-2016-2037 (out of bounds write in process_copy_in()). - -Copied from upstream mailing list: -https://lists.gnu.org/archive/html/bug-cpio/2016-01/msg00005.html - ---- - - Other calls to cpio_safer_name_suffix seem to be safe. - . - * src/copyin.c (process_copy_in): Make sure that file_hdr.c_name - has at least two bytes allocated. - * src/util.c (cpio_safer_name_suffix): Document that use of this - function requires to be careful. -Author: Pavel Raiskup <praiskup@redhat.com> - ---- - src/copyin.c | 2 ++ - src/util.c | 5 ++++- - 2 files changed, 6 insertions(+), 1 deletion(-) - -Index: cpio-2.11+dfsg/src/copyin.c -=================================================================== ---- cpio-2.11+dfsg.orig/src/copyin.c -+++ cpio-2.11+dfsg/src/copyin.c -@@ -1433,6 +1433,8 @@ process_copy_in () - break; - } - -+ if (file_hdr.c_namesize <= 1) -+ file_hdr.c_name = xrealloc(file_hdr.c_name, 2); - cpio_safer_name_suffix (file_hdr.c_name, false, !no_abs_paths_flag, - false); - -Index: cpio-2.11+dfsg/src/util.c -=================================================================== ---- cpio-2.11+dfsg.orig/src/util.c -+++ cpio-2.11+dfsg/src/util.c -@@ -1374,7 +1374,10 @@ set_file_times (int fd, - } - - /* Do we have to ignore absolute paths, and if so, does the filename -- have an absolute path? */ -+ have an absolute path? -+ Before calling this function make sure that the allocated NAME buffer has -+ capacity at least 2 bytes to allow us to store the "." string inside. */ -+ - void - cpio_safer_name_suffix (char *name, bool link_target, bool absolute_names, - bool strip_leading_dots) diff --git a/gnu/packages/patches/docker-adjust-tests-for-changes-in-go.patch b/gnu/packages/patches/docker-adjust-tests-for-changes-in-go.patch new file mode 100644 index 0000000000..82d92cd4de --- /dev/null +++ b/gnu/packages/patches/docker-adjust-tests-for-changes-in-go.patch @@ -0,0 +1,67 @@ +From 4983ef7c1693ad6dfbe4e3809b12541241d7ff56 Mon Sep 17 00:00:00 2001 +From: Sebastiaan van Stijn <github@gone.nl> +Date: Wed, 14 Aug 2019 02:51:08 +0200 +Subject: [PATCH] Adjust tests for changes in Go 1.12.8 / 1.11.13 + +``` +00:38:11 === Failed +00:38:11 === FAIL: opts TestParseDockerDaemonHost (0.00s) +00:38:11 hosts_test.go:87: tcp tcp:a.b.c.d address expected error "Invalid bind address format: tcp:a.b.c.d" return, got "parse tcp://tcp:a.b.c.d: invalid port \":a.b.c.d\" after host" and addr +00:38:11 hosts_test.go:87: tcp tcp:a.b.c.d/path address expected error "Invalid bind address format: tcp:a.b.c.d/path" return, got "parse tcp://tcp:a.b.c.d/path: invalid port \":a.b.c.d\" after host" and addr +00:38:11 +00:38:11 === FAIL: opts TestParseTCP (0.00s) +00:38:11 hosts_test.go:129: tcp tcp:a.b.c.d address expected error Invalid bind address format: tcp:a.b.c.d return, got parse tcp://tcp:a.b.c.d: invalid port ":a.b.c.d" after host and addr +00:38:11 hosts_test.go:129: tcp tcp:a.b.c.d/path address expected error Invalid bind address format: tcp:a.b.c.d/path return, got parse tcp://tcp:a.b.c.d/path: invalid port ":a.b.c.d" after host and addr +``` + +Signed-off-by: Sebastiaan van Stijn <github@gone.nl> +Upstream-commit: 683766613a8c1dca8f95b19ddb7e083bb3aef266 +Component: engine +--- + opts/hosts_test.go | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/opts/hosts_test.go b/opts/hosts_test.go +index 8c54ec0f4b..7a0a943adf 100644 +--- a/opts/hosts_test.go ++++ b/opts/hosts_test.go +@@ -53,8 +53,8 @@ func TestParseHost(t *testing.T) { + func TestParseDockerDaemonHost(t *testing.T) { + invalids := map[string]string{ + +- "tcp:a.b.c.d": "Invalid bind address format: tcp:a.b.c.d", +- "tcp:a.b.c.d/path": "Invalid bind address format: tcp:a.b.c.d/path", ++ "tcp:a.b.c.d": "", ++ "tcp:a.b.c.d/path": "", + "udp://127.0.0.1": "Invalid bind address format: udp://127.0.0.1", + "udp://127.0.0.1:2375": "Invalid bind address format: udp://127.0.0.1:2375", + "tcp://unix:///run/docker.sock": "Invalid proto, expected tcp: unix:///run/docker.sock", +@@ -83,7 +83,7 @@ func TestParseDockerDaemonHost(t *testing.T) { + "localhost:5555/path": "tcp://localhost:5555/path", + } + for invalidAddr, expectedError := range invalids { +- if addr, err := parseDaemonHost(invalidAddr); err == nil || err.Error() != expectedError { ++ if addr, err := parseDaemonHost(invalidAddr); err == nil || expectedError != "" && err.Error() != expectedError { + t.Errorf("tcp %v address expected error %q return, got %q and addr %v", invalidAddr, expectedError, err, addr) + } + } +@@ -99,8 +99,8 @@ func TestParseTCP(t *testing.T) { + defaultHTTPHost = "tcp://127.0.0.1:2376" + ) + invalids := map[string]string{ +- "tcp:a.b.c.d": "Invalid bind address format: tcp:a.b.c.d", +- "tcp:a.b.c.d/path": "Invalid bind address format: tcp:a.b.c.d/path", ++ "tcp:a.b.c.d": "", ++ "tcp:a.b.c.d/path": "", + "udp://127.0.0.1": "Invalid proto, expected tcp: udp://127.0.0.1", + "udp://127.0.0.1:2375": "Invalid proto, expected tcp: udp://127.0.0.1:2375", + } +@@ -125,7 +125,7 @@ func TestParseTCP(t *testing.T) { + "localhost:5555/path": "tcp://localhost:5555/path", + } + for invalidAddr, expectedError := range invalids { +- if addr, err := ParseTCPAddr(invalidAddr, defaultHTTPHost); err == nil || err.Error() != expectedError { ++ if addr, err := ParseTCPAddr(invalidAddr, defaultHTTPHost); err == nil || expectedError != "" && err.Error() != expectedError { + t.Errorf("tcp %v address expected error %v return, got %s and addr %v", invalidAddr, expectedError, err, addr) + } + } diff --git a/gnu/packages/patches/fribidi-CVE-2019-18397.patch b/gnu/packages/patches/fribidi-CVE-2019-18397.patch new file mode 100644 index 0000000000..aff1a669b2 --- /dev/null +++ b/gnu/packages/patches/fribidi-CVE-2019-18397.patch @@ -0,0 +1,26 @@ +https://github.com/fribidi/fribidi/commit/034c6e9a1d296286305f4cfd1e0072b879f52568.patch + +From 034c6e9a1d296286305f4cfd1e0072b879f52568 Mon Sep 17 00:00:00 2001 +From: Dov Grobgeld <dov.grobgeld@gmail.com> +Date: Thu, 24 Oct 2019 09:37:29 +0300 +Subject: [PATCH] Truncate isolate_level to FRIBIDI_BIDI_MAX_EXPLICIT_LEVEL + +--- + lib/fribidi-bidi.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/lib/fribidi-bidi.c b/lib/fribidi-bidi.c +index 6c84392..d384878 100644 +--- a/lib/fribidi-bidi.c ++++ b/lib/fribidi-bidi.c +@@ -747,7 +747,9 @@ fribidi_get_par_embedding_levels_ex ( + } + + RL_LEVEL (pp) = level; +- RL_ISOLATE_LEVEL (pp) = isolate_level++; ++ RL_ISOLATE_LEVEL (pp) = isolate_level; ++ if (isolate_level < FRIBIDI_BIDI_MAX_EXPLICIT_LEVEL-1) ++ isolate_level++; + base_level_per_iso_level[isolate_level] = new_level; + + if (!FRIBIDI_IS_NEUTRAL (override)) diff --git a/gnu/packages/patches/icecat-gnuzilla-fixes.patch b/gnu/packages/patches/icecat-gnuzilla-fixes.patch index 41f0d2e3a3..e8e0946f57 100644 --- a/gnu/packages/patches/icecat-gnuzilla-fixes.patch +++ b/gnu/packages/patches/icecat-gnuzilla-fixes.patch @@ -1,241 +1,546 @@ -From 2676d4e1eb64e18d2e4722c0ea0babdc1f716fa4 Mon Sep 17 00:00:00 2001 +From 2abca7767c461a022317bf18fbec51e8b3ce6a92 Mon Sep 17 00:00:00 2001 From: Mark H Weaver <mhw@netris.org> -Date: Mon, 28 Oct 2019 01:54:19 -0400 -Subject: [PATCH 1/4] Update to 68.2.0-gnu1. +Date: Thu, 31 Oct 2019 03:59:46 -0400 +Subject: [PATCH 1/2] Branding: fix patching of trademarkInfo within l10n + directory. -* makeicecat: Update to FFMINOR to 2, and update the expected -sha256sum of the firefox source tarball. +This is a followup to commit 930298e1efff3e40721659d8fd7118cdd2477bd4. + +* makeicecat: Patch in the IceCat logo copyright notice in all +brand.dtd files within l10n directory. --- - makeicecat | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + makeicecat | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makeicecat b/makeicecat -index 97ee473..1bcf465 100644 +index 3ff2ead..4ff3e64 100755 --- a/makeicecat +++ b/makeicecat -@@ -21,7 +21,7 @@ - set -euxo pipefail +@@ -226,7 +226,7 @@ cp $DATA/bookmarks.html.in browser/locales/generic/profile/bookmarks.html.in + + # Custom legal about pages - FFMAJOR=68 --FFMINOR=1 -+FFMINOR=2 - FFSUB=0 - GNUVERSION=1 - FFVERSION=$FFMAJOR.$FFMINOR.$FFSUB -@@ -43,7 +43,7 @@ wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FFVERSION}esr - wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FFVERSION}esr/source/firefox-${FFVERSION}esr.source.tar.xz.asc - gpg --recv-keys --keyserver keyserver.ubuntu.com 14F26682D0916CDD81E37B6D61B7B526D98F0353 - gpg --verify firefox-${FFVERSION}esr.source.tar.xz.asc --echo -n f56f5fa5a4744be0b9acf259cb991254d708a50b9a0a12d1d846ffa5a6c409ac firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - -+echo -n 85f1c2eaf68ebedcbc0b78a342f6d16ef0865dedd426a1bba94b75c85f716f38 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - +-find l10n -wholename '*/brand.dtd' |xargs /bin/sed 's/trademarkInfo.part1.*/trademarkInfo.part1 "">/' -i ++find l10n -wholename '*/brand.dtd' |xargs /bin/sed 's/trademarkInfo.part1.*/trademarkInfo.part1 "The IceCat logo is Copyright 2008-2015 Free Software Foundation, released under the terms of the GNU Lesser General Public License, version 3 or any later version.">/' -i + find l10n -wholename '*/brand.ftl' |xargs /bin/sed 's/^trademarkInfo = .*/trademarkInfo = The IceCat logo is Copyright 2008-2015 Free Software Foundation, released under the terms of the GNU Lesser General Public License, version 3 or any later version./' -i - echo Extracting Firefox tarball - tar -xf firefox-${FFVERSION}esr.source.tar.xz + for STRING in rights.intro-point3-unbranded rights.intro-point4a-unbranded rights.intro-point4b-unbranded rights.intro-point4c-unbranded -- 2.23.0 -From c3a7b761f11c75d3764779e731a7c7e86b072d2f Mon Sep 17 00:00:00 2001 +From 150af5dd8b502b66f325b9fe8bd0b2ae553326a4 Mon Sep 17 00:00:00 2001 From: Mark H Weaver <mhw@netris.org> -Date: Mon, 28 Oct 2019 04:18:26 -0400 -Subject: [PATCH 2/4] Disable MOZ_SERVICES_HEALTHREPORT and MOZ_DATA_REPORTING. +Date: Wed, 30 Oct 2019 18:34:44 -0400 +Subject: [PATCH 2/2] Add first batch of IceCat-specific preferences. -* data/patches/fix-data-reporting-check.patch: New file. -* data/patches/legacy-profiles.patch: Rename to ... -* data/patches/moz-configure-changes.patch: ... this, -and set MOZ_SERVICES_HEALTHREPORT to False. +* makeicecat: Add code to add IceCat-specific messages to l10n directory. +* data/files-to-append/browser/locales/en-US/browser/preferences/preferences.ftl, +data/files-to-append/l10n/es-AR/browser/browser/preferences/preferences.ftl, +data/files-to-append/l10n/es-CL/browser/browser/preferences/preferences.ftl, +data/files-to-append/l10n/es-ES/browser/browser/preferences/preferences.ftl, +data/files-to-append/l10n/es-MX/browser/browser/preferences/preferences.ftl, +data/files-to-append/l10n/fr/browser/browser/preferences/preferences.ftl, +data/files-to-append/l10n/it/browser/browser/preferences/preferences.ftl, +data/patches/icecat-preferences.patch: New files. --- - data/patches/fix-data-reporting-check.patch | 22 +++++++++++++++++++++ - data/patches/legacy-profiles.patch | 11 ----------- - data/patches/moz-configure-changes.patch | 14 +++++++++++++ - 3 files changed, 36 insertions(+), 11 deletions(-) - create mode 100644 data/patches/fix-data-reporting-check.patch - delete mode 100644 data/patches/legacy-profiles.patch - create mode 100644 data/patches/moz-configure-changes.patch + .../en-US/browser/preferences/preferences.ftl | 36 ++++ + .../browser/preferences/preferences.ftl | 36 ++++ + .../browser/preferences/preferences.ftl | 36 ++++ + .../browser/preferences/preferences.ftl | 36 ++++ + .../browser/preferences/preferences.ftl | 36 ++++ + .../browser/preferences/preferences.ftl | 36 ++++ + .../browser/preferences/preferences.ftl | 36 ++++ + data/patches/icecat-preferences.patch | 155 ++++++++++++++++++ + makeicecat | 13 ++ + 9 files changed, 420 insertions(+) + create mode 100644 data/files-to-append/browser/locales/en-US/browser/preferences/preferences.ftl + create mode 100644 data/files-to-append/l10n/es-AR/browser/browser/preferences/preferences.ftl + create mode 100644 data/files-to-append/l10n/es-CL/browser/browser/preferences/preferences.ftl + create mode 100644 data/files-to-append/l10n/es-ES/browser/browser/preferences/preferences.ftl + create mode 100644 data/files-to-append/l10n/es-MX/browser/browser/preferences/preferences.ftl + create mode 100644 data/files-to-append/l10n/fr/browser/browser/preferences/preferences.ftl + create mode 100644 data/files-to-append/l10n/it/browser/browser/preferences/preferences.ftl + create mode 100644 data/patches/icecat-preferences.patch -diff --git a/data/patches/fix-data-reporting-check.patch b/data/patches/fix-data-reporting-check.patch +diff --git a/data/files-to-append/browser/locales/en-US/browser/preferences/preferences.ftl b/data/files-to-append/browser/locales/en-US/browser/preferences/preferences.ftl new file mode 100644 -index 0000000..d586dc5 +index 0000000..2f90bcd --- /dev/null -+++ b/data/patches/fix-data-reporting-check.patch -@@ -0,0 +1,22 @@ -+--- a/old-configure.in.orig 1980-01-01 18:59:51.000000000 -0500 -++++ b/old-configure.in 2019-10-28 04:13:17.343606008 -0400 -+@@ -3116,7 +3116,7 @@ -+ dnl If we have any service that uploads data (and requires data submission -+ dnl policy alert), set MOZ_DATA_REPORTING. -+ dnl We need SUBST for build system and DEFINE for xul preprocessor. -+-if test -n "$MOZ_TELEMETRY_REPORTING" || test -n "$MOZ_SERVICES_HEALTHREPORT" || test -n "$MOZ_CRASHREPORTER"; then -++if test "$MOZ_TELEMETRY_REPORTING" = 1 || test "$MOZ_SERVICES_HEALTHREPORT" = 1 || test "$MOZ_CRASHREPORTER" = 1; then -+ MOZ_DATA_REPORTING=1 -+ AC_DEFINE(MOZ_DATA_REPORTING) -+ AC_SUBST(MOZ_DATA_REPORTING) -+--- a/old-configure.orig 1980-01-01 18:59:51.000000000 -0500 -++++ b/old-configure 2019-10-28 04:15:41.772322191 -0400 -+@@ -12150,7 +12150,7 @@ -+ -+ -+ -+-if test -n "$MOZ_TELEMETRY_REPORTING" || test -n "$MOZ_SERVICES_HEALTHREPORT" || test -n "$MOZ_CRASHREPORTER"; then -++if test "$MOZ_TELEMETRY_REPORTING" = 1 || test "$MOZ_SERVICES_HEALTHREPORT" = 1 || test "$MOZ_CRASHREPORTER" = 1; then -+ MOZ_DATA_REPORTING=1 -+ cat >> confdefs.pytmp <<\EOF -+ (''' MOZ_DATA_REPORTING ''', ' 1 ') -diff --git a/data/patches/legacy-profiles.patch b/data/patches/legacy-profiles.patch -deleted file mode 100644 -index 33e9e99..0000000 ---- a/data/patches/legacy-profiles.patch -+++ /dev/null -@@ -1,11 +0,0 @@ ----- a/browser/moz.configure.orig 1980-01-01 18:59:51.000000000 -0500 --+++ b/browser/moz.configure 2019-10-26 21:58:37.719617701 -0400 --@@ -7,7 +7,7 @@ -- imply_option('MOZ_PLACES', True) -- imply_option('MOZ_SERVICES_HEALTHREPORT', True) -- imply_option('MOZ_SERVICES_SYNC', True) ---imply_option('MOZ_DEDICATED_PROFILES', True) --+imply_option('MOZ_DEDICATED_PROFILES', False) -- imply_option('MOZ_BLOCK_PROFILE_DOWNGRADE', True) -- -- with only_when(target_is_linux & compile_environment): -diff --git a/data/patches/moz-configure-changes.patch b/data/patches/moz-configure-changes.patch ++++ b/data/files-to-append/browser/locales/en-US/browser/preferences/preferences.ftl +@@ -0,0 +1,36 @@ ++ ++## IceCat-specific privacy settings ++ ++icecat-privacy-group-header = IceCat-specific privacy settings ++ ++disable-javascript-option = ++ .label = Disable JavaScript ++disable-javascript-description = Disabling Javascript greatly improves privacy, security and <a href=\"https://www.gnu.org/philosophy/javascript-trap.html\">freedom</a>, but it will break many sites. ++ ++disable-custom-fonts-option = ++ .label = Do not load custom fonts ++disable-custom-fonts-description = Custom fonts can be used for <a href=\"https://en.wikipedia.org/wiki/Device_fingerprint\">fingerprinting</a>. Disabling them improves privacy but may make some sites look wrong. ++ ++isolate-request-first-party-option = ++ .label = Isolate requests to First Party domains ++isolate-request-first-party-description = This <a href=\"https://www.torproject.org/projects/torbrowser/design/#identifier-linkability\">improves privacy</a>, but it may interfere with login into some sites. ++ ++auto-update-extensions-option = ++ .label = Automatically update extensions ++auto-update-extensions-description = Enabling automated updates is good for security, but would start Internet connections in the background. ++ ++spoof-referers-option = ++ .label = Spoof Referers ++spoof-referers-description = <a href=\"https://en.wikipedia.org/wiki/HTTP_referer\">Referers</a> tell sites what link brought you there. This feature greatly improves your privacy, but it may break functionality on some sites. ++ ++detect-captive-portal-option = ++ .label = Detect captive portal ++detect-captive-portal-description = <a href=\"https://en.wikipedia.org/wiki/Captive_portal\">Captive portals</a> are the sites that control access to public wireless networks in hotels, airports, cafes, etc. The detection service is useful if you connect to such netwoks, but it will start connections automatically. ++ ++geolocation-option = ++ .label = Enable Geolocation ++geolocation-description = This is commonly used for maps, weather sites, and some stores. It is better to keep it off unless you really need it. ++ ++webgl-option = ++ .label = Enable WebGL ++webgl-description = Needed to visualize 3D graphics, but it may expose you to security threats. Enable it only if you really use it. +diff --git a/data/files-to-append/l10n/es-AR/browser/browser/preferences/preferences.ftl b/data/files-to-append/l10n/es-AR/browser/browser/preferences/preferences.ftl +new file mode 100644 +index 0000000..ad052b3 +--- /dev/null ++++ b/data/files-to-append/l10n/es-AR/browser/browser/preferences/preferences.ftl +@@ -0,0 +1,36 @@ ++ ++## IceCat-specific privacy settings ++ ++icecat-privacy-group-header = Ajustes de privacidad de IceCat ++ ++disable-javascript-option = ++ .label = Desactivar JavaScript ++disable-javascript-description = Desactivar JavaScript mejora enormemente la privacidad, la seguridad en Internet y la <a href=\"https://www.gnu.org/philosophy/javascript-trap.es.html\">libertad</a> en su equipo, pero afectará a la funcionalidad de muchas páginas. ++ ++disable-custom-fonts-option = ++ .label = No cargar fuentes personalizadas ++disable-custom-fonts-description = Las fuentes personalizadas pueden usarse para <a href=\"https://en.wikipedia.org/wiki/Device_fingerprint\">rastrear</a> al usuario. Desactivarlas mejora la privacidad pero puede afectar al aspecto visual de algunas páginas. ++ ++isolate-request-first-party-option = ++ .label = Aislar las solicitudes a los Dominios Primarios ++isolate-request-first-party-description = Este ajuste <a href=\"https://www.torproject.org/projects/torbrowser/design/#identifier-linkability\">mejora la privacidad</a>, pero puede interferir con el inicio de sesión en algunas webs. ++ ++auto-update-extensions-option = ++ .label = Actualizar las extensiones automáticamente ++auto-update-extensions-description = Activar las actualizaciones automáticas es bueno para la seguridad, pero precisa del establecimiento de conexiones a otros servidores en segundo plano. ++ ++spoof-referers-option = ++ .label = Modificar los referers HTTP ++spoof-referers-description = Los <a href=\"https://es.wikipedia.org/wiki/Referer_(Cabecera_HTTP)\">referers</a> son cabeceras HTTP que informan a una página acerca de nuestro enlace de origen. Activar esta característica mejora enormemente su privacidad, pero puede afectar a la funcionalidad de algunas páginas. ++ ++detect-captive-portal-option = ++ .label = Detectar los portales cautivos ++detect-captive-portal-description = Los <a href=\"https://es.wikipedia.org/wiki/Portal_cautivo\">portales cautivos</a> son las webs que registran y controlan el acceso a redes inalámbricas públicas en hoteles, aeropuertos, cafés y similares. El servicio que los detecta es práctico si se ve a menudo en la necesidad de usarlos, pero implica el establecimiento de conexiones en segundo plano. ++ ++geolocation-option = ++ .label = Activar Geolocalización ++geolocation-description = Esta característica se usa habitualmente en mapas, páginas del tiempo y algunas tiendas. Es mejor desactivarla si realmente no necesita que identifiquen su ubicación. ++ ++webgl-option = ++ .label = Activar WebGL ++webgl-description = Esta función necesaria para mostrar ciertos gráficos 3D en el navegador puede exponerle a ciertos riesgos de seguridad. Actívela solamente si va a usarla. +diff --git a/data/files-to-append/l10n/es-CL/browser/browser/preferences/preferences.ftl b/data/files-to-append/l10n/es-CL/browser/browser/preferences/preferences.ftl +new file mode 100644 +index 0000000..ad052b3 +--- /dev/null ++++ b/data/files-to-append/l10n/es-CL/browser/browser/preferences/preferences.ftl +@@ -0,0 +1,36 @@ ++ ++## IceCat-specific privacy settings ++ ++icecat-privacy-group-header = Ajustes de privacidad de IceCat ++ ++disable-javascript-option = ++ .label = Desactivar JavaScript ++disable-javascript-description = Desactivar JavaScript mejora enormemente la privacidad, la seguridad en Internet y la <a href=\"https://www.gnu.org/philosophy/javascript-trap.es.html\">libertad</a> en su equipo, pero afectará a la funcionalidad de muchas páginas. ++ ++disable-custom-fonts-option = ++ .label = No cargar fuentes personalizadas ++disable-custom-fonts-description = Las fuentes personalizadas pueden usarse para <a href=\"https://en.wikipedia.org/wiki/Device_fingerprint\">rastrear</a> al usuario. Desactivarlas mejora la privacidad pero puede afectar al aspecto visual de algunas páginas. ++ ++isolate-request-first-party-option = ++ .label = Aislar las solicitudes a los Dominios Primarios ++isolate-request-first-party-description = Este ajuste <a href=\"https://www.torproject.org/projects/torbrowser/design/#identifier-linkability\">mejora la privacidad</a>, pero puede interferir con el inicio de sesión en algunas webs. ++ ++auto-update-extensions-option = ++ .label = Actualizar las extensiones automáticamente ++auto-update-extensions-description = Activar las actualizaciones automáticas es bueno para la seguridad, pero precisa del establecimiento de conexiones a otros servidores en segundo plano. ++ ++spoof-referers-option = ++ .label = Modificar los referers HTTP ++spoof-referers-description = Los <a href=\"https://es.wikipedia.org/wiki/Referer_(Cabecera_HTTP)\">referers</a> son cabeceras HTTP que informan a una página acerca de nuestro enlace de origen. Activar esta característica mejora enormemente su privacidad, pero puede afectar a la funcionalidad de algunas páginas. ++ ++detect-captive-portal-option = ++ .label = Detectar los portales cautivos ++detect-captive-portal-description = Los <a href=\"https://es.wikipedia.org/wiki/Portal_cautivo\">portales cautivos</a> son las webs que registran y controlan el acceso a redes inalámbricas públicas en hoteles, aeropuertos, cafés y similares. El servicio que los detecta es práctico si se ve a menudo en la necesidad de usarlos, pero implica el establecimiento de conexiones en segundo plano. ++ ++geolocation-option = ++ .label = Activar Geolocalización ++geolocation-description = Esta característica se usa habitualmente en mapas, páginas del tiempo y algunas tiendas. Es mejor desactivarla si realmente no necesita que identifiquen su ubicación. ++ ++webgl-option = ++ .label = Activar WebGL ++webgl-description = Esta función necesaria para mostrar ciertos gráficos 3D en el navegador puede exponerle a ciertos riesgos de seguridad. Actívela solamente si va a usarla. +diff --git a/data/files-to-append/l10n/es-ES/browser/browser/preferences/preferences.ftl b/data/files-to-append/l10n/es-ES/browser/browser/preferences/preferences.ftl new file mode 100644 -index 0000000..aa6f1a5 +index 0000000..ad052b3 --- /dev/null -+++ b/data/patches/moz-configure-changes.patch -@@ -0,0 +1,14 @@ -+--- a/browser/moz.configure.orig 1980-01-01 18:59:51.000000000 -0500 -++++ b/browser/moz.configure 2019-10-28 01:36:13.132873871 -0400 -+@@ -5,9 +5,9 @@ -+ # file, You can obtain one at http://mozilla.org/MPL/2.0/. ++++ b/data/files-to-append/l10n/es-ES/browser/browser/preferences/preferences.ftl +@@ -0,0 +1,36 @@ ++ ++## IceCat-specific privacy settings ++ ++icecat-privacy-group-header = Ajustes de privacidad de IceCat ++ ++disable-javascript-option = ++ .label = Desactivar JavaScript ++disable-javascript-description = Desactivar JavaScript mejora enormemente la privacidad, la seguridad en Internet y la <a href=\"https://www.gnu.org/philosophy/javascript-trap.es.html\">libertad</a> en su equipo, pero afectará a la funcionalidad de muchas páginas. ++ ++disable-custom-fonts-option = ++ .label = No cargar fuentes personalizadas ++disable-custom-fonts-description = Las fuentes personalizadas pueden usarse para <a href=\"https://en.wikipedia.org/wiki/Device_fingerprint\">rastrear</a> al usuario. Desactivarlas mejora la privacidad pero puede afectar al aspecto visual de algunas páginas. ++ ++isolate-request-first-party-option = ++ .label = Aislar las solicitudes a los Dominios Primarios ++isolate-request-first-party-description = Este ajuste <a href=\"https://www.torproject.org/projects/torbrowser/design/#identifier-linkability\">mejora la privacidad</a>, pero puede interferir con el inicio de sesión en algunas webs. ++ ++auto-update-extensions-option = ++ .label = Actualizar las extensiones automáticamente ++auto-update-extensions-description = Activar las actualizaciones automáticas es bueno para la seguridad, pero precisa del establecimiento de conexiones a otros servidores en segundo plano. ++ ++spoof-referers-option = ++ .label = Modificar los referers HTTP ++spoof-referers-description = Los <a href=\"https://es.wikipedia.org/wiki/Referer_(Cabecera_HTTP)\">referers</a> son cabeceras HTTP que informan a una página acerca de nuestro enlace de origen. Activar esta característica mejora enormemente su privacidad, pero puede afectar a la funcionalidad de algunas páginas. ++ ++detect-captive-portal-option = ++ .label = Detectar los portales cautivos ++detect-captive-portal-description = Los <a href=\"https://es.wikipedia.org/wiki/Portal_cautivo\">portales cautivos</a> son las webs que registran y controlan el acceso a redes inalámbricas públicas en hoteles, aeropuertos, cafés y similares. El servicio que los detecta es práctico si se ve a menudo en la necesidad de usarlos, pero implica el establecimiento de conexiones en segundo plano. ++ ++geolocation-option = ++ .label = Activar Geolocalización ++geolocation-description = Esta característica se usa habitualmente en mapas, páginas del tiempo y algunas tiendas. Es mejor desactivarla si realmente no necesita que identifiquen su ubicación. ++ ++webgl-option = ++ .label = Activar WebGL ++webgl-description = Esta función necesaria para mostrar ciertos gráficos 3D en el navegador puede exponerle a ciertos riesgos de seguridad. Actívela solamente si va a usarla. +diff --git a/data/files-to-append/l10n/es-MX/browser/browser/preferences/preferences.ftl b/data/files-to-append/l10n/es-MX/browser/browser/preferences/preferences.ftl +new file mode 100644 +index 0000000..ad052b3 +--- /dev/null ++++ b/data/files-to-append/l10n/es-MX/browser/browser/preferences/preferences.ftl +@@ -0,0 +1,36 @@ ++ ++## IceCat-specific privacy settings ++ ++icecat-privacy-group-header = Ajustes de privacidad de IceCat ++ ++disable-javascript-option = ++ .label = Desactivar JavaScript ++disable-javascript-description = Desactivar JavaScript mejora enormemente la privacidad, la seguridad en Internet y la <a href=\"https://www.gnu.org/philosophy/javascript-trap.es.html\">libertad</a> en su equipo, pero afectará a la funcionalidad de muchas páginas. ++ ++disable-custom-fonts-option = ++ .label = No cargar fuentes personalizadas ++disable-custom-fonts-description = Las fuentes personalizadas pueden usarse para <a href=\"https://en.wikipedia.org/wiki/Device_fingerprint\">rastrear</a> al usuario. Desactivarlas mejora la privacidad pero puede afectar al aspecto visual de algunas páginas. ++ ++isolate-request-first-party-option = ++ .label = Aislar las solicitudes a los Dominios Primarios ++isolate-request-first-party-description = Este ajuste <a href=\"https://www.torproject.org/projects/torbrowser/design/#identifier-linkability\">mejora la privacidad</a>, pero puede interferir con el inicio de sesión en algunas webs. ++ ++auto-update-extensions-option = ++ .label = Actualizar las extensiones automáticamente ++auto-update-extensions-description = Activar las actualizaciones automáticas es bueno para la seguridad, pero precisa del establecimiento de conexiones a otros servidores en segundo plano. ++ ++spoof-referers-option = ++ .label = Modificar los referers HTTP ++spoof-referers-description = Los <a href=\"https://es.wikipedia.org/wiki/Referer_(Cabecera_HTTP)\">referers</a> son cabeceras HTTP que informan a una página acerca de nuestro enlace de origen. Activar esta característica mejora enormemente su privacidad, pero puede afectar a la funcionalidad de algunas páginas. ++ ++detect-captive-portal-option = ++ .label = Detectar los portales cautivos ++detect-captive-portal-description = Los <a href=\"https://es.wikipedia.org/wiki/Portal_cautivo\">portales cautivos</a> son las webs que registran y controlan el acceso a redes inalámbricas públicas en hoteles, aeropuertos, cafés y similares. El servicio que los detecta es práctico si se ve a menudo en la necesidad de usarlos, pero implica el establecimiento de conexiones en segundo plano. ++ ++geolocation-option = ++ .label = Activar Geolocalización ++geolocation-description = Esta característica se usa habitualmente en mapas, páginas del tiempo y algunas tiendas. Es mejor desactivarla si realmente no necesita que identifiquen su ubicación. ++ ++webgl-option = ++ .label = Activar WebGL ++webgl-description = Esta función necesaria para mostrar ciertos gráficos 3D en el navegador puede exponerle a ciertos riesgos de seguridad. Actívela solamente si va a usarla. +diff --git a/data/files-to-append/l10n/fr/browser/browser/preferences/preferences.ftl b/data/files-to-append/l10n/fr/browser/browser/preferences/preferences.ftl +new file mode 100644 +index 0000000..4008883 +--- /dev/null ++++ b/data/files-to-append/l10n/fr/browser/browser/preferences/preferences.ftl +@@ -0,0 +1,36 @@ ++ ++## IceCat-specific privacy settings ++ ++icecat-privacy-group-header = Vie privée de IceCat ++ ++disable-javascript-option = ++ .label = Disable JavaScript ++disable-javascript-description = Désactiver JavaScript améliore grandement le respect de la vie privée, la sécurité et <a href=\"https://www.gnu.org/philosophy/javascript-trap.fr.html\">la liberté</a>, mais cela risque de rendre beaucoup de sites web inutilisables. ++ ++disable-custom-fonts-option = ++ .label = Ne pas charger de polices personnalisées ++disable-custom-fonts-description = Les polices personnalisées peuvent être utilisées pour vous <a href=\"https://fr.wikipedia.org/wiki/Empreinte_digitale_d%27appareil\">identifier</a>. Les désactiver améliore le respect de la vie privée mais peut détérorier le rendu de certains sites. ++ ++isolate-request-first-party-option = ++ .label = Isoler les requêtes vers les domaines de premier niveau ++isolate-request-first-party-description = Améliore <a href=\"https://www.torproject.org/projects/torbrowser/design/#identifier-linkability\">le respect de la vie privée</a>, mais peut interférer avec la page de login de certains sites web. ++ ++auto-update-extensions-option = ++ .label = Mettre à jour les extensions automatiquement ++auto-update-extensions-description = Activer les mises à jour automatiques améliore votre sécurité, mais cela va ouvrir des connexions internet en arrière-plan. ++ ++spoof-referers-option = ++ .label = Usurper l'identité des Referers ++spoof-referers-description = <a href=\"https://fr.wikipedia.org/wiki/R%C3%A9f%C3%A9rent_(informatique)\">Les Referers</a> indiquent aux sites web quel lien vous y a amené. Cette fonctionnalité améliore grandement le respect de la vie privée, mais peut entraîner la perte de fonctionnalités sur certains sites. ++ ++detect-captive-portal-option = ++ .label = Détecter les portails captifs ++detect-captive-portal-description = <a href=\"https://fr.wikipedia.org/wiki/Portail_captif\">Les portails captifs</a> sont les sites qui contrôlent l'accès aux réseaux sans fils publics dans les hôtels, les aéroports, les bars, etc. Ce service de détection est utile si vous vous connectez à ce type de réseaux, mais cela entraîne l'ouverture automatique de connexions. ++ ++geolocation-option = ++ .label = Activer la géolocalisation ++geolocation-description = Elle est utilisée couramment pour les cartes, les sites de prévisions météo, et certaines boutiques en ligne. Il vaut mieux la désactivez à moins d'en avoir réellement besoin. ++ ++webgl-option = ++ .label = Activer WebGL ++webgl-description = Nécessaire afin de visualiser les graphisme en 3D, mais peut vous exposer à des menaces de sécurité. Activer WebGL seulement si vous l'utilisez réellement. +diff --git a/data/files-to-append/l10n/it/browser/browser/preferences/preferences.ftl b/data/files-to-append/l10n/it/browser/browser/preferences/preferences.ftl +new file mode 100644 +index 0000000..a1fe1b7 +--- /dev/null ++++ b/data/files-to-append/l10n/it/browser/browser/preferences/preferences.ftl +@@ -0,0 +1,36 @@ ++ ++## IceCat-specific privacy settings ++ ++icecat-privacy-group-header = Impostazioni sulla privacy di IceCat ++ ++disable-javascript-option = ++ .label = Disabilita JavaScript ++disable-javascript-description = Disabilitare Javascript migliora notevolmente la privacy, la sicurezza e la <a href=\"https://www.gnu.org/philosophy/javascript-trap.it.html\">libertà</a>, ma compromette la funzionalità molti siti. ++ ++disable-custom-fonts-option = ++ .label = Non caricare caratteri personalizzati ++disable-custom-fonts-description = I caratteri personalizzati possono essere utilizzati per il <a href=\"https://it.wikipedia.org/wiki/Device_fingerprint\">fingerprinting</a>. Disabilitarli migliora la privacy ma potrebbe far compromettere la visibilità di alcuni siti. ++ ++isolate-request-first-party-option = ++ .label = Isolare le richieste ai domini proprietari ++isolate-request-first-party-description = Questo <a href=\"https://www.torproject.org/projects/torbrowser/design/#identifier-linkability\">migliora la privacy</a>, ma potrebbe interferire con il login in alcuni siti. ++ ++auto-update-extensions-option = ++ .label = Aggiorna automaticamente le estensioni ++auto-update-extensions-description = Abilitare gli aggiornamenti automatici è positivo per la sicurezza, ma avvierebbe connessioni Internet in background. ++ ++spoof-referers-option = ++ .label = Spoof Referers ++spoof-referers-description = <a href=\"https://it.wikipedia.org/wiki/Referer\">I referer</a> dicono ai siti quale link ti ha portato lì. Questa funzione migliora notevolmente la privacy, ma potrebbe compromettere la funzionalità di alcuni siti. ++ ++detect-captive-portal-option = ++ .label = Rileva il captive portal ++detect-captive-portal-description = <a href=\"https://it.wikipedia.org/wiki/Captive_portal\">I captive portal</a> sono i siti che controllano l'accesso alle reti wireless pubbliche negli hotel, negli aeroporti, nei bar, ecc. Il servizio di rilevamento è utile se ci si connette a tali reti, ma avvierà automaticamente le connessioni. ++ ++geolocation-option = ++ .label = Abilita geolocalizzazione ++geolocation-description = Questo è comunemente usato per mappe, siti meteo e alcuni negozi online. È meglio tenerlo spento a meno che non se ne abbia veramente bisogno. ++ ++webgl-option = ++ .label = Abilita WebGL ++webgl-description = Necessario per visualizzare la grafica 3D, ma potrebbe esporre a minacce alla sicurezza. Abilitare solo in caso di necessità. +diff --git a/data/patches/icecat-preferences.patch b/data/patches/icecat-preferences.patch +new file mode 100644 +index 0000000..86fdd06 +--- /dev/null ++++ b/data/patches/icecat-preferences.patch +@@ -0,0 +1,155 @@ ++--- a/browser/components/preferences/in-content/privacy.xul.orig 2019-10-16 15:29:49.000000000 -0400 +++++ b/browser/components/preferences/in-content/privacy.xul 2019-10-30 23:54:53.591633131 -0400 ++@@ -594,6 +594,79 @@ ++ data-l10n-id="addressbar-suggestions-settings"/> ++ </groupbox> + -+ imply_option('MOZ_PLACES', True) -+-imply_option('MOZ_SERVICES_HEALTHREPORT', True) -++imply_option('MOZ_SERVICES_HEALTHREPORT', False) -+ imply_option('MOZ_SERVICES_SYNC', True) -+-imply_option('MOZ_DEDICATED_PROFILES', True) -++imply_option('MOZ_DEDICATED_PROFILES', False) -+ imply_option('MOZ_BLOCK_PROFILE_DOWNGRADE', True) +++<!-- IceCat-specific privacy group --> +++<groupbox id="iceCatPrivacyGroup" +++ data-category="panePrivacy" +++ hidden="true"> +++ <label><html:h2 data-l10n-id="icecat-privacy-group-header"/></label> +++ <vbox> +++ <checkbox id="disableJavaScript" data-l10n-id="disable-javascript-option" +++ preference="javascript.enabled" +++ onsyncfrompreference="return gPrivacyPane.readDisableJavaScriptOption();" +++ onsynctopreference="return gPrivacyPane.writeDisableJavaScriptOption();"/> +++ <vbox class="indent"> +++ <label data-l10n-id="disable-javascript-description"/> +++ </vbox> +++ </vbox> +++ <vbox> +++ <checkbox id="disableCustomFonts" data-l10n-id="disable-custom-fonts-option" +++ preference="browser.display.use_document_fonts" +++ onsyncfrompreference="return gPrivacyPane.readDisableCustomFontsOption();" +++ onsynctopreference="return gPrivacyPane.writeDisableCustomFontsOption();"/> +++ <vbox class="indent"> +++ <label data-l10n-id="disable-custom-fonts-description"/> +++ </vbox> +++ </vbox> +++ <vbox> +++ <checkbox id="isolateRequestFirstParty" data-l10n-id="isolate-request-first-party-option" +++ preference="privacy.firstparty.isolate"/> +++ <vbox class="indent"> +++ <label data-l10n-id="isolate-request-first-party-description"/> +++ </vbox> +++ </vbox> +++ <vbox> +++ <checkbox id="autoUpdateExtensions" data-l10n-id="auto-update-extensions-option" +++ preference="extensions.update.enabled"/> +++ <vbox class="indent"> +++ <label data-l10n-id="auto-update-extensions-description"/> +++ </vbox> +++ </vbox> +++ <vbox> +++ <checkbox id="spoofReferrers" data-l10n-id="spoof-referers-option" +++ preference="network.http.referer.spoofSource"/> +++ <vbox class="indent"> +++ <label data-l10n-id="spoof-referers-description"/> +++ </vbox> +++ </vbox> +++ <vbox> +++ <checkbox id="detectCaptivePortal" data-l10n-id="detect-captive-portal-option" +++ preference="captivedetect.canonicalURL" +++ onsyncfrompreference="return gPrivacyPane.readDetectCaptiveOption();" +++ onsynctopreference="return gPrivacyPane.writeDetectCaptiveOption();"/> +++ <vbox class="indent"> +++ <label data-l10n-id="detect-captive-portal-description"/> +++ </vbox> +++ </vbox> +++ <vbox> +++ <checkbox id="geolocation" data-l10n-id="geolocation-option" +++ preference="browser.search.geoip.url" +++ onsyncfrompreference="return gPrivacyPane.readGeolocationOption();" +++ onsynctopreference="return gPrivacyPane.writeGeolocationOption();"/> +++ <vbox class="indent"> +++ <label data-l10n-id="geolocation-description"/> +++ </vbox> +++ </vbox> +++ <vbox> +++ <checkbox id="webgl" data-l10n-id="webgl-option" +++ preference="webgl.disabled" +++ onsyncfrompreference="return gPrivacyPane.readWebGLOption();" +++ onsynctopreference="return gPrivacyPane.writeWebGLOption();"/> +++ <vbox class="indent"> +++ <label data-l10n-id="webgl-description"/> +++ </vbox> +++ </vbox> +++</groupbox> +++ ++ <hbox id="permissionsCategory" ++ class="subcategory" ++ hidden="true" ++--- a/browser/components/preferences/in-content/privacy.js.orig 2019-10-16 15:29:49.000000000 -0400 +++++ b/browser/components/preferences/in-content/privacy.js 2019-10-31 00:08:05.819561577 -0400 ++@@ -93,6 +93,16 @@ ++ { id: "browser.urlbar.suggest.history", type: "bool" }, ++ { id: "browser.urlbar.suggest.openpage", type: "bool" }, + -+ with only_when(target_is_linux & compile_environment): --- -2.23.0 - -From 62f50f15abc91483c6aa7a2ac7ebb972e6f9affd Mon Sep 17 00:00:00 2001 -From: Mark H Weaver <mhw@netris.org> -Date: Mon, 28 Oct 2019 13:05:28 -0400 -Subject: [PATCH 3/4] Disable MOZ_BLOCK_PROFILE_DOWNGRADE. - -It would be desirable to prevent downgrades from one major version of -IceCat to another. However, as MOZ_BLOCK_PROFILE_DOWNGRADE is -currently implemented, it prevents downgrades from one build of -IceCat-68.2 to an earlier build of IceCat-68.2. Until we can find a -satisfactory solution, we disable this functionality entirely. - -* data/patches/moz-configure-changes.patch: Set -MOZ_BLOCK_PROFILE_DOWNGRADE to 'False'. ---- - data/patches/moz-configure-changes.patch | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/data/patches/moz-configure-changes.patch b/data/patches/moz-configure-changes.patch -index aa6f1a5..53091a4 100644 ---- a/data/patches/moz-configure-changes.patch -+++ b/data/patches/moz-configure-changes.patch -@@ -1,6 +1,6 @@ - --- a/browser/moz.configure.orig 1980-01-01 18:59:51.000000000 -0500 --+++ b/browser/moz.configure 2019-10-28 01:36:13.132873871 -0400 --@@ -5,9 +5,9 @@ -++++ b/browser/moz.configure 2019-10-28 13:04:11.469562089 -0400 -+@@ -5,10 +5,10 @@ - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - - imply_option('MOZ_PLACES', True) -@@ -8,7 +8,9 @@ - +imply_option('MOZ_SERVICES_HEALTHREPORT', False) - imply_option('MOZ_SERVICES_SYNC', True) - -imply_option('MOZ_DEDICATED_PROFILES', True) -+-imply_option('MOZ_BLOCK_PROFILE_DOWNGRADE', True) - +imply_option('MOZ_DEDICATED_PROFILES', False) -- imply_option('MOZ_BLOCK_PROFILE_DOWNGRADE', True) -++imply_option('MOZ_BLOCK_PROFILE_DOWNGRADE', False) - - with only_when(target_is_linux & compile_environment): -+ option(env='MOZ_NO_PIE_COMPAT', --- -2.23.0 - -From 036f74092d223976054f9eafd8caa056f5975c54 Mon Sep 17 00:00:00 2001 -From: Mark H Weaver <mhw@netris.org> -Date: Mon, 28 Oct 2019 19:57:37 -0400 -Subject: [PATCH 4/4] Improve branding for version 68 ESR. - -* data/branding/icecat/locales/en-US/brand.dtd: Add brandProductName. -* data/branding/icecat/locales/en-US/brand.ftl: Add -brand-shorter-name, brand-full-name, brand-product-name, -vendor-short-name, and trademarkInfo. -* data/branding/icecat/locales/en-US/brand.properties: Add -brandProductName. -* makeicecat: Limit replacement of trademarkInfo.part1 of brand.dtd -files to only be done within l10n directory. Replace trademarkInfo of -brand.ftl files within l10n directory. ---- - data/branding/icecat/locales/en-US/brand.dtd | 1 + - data/branding/icecat/locales/en-US/brand.ftl | 5 +++++ - data/branding/icecat/locales/en-US/brand.properties | 1 + - makeicecat | 3 ++- - 4 files changed, 9 insertions(+), 1 deletion(-) - -diff --git a/data/branding/icecat/locales/en-US/brand.dtd b/data/branding/icecat/locales/en-US/brand.dtd -index 3788266..475ce7d 100644 ---- a/data/branding/icecat/locales/en-US/brand.dtd -+++ b/data/branding/icecat/locales/en-US/brand.dtd -@@ -5,5 +5,6 @@ - <!ENTITY brandShorterName "IceCat"> - <!ENTITY brandShortName "IceCat"> - <!ENTITY brandFullName "GNU IceCat"> -+<!ENTITY brandProductName "IceCat"> - <!ENTITY vendorShortName "GNU"> - <!ENTITY trademarkInfo.part1 "The IceCat logo is Copyright 2008-2015 Free Software Foundation, released under the terms of the GNU Lesser General Public License, version 3 or any later version."> -diff --git a/data/branding/icecat/locales/en-US/brand.ftl b/data/branding/icecat/locales/en-US/brand.ftl -index bd7fbe0..7c9fcc8 100644 ---- a/data/branding/icecat/locales/en-US/brand.ftl -+++ b/data/branding/icecat/locales/en-US/brand.ftl -@@ -2,4 +2,9 @@ - # License, v. 2.0. If a copy of the MPL was not distributed with this - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - -+-brand-shorter-name = IceCat - -brand-short-name = IceCat -+-brand-full-name = GNU IceCat -+-brand-product-name = IceCat -+-vendor-short-name = GNU -+trademarkInfo = The IceCat logo is Copyright 2008-2015 Free Software Foundation, released under the terms of the GNU Lesser General Public License, version 3 or any later version. -diff --git a/data/branding/icecat/locales/en-US/brand.properties b/data/branding/icecat/locales/en-US/brand.properties -index 85e2894..9b9cf97 100644 ---- a/data/branding/icecat/locales/en-US/brand.properties -+++ b/data/branding/icecat/locales/en-US/brand.properties -@@ -5,6 +5,7 @@ - brandShorterName=IceCat - brandShortName=IceCat - brandFullName=IceCat -+brandProductName=IceCat - vendorShortName=GNU - - syncBrandShortName=Sync +++ // IceCat-specific +++ { id: "javascript.enabled", type: "bool" }, +++ { id: "browser.display.use_document_fonts", type: "int" }, +++ { id: "privacy.firstparty.isolate", type: "bool" }, +++ { id: "extensions.update.enabled", type: "bool" }, +++ { id: "network.http.referer.spoofSource", type: "bool" }, +++ { id: "webgl.disabled", type: "bool" }, +++ { id: "captivedetect.canonicalURL", type: "string" }, +++ { id: "browser.search.geoip.url", type: "string" }, +++ ++ // History ++ { id: "places.history.enabled", type: "bool" }, ++ { id: "browser.formfill.enable", type: "bool" }, ++@@ -587,6 +597,53 @@ ++ SiteDataManager.updateSites(); ++ }, ++ +++ // ICECAT PREFERENCES +++ +++ readDisableJavaScriptOption() { +++ let pref = Preferences.get("javascript.enabled"); +++ return !pref.value; +++ }, +++ writeDisableJavaScriptOption() { +++ let checkbox = document.getElementById("disableJavaScript"); +++ return !checkbox.checked; +++ }, +++ +++ readDisableCustomFontsOption() { +++ let pref = Preferences.get("browser.display.use_document_fonts"); +++ return pref.value == 0; +++ }, +++ writeDisableCustomFontsOption() { +++ let checkbox = document.getElementById("disableCustomFonts"); +++ return checkbox.checked ? 0 : 1; +++ }, +++ +++ readDetectCaptiveOption() { +++ let pref = Preferences.get("captivedetect.canonicalURL"); +++ return pref.value !== ""; +++ }, +++ writeDetectCaptiveOption() { +++ let checkbox = document.getElementById("detectCaptivePortal"); +++ return checkbox.checked ? "http://detectportal.firefox.com/success.txt" : ""; +++ }, +++ +++ readGeolocationOption() { +++ let pref = Preferences.get("browser.search.geoip.url"); +++ return pref.value !== ""; +++ }, +++ writeGeolocationOption() { +++ let checkbox = document.getElementById("geolocation"); +++ return checkbox.checked ? "https://location.services.mozilla.com/v1/country?key=%MOZILLA_API_KEY%" : ""; +++ }, +++ +++ readWebGLOption() { +++ let pref = Preferences.get("webgl.disabled"); +++ return !pref.value; +++ }, +++ writeWebGLOption() { +++ let checkbox = document.getElementById("webgl"); +++ return !checkbox.checked; +++ }, +++ ++ // CONTENT BLOCKING ++ ++ /** diff --git a/makeicecat b/makeicecat -index 1bcf465..3ff2ead 100644 +index 4ff3e64..493d946 100755 --- a/makeicecat +++ b/makeicecat -@@ -226,7 +226,8 @@ cp $DATA/bookmarks.html.in browser/locales/generic/profile/bookmarks.html.in +@@ -87,6 +87,19 @@ for patch in $DATA/patches/*.patch; do + done + shopt -u nullglob - # Custom legal about pages ++for file_to_append in $(cd $DATA/files-to-append; find . -type f -print); do ++ echo Appending new data to the end of file: $file_to_append ++ cat $DATA/files-to-append/$file_to_append >> $file_to_append ++done ++ ++for dir in l10n/*; do ++ if [[ $dir != l10n/compare-locales ]]; then ++ if [[ ! -e $DATA/files-to-append/$dir/browser/browser/preferences/preferences.ftl ]]; then ++ cat $DATA/files-to-append/browser/locales/en-US/browser/preferences/preferences.ftl >> $dir/browser/browser/preferences/preferences.ftl ++ fi ++ fi ++done ++ + cp $DATA/Changelog.IceCat $DATA/README.IceCat . --find -wholename '*/brand.dtd' |xargs /bin/sed 's/trademarkInfo.part1.*/trademarkInfo.part1 "">/' -i -+find l10n -wholename '*/brand.dtd' |xargs /bin/sed 's/trademarkInfo.part1.*/trademarkInfo.part1 "">/' -i -+find l10n -wholename '*/brand.ftl' |xargs /bin/sed 's/^trademarkInfo = .*/trademarkInfo = The IceCat logo is Copyright 2008-2015 Free Software Foundation, released under the terms of the GNU Lesser General Public License, version 3 or any later version./' -i - - for STRING in rights.intro-point3-unbranded rights.intro-point4a-unbranded rights.intro-point4b-unbranded rights.intro-point4c-unbranded - do + ############################################################################### -- 2.23.0 diff --git a/gnu/packages/patches/icecat-makeicecat.patch b/gnu/packages/patches/icecat-makeicecat.patch index 90a79eebc9..66816070aa 100644 --- a/gnu/packages/patches/icecat-makeicecat.patch +++ b/gnu/packages/patches/icecat-makeicecat.patch @@ -98,7 +98,7 @@ index b04c731..06d1f3f 100644 shopt -s nullglob for patch in $DATA/patches/*.patch; do -@@ -598,6 +598,6 @@ sed 's/777/755/;' -i toolkit/crashreporter/google-breakpad/Makefile.in +@@ -611,6 +611,6 @@ sed 's/777/755/;' -i toolkit/crashreporter/google-breakpad/Makefile.in # Fix CVE-2012-3386 /bin/sed 's/chmod a+w/chmod u+w/' -i ./js/src/ctypes/libffi/Makefile.in ./toolkit/crashreporter/google-breakpad/Makefile.in ./toolkit/crashreporter/google-breakpad/src/third_party/glog/Makefile.in || true diff --git a/gnu/packages/patches/java-svg-salamander-Fix-non-det.patch b/gnu/packages/patches/java-svg-salamander-Fix-non-det.patch new file mode 100644 index 0000000000..418fa0867f --- /dev/null +++ b/gnu/packages/patches/java-svg-salamander-Fix-non-det.patch @@ -0,0 +1,86 @@ +From c812efa9fcbfb49a571cc73af83c8da5cb951bcf Mon Sep 17 00:00:00 2001 +From: Julien Lepiller <julien@lepiller.eu> +Date: Thu, 2 May 2019 19:05:33 +0200 +Subject: [PATCH] Fix non determinism and installation + +--- + svg-core/build.xml | 22 ---------------------- + svg-core/nbproject/build-impl.xml | 1 - + 2 files changed, 23 deletions(-) + +diff --git a/svg-core/build.xml b/svg-core/build.xml +index cc72eb7..0f9c3e6 100755 +--- a/svg-core/build.xml ++++ b/svg-core/build.xml +@@ -102,7 +102,6 @@ + <jar destfile="${maven-javadoc-jar}" update="false">
+ <manifest>
+ <attribute name="Version" value="${version}"/>
+- <attribute name="Date" value="${TODAY}"/>
+ </manifest>
+
+ <fileset dir="dist/javadoc">
+@@ -112,7 +111,6 @@ + <jar destfile="${maven-sources-jar}" update="false">
+ <manifest>
+ <attribute name="Version" value="${version}"/>
+- <attribute name="Date" value="${TODAY}"/>
+ </manifest>
+
+ <fileset dir="src/main/java">
+@@ -126,7 +124,6 @@ + <manifest>
+ <attribute name="Main-Class" value="com.kitfox.svg.app.SVGPlayer"/>
+ <attribute name="Version" value="${version}"/>
+- <attribute name="Date" value="${TODAY}"/>
+ </manifest>
+
+ <fileset dir="build/classes">
+@@ -203,7 +200,6 @@ + <manifest>
+ <attribute name="Main-Class" value="com.kitfox.svg.app.SVGPlayer"/>
+ <attribute name="Version" value="${version}"/>
+- <attribute name="Date" value="${TODAY}"/>
+ </manifest>
+
+ <fileset dir="build/classes">
+@@ -213,24 +209,6 @@ + </fileset>
+ </jar>
+
+- <delete file="${key.location}"/>
+- <genkey alias="${key.user}" storepass="${key.password}" keystore="${key.location}" validity="1000" verbose="true">
+- <dname>
+- <param name="CN" value="Mark McKay, mark@kitfox.com"/>
+- <param name="OU" value="kitfox.com"/>
+- <param name="O" value="kitfox"/>
+- <param name="L" value="Toronto"/>
+- <param name="S" value="Ontario"/>
+- <param name="C" value="CA"/>
+- </dname>
+- </genkey>
+-
+- <copy file="${dist.jar}" toFile="${project.www.jar}"/>
+- <signjar jar="${project.www.jar}"
+- alias="${key.user}"
+- storepass="${key.password}"
+- keystore="${key.location}"/>
+-
+ <delete file="${project.tiny.jar}"/>
+ <jar destfile="${project.tiny.jar}" update="true">
+ <manifest>
+diff --git a/svg-core/nbproject/build-impl.xml b/svg-core/nbproject/build-impl.xml +index b448d8a..37725ad 100755 +--- a/svg-core/nbproject/build-impl.xml ++++ b/svg-core/nbproject/build-impl.xml +@@ -1045,7 +1045,6 @@ is divided into following sections: + </manifest>
+ </target>
+ <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.mkdist" name="-do-jar-copylibs">
+- <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
+ <echo level="info">To run this application from the command line without Ant, try:</echo>
+ <property location="${dist.jar}" name="dist.jar.resolved"/>
+ <echo level="info">java -jar "${dist.jar.resolved}"</echo>
+-- +2.21.0 + diff --git a/gnu/packages/patches/libvirt-create-machine-cgroup.patch b/gnu/packages/patches/libvirt-create-machine-cgroup.patch new file mode 100644 index 0000000000..585ac237e1 --- /dev/null +++ b/gnu/packages/patches/libvirt-create-machine-cgroup.patch @@ -0,0 +1,48 @@ +From 9ca0b2955edea162b255b428e493cd8ffac52167 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Miguel=20=C3=81ngel=20Arruga=20Vivas?= + <rosen644835@gmail.com> +Date: Fri, 1 Nov 2019 17:29:00 +0100 +Subject: [PATCH] vircgroup: Ensure /machine group is associated with its + parent. + +Call first virCgroupNew on the parent group virCgroupNewPartition if +it is available on before the creation of the child group. This +ensures that the creation of a first level group on the unified +architecture, as the check at virCgroupV2ParseControllersFile as the +parent file is there. + +Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1760233 +--- + src/util/vircgroup.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c +index b46f20abfd..33c61f2d45 100644 +--- a/src/util/vircgroup.c ++++ b/src/util/vircgroup.c +@@ -855,9 +855,6 @@ virCgroupNewPartition(const char *path, + if (virCgroupSetPartitionSuffix(path, &newPath) < 0) + goto cleanup; + +- if (virCgroupNew(-1, newPath, NULL, controllers, group) < 0) +- goto cleanup; +- + if (STRNEQ(newPath, "/")) { + char *tmp; + parentPath = g_strdup(newPath); +@@ -868,7 +865,12 @@ virCgroupNewPartition(const char *path, + + if (virCgroupNew(-1, parentPath, NULL, controllers, &parent) < 0) + goto cleanup; ++ } + ++ if (virCgroupNew(-1, newPath, parent, controllers, group) < 0) ++ goto cleanup; ++ ++ if (parent) { + if (virCgroupMakeGroup(parent, *group, create, VIR_CGROUP_NONE) < 0) + goto cleanup; + } +-- +2.23.0 + diff --git a/gnu/packages/patches/openmpi-psm2-priority.patch b/gnu/packages/patches/openmpi-psm2-priority.patch new file mode 100644 index 0000000000..d9dd558010 --- /dev/null +++ b/gnu/packages/patches/openmpi-psm2-priority.patch @@ -0,0 +1,21 @@ +PSM2 is the only valid implementation for OmniPath (OPA). UCX also +supports OmniPath, but it does so via Verbs, thus getting much lower +performance (typically 3 GiB/s instead of 10 GiB/s). + +To work around that, give the mtl_psm2 component a higher priority +than the pml_ucx component. + +See <https://www.mail-archive.com/users@lists.open-mpi.org/msg33581.html>. + +--- openmpi-4.0.2/ompi/mca/mtl/psm2/mtl_psm2_component.c 2019-11-15 17:06:15.142076840 +0100 ++++ openmpi-4.0.2/ompi/mca/mtl/psm2/mtl_psm2_component.c 2019-11-15 17:06:22.242009379 +0100 +@@ -126,7 +126,7 @@ ompi_mtl_psm2_component_register(void) + setenv("PSM2_DEVICES", "self,shm", 0); + } + +- param_priority = 40; ++ param_priority = 55; + (void) mca_base_component_var_register (&mca_mtl_psm2_component.super.mtl_version, + "priority", "Priority of the PSM2 MTL component", + MCA_BASE_VAR_TYPE_INT, NULL, 0, 0, + diff --git a/gnu/packages/patches/patchelf-page-size.patch b/gnu/packages/patches/patchelf-page-size.patch deleted file mode 100644 index 1c14047512..0000000000 --- a/gnu/packages/patches/patchelf-page-size.patch +++ /dev/null @@ -1,70 +0,0 @@ -Improve the determination of pageSize in patchelf.cc. - -Patch by Mark H Weaver <mhw@netris.org>. - ---- patchelf/src/patchelf.cc.orig 1969-12-31 19:00:01.000000000 -0500 -+++ patchelf/src/patchelf.cc 2014-02-16 20:15:06.283203125 -0500 -@@ -21,11 +21,19 @@ - using namespace std; - - --#ifdef MIPSEL --/* The lemote fuloong 2f kernel defconfig sets a page size of 16KB */ --const unsigned int pageSize = 4096*4; --#else -+/* Note that some platforms support multiple page sizes. Therefore, -+ it is not enough to query the current page size. 'pageSize' must -+ be the maximum architectural page size for the platform, which is -+ typically defined in the corresponding ABI document. -+ -+ XXX FIXME: This won't work when we're cross-compiling. */ -+ -+#if defined __MIPSEL__ || defined __MIPSEB__ || defined __aarch64__ -+const unsigned int pageSize = 65536; -+#elif defined __x86_64__ || defined __i386__ || defined __arm__ - const unsigned int pageSize = 4096; -+#else -+# error maximum architectural page size unknown for this platform - #endif - - ---- patchelf/tests/no-rpath.sh.orig 2014-01-14 08:17:47.000000000 -0500 -+++ patchelf/tests/no-rpath.sh 2015-01-06 18:31:53.418172797 -0500 -@@ -1,23 +1,23 @@ - #! /bin/sh -e - SCRATCH=scratch/$(basename $0 .sh) - --rm -rf ${SCRATCH} --mkdir -p ${SCRATCH} -+if [ "$(uname -m)" = i686 -a "$(uname -s)" = Linux ]; then -+ rm -rf ${SCRATCH} -+ mkdir -p ${SCRATCH} - --cp ${srcdir}/no-rpath ${SCRATCH}/ -+ cp ${srcdir}/no-rpath ${SCRATCH}/ - --oldRPath=$(../src/patchelf --print-rpath ${SCRATCH}/no-rpath) --if test -n "$oldRPath"; then exit 1; fi --../src/patchelf \ -- --set-interpreter "$(../src/patchelf --print-interpreter ../src/patchelf)" \ -- --set-rpath /foo:/bar:/xxxxxxxxxxxxxxx ${SCRATCH}/no-rpath -+ oldRPath=$(../src/patchelf --print-rpath ${SCRATCH}/no-rpath) -+ if test -n "$oldRPath"; then exit 1; fi -+ ../src/patchelf \ -+ --set-interpreter "$(../src/patchelf --print-interpreter ../src/patchelf)" \ -+ --set-rpath /foo:/bar:/xxxxxxxxxxxxxxx ${SCRATCH}/no-rpath - --newRPath=$(../src/patchelf --print-rpath ${SCRATCH}/no-rpath) --if ! echo "$newRPath" | grep -q '/foo:/bar'; then -- echo "incomplete RPATH" -- exit 1 --fi -+ newRPath=$(../src/patchelf --print-rpath ${SCRATCH}/no-rpath) -+ if ! echo "$newRPath" | grep -q '/foo:/bar'; then -+ echo "incomplete RPATH" -+ exit 1 -+ fi - --if [ "$(uname -m)" = i686 -a "$(uname -s)" = Linux ]; then - cd ${SCRATCH} && ./no-rpath - fi diff --git a/gnu/packages/patches/patchelf-rework-for-arm.patch b/gnu/packages/patches/patchelf-rework-for-arm.patch deleted file mode 100644 index 6f4eb8f72b..0000000000 --- a/gnu/packages/patches/patchelf-rework-for-arm.patch +++ /dev/null @@ -1,473 +0,0 @@ -Rework the growing algorithm in patchelf to support ARM systems. -See <https://github.com/NixOS/patchelf/issues/8>. -This patch copied from: -<https://github.com/sriemer/patchelf/commit/0a96239cea6b97b9a0fff80da576e58ca2dfb2a2> - -From 0a96239cea6b97b9a0fff80da576e58ca2dfb2a2 Mon Sep 17 00:00:00 2001 -From: Sebastian Parschauer <s.parschauer@gmx.de> -Date: Sat, 28 Jun 2014 01:24:57 +0200 -Subject: [PATCH] Rework the growing algorithm - -On ARM systems there is no space in virtual memory for another LOAD -area in front of the code LOAD area. So insert data to its end -instead. At this location there should be enough space in virtual -memory due to alignment. We can extend it until the end of the -alignment but the file shift may be greater as it must be aligned -to the page size. Do the same for the data LOAD area. ---- - src/patchelf.cc | 357 ++++++++++++++++++++++---------------------------------- - 1 file changed, 142 insertions(+), 215 deletions(-) - -diff --git a/src/patchelf.cc b/src/patchelf.cc -index dcbfd38..4fce9e6 100644 ---- a/src/patchelf.cc -+++ b/src/patchelf.cc -@@ -116,7 +116,11 @@ private: - - void sortShdrs(); - -- void shiftFile(unsigned int extraPages, Elf_Addr startPage); -+ void shiftFileSingle(size_t fileShift, Elf_Off insertOff); -+ -+ void shiftFile(size_t neededCode, size_t neededData, -+ Elf_Off codeOff[], Elf_Off dataOff[], -+ Elf_Addr *codePage, Elf_Addr *dataPage); - - string getSectionName(const Elf_Shdr & shdr); - -@@ -130,13 +134,11 @@ private: - unsigned int size); - - void writeReplacedSections(Elf_Off & curOff, -- Elf_Addr startAddr, Elf_Off startOffset); -+ Elf_Addr startAddr, Elf_Off startOffset, bool isData); - - void rewriteHeaders(Elf_Addr phdrAddress); - -- void rewriteSectionsLibrary(); -- -- void rewriteSectionsExecutable(); -+ void rewriteSectionsBinary(); - - public: - -@@ -391,46 +393,119 @@ static unsigned int roundUp(unsigned int n, unsigned int m) - - - template<ElfFileParams> --void ElfFile<ElfFileParamNames>::shiftFile(unsigned int extraPages, Elf_Addr startPage) -+void ElfFile<ElfFileParamNames>::shiftFileSingle(size_t fileShift, -+ Elf_Off insertOff) - { -- /* Move the entire contents of the file `extraPages' pages -- further. */ - unsigned int oldSize = fileSize; -- unsigned int shift = extraPages * pageSize; -- growFile(fileSize + extraPages * pageSize); -- memmove(contents + extraPages * pageSize, contents, oldSize); -- memset(contents + sizeof(Elf_Ehdr), 0, shift - sizeof(Elf_Ehdr)); -+ -+ /* Grow at the end */ -+ growFile(fileSize + fileShift); -+ -+ /* move the data from the insertion point -+ to the end and zero inserted space */ -+ memmove(contents + insertOff + fileShift, -+ contents + insertOff, oldSize - insertOff); -+ memset(contents + insertOff, 0, fileShift); - - /* Adjust the ELF header. */ - wri(hdr->e_phoff, sizeof(Elf_Ehdr)); -- wri(hdr->e_shoff, rdi(hdr->e_shoff) + shift); -+ if (rdi(hdr->e_shoff) >= insertOff) -+ wri(hdr->e_shoff, rdi(hdr->e_shoff) + fileShift); - - /* Update the offsets in the section headers. */ -- for (int i = 1; i < rdi(hdr->e_shnum); ++i) -- wri(shdrs[i].sh_offset, rdi(shdrs[i].sh_offset) + shift); -+ for (int i = 1; i < rdi(hdr->e_shnum); ++i) { -+ if (rdi(shdrs[i].sh_offset) >= insertOff) -+ wri(shdrs[i].sh_offset, rdi(shdrs[i].sh_offset) + fileShift); -+ } - - /* Update the offsets in the program headers. */ - for (int i = 0; i < rdi(hdr->e_phnum); ++i) { -- wri(phdrs[i].p_offset, rdi(phdrs[i].p_offset) + shift); -- if (rdi(phdrs[i].p_align) != 0 && -- (rdi(phdrs[i].p_vaddr) - rdi(phdrs[i].p_offset)) % rdi(phdrs[i].p_align) != 0) { -- debug("changing alignment of program header %d from %d to %d\n", i, -- rdi(phdrs[i].p_align), pageSize); -- wri(phdrs[i].p_align, pageSize); -+ if (rdi(phdrs[i].p_offset) >= insertOff) -+ wri(phdrs[i].p_offset, rdi(phdrs[i].p_offset) + fileShift); -+ /* Check for ELF load command alignment issue the same -+ way as glibc/elf/dl-load.c does. This gives us the -+ chance to run an interpreter explicitly. */ -+ if (rdi(phdrs[i].p_type) == PT_LOAD && ((rdi(phdrs[i].p_vaddr) - -+ rdi(phdrs[i].p_offset)) & (rdi(phdrs[i].p_align) - 1)) != 0) { -+ debug("changing alignment of program header %d from %d to %d\n", -+ i, rdi(phdrs[i].p_align), pageSize); -+ wri(phdrs[i].p_align, pageSize); - } - } -+} -+ -+template<ElfFileParams> -+void ElfFile<ElfFileParamNames>::shiftFile(size_t neededCode, -+ size_t neededData, Elf_Off codeOff[], Elf_Off dataOff[], -+ Elf_Addr *codePage, Elf_Addr *dataPage) -+{ -+ /* Move some contents of the file further. The binary has one LOAD area -+ * for code and one for data. There is virtual memory space between -+ * these which we can use due to alignment. -+ */ -+ unsigned int memShift = neededCode; -+ unsigned int fileShift = roundUp(neededCode, pageSize); -+ unsigned int maxMemShift = 0; -+ -+ if (neededCode > 0) { -+ /* find the LOAD program header for code and extend it */ -+ for (int i = 0; i < rdi(hdr->e_phnum); ++i) { -+ if (rdi(phdrs[i].p_type) == PT_LOAD && -+ rdi(phdrs[i].p_flags) & PF_X) { -+ codeOff[1] = rdi(phdrs[i].p_filesz); -+ codeOff[0] = codeOff[1] + rdi(phdrs[i].p_offset); -+ maxMemShift = rdi(phdrs[i].p_memsz) % rdi(phdrs[i].p_align); -+ if (maxMemShift == 0) -+ continue; -+ maxMemShift = rdi(phdrs[i].p_align) - maxMemShift; -+ if (maxMemShift == 0 || memShift > maxMemShift) -+ continue; -+ *codePage = rdi(phdrs[i].p_vaddr); -+ wri(phdrs[i].p_filesz, rdi(phdrs[i].p_filesz) + memShift); -+ wri(phdrs[i].p_memsz, rdi(phdrs[i].p_memsz) + memShift); -+ break; -+ } -+ } -+ debug("codeOff: %#lx, memShift: %d, maxMemShift: %d, fileShift: %d\n", -+ codeOff[1], memShift, maxMemShift, fileShift); -+ if (codeOff[1] == 0 || maxMemShift == 0) -+ goto out; -+ -+ shiftFileSingle(fileShift, codeOff[0]); -+ } -+ -+ /* +++ Do the same for the data LOAD area +++ */ -+ memShift = neededData; -+ fileShift = roundUp(neededData, pageSize); -+ maxMemShift = 0; -+ if (neededData > 0) { -+ /* find the LOAD program header for data and extend it */ -+ for (int i = 0; i < rdi(hdr->e_phnum); ++i) { -+ if (rdi(phdrs[i].p_type) == PT_LOAD && -+ rdi(phdrs[i].p_flags) & PF_W) { -+ dataOff[1] = rdi(phdrs[i].p_filesz); -+ dataOff[0] = dataOff[1] + rdi(phdrs[i].p_offset); -+ maxMemShift = rdi(phdrs[i].p_memsz) % rdi(phdrs[i].p_align); -+ if (maxMemShift == 0) -+ continue; -+ maxMemShift = rdi(phdrs[i].p_align) - maxMemShift; -+ if (maxMemShift == 0 || memShift > maxMemShift) -+ continue; -+ *dataPage = rdi(phdrs[i].p_vaddr); -+ wri(phdrs[i].p_filesz, rdi(phdrs[i].p_filesz) + memShift); -+ wri(phdrs[i].p_memsz, rdi(phdrs[i].p_memsz) + memShift); -+ break; -+ } -+ } -+ debug("dataOff: %#lx, memShift: %d, maxMemShift: %d, fileShift: %d\n", -+ dataOff[1], memShift, maxMemShift, fileShift); -+ if (dataOff[1] == 0 || maxMemShift == 0) -+ goto out; - -- /* Add a segment that maps the new program/section headers and -- PT_INTERP segment into memory. Otherwise glibc will choke. */ -- phdrs.resize(rdi(hdr->e_phnum) + 1); -- wri(hdr->e_phnum, rdi(hdr->e_phnum) + 1); -- Elf_Phdr & phdr = phdrs[rdi(hdr->e_phnum) - 1]; -- wri(phdr.p_type, PT_LOAD); -- wri(phdr.p_offset, 0); -- wri(phdr.p_vaddr, wri(phdr.p_paddr, startPage)); -- wri(phdr.p_filesz, wri(phdr.p_memsz, shift)); -- wri(phdr.p_flags, PF_R | PF_W); -- wri(phdr.p_align, pageSize); -+ shiftFileSingle(fileShift, dataOff[0]); -+ } -+out: -+ return; - } - - -@@ -491,7 +566,7 @@ string & ElfFile<ElfFileParamNames>::replaceSection(const SectionName & sectionN - - template<ElfFileParams> - void ElfFile<ElfFileParamNames>::writeReplacedSections(Elf_Off & curOff, -- Elf_Addr startAddr, Elf_Off startOffset) -+ Elf_Addr startAddr, Elf_Off startOffset, bool isData = false) - { - /* Overwrite the old section contents with 'X's. Do this - *before* writing the new section contents (below) to prevent -@@ -501,6 +576,9 @@ void ElfFile<ElfFileParamNames>::writeReplacedSections(Elf_Off & curOff, - { - string sectionName = i->first; - Elf_Shdr & shdr = findSection(sectionName); -+ if ((!isData && rdi(shdr.sh_flags) & SHF_WRITE) || -+ (isData && ~(rdi(shdr.sh_flags)) & SHF_WRITE)) -+ continue; - memset(contents + rdi(shdr.sh_offset), 'X', rdi(shdr.sh_size)); - } - -@@ -509,6 +587,9 @@ void ElfFile<ElfFileParamNames>::writeReplacedSections(Elf_Off & curOff, - { - string sectionName = i->first; - Elf_Shdr & shdr = findSection(sectionName); -+ if ((!isData && rdi(shdr.sh_flags) & SHF_WRITE) || -+ (isData && ~(rdi(shdr.sh_flags)) & SHF_WRITE)) -+ continue; - debug("rewriting section `%s' from offset 0x%x (size %d) to offset 0x%x (size %d)\n", - sectionName.c_str(), rdi(shdr.sh_offset), rdi(shdr.sh_size), curOff, i->second.size()); - -@@ -546,201 +627,47 @@ void ElfFile<ElfFileParamNames>::writeReplacedSections(Elf_Off & curOff, - curOff += roundUp(i->second.size(), sectionAlignment); - } - -- replacedSections.clear(); -+ if (isData) -+ replacedSections.clear(); - } - - - template<ElfFileParams> --void ElfFile<ElfFileParamNames>::rewriteSectionsLibrary() -+void ElfFile<ElfFileParamNames>::rewriteSectionsBinary() - { -- /* For dynamic libraries, we just place the replacement sections -- at the end of the file. They're mapped into memory by a -- PT_LOAD segment located directly after the last virtual address -- page of other segments. */ -- Elf_Addr startPage = 0; -- for (unsigned int i = 0; i < phdrs.size(); ++i) { -- Elf_Addr thisPage = roundUp(rdi(phdrs[i].p_vaddr) + rdi(phdrs[i].p_memsz), pageSize); -- if (thisPage > startPage) startPage = thisPage; -- } -- -- debug("last page is 0x%llx\n", (unsigned long long) startPage); -+ Elf_Off codeOff[2] = {0}, dataOff[2] = {0}; -+ Elf_Addr codePage = 0, dataPage = 0; -+ size_t neededCode = 0, neededData = 0, oldCode = 0, oldData = 0; -+ Elf_Shdr shdr = findSection(".text"); -+ Elf_Addr firstPage = rdi(shdr.sh_addr) - rdi(shdr.sh_offset); - -+ debug("first page is 0x%llx\n", (unsigned long long) firstPage); - -- /* Compute the total space needed for the replaced sections and -- the program headers. */ -- off_t neededSpace = (phdrs.size() + 1) * sizeof(Elf_Phdr); -+ /* Compute the total space needed for the replaced sections */ - for (ReplacedSections::iterator i = replacedSections.begin(); -- i != replacedSections.end(); ++i) -- neededSpace += roundUp(i->second.size(), sectionAlignment); -- debug("needed space is %d\n", neededSpace); -- -- -- size_t startOffset = roundUp(fileSize, pageSize); -- -- growFile(startOffset + neededSpace); -- -- -- /* Even though this file is of type ET_DYN, it could actually be -- an executable. For instance, Gold produces executables marked -- ET_DYN. In that case we can still hit the kernel bug that -- necessitated rewriteSectionsExecutable(). However, such -- executables also tend to start at virtual address 0, so -- rewriteSectionsExecutable() won't work because it doesn't have -- any virtual address space to grow downwards into. As a -- workaround, make sure that the virtual address of our new -- PT_LOAD segment relative to the first PT_LOAD segment is equal -- to its offset; otherwise we hit the kernel bug. This may -- require creating a hole in the executable. The bigger the size -- of the uninitialised data segment, the bigger the hole. */ -- if (isExecutable) { -- if (startOffset >= startPage) { -- debug("shifting new PT_LOAD segment by %d bytes to work around a Linux kernel bug\n", startOffset - startPage); -- } else { -- size_t hole = startPage - startOffset; -- /* Print a warning, because the hole could be very big. */ -- fprintf(stderr, "warning: working around a Linux kernel bug by creating a hole of %zu bytes in ‘%s’\n", hole, fileName.c_str()); -- assert(hole % pageSize == 0); -- /* !!! We could create an actual hole in the file here, -- but it's probably not worth the effort. */ -- growFile(fileSize + hole); -- startOffset += hole; -- } -- startPage = startOffset; -- } -- -- -- /* Add a segment that maps the replaced sections and program -- headers into memory. */ -- phdrs.resize(rdi(hdr->e_phnum) + 1); -- wri(hdr->e_phnum, rdi(hdr->e_phnum) + 1); -- Elf_Phdr & phdr = phdrs[rdi(hdr->e_phnum) - 1]; -- wri(phdr.p_type, PT_LOAD); -- wri(phdr.p_offset, startOffset); -- wri(phdr.p_vaddr, wri(phdr.p_paddr, startPage)); -- wri(phdr.p_filesz, wri(phdr.p_memsz, neededSpace)); -- wri(phdr.p_flags, PF_R | PF_W); -- wri(phdr.p_align, pageSize); -- -- -- /* Write out the replaced sections. */ -- Elf_Off curOff = startOffset + phdrs.size() * sizeof(Elf_Phdr); -- writeReplacedSections(curOff, startPage, startOffset); -- assert((off_t) curOff == startOffset + neededSpace); -- -- -- /* Move the program header to the start of the new area. */ -- wri(hdr->e_phoff, startOffset); -- -- rewriteHeaders(startPage); --} -- -- --template<ElfFileParams> --void ElfFile<ElfFileParamNames>::rewriteSectionsExecutable() --{ -- /* Sort the sections by offset, otherwise we won't correctly find -- all the sections before the last replaced section. */ -- sortShdrs(); -- -- -- /* What is the index of the last replaced section? */ -- unsigned int lastReplaced = 0; -- for (unsigned int i = 1; i < rdi(hdr->e_shnum); ++i) { -- string sectionName = getSectionName(shdrs[i]); -- if (replacedSections.find(sectionName) != replacedSections.end()) { -- debug("using replaced section `%s'\n", sectionName.c_str()); -- lastReplaced = i; -- } -- } -- -- assert(lastReplaced != 0); -- -- debug("last replaced is %d\n", lastReplaced); -- -- /* Try to replace all sections before that, as far as possible. -- Stop when we reach an irreplacable section (such as one of type -- SHT_PROGBITS). These cannot be moved in virtual address space -- since that would invalidate absolute references to them. */ -- assert(lastReplaced + 1 < shdrs.size()); /* !!! I'm lazy. */ -- size_t startOffset = rdi(shdrs[lastReplaced + 1].sh_offset); -- Elf_Addr startAddr = rdi(shdrs[lastReplaced + 1].sh_addr); -- string prevSection; -- for (unsigned int i = 1; i <= lastReplaced; ++i) { -- Elf_Shdr & shdr(shdrs[i]); -- string sectionName = getSectionName(shdr); -- debug("looking at section `%s'\n", sectionName.c_str()); -- /* !!! Why do we stop after a .dynstr section? I can't -- remember! */ -- if ((rdi(shdr.sh_type) == SHT_PROGBITS && sectionName != ".interp") -- || prevSection == ".dynstr") -- { -- startOffset = rdi(shdr.sh_offset); -- startAddr = rdi(shdr.sh_addr); -- lastReplaced = i - 1; -- break; -+ i != replacedSections.end(); ++i) { -+ shdr = findSection(i->first); -+ if (rdi(shdr.sh_flags) & SHF_WRITE) { -+ oldData += rdi(shdr.sh_size); -+ neededData += roundUp(i->second.size(), sectionAlignment); - } else { -- if (replacedSections.find(sectionName) == replacedSections.end()) { -- debug("replacing section `%s' which is in the way\n", sectionName.c_str()); -- replaceSection(sectionName, rdi(shdr.sh_size)); -- } -+ oldCode += rdi(shdr.sh_size); -+ neededCode += roundUp(i->second.size(), sectionAlignment); - } -- prevSection = sectionName; - } - -- debug("first reserved offset/addr is 0x%x/0x%llx\n", -- startOffset, (unsigned long long) startAddr); -- -- assert(startAddr % pageSize == startOffset % pageSize); -- Elf_Addr firstPage = startAddr - startOffset; -- debug("first page is 0x%llx\n", (unsigned long long) firstPage); -- -- /* Right now we assume that the section headers are somewhere near -- the end, which appears to be the case most of the time. -- Therefore they're not accidentally overwritten by the replaced -- sections. !!! Fix this. */ -- assert((off_t) rdi(hdr->e_shoff) >= startOffset); -- -- -- /* Compute the total space needed for the replaced sections, the -- ELF header, and the program headers. */ -- size_t neededSpace = sizeof(Elf_Ehdr) + phdrs.size() * sizeof(Elf_Phdr); -- for (ReplacedSections::iterator i = replacedSections.begin(); -- i != replacedSections.end(); ++i) -- neededSpace += roundUp(i->second.size(), sectionAlignment); -- -- debug("needed space is %d\n", neededSpace); -- -- /* If we need more space at the start of the file, then grow the -- file by the minimum number of pages and adjust internal -- offsets. */ -- if (neededSpace > startOffset) { -- -- /* We also need an additional program header, so adjust for that. */ -- neededSpace += sizeof(Elf_Phdr); -- debug("needed space is %d\n", neededSpace); -- -- unsigned int neededPages = roundUp(neededSpace - startOffset, pageSize) / pageSize; -- debug("needed pages is %d\n", neededPages); -- if (neededPages * pageSize > firstPage) -- error("virtual address space underrun!"); -- -- firstPage -= neededPages * pageSize; -- startOffset += neededPages * pageSize; -- -- shiftFile(neededPages, firstPage); -- } -- -- -- /* Clear out the free space. */ -- Elf_Off curOff = sizeof(Elf_Ehdr) + phdrs.size() * sizeof(Elf_Phdr); -- debug("clearing first %d bytes\n", startOffset - curOff); -- memset(contents + curOff, 0, startOffset - curOff); -+ debug("needed space is C: %d, D: %d\n", neededCode, neededData); - -+ /* If we need more space within the file, then grow the -+ file and adjust internal offsets. */ -+ shiftFile(neededCode, neededData, codeOff, dataOff, &codePage, -+ &dataPage); -+ assert(codeOff[0] > 0); - - /* Write out the replaced sections. */ -- writeReplacedSections(curOff, firstPage, 0); -- assert((off_t) curOff == neededSpace); -- -+ debug("codePage: %#lx, dataPage: %#lx\n", codePage, dataPage); -+ writeReplacedSections(codeOff[0], codePage + codeOff[1], codeOff[0]); -+ writeReplacedSections(dataOff[0], dataPage + dataOff[1], dataOff[0], true); - - rewriteHeaders(firstPage + rdi(hdr->e_phoff)); - } -@@ -758,10 +685,10 @@ void ElfFile<ElfFileParamNames>::rewriteSections() - - if (rdi(hdr->e_type) == ET_DYN) { - debug("this is a dynamic library\n"); -- rewriteSectionsLibrary(); -+ rewriteSectionsBinary(); - } else if (rdi(hdr->e_type) == ET_EXEC) { - debug("this is an executable\n"); -- rewriteSectionsExecutable(); -+ rewriteSectionsBinary(); - } else error("unknown ELF type"); - } - --- -2.1.2 - diff --git a/gnu/packages/patches/udiskie-no-appindicator.patch b/gnu/packages/patches/udiskie-no-appindicator.patch new file mode 100644 index 0000000000..c19099cdaa --- /dev/null +++ b/gnu/packages/patches/udiskie-no-appindicator.patch @@ -0,0 +1,155 @@ +Remove the support for Unity's appindicator. + +diff -Naur udiskie-1.7.7/completions/_udiskie udiskie-1.7.7a/completions/_udiskie +--- udiskie-1.7.7/completions/_udiskie 2019-02-17 18:28:58.000000000 +0100 ++++ udiskie-1.7.7a/completions/_udiskie 2019-10-29 14:21:04.556193639 +0100 +@@ -21,8 +21,6 @@ + '(-a)'{-A,--no-automount}"[disable automounting]" + '(-N)'{-n,--notify}"[show popup notifications]" + '(-n)'{-N,--no-notify}"[disable notifications]" +- '(--no-appindicator)'--appindicator"[use appindicator for status icon]" +- '(--appindicator)'--no-appindicator"[don't use appindicator]" + '(-T -s)'{-t,--tray}"[show tray icon]" + '(-T -t)'{-s,--smart-tray}"[auto hide tray icon]" + '(-t -s)'{-T,--no-tray}"[disable tray icon]" +diff -Naur udiskie-1.7.7/doc/udiskie.8.txt udiskie-1.7.7a/doc/udiskie.8.txt +--- udiskie-1.7.7/doc/udiskie.8.txt 2019-02-17 18:28:58.000000000 +0100 ++++ udiskie-1.7.7a/doc/udiskie.8.txt 2019-10-29 14:21:52.304570344 +0100 +@@ -95,12 +95,6 @@ + *-F, \--no-file-manager*:: + Disable browsing. + +-*-appindicator*:: +- Use AppIndicator3 for the status icon. Use this on Ubuntu/Unity if no icon is shown. +- +-*--no-appindicator*:: +- Use Gtk.StatusIcon for the status icon (default). +- + *--password-cache MINUTES*:: + Cache passwords for LUKS partitions and set the timeout. + +diff -Naur udiskie-1.7.7/udiskie/appindicator.py udiskie-1.7.7a/udiskie/appindicator.py +--- udiskie-1.7.7/udiskie/appindicator.py 2019-02-17 18:28:58.000000000 +0100 ++++ udiskie-1.7.7a/udiskie/appindicator.py 1970-01-01 01:00:00.000000000 +0100 +@@ -1,61 +0,0 @@ +-""" +-Status icon using AppIndicator3. +-""" +- +-from gi.repository import Gtk +-from gi.repository import AppIndicator3 +- +-from udiskie.async_ import Async +- +- +-class AppIndicatorIcon(object): +- +- """ +- Show status icon using AppIndicator as backend. Replaces +- `udiskie.tray.StatusIcon` on ubuntu/unity. +- """ +- +- def __init__(self, menumaker, _icons): +- self._maker = menumaker +- self._menu = Gtk.Menu() +- self._indicator = AppIndicator3.Indicator.new( +- 'udiskie', +- _icons.get_icon_name('media'), +- AppIndicator3.IndicatorCategory.HARDWARE) +- self._indicator.set_status(AppIndicator3.IndicatorStatus.PASSIVE) +- self._indicator.set_menu(self._menu) +- # Get notified before menu is shown, see: +- # https://bugs.launchpad.net/screenlets/+bug/522152/comments/15 +- dbusmenuserver = self._indicator.get_property('dbus-menu-server') +- self._dbusmenuitem = dbusmenuserver.get_property('root-node') +- self._conn = self._dbusmenuitem.connect('about-to-show', self._on_show) +- self.task = Async() +- menumaker._quit_action = self.destroy +- # Populate menu initially, so libdbusmenu does not ignore the +- # 'about-to-show': +- self._maker(self._menu) +- +- def destroy(self): +- self.show(False) +- self._dbusmenuitem.disconnect(self._conn) +- self.task.callback() +- +- @property +- def visible(self): +- status = self._indicator.get_status() +- return status == AppIndicator3.IndicatorStatus.ACTIVE +- +- def show(self, show=True): +- if show == self.visible: +- return +- status = (AppIndicator3.IndicatorStatus.ACTIVE if show else +- AppIndicator3.IndicatorStatus.PASSIVE) +- self._indicator.set_status(status) +- +- def _on_show(self, menu): +- # clear menu: +- for item in self._menu.get_children(): +- self._menu.remove(item) +- # repopulate: +- self._maker(self._menu) +- self._menu.show_all() +diff -Naur udiskie-1.7.7/udiskie/cli.py udiskie-1.7.7a/udiskie/cli.py +--- udiskie-1.7.7/udiskie/cli.py 2019-02-17 18:28:58.000000000 +0100 ++++ udiskie-1.7.7a/udiskie/cli.py 2019-10-29 14:18:22.678919186 +0100 +@@ -376,9 +376,6 @@ + -T, --no-tray Disable tray icon + -m MENU, --menu MENU Tray menu [flat/nested] + +- --appindicator Use appindicator for status icon +- --no-appindicator Don't use appindicator +- + --password-cache MINUTES Set password cache timeout + --no-password-cache Disable password cache + +@@ -400,7 +397,6 @@ + 'notify': True, + 'tray': False, + 'menu': 'flat', +- 'appindicator': False, + 'file_manager': 'xdg-open', + 'password_prompt': 'builtin:gui', + 'password_cache': False, +@@ -415,7 +411,6 @@ + '--no-tray': False, + '--smart-tray': 'auto'}), + 'menu': Value('--menu'), +- 'appindicator': Switch('appindicator'), + 'file_manager': OptionalValue('--file-manager'), + 'password_prompt': OptionalValue('--password-prompt'), + 'password_cache': OptionalValue('--password-cache'), +@@ -541,11 +536,7 @@ + raise ValueError("Invalid menu: %s" % (options['menu'],)) + + menu_maker = udiskie.tray.UdiskieMenu(self, icons, actions, flat) +- if options['appindicator']: +- import udiskie.appindicator +- TrayIcon = udiskie.appindicator.AppIndicatorIcon +- else: +- TrayIcon = udiskie.tray.TrayIcon ++ TrayIcon = udiskie.tray.TrayIcon + trayicon = TrayIcon(menu_maker, icons) + return udiskie.tray.UdiskieStatusIcon(trayicon, menu_maker, smart) + +diff -Naur udiskie-1.7.7/udiskie.egg-info/SOURCES.txt udiskie-1.7.7a/udiskie.egg-info/SOURCES.txt +--- udiskie-1.7.7/udiskie.egg-info/SOURCES.txt 2019-02-17 19:42:25.000000000 +0100 ++++ udiskie-1.7.7a/udiskie.egg-info/SOURCES.txt 2019-10-29 14:40:09.333315287 +0100 +@@ -24,7 +24,6 @@ + test/test_cache.py + test/test_match.py + udiskie/__init__.py +-udiskie/appindicator.py + udiskie/async_.py + udiskie/automount.py + udiskie/cache.py +@@ -46,4 +45,4 @@ + udiskie.egg-info/dependency_links.txt + udiskie.egg-info/entry_points.txt + udiskie.egg-info/requires.txt +-udiskie.egg-info/top_level.txt +\ Pas de fin de ligne à la fin du fichier ++udiskie.egg-info/top_level.txt diff --git a/gnu/packages/patches/vlc-fix-test_libvlc_slaves.patch b/gnu/packages/patches/vlc-fix-test_libvlc_slaves.patch new file mode 100644 index 0000000000..9bc6d35f18 --- /dev/null +++ b/gnu/packages/patches/vlc-fix-test_libvlc_slaves.patch @@ -0,0 +1,35 @@ +From 4186c94104ee528abd6860611b49515f3e6ec644 Mon Sep 17 00:00:00 2001 +From: Thomas Guillem <thomas@gllm.fr> +Date: Fri, 18 Oct 2019 10:34:07 +0200 +Subject: [PATCH] input/item: sort before attaching slaves + +The order of readdir() is completely filesystem dependent. + +Slaves should be attached using the same order across multiple OSses/access +modules. + +This fixes the test_libvlc_slaves on some system when the entry order from +readdir() is different. + +This patch need to be backported to VLC 3.0. +--- + src/input/item.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/input/item.c b/src/input/item.c +index e8db39ca28..fbd74cc95f 100644 +--- a/src/input/item.c ++++ b/src/input/item.c +@@ -1809,8 +1809,8 @@ void vlc_readdir_helper_finish(struct vlc_readdir_helper *p_rdh, bool b_success) + { + if (b_success) + { +- rdh_attach_slaves(p_rdh, p_rdh->p_node); + rdh_sort(p_rdh->p_node); ++ rdh_attach_slaves(p_rdh, p_rdh->p_node); + } + free(p_rdh->psz_ignored_exts); + +-- +2.20.1 + diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 03b18a6f50..a7ef21ea4b 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -755,13 +755,13 @@ using a stylus.") (define-public python-reportlab (package (name "python-reportlab") - (version "3.5.13") + (version "3.5.32") (source (origin (method url-fetch) (uri (pypi-uri "reportlab" version)) (sha256 (base32 - "1wxgcj46rm83qz97i8ygvd59bks60kr6vvnz12ygw640z58ff5k1")))) + "0lf8hil9nbm74zl27l8rydxbhwnpr0pbghibsqrc9sglds9l9vw3")))) (build-system python-build-system) (arguments '(;; FIXME: There is one test failure, but it does not cause the diff --git a/gnu/packages/perl-compression.scm b/gnu/packages/perl-compression.scm index d09e68e294..69452f60f6 100644 --- a/gnu/packages/perl-compression.scm +++ b/gnu/packages/perl-compression.scm @@ -34,15 +34,14 @@ (define-public perl-compress-raw-bzip2 (package (name "perl-compress-raw-bzip2") - (version "2.084") + (version "2.090") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/P/PM/PMQS/" "Compress-Raw-Bzip2-" version ".tar.gz")) (sha256 - (base32 - "0kwjrsl519bv48b7698a9anj6l0n3z1vrd1a7im2r1pbffxxw5kx")))) + (base32 "0yi972il6i0ya65qar0767mm3sb2wbsrllsgx6296s5myh2838p6")))) (build-system perl-build-system) ;; TODO: Use our bzip2 package. (home-page "https://metacpan.org/release/Compress-Raw-Bzip2") @@ -54,15 +53,14 @@ compression library.") (define-public perl-compress-raw-zlib (package (name "perl-compress-raw-zlib") - (version "2.084") + (version "2.090") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/P/PM/PMQS/" "Compress-Raw-Zlib-" version ".tar.gz")) (sha256 - (base32 - "0vv69a8kjx64cxhjgaccidy2yyij2j3aqlrv1r0dwa1fl9xijpim")))) + (base32 "0ndgkv7z4zi3ffail9abp02x62dx1j3pnxn3rjw91py7pjd4kj7j")))) (build-system perl-build-system) (inputs `(("zlib" ,zlib))) @@ -90,19 +88,19 @@ compression library.") (define-public perl-io-compress (package (name "perl-io-compress") - (version "2.084") + (version "2.090") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/P/PM/PMQS/" "IO-Compress-" version ".tar.gz")) (sha256 - (base32 - "1dbdsxhbikmbbfsdam3crv8474l8ax6d9d7r3s6safk4v8z51g8x")))) + (base32 "11z9jkcpqyd4d1kziiq8q4rmqax93jd3hryx8cnkg4zrhd5fa4jc")))) (build-system perl-build-system) (propagated-inputs - `(("perl-compress-raw-zlib" ,perl-compress-raw-zlib) ; >=2.081 - ("perl-compress-raw-bzip2" ,perl-compress-raw-bzip2))) ; >=2.081 + ;; These two packages should be updated to this one's version first. + `(("perl-compress-raw-zlib" ,perl-compress-raw-zlib) + ("perl-compress-raw-bzip2" ,perl-compress-raw-bzip2))) (home-page "https://metacpan.org/release/IO-Compress") (synopsis "IO Interface to compressed files/buffers") (description "IO-Compress provides a Perl interface to allow reading and @@ -133,7 +131,7 @@ type by using either Perl modules, or command-line tools on your system.") (define-public perl-archive-zip (package (name "perl-archive-zip") - (version "1.65") + (version "1.67") (source (origin (method url-fetch) @@ -141,7 +139,7 @@ type by using either Perl modules, or command-line tools on your system.") "mirror://cpan/authors/id/P/PH/PHRED/Archive-Zip-" version ".tar.gz")) (sha256 - (base32 "116vcg8x7n92i7cn3bx0xck69mz9vjy0il9i8p7p7lk40kz7jcbl")))) + (base32 "0x17b7s5c3bqy9gx7psdqxbzkilylnwwd3c3i68vynbn9hs788my")))) (build-system perl-build-system) (native-inputs ;; For tests. diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index f92d50290e..6069413264 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> -;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> +;;; Copyright © 2013, 2019 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2015, 2016, 2017, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2016, 2017, 2019 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr> @@ -1065,7 +1065,7 @@ to the calling program.") (define-public perl-class-inspector (package (name "perl-class-inspector") - (version "1.32") + (version "1.36") (source (origin (method url-fetch) @@ -1073,7 +1073,7 @@ to the calling program.") "Class-Inspector-" version ".tar.gz")) (sha256 (base32 - "0d85rihxahdvhj8cysqrgg0kbmcqghz5hgy41dbkxr1qaf5xrynf")))) + "0kk900bp8iq7bw5jyllfb31gvf93mmp24n4x90j7qs3jlhimsafc")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/Class-Inspector") (synopsis "Get information about a class and its structure") @@ -1611,14 +1611,14 @@ CPAN::Meta object are present.") (define-public perl-cpanel-json-xs (package (name "perl-cpanel-json-xs") - (version "4.15") + (version "4.17") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/R/RU/RURBAN/" "Cpanel-JSON-XS-" version ".tar.gz")) (sha256 - (base32 "1695408fj6jjx6dv5082hhxg5am480x1nz7s0f355npv0wm776wx")))) + (base32 "1yq6hwd6hayqrhaa2h90svqqvsc28k0g4bdip5nyxgm9r93sx07s")))) (build-system perl-build-system) (propagated-inputs `(("perl-common-sense" ,perl-common-sense))) @@ -1768,18 +1768,18 @@ input.") (define-public perl-data-compare (package (name "perl-data-compare") - (version "1.25") + (version "1.27") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/D/DC/DCANTRELL/" "Data-Compare-" version ".tar.gz")) (sha256 - (base32 - "0wzasidg9yjcfsi2gdiaw6726ikqda7n24n0v2ngpaazakdkcjqx")))) + (base32 "1gg8rqbv3x6a1lrpabv6vnlab53zxmpwz2ygad9fcx4gygqj12l1")))) (build-system perl-build-system) (propagated-inputs - `(("perl-file-find-rule" ,perl-file-find-rule))) + `(("perl-clone" ,perl-clone) + ("perl-file-find-rule" ,perl-file-find-rule))) (home-page "https://metacpan.org/release/Data-Compare") (synopsis "Compare Perl data structures") (description "This module compares arbitrary data structures to see if @@ -2268,14 +2268,14 @@ time before its creation (in 1582).") (define-public perl-datetime-calendar-julian (package (name "perl-datetime-calendar-julian") - (version "0.100") + (version "0.102") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/W/WY/WYANT/" "DateTime-Calendar-Julian-" version ".tar.gz")) (sha256 - (base32 "0gbw7rh706qk5jlmmz3yzsm0ilzp39kyar28g4j6d57my8cwaipx")))) + (base32 "0j95dhma66spjyb04zi6rwy7l33hibnrx02mn0znd9m89aiq52s6")))) (build-system perl-build-system) ;; Only needed for tests (native-inputs @@ -2700,17 +2700,17 @@ particular command is available.") (define-public perl-devel-checklib (package (name "perl-devel-checklib") - (version "1.13") + (version "1.14") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/M/MA/MATTN/Devel-CheckLib-" version ".tar.gz")) (sha256 - (base32 "1a19qkwxwz3wqb16cdabymfbf9kiydiifw90nd5srpq5hy8gvb94")))) + (base32 "15621qh5gaan1sgmk9y9svl70nm8viw17x5h1kf0zknkk8lmw77j")))) (build-system perl-build-system) (native-inputs - `(("perl-io-captureoutput" ,perl-io-captureoutput) + `(("perl-capture-tiny" ,perl-capture-tiny) ("perl-mock-config" ,perl-mock-config))) (home-page "https://metacpan.org/release/Devel-CheckLib") (synopsis "Check that a library is available") @@ -3320,6 +3320,33 @@ By itself it is not a particularly interesting module by any measure, however it ties together a family of modern toolchain modules.") (license (package-license perl)))) +(define-public perl-extutils-cppguess + (package + (name "perl-extutils-cppguess") + (version "0.20") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/E/ET/ETJ/ExtUtils-CppGuess-" + version + ".tar.gz")) + (sha256 + (base32 + "0q9ynigk600fv95xac6aslrg2k19m6qbzf5hqfsnall8113r3gqj")))) + (build-system perl-build-system) + (native-inputs + `(("perl-capture-tiny" ,perl-capture-tiny) + ("perl-module-build" ,perl-module-build))) + (propagated-inputs + `(("perl-capture-tiny" ,perl-capture-tiny))) + (home-page + "https://metacpan.org/release/ExtUtils-CppGuess") + (synopsis "Tool for guessing C++ compiler and flags") + (description "ExtUtils::CppGuess attempts to guess the C++ compiler that +is compatible with the C compiler used to build perl.") + (license (package-license perl)))) + (define-public perl-extutils-depends (package (name "perl-extutils-depends") @@ -3385,6 +3412,29 @@ C code in your Perl programs, there isn't a clear method to compile standard, self-contained C libraries. This module main goal is to help in that task.") (license (package-license perl)))) +(define-public perl-extutils-parsexs + (package + (name "perl-extutils-parsexs") + (version "3.35") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/S/SM/SMUELLER/ExtUtils-ParseXS-" + version + ".tar.gz")) + (sha256 + (base32 + "077fqiyabydm8j34wxzxwxskyidh8nmwq9gskaxai8kq298z1pj1")))) + (build-system perl-build-system) + (home-page + "https://metacpan.org/release/ExtUtils-ParseXS") + (synopsis "Module to convert Perl XS code into C code") + (description "The package contains the ExtUtils::ParseXS module to +convert Perl XS code into C code, the ExtUtils::Typemaps module to +handle Perl/XS typemap files, and their submodules.") + (license (package-license perl)))) + (define-public perl-extutils-pkgconfig (package (name "perl-extutils-pkgconfig") @@ -3408,6 +3458,56 @@ of perl extensions which bind libraries that @command{pkg-config} knows. It is really just boilerplate code that you would have written yourself.") (license lgpl2.1+))) +(define-public perl-extutils-typemaps-default + (package + (name "perl-extutils-typemaps-default") + (version "1.05") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/S/SM/SMUELLER/ExtUtils-Typemaps-Default-" + version + ".tar.gz")) + (sha256 + (base32 + "1phmha0ks95kvzl00r1kgnd5hvg7qb1q9jmzjmw01p5zgs1zbyix")))) + (build-system perl-build-system) + (native-inputs + `(("perl-module-build" ,perl-module-build))) + (home-page + "https://metacpan.org/release/ExtUtils-Typemaps-Default") + (synopsis "Set of useful typemaps") + (description "The package provides a number of useful typemaps as +submodules of ExtUtils::Typemaps.") + (license (package-license perl)))) + +(define-public perl-extutils-xspp + (package + (name "perl-extutils-xspp") + (version "0.18") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/S/SM/SMUELLER/ExtUtils-XSpp-" + version + ".tar.gz")) + (sha256 + (base32 + "1zx84f93lkymqz7qa4d63gzlnhnkxm5i3gvsrwkvvqr9cxjasxli")))) + (build-system perl-build-system) + (native-inputs + `(("perl-module-build" ,perl-module-build) + ("perl-test-base" ,perl-test-base) + ("perl-test-differences" ,perl-test-differences))) + (home-page + "https://metacpan.org/release/ExtUtils-XSpp") + (synopsis "XS for C++") + (description "This module implements the Perl foreign function +interface XS for C++; it is a thin layer over plain XS.") + (license (package-license perl)))) + (define-public perl-file-changenotify (package (name "perl-file-changenotify") @@ -3442,7 +3542,7 @@ changes made to any file.") (define-public perl-file-configdir (package (name "perl-file-configdir") - (version "0.018") + (version "0.021") (source (origin (method url-fetch) @@ -3450,11 +3550,12 @@ changes made to any file.") "File-ConfigDir-" version ".tar.gz")) (sha256 (base32 - "1xpzrlya0gskk7lm6gppyfwbk0swv0n6ssgp629575dk5l49z2rf")))) + "1ihlhdbwaybyj3xqfxpx4ii0ypa41907b6zdh94rvr4wyqa5lh3b")))) (build-system perl-build-system) (propagated-inputs `(("perl-file-homedir" ,perl-file-homedir) - ("perl-list-moreutils" ,perl-list-moreutils))) + ("perl-list-moreutils" ,perl-list-moreutils) + ("perl-test-without-module" ,perl-test-without-module))) (home-page "https://metacpan.org/release/File-ConfigDir") (synopsis "Get directories of configuration files") (description "This module is a helper for installing, reading and finding @@ -5245,6 +5346,36 @@ replacement. Whereas Module::Build has over 6,700 lines of code; this module has less than 120, yet supports the features needed by most distributions.") (license (package-license perl)))) +(define-public perl-module-build-withxspp + (package + (name "perl-module-build-withxspp") + (version "0.14") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/S/SM/SMUELLER/Module-Build-WithXSpp-" + version + ".tar.gz")) + (sha256 + (base32 + "0d39fjg9c0n820bk3fb50vvlwhdny4hdl69xmlyzql5xzp4cicsk")))) + (build-system perl-build-system) + (native-inputs + `(("perl-module-build" ,perl-module-build))) + (propagated-inputs + `(("perl-extutils-cppguess" ,perl-extutils-cppguess) + ("perl-extutils-xspp" ,perl-extutils-xspp) + ("perl-module-build" ,perl-module-build))) + (home-page + "https://metacpan.org/release/Module-Build-WithXSpp") + (synopsis + "The module provides an XS++ enhanced flavour of Module::Build") + (description "This subclass of Module::Build adds some tools and +processes to make it easier to use for wrapping C++ using XS++ +(ExtUtils::XSpp).") + (license (package-license perl)))) + (define-public perl-module-build-xsutil (package (name "perl-module-build-xsutil") @@ -6341,6 +6472,35 @@ takes additional parameters and uses @code{Getopt::Long::Descriptive} to generate a command line tool.") (license (package-license perl)))) +(define-public perl-moox-strictconstructor + (package + (name "perl-moox-strictconstructor") + (version "0.010") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/H/HA/HARTZELL/MooX-StrictConstructor-" + version + ".tar.gz")) + (sha256 + (base32 + "0vvjgz7xbfmf69yav7sxsxmvklqv835xvh7h47w0apxmlkm9fjgr")))) + (build-system perl-build-system) + (native-inputs + `(("perl-test-fatal" ,perl-test-fatal))) + (propagated-inputs + `(("perl-class-method-modifiers" ,perl-class-method-modifiers) + ("perl-moo" ,perl-moo) + ("perl-strictures" ,perl-strictures))) + (home-page "https://metacpan.org/release/MooX-StrictConstructor") + (synopsis "Make Moo-based object constructors blow up on unknown attributes") + (description + "Loading @code{MooX::StrictConstructor} makes your constructors \"strict\". +If your constructor is called with an attribute init argument that your class +does not declare, then it dies.") + (license perl-license))) + (define-public perl-moox-types-mooselike (package (name "perl-moox-types-mooselike") @@ -9053,14 +9213,14 @@ variable conform.") (define-public perl-type-tiny (package (name "perl-type-tiny") - (version "1.004004") + (version "1.006000") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/T/TO/TOBYINK/" "Type-Tiny-" version ".tar.gz")) (sha256 - (base32 "1gk2f0zs2xq99nqn6wcgvl8l9qlq2cnab2lk7l08kpac03m824h8")))) + (base32 "007xsx78cnjillbny7x9sjn1w6z8m22fmksmay710jhbvw9h19nm")))) (build-system perl-build-system) (native-inputs `(("perl-test-warnings" ,perl-test-warnings))) diff --git a/gnu/packages/perl6.scm b/gnu/packages/perl6.scm index 33c1686088..ef46c00385 100644 --- a/gnu/packages/perl6.scm +++ b/gnu/packages/perl6.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -342,7 +343,7 @@ respectively.") (define-public perl6-json-fast (package (name "perl6-json-fast") - (version "0.8") + (version "0.10") (source (origin (method git-fetch) @@ -351,8 +352,7 @@ respectively.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 - "1fif081gdxdnja14vkj523p9dyzdcdj81lmjv9fvfazvpagb6dg2")))) + (base32 "1g8hr1mdrxwdpzc7hvs9l5r12phvba6y6a5chgkj90ing77ji4b2")))) (build-system rakudo-build-system) (arguments '(#:with-zef? #f)) (home-page "https://github.com/timo/json_fast") diff --git a/gnu/packages/pkg-config.scm b/gnu/packages/pkg-config.scm index 6fc19a975d..c3bc3025a3 100644 --- a/gnu/packages/pkg-config.scm +++ b/gnu/packages/pkg-config.scm @@ -22,6 +22,7 @@ #:use-module (guix download) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) + #:use-module (guix memoization) #:export (pkg-config)) ;; This is the "primitive" pkg-config package. People should use `pkg-config' @@ -65,44 +66,46 @@ on where to find glib (or other libraries). It is language-agnostic, so it can be used for defining the location of documentation tools, for instance."))) -(define (cross-pkg-config target) - "Return a pkg-config for TARGET, essentially just a wrapper called +(define cross-pkg-config + (mlambda (target) + "Return a pkg-config for TARGET, essentially just a wrapper called `TARGET-pkg-config', as `configure' scripts like it." - ;; See <http://www.flameeyes.eu/autotools-mythbuster/pkgconfig/cross-compiling.html> - ;; for details. - (package (inherit %pkg-config) - (name (string-append (package-name %pkg-config) "-" target)) - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build utils)) - #:builder (begin - (use-modules (guix build utils)) + ;; See <http://www.flameeyes.eu/autotools-mythbuster/pkgconfig/cross-compiling.html> + ;; for details. + (package + (inherit %pkg-config) + (name (string-append (package-name %pkg-config) "-" target)) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils)) + #:builder (begin + (use-modules (guix build utils)) - (let* ((in (assoc-ref %build-inputs "pkg-config")) - (out (assoc-ref %outputs "out")) - (bin (string-append out "/bin")) - (prog (string-append ,target "-pkg-config")) - (native (string-append in "/bin/pkg-config"))) + (let* ((in (assoc-ref %build-inputs "pkg-config")) + (out (assoc-ref %outputs "out")) + (bin (string-append out "/bin")) + (prog (string-append ,target "-pkg-config")) + (native (string-append in "/bin/pkg-config"))) - (mkdir-p bin) + (mkdir-p bin) - ;; Create a `TARGET-pkg-config' -> `pkg-config' symlink. - ;; This satisfies the pkg.m4 macros, which use - ;; AC_PROG_TOOL to determine the `pkg-config' program - ;; name. - (symlink native (string-append bin "/" prog)) + ;; Create a `TARGET-pkg-config' -> `pkg-config' symlink. + ;; This satisfies the pkg.m4 macros, which use + ;; AC_PROG_TOOL to determine the `pkg-config' program + ;; name. + (symlink native (string-append bin "/" prog)) - ;; Also make 'pkg.m4' available, some packages might - ;; expect it. - (mkdir-p (string-append out "/share")) - (symlink (string-append in "/share/aclocal") - (string-append out "/share/aclocal")) - #t)))) - (native-inputs `(("pkg-config" ,%pkg-config))) + ;; Also make 'pkg.m4' available, some packages might + ;; expect it. + (mkdir-p (string-append out "/share")) + (symlink (string-append in "/share/aclocal") + (string-append out "/share/aclocal")) + #t)))) + (native-inputs `(("pkg-config" ,%pkg-config))) - ;; Ignore native inputs, and set `PKG_CONFIG_PATH' for target inputs. - (native-search-paths '()) - (search-paths (package-native-search-paths %pkg-config)))) + ;; Ignore native inputs, and set `PKG_CONFIG_PATH' for target inputs. + (native-search-paths '()) + (search-paths (package-native-search-paths %pkg-config))))) (define (pkg-config-for-target target) "Return a pkg-config package for TARGET, which may be either #f for a native diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index a96b2eafa1..56f7d548fb 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -180,14 +180,14 @@ colors, styles, options and details.") (define-public asymptote (package (name "asymptote") - (version "2.55") + (version "2.59") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/asymptote/" version "/asymptote-" version ".src.tgz")) (sha256 (base32 - "07704k1p9bzchv7r8x6sj22gcphdyjmj6caa3y83r7gk0r9xi56c")))) + "15riihmfmlh8skdssqkl0yv06hc6sw6pbr6jzsfvhcwdmlbsvh33")))) (build-system gnu-build-system) ;; Note: The 'asy' binary retains a reference to docdir for use with its ;; "help" command in interactive mode, so adding a "doc" output is not @@ -241,7 +241,7 @@ colors, styles, options and details.") (("#include <primitives.h>") "#include \"primitives.h\"")) (invoke "touch" "prc/config.h"))) (add-after 'unpack 'move-info-location - ;; Build process install info file in the unusual + ;; Build process installs info file in the unusual ;; "%out/share/info/asymptote/" location. Move it to ;; "%out/share/info/" so it appears in the top-level directory. (lambda _ diff --git a/gnu/packages/polkit.scm b/gnu/packages/polkit.scm index 7cc35f1ed9..d868aceec2 100644 --- a/gnu/packages/polkit.scm +++ b/gnu/packages/polkit.scm @@ -142,8 +142,8 @@ for unprivileged applications.") (source (origin (method url-fetch) (uri (string-append - "http://download.kde.org/stable/apps/KDE4.x/admin/" - name "-" version ".tar.bz2")) + "mirror://kde//stable/apps/KDE4.x/admin/" + "polkit-qt-" version ".tar.bz2")) (sha256 (base32 "1ip78x20hjqvm08kxhp6gb8hf6k5n6sxyx6kk2yvvq53djzh7yv7")))) @@ -161,7 +161,7 @@ for unprivileged applications.") (assoc-ref %outputs "out") "/lib64")) #:tests? #f)) ; there is a test subdirectory, but no test target - (home-page "http://api.kde.org/kdesupport-api/polkit-qt-1-apidocs/") + (home-page "https://api.kde.org/kdesupport-api/polkit-qt-1-apidocs/") (synopsis "Qt frontend to the polkit library") (description "Polkit-qt is a library that lets developers use the PolicyKit API through a Qt-styled API. It is mainly a wrapper around diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm index fe69af84c4..cfe06a0be2 100644 --- a/gnu/packages/pretty-print.scm +++ b/gnu/packages/pretty-print.scm @@ -242,14 +242,14 @@ seen in a terminal.") (define-public highlight (package (name "highlight") - (version "3.50") + (version "3.54") (source (origin (method url-fetch) (uri (string-append "http://www.andre-simon.de/zip/highlight-" version ".tar.bz2")) (sha256 - (base32 "0frcq12zy3dqfhwwzylm10ydp7zp51w9jlijm23zvx09daslg1bl")))) + (base32 "1l6nxk3vwd7rkxpq9aqisjyps89r008wzn3abh4566q6jigahl4a")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm index e9aaeb23c2..d00057934d 100644 --- a/gnu/packages/protobuf.scm +++ b/gnu/packages/protobuf.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2016 Daniel Pimentel <d4n1@d4n1.org> ;;; Copyright © 2016 Leo Famulari <leo@famulari.name> ;;; Copyright © 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net> -;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -75,7 +75,7 @@ data in motion, or as a file format for data at rest.") (define-public protobuf (package (name "protobuf") - (version "3.10.0") + (version "3.10.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/google/protobuf/releases/" @@ -83,7 +83,7 @@ data in motion, or as a file format for data at rest.") version ".tar.gz")) (sha256 (base32 - "06xnqpsa79jrk3k55fsycnp7jac546299v7gdyx9yf4c5q81xfgz")))) + "16xrclp3xw4hzni1h53px9s99657hs5790726lchm3hrvsyyabp8")))) (build-system gnu-build-system) (inputs `(("zlib" ,zlib))) (outputs (list "out" diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index f05c01060f..11c23aebfc 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2018 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2018 Vagrant Cascadian <vagrant@debian.org> ;;; Copyright © 2018 Nam Nguyen <namn@berkeley.edu> +;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1062,3 +1063,30 @@ Password-Authenticated Key Exchange algorithm.") (description "This package provides a Twisted-based Tor controller client, with state-tracking and configuration abstractions.") (license license:expat))) + +(define-public python-keyutils + (package + (name "python-keyutils") + (version "0.6") + (source + (origin + (method url-fetch) + (uri (pypi-uri "keyutils" version)) + (sha256 + (base32 + "0lipygpzhwzzsq2k5imb1jgkmj8y4khxdwhzadjs3bd56g6bmkx9")))) + (build-system python-build-system) + (native-inputs + `(("python-pytest" ,python-pytest) + ("python-pytest-runner" ,python-pytest-runner))) + (inputs + `(("keyutils" ,keyutils))) + (arguments + '(#:tests? #f)) + (home-page "https://github.com/sassoftware/python-keyutils") + (synopsis "Python bindings for keyutils") + (description + "This is a set of python bindings for keyutils, a key management suite +that leverages the infrastructure provided by the Linux kernel for safely +storing and retrieving sensitive information in your programs.") + (license license:asl2.0))) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 397d15c99b..733bd18aff 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -166,13 +166,13 @@ (define-public python-psutil (package (name "python-psutil") - (version "5.6.3") + (version "5.6.5") (source (origin (method url-fetch) (uri (pypi-uri "psutil" version)) (sha256 - (base32 "1wv31zly44qj0rp2acg58xbnc7bf6ffyadasq093l455q30qafl6")))) + (base32 "0isil5jxwwd8awz54qk28rpgjg43i5l6yl70g40vxwa4r4m56lfh")))) (build-system python-build-system) (arguments ;; FIXME: some tests does not return and times out. @@ -4309,14 +4309,13 @@ operators such as union, intersection, and difference.") (define-public python-scipy (package (name "python-scipy") - (version "1.3.1") + (version "1.3.2") (source (origin (method url-fetch) (uri (pypi-uri "scipy" version)) (sha256 - (base32 - "1df113c9i6vazsn6y3n9wc22jh737z1g7dmx3mypkdwpdnscyhr6")))) + (base32 "192d8dsybvhv19igkrsafbdafx198nz7pibkjgrqjhlr66s3jfd0")))) (build-system python-build-system) (propagated-inputs `(("python-numpy" ,python-numpy) @@ -4454,6 +4453,35 @@ as the original project seems to have been abandoned circa 2007.") (define-public python2-socksipy-branch (package-with-python2 python-socksipy-branch)) +(define-public python-socksipychain + (package + (name "python-socksipychain") + (version "2.0.15") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pagekite/PySocksipyChain.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1pkljnh9hfwla8sg7mil4f9zrnsqj0dbhr3crxjw3k8dnjz70dvk")))) + (build-system python-build-system) + (arguments + `(#:tests? #f)) ; Tests try to access the network. + (home-page "http://pagekite.net/wiki/Floss/PySocksipyChain/") + (synopsis "Python SOCKS module with chained proxies support") + (description + "SocksiPyChain is a modified version of the SocksiPy SOCKS module, which +adds support for arbitrary chaining of proxy servers and various modes of +TLS/SSL encryption. It was developed for use in PageKite, and also includes +a simple netcat replacement with chaining support.") + (license license:bsd-3))) + +(define-public python2-socksipychain + (package-with-python2 python-socksipychain)) + (define-public python-pycodestyle (package (name "python-pycodestyle") @@ -5916,27 +5944,15 @@ parsing (browser/HTTP) user agent strings.") (define-public python-dbus (package (name "python-dbus") - (version "1.2.8") + (version "1.2.10") (source (origin (method url-fetch) (uri (string-append "https://dbus.freedesktop.org/releases/dbus-python/" "dbus-python-" version ".tar.gz")) (sha256 - (base32 - "0vvvjmiwnc9cjlks3gcdk43ap7llhlpz7cm1wbw0nc2yfsxjpwdb")))) + (base32 "11nqk01iq5bx2llgb3ksknyinijdp29w4ndj210glm009ayjncyl")))) (build-system gnu-build-system) - (arguments - '(#:phases - (modify-phases %standard-phases - (add-before - 'check 'pre-check - (lambda _ - ;; XXX: For the missing '/etc/machine-id'. - (substitute* "test/run-test.sh" - (("DBUS_FATAL_WARNINGS=1") - "DBUS_FATAL_WARNINGS=0")) - #t))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs @@ -6065,14 +6081,14 @@ converts incoming documents to Unicode and outgoing documents to UTF-8.") (define-public python-soupsieve (package (name "python-soupsieve") - (version "1.9.2") + (version "1.9.5") (source (origin (method url-fetch) (uri (pypi-uri "soupsieve" version)) (sha256 (base32 - "0in9rc9q3h8w5b4qf7kvl3qxcvw6vrz35ckblchgf70hm6pg3dbj")))) + "1nhd0q0ifwva9wn645s6pn74p1rd97asn3qfg75nphx1wkgcbhg2")))) (build-system python-build-system) (arguments `(#:tests? #f)) ;;XXX: 2 tests fail currently despite claming they were to be @@ -9004,14 +9020,14 @@ servers.") (define-public python-jmespath (package (name "python-jmespath") - (version "0.9.3") + (version "0.9.4") (source (origin (method url-fetch) (uri (pypi-uri "jmespath" version)) (sha256 (base32 - "0r7wc7fsxmlwzxx9j1j7rms06c6xs6d4sysirdhz1jk2mb4x90ba")))) + "0k0765x1mybcrzajh3hiqkl8sy9hs0bmn4900frxy0j3ykvaxqmx")))) (build-system python-build-system) (native-inputs `(("python-nose" ,python-nose))) @@ -12746,14 +12762,13 @@ clone, while other processes access the original tree.") (define-public python-astroid (package (name "python-astroid") - (version "2.3.2") + (version "2.3.3") (source (origin (method url-fetch) (uri (pypi-uri "astroid" version)) (sha256 - (base32 - "0crfhpblcy5a6nh694hc2073gw389f01yilamzqi34si2skgp8q9")))) + (base32 "0fnibsl2cb5mvzbfm7sycj85smx48f8w8m7ks1sqlmpr9ps0gski")))) (build-system python-build-system) (propagated-inputs `(("python-lazy-object-proxy" ,python-lazy-object-proxy) @@ -15264,13 +15279,13 @@ working with iterables.") (define-public python-latexcodec (package (name "python-latexcodec") - (version "1.0.6") + (version "1.0.7") (source (origin (method url-fetch) (uri (pypi-uri "latexcodec" version)) (sha256 - (base32 "0s4wdbg0w2l8pj3i0y4510i0s04p8nhxcsa2z41bjsv0k66npb81")))) + (base32 "0wnp3yqcgx0rpy8dz51vh75lbp2qif67da19zi7m3ca98n887hgb")))) (build-system python-build-system) (inputs `(("python-six" ,python-six))) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 222a0cc867..5f4f29a948 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -38,6 +38,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (guix packages) + #:use-module (guix deprecation) #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages base) @@ -127,65 +128,26 @@ other text such as code. The syntax uses the syntax of the Django template system, and the core design of Django is reused in Grantlee.") (license license:lgpl2.0+))) -(define-public qt +(define-public qt-4 (package (name "qt") - (version "5.12.5") - (outputs '("out" "examples")) + (version "4.8.7") (source (origin (method url-fetch) - (uri - (string-append - "http://download.qt.io/official_releases/qt/" - (version-major+minor version) - "/" version - "/single/qt-everywhere-src-" - version ".tar.xz")) + (uri (string-append "http://download.qt-project.org/official_releases/qt/" + (string-copy version 0 (string-rindex version #\.)) + "/" version + "/qt-everywhere-opensource-src-" + version ".tar.gz")) (sha256 (base32 - "160jr7w39lpd7cwnlbgf5yj8halan7zpnxj2hbwwlrvpvchrwad2")) + "183fca7n7439nlhxyg1z7aky0izgbyll3iwakw4gwivy16aj5272")) + (patches (search-patches "qt4-ldflags.patch")) (modules '((guix build utils))) (snippet - '(begin - ;; Remove qtwebengine, which relies on a bundled copy of - ;; chromium. Not only does it fail compilation in qt 5.5: - ;; 3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc:362:10: - ;; error: cannot convert ‘bool’ to ‘boolean’ in return - ;; it might also pose security problems. - ;; Alternatively, we could use the "-skip qtwebengine" - ;; configuration option. - (delete-file-recursively "qtwebengine") - ;; The following snippets are copied from their mondular-qt counterparts. - (for-each - (lambda (dir) - (delete-file-recursively (string-append "qtbase/src/3rdparty/" dir))) - (list "double-conversion" "freetype" "harfbuzz-ng" - "libpng" "libjpeg" "pcre2" "sqlite" "xcb" - "zlib")) - (for-each - (lambda (dir) - (delete-file-recursively dir)) - (list "qtimageformats/src/3rdparty" - "qtmultimedia/examples/multimedia/spectrum/3rdparty" - "qtwayland/examples" - "qtscxml/tests/3rdparty" - "qtcanvas3d/examples/canvas3d/3rdparty")) - ;; Tests depend on this example, which depends on the 3rd party code. - (substitute* "qtmultimedia/examples/multimedia/multimedia.pro" - (("spectrum") "#")) - (substitute* "qtxmlpatterns/tests/auto/auto.pro" - (("qxmlquery") "# qxmlquery") - (("xmlpatterns ") "# xmlpatterns")) - (substitute* "qtwebglplugin/tests/plugins/platforms/platforms.pro" - (("webgl") "# webgl")) - (substitute* "qtscxml/tests/auto/auto.pro" - (("scion") "#")) - (substitute* "qtnetworkauth/tests/auto/auto.pro" - (("oauth1 ") "# oauth1 ")) - (substitute* "qtremoteobjects/tests/auto/qml/qml.pro" - (("integration") "# integration") - (("usertypes") "# usertypes")) - #t)))) + ;; Remove webkit module, which is not built. + '(begin (delete-file-recursively "src/3rdparty/webkit") + #t)))) (build-system gnu-build-system) (propagated-inputs `(("mesa" ,mesa))) @@ -201,11 +163,9 @@ system, and the core design of Django is reused in Grantlee.") ("glib" ,glib) ("gstreamer" ,gstreamer) ("gst-plugins-base" ,gst-plugins-base) - ("harfbuzz" ,harfbuzz) ("icu4c" ,icu4c) ("jasper" ,jasper) ("libinput" ,libinput-minimal) - ("libjpeg" ,libjpeg) ("libmng" ,libmng) ("libpci" ,pciutils) ("libpng" ,libpng) @@ -228,7 +188,6 @@ system, and the core design of Django is reused in Grantlee.") ("mariadb" ,mariadb "lib") ("mariadb-dev" ,mariadb "dev") ("nss" ,nss) - ("openssl" ,openssl) ("postgresql" ,postgresql) ("pulseaudio" ,pulseaudio) ("pcre2" ,pcre2) @@ -241,197 +200,7 @@ system, and the core design of Django is reused in Grantlee.") ("xcb-util-keysyms" ,xcb-util-keysyms) ("xcb-util-renderutil" ,xcb-util-renderutil) ("xcb-util-wm" ,xcb-util-wm) - ("zlib" ,zlib))) - (native-inputs - `(("bison" ,bison) - ("flex" ,flex) - ("gperf" ,gperf) - ("perl" ,perl) - ("pkg-config" ,pkg-config) - ("python" ,python-2) - ("ruby" ,ruby) - ("vulkan-headers" ,vulkan-headers) - ("which" ,(@ (gnu packages base) which)))) - (arguments - `(#:parallel-build? #f ; Triggers race condition in qtbase module on Hydra. - #:phases - (modify-phases %standard-phases - (add-after 'configure 'patch-bin-sh - (lambda _ - (substitute* '("qtbase/configure" - "qtbase/mkspecs/features/qt_functions.prf" - "qtbase/qmake/library/qmakebuiltins.cpp") - (("/bin/sh") (which "sh"))) - #t)) - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (examples (assoc-ref outputs "examples"))) - (substitute* '("configure" "qtbase/configure") - (("/bin/pwd") (which "pwd"))) - (substitute* "qtbase/src/corelib/global/global.pri" - (("/bin/ls") (which "ls"))) - ;; do not pass "--enable-fast-install", which makes the - ;; configure process fail - (invoke - "./configure" - "-verbose" - "-prefix" out - "-docdir" (string-append out "/share/doc/qt5") - "-headerdir" (string-append out "/include/qt5") - "-archdatadir" (string-append out "/lib/qt5") - "-datadir" (string-append out "/share/qt5") - "-examplesdir" (string-append - examples "/share/doc/qt5/examples") ; 151MiB - "-opensource" - "-confirm-license" - - ;; These features require higher versions of Linux than the - ;; minimum version of the glibc. See - ;; src/corelib/global/minimum-linux_p.h. By disabling these - ;; features Qt5 applications can be used on the oldest - ;; kernels that the glibc supports, including the RHEL6 - ;; (2.6.32) and RHEL7 (3.10) kernels. - "-no-feature-getentropy" ; requires Linux 3.17 - "-no-feature-renameat2" ; requires Linux 3.16 - - ;; Do not build examples; for the time being, we - ;; prefer to save the space and build time. - "-no-compile-examples" - ;; Most "-system-..." are automatic, but some use - ;; the bundled copy by default. - "-system-sqlite" - "-system-harfbuzz" - "-system-pcre" - ;; explicitly link with openssl instead of dlopening it - "-openssl-linked" - ;; explicitly link with dbus instead of dlopening it - "-dbus-linked" - ;; don't use the precompiled headers - "-no-pch" - ;; drop special machine instructions not supported - ;; on all instances of the target - ,@(if (string-prefix? "x86_64" - (or (%current-target-system) - (%current-system))) - '() - '("-no-sse2")) - "-no-mips_dsp" - "-no-mips_dspr2")))) - (add-after 'install 'patch-mkspecs - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (archdata (string-append out "/lib/qt5")) - (mkspecs (string-append archdata "/mkspecs")) - (qt_config.prf (string-append - mkspecs "/features/qt_config.prf"))) - ;; For each Qt module, let `qmake' uses search paths in the - ;; module directory instead of all in QT_INSTALL_PREFIX. - (substitute* qt_config.prf - (("\\$\\$\\[QT_INSTALL_HEADERS\\]") - "$$clean_path($$replace(dir, mkspecs/modules, ../../include/qt5))") - (("\\$\\$\\[QT_INSTALL_LIBS\\]") - "$$clean_path($$replace(dir, mkspecs/modules, ../../lib))") - (("\\$\\$\\[QT_HOST_LIBS\\]") - "$$clean_path($$replace(dir, mkspecs/modules, ../../lib))") - (("\\$\\$\\[QT_INSTALL_BINS\\]") - "$$clean_path($$replace(dir, mkspecs/modules, ../../bin))")) - - ;; Searches Qt tools in the current PATH instead of QT_HOST_BINS. - (substitute* (string-append mkspecs "/features/qt_functions.prf") - (("cmd = \\$\\$\\[QT_HOST_BINS\\]/\\$\\$2") - "cmd = $$system(which $${2}.pl 2>/dev/null || which $${2})")) - - ;; Resolve qmake spec files within qtbase by absolute paths. - (substitute* - (map (lambda (file) - (string-append mkspecs "/features/" file)) - '("device_config.prf" "moc.prf" "qt_build_config.prf" - "qt_config.prf" "winrt/package_manifest.prf")) - (("\\$\\$\\[QT_HOST_DATA/get\\]") archdata) - (("\\$\\$\\[QT_HOST_DATA/src\\]") archdata)) - #t))) - (add-after 'unpack 'patch-paths - ;; Use the absolute paths for dynamically loaded libs, otherwise - ;; the lib will be searched in LD_LIBRARY_PATH which typically is - ;; not set in guix. - (lambda* (#:key inputs #:allow-other-keys) - ;; libresolve - (let ((glibc (assoc-ref inputs ,(if (%current-target-system) - "cross-libc" "libc")))) - (substitute* '("qtbase/src/network/kernel/qdnslookup_unix.cpp" - "qtbase/src/network/kernel/qhostinfo_unix.cpp") - (("^\\s*(lib.setFileName\\(QLatin1String\\(\")(resolv\"\\)\\);)" _ a b) - (string-append a glibc "/lib/lib" b)))) - ;; X11/locale (compose path) - (substitute* "qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp" - ;; Don't search in /usr/…/X11/locale, … - (("^\\s*m_possibleLocations.append\\(QStringLiteral\\(\"/usr/.*/X11/locale\"\\)\\);" line) - (string-append "// " line)) - ;; … but use libx11's path - (("^\\s*(m_possibleLocations.append\\(QStringLiteral\\()X11_PREFIX \"(/.*/X11/locale\"\\)\\);)" _ a b) - (string-append a "\"" (assoc-ref inputs "libx11") b))) - ;; libGL - (substitute* "qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp" - (("^\\s*(QLibrary lib\\(QLatin1String\\(\")(GL\"\\)\\);)" _ a b) - (string-append a (assoc-ref inputs "mesa") "/lib/lib" b))) - ;; libXcursor - (substitute* "qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp" - (("^\\s*(QLibrary xcursorLib\\(QLatin1String\\(\")(Xcursor\"\\), 1\\);)" _ a b) - (string-append a (assoc-ref inputs "libxcursor") "/lib/lib" b)) - (("^\\s*(xcursorLib.setFileName\\(QLatin1String\\(\")(Xcursor\"\\)\\);)" _ a b) - (string-append a (assoc-ref inputs "libxcursor") "/lib/lib" b))) - #t))))) - (native-search-paths - (list (search-path-specification - (variable "QMAKEPATH") - (files '("lib/qt5"))) - (search-path-specification - (variable "QML2_IMPORT_PATH") - (files '("lib/qt5/qml"))) - (search-path-specification - (variable "QT_PLUGIN_PATH") - (files '("lib/qt5/plugins"))) - (search-path-specification - (variable "XDG_DATA_DIRS") - (files '("share"))) - (search-path-specification - (variable "XDG_CONFIG_DIRS") - (files '("etc/xdg"))))) - (home-page "https://www.qt.io/") - (synopsis "Cross-platform GUI library") - (description "Qt is a cross-platform application and UI framework for - developers using C++ or QML, a CSS & JavaScript like language.") - (license (list license:lgpl2.1 license:lgpl3)) - - ;; Qt 4: 'QBasicAtomicPointer' leads to build failures on MIPS; - ;; see <http://hydra.gnu.org/build/112828>. - ;; Qt 5: assembler error; see <http://hydra.gnu.org/build/112526>. - (supported-systems (delete "mips64el-linux" %supported-systems)))) - -(define-public qt-4 - (package (inherit qt) - (version "4.8.7") - (source (origin - (method url-fetch) - (uri (string-append "http://download.qt-project.org/official_releases/qt/" - (string-copy version 0 (string-rindex version #\.)) - "/" version - "/qt-everywhere-opensource-src-" - version ".tar.gz")) - (sha256 - (base32 - "183fca7n7439nlhxyg1z7aky0izgbyll3iwakw4gwivy16aj5272")) - (patches (search-patches "qt4-ldflags.patch")) - (modules '((guix build utils))) - (snippet - ;; Remove webkit module, which is not built. - '(begin (delete-file-recursively "src/3rdparty/webkit") - #t)))) - (inputs - `(,@(fold alist-delete - (package-inputs qt) - '("harfbuzz" "libjpeg" "openssl")) + ("zlib" ,zlib) ("libjpeg" ,libjpeg-8) ("libsm" ,libsm) ("openssl" ,openssl-1.0))) @@ -440,10 +209,14 @@ system, and the core design of Django is reused in Grantlee.") ;; We could build it with -std=gnu++98, but then we'll get in trouble with ;; ICU later. Just keep using GCC 5 for now. ("gcc" ,gcc-5) - ,@(fold alist-delete - (package-native-inputs qt) - '("vulkan-headers")))) - + ("bison" ,bison) + ("flex" ,flex) + ("gperf" ,gperf) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("python" ,python-2) + ("ruby" ,ruby) + ("which" ,(@ (gnu packages base) which)))) ;; Note: there are 37 MiB of examples and a '-exampledir' configure flags, ;; but we can't make them a separate output because "out" and "examples" ;; would refer to each other. @@ -521,7 +294,33 @@ system, and the core design of Django is reused in Grantlee.") ;; different "devices" due to bind-mounts. (copy-recursively olddoc docdir) (delete-file-recursively olddoc) - #t)))))))) + #t)))))) + (native-search-paths + (list (search-path-specification + (variable "QMAKEPATH") + (files '("lib/qt5"))) + (search-path-specification + (variable "QML2_IMPORT_PATH") + (files '("lib/qt5/qml"))) + (search-path-specification + (variable "QT_PLUGIN_PATH") + (files '("lib/qt5/plugins"))) + (search-path-specification + (variable "XDG_DATA_DIRS") + (files '("share"))) + (search-path-specification + (variable "XDG_CONFIG_DIRS") + (files '("etc/xdg"))))) + (home-page "https://www.qt.io/") + (synopsis "Cross-platform GUI library") + (description "Qt is a cross-platform application and UI framework for +developers using C++ or QML, a CSS & JavaScript like language.") + (license (list license:lgpl2.1 license:lgpl3)) + + ;; Qt 4: 'QBasicAtomicPointer' leads to build failures on MIPS; + ;; see <http://hydra.gnu.org/build/112828>. + ;; Qt 5: assembler error; see <http://hydra.gnu.org/build/112526>. + (supported-systems (delete "mips64el-linux" %supported-systems)))) (define-public qtbase (package @@ -763,6 +562,11 @@ system, and the core design of Django is reused in Grantlee.") developers using C++ or QML, a CSS & JavaScript like language.") (license (list license:lgpl2.1 license:lgpl3)))) + +;; qt used to refer to the monolithic Qt 5.x package +(define-deprecated qt qtbase qtbase) + + (define-public qtsvg (package (inherit qtbase) (name "qtsvg") @@ -1436,34 +1240,6 @@ components. The API consists of over 20 effects provided as separate QML types. The effects cover functional areas such as blending, masking, blurring, coloring, and many more."))) -(define-public qtdeclarative-render2d - ;; As of Qt-5.8.0 this module has been merged into qtdeclarative - (package (inherit qtsvg) - (name "qtdeclarative-render2d") - (version "5.7.1") - (source (origin - (method url-fetch) - (uri (string-append "https://download.qt.io/official_releases/qt/" - (version-major+minor version) "/" version - "/submodules/" name "-everywhere-src-" - version ".tar.xz")) - (sha256 - (base32 - "0zwch9vn17f3bpy300jcfxx6cx9qymk5j7khx0x9k1xqid4166c3")) - (modules '((guix build utils))) - (snippet - '(begin - (delete-file-recursively "tools/opengldummy/3rdparty") - #t)))) - (native-inputs `()) - (inputs - `(("qtbase" ,qtbase) - ("qtdeclarative" ,qtdeclarative))) - (synopsis "Qt Declarative Render module") - (description "The Qt Declarative Render 2D module provides a Raster -backend for QtQuick scene graph.") - (properties `((superseded . ,qtdeclarative))))) - (define-public qtgamepad (package (inherit qtsvg) (name "qtgamepad") @@ -2161,7 +1937,7 @@ different kinds of sliders, and much more.") (origin (method url-fetch) (uri (string-append "https://github.com/annulen/webkit/releases/download/" - name "-" version "/" name "-" version ".tar.xz")) + "qtwebkit-" version "/qtwebkit-" version ".tar.xz")) (sha256 (base32 "05syvwi3jw9abwsc93rmjkna0vyh6bkfrsqhwir48ms54icfwzim")) @@ -2235,16 +2011,17 @@ time Web content can be enhanced with native controls.") (define-public dotherside (package (name "dotherside") - (version "0.6.3") + (version "0.6.4") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/filcuc/DOtherSide/" - "archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/filcuc/DOtherSide") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0azq7qlsrfdwbd6qsi7d3c1knn42qw0r47g43xf7clwbinapswpz")))) + "09fz6v8rp28997f235yaifj8p4vvsyv45knc1iivgdvx7msgcd0m")))) (build-system cmake-build-system) (native-inputs `(("qttools" ,qttools))) diff --git a/gnu/packages/rdesktop.scm b/gnu/packages/rdesktop.scm index 2febb1b5f4..71464237f4 100644 --- a/gnu/packages/rdesktop.scm +++ b/gnu/packages/rdesktop.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2019 Leo Famulari <leo@famulari.name> +;;; Copyright © 2019 Eric Bavier <bavier@member.fsf.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -35,6 +36,7 @@ #:use-module (gnu packages gstreamer) #:use-module (gnu packages image) #:use-module (gnu packages linux) + #:use-module (gnu packages nettle) #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages tls) @@ -46,7 +48,7 @@ (define-public rdesktop (package (name "rdesktop") - (version "1.8.4") + (version "1.9.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/rdesktop/rdesktop/" @@ -54,32 +56,20 @@ version ".tar.gz")) (sha256 (base32 - "0bfd9nl2dfr1931fv6bpnrj5yf88ikijrs4s3nm96gm87bkvi64v")))) + "1222f2srlq16bydhy44gph997iajg39sl774xxh9jdwi4cqjyg27")))) (build-system gnu-build-system) (arguments - `(#:configure-flags (list (string-append "--with-openssl=" - (assoc-ref %build-inputs - "openssl")) - - ;; XXX: optional dependencies missing + `(#:configure-flags (list ;; XXX: optional dependencies missing "--disable-credssp" "--disable-smartcard") - - #:phases - (modify-phases %standard-phases - (add-after 'install-license-files 'delete-extraneous-files - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (license-dir (string-append out "/share/doc/" - ,name "-" ,version))) - ;; XXX These files are installed erroneously. - (delete-file (string-append license-dir "/licence.c")) - (delete-file (string-append license-dir "/licence.o"))) - #t))) - #:tests? #f)) ;no 'check' target + #:tests? #f)) ; No 'check' target + (native-inputs + `(("pkg-config" ,pkg-config))) (inputs - `(("libx11" ,libx11) - ("openssl" ,openssl))) + `(("gnutls" ,gnutls) + ("libx11" ,libx11) + ("libxcursor" ,libxcursor) + ("nettle" ,nettle))) (home-page "https://www.rdesktop.org/") (synopsis "Client for Windows Terminal Services") (description diff --git a/gnu/packages/rdf.scm b/gnu/packages/rdf.scm index 1f2b713d2d..b086d2f00f 100644 --- a/gnu/packages/rdf.scm +++ b/gnu/packages/rdf.scm @@ -299,14 +299,14 @@ ideal (e.g. in LV2 implementations or embedded applications).") (define-public sord (package (name "sord") - (version "0.16.2") + (version "0.16.4") (source (origin (method url-fetch) (uri (string-append "https://download.drobilla.net/sord-" version ".tar.bz2")) (sha256 (base32 - "13fshxwpipjrvsah1m2jw1kf022z2q5vpw24bzcznglgvms13x89")))) + "1mwh4qvp9q4vgrgg5bz9sgjhxscncrylf2b06h0q55ddwzs9hndi")))) (build-system waf-build-system) (arguments `(#:tests? #f ; no check target diff --git a/gnu/packages/regex.scm b/gnu/packages/regex.scm index 7582502069..65541788a1 100644 --- a/gnu/packages/regex.scm +++ b/gnu/packages/regex.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2014 John Darrington ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com> -;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,7 +30,7 @@ (define-public re2 (package (name "re2") - (version "2019-09-01") + (version "2019-11-01") (home-page "https://github.com/google/re2") (source (origin (method git-fetch) @@ -38,7 +38,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1a0m3p0nx7vz2sgryrsjnbiwkjpj98swjb29r0w5lsv3f92dqyn4")))) + "1w6djkydjgwavml2qchq24834jkbngyxc1dc4vk8vkgajglv9pff")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) diff --git a/gnu/packages/rsync.scm b/gnu/packages/rsync.scm index b20b841478..fad995bc88 100644 --- a/gnu/packages/rsync.scm +++ b/gnu/packages/rsync.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2016 Mark H Weaver <mhw@netris.org> -;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2017, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019 Leo Famulari <leo@famulari.name> ;;; @@ -30,6 +30,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu)) @@ -61,14 +62,16 @@ files in the destination.") (define-public librsync (package (name "librsync") - (version "2.0.2") + (version "2.2.1") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/librsync/librsync/archive/v" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/librsync/librsync.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1waa581pcscc1rnvy06cj584k5dx0dc7jj79wsdj7xw4xqh9ayz6")))) + "08wdlxsa9zg2pyasz1lwg70d5psi4amv81v4yxwffx67ndzb9yp5")))) (build-system cmake-build-system) (inputs `(("popt" ,popt))) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index b4fd02cd9a..695c38694a 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3682,13 +3682,13 @@ to reproduce user environments.") (define-public ruby-nokogiri (package (name "ruby-nokogiri") - (version "1.10.4") + (version "1.10.5") (source (origin (method url-fetch) (uri (rubygems-uri "nokogiri" version)) (sha256 (base32 - "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv")))) + "185g3dwba73jqxjr94bd2zk6fil6n9hmcfnfyzh3p1w47vm296r7")))) (build-system ruby-build-system) (arguments ;; Tests fail because Nokogiri can only test with an installed extension, @@ -8784,18 +8784,17 @@ then check out http://127.0.0.1:1080 to see the mail.") (define-public ruby-backport (package (name "ruby-backport") - (version "1.1.1") + (version "1.1.2") (source (origin - ;; The gem does not include test code, so fetch from the Git repository + ;; The gem does not include test code, so fetch from the Git repository. (method git-fetch) (uri (git-reference (url "https://github.com/castwide/backport.git") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "0ii3y1wx1n48nd2mhlv0v61b2m21h7dg30if9vc2idza7k4afyw8")))) + (base32 "18fpg1n7n2z02ykz9v1x1q0cqa2lvivf8ygka768s01q1r9wfwv2")))) (build-system ruby-build-system) (arguments `(#:test-target "spec")) diff --git a/gnu/packages/sagemath.scm b/gnu/packages/sagemath.scm index 7615b37759..a749f5633a 100644 --- a/gnu/packages/sagemath.scm +++ b/gnu/packages/sagemath.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr> +;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -240,7 +241,7 @@ represented as strings.") (define-public pynac (package (name "pynac") - (version "0.7.25") + (version "0.7.26") (source (origin (method git-fetch) @@ -249,8 +250,7 @@ represented as strings.") (commit (string-append "pynac-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "0nnifvg6kzx0lq6gz7znind8g30v3d2pjfwgsdiks3vv9kv9nbj3")))) + (base32 "09d2p74x1arkydlxy6pw4p4byi7r8q7f29w373h4d8a215kadc6d")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index c69345910b..a60b735414 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2015, 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> -;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016, 2017, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@openmailbox.org> ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2017, 2018 Marius Bakke <mbakke@fastmail.com> @@ -27,6 +27,7 @@ (define-module (gnu packages samba) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix build-system gnu) #:use-module (guix licenses) #:use-module (guix utils) @@ -99,13 +100,14 @@ the Linux kernel CIFS client.") (name "iniparser") (version "4.1") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/ndevilla/iniparser/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/ndevilla/iniparser") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1bpk8dj9d5cl64lg6jsk0qlzrpg848nymwxc3fx707fk1n0al3cn")))) + "0dhab6pad6wh816lr7r3jb6z273njlgw2vpw8kcfnmi7ijaqhnr5")))) (build-system gnu-build-system) (arguments `(#:make-flags @@ -154,14 +156,14 @@ anywhere.") (define-public samba (package (name "samba") - (version "4.11.0") + (version "4.11.2") (source (origin (method url-fetch) (uri (string-append "https://download.samba.org/pub/samba/stable/" "samba-" version ".tar.gz")) (sha256 (base32 - "174fwi8n191dnb8ix9afchfp59hic6iwa3062iz3y7zzmxs1rpva")))) + "07wzn0fq90mbrfsm5qvyrzvhb9s76yvwqvw9hxazn9azryvz2yyj")))) (build-system gnu-build-system) (arguments `(#:phases diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index 5753035643..cc69c54703 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -590,15 +590,16 @@ mixed.") (define-public chibi-scheme (package (name "chibi-scheme") - (version "0.7.3") + (version "0.8") + (home-page "https://github.com/ashinn/chibi-scheme") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/ashinn/chibi-scheme/archive/" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference (url home-page) (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "16wppf4qzr0748iyp0m89gidsfgq9s6x3gw4xggym91waw4fh742")) - (file-name (string-append "chibi-scheme-" version ".tar.gz")))) + (base32 + "0269d5fhaz7nqjb41vh7yz63mp5s4z08fn4sspwc06z32xksigw9")))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases @@ -610,7 +611,6 @@ mixed.") (list (string-append "PREFIX=" out) (string-append "LDFLAGS=-Wl,-rpath=" out "/lib"))) #:test-target "test")) - (home-page "https://github.com/ashinn/chibi-scheme") (synopsis "Small embeddable Scheme implementation") (description "Chibi-Scheme is a very small library with no external dependencies diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 249b6f1af5..2bd1872bfd 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -260,34 +260,19 @@ that implements both the msgpack and msgpack-rpc specifications.") (define-public yaml-cpp (package (name "yaml-cpp") - (version "0.6.2") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/jbeder/yaml-cpp/archive/" - "yaml-cpp-" version ".tar.gz")) - (sha256 - (base32 - "01gxn7kc8pzyh4aadjxxzq8cignmbwmm9rfrsmgqfg9w2q75dn74")))) + (version "0.6.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jbeder/yaml-cpp.git") + (commit (string-append "yaml-cpp-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0ykkxzxcwwiv8l8r697gyqh1nl582krpvi7m7l6b40ijnk4pw30s")))) (build-system cmake-build-system) (arguments - '(#:configure-flags '("-DBUILD_SHARED_LIBS=ON") - #:phases - (modify-phases %standard-phases - (add-after 'install 'dont-install-gtest-libraries - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (with-directory-excursion - (string-append out "/include") - (delete-file-recursively "gtest") - (delete-file-recursively "gmock")) - (with-directory-excursion - (string-append out "/lib") - (for-each (lambda (file) - (delete-file file)) - '("libgmock.so" "libgmock_main.so" - "libgtest.so" "libgtest_main.so")))) - #t))))) + '(#:configure-flags '("-DYAML_BUILD_SHARED_LIBS=ON"))) (native-inputs `(("python" ,python))) (home-page "https://github.com/jbeder/yaml-cpp") @@ -524,6 +509,3 @@ game development and other performance-critical applications.") (description "This package provides a Python wrapper library to the Apache Arrow-based Feather binary columnar serialization data frame format.") (license license:asl2.0))) - -(define-public python2-feather-format - (package-with-python2 python-feather-format)) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 0579c167fc..40a59635b1 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -673,7 +673,7 @@ The OpenBSD Korn Shell is a cleaned up and enhanced ksh.") (define-public loksh (package (name "loksh") - (version "6.5") + (version "6.6") (source (origin (method git-fetch) @@ -682,7 +682,7 @@ The OpenBSD Korn Shell is a cleaned up and enhanced ksh.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "01ra64zm1ryb4jsbmh8c3fjaymyy1992hzpm6iydbfxn1sjdihha")))) + (base32 "1a8s64n97ikvvi7ckirxnnjvcmhr3dd4rnqm2ivapyzb0wp42jk7")))) (build-system gnu-build-system) (inputs `(("libbsd" ,libbsd) diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index 6630332692..83bbb55f6b 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -279,13 +279,14 @@ below the current cursor position, scrolling the screen if necessary.") (name "hstr") (version "2.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/dvorka/" name "/archive/" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/dvorka/hstr.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "0yk2008bl48hv0v3c90ngq4y45h3nxif2ik6s3l7kag1zs5yv4wd")) - (file-name (string-append name "-" version ".tar.gz")))) + "1y9vsfbg07gbic0daqy569d9pb9i1d07fym3q7a0a99hbng85s20")))) (build-system gnu-build-system) (arguments `(#:phases diff --git a/gnu/packages/speech.scm b/gnu/packages/speech.scm index 38ae8ae6f8..21ad6f8928 100644 --- a/gnu/packages/speech.scm +++ b/gnu/packages/speech.scm @@ -25,6 +25,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (gnu packages) @@ -199,13 +200,14 @@ stable and well documented interface.") (name "sonic") (version "0.2.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/waywardgeek/sonic/archive/" - "release-" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/waywardgeek/sonic") + (commit (string-append "release-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "11a0q9wkgbb9ymf52v7dvybfhj8hprgr67zs1xcng143fvjpr0n7")))) + "08xwnpw9cnaix1n1i7gvpq5hrfrqc2z1snjhjapfam506hrc77g4")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; No test suite. diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm index 64c1fc3318..b74137362c 100644 --- a/gnu/packages/sphinx.scm +++ b/gnu/packages/sphinx.scm @@ -30,6 +30,7 @@ (define-module (gnu packages sphinx) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix utils) #:use-module (guix build-system python) #:use-module ((guix licenses) #:prefix license:) @@ -375,13 +376,14 @@ integrate Sphinx documents in web templates and to handle searches.") (name "python-sphinx-gallery") (version "0.1.13") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/sphinx-gallery/sphinx-gallery" - "/archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/sphinx-gallery/sphinx-gallery") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "03fs99mcb1r7qp0xixqv07vcz98sk21yq19ffdysi0infdcpzfkd")))) + "14nbqh9krx2l2y2ylbln6l6w8iak3wac1lngvaf278y1cx7685kg")))) (build-system python-build-system) (arguments ;; FIXME: Tests attempt to download <https://docs.python.org/3/objects.inv>, @@ -541,3 +543,25 @@ and several other projects.") (define-public python2-sphinx-rtd-theme (package-with-python2 python-sphinx-rtd-theme)) + +(define-public python-breathe + (package + (name "python-breathe") + (version "4.13.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "breathe" version)) + (sha256 + (base32 + "1aw749n2ry27434qd7gr99dvsrs3x3chyi9aywmhjj1g4m2j6xf6")))) + (build-system python-build-system) + (propagated-inputs + `(("python-docutils" ,python-docutils) + ("python-six" ,python-six) + ("python-sphinx" ,python-sphinx))) + (home-page "https://github.com/michaeljones/breathe") + (synopsis "ReStructuredText and Sphinx bridge to Doxygen") + (description "This package is an extension to reStructuredText and Sphinx +to be able to read and render the Doxygen xml output.") + (license license:bsd-3))) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index f626e0e5f6..fa1d32a0e0 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 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 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2015, 2016, 2018, 2019 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> @@ -70,7 +70,7 @@ (define-public libssh (package (name "libssh") - (version "0.9.1") + (version "0.9.2") (source (origin (method git-fetch) (uri (git-reference @@ -78,7 +78,7 @@ (commit (string-append "libssh-" version)))) (sha256 (base32 - "1gn8ssb1j8p41w6zy6iagbafgvcgn36ci9yyhhq83sragfjsvxaz")) + "14g4rvp91skn2hlsjyhkv58vhng65xrf34cfqffixa4al869hzgj")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (outputs '("out" "debug")) @@ -707,16 +707,15 @@ shell services and remote host selection.") (define-public clustershell (package (name "clustershell") - (version "1.8") + (version "1.8.2") (source (origin (method url-fetch) - (uri (string-append "https://github.com/cea-hpc/clustershell/archive/v" - version - ".tar.gz")) + (uri (string-append "https://github.com/cea-hpc/clustershell/releases" + "/download/v" version + "/ClusterShell-" version ".tar.gz")) (sha256 - (base32 "1qyf6zp5ikk8rk7zvx5ssbgr9si2bqv3a3415590kd07s7i16nmd")) - (file-name (string-append name "-" version ".tar.gz")))) + (base32 "1gz2g85wpk35n1fp31q753w01y3p8abm7dnbas28q4yjyvikqw75")))) (build-system python-build-system) (inputs `(("openssh" ,openssh))) (propagated-inputs `(("python-pyyaml" ,python-pyyaml))) @@ -741,3 +740,37 @@ optimized execution algorithms, as well as gathering results and merging identical outputs, or retrieving return codes. ClusterShell takes advantage of existing remote shell facilities such as SSH.") (license license:lgpl2.1+))) + +(define-public endlessh + (package + (name "endlessh") + (version "1.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/skeeto/endlessh/releases/" + "download/" version "/endlessh-" version ".tar.xz")) + (sha256 + (base32 + "0hhsr65hzrcb7ylskmxyr92svzndhks8hqzn8hvg7f7j89rkvq5k")))) + (build-system gnu-build-system) + (arguments + '(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) + "CC=gcc") + #:tests? #f ; no test target + #:phases + (modify-phases %standard-phases + (delete 'configure)))) ; no configure script + (home-page "https://github.com/skeeto/endlessh") + (synopsis "SSH tarpit that slowly sends an endless banner") + (description + "Endlessh is an SSH tarpit that very slowly sends an endless, random SSH +banner. It keeps SSH clients locked up for hours or even days at a time. The +purpose is to put your real SSH server on another port and then let the script +kiddies get stuck in this tarpit instead of bothering a real server. + +Since the tarpit is in the banner before any cryptographic exchange occurs, this +program doesn't depend on any cryptographic libraries. It's a simple, +single-threaded, standalone C program. It uses @code{poll()} to trap multiple +clients at a time.") + (license license:unlicense))) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 4618c29c7c..b4de0e812b 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -589,14 +589,13 @@ and operations on them using LAPACK and SuiteSparse.") (define-public r-nlme (package (name "r-nlme") - (version "3.1-141") + (version "3.1-142") (source (origin (method url-fetch) (uri (cran-uri "nlme" version)) (sha256 - (base32 - "0ml00g79bimjcl0sgn6h55l5b4gfmnsnc1vvmivggn0318k4c04i")))) + (base32 "0figfb1i22hfkkhzpprmpp723s01r43x725a1ab0pc9gsxqg90nx")))) (build-system r-build-system) (propagated-inputs `(("r-lattice" ,r-lattice))) @@ -612,14 +611,13 @@ nonlinear mixed-effects models.") (define-public r-mgcv (package (name "r-mgcv") - (version "1.8-30") + (version "1.8-31") (source (origin (method url-fetch) (uri (cran-uri "mgcv" version)) (sha256 - (base32 - "0x9jr0a4r8v6jb0r4m3m1sk606s2x3lmg5ndz5bz0xxvqpzf593q")))) + (base32 "1if34mqsn9r7g0l82lxvvx0wjhi9paqdymyd73nschxcl1if8vbk")))) (build-system r-build-system) (propagated-inputs `(("r-matrix" ,r-matrix) @@ -694,14 +692,14 @@ analysis.") (define-public r-survival (package (name "r-survival") - (version "2.44-1.1") + (version "3.1-7") (source (origin (method url-fetch) (uri (cran-uri "survival" version)) (sha256 (base32 - "1faiwyg7x8y2kfzb66l4yc8br0mdlz4k20znmjrwq96dbzhm3cam")))) + "1ij77bgfcjx29xkx5bck0sv4ybglpcmzzv9ilkinj8fqhhclbs8p")))) (build-system r-build-system) (propagated-inputs `(("r-matrix" ,r-matrix))) @@ -1451,13 +1449,13 @@ emitter (http://pyyaml.org/wiki/LibYAML) for R.") (define-public r-knitr (package (name "r-knitr") - (version "1.25") + (version "1.26") (source (origin (method url-fetch) (uri (cran-uri "knitr" version)) (sha256 (base32 - "0lsc201a4f6xksmsklhr6gmhl0mxih0xhlcdvhs2ypzcx1pvkpnv")))) + "08f3bdd5cnnbigybr9vmkhq12n64pbmn4layl3w5rwk8xi5kbnrq")))) (build-system r-build-system) (propagated-inputs `(("r-evaluate" ,r-evaluate) @@ -1606,20 +1604,22 @@ R packages that praise their users.") (define-public r-testthat (package (name "r-testthat") - (version "2.2.1") + (version "2.3.0") (source (origin (method url-fetch) (uri (cran-uri "testthat" version)) (sha256 (base32 - "0y0bvggm4pzkzp6xn7b8cf3ybqp9ijxkhhyp3z49a9iipc90bvk7")))) + "0qlajfgm3zjrmladwcm0xzw8zp2431zz2asa2w7lpg7zl6ymvz29")))) (build-system r-build-system) (propagated-inputs `(("r-cli" ,r-cli) ("r-crayon" ,r-crayon) ("r-digest" ,r-digest) + ("r-ellipsis" ,r-ellipsis) ("r-evaluate" ,r-evaluate) ("r-magrittr" ,r-magrittr) + ("r-pkgload" ,r-pkgload) ("r-praise" ,r-praise) ("r-r6" ,r-r6) ("r-rlang" ,r-rlang) @@ -1634,13 +1634,13 @@ flexible and easy to set up.") (define-public r-r6 (package (name "r-r6") - (version "2.4.0") + (version "2.4.1") (source (origin (method url-fetch) (uri (cran-uri "R6" version)) (sha256 (base32 - "1kmbw2k5vvzwh3wwmn66mszpfny0z6k8dca980qgbxgvfh0i3gkh")))) + "0gma5z41mx02ka9h96xdyf3p6i1rx0izczrzj26c4mbnh9jgvc16")))) (build-system r-build-system) (home-page "https://github.com/wch/R6/") (synopsis "Classes with reference semantics in R") @@ -2309,13 +2309,13 @@ tables, autolinks and strikethrough text.") (define-public r-roxygen2 (package (name "r-roxygen2") - (version "6.1.1") + (version "7.0.0") (source (origin (method url-fetch) (uri (cran-uri "roxygen2" version)) (sha256 (base32 - "0wq29ilqas8yn2z8v49fk0hbgchg29nmyyhwczgdipz0cbhbfipd")))) + "13sani3y9ql56cvja8pfjpwsbq8pismc52ns1cq1zgi0jycgqja5")))) (build-system r-build-system) (propagated-inputs `(("r-brew" ,r-brew) @@ -2326,6 +2326,7 @@ tables, autolinks and strikethrough text.") ("r-purrr" ,r-purrr) ("r-r6" ,r-r6) ("r-rcpp" ,r-rcpp) + ("r-rlang" ,r-rlang) ("r-stringi" ,r-stringi) ("r-stringr" ,r-stringr) ("r-xml2" ,r-xml2))) @@ -2504,14 +2505,14 @@ were originally a part of the r-devtools package.") (define-public r-hms (package (name "r-hms") - (version "0.5.1") + (version "0.5.2") (source (origin (method url-fetch) (uri (cran-uri "hms" version)) (sha256 (base32 - "1v4cxfpvp85la4gqla6b4q2bwx4jv1fxqwndcnjsibbnybz6wcvd")))) + "0h24dsagn4kcr65arn73mpqapcg002kw4kyxfqyff95j6s6cjifl")))) (build-system r-build-system) (propagated-inputs `(("r-rlang" ,r-rlang) @@ -2710,13 +2711,13 @@ certain criterion, e.g., it contains a certain regular file.") (define-public r-rmarkdown (package (name "r-rmarkdown") - (version "1.16") + (version "1.17") (source (origin (method url-fetch) (uri (cran-uri "rmarkdown" version)) (sha256 - (base32 "1p11g9lma604ndrhvyvriqxxp91lardc543nmvmr49n1m7309qvz")))) + (base32 "18dj6nr1m79pv1pv9w2n0rhiidwqjb2w8w1rnpcwijwbz4i8d3k2")))) (properties `((upstream-name . "rmarkdown"))) (build-system r-build-system) (propagated-inputs @@ -3178,13 +3179,13 @@ using the multicore functionality of the parallel package.") (define-public r-dt (package (name "r-dt") - (version "0.9") + (version "0.10") (source (origin (method url-fetch) (uri (cran-uri "DT" version)) (sha256 (base32 - "17han4560jv8mmfn4f8adrwh0x25fxz2qwd0sv7vv4iky5and8a7")))) + "0vwhn1mcwv0hkbxnppf6vip23iiib0szvp1h3prawlkvd74xziiw")))) (properties `((upstream-name . "DT"))) (build-system r-build-system) @@ -3255,20 +3256,21 @@ analysis of large sparse or dense matrices.") (define-public r-glmnet (package (name "r-glmnet") - (version "2.0-18") + (version "3.0") (source (origin (method url-fetch) (uri (cran-uri "glmnet" version)) (sha256 (base32 - "0sr5akaiaab1sdh9c8gfmc4kp9b4vqhd90d9ig0rqpqhp3bykp78")))) + "1fwspkxbsx7jy5h8zcdl0q8xsbj7svjjbcmg5lfpxdsgyyww46v7")))) (build-system r-build-system) - (inputs + (native-inputs `(("gfortran" ,gfortran))) (propagated-inputs `(("r-foreach" ,r-foreach) - ("r-matrix" ,r-matrix))) + ("r-matrix" ,r-matrix) + ("r-shape" ,r-shape))) (home-page "http://www.jstatsoft.org/v33/i01") (synopsis "Lasso and elastic-net regularized generalized linear models") (description @@ -3536,13 +3538,13 @@ want to migrate to S4.") (define-public r-r-oo (package (name "r-r-oo") - (version "1.22.0") + (version "1.23.0") (source (origin (method url-fetch) (uri (cran-uri "R.oo" version)) (sha256 (base32 - "0k6xwy93fpb2p7bs76lzk52br9rv5xnd9524xj8qyazv1132x1n0")))) + "189fb7mmyzwg6nn8rza8iip7fbyws7i2vkmzy672x9mhvgilq4pm")))) (properties `((upstream-name . "R.oo"))) (build-system r-build-system) (propagated-inputs @@ -3797,14 +3799,14 @@ and tidyr provides no margins or aggregation.") (define-public r-hexbin (package (name "r-hexbin") - (version "1.27.3") + (version "1.28.0") (source (origin (method url-fetch) (uri (cran-uri "hexbin" version)) (sha256 (base32 - "14f181lw6sj5xhfxbrpyyinsjfl0nzqilq6z80lgrhj2cnkj593y")))) + "0b58jb1kz39wzrnkv077cfzns889xly7psvhxnm3xmnx6yvd986d")))) (build-system r-build-system) (propagated-inputs `(("r-lattice" ,r-lattice))) @@ -3842,13 +3844,13 @@ features present in other programming languages.") (define-public r-plotly (package (name "r-plotly") - (version "4.9.0") + (version "4.9.1") (source (origin (method url-fetch) (uri (cran-uri "plotly" version)) (sha256 (base32 - "1kz2hm7vnkn4clxr6yyxxnmdmkz9zwjq6bzysw7j27r3721i8qgp")))) + "0gadam4qw81q9gpjp7sqrpd7ikmcdsc78d8vjn39g0xzs5j8r845")))) (build-system r-build-system) (propagated-inputs `(("r-base64enc" ,r-base64enc) @@ -4045,14 +4047,13 @@ package instead.") (define-public r-hmisc (package (name "r-hmisc") - (version "4.2-0") + (version "4.3-0") (source (origin (method url-fetch) (uri (cran-uri "Hmisc" version)) (sha256 - (base32 - "1n8i2jhc308hd6bvys9cd7nrz7pwjszs03r5bwlh1pc869ki95ly")))) + (base32 "0rb1m6138lqzb46nss9ggvhghipd10vdnwsy6iq2wzynrynzkwkz")))) (properties `((upstream-name . "Hmisc"))) (build-system r-build-system) (native-inputs @@ -5157,14 +5158,13 @@ using modular prediction and response module classes.") (define-public r-quantreg (package (name "r-quantreg") - (version "5.51") + (version "5.52") (source (origin (method url-fetch) (uri (cran-uri "quantreg" version)) (sha256 - (base32 - "1cdx51a9g6fjq2g9arr6wp6ghkyl2m6bs2dj4kcycvpn8p9304yz")))) + (base32 "0rq9as31wiz41lmi9hmdq3gknpcbpwqzfcn065ysjdxzjdb57dcy")))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index b3305be6ba..b30202fb43 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Ludovic Courtès <ludo@gnu.org> -;;; Copyright © 2018 Nicolas Goaziou <mail@nicolasgoaziou.fr> +;;; Copyright © 2018, 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -264,14 +264,14 @@ over the Internet in an HTTP and CDN friendly way; (define-public rclone (package (name "rclone") - (version "1.49.4") + (version "1.50.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/rclone/rclone/releases/download/" "v" version "/rclone-v" version ".tar.gz")) (sha256 - (base32 "1bs7b3iy39igli1jqrgjzh32zzzhp1yj8rybsx8i34p9wj2zq2h7")))) + (base32 "05p25i1d2fs2ak155rl5m9kkpkrifsfhk5sd5dl6jx22hc4cimj8")))) ;; FIXME: Rclone bundles some libraries Guix already provides. Need to ;; un-bundle them. (build-system go-build-system) diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 81e710a536..abb68f62b2 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -243,13 +243,14 @@ internet.") (name "libsrtp") (version "2.2.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/cisco/libsrtp/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/cisco/libsrtp") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "02x5l5h2nq6f9gq1bmgz5v9jmnqaab51p8aldglng1z7pjbp9za4")))) + "1ac7xs1djb03j131f1gmqyfmrplblid9qqyxahs0shdy707r5ll6")))) (native-inputs `(("psmisc" ,psmisc) ;some tests require 'killall' ("procps" ,procps))) diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 22083940c4..75c0092064 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Mckinley Olsen <mck.olsen@gmail.com> -;;; Copyright © 2016, 2017 Alex Griffin <a@ajgrf.com> +;;; Copyright © 2016, 2017, 2019 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2016 David Craven <david@craven.ch> ;;; Copyright © 2016, 2017, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016, 2017 José Miguel Sánchez García <jmi2k@openmailbox.org> @@ -171,14 +171,17 @@ insert mode and command mode where keybindings have different functions.") (define-public asciinema (package (name "asciinema") - (version "1.4.0") + (version "2.0.2") (source (origin - (method url-fetch) - (uri (pypi-uri "asciinema" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/asciinema/asciinema") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1jrf8c8711gkdilmvyv3d37kp8xfvdc5cqighw5k92a6g9z4acgv")))) + "1a2pysxnp6icyd08mgf66xr6f6j0irnfxdpf3fmzcz31ix7l9kc4")))) (build-system python-build-system) (arguments `(#:phases @@ -186,14 +189,16 @@ insert mode and command mode where keybindings have different functions.") (add-before 'build 'patch-exec-paths (lambda* (#:key inputs #:allow-other-keys) (let ((ncurses (assoc-ref inputs "ncurses"))) - (substitute* "asciinema/recorder.py" + (substitute* "asciinema/term.py" (("'tput'") (string-append "'" ncurses "/bin/tput'")))) - #t))))) + #t)) + (replace 'check + (lambda _ (invoke "nosetests" "-v")))))) (inputs `(("ncurses" ,ncurses))) (native-inputs ;; For tests. - `(("python-requests" ,python-requests))) + `(("python-nose" ,python-nose))) (home-page "https://asciinema.org") (synopsis "Terminal session recorder") (description @@ -214,6 +219,7 @@ text-based approach to terminal recording.") (uri (git-reference (url (string-append "https://github.com/Aetf/" name)) (commit commit))) + (file-name (git-file-name name version)) (sha256 (base32 "0mwn91i5h5d518i1s05y7hzv6bc13vzcvxszpfh77473iwg4wprx")))) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 1e26fc3965..d184d7616b 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1002,6 +1002,7 @@ symbol fonts.") (origin (method svn-fetch) (uri (texlive-ref "latex" "mflogo")) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "15i2ib6nvhf31g1b92c6njf7n0g29znlq7hbfp9ii7qabhcwwvrj")))) @@ -6229,15 +6230,15 @@ and Karl Berry.") (define-public lyx (package (name "lyx") - (version "2.3.2-2") + (version "2.3.3") (source (origin (method url-fetch) - (uri (string-append "http://ftp.lyx.org/pub/lyx/stable/" + (uri (string-append "https://ftp.lyx.org/pub/lyx/stable/" (version-major+minor version) ".x/" - name "-" version ".tar.gz")) + "lyx-" version ".tar.gz")) (sha256 (base32 - "0vr0qwis6rhind6azfa270hqxci7rj8qb1kk5x6lm80mc34nvrqi")) + "0j3xincwmsscfgv13g3z6h4kx1qfzgg8x71fs393akcdxsh2g07c")) (modules '((guix build utils))) (snippet '(begin @@ -6303,19 +6304,15 @@ and Karl Berry.") ("hunspell" ,hunspell) ; Note: Could also use aspell instead. ("libx11" ,libx11) ("mythes" ,mythes) - ("python" ,python-2) + ("python" ,python) ("qtbase" ,qtbase) ("qtsvg" ,qtsvg) ("zlib" ,zlib))) (propagated-inputs `(("texlive" ,(texlive-union (list texlive-fonts-ec))))) - ;; FIXME: Python 3.7.0 cannot be used because the test infrastructure - ;; "requires a bytes-like object, not 'str'". This may be fixed with - ;; upgrades to Python. (native-inputs - `(("python" ,python-2) - ("pkg-config" ,pkg-config) - ("bc" ,bc))) + `(("python" ,python) + ("pkg-config" ,pkg-config))) (home-page "https://www.lyx.org/") (synopsis "Document preparation system with GUI") (description "LyX is a document preparation system. It excels at letting @@ -6473,6 +6470,7 @@ page, a new page will be started.") (origin (method svn-fetch) (uri (texlive-ref "latex" "changepage")) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "1rpw8xg5p4jsyh236jma9dz3l29wjx4062f154b3wak5yjcxyxyb")))) @@ -7004,6 +7002,7 @@ effects, varying slide transitions and animations.") (origin (method svn-fetch) (uri (texlive-ref "latex" "xmpincl")) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "0lq3dfb4fsw955gjwllnk7cg00ciq5mva64mlpbva6g2jz117734")))) @@ -7026,6 +7025,7 @@ the file to which it applies.") (origin (method svn-fetch) (uri (texlive-ref "latex" "pdfx")) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "0ikxg8yzq78hy5b9x13d4nah46d0yvmwlqmdri06pygbx116dcac")))) @@ -7226,6 +7226,7 @@ are part of the LaTeX required tools distribution, comprising the packages: (source (origin (method svn-fetch) (uri (texlive-ref "latex" "xkeyval")) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "0wancavix39j240pd8m9cgmwsijwx6jd6n54v8wg0x2rk5m44myp")))) @@ -7305,6 +7306,7 @@ keys.") (origin (method svn-fetch) (uri (texlive-ref "latex" "standalone")) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "192ydxcn8ir96q8qwvnppksmqf5i0p50i0wz6iqazbwmh3dqxpx4")))) @@ -7372,6 +7374,7 @@ package to handle all of the possible unit-related needs of LaTeX users.") (origin (method svn-fetch) (uri (texlive-ref "latex" "booktabs")) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "1dqid48vgh25wmw8xzmx6x3pfgz1y9f0r8aza1yxq2mjny5yf68x")))) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index e83bcad509..0ee64f3040 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -66,12 +66,12 @@ (version "0.5") (source (origin (method url-fetch) - (uri (string-append "https://github.com/martanne/" - name "/archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (uri (string-append "https://github.com/martanne/vis/releases" + "/download/v" version + "/vis-v" version ".tar.gz")) (sha256 (base32 - "1xbxb3q963s6sav63yw0x30lm0wvxsrzb7hr6a7dh4f8r7mp1skp")))) + "0aw35n8xk7ir84ckvczc6yshj9ynishrlz0qlv4yc1afbra1gxmn")))) (build-system gnu-build-system) (arguments `(#:test-target "test" @@ -444,7 +444,7 @@ and Octave. TeXmacs is completely extensible via Guile.") (define-public scintilla (package (name "scintilla") - (version "4.2.0") + (version "4.2.1") (source (origin (method url-fetch) (uri (let ((v (apply string-append (string-split version #\.)))) @@ -452,7 +452,7 @@ and Octave. TeXmacs is completely extensible via Guile.") "https://www.scintilla.org/scintilla" v ".tgz"))) (sha256 (base32 - "02ymi86fpcypg6423vfr54lbkxbks046q02v3m3dypawcf3bqy42")))) + "0l52s39zg8l3fcj86nqm3hzh0sa4i981dasil54a40dvz3d3cvrx")))) (build-system gnu-build-system) (arguments `(#:make-flags (list "GTK3=1" "CC=gcc" "-Cgtk") @@ -468,15 +468,6 @@ and Octave. TeXmacs is completely extensible via Guile.") "$(CC) -shared $^ -o $@") (("\\$\\(RANLIB\\) \\$@") "")) #t)) - (add-before 'build 'expand-C++-include-path - (lambda* (#:key inputs #:allow-other-keys) - ;; Make <gcc>/include/c++/ext/string_conversions.h find - ;; <stdlib.h>. - (let* ((path "CPLUS_INCLUDE_PATH") - (gcc (assoc-ref inputs "gcc")) - (c++ (string-append gcc "/include/c++"))) - (setenv path (string-append c++ ":" (getenv path)))) - #t)) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -487,8 +478,8 @@ and Octave. TeXmacs is completely extensible via Guile.") (find-files "include/" ".")) #t)))))) (native-inputs - `(("gcc" ,gcc-7) ;require GCC 7.1+ - ("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + ("python" ,python-wrapper))) (inputs `(("gtk+" ,gtk+))) (home-page "https://www.scintilla.org/") @@ -506,14 +497,14 @@ and multiple fonts.") (define-public geany (package (name "geany") - (version "1.35") + (version "1.36") (source (origin (method url-fetch) (uri (string-append "https://download.geany.org/" "geany-" version ".tar.bz2")) (sha256 (base32 - "179xfnvhcxsv54v2mlrhykqv2j7klniln5sffvqqpjmdvwyivvim")) + "0gnm17cr4rf3pmkf0axz4a0fxwnvp55ji0q0lzy88yqbshyxv14i")) (modules '((guix build utils))) (snippet '(begin (delete-file-recursively "scintilla") @@ -546,6 +537,8 @@ and multiple fonts.") (("geany_LDFLAGS =" all) (string-append all " -lscintilla"))) (substitute* "doc/Makefile.am" (("\\$\\(INSTALL_DATA\\) \\$\\(top_srcdir\\)/scintilla/License.txt \\$\\(DOCDIR\\)/ScintillaLicense.txt") "")) + (substitute* "tests/Makefile.am" + (("AM_LDFLAGS =" all) (string-append all " -lscintilla"))) (for-each delete-file (list "autogen.sh" "configure" "Makefile.in")) #t))))) (home-page "https://www.geany.org") diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 79cf172179..668260b7d8 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2015 Roel Janssen <roel@gnu.org> ;;; Copyright © 2016 Jelle Licht <jlicht@fsfe.org> ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com> -;;; Copyright © 2016, 2018 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 ng0 <ng0@n0.is> ;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017 Eric Bavier <bavier@member.fsf.org> @@ -117,12 +117,13 @@ handy front-end to the library.") (version "1.19") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/nijel/enca/archive/" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/nijel/enca") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "099z526i7qgij7q1w3lvhl88iv3jc3nqxca2i09h6s08ghyrmzf4")) - (file-name (string-append name "-" version ".tar.gz")))) + (base32 "19q7cwwxmmk5j9438bsqdpjvdjawsd3zmw1zyqgi7s4m0rasr3ah")))) (build-system gnu-build-system) ;; enca-1.19 tests fail with recent recode. ;(inputs `(("recode" ,recode))) @@ -449,13 +450,14 @@ application code.") (name "pfff") (version "1.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/pfff/pfff/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/pfff/pfff") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "00m553aa277iarxj6dalmklyb64r7ias49bfwzbacsfg8h3kar8m")))) + "1nxkfm7zliq3rmr7yp871sppwfnz71iz364m2sgazny71pzykggc")))) (build-system cmake-build-system) (home-page "http://biit.cs.ut.ee/pfff/") (synopsis "Probabilistic fast file fingerprinting tool") @@ -576,14 +578,14 @@ spreadsheets and outputs it in comma-separated-value format, and (name "utfcpp") (version "2.3.5") (source (origin - (method url-fetch) - (uri - (string-append "https://github.com/nemtrif/utfcpp/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/nemtrif/utfcpp") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0gcqcfw19kfim8xw29xdp91l310yfjyrqdj2zsx8xx02dkpy1zzk")))) + "1gr98d826z6wa58r1s5i7rz7q2x3r31v7zj0pjjlrc7gfxwklr4s")))) (build-system cmake-build-system) (arguments `(#:out-of-source? #f diff --git a/gnu/packages/tigervnc.scm b/gnu/packages/tigervnc.scm index cb44d355c6..85ac730f3d 100644 --- a/gnu/packages/tigervnc.scm +++ b/gnu/packages/tigervnc.scm @@ -47,6 +47,7 @@ (git-reference (url "https://github.com/TigerVNC/tigervnc.git") (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 "0b47fg3741qs3zdpl2zr0s6jz46dypp2j6gqrappbzm3ywnnmm1x")))) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index bfc5e710c4..a23eac58fc 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -495,15 +495,13 @@ required structures.") ;; Provide a TLS-enabled netcat. "--enable-nc"))) (native-search-paths - ;; FIXME: These two variables must designate a single file or directory - ;; and are not actually "search paths." In practice it works OK in - ;; user profiles because there's always just one item that matches the - ;; specification. (list (search-path-specification (variable "SSL_CERT_DIR") + (separator #f) ;single entry (files '("etc/ssl/certs"))) (search-path-specification (variable "SSL_CERT_FILE") + (separator #f) ;single entry (files '("etc/ssl/certs/ca-certificates.crt"))))) (home-page "https://www.libressl.org/") (synopsis "SSL/TLS implementation") @@ -522,13 +520,13 @@ netcat implementation that supports TLS.") (package (name "python-acme") ;; Remember to update the hash of certbot when updating python-acme. - (version "0.39.0") + (version "0.40.1") (source (origin (method url-fetch) (uri (pypi-uri "acme" version)) (sha256 (base32 - "021nyzld949ahrhamlcgmzmk8r1gxrbs8wypnks08s6y2rfvgz52")))) + "1z2zibs9lyxi5gxw9bny1127bjliwsp476kai1wnnnwd8238dgrk")))) (build-system python-build-system) (arguments `(#:phases @@ -579,7 +577,7 @@ netcat implementation that supports TLS.") (uri (pypi-uri "certbot" version)) (sha256 (base32 - "1q6zmnfyyk4rhsjg9s2gxx1ciink57ybnv32dgw8m2059lffwp48")))) + "1l8h7ggq75h59246mmzigmjr5jvzi29hihrnz9aiqh6g8hq1pj4d")))) (build-system python-build-system) (arguments `(,@(substitute-keyword-arguments (package-arguments python-acme) diff --git a/gnu/packages/upnp.scm b/gnu/packages/upnp.scm index 1c2479064a..390a3387ab 100644 --- a/gnu/packages/upnp.scm +++ b/gnu/packages/upnp.scm @@ -47,7 +47,7 @@ (origin (method url-fetch) (uri (string-append "https://miniupnp.tuxfamily.org/files/" - name "-" version ".tar.gz")) + "miniupnpc-" version ".tar.gz")) (sha256 (base32 "0rg1i51lnyq8zgflhcg981kq4348vgq03ndmbgiv7knd1vmfzb8z")))) (build-system gnu-build-system) @@ -89,49 +89,6 @@ over IRC, instant messaging, network games, and most server software.") (license (x11-style "file://LICENSE" "See 'LICENSE' file in the distribution")))) -(define-public monero-miniupnpc - ;; This package is the bundled version of miniupnpc used with monero. - ;; Monero-project has been maintaining its own version of the package since - ;; release 0.12.2.0. It includes security fixes not included in upstream - ;; releases. - (let ((revision "0") - (commit "6a63f9954959119568fbc4af57d7b491b9428d87")) - (package - (inherit miniupnpc) - (name "miniupnpc-monero") - (version (string-append "2.1-monero-0.12.3.0-" revision "." - (string-take commit 7))) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/monero-project/miniupnp/") - (commit commit))) - (sha256 - (base32 - "0s67zcz978iapjlq30yy9dl8qda9xhrl3jdi5f99cnbglh5gy16a")) - (file-name (string-append name "-" version "-checkout")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Delete miniupnp subprojects except for miniupnpc. - (for-each - delete-file-recursively - '("minissdpd" "miniupnpc-async" "miniupnpc-libevent" - "miniupnpd" )) - #t)))) - (arguments - (substitute-keyword-arguments (package-arguments miniupnpc) - ((#:phases phases) - `(modify-phases ,phases - (add-before 'build 'change-directory - (lambda _ - (chdir "miniupnpc") - #t)) - (add-after 'change-directory 'chmod-header-file - (lambda _ - (chmod "miniupnpc.h" #o644) - #t))))))))) - (define-public libupnp (package (name "libupnp") diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index bcc3377a44..cca61147b6 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -146,14 +146,14 @@ as well as the classic centralized workflow.") (name "git") ;; XXX When updating Git, check if the special 'git-source' input to cgit ;; needs to be updated as well. - (version "2.23.0") + (version "2.24.0") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/software/scm/git/git-" version ".tar.xz")) (sha256 (base32 - "0rv0y45gcd3h191isppn77acih695v4pipdj031jvs9rd1ds0kr3")))) + "06rpakbwzck85ncfsgv4xmq3iwab9d4f5y6dqhl8nvb2fccxcwcz")))) (build-system gnu-build-system) (native-inputs `(("native-perl" ,perl) @@ -166,7 +166,7 @@ as well as the classic centralized workflow.") version ".tar.xz")) (sha256 (base32 - "0sllhyl0w29v4n303hqfmcc3apafnwk4sk78anyjjhpzd0zl6n4m")))) + "19h4bhk78rljxk921fcz5xy1z4ss75zw03n9nqf2r512dz0p5j5h")))) ;; For subtree documentation. ("asciidoc" ,asciidoc) ("docbook-xsl" ,docbook-xsl) @@ -183,14 +183,17 @@ as well as the classic centralized workflow.") ;; a problem in 'patch-shebangs'; see <https://bugs.gnu.org/31952>. ("bash-for-tests" ,bash) - ;; For 'gitweb.cgi' + ;; For PCRE support in git grep (USE_LIBPCRE2). + ("pcre" ,pcre2) + + ;; For 'gitweb.cgi'. ("perl-cgi" ,perl-cgi) ;; For 'git-svn'. ("subversion" ,subversion) ("perl-term-readkey" ,perl-term-readkey) - ;; For 'git-send-email' + ;; For 'git-send-email'. ("perl-authen-sasl" ,perl-authen-sasl) ("perl-net-smtp-ssl" ,perl-net-smtp-ssl) ("perl-io-socket-ssl" ,perl-io-socket-ssl) @@ -216,6 +219,8 @@ as well as the classic centralized workflow.") (assoc-ref %build-inputs "bash-for-tests") "/bin/bash") + "USE_LIBPCRE2=yes" + ;; By default 'make install' creates hard links for ;; things in 'libexec/git-core', which leads to huge ;; nars; see <https://bugs.gnu.org/21949>. @@ -505,6 +510,8 @@ everything from small to very large projects with speed and efficiency.") (delete-file-recursively (string-append out "/share/gitweb")) #t))))) + ((#:make-flags flags) + `(delete "USE_LIBPCRE2=yes" ,flags)) ((#:configure-flags flags) ''()) ((#:disallowed-references lst '()) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index b55b011ef6..25ea91d5c9 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -508,7 +508,7 @@ H.264 (MPEG-4 AVC) video streams.") (define-public x265 (package (name "x265") - (version "3.2") + (version "3.2.1") (outputs '("out" "static")) (source (origin @@ -518,7 +518,7 @@ H.264 (MPEG-4 AVC) video streams.") (string-append "https://download.videolan.org/videolan/x265/" "x265_" version ".tar.gz"))) (sha256 - (base32 "0fqkhfhr22gzavxn60cpnj3agwdf5afivszxf3haj5k1sny7jk9n")) + (base32 "1k5vijsy6cgcghw69f5275xfmbjjx7js0nlbgxbd6krnjb7sv6zv")) (patches (search-patches "x265-arm-flags.patch")) (modules '((guix build utils))) (snippet '(begin @@ -1088,20 +1088,26 @@ videoformats depend on the configuration flags of ffmpeg.") (name "vlc") (version "3.0.8") (source (origin - (method url-fetch) - (uri (string-append - "https://download.videolan.org/pub/videolan/vlc/" - (car (string-split version #\-)) - "/vlc-" version ".tar.xz")) - (sha256 - (base32 - "1xmxjpyzdhabchwncz6lvx3kzvl7fz9c42bkv3nbj68albs9w570")))) + (method url-fetch) + (uri (string-append + "https://download.videolan.org/pub/videolan/vlc/" + (car (string-split version #\-)) + "/vlc-" version ".tar.xz")) + (sha256 + (base32 + "1xmxjpyzdhabchwncz6lvx3kzvl7fz9c42bkv3nbj68albs9w570")) + (patches + (search-patches + ;; TODO: The test "libvlc_slaves" fails. Applied upstream as + ;; <https://git.videolan.org/?p=vlc.git;a=commit;h=4186c94104ee528abd6860611b49515f3e6ec644>. + ;; Try removing it in 3.0.9. + "vlc-fix-test_libvlc_slaves.patch")))) (build-system gnu-build-system) (native-inputs `(("flex" ,flex) ("bison" ,bison) ("gettext" ,gettext-minimal) - ("git" ,git) ; needed for a test + ("git" ,git) ; needed for a test ("pkg-config" ,pkg-config))) ;; FIXME: Add optional inputs once available. (inputs @@ -1182,7 +1188,7 @@ videoformats depend on the configuration flags of ffmpeg.") `("BUILDCC=gcc" ,(string-append "LDFLAGS=-Wl,-rpath -Wl," (assoc-ref %build-inputs "ffmpeg") - "/lib")) ;needed for the tests + "/lib")) ;needed for the tests #:phases (modify-phases %standard-phases @@ -1233,11 +1239,11 @@ videoformats depend on the configuration flags of ffmpeg.") (invoke cachegen plugindir)))) (add-after 'install 'wrap-executable (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (plugin-path (getenv "QT_PLUGIN_PATH"))) - (wrap-program (string-append out "/bin/vlc") - `("QT_PLUGIN_PATH" ":" prefix (,plugin-path)))) - #t))))) + (let ((out (assoc-ref outputs "out")) + (plugin-path (getenv "QT_PLUGIN_PATH"))) + (wrap-program (string-append out "/bin/vlc") + `("QT_PLUGIN_PATH" ":" prefix (,plugin-path)))) + #t))))) (home-page "https://www.videolan.org/") (synopsis "Audio and video framework") (description "VLC is a cross-platform multimedia player and framework @@ -1491,7 +1497,7 @@ projects while introducing many more.") (define-public youtube-dl (package (name "youtube-dl") - (version "2019.10.29") + (version "2019.11.05") (source (origin (method url-fetch) (uri (string-append "https://github.com/ytdl-org/youtube-dl/" @@ -1499,7 +1505,7 @@ projects while introducing many more.") version ".tar.gz")) (sha256 (base32 - "1lq6ycjbx07831s24yx42q6m6svas4mf02vbszw0965dbbzs7vp4")))) + "129461i4103slqj3nq69djnlmgjj3lfgmazn41avc5g967w29b85")))) (build-system python-build-system) (arguments ;; The problem here is that the directory for the man page and completion @@ -1796,7 +1802,7 @@ players, like VLC or MPlayer.") (define-public libdvdread (package (name "libdvdread") - (version "6.0.1") + (version "6.0.2") (source (origin (method url-fetch) (uri (string-append "https://download.videolan.org/videolan/" @@ -1804,7 +1810,7 @@ players, like VLC or MPlayer.") "libdvdread-" version ".tar.bz2")) (sha256 (base32 - "1gfmh8ii3s2fw1c8vn57piwxc0smd3va4h7xgp9s8g48cc04zki8")))) + "1c7yqqn67m3y3n7nfrgrnzz034zjaw5caijbwbfrq89v46ph257r")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-libdvdcss=yes"))) @@ -1852,15 +1858,15 @@ MPEG-2 stream containing VOB packets.") (define-public libdvdnav (package (name "libdvdnav") - (version "6.0.0") + (version "6.0.1") (source (origin (method url-fetch) (uri (string-append "https://download.videolan.org/videolan/" - name "/" version "/" - name "-" version ".tar.bz2")) + "libdvdnav/" version "/" + "libdvdnav-" version ".tar.bz2")) (sha256 (base32 - "062njcksmpgw9yv3737qkf93r2pzhaxi9szqjabpa8d010dp38ph")))) + "0cv7j8irsv1n2dadlnhr6i1b8pann2ah6xpxic41f04my6ba6rp5")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) @@ -2048,7 +2054,7 @@ capabilities.") (define-public vapoursynth (package (name "vapoursynth") - (version "37") + (version "48") (source (origin (method git-fetch) (uri (git-reference @@ -2057,7 +2063,7 @@ capabilities.") (file-name (git-file-name name version)) (sha256 (base32 - "1ma2s7dxk6y6l04qj1jvgwia4xj7999ny3a1yx2vbk5l83giam2p")))) + "1i6163bidlp0p9zcnxpsphr44ayfzd51fig4ri7vbrbl9lw9jaih")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) @@ -2202,7 +2208,7 @@ from sites like Twitch.tv and pipes them into a video player of choice.") (define-public mlt (package (name "mlt") - (version "6.16.0") + (version "6.18.0") (source (origin (method git-fetch) (uri (git-reference @@ -2211,7 +2217,7 @@ from sites like Twitch.tv and pipes them into a video player of choice.") (file-name (git-file-name name version)) (sha256 (base32 - "1362fv63p34kza9v4b71b6wakgvsa2vdx9y0g28x3yh4cp4k97kx")))) + "0iiqym15n8kbnjzj0asmm86gs23yykz0va5b475cc4v2vv5admgx")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests @@ -2295,7 +2301,7 @@ be used for realtime video capture via Linux-specific APIs.") (define-public obs (package (name "obs") - (version "24.0.1") + (version "24.0.3") (source (origin (method git-fetch) (uri (git-reference @@ -2304,7 +2310,7 @@ be used for realtime video capture via Linux-specific APIs.") (file-name (git-file-name name version)) (sha256 (base32 - "056s0hs1ds3c57sc0gy39dxaxvwlakl3w25jxgawh0fs99211ar5")))) + "0g8nzs696f3myz4hvygav85b0jgjmn6dicy50axmapdv8miff9xa")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; no tests diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index fbc0b48898..ae07bcd9b6 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -234,13 +234,14 @@ with the editor vim."))) (version "2.1") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/Shougo/neocomplete.vim/" - "archive/ver." version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/Shougo/neocomplete.vim") + (commit (string-append "ver." version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1307gbrdwam2akq9w2lpijc41740i4layk2qkd9sjkqxfch5lni2")))) + "1h6sci5mhdfg6sjsjpi8l5li02hg858zcayiwl60y9j2gqnd18lv")))) (build-system gnu-build-system) (arguments `(#:tests? #f @@ -734,7 +735,7 @@ are detected, the user is notified."))) (define-public neovim (package (name "neovim") - (version "0.4.2") + (version "0.4.3") (source (origin (method git-fetch) @@ -743,8 +744,7 @@ are detected, the user is notified."))) (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "13w446plvgl219lhj29jyimhiqvs1y1byrz4qpdmxgyddmx9xqss")))) + (base32 "03p7pic7hw9yxxv7fbgls1f42apx3lik2k6mpaz1a109ngyc5kaj")))) (build-system cmake-build-system) (arguments `(#:modules ((srfi srfi-26) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 93e1cb5ec5..904b4e1755 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -114,7 +114,16 @@ version ".tar.xz")) (sha256 (base32 - "1ih9v6gxgild3m4g80ld4dr3wp9db3bpy203k73fxgc9hqhn0vk5")))) + "1ih9v6gxgild3m4g80ld4dr3wp9db3bpy203k73fxgc9hqhn0vk5")) + (patches + (list + ;; Fix an ordering issue with recent kernels, see + ;; <https://bugs.gnu.org/37860>. + (qemu-patch + "bf9e0313c27d8e6ecd7f7de3d63e1cb25d8f6311" + "qemu-tests-make-filemonitor-test-more-robust.patch" + (base32 + "1242wqpr8id3cn88pzbig3sqh4znml0g0h2mwdmdyhp81blq7s7n")))))) (build-system gnu-build-system) (arguments '(;; Running tests in parallel can occasionally lead to failures, like: @@ -400,14 +409,16 @@ manage system or application containers.") (define-public libvirt (package (name "libvirt") - (version "5.6.0") + (version "5.8.0") (source (origin (method url-fetch) (uri (string-append "https://libvirt.org/sources/libvirt-" version ".tar.xz")) (sha256 - (base32 "1d5rmcx5fgb024hw8chbiv886n3jal5wp2yajjk5l4qh9s9gkx35")))) + (base32 "0m8cqaqflvys5kaqpvb0qr4k365j09jc5xk6x70yvg8qkcl2hcz2")) + (patches + (search-patches "libvirt-create-machine-cgroup.patch")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -439,6 +450,8 @@ manage system or application containers.") (add-before 'configure 'disable-broken-tests (lambda _ (let ((tests (list "commandtest" ; hangs idly + "qemuxml2argvtest" ; fails + "qemuhotplugtest" ; fails "virnetsockettest" ; tries to network "virshtest"))) ; fails (substitute* "tests/Makefile.in" @@ -480,7 +493,7 @@ manage system or application containers.") ("perl" ,perl) ("pkg-config" ,pkg-config) ("polkit" ,polkit) - ("python" ,python))) + ("python" ,python-wrapper))) (home-page "https://libvirt.org") (synopsis "Simple API for virtualization") (description "Libvirt is a C toolkit to interact with the virtualization @@ -534,15 +547,14 @@ three libraries: (define-public python-libvirt (package (name "python-libvirt") - (version "5.6.0") + (version "5.8.0") (source (origin (method url-fetch) - ;; The latest version hosted on PyPI at 5.6.0 release time was 5.5.0. (uri (string-append "https://libvirt.org/sources/python/libvirt-python-" version ".tar.gz")) (sha256 - (base32 "11i440aibykxw22fzyavmrvn67s8rmnijw5bag0yx9r8jpnkzwad")))) + (base32 "0kyz3lx49d8p75mvbzinxc1zgs8g7adn77y9bm15b8b4ad9zl5s6")))) (build-system python-build-system) (arguments `(#:phases @@ -574,7 +586,7 @@ virtualization library.") (define-public virt-manager (package (name "virt-manager") - (version "2.1.0") + (version "2.2.1") (source (origin (method url-fetch) (uri (string-append "https://virt-manager.org/download/sources" @@ -582,7 +594,7 @@ virtualization library.") version ".tar.gz")) (sha256 (base32 - "1m038kyngmxlgz91c7z8g73lb2wy0ajyah871a3g3wb5cnd0dsil")))) + "06ws0agxlip6p6n3n43knsnjyd91gqhh2dadgc33wl9lx1k8vn6g")))) (build-system python-build-system) (arguments `(#:use-setuptools? #f ; uses custom distutils 'install' command @@ -600,13 +612,19 @@ virtualization library.") (modify-phases %standard-phases (add-after 'unpack 'fix-setup (lambda* (#:key outputs #:allow-other-keys) - (substitute* "virtcli/cliconfig.py" + (substitute* "virtinst/buildconfig.py" (("/usr") (assoc-ref outputs "out"))) #t)) + (add-after 'unpack 'fix-qemu-img-reference + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "virtconv/formats.py" + (("/usr(/bin/qemu-img)" _ suffix) + (string-append (assoc-ref inputs "qemu") suffix))) + #t)) (add-after 'unpack 'fix-default-uri (lambda* (#:key inputs #:allow-other-keys) ;; Xen is not available for now - so only patch qemu. - (substitute* "virtManager/connect.py" + (substitute* "virtManager/createconn.py" (("/usr(/bin/qemu-system)" _ suffix) (string-append (assoc-ref inputs "qemu") suffix))) #t)) @@ -637,6 +655,7 @@ virtualization library.") `(("dconf" ,dconf) ("gtk+" ,gtk+) ("gtk-vnc" ,gtk-vnc) + ("gtksourceview" ,gtksourceview) ("libvirt" ,libvirt) ("libvirt-glib" ,libvirt-glib) ("libosinfo" ,libosinfo) @@ -787,13 +806,14 @@ mainly implemented in user space.") (name "qmpbackup") (version "0.2") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/abbbi/qmpbackup/archive/" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/abbbi/qmpbackup.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "10k9mnb1yrg4gw1rvz4kw4dxc4aajl8gnjrpm3axqkg63qmxj3qn")) - (file-name (string-append name "-" version ".tar.gz")))) + "0swhp5byz44brhyis1a39p11fyn9q84xz5q6v2fah29r7d71kmmx")))) (build-system python-build-system) (arguments `(#:python ,python-2)) @@ -982,7 +1002,7 @@ Open Container Initiative (OCI) image layout and its tagged images.") (define-public skopeo (package (name "skopeo") - (version "0.1.39") + (version "0.1.40") (source (origin (method git-fetch) (uri (git-reference @@ -991,7 +1011,7 @@ Open Container Initiative (OCI) image layout and its tagged images.") (file-name (git-file-name name version)) (sha256 (base32 - "1jkxmvh079pd9j4aa39ilmclwafnjs0yqdiigwh8cj7yf97x4vsi")))) + "1bagirzdzjhicn5dr691092ac3q6lhz3xngjzgqiqkxnvpz7p6cn")))) (build-system go-build-system) (native-inputs `(("pkg-config" ,pkg-config))) diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 9d7c63d046..364d0a2062 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -213,14 +213,14 @@ the entire VPN in a network namespace accessible only through SSH.") (name "ocproxy") (version "1.60") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/cernekee/ocproxy/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/cernekee/ocproxy.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1b4rg3xq5jnrp2l14sw0msan8kqhdxmsd7gpw9lkiwvxy13pcdm7")))) + "03323nnhb4y9nzwva04mq7xg03dvdrgp689g89f69jqc261skcqx")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) @@ -273,7 +273,7 @@ and probably others.") (define-public openvpn (package (name "openvpn") - (version "2.4.7") + (version "2.4.8") (source (origin (method url-fetch) (uri (string-append @@ -281,7 +281,7 @@ and probably others.") version ".tar.xz")) (sha256 (base32 - "0j7na936isk9j8nsdrrbw7wmy09inmjqvsb8mw8az7k61xbm6bx4")))) + "149z3agjy03i66mcj5bplim2mh45s2ps1wmxbxczyzw0nxmsd37v")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--enable-iproute2=yes"))) @@ -305,14 +305,14 @@ traversing network address translators (@dfn{NAT}s) and firewalls.") (define-public tinc (package (name "tinc") - (version "1.0.35") + (version "1.0.36") (source (origin (method url-fetch) (uri (string-append "https://tinc-vpn.org/packages/" - name "-" version ".tar.gz")) + "tinc-" version ".tar.gz")) (sha256 (base32 - "0pl92sdwrkiwgll78x0ww06hfljd07mkwm62g8x17qn3gha3pj0q")))) + "021i2sl2mjscbm8g59d7vs74iw3gf0m48wg7w3zhwj6czarkpxs0")))) (build-system gnu-build-system) (arguments '(#:configure-flags diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 1b41aec874..6a59021ae9 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -1,13 +1,14 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 John Darrington <jmd@gnu.org> ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org> -;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2015, 2016, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2017 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2018 Timo Eisenmann <eisenmann@fn.de> ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz> +;;; Copyright © 2019 Clément Lassieur <clement@lassieur.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -93,14 +94,14 @@ older or slower computers and embedded systems.") (define-public links (package (name "links") - (version "2.20.1") + (version "2.20.2") (source (origin (method url-fetch) (uri (string-append "http://links.twibright.com/download/" "links-" version ".tar.bz2")) - (sha256 + (sha256 (base32 - "0184g59cxxhg9dqg5gv66f30f1wg8sx957pp5rs7b8icnwnafa5v")))) + "097ll98ympzfx7qfdyhc52yzvsp167x5nnjs6v8ih496wv80fksb")))) (build-system gnu-build-system) (arguments `(#:phases @@ -146,13 +147,14 @@ features including, tables, builtin image display, bookmarks, SSL and more.") (name "luakit") (version "2.1") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/luakit/luakit/archive/" version - ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/luakit/luakit.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "09kgsm2w2xa4xwylsi0bwjvdl9k6hkyjyyrq2i3l8bvi2qrs5gzc")) - (file-name (string-append name "-" version ".tar.gz")))) + "1qa90caxv1k6ak88fn0a7n7h0c4iv8szw6zn2axch8ig83i86az2")))) (inputs `(("lua-5.1" ,lua-5.1) ("gtk+" ,gtk+) @@ -222,7 +224,7 @@ and the GTK+ toolkit.") ("perl" ,perl))) (inputs `(("ncurses" ,ncurses) ("libidn" ,libidn) - ("gnutls" ,gnutls) + ("openssl" ,openssl) ("libgcrypt" ,libgcrypt) ("unzip" ,unzip) ("zlib" ,zlib) @@ -230,12 +232,12 @@ and the GTK+ toolkit.") ("bzip2" ,bzip2))) (arguments `(#:configure-flags - (let ((gnutls (assoc-ref %build-inputs "gnutls"))) + (let ((openssl (assoc-ref %build-inputs "openssl"))) `("--with-pkg-config" "--with-screen=ncurses" "--with-zlib" "--with-bzlib" - ,(string-append "--with-gnutls=" gnutls) + ,(string-append "--with-ssl=" openssl) ;; "--with-socks5" ; XXX TODO "--enable-widec" "--enable-ascii-ctypes" diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index a6aef2ff6e..2afcf5f6ee 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -25,7 +25,7 @@ ;;; Copyright © 2017 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2017, 2019 Christopher Baines <mail@cbaines.net> -;;; Copyright © 2018 Julien Lepiller <julien@lepiller.eu> +;;; Copyright © 2018, 2019 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr> ;;; Copyright © 2018 Gábor Boskovits <boskovits@gmail.com> ;;; Copyright © 2018 Mădălin Ionel Patrașcu <madalinionel.patrascu@mdc-berlin.de> @@ -35,6 +35,7 @@ ;;; Copyright © 2019 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2019 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.lonestar.org> +;;; Copyright © 2019 Florian Pelz <pelzflorian@pelzflorian.de> ;;; ;;; This file is part of GNU Guix. ;;; @@ -134,7 +135,8 @@ #:use-module (gnu packages valgrind) #:use-module (gnu packages version-control) #:use-module (gnu packages vim) - #:use-module (gnu packages xml)) + #:use-module (gnu packages xml) + #:use-module ((srfi srfi-1) #:select (delete-duplicates))) (define-public httpd (package @@ -395,6 +397,152 @@ documentation.") "This package provides HTML documentation for the nginx web server.") (license license:bsd-2)))) +(define-public nginx-accept-language-module + ;; Upstream has never made a release; use current commit instead. + (let ((commit "2f69842f83dac77f7d98b41a2b31b13b87aeaba7") + (revision "1")) + (package + (name "nginx-accept-language-module") + (version (git-version "0.0.0" ;upstream has no version number + revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/giom/nginx_accept_language_module.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1hjysrl15kh5233w7apq298cc2bp4q1z5mvaqcka9pdl90m0vhbw")))) + (build-system gnu-build-system) + (inputs `(("openssl" ,openssl) + ("pcre" ,pcre) + ("nginx-sources" ,(package-source nginx)) + ("zlib" ,zlib))) + (arguments + `(#:tests? #f ; no test target + #:make-flags (list "modules") + #:modules ((guix build utils) + (guix build gnu-build-system) + (ice-9 popen) + (ice-9 regex) + (ice-9 textual-ports)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'unpack-nginx-sources + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (begin + ;; The nginx source code is part of the module’s source. + (format #t "decompressing nginx source code~%") + (call-with-output-file "nginx.tar" + (lambda (out) + (let* ((gzip (assoc-ref inputs "gzip")) + (nginx-srcs (assoc-ref inputs "nginx-sources")) + (pipe (open-pipe* OPEN_READ + (string-append gzip "/bin/gzip") + "-cd" + nginx-srcs))) + (dump-port pipe out) + (unless (= (status:exit-val (close-pipe pipe)) 0) + (error "gzip decompress failed"))))) + (invoke (string-append (assoc-ref inputs "tar") "/bin/tar") + "xvf" "nginx.tar" "--strip-components=1") + (delete-file "nginx.tar") + #t))) + (add-after 'unpack 'convert-to-dynamic-module + (lambda _ + (begin + (with-atomic-file-replacement "config" + (lambda (in out) + ;; cf. https://www.nginx.com/resources/wiki/extending/new_config/ + (format out "ngx_module_type=HTTP~%") + (format out "ngx_module_name=\ +ngx_http_accept_language_module~%") + (let* ((str (get-string-all in)) + (rx (make-regexp + "NGX_ADDON_SRCS=\"\\$NGX_ADDON_SRCS (.*)\"")) + (m (regexp-exec rx str)) + (srcs (match:substring m 1))) + (format out (string-append "ngx_module_srcs=\"" + srcs "\"~%"))) + (format out ". auto/module~%") + (format out "ngx_addon_name=$ngx_module_name~%")))))) + (add-before 'configure 'patch-/bin/sh + (lambda _ + (substitute* "auto/feature" + (("/bin/sh") (which "sh"))) + #t)) + (replace 'configure + ;; This phase is largely copied from the nginx package. + (lambda* (#:key outputs #:allow-other-keys) + (let ((flags + (list ;; A copy of nginx’ flags follows, otherwise we + ;; get a binary compatibility error. FIXME: Code + ;; duplication is bad. + (string-append "--prefix=" (assoc-ref outputs "out")) + "--with-http_ssl_module" + "--with-http_v2_module" + "--with-pcre-jit" + "--with-debug" + ;; Even when not cross-building, we pass the + ;; --crossbuild option to avoid customizing for the + ;; kernel version on the build machine. + ,(let ((system "Linux") ; uname -s + (release "3.2.0") ; uname -r + ;; uname -m + (machine (match (or (%current-target-system) + (%current-system)) + ("x86_64-linux" "x86_64") + ("i686-linux" "i686") + ("mips64el-linux" "mips64") + ;; Prevent errors when querying + ;; this package on unsupported + ;; platforms, e.g. when running + ;; "guix package --search=" + (_ "UNSUPPORTED")))) + (string-append "--crossbuild=" + system ":" release ":" machine)) + ;; The following are the args decribed on + ;; <https://www.nginx.com/blog/compiling-dynamic-modules-nginx-plus>. + ;; Enabling --with-compat here and in the nginx package + ;; would ensure binary compatibility even when using + ;; different configure options from the main nginx + ;; package. This is not needed for Guix. + ;; "--with-compat" + "--add-dynamic-module=."))) + (setenv "CC" "gcc") + (format #t "environment variable `CC' set to `gcc'~%") + (format #t "configure flags: ~s~%" flags) + (apply invoke "./configure" flags) + #t))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (modules-dir (string-append out "/etc/nginx/modules")) + (doc-dir (string-append + out "/share/doc/nginx-accept-language-module"))) + (mkdir-p modules-dir) + (copy-file "objs/ngx_http_accept_language_module.so" + (string-append + modules-dir "/ngx_http_accept_language_module.so")) + (mkdir-p doc-dir) + (copy-file "README.textile" + (string-append doc-dir "/README.textile")) + #t)))))) + (home-page + "https://www.nginx.com/resources/wiki/modules/accept_language/") + (synopsis "Nginx module for parsing the Accept-Language HTTP header") + (description + "This nginx module parses the Accept-Language field in HTTP headers and +chooses the most suitable locale for the user from the list of locales +supported at your website.") + (license (delete-duplicates + (cons license:bsd-2 ;license of nginx-accept-language-module + ;; The module’s code is linked statically with nginx, + ;; therefore nginx’ other licenses may also apply to its + ;; binary: + (package-license nginx))))))) + (define-public fcgi (package (name "fcgi") @@ -2860,7 +3008,7 @@ jar in conformance with RFC 6265 <http://tools.ietf.org/html/rfc6265>.") (define-public perl-http-cookies (package (name "perl-http-cookies") - (version "6.05") + (version "6.06") (source (origin (method url-fetch) (uri (string-append @@ -2868,7 +3016,7 @@ jar in conformance with RFC 6265 <http://tools.ietf.org/html/rfc6265>.") version ".tar.gz")) (sha256 (base32 - "0pbgns2gwgvgg9rglah7ryw0jj13aykyf38lnhm3rwzw3c2cvqaq")))) + "13rnz3233vbsfariya4njiyfaj6k94j6bvlyh3dmfmh24hpqgx77")))) (build-system perl-build-system) (propagated-inputs `(("perl-http-message" ,perl-http-message))) @@ -6412,6 +6560,36 @@ provides a very convenient API for extracting and manipulating data, using the best of DOM, CSS, and jQuery-like methods.") (license license:expat))) +(define-public java-signpost-core + (package + (name "java-signpost-core") + (version "1.2.1.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mttkay/signpost") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1l04yj2znch3hpyw90c4g4jan453w7d88l84bgl0c72i2kbb8z7h")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "signpost-core.jar" + #:source-dir "signpost-core/src/main/java" + #:test-dir "signpost-core/src/test" + ;; Tests all fail with InstantiationException from mockito + #:tests? #f)) + (propagated-inputs + `(("java-commons-codec" ,java-commons-codec))) + (home-page "https://github.com/mttkay/signpost") + (synopsis "Lightweight client-side OAuth library for Java") + (description "Signpost is the easy and intuitive solution for signing +HTTP messages on the Java platform in conformance with the OAuth Core 1.0a +standard. Signpost follows a modular and flexible design, allowing you to +combine it with different HTTP messaging layers.") + (license license:asl2.0))) + (define-public tidyp (package (name "tidyp") diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index bda0fc6ba2..b0b0d79a05 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com> ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Mark H Weaver <mhw@netris.org> -;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com> ;;; @@ -121,14 +121,14 @@ engine that uses Wayland for graphics output.") (define-public webkitgtk (package (name "webkitgtk") - (version "2.26.1") + (version "2.26.2") (source (origin (method url-fetch) (uri (string-append "https://www.webkitgtk.org/releases/" - name "-" version ".tar.xz")) + "webkitgtk-" version ".tar.xz")) (sha256 (base32 - "0mfikjfjhwcnrxbzdyh3fl9bbs2azgbdnx8h5910h41b3n022jvb")))) + "04k5h0sid9azsqz9pyq436v1rx4lnfrhvmcgmicqb0c0g9iz103b")))) (build-system cmake-build-system) (outputs '("out" "doc")) (arguments diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index e73432ba3a..d2c0bf0a44 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2017 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz> ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,6 +29,7 @@ #:use-module (guix git-download) #:use-module (guix utils) #:use-module (guix build-system gnu) + #:use-module (guix build-system meson) #:use-module (guix build-system trivial) #:use-module (gnu packages) #:use-module (gnu packages admin) @@ -50,6 +52,7 @@ #:use-module (gnu packages gtk) #:use-module (gnu packages kerberos) #:use-module (gnu packages linux) + #:use-module (gnu packages mingw) #:use-module (gnu packages openldap) #:use-module (gnu packages perl) #:use-module (gnu packages pulseaudio) @@ -541,3 +544,85 @@ integrated into the main branch.") (synopsis "Implementation of the Windows API (staging branch, WoW64 version)") (supported-systems '("x86_64-linux" "aarch64-linux")))) + +(define dxvk32 + ;; This package provides 32-bit dxvk libraries on 64-bit systems. + (package + (name "dxvk32") + (version "1.4.4") + (home-page "https://github.com/doitsujin/dxvk/") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0zr8hqyig18q4wp96cmfrkrgxxbgxida6k8cv6qbbldni29qy20w")))) + (build-system meson-build-system) + (arguments + `(#:system "i686-linux" + #:configure-flags (list "--cross-file" + (string-append (assoc-ref %build-inputs "source") + "/build-wine32.txt")))) + (native-inputs + `(("glslang" ,glslang) + ("wine" ,wine))) + (synopsis "Vulkan-based D3D11 and D3D10 implementation for Wine") + (description "A Vulkan-based translation layer for Direct3D 10/11 which +allows running complex 3D applications with high performance using Wine. + +Use @command{setup_dxvk} to install the required libraries to a Wine prefix.") + (supported-systems '("x86_64-linux")) + (license license:zlib))) + +(define-public dxvk + (package + (inherit dxvk32) + (name "dxvk") + (arguments + `(#:configure-flags (list "--cross-file" + (string-append (assoc-ref %build-inputs "source") + "/build-wine" + ,(match (%current-system) + ("x86_64-linux" "64") + (_ "32")) + ".txt")) + #:phases + (modify-phases %standard-phases + ,@(if (string=? (%current-system) "x86_64-linux") + `((add-after 'unpack 'install-32 + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (dxvk32 (assoc-ref inputs "dxvk32"))) + (mkdir-p (string-append out "/lib32")) + (copy-recursively (string-append dxvk32 "/lib") + (string-append out "/lib32")))))) + '()) + (add-after 'install 'install-setup + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin/setup_dxvk"))) + (mkdir-p (string-append out "/bin")) + (copy-file "../source/setup_dxvk.sh" + bin) + (chmod bin #o755) + (substitute* bin + (("wine=\"wine\"") + (string-append "wine=" (assoc-ref inputs "wine") "/bin/wine")) + (("x32") ,(match (%current-system) + ("x86_64-linux" "../lib32") + (_ "../lib"))) + (("x64") "../lib")))))))) + (native-inputs + `(("glslang" ,glslang))) + (inputs + `(("wine" ,(match (%current-system) + ("x86_64-linux" wine64) + (_ wine))) + ,@(match (%current-system) + ("x86_64-linux" + `(("dxvk32" ,dxvk32))) + (_ '())))) + (supported-systems '("i686-linux" "x86_64-linux")))) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index e793d89bfa..080b0f32a6 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1034,15 +1034,15 @@ Keybinder works with GTK-based applications using the X Window System.") (version "3.2.0") (source (origin - (method url-fetch) - (uri (let ((version-with-underscores - (string-join (string-split version #\.) "_"))) - (string-append "https://github.com/conformal/spectrwm/archive/" - "SPECTRWM_" version-with-underscores ".tar.gz"))) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/conformal/spectrwm.git") + (commit + (string-append "SPECTRWM_" + (string-join (string-split version #\.) "_"))))) + (file-name (git-file-name name version)) (sha256 - (base32 - "0z7gjmp1x6y8q3dnw6swvbv8x2wd4ykzjvi3ibk2sxhgc910907v")))) + (base32 "1dfqy5f0s1nv6rqkz9lj006vypmp4rwxd5vczfk3ndzqgnh19kw6")))) (build-system gnu-build-system) (arguments `(#:make-flags (let ((pkg-config (lambda (flag) @@ -1194,14 +1194,14 @@ its size (define-public polybar (package (name "polybar") - (version "3.4.0") + (version "3.4.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/polybar/polybar/releases/" "download/" version "/polybar-" version ".tar")) (sha256 - (base32 "06yd9ffak53qbhpw35xh422v2lhjh23zdbrh81cynwks5pr9i839")))) + (base32 "1sy4xnx9rnj5z22kca8al84ivjg4mkvb9wj68pqq2y02l54gldwy")))) (build-system cmake-build-system) (arguments ;; Test is disabled because it requires downloading googletest from the diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm index caa0ad2372..48e6c31f6c 100644 --- a/gnu/packages/wxwidgets.scm +++ b/gnu/packages/wxwidgets.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2019 Arun Isaac <arunisaac@systemreboot.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -42,6 +43,7 @@ #:use-module (gnu packages video) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages sdl) #:use-module (gnu packages webkit) #:use-module (gnu packages xorg) @@ -165,6 +167,66 @@ and many other languages.") (package-inputs wxwidgets-3.1)))) (name "wxwidgets-gtk2"))) +(define-public python-wxpython + (package + (name "python-wxpython") + (version "4.0.7.post1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "wxPython" version)) + (sha256 + (base32 + "1jppcr3n428m8pgwb9q3g0iiqydxd451ncri4njk8b53xsiflhys")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove bundled wxwidgets + (delete-file-recursively "ext/wxWidgets") + #t)))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'build 'configure + (lambda* (#:key inputs #:allow-other-keys) + (setenv "WXWIN" (assoc-ref inputs "wxwidgets")) + ;; Copy the waf executable to the source directory since it needs + ;; to be in a writable directory. + (copy-file (string-append (assoc-ref inputs "python-waf") "/bin/waf") + "bin/waf") + (setenv "WAF" "bin/waf") + ;; The build script tries to copy license files from the + ;; wxwidgets source tree. Prevent it. + (substitute* "wscript" + (("updateLicenseFiles\\(cfg\\)" all) + (string-append "#" all))) + ;; The build script tries to write to demo/version.py. So, we set + ;; correct write permissions. + (chmod "demo/version.py" #o644) + ;; Build only the python bindings, not wxwidgets also. + (substitute* "setup.py" + (("'build']") "'build_py', '--use_syswx']")) + #t))))) + (inputs + `(("gtk+" ,gtk+) + ("wxwidgets" ,wxwidgets))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("python-waf" ,python-waf))) + (propagated-inputs + `(("python-numpy" ,python-numpy) + ("python-pillow" ,python-pillow) + ("python-six" ,python-six))) + (home-page "http://wxPython.org/") + (synopsis "Cross platform GUI toolkit for Python") + (description "wxPython is a cross-platform GUI toolkit for the Python +programming language. It is implemented as a set of Python extension modules +that wrap the GUI components of the popular wxWidgets cross platform C++ +library. In most cases, wxPython uses the native widgets on each platform to +provide a 100% native look and feel for the application.") + (license l:wxwindows3.1+))) + (define-public python2-wxpython (package (name "python2-wxpython") diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 17dc16b44c..8c24ff92ec 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -28,6 +28,7 @@ ;;; Copyright © 2019 Wiktor Żelazny <wzelazny@vurv.cz> ;;; Copyright © 2019 Kyle Andrews <kyle.c.andrews@gmail.com> ;;; Copyright © 2019 Josh Holland <josh@inv.alid.pw> +;;; Copyright © 2019 Tanguy Le Carrour <tanguy@bioneland.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -552,7 +553,7 @@ move windows, switch between desktops, etc.).") (define-public scrot (package (name "scrot") - (version "0.9") + (version "1.2") (source (origin (method git-fetch) @@ -562,14 +563,17 @@ move windows, switch between desktops, etc.).") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1dg0pnmk09p7zlbyxv7d40vf54amrv73y976ds5p7096x6lmlndy")))) + (base32 "08gkdby0ysx2mki57z81zlm7vfnq9c1gq692xw67cg5vv2p3320w")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) + ("autoconf-archive" ,autoconf-archive) ("automake" ,automake))) (inputs `(("giblib" ,giblib) - ("libx11" ,libx11))) + ("libx11" ,libx11) + ("libXcursor" ,libxcursor) + ("libXfixes" ,libxfixes))) (home-page "https://github.com/resurrecting-open-source-projects/scrot") (synopsis "Command-line screen capture utility for X Window System") (description @@ -733,6 +737,7 @@ to find buttons, etc, on the screen to click on.") (method git-fetch) (uri (git-reference (url home-page) (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 "0vp8ja68hpmqkl61zyjar3czhmny1hbm74m8f393incfz1ymr3i8")))) @@ -1454,6 +1459,7 @@ XCB util-xrm module provides the following libraries: (uri (git-reference (url home-page) (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 "05fzdjmhiafgi2jf0k41i3nm0837a78sb6yv59cwc23nla8g0bhr")) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 126ba19b1a..315e4a45be 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -462,15 +462,15 @@ keys for controlling the audio volume.") (define-public xfce4-whiskermenu-plugin (package (name "xfce4-whiskermenu-plugin") - (version "2.3.3") - (source (origin - (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" - name "/" (version-major+minor version) "/" - name "-" version ".tar.bz2")) - (sha256 - (base32 - "0j0qmk372130avq8n07lfqrcm2al7n07l8gc06bbr1g6q57wrip0")))) + (version "2.3.4") + (source + (origin + (method url-fetch) + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" + "xfce4-whiskermenu-plugin/" (version-major+minor version) "/" + "xfce4-whiskermenu-plugin-" version ".tar.bz2")) + (sha256 + (base32 "03jpcbdpkgg825g7mr630wxynachymsrnyhz32mkl0jsd4sxxlw4")))) (build-system cmake-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -645,15 +645,15 @@ like appearance, display, keyboard and mouse settings.") (define-public thunar (package (name "thunar") - (version "1.8.9") + (version "1.8.10") (source (origin (method url-fetch) (uri (string-append "http://archive.xfce.org/src/xfce/" "thunar/" (version-major+minor version) "/" - "Thunar-" version ".tar.bz2")) + "thunar-" version ".tar.bz2")) (sha256 (base32 - "1fah2d7v3a7fp28xa5wv896rap1iad9q9y04qchca09mq1x8wxbs")))) + "02g72bpbb8dkwspay9qii8bi99l87jn39gz6bamgp7p4q20qsi1x")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -1047,15 +1047,15 @@ sending standard messages over D-Bus using the (define-public xfburn (package (name "xfburn") - (version "0.5.5") + (version "0.6.1") (source (origin (method url-fetch) (uri (string-append "http://archive.xfce.org/src/apps/xfburn/" (version-major+minor version) "/" - name "-" version ".tar.bz2")) + "xfburn-" version ".tar.bz2")) (sha256 (base32 - "1qdd8prnsfilsprg36p95cz3z50ffr9kgvka4d5pm260lsl3l5xa")))) + "0ydka5lf9n614gb5xc9bn9297nilgmkfqlb7q1y2yrc97882nxxk")))) (build-system gnu-build-system) (native-inputs `(("intltool" ,intltool) @@ -1067,7 +1067,7 @@ sending standard messages over D-Bus using the ("gst-plugins-good" ,gst-plugins-good) ("gst-plugins-ugly" ,gst-plugins-ugly) ("glib" ,glib) - ("gtk+" ,gtk+-2) + ("gtk+" ,gtk+) ("libburn" ,libburn) ("libisofs" ,libisofs) ("libxfce4ui" ,libxfce4ui))) @@ -1125,7 +1125,7 @@ of data to either CD/DVD/BD.") (define-public xfce4-screenshooter (package (name "xfce4-screenshooter") - (version "1.9.5") + (version "1.9.7") (source (origin (method url-fetch) (uri (string-append "http://archive.xfce.org/src/apps/" @@ -1135,7 +1135,7 @@ of data to either CD/DVD/BD.") version ".tar.bz2")) (sha256 (base32 - "135kad07922jxjs05amn48sdgm2x1rh97wbzdmy9h85r5i1vaddz")))) + "1lbhl0sh0ayv3zhgzcd9hj9q9m3lnyv7vlglfqrl39i3782n2w8g")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -1426,7 +1426,7 @@ governor and frequencies supported and used by your system.") "https://goodies.xfce.org/projects/panel-plugins/xfce4-diskperf-plugin") (synopsis "Display disk performance in the Xfce panel") (description "This Xfce panel plugin displays instant disk/partition -performance (bytes transfered per second).") +performance (bytes transferred per second).") (license gpl2+))) (define-public xfce4-embed-plugin @@ -1452,7 +1452,7 @@ performance (bytes transfered per second).") ("gtk+-2" ,gtk+-2))) (home-page "https://goodies.xfce.org/projects/panel-plugins/xfce4-embed-plugin") - (synopsis "Embed arbitary applications inside the Xfce panel") + (synopsis "Embed arbitrary applications inside the Xfce panel") (description "This plugin enables the embedding of arbitrary application windows into the Xfce panel. The window is resized into the panel space available, and the associated program can be @@ -1852,7 +1852,7 @@ swap space and the system uptime in the Xfce4 panel.") (define-public xfce4-time-out-plugin (package (name "xfce4-time-out-plugin") - (version "1.0.3") + (version "1.1.0") (source (origin (method url-fetch) (uri (string-append "http://archive.xfce.org/src/panel-plugins/" @@ -1861,13 +1861,13 @@ swap space and the system uptime in the Xfce4 panel.") "/xfce4-time-out-plugin-" version ".tar.bz2")) (sha256 (base32 - "0sqggsnkj40337v0c9vgakyh1zjzri6if38l85gcrnc39rlx973z")))) + "068a8ck08g4g1msbr7hd5zzp6lsq2a1ry1r472x0rmbna2im2jpf")))) (build-system gnu-build-system) (native-inputs `(("intltool" ,intltool) ("pkg-config" ,pkg-config))) (inputs - `(("gtk+-2" ,gtk+-2) + `(("gtk+" ,gtk+) ("libxfce4ui" ,libxfce4ui) ("xfce4-panel" ,xfce4-panel))) (home-page diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index d0216423e8..ba7c121776 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -1017,28 +1017,18 @@ Libxml2).") (name "minixml") (version "2.12") (source (origin - (method url-fetch/tarbomb) + (method url-fetch) (uri (string-append "https://github.com/michaelrsweet/mxml/" "releases/download/v" version "/mxml-" version ".tar.gz")) (sha256 (base32 - "1z8nqxa4pqdic8wpixkkgg1m2pak9wjikjjxnk3j5i0d29dbgmmg")))) + "0kq3wiycb40dcyswvajrqb1n5ffm5xcnsfxxaml92vhpl6x57yvb")))) (build-system gnu-build-system) (arguments `(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") "/lib")) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-permissions - ;; FIXME: url-fetch/tarbomb resets all permissions to 555/444. - (lambda _ - (for-each - (lambda (file) - (chmod file #o644)) - (find-files "doc" "\\.")) - #t))) #:tests? #f)) ; tests are run during build (home-page "https://michaelrsweet.github.io/mxml") (synopsis "Small XML parsing library") diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 2692e4bd78..43fccc71b8 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4029,7 +4029,8 @@ Font Description (XLFD) full name for a font.") ("libxaw" ,libxaw) ("libxft" ,libxft) ("libxmu" ,libxmu) - ("libxrender" ,libxrender))) + ("libxrender" ,libxrender) + ("libxkbfile" ,libxkbfile))) (native-inputs `(("gettext" ,gettext-minimal) ("pkg-config" ,pkg-config))) @@ -5798,7 +5799,7 @@ to answer a question. Xmessage can also exit after a specified time.") (define-public xterm (package (name "xterm") - (version "349") + (version "350") (source (origin (method url-fetch) (uri (list @@ -5808,7 +5809,7 @@ to answer a question. Xmessage can also exit after a specified time.") "xterm-" version ".tgz"))) (sha256 (base32 - "0ps7b2b2kbrkv5q49cmb8c51z0w21jmm7hwciw30m6jgfb9s79ir")))) + "0k8h0k1nrgq073yfrgrpcyd7mfcg6r3s940s1l46h0iizpp5kyxf")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--enable-wide-chars" "--enable-load-vt-fonts" diff --git a/gnu/services.scm b/gnu/services.scm index 6ee05d4580..394470ba7d 100644 --- a/gnu/services.scm +++ b/gnu/services.scm @@ -775,18 +775,34 @@ TARGET-TYPE; return the root service adjusted accordingly." (eq? (service-kind service) target-type)) services) ((sink) - (let loop ((sink sink)) - (let* ((dependents (map loop (dependents sink))) - (extensions (map (apply-extension sink) dependents)) - (extend (service-type-extend (service-kind sink))) - (compose (service-type-compose (service-kind sink))) - (params (service-value sink))) - ;; We distinguish COMPOSE and EXTEND because PARAMS typically has a - ;; different type than the elements of EXTENSIONS. - (if extend - (service (service-kind sink) - (extend params (compose extensions))) - sink)))) + ;; Use the state monad to keep track of already-visited services in the + ;; graph and to memoize their value once folded. + (run-with-state + (let loop ((sink sink)) + (mlet %state-monad ((visited (current-state))) + (match (vhash-assq sink visited) + (#f + (mlet* %state-monad + ((dependents (mapm %state-monad loop (dependents sink))) + (visited (current-state)) + (extensions -> (map (apply-extension sink) dependents)) + (extend -> (service-type-extend (service-kind sink))) + (compose -> (service-type-compose (service-kind sink))) + (params -> (service-value sink)) + (service + -> + ;; Distinguish COMPOSE and EXTEND because PARAMS typically + ;; has a different type than the elements of EXTENSIONS. + (if extend + (service (service-kind sink) + (extend params (compose extensions))) + sink))) + (mbegin %state-monad + (set-current-state (vhash-consq sink service visited)) + (return service)))) + ((_ . service) ;SINK was already visited + (return service))))) + vlist-null)) (() (raise (condition (&missing-target-service-error diff --git a/gnu/services/audio.scm b/gnu/services/audio.scm index 471c5fd95f..345d8225b2 100644 --- a/gnu/services/audio.scm +++ b/gnu/services/audio.scm @@ -140,6 +140,13 @@ audio_output { "--no-daemon" #$(mpd-config->file config)) #:pid-file #$(mpd-file-name config "pid") + #:environment-variables + ;; Required to detect PulseAudio when run under a user account. + '(#$(string-append + "XDG_RUNTIME_DIR=/run/user/" + (number->string + (passwd:uid + (getpwnam (mpd-configuration-user config)))))) #:log-file #$(mpd-file-name config "log"))) (stop #~(make-kill-destructor)))) diff --git a/gnu/services/dbus.scm b/gnu/services/dbus.scm index 35d7ff3c9c..7b3c8100e2 100644 --- a/gnu/services/dbus.scm +++ b/gnu/services/dbus.scm @@ -86,6 +86,19 @@ includes the @code{etc/dbus-1/system.d} directories of each package listed in (use-modules (sxml simple) (srfi srfi-1)) + (define-syntax directives + (syntax-rules () + ;; Expand the given directives (SXML expressions) only if their + ;; key names a file that exists. + ((_ (name directory) rest ...) + (let ((dir directory)) + (if (file-exists? dir) + `((name ,dir) + ,@(directives rest ...)) + (directives rest ...)))) + ((_) + '()))) + (define (services->sxml services) ;; Return the SXML 'includedir' clauses for DIRS. `(busconfig @@ -98,10 +111,13 @@ includes the @code{etc/dbus-1/system.d} directories of each package listed in (servicedir "/etc/dbus-1/system-services") ,@(append-map (lambda (dir) - `((includedir - ,(string-append dir "/etc/dbus-1/system.d")) - (servicedir ;for '.service' files - ,(string-append dir "/share/dbus-1/services")))) + (directives + (includedir + (string-append dir "/etc/dbus-1/system.d")) + (includedir + (string-append dir "/share/dbus-1/system.d")) + (servicedir ;for '.service' files + (string-append dir "/share/dbus-1/services")))) services))) (mkdir #$output) @@ -160,18 +176,9 @@ includes the @code{etc/dbus-1/system.d} directories of each package listed in (unless (file-exists? "/etc/machine-id") (format #t "creating /etc/machine-id...~%") - (let ((prog (string-append #$(dbus-configuration-dbus config) - "/bin/dbus-uuidgen"))) - ;; XXX: We can't use 'system' because the initrd's - ;; guile system(3) only works when 'sh' is in $PATH. - (let ((pid (primitive-fork))) - (if (zero? pid) - (call-with-output-file "/etc/machine-id" - (lambda (port) - (close-fdes 1) - (dup2 (port->fdes port) 1) - (execl prog))) - (waitpid pid))))))) + (invoke (string-append #$(dbus-configuration-dbus config) + "/bin/dbus-uuidgen") + "--ensure=/etc/machine-id")))) (define dbus-shepherd-service (match-lambda @@ -179,10 +186,10 @@ includes the @code{etc/dbus-1/system.d} directories of each package listed in (list (shepherd-service (documentation "Run the D-Bus system daemon.") (provision '(dbus-system)) - (requirement '(user-processes)) + (requirement '(user-processes syslogd)) (start #~(make-forkexec-constructor (list (string-append #$dbus "/bin/dbus-daemon") - "--nofork" "--system") + "--nofork" "--system" "--syslog-only") #:pid-file "/var/run/dbus/pid")) (stop #~(make-kill-destructor))))))) @@ -213,7 +220,10 @@ includes the @code{etc/dbus-1/system.d} directories of each package listed in (append (dbus-configuration-services config) services))))) - (default-value (dbus-configuration)))) + (default-value (dbus-configuration)) + (description "Run the system-wide D-Bus inter-process message +bus. It allows programs and daemons to communicate and is also responsible +for spawning (@dfn{activating}) D-Bus services on demand."))) (define* (dbus-service #:key (dbus dbus) (services '())) "Return a service that runs the \"system bus\", using @var{dbus}, with diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index 449b606a31..0152e86e8a 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -514,12 +514,14 @@ Users need to be in the @code{lp} group to access the D-Bus service. ;; It provides polkit "actions". (service-extension polkit-service-type list))) + (default-value colord) (description "Run @command{colord}, a system service with a D-Bus interface to manage the color profiles of input and output devices such as screens and scanners."))) -(define* (colord-service #:key (colord colord)) +(define-deprecated (colord-service #:key (colord colord)) + colord-service-type "Return a service that runs @command{colord}, a system service with a D-Bus interface to manage the color profiles of input and output devices such as screens and scanners. It is notably used by the GNOME Color Manager graphical @@ -1094,7 +1096,7 @@ dispatches events from it."))) (service upower-service-type) (accountsservice-service) (service cups-pk-helper-service-type) - (colord-service) + (service colord-service-type) (geoclue-service) (service polkit-service-type) (elogind-service) diff --git a/gnu/services/dns.scm b/gnu/services/dns.scm index 5f37cb0782..43b6261c07 100644 --- a/gnu/services/dns.scm +++ b/gnu/services/dns.scm @@ -45,6 +45,9 @@ zone-file zone-entry + knot-resolver-service-type + knot-resolver-configuration + dnsmasq-service-type dnsmasq-configuration @@ -639,6 +642,89 @@ ;;; +;;; Knot Resolver. +;;; + +(define-record-type* <knot-resolver-configuration> + knot-resolver-configuration + make-knot-resolver-configuration + knot-resolver-configuration? + (package knot-resolver-configuration-package + (default knot-resolver)) + (kresd-config-file knot-resolver-kresd-config-file + (default %kresd.conf)) + (garbage-collection-interval knot-resolver-garbage-collection-interval + (default 1000))) + +(define %kresd.conf + (plain-file "kresd.conf" "-- -*- mode: lua -*- +net = { '127.0.0.1', '::1' } +user('knot-resolver', 'knot-resolver') +modules = { 'hints > iterate', 'stats', 'predict' } +cache.size = 100 * MB +")) + +(define %knot-resolver-accounts + (list (user-group + (name "knot-resolver") + (system? #t)) + (user-account + (name "knot-resolver") + (group "knot-resolver") + (system? #t) + (home-directory "/var/cache/knot-resolver") + (shell (file-append shadow "/sbin/nologin"))))) + +(define (knot-resolver-activation config) + #~(begin + (use-modules (guix build utils)) + (let ((rundir "/var/cache/knot-resolver") + (owner (getpwnam "knot-resolver"))) + (mkdir-p rundir) + (chown rundir (passwd:uid owner) (passwd:gid owner))))) + +(define knot-resolver-shepherd-services + (match-lambda + (($ <knot-resolver-configuration> package + kresd-config-file + garbage-collection-interval) + (list + (shepherd-service + (provision '(kresd)) + (requirement '(networking)) + (documentation "Run the Knot Resolver daemon.") + (start #~(make-forkexec-constructor + '(#$(file-append package "/sbin/kresd") + "-c" #$kresd-config-file "-f" "1" + "/var/cache/knot-resolver"))) + (stop #~(make-kill-destructor))) + (shepherd-service + (provision '(kres-cache-gc)) + (requirement '(user-processes)) + (documentation "Run the Knot Resolver Garbage Collector daemon.") + (start #~(make-forkexec-constructor + '(#$(file-append package "/sbin/kres-cache-gc") + "-d" #$(number->string garbage-collection-interval) + "-c" "/var/cache/knot-resolver") + #:user "knot-resolver" + #:group "knot-resolver")) + (stop #~(make-kill-destructor))))))) + +(define knot-resolver-service-type + (service-type + (name 'knot-resolver) + (extensions + (list (service-extension shepherd-root-service-type + knot-resolver-shepherd-services) + (service-extension activation-service-type + knot-resolver-activation) + (service-extension account-service-type + (const %knot-resolver-accounts)))) + (default-value (knot-resolver-configuration)) + (description "Run the Knot DNS Resolver."))) + + +;;; ;;; Dnsmasq. ;;; diff --git a/gnu/services/monitoring.scm b/gnu/services/monitoring.scm index 7276f7056d..511f4fb2fe 100644 --- a/gnu/services/monitoring.scm +++ b/gnu/services/monitoring.scm @@ -473,7 +473,8 @@ configuration file.")) (list " fastcgi_param PHP_VALUE \"post_max_size = 16M max_execution_time = 300\"; -"))))))))) +"))))))) + (listen '("80")))) (define-configuration zabbix-front-end-configuration ;; TODO: Specify zabbix front-end package. diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index 93d9b6a15e..6485c08ff7 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2019 Florian Pelz <pelzflorian@pelzflorian.de> ;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2019 Sou Bunnbu <iyzsong@member.fsf.org> +;;; Copyright © 2019 Alex Griffin <a@ajgrf.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -154,7 +155,17 @@ nftables-configuration? nftables-configuration-package nftables-configuration-ruleset - %default-nftables-ruleset)) + %default-nftables-ruleset + + pagekite-service-type + pagekite-configuration + pagekite-configuration? + pagekite-configuration-package + pagekite-configuration-kitename + pagekite-configuration-kitesecret + pagekite-configuration-frontend + pagekite-configuration-kites + pagekite-configuration-extra-file)) ;;; Commentary: ;;; @@ -345,7 +356,7 @@ Protocol (DHCP) client, on all the non-loopback network interfaces." (res '())) (if (list? x) (fold loop res x) - (cons (format #f "~s" x) res))))) + (cons (format #f "~a" x) res))))) (match ntp-server (($ <ntp-server> type address options) @@ -394,15 +405,16 @@ deprecated. Please use <ntp-server> records instead.\n") ntp-servers)))) (define ntp-shepherd-service - (match-lambda - (($ <ntp-configuration> ntp servers allow-large-adjustment?) - (let () - ;; TODO: Add authentication support. - (define config - (string-append "driftfile /var/run/ntpd/ntp.drift\n" - (string-join (map ntp-server->string servers) - "\n") - " + (lambda (config) + (match config + (($ <ntp-configuration> ntp servers allow-large-adjustment?) + (let ((servers (ntp-configuration-servers config))) + ;; TODO: Add authentication support. + (define config + (string-append "driftfile /var/run/ntpd/ntp.drift\n" + (string-join (map ntp-server->string servers) + "\n") + " # Disable status queries as a workaround for CVE-2013-5211: # <http://support.ntp.org/bin/view/Main/SecurityNotice#DRDoS_Amplification_Attack_using>. restrict default kod nomodify notrap nopeer noquery limited @@ -416,20 +428,20 @@ restrict -6 ::1 # option by default, as documented in the 'ntp.conf' manual. restrict source notrap nomodify noquery\n")) - (define ntpd.conf - (plain-file "ntpd.conf" config)) + (define ntpd.conf + (plain-file "ntpd.conf" config)) - (list (shepherd-service - (provision '(ntpd)) - (documentation "Run the Network Time Protocol (NTP) daemon.") - (requirement '(user-processes networking)) - (start #~(make-forkexec-constructor - (list (string-append #$ntp "/bin/ntpd") "-n" - "-c" #$ntpd.conf "-u" "ntpd" - #$@(if allow-large-adjustment? - '("-g") - '())))) - (stop #~(make-kill-destructor)))))))) + (list (shepherd-service + (provision '(ntpd)) + (documentation "Run the Network Time Protocol (NTP) daemon.") + (requirement '(user-processes networking)) + (start #~(make-forkexec-constructor + (list (string-append #$ntp "/bin/ntpd") "-n" + "-c" #$ntpd.conf "-u" "ntpd" + #$@(if allow-large-adjustment? + '("-g") + '())))) + (stop #~(make-kill-destructor))))))))) (define %ntp-accounts (list (user-account @@ -1526,4 +1538,100 @@ table inet filter { (compose list nftables-configuration-package)))) (default-value (nftables-configuration)))) + +;;; +;;; PageKite +;;; + +(define-record-type* <pagekite-configuration> + pagekite-configuration + make-pagekite-configuration + pagekite-configuration? + (package pagekite-configuration-package + (default pagekite)) + (kitename pagekite-configuration-kitename + (default #f)) + (kitesecret pagekite-configuration-kitesecret + (default #f)) + (frontend pagekite-configuration-frontend + (default #f)) + (kites pagekite-configuration-kites + (default '("http:@kitename:localhost:80:@kitesecret"))) + (extra-file pagekite-configuration-extra-file + (default #f))) + +(define (pagekite-configuration-file config) + (match-record config <pagekite-configuration> + (package kitename kitesecret frontend kites extra-file) + (mixed-text-file "pagekite.rc" + (if extra-file + (string-append "optfile = " extra-file "\n") + "") + (if kitename + (string-append "kitename = " kitename "\n") + "") + (if kitesecret + (string-append "kitesecret = " kitesecret "\n") + "") + (if frontend + (string-append "frontend = " frontend "\n") + "defaults\n") + (string-join (map (lambda (kite) + (string-append "service_on = " kite)) + kites) + "\n" + 'suffix)))) + +(define (pagekite-shepherd-service config) + (match-record config <pagekite-configuration> + (package kitename kitesecret frontend kites extra-file) + (with-imported-modules (source-module-closure + '((gnu build shepherd) + (gnu system file-systems))) + (shepherd-service + (documentation "Run the PageKite service.") + (provision '(pagekite)) + (requirement '(networking)) + (modules '((gnu build shepherd) + (gnu system file-systems))) + (start #~(make-forkexec-constructor/container + (list #$(file-append package "/bin/pagekite") + "--clean" + "--nullui" + "--nocrashreport" + "--runas=pagekite:pagekite" + (string-append "--optfile=" + #$(pagekite-configuration-file config))) + #:log-file "/var/log/pagekite.log" + #:mappings #$(if extra-file + #~(list (file-system-mapping + (source #$extra-file) + (target source))) + #~'()))) + ;; SIGTERM doesn't always work for some reason. + (stop #~(make-kill-destructor SIGINT)))))) + +(define %pagekite-accounts + (list (user-group (name "pagekite") (system? #t)) + (user-account + (name "pagekite") + (group "pagekite") + (system? #t) + (comment "PageKite user") + (home-directory "/var/empty") + (shell (file-append shadow "/sbin/nologin"))))) + +(define pagekite-service-type + (service-type + (name 'pagekite) + (default-value (pagekite-configuration)) + (extensions + (list (service-extension shepherd-root-service-type + (compose list pagekite-shepherd-service)) + (service-extension account-service-type + (const %pagekite-accounts)))) + (description + "Run @url{https://pagekite.net/,PageKite}, a tunneling solution to make +local servers publicly accessible on the web, even behind NATs and firewalls."))) + ;;; networking.scm ends here diff --git a/gnu/services/virtualization.scm b/gnu/services/virtualization.scm index bc8ac9b40a..2cd4e5e89c 100644 --- a/gnu/services/virtualization.scm +++ b/gnu/services/virtualization.scm @@ -433,9 +433,11 @@ potential infinite waits blocking libvirt.")) (start #~(make-forkexec-constructor (list (string-append #$libvirt "/sbin/libvirtd") "-f" #$config-file) + ;; For finding qemu and ip binaries. #:environment-variables - ;; For finding qemu binaries. - '("PATH=/run/current-system/profile/bin"))) + (list (string-append + "PATH=/run/current-system/profile/bin:" + "/run/current-system/profile/sbin")))) (stop #~(make-kill-destructor)))))) (define libvirt-service-type diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 899be1c168..3d149a105d 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 David Thompson <davet@gnu.org> -;;; Copyright © 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016 ng0 <ng0@n0.is> ;;; Copyright © 2016, 2017, 2018 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2017 Christopher Baines <mail@cbaines.net> @@ -9,6 +9,7 @@ ;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr> ;;; Copyright © 2017, 2018, 2019 Christopher Baines <mail@cbaines.net> ;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com> +;;; Copyright © 2019 Florian Pelz <pelzflorian@pelzflorian.de> ;;; ;;; This file is part of GNU Guix. ;;; @@ -95,6 +96,7 @@ nginx-configuration-upstream-blocks nginx-configuration-server-names-hash-bucket-size nginx-configuration-server-names-hash-bucket-max-size + nginx-configuration-modules nginx-configuration-extra-content nginx-configuration-file @@ -522,6 +524,7 @@ (default #f)) (server-names-hash-bucket-max-size nginx-configuration-server-names-hash-bucket-max-size (default #f)) + (modules nginx-configuration-modules (default '())) (extra-content nginx-configuration-extra-content (default "")) (file nginx-configuration-file ;#f | string | file-like @@ -542,6 +545,9 @@ of index files." ((? string? str) (list str " "))) names)) +(define (emit-load-module module) + (list "load_module " module ";\n")) + (define emit-nginx-location-config (match-lambda (($ <nginx-location-configuration> uri body) @@ -615,12 +621,14 @@ of index files." server-blocks upstream-blocks server-names-hash-bucket-size server-names-hash-bucket-max-size + modules extra-content) (apply mixed-text-file "nginx.conf" (flatten "user nginx nginx;\n" "pid " run-directory "/pid;\n" "error_log " log-directory "/error.log info;\n" + (map emit-load-module modules) "http {\n" " client_body_temp_path " run-directory "/client_body_temp;\n" " proxy_temp_path " run-directory "/proxy_temp;\n" @@ -1039,13 +1047,24 @@ a webserver.") (shell (file-append shadow "/sbin/nologin"))))) (define %hpcguix-web-activation - #~(begin - (use-modules (guix build utils)) - (let ((home-dir "/var/cache/guix/web") - (user (getpwnam "hpcguix-web"))) - (mkdir-p home-dir) - (chown home-dir (passwd:uid user) (passwd:gid user)) - (chmod home-dir #o755)))) + (with-imported-modules '((guix build utils)) + #~(begin + (use-modules (guix build utils) + (ice-9 ftw)) + + (let ((home-dir "/var/cache/guix/web") + (user (getpwnam "hpcguix-web"))) + (mkdir-p home-dir) + (chown home-dir (passwd:uid user) (passwd:gid user)) + (chmod home-dir #o755) + + ;; Remove stale 'packages.json.lock' file (and other lock files, if + ;; any) since that would prevent 'packages.json' from being updated. + (for-each (lambda (lock) + (delete-file (string-append home-dir "/" lock))) + (scandir home-dir + (lambda (file) + (string-suffix? ".lock" file)))))))) (define %hpcguix-web-log-file "/var/log/hpcguix-web.log") @@ -1425,7 +1444,7 @@ ADMINS = [ DEBUG = " #$(if debug? "True" "False") " -ENABLE_REST_API = " #$(if enable-xmlrpc? "True" "False") " +ENABLE_REST_API = " #$(if enable-rest-api? "True" "False") " ENABLE_XMLRPC = " #$(if enable-xmlrpc? "True" "False") " FORCE_HTTPS_LINKS = " #$(if force-https-links? "True" "False") " diff --git a/gnu/system/file-systems.scm b/gnu/system/file-systems.scm index 6cf6ccc53e..d47a514b66 100644 --- a/gnu/system/file-systems.scm +++ b/gnu/system/file-systems.scm @@ -507,7 +507,10 @@ a bind mount." ;; XXX: On some GNU/Linux systems, /etc/resolv.conf is a ;; symlink to a file in a tmpfs which, for an unknown reason, ;; cannot be bind mounted read-only within the container. - (writable? (string=? file "/etc/resolv.conf")))) + ;; The same goes with /var/run/nscd, as discussed in + ;; <https://bugs.gnu.org/37967>. + (writable? (or (string=? file "/etc/resolv.conf") + (string=? file "/var/run/nscd"))))) (cons "/var/run/nscd" %network-configuration-files))) (define (file-system-type-predicate type) diff --git a/gnu/tests/docker.scm b/gnu/tests/docker.scm index 3f98a1e316..10882b9d1f 100644 --- a/gnu/tests/docker.scm +++ b/gnu/tests/docker.scm @@ -171,7 +171,7 @@ standard output device and then enters a new line.") (home-page #f) (license license:public-domain))) (profile (profile-derivation (packages->manifest - (list guile-2.2 guile-json + (list guile-2.2 guile-json-3 guest-script-package)) #:hooks '() #:locales? #f)) diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index 124d176181..22c9554705 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -138,7 +138,7 @@ export GUIX_BUILD_OPTIONS=--no-grafts guix build isc-dhcp parted --script /dev/vdb mklabel gpt \\ mkpart primary ext2 1M 3M \\ - mkpart primary ext2 3M 1.2G \\ + mkpart primary ext2 3M 1.4G \\ set 1 boot on \\ set 1 bios_grub on mkfs.ext4 -L my-root /dev/vdb2 @@ -163,7 +163,7 @@ guix --version export GUIX_BUILD_OPTIONS=--no-grafts guix build isc-dhcp parted --script /dev/vdb mklabel gpt \\ - mkpart ext2 1M 1.2G \\ + mkpart ext2 1M 1.4G \\ set 1 legacy_boot on mkfs.ext4 -L my-root -O '^64bit' /dev/vdb1 mount /dev/vdb1 /mnt @@ -365,7 +365,7 @@ export GUIX_BUILD_OPTIONS=--no-grafts guix build isc-dhcp parted --script /dev/vda mklabel gpt \\ mkpart primary ext2 1M 3M \\ - mkpart primary ext2 3M 1.2G \\ + mkpart primary ext2 3M 1.4G \\ set 1 boot on \\ set 1 bios_grub on mkfs.ext4 -L my-root /dev/vda2 diff --git a/gnu/tests/singularity.scm b/gnu/tests/singularity.scm index 2f3a6f289d..1fc2773a00 100644 --- a/gnu/tests/singularity.scm +++ b/gnu/tests/singularity.scm @@ -138,7 +138,7 @@ ;; 'singularity exec' insists on having /bin/sh in the image. (profile (profile-derivation (packages->manifest (list bash-minimal - guile-2.2 guile-json)) + guile-2.2 guile-json-3)) #:hooks '() #:locales? #f)) (tarball (squashfs-image "singularity-pack" profile diff --git a/guix/build/make-bootstrap.scm b/guix/build/make-bootstrap.scm index e5ef1d6d2b..0d29338ce3 100644 --- a/guix/build/make-bootstrap.scm +++ b/guix/build/make-bootstrap.scm @@ -47,7 +47,6 @@ bootstrap libc." (install-file (pk 'src (string-append kernel-headers "/include/linux/" file)) (pk 'dest (string-append incdir "/linux")))) '( - "a.out.h" ; for 2.2.5 "atalk.h" ; for 2.2.5 "errno.h" "falloc.h" diff --git a/guix/build/svn.scm b/guix/build/svn.scm index e3188add3e..33783f3056 100644 --- a/guix/build/svn.scm +++ b/guix/build/svn.scm @@ -31,6 +31,7 @@ (define* (svn-fetch url revision directory #:key (svn-command "svn") + (recursive? #t) (user-name #f) (password #f)) "Fetch REVISION from URL into DIRECTORY. REVISION must be an integer, and a @@ -45,6 +46,9 @@ valid Subversion revision. Return #t on success, #f otherwise." (list (string-append "--username=" user-name) (string-append "--password=" password)) '()) + ,@(if recursive? + '() + (list "--ignore-externals")) ,url ,directory)) #t) diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm index bbf2531c79..a5a9c92a42 100644 --- a/guix/build/syscalls.scm +++ b/guix/build/syscalls.scm @@ -80,6 +80,7 @@ lock-file unlock-file with-file-lock + with-file-lock/no-wait set-thread-name thread-name @@ -1087,10 +1088,10 @@ exception if it's already taken." ;; Presumably we got EAGAIN or so. (throw 'flock-error err)))))) -(define (lock-file file) +(define* (lock-file file #:key (wait? #t)) "Wait and acquire an exclusive lock on FILE. Return an open port." (let ((port (open-file file "w0"))) - (fcntl-flock port 'write-lock) + (fcntl-flock port 'write-lock #:wait? wait?) port)) (define (unlock-file port) @@ -1119,10 +1120,40 @@ exception if it's already taken." (when port (unlock-file port)))))) +(define (call-with-file-lock/no-wait file thunk handler) + (let ((port (catch #t + (lambda () + (lock-file file #:wait? #f)) + (lambda (key . args) + (match key + ('flock-error + (handler args)) + ('system-error + ;; When using the statically-linked Guile in the initrd, + ;; 'fcntl-flock' returns ENOSYS unconditionally. Ignore + ;; that error since we're typically the only process running + ;; at this point. + (if (= ENOSYS (system-error-errno (cons key args))) + #f + (apply throw args))) + (_ (apply throw key args))))))) + (dynamic-wind + (lambda () + #t) + thunk + (lambda () + (when port + (unlock-file port)))))) + (define-syntax-rule (with-file-lock file exp ...) "Wait to acquire a lock on FILE and evaluate EXP in that context." (call-with-file-lock file (lambda () exp ...))) +(define-syntax-rule (with-file-lock/no-wait file handler exp ...) + "Try to acquire a lock on FILE and evaluate EXP in that context. Execute +handler if the lock is already held by another process." + (call-with-file-lock/no-wait file (lambda () exp ...) handler)) + ;;; ;;; Miscellaneous, aka. 'prctl'. diff --git a/guix/derivations.scm b/guix/derivations.scm index bde937044a..6cdf55b1fe 100644 --- a/guix/derivations.scm +++ b/guix/derivations.scm @@ -1208,7 +1208,7 @@ they can refer to each other." (define %module-cache ;; Map a list of modules to its 'imported+compiled-modules' result. - (make-weak-value-hash-table)) + (make-hash-table)) (define* (imported+compiled-modules store modules #:key (system (%current-system)) diff --git a/guix/scripts/graph.scm b/guix/scripts/graph.scm index 2e14857f1e..7558cb1e85 100644 --- a/guix/scripts/graph.scm +++ b/guix/scripts/graph.scm @@ -32,6 +32,10 @@ #:use-module (gnu packages) #:use-module (guix sets) #:use-module ((guix utils) #:select (location-file)) + #:use-module ((guix scripts build) + #:select (show-transformation-options-help + options->transformation + %transformation-options)) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) #:use-module (srfi srfi-34) @@ -446,36 +450,38 @@ package modules, while attempting to retain user package modules." ;;; (define %options - (list (option '(#\t "type") #t #f - (lambda (opt name arg result) - (alist-cons 'node-type (lookup-node-type arg) - result))) - (option '("list-types") #f #f - (lambda (opt name arg result) - (list-node-types) - (exit 0))) - (option '(#\b "backend") #t #f - (lambda (opt name arg result) - (alist-cons 'backend (lookup-backend arg) - result))) - (option '("list-backends") #f #f - (lambda (opt name arg result) - (list-backends) - (exit 0))) - (option '(#\e "expression") #t #f - (lambda (opt name arg result) - (alist-cons 'expression arg result))) - (option '(#\s "system") #t #f - (lambda (opt name arg result) - (alist-cons 'system arg - (alist-delete 'system result eq?)))) - (option '(#\h "help") #f #f - (lambda args - (show-help) - (exit 0))) - (option '(#\V "version") #f #f - (lambda args - (show-version-and-exit "guix edit"))))) + (cons* (option '(#\t "type") #t #f + (lambda (opt name arg result) + (alist-cons 'node-type (lookup-node-type arg) + result))) + (option '("list-types") #f #f + (lambda (opt name arg result) + (list-node-types) + (exit 0))) + (option '(#\b "backend") #t #f + (lambda (opt name arg result) + (alist-cons 'backend (lookup-backend arg) + result))) + (option '("list-backends") #f #f + (lambda (opt name arg result) + (list-backends) + (exit 0))) + (option '(#\e "expression") #t #f + (lambda (opt name arg result) + (alist-cons 'expression arg result))) + (option '(#\s "system") #t #f + (lambda (opt name arg result) + (alist-cons 'system arg + (alist-delete 'system result eq?)))) + (option '(#\h "help") #f #f + (lambda args + (show-help) + (exit 0))) + (option '(#\V "version") #f #f + (lambda args + (show-version-and-exit "guix graph"))) + + %transformation-options)) (define (show-help) ;; TRANSLATORS: Here 'dot' is the name of a program; it must not be @@ -495,6 +501,8 @@ Emit a representation of the dependency graph of PACKAGE...\n")) (display (G_ " -s, --system=SYSTEM consider the graph for SYSTEM--e.g., \"i686-linux\"")) (newline) + (show-transformation-options-help) + (newline) (display (G_ " -h, --help display this help and exit")) (display (G_ " @@ -514,21 +522,28 @@ Emit a representation of the dependency graph of PACKAGE...\n")) (define (guix-graph . args) (with-error-handling - (let* ((opts (parse-command-line args %options - (list %default-options) - #:build-options? #f)) - (backend (assoc-ref opts 'backend)) - (type (assoc-ref opts 'node-type)) - (items (filter-map (match-lambda - (('argument . (? store-path? item)) - item) - (('argument . spec) - (specification->package spec)) - (('expression . exp) - (read/eval-package-expression exp)) - (_ #f)) - opts))) - (with-store store + (define opts + (parse-command-line args %options + (list %default-options) + #:build-options? #f)) + (define backend + (assoc-ref opts 'backend)) + (define type + (assoc-ref opts 'node-type)) + + (with-store store + (let* ((transform (options->transformation opts)) + (items (filter-map (match-lambda + (('argument . (? store-path? item)) + item) + (('argument . spec) + (transform store + (specification->package spec))) + (('expression . exp) + (transform store + (read/eval-package-expression exp))) + (_ #f)) + opts))) ;; Ask for absolute file names so that .drv file names passed from the ;; user to 'read-derivation' are absolute when it returns. (with-fluids ((%file-port-name-canonicalization 'absolute)) diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm index 1a58d43e5c..bcd03a1df9 100644 --- a/guix/scripts/package.scm +++ b/guix/scripts/package.scm @@ -42,6 +42,8 @@ #:autoload (guix store roots) (gc-roots) #:use-module ((guix build utils) #:select (directory-exists? mkdir-p)) + #:use-module ((guix build syscalls) + #:select (with-file-lock/no-wait)) #:use-module (ice-9 format) #:use-module (ice-9 match) #:use-module (ice-9 regex) @@ -876,36 +878,44 @@ processed, #f otherwise." (package-version item) (manifest-entry-version entry)))))) - ;; First, process roll-backs, generation removals, etc. - (for-each (match-lambda - ((key . arg) - (and=> (assoc-ref %actions key) - (lambda (proc) - (proc store profile arg opts - #:dry-run? dry-run?))))) - opts) - - ;; Then, process normal package removal/installation/upgrade. - (let* ((manifest (profile-manifest profile)) - (step1 (options->removable opts manifest - (manifest-transaction))) - (step2 (options->installable opts manifest step1)) - (step3 (manifest-transaction - (inherit step2) - (install (map transform-entry - (manifest-transaction-install step2))))) - (new (manifest-perform-transaction manifest step3))) - - (warn-about-old-distro) - - (unless (manifest-transaction-null? step3) - (show-manifest-transaction store manifest step3 - #:dry-run? dry-run?) - (build-and-use-profile store profile new - #:allow-collisions? allow-collisions? - #:bootstrap? bootstrap? - #:use-substitutes? substitutes? - #:dry-run? dry-run?)))) + + ;; First, acquire a lock on the profile, to ensure only one guix process + ;; is modifying it at a time. + (with-file-lock/no-wait (string-append profile ".lock") + (lambda (key . args) + (leave (G_ "profile ~a is locked by another process~%") + profile)) + + ;; Then, process roll-backs, generation removals, etc. + (for-each (match-lambda + ((key . arg) + (and=> (assoc-ref %actions key) + (lambda (proc) + (proc store profile arg opts + #:dry-run? dry-run?))))) + opts) + + ;; Then, process normal package removal/installation/upgrade. + (let* ((manifest (profile-manifest profile)) + (step1 (options->removable opts manifest + (manifest-transaction))) + (step2 (options->installable opts manifest step1)) + (step3 (manifest-transaction + (inherit step2) + (install (map transform-entry + (manifest-transaction-install step2))))) + (new (manifest-perform-transaction manifest step3))) + + (warn-about-old-distro) + + (unless (manifest-transaction-null? step3) + (show-manifest-transaction store manifest step3 + #:dry-run? dry-run?) + (build-and-use-profile store profile new + #:allow-collisions? allow-collisions? + #:bootstrap? bootstrap? + #:use-substitutes? substitutes? + #:dry-run? dry-run?))))) ;;; diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm index 80d070652b..92aac6066e 100644 --- a/guix/scripts/pull.scm +++ b/guix/scripts/pull.scm @@ -235,12 +235,18 @@ purposes." (define title (channel-news-entry-title entry)) - (format port " ~a~%" - (highlight - (string-trim-right - (texi->plain-text (or (assoc-ref title language) - (assoc-ref title (%default-message-language)) - "")))))) + (let ((title (or (assoc-ref title language) + (assoc-ref title (%default-message-language)) + ""))) + (format port " ~a~%" + (highlight + (string-trim-right + (catch 'parser-error + (lambda () + (texi->plain-text title)) + + ;; When Texinfo markup is invalid, display it as-is. + (const title))))))) (define (display-news-entry entry language port) "Display ENTRY, a <channel-news-entry>, in LANGUAGE, a language code, to @@ -252,14 +258,20 @@ PORT." (format port (dim (G_ " commit ~a~%")) (channel-news-entry-commit entry)) (newline port) - (format port " ~a~%" - (indented-string - (parameterize ((%text-width (- (%text-width) 4))) - (string-trim-right - (texi->plain-text (or (assoc-ref body language) - (assoc-ref body (%default-message-language)) - "")))) - 4))) + (let ((body (or (assoc-ref body language) + (assoc-ref body (%default-message-language)) + ""))) + (format port " ~a~%" + (indented-string + (parameterize ((%text-width (- (%text-width) 4))) + (string-trim-right + (catch 'parser-error + (lambda () + (texi->plain-text body)) + (lambda _ + ;; When Texinfo markup is invalid, display it as-is. + (fill-paragraph body (%text-width)))))) + 4)))) (define* (display-channel-specific-news new old #:key (port (current-output-port)) diff --git a/guix/scripts/system/search.scm b/guix/scripts/system/search.scm index 5278062edd..d2eac06cca 100644 --- a/guix/scripts/system/search.scm +++ b/guix/scripts/system/search.scm @@ -65,9 +65,12 @@ provided TYPE has a default value." (define* (service-type->recutils type port #:optional (width (%text-width)) - #:key (extra-fields '())) + #:key + (extra-fields '()) + (hyperlinks? (supports-hyperlinks? port))) "Write to PORT a recutils record of TYPE, arranging to fit within WIDTH -columns." +columns. When HYPERLINKS? is true, emit hyperlink escape sequences when +appropriate." (define width* ;; The available number of columns once we've taken into account space for ;; the initial "+ " prefix. @@ -84,7 +87,8 @@ columns." ;; Note: Don't i18n field names so that people can post-process it. (format port "name: ~a~%" (service-type-name type)) (format port "location: ~a~%" - (or (and=> (service-type-location type) location->string) + (or (and=> (service-type-location type) + (if hyperlinks? location->hyperlink location->string)) (G_ "unknown"))) (format port "extends: ~a~%" diff --git a/guix/svn-download.scm b/guix/svn-download.scm index 4139cbc2e2..59e2eb8d07 100644 --- a/guix/svn-download.scm +++ b/guix/svn-download.scm @@ -31,6 +31,7 @@ svn-reference? svn-reference-url svn-reference-revision + svn-reference-recursive? svn-fetch download-svn-to-store @@ -39,6 +40,7 @@ svn-multi-reference-url svn-multi-reference-revision svn-multi-reference-locations + svn-multi-reference-recursive? svn-multi-fetch)) ;;; Commentary: @@ -52,10 +54,11 @@ (define-record-type* <svn-reference> svn-reference make-svn-reference svn-reference? - (url svn-reference-url) ; string - (revision svn-reference-revision) ; number - (user-name svn-reference-user-name (default #f)) - (password svn-reference-password (default #f))) + (url svn-reference-url) ; string + (revision svn-reference-revision) ; number + (recursive? svn-reference-recursive? (default #t)) + (user-name svn-reference-user-name (default #f)) + (password svn-reference-password (default #f))) (define (subversion-package) "Return the default Subversion package." @@ -78,6 +81,7 @@ HASH-ALGO (a symbol). Use NAME as the file name, or a generic name if #f." '#$(svn-reference-revision ref) #$output #:svn-command (string-append #+svn "/bin/svn") + #:recursive? #$(svn-reference-recursive? ref) #:user-name #$(svn-reference-user-name ref) #:password #$(svn-reference-password ref))))) @@ -96,6 +100,7 @@ HASH-ALGO (a symbol). Use NAME as the file name, or a generic name if #f." (url svn-multi-reference-url) ; string (revision svn-multi-reference-revision) ; number (locations svn-multi-reference-locations) ; list of strings + (recursive? svn-multi-reference-recursive? (default #t)) (user-name svn-multi-reference-user-name (default #f)) (password svn-multi-reference-password (default #f))) @@ -125,6 +130,8 @@ HASH-ALGO (a symbol). Use NAME as the file name, or a generic name if #f." (string-append #$output "/" location) (string-append #$output "/" (dirname location))) #:svn-command (string-append #+svn "/bin/svn") + #:recursive? + #$(svn-multi-reference-recursive? ref) #:user-name #$(svn-multi-reference-user-name ref) #:password #$(svn-multi-reference-password ref))) '#$(svn-multi-reference-locations ref))))) diff --git a/guix/ui.scm b/guix/ui.scm index 3e4bd5787e..eb17d274c8 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -44,7 +44,8 @@ #:use-module (guix derivations) #:use-module (guix build-system) #:use-module (guix serialization) - #:use-module ((guix licenses) #:select (license? license-name)) + #:use-module ((guix licenses) + #:select (license? license-name license-uri)) #:use-module ((guix build syscalls) #:select (free-disk-space terminal-columns terminal-rows)) @@ -69,6 +70,7 @@ #:autoload (system base compile) (compile-file) #:autoload (system repl repl) (start-repl) #:autoload (system repl debug) (make-debug stack->vector) + #:autoload (web uri) (encode-and-join-uri-path) #:use-module (texinfo) #:use-module (texinfo plain-text) #:use-module (texinfo string-utils) @@ -108,6 +110,9 @@ package->recutils package-specification->name+version+output + supports-hyperlinks? + location->hyperlink + relevance package-relevance display-search-results @@ -1234,10 +1239,42 @@ followed by \"+ \", which makes for a valid multi-line field value in the '() str))) +(define (hyperlink uri text) + "Return a string that denotes a hyperlink using an OSC escape sequence as +documented at +<https://gist.github.com/egmontkob/eb114294efbcd5adb1944c9f3cb5feda>." + (string-append "\x1b]8;;" uri "\x1b\\" + text "\x1b]8;;\x1b\\")) + +(define (supports-hyperlinks? port) + "Return true if PORT is a terminal that supports hyperlink escapes." + ;; Note that terminals are supposed to ignore OSC escapes they don't + ;; understand (this is the case of xterm as of version 349, for instance.) + ;; However, Emacs comint as of 26.3 does not ignore it and instead lets it + ;; through, hence the 'INSIDE_EMACS' special case below. + (and (isatty?* port) + (not (getenv "INSIDE_EMACS")))) + +(define (location->hyperlink location) + "Return a string corresponding to LOCATION, with escapes for a hyperlink." + (let ((str (location->string location)) + (file (if (string-prefix? "/" (location-file location)) + (location-file location) + (search-path %load-path (location-file location))))) + (if file + (hyperlink (string-append "file://" (gethostname) + (encode-and-join-uri-path + (string-split file #\/))) + str) + str))) + (define* (package->recutils p port #:optional (width (%text-width)) - #:key (extra-fields '())) + #:key + (hyperlinks? (supports-hyperlinks? port)) + (extra-fields '())) "Write to PORT a `recutils' record of package P, arranging to fit within -WIDTH columns. EXTRA-FIELDS is a list of symbol/value pairs to emit." +WIDTH columns. EXTRA-FIELDS is a list of symbol/value pairs to emit. When +HYPERLINKS? is true, emit hyperlink escape sequences when appropriate." (define width* ;; The available number of columns once we've taken into account space for ;; the initial "+ " prefix. @@ -1265,7 +1302,8 @@ WIDTH columns. EXTRA-FIELDS is a list of symbol/value pairs to emit." (((labels inputs . _) ...) (dependencies->recutils (filter package? inputs))))) (format port "location: ~a~%" - (or (and=> (package-location p) location->string) + (or (and=> (package-location p) + (if hyperlinks? location->hyperlink location->string)) (G_ "unknown"))) ;; Note: Starting from version 1.6 or recutils, hyphens are not allowed in @@ -1278,7 +1316,11 @@ WIDTH columns. EXTRA-FIELDS is a list of symbol/value pairs to emit." (string-join (map license-name licenses) ", ")) ((? license? license) - (license-name license)) + (let ((text (license-name license)) + (uri (license-uri license))) + (if (and hyperlinks? uri (string-prefix? "http" uri)) + (hyperlink uri text) + text))) (x (G_ "unknown")))) (format port "synopsis: ~a~%" @@ -1398,11 +1440,13 @@ them. If PORT is a terminal, print at most a full screen of results." (let loop ((matches matches)) (match matches (((package . score) rest ...) - (let ((text (call-with-output-string - (lambda (port) - (print package port - #:extra-fields - `((relevance . ,score))))))) + (let* ((links? (supports-hyperlinks? port)) + (text (call-with-output-string + (lambda (port) + (print package port + #:hyperlinks? links? + #:extra-fields + `((relevance . ,score))))))) (if (and max-rows (> (port-line port) first-line) ;print at least one result (> (+ 4 (line-count text) (port-line port)) diff --git a/nix/libstore/build.cc b/nix/libstore/build.cc index 74cd05417f..17e92c68a7 100644 --- a/nix/libstore/build.cc +++ b/nix/libstore/build.cc @@ -51,11 +51,6 @@ #include <sched.h> #endif -/* In GNU libc 2.11, <sys/mount.h> does not define `MS_PRIVATE', but - <linux/fs.h> does. */ -#if !defined MS_PRIVATE && defined HAVE_LINUX_FS_H -#include <linux/fs.h> -#endif #define CHROOT_ENABLED HAVE_CHROOT && HAVE_SYS_MOUNT_H && defined(MS_BIND) && defined(MS_PRIVATE) && defined(CLONE_NEWNS) && defined(SYS_pivot_root) @@ -947,6 +942,11 @@ void DerivationGoal::killChild() assert(pid == -1); } + /* If there was a build hook involved, remove it from the worker's + children. */ + if (hook && hook->pid != -1) { + worker.childTerminated(hook->pid); + } hook.reset(); } diff --git a/nix/libstore/local-store.cc b/nix/libstore/local-store.cc index 3793382361..7a520925e5 100644 --- a/nix/libstore/local-store.cc +++ b/nix/libstore/local-store.cc @@ -28,11 +28,8 @@ #include <sys/mount.h> #endif -#if HAVE_LINUX_FS_H -#include <linux/fs.h> #include <sys/ioctl.h> #include <errno.h> -#endif #include <sqlite3.h> diff --git a/tests/guix-build.sh b/tests/guix-build.sh index 37666ffd01..52feda9d3a 100644 --- a/tests/guix-build.sh +++ b/tests/guix-build.sh @@ -226,6 +226,10 @@ rmdir "$result" # Cross building. guix build coreutils --target=mips64el-linux-gnu --dry-run --no-substitutes +# Likewise, but with '-e' (see <https://bugs.gnu.org/38093>). +guix build --target=arm-linux-gnueabihf --dry-run \ + -e '(@ (gnu packages base) coreutils)' + # Replacements. drv1=`guix build guix --with-input=guile@2.0=guile@2.2 -d` drv2=`guix build guix -d` diff --git a/tests/guix-graph.sh b/tests/guix-graph.sh index 1ec99706fd..2d4b3fac3f 100644 --- a/tests/guix-graph.sh +++ b/tests/guix-graph.sh @@ -1,5 +1,5 @@ # GNU Guix --- Functional package management for GNU -# Copyright © 2015, 2016 Ludovic Courtès <ludo@gnu.org> +# Copyright © 2015, 2016, 2019 Ludovic Courtès <ludo@gnu.org> # # This file is part of GNU Guix. # @@ -53,3 +53,9 @@ cmp "$tmpfile1" "$tmpfile2" guix graph -t derivation coreutils > "$tmpfile1" guix graph -t derivation `guix build -d coreutils` > "$tmpfile2" cmp "$tmpfile1" "$tmpfile2" + +# Try package transformation options. +guix graph git | grep 'label = "openssl' +guix graph git --with-input=openssl=libressl | grep 'label = "libressl' +if guix graph git --with-input=openssl=libressl | grep 'label = "openssl' +then false; else true; fi diff --git a/tests/guix-package.sh b/tests/guix-package.sh index 0de30bf6c1..7ad0699380 100644 --- a/tests/guix-package.sh +++ b/tests/guix-package.sh @@ -33,7 +33,7 @@ profile="t-profile-$$" tmpfile="t-guix-package-file-$$" rm -f "$profile" "$tmpfile" -trap 'rm -f "$profile" "$profile-"[0-9]* "$tmpfile"; rm -rf "$module_dir" t-home-'"$$" EXIT +trap 'rm -f "$profile" "$profile.lock" "$profile-"[0-9]* "$tmpfile"; rm -rf "$module_dir" t-home-'"$$" EXIT # Use `-e' with a non-package expression. if guix package --bootstrap -e +; @@ -452,3 +452,11 @@ rm -rf "$module_dir" # Make sure we can see user profiles. guix package --list-profiles | grep "$profile" guix package --list-profiles | grep '\.guix-profile' + +# Make sure we can properly lock a profile. +mkdir "$module_dir" +echo '(sleep 60)' > "$module_dir/manifest.scm" +guix package -m "$module_dir/manifest.scm" -p "$module_dir/profile" & +pid=$! +if guix install emacs -p "$module_dir/profile"; then kill $pid; false; else true; fi +kill $pid diff --git a/tests/networking.scm b/tests/networking.scm index 439cca5ffc..c494a48067 100644 --- a/tests/networking.scm +++ b/tests/networking.scm @@ -36,22 +36,23 @@ (ntp-server (type 'server) (address "some.ntp.server.org") - (options `(iburst (version 3) (maxpoll 16) prefer)))) + ;; Using either strings or symbols for option names is accepted. + (options `("iburst" (version 3) (maxpoll 16) prefer)))) (test-equal "ntp-server->string" - (ntp-server->string %ntp-server-sample) - "server some.ntp.server.org iburst version 3 maxpoll 16 prefer") + "server some.ntp.server.org iburst version 3 maxpoll 16 prefer" + (ntp-server->string %ntp-server-sample)) (test-equal "ntp configuration servers deprecated form" (ntp-configuration-servers (ntp-configuration + (servers (list "example.pool.ntp.org")))) + (ntp-configuration-servers + (ntp-configuration (servers (list (ntp-server (type 'server) (address "example.pool.ntp.org") - (options '())))))) - (ntp-configuration-servers - (ntp-configuration - (servers (list "example.pool.ntp.org"))))) + (options '()))))))) ;;; @@ -106,8 +107,8 @@ the sanity check:\n~a~%" config) #t)))) (test-equal "openntpd generated config string ends with a newline" + "\n" (let ((config (openntpd-configuration->string %openntpd-conf-sample))) - (string-take-right config 1)) - "\n") + (string-take-right config 1))) (test-end "networking") |