diff options
139 files changed, 4988 insertions, 2041 deletions
diff --git a/.dir-locals.el b/.dir-locals.el index fcde914e60..e34ddc5a85 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -96,6 +96,8 @@ (eval . (put 'call-with-progress-reporter 'scheme-indent-function 1)) (eval . (put 'with-temporary-git-repository 'scheme-indent-function 2)) + (eval . (put 'with-environment-variables 'scheme-indent-function 1)) + (eval . (put 'with-fresh-gnupg-setup 'scheme-indent-function 1)) ;; This notably allows '(' in Paredit to not insert a space when the ;; preceding symbol is one of these. diff --git a/Makefile.am b/Makefile.am index 5b64386b53..f3985f9572 100644 --- a/Makefile.am +++ b/Makefile.am @@ -104,6 +104,7 @@ MODULES = \ guix/lint.scm \ guix/glob.scm \ guix/git.scm \ + guix/git-authenticate.scm \ guix/graph.scm \ guix/cache.scm \ guix/cve.scm \ @@ -318,7 +319,8 @@ MODULES += $(STORE_MODULES) dist_noinst_DATA = \ guix/tests.scm \ guix/tests/http.scm \ - guix/tests/git.scm + guix/tests/git.scm \ + guix/tests/gnupg.scm # Auxiliary files for packages. AUX_FILES = \ @@ -403,6 +405,7 @@ SCM_TESTS = \ tests/gem.scm \ tests/gexp.scm \ tests/git.scm \ + tests/git-authenticate.scm \ tests/glob.scm \ tests/gnu-maintenance.scm \ tests/grafts.scm \ @@ -575,6 +578,8 @@ EXTRA_DIST += \ tests/dsa.key \ tests/ed25519.key \ tests/ed25519.sec \ + tests/ed25519bis.key \ + tests/ed25519bis.sec \ build-aux/config.rpath \ bootstrap \ doc/build.scm \ @@ -632,7 +637,7 @@ commit_v1_0_1 = d68de958b60426798ed62797ff7c96c327a672ac # Authenticate the current Git checkout by checking signatures on every commit # starting from $(commit_v1_0_1). -authenticate: guix/openpgp.go guix/git.go +authenticate: guix/openpgp.go guix/git-authenticate.go guix/git.go $(AM_V_at)echo "Authenticating Git checkout..." ; \ "$(top_builddir)/pre-inst-env" $(GUILE) \ --no-auto-compile -e git-authenticate \ @@ -18,27 +18,12 @@ Guix is based on the [[https://nixos.org/nix/][Nix]] package manager. * Requirements -GNU Guix currently depends on the following packages: +If you are building Guix from source, please see the manual for build +instructions and requirements, either by running: - - [[https://gnu.org/software/guile/][GNU Guile 2.2.x]] - - [[https://notabug.org/cwebber/guile-gcrypt][Guile-Gcrypt]] 0.1.0 or later - - [[https://www.gnu.org/software/make/][GNU Make]] - - [[https://www.gnutls.org][GnuTLS]] compiled with guile support enabled - - [[https://notabug.org/guile-sqlite3/guile-sqlite3][Guile-SQLite3]], version 0.1.0 or later - - [[https://gitlab.com/guile-git/guile-git][Guile-Git]] - - [[http://www.zlib.net/][zlib]] - - [[https://savannah.nongnu.org/projects/guile-json/][Guile-JSON]] + info -f doc/guix.info "Requirements" -Unless `--disable-daemon' was passed, the following packages are needed: - - - [[https://gnupg.org/][GNU libgcrypt]] - - [[https://sqlite.org/][SQLite 3]] - - [[https://gcc.gnu.org][GCC's g++]] - - optionally [[http://www.bzip.org][libbz2]] - -When `--disable-daemon' was passed, you instead need the following: - - - [[https://nixos.org/nix/][Nix]] +or by checking the [[https://guix.gnu.org/manual/en/html_node/Requirements.html][web copy of the manual]]. * Installation @@ -46,7 +31,7 @@ See the manual for the installation instructions, either by running info -f doc/guix.info "Installation" -or by checking the [[https://www.gnu.org/software/guix/manual/guix.html#Installation][web copy of the manual]]. +or by checking the [[https://guix.gnu.org/manual/en/html_node/Installation.html][web copy of the manual]]. For information on installation from a Git checkout, please see the section "Building from Git" in the manual. diff --git a/build-aux/git-authenticate.scm b/build-aux/git-authenticate.scm index ab50459369..5e1fdaaa24 100644 --- a/build-aux/git-authenticate.scm +++ b/build-aux/git-authenticate.scm @@ -22,32 +22,28 @@ ;;; (use-modules (git) - (guix git) - (guix openpgp) (guix base16) - ((guix utils) - #:select (cache-directory with-atomic-file-output)) - ((guix build utils) #:select (mkdir-p)) + (guix git) + (guix git-authenticate) (guix i18n) + ((guix openpgp) + #:select (openpgp-public-key-fingerprint + openpgp-format-fingerprint)) (guix progress) (srfi srfi-1) - (srfi srfi-11) (srfi srfi-26) - (srfi srfi-34) - (srfi srfi-35) - (rnrs bytevectors) - (rnrs io ports) (ice-9 match) (ice-9 format) (ice-9 pretty-print)) -(define %committers - ;; List of committers. These are the user names found on +(define %historical-committers + ;; List of "historical" committers---people once authorized committers + ;; before the '.guix-authorizations' file was created. + ;; + ;; These are the user names found on ;; <https://savannah.gnu.org/project/memberlist.php?group=guix> along with ;; the fingerprint of the signing (sub)key. - ;; - ;; TODO: Replace this statically-defined list by an in-repo list. '(("andreas" "AD17 A21E F8AE D8F1 CC02 DBD9 F7D5 C9BF 765C 61E3") ("ajgrf" @@ -214,13 +210,13 @@ ("wingo" "FF47 8FB2 64DE 32EC 2967 25A3 DDC0 F535 8812 F8F2"))) -(define %authorized-signing-keys - ;; Fingerprint of authorized signing keys. +(define %historical-authorized-signing-keys + ;; Fingerprint of historically authorized signing keys. (map (match-lambda ((name fingerprint) (base16-string->bytevector (string-downcase (string-filter char-set:graphic fingerprint))))) - %committers)) + %historical-committers)) (define %commits-with-bad-signature ;; Commits with a known-bad signature. @@ -230,197 +226,11 @@ ;; Commits lacking a signature. '()) -(define (commit-signing-key repo commit-id keyring) - "Return the OpenPGP key that signed COMMIT-ID (an OID). Raise an exception -if the commit is unsigned, has an invalid signature, or if its signing key is -not in KEYRING." - (let-values (((signature signed-data) - (catch 'git-error - (lambda () - (commit-extract-signature repo commit-id)) - (lambda _ - (values #f #f))))) - (unless signature - (raise (condition - (&message - (message (format #f (G_ "commit ~a lacks a signature") - commit-id)))))) - - (let ((signature (string->openpgp-packet signature))) - (with-fluids ((%default-port-encoding "UTF-8")) - (let-values (((status data) - (verify-openpgp-signature signature keyring - (open-input-string signed-data)))) - (match status - ('bad-signature - ;; There's a signature but it's invalid. - (raise (condition - (&message - (message (format #f (G_ "signature verification failed \ -for commit ~a") - (oid->string commit-id))))))) - ('missing-key - (raise (condition - (&message - (message (format #f (G_ "could not authenticate \ -commit ~a: key ~a is missing") - (oid->string commit-id) - data)))))) - ('good-signature data))))))) - -(define (read-authorizations port) - "Read authorizations in the '.guix-authorizations' format from PORT, and -return a list of authorized fingerprints." - (match (read port) - (('authorizations ('version 0) - (((? string? fingerprints) _ ...) ...) - _ ...) - (map (lambda (fingerprint) - (base16-string->bytevector - (string-downcase (string-filter char-set:graphic fingerprint)))) - fingerprints)))) - -(define* (commit-authorized-keys repository commit - #:optional (default-authorizations '())) - "Return the list of OpenPGP fingerprints authorized to sign COMMIT, based on -authorizations listed in its parent commits. If one of the parent commits -does not specify anything, fall back to DEFAULT-AUTHORIZATIONS." - (define (commit-authorizations commit) - (catch 'git-error - (lambda () - (let* ((tree (commit-tree commit)) - (entry (tree-entry-bypath tree ".guix-authorizations")) - (blob (blob-lookup repository (tree-entry-id entry)))) - (read-authorizations - (open-bytevector-input-port (blob-content blob))))) - (lambda (key error) - (if (= (git-error-code error) GIT_ENOTFOUND) - default-authorizations - (throw key error))))) - - (apply lset-intersection bytevector=? - (map commit-authorizations (commit-parents commit)))) - -(define (authenticate-commit repository commit keyring) - "Authenticate COMMIT from REPOSITORY and return the signing key fingerprint. -Raise an error when authentication fails." - (define id - (commit-id commit)) - - (define signing-key - (commit-signing-key repository id keyring)) - - (unless (member (openpgp-public-key-fingerprint signing-key) - (commit-authorized-keys repository commit - %authorized-signing-keys)) - (raise (condition - (&message - (message (format #f (G_ "commit ~a not signed by an authorized \ -key: ~a") - (oid->string id) - (openpgp-format-fingerprint - (openpgp-public-key-fingerprint - signing-key)))))))) - - signing-key) - -(define (load-keyring-from-blob repository oid keyring) - "Augment KEYRING with the keyring available in the blob at OID, which may or -may not be ASCII-armored." - (let* ((blob (blob-lookup repository oid)) - (port (open-bytevector-input-port (blob-content blob)))) - (get-openpgp-keyring (if (port-ascii-armored? port) - (open-bytevector-input-port (read-radix-64 port)) - port) - keyring))) - -(define (load-keyring-from-reference repository reference) - "Load the '.key' files from the tree at REFERENCE in REPOSITORY and return -an OpenPGP keyring." - (let* ((reference (branch-lookup repository - (string-append "origin/" reference) - BRANCH-REMOTE)) - (target (reference-target reference)) - (commit (commit-lookup repository target)) - (tree (commit-tree commit))) - (fold (lambda (name keyring) - (if (string-suffix? ".key" name) - (let ((entry (tree-entry-bypath tree name))) - (load-keyring-from-blob repository - (tree-entry-id entry) - keyring)) - keyring)) - %empty-keyring - (tree-list tree)))) - -(define* (authenticate-commits repository commits - #:key - (keyring-reference "keyring") - (report-progress (const #t))) - "Authenticate COMMITS, a list of commit objects, calling REPORT-PROGRESS for -each of them. Return an alist showing the number of occurrences of each key. -The OpenPGP keyring is loaded from KEYRING-REFERENCE in REPOSITORY." - (define keyring - (load-keyring-from-reference repository keyring-reference)) - - (fold (lambda (commit stats) - (report-progress) - (let ((signer (authenticate-commit repository commit keyring))) - (match (assq signer stats) - (#f (cons `(,signer . 1) stats)) - ((_ . count) (cons `(,signer . ,(+ count 1)) - (alist-delete signer stats)))))) - '() - commits)) - (define commit-short-id (compose (cut string-take <> 7) oid->string commit-id)) ;;; -;;; Caching. -;;; - -(define (authenticated-commit-cache-file) - "Return the name of the file that contains the cache of -previously-authenticated commits." - (string-append (cache-directory) "/authentication/channels/guix")) - -(define (previously-authenticated-commits) - "Return the previously-authenticated commits as a list of commit IDs (hex -strings)." - (catch 'system-error - (lambda () - (call-with-input-file (authenticated-commit-cache-file) - read)) - (lambda args - (if (= ENOENT (system-error-errno args)) - '() - (apply throw args))))) - -(define (cache-authenticated-commit commit-id) - "Record in ~/.cache COMMIT-ID and its closure as authenticated (only -COMMIT-ID is written to cache, though)." - (define %max-cache-length - ;; Maximum number of commits in cache. - 200) - - (let ((lst (delete-duplicates - (cons commit-id (previously-authenticated-commits)))) - (file (authenticated-commit-cache-file))) - (mkdir-p (dirname file)) - (with-atomic-file-output file - (lambda (port) - (let ((lst (if (> (length lst) %max-cache-length) - (take lst %max-cache-length) ;truncate - lst))) - (chmod port #o600) - (display ";; List of previously-authenticated commits.\n\n" - port) - (pretty-print lst port)))))) - - -;;; ;;; Entry point. ;;; @@ -461,6 +271,8 @@ COMMIT-ID is written to cache, though)." (let ((stats (call-with-progress-reporter reporter (lambda (report) (authenticate-commits repository commits + #:default-authorizations + %historical-authorized-signing-keys #:report-progress report))))) (cache-authenticated-commit (oid->string (commit-id end-commit))) diff --git a/doc/guix-cookbook.texi b/doc/guix-cookbook.texi index 8651bc4429..1342826c97 100644 --- a/doc/guix-cookbook.texi +++ b/doc/guix-cookbook.texi @@ -14,6 +14,7 @@ Copyright @copyright{} 2019 Pierre Neidhardt@* Copyright @copyright{} 2020 Oleg Pykhalov@* Copyright @copyright{} 2020 Matthew Brooks@* Copyright @copyright{} 2020 Marcin Karpezo@* +Copyright @copyright{} 2020 Brice Waegeneire@* Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or @@ -327,7 +328,7 @@ package definitions. @item Inheritance makes it easy to customize a package by inheriting from it and modifying only what is needed. - + @item Batch processing: the whole package collection can be parsed, filtered and processed. Building a headless server with all graphical interfaces stripped @@ -1323,8 +1324,10 @@ reference. @menu * Customizing the Kernel:: Creating and using a custom Linux kernel on Guix System. +* Connecting to Wireguard VPN:: Connecting to a Wireguard VPN. * Customizing a Window Manager:: Handle customization of a Window manager on Guix System. * Setting up a bind mount:: Setting up a bind mount in the file-systems definition. +* Getting substitutes from Tor:: Configuring Guix daemon to get substitutes through Tor. @end menu @node Customizing the Kernel @@ -1567,6 +1570,83 @@ likely that you'll need to modify the initrd on a machine using a custom kernel, since certain modules which are expected to be built may not be available for inclusion into the initrd. +@node Connecting to Wireguard VPN +@section Connecting to Wireguard VPN + +To connect to a Wireguard VPN server you need the kernel module to be +loaded in memory and a package providing networking tools that support +it (e.g. @code{wireguard-tools} or @code{network-manager}). + +Here is a configuration example for Linux-Libre < 5.6, where the module +is out of tree and need to be loaded manually---following revisions of +the kernel have it built-in and so don't need such configuration: + +@lisp +(use-modules (gnu)) +(use-service-modules desktop) +(use-package-modules vpn) + +(operating-system + ;; … + (services (cons (simple-service 'wireguard-module + kernel-module-loader-service-type + '("wireguard")) + %desktop-services)) + (packages (cons wireguard-tools %base-packages)) + (kernel-loadable-modules (list wireguard-linux-compat))) +@end lisp + +After reconfiguring and restarting your system you can either use +Wireguard tools or NetworkManager to connect to a VPN server. + +@subsection Using Wireguard tools + +To test your Wireguard setup it is convenient to use @command{wg-quick}. +Just give it a configuration file @command{wg-quick up ./wg0.conf}; or +put that file in @file{/etc/wireguard} and run @command{wg-quick up wg0} +instead. + +@quotation Note +Be warned that the author described this command as a: “[…] very quick +and dirty bash script […]”. +@end quotation + +@subsection Using NetworkManager + +Thanks to NetworkManager support for Wireguard we can connect to our VPN +using @command{nmcli} command. Up to this point this guide assumes that +you're using Network Manager service provided by +@code{%desktop-services}. Ortherwise you need to adjust your services +list to load @code{network-manager-service-type} and reconfigure your +Guix system. + +To import your VPN configuration execute nmcli import command: + +@example shell +# nmcli connection import type wireguard file wg0.conf +Connection 'wg0' (edbee261-aa5a-42db-b032-6c7757c60fde) successfully added +@end example + +This will create a configuration file in +@file{/etc/NetworkManager/wg0.nmconnection}. Next connect to the +Wireguard server: + +@example shell +$ nmcli connection up wg0 +Connection successfully activated (D-Bus active path: /org/freedesktop/NetworkManager/ActiveConnection/6) +@end example + +By default NetworkManager will connect automatically on system boot. To +change that behaviour you need to edit your config: + +@example shell +# nmcli connection modify wg0 connection.autoconnect no +@end example + +For more specific information about NetworkManager and wireguard +@uref{https://blogs.gnome.org/thaller/2019/03/15/wireguard-in-networkmanager/,see +this post by thaller}. + @node Customizing a Window Manager @section Customizing a Window Manager @cindex wm @@ -1707,6 +1787,62 @@ mount itself. )) @end lisp +@node Getting substitutes from Tor +@section Getting substitutes from Tor + +Guix daemon can use a HTTP proxy to get substitutes, here we are +configuring it to get them via Tor. + +@quotation Warning +@emph{Not all} Guix daemon's traffic will go through Tor! Only +HTTP/HTTPS will get proxied; FTP, Git protocol, SSH, etc connections +will still go through the clearnet. Again, this configuration isn't +foolproof some of your traffic won't get routed by Tor at all. Use it +at your own risk. +@end quotation + +Guix's substitute server is available as a Onion service, if you want +to use it to get your substitutes from Tor configure your system as +follow: + +@lisp +(use-modules (gnu)) +(use-service-module base networking) + +(operating-system + … + (services + (cons + (service tor-service-type + (tor-configuration + (config-file (plain-file "tor-config" + "HTTPTunnelPort 127.0.0.1:9250")))) + (modify-services %base-services + (guix-service-type + config => (guix-configuration + (inherit config) + ;; ci.guix.gnu.org's Onion service + (substitute-urls "https://bp7o7ckwlewr4slm.onion") + (http-proxy "http://localhost:9250"))))))) +@end lisp + +This will keep a tor process running that provides a HTTP CONNECT tunnel +which will be used by @command{guix-daemon}. The daemon can use other +protocols than HTTP(S) to get remote resources, request using those +protocols won't go through Tor since we are only setting a HTTP tunnel +here. Note that @code{substitutes-urls} is using HTTPS and not HTTP or +it won't work, that's a limitation of Tor's tunnel; you may want to use +@command{privoxy} instead to avoid such limitations. + +If you don't want to always get substitutes through Tor but using it just +some of the times, then skip the @code{guix-configuration}. When you +want to get a substitute from the Tor tunnel run: + +@example +sudo herd set-http-proxy guix-daemon http://localhost:9250 +guix build --substitute-urls=https://bp7o7ckwlewr4slm.onion … +@end example + @c ********************************************************************* @node Advanced package management @chapter Advanced package management diff --git a/doc/guix.texi b/doc/guix.texi index ba5729bd41..056bf011f6 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -2279,6 +2279,12 @@ types.}. For the ESP, if you have one and assuming it is mkfs.fat -F32 /dev/sda1 @end example +For the root file system, ext4 is the most widely used format. Other +file systems, such as Btrfs, support compression, which is reported to +nicely complement file deduplication that the daemon performs +independently of the file system (@pxref{Invoking guix-daemon, +deduplication}). + Preferably, assign file systems a label so that you can easily and reliably refer to them in @code{file-system} declarations (@pxref{File Systems}). This is typically done using the @code{-L} option of @@ -22858,6 +22864,12 @@ The network port that the @command{nfsd} daemon should use. @item @code{nfsd-threads} (default: @code{8}) The number of threads used by the @command{nfsd} daemon. +@item @code{nfsd-tcp?} (default: @code{#t}) +Whether the @command{nfsd} daemon should listen on a TCP socket. + +@item @code{nfsd-udp?} (default: @code{#f}) +Whether the @command{nfsd} daemon should listen on a UDP socket. + @item @code{pipefs-directory} (default: @code{"/var/lib/nfs/rpc_pipefs"}) The directory where the pipefs file system is mounted. @@ -26281,6 +26293,15 @@ The Docker package to use. @item @code{containerd} (default: @var{containerd}) The Containerd package to use. +@item @code{proxy} (default @var{docker-libnetwork-cmd-proxy}) +The Docker user-land networking proxy package to use. + +@item @code{enable-proxy?} (default @code{#f}) +Enable or disable the use of the Docker user-land networking proxy. + +@item @code{debug?} (default @code{#f}) +Enable or disable debug output. + @end table @end deftp diff --git a/etc/completion/bash/guix b/etc/completion/bash/guix index 0333bfc8a2..df35919eb2 100644 --- a/etc/completion/bash/guix +++ b/etc/completion/bash/guix @@ -1,5 +1,5 @@ # GNU Guix --- Functional package management for GNU -# Copyright © 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> +# Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> # # This file is part of GNU Guix. # @@ -115,6 +115,24 @@ _guix_is_dash_m () esac } } +_guix_is_dash_C () +{ + [ "${COMP_WORDS[$COMP_CWORD - 1]}" = "-C" ] \ + || { case "${COMP_WORDS[$COMP_CWORD]}" in + --channels=*) true;; + *) false;; + esac } +} + +_guix_is_dash_p () +{ + [ "${COMP_WORDS[$COMP_CWORD - 1]}" = "-p" ] \ + || { case "${COMP_WORDS[$COMP_CWORD]}" in + --profile=*) true;; + *) false;; + esac } +} + _guix_complete_file () { # Let Readline complete file names. @@ -130,6 +148,17 @@ _guix_complete_pid () declare _guix_subcommands +_guix_complete_subcommand () +{ + if [ -z "$_guix_subcommands" ] + then + # Cache the list of subcommands to speed things up. + _guix_subcommands="$(guix --help 2> /dev/null \ + | grep '^ ' | cut -c 2-)" + fi + COMPREPLY=($(compgen -W "$_guix_subcommands" -- "$word_at_point")) +} + _guix_complete () { local word_count=${#COMP_WORDS[*]} @@ -147,13 +176,7 @@ _guix_complete () case $COMP_CWORD in 1) - if [ -z "$_guix_subcommands" ] - then - # Cache the list of subcommands to speed things up. - _guix_subcommands="$(guix --help 2> /dev/null \ - | grep '^ ' | cut -c 2-)" - fi - COMPREPLY=($(compgen -W "$_guix_subcommands" -- "$word_at_point")) + _guix_complete_subcommand ;; *) if _guix_is_command "package" @@ -169,13 +192,28 @@ _guix_complete () fi elif _guix_is_command "install" then - _guix_complete_available_package "$word_at_point" + if _guix_is_dash_L || _guix_is_dash_m || _guix_is_dash_p + then + _guix_complete_file + else + _guix_complete_available_package "$word_at_point" + fi elif _guix_is_command "remove" then - _guix_complete_installed_package "$word_at_point" + if _guix_is_dash_L || _guix_is_dash_m || _guix_is_dash_p + then + _guix_complete_file + else + _guix_complete_installed_package "$word_at_point" + fi elif _guix_is_command "upgrade" then - _guix_complete_installed_package "$word_at_point" + if _guix_is_dash_L || _guix_is_dash_m || _guix_is_dash_p + then + _guix_complete_file + else + _guix_complete_installed_package "$word_at_point" + fi elif _guix_is_command "build" then if _guix_is_dash_L || _guix_is_dash_m @@ -193,6 +231,20 @@ _guix_complete () 2) _guix_complete_subcommand;; *) _guix_complete_file;; # TODO: restrict to *.scm esac + elif _guix_is_command "pull" + then + if _guix_is_dash_C || _guix_is_dash_p + then + _guix_complete_file + fi + elif _guix_is_command "time-machine" + then + if _guix_is_dash_C + then + _guix_complete_file + else + _guix_complete_subcommand + fi elif _guix_is_command "container" then case $COMP_CWORD in diff --git a/etc/git/pre-push b/etc/git/pre-push index 59294f0ffb..415345fc75 100755 --- a/etc/git/pre-push +++ b/etc/git/pre-push @@ -1,6 +1,8 @@ #!/bin/sh -# A hook script that prevents the user from pushing unsigned commits. +# This hook script prevents the user from pushing to Savannah if any of the new +# commits' OpenPGP signatures cannot be verified, or if a commit is signed +# with an unauthorized key. # Called by "git push" after it has checked the remote status, but before # anything has been pushed. If this script exits with a non-zero status nothing diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index 40918ea307..2d9a39afc3 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -58,8 +58,8 @@ ;;; ;;; Code: -(define* (normalize-file file mount-point btrfs-subvolume-file-name) - "Strip MOUNT-POINT and prepend BTRFS-SUBVOLUME-FILE-NAME to FILE, a +(define* (normalize-file file mount-point store-directory-prefix) + "Strip MOUNT-POINT and prepend STORE-DIRECTORY-PREFIX, if any, to FILE, a G-expression or other lowerable object denoting a file name." (define (strip-mount-point mount-point file) @@ -72,13 +72,13 @@ G-expression or other lowerable object denoting a file name." file))) file)) - (define (prepend-btrfs-subvolume-file-name btrfs-subvolume-file-name file) - (if btrfs-subvolume-file-name - #~(string-append #$btrfs-subvolume-file-name #$file) + (define (prepend-store-directory-prefix store-directory-prefix file) + (if store-directory-prefix + #~(string-append #$store-directory-prefix #$file) file)) - (prepend-btrfs-subvolume-file-name btrfs-subvolume-file-name - (strip-mount-point mount-point file))) + (prepend-store-directory-prefix store-directory-prefix + (strip-mount-point mount-point file))) @@ -135,14 +135,14 @@ file with the resolution provided in CONFIG." (_ #f))))) (define* (eye-candy config store-device store-mount-point - #:key btrfs-store-subvolume-file-name system port) + #:key store-directory-prefix system port) "Return a gexp that writes to PORT (a port-valued gexp) the 'grub.cfg' part concerned with graphics mode, background images, colors, and all that. STORE-DEVICE designates the device holding the store, and STORE-MOUNT-POINT is its mount point; these are used to determine where the background image and fonts must be searched for. SYSTEM must be the target system string---e.g., -\"x86_64-linux\". BTRFS-STORE-SUBVOLUME-FILE-NAME is the file name of the -Btrfs subvolume, to be prepended to any store path, if any." +\"x86_64-linux\". STORE-DIRECTORY-PREFIX is a directory prefix to prepend to +any store file name." (define setup-gfxterm-body (let ((gfxmode (or (and-let* ((theme (bootloader-configuration-theme config)) @@ -181,12 +181,12 @@ fi~%" #+font-file) (define font-file (normalize-file (file-append grub "/share/grub/unicode.pf2") store-mount-point - btrfs-store-subvolume-file-name)) + store-directory-prefix)) (define image (normalize-file (grub-background-image config) store-mount-point - btrfs-store-subvolume-file-name)) + store-directory-prefix)) (and image #~(format #$port " @@ -320,13 +320,13 @@ code." #:key (system (%current-system)) (old-entries '()) - btrfs-subvolume-file-name) + store-directory-prefix) "Return the GRUB configuration file corresponding to CONFIG, a <bootloader-configuration> object, and where the store is available at -STORE-FS, a <file-system> object. OLD-ENTRIES is taken to be a list -of menu entries corresponding to old generations of the system. -BTRFS-SUBVOLUME-FILE-NAME may be used to specify on which subvolume a -Btrfs root file system resides." +STORE-FS, a <file-system> object. OLD-ENTRIES is taken to be a list of menu +entries corresponding to old generations of the system. +STORE-DIRECTORY-PREFIX may be used to specify a store prefix, as is required +when booting a root file system on a Btrfs subvolume." (define all-entries (append entries (bootloader-configuration-menu-entries config))) (define (menu-entry->gexp entry) @@ -336,17 +336,14 @@ Btrfs root file system resides." (arguments (menu-entry-linux-arguments entry)) (kernel (normalize-file (menu-entry-linux entry) device-mount-point - btrfs-subvolume-file-name)) + store-directory-prefix)) (initrd (normalize-file (menu-entry-initrd entry) device-mount-point - btrfs-subvolume-file-name))) + store-directory-prefix))) ;; Here DEVICE is the store and DEVICE-MOUNT-POINT is its mount point. ;; Use the right file names for KERNEL and INITRD in case ;; DEVICE-MOUNT-POINT is not "/", meaning that the store is on a ;; separate partition. - - ;; When BTRFS-SUBVOLUME-FILE-NAME is defined, prepend it the kernel and - ;; initrd paths, to allow booting from a Btrfs subvolume. #~(format port "menuentry ~s { ~a linux ~a ~a @@ -360,7 +357,7 @@ Btrfs root file system resides." (eye-candy config (menu-entry-device (first all-entries)) (menu-entry-device-mount-point (first all-entries)) - #:btrfs-store-subvolume-file-name btrfs-subvolume-file-name + #:store-directory-prefix store-directory-prefix #:system system #:port #~port)) @@ -371,8 +368,8 @@ Btrfs root file system resides." (keymap* (and layout (keyboard-layout-file layout #:grub grub))) (keymap (and keymap* - (if btrfs-subvolume-file-name - #~(string-append #$btrfs-subvolume-file-name + (if store-directory-prefix + #~(string-append #$store-directory-prefix #$keymap*) keymap*)))) #~(when #$keymap diff --git a/gnu/installer/final.scm b/gnu/installer/final.scm index 4c2da484c9..ece1aff95c 100644 --- a/gnu/installer/final.scm +++ b/gnu/installer/final.scm @@ -128,7 +128,7 @@ USERS." (match (string-tokenize (read-string port) %not-nul) ((argv0 _ ...) (unless (member (pk (basename argv0)) spare) - (syslog "Killing process ~a~%" pid) + (syslog "Killing process ~a (~a)~%" pid argv0) (kill pid SIGKILL))) (_ #f)))))) pids))) @@ -146,6 +146,8 @@ be much appreciated." (catch #t (lambda () (let ((tmp-dir "/remove")) + (syslog "Unmounting cow-store.~%") + (mkdir-p tmp-dir) (mount (%store-directory) tmp-dir "" MS_MOVE) diff --git a/gnu/local.mk b/gnu/local.mk index 55878628ee..120d68c0ac 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -854,6 +854,7 @@ dist_patch_DATA = \ %D%/packages/patches/datefudge-gettimeofday.patch \ %D%/packages/patches/dbacl-include-locale.h.patch \ %D%/packages/patches/dbus-helper-search-path.patch \ + %D%/packages/patches/dbus-CVE-2020-12049.patch \ %D%/packages/patches/dbus-c++-gcc-compat.patch \ %D%/packages/patches/dbus-c++-threading-mutex.patch \ %D%/packages/patches/dconf-meson-0.52.patch \ @@ -893,7 +894,6 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-telega-test-env.patch \ %D%/packages/patches/emacs-undohist-ignored.patch \ %D%/packages/patches/emacs-wordnut-require-adaptive-wrap.patch \ - %D%/packages/patches/emacs-zones-called-interactively.patch \ %D%/packages/patches/enjarify-setup-py.patch \ %D%/packages/patches/enlightenment-fix-setuid-path.patch \ %D%/packages/patches/erlang-man-path.patch \ @@ -1067,8 +1067,6 @@ dist_patch_DATA = \ %D%/packages/patches/gtksourceview-2-add-default-directory.patch \ %D%/packages/patches/gzdoom-search-in-installed-share.patch \ %D%/packages/patches/gzdoom-find-system-libgme.patch \ - %D%/packages/patches/haskell-mode-unused-variables.patch \ - %D%/packages/patches/haskell-mode-make-check.patch \ %D%/packages/patches/hdf4-architectures.patch \ %D%/packages/patches/hdf4-reproducibility.patch \ %D%/packages/patches/hdf4-shared-fortran.patch \ @@ -1109,6 +1107,7 @@ dist_patch_DATA = \ %D%/packages/patches/java-apache-ivy-port-to-latest-bouncycastle.patch \ %D%/packages/patches/java-commons-collections-fix-java8.patch \ %D%/packages/patches/java-jeromq-fix-tests.patch \ + %D%/packages/patches/java-openjfx-build-jdk_version.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 \ @@ -1158,6 +1157,9 @@ dist_patch_DATA = \ %D%/packages/patches/ldc-disable-phobos-tests.patch \ %D%/packages/patches/leela-zero-gtest.patch \ %D%/packages/patches/less-hurd-path-max.patch \ + %D%/packages/patches/lib2geom-enable-assertions.patch \ + %D%/packages/patches/lib2geom-link-tests-against-glib.patch \ + %D%/packages/patches/lib2geom-use-system-googletest.patch \ %D%/packages/patches/liba52-enable-pic.patch \ %D%/packages/patches/liba52-link-with-libm.patch \ %D%/packages/patches/liba52-set-soname.patch \ @@ -1293,6 +1295,7 @@ dist_patch_DATA = \ %D%/packages/patches/ngircd-handle-zombies.patch \ %D%/packages/patches/network-manager-plugin-path.patch \ %D%/packages/patches/nsis-env-passthru.patch \ + %D%/packages/patches/nss-CVE-2020-12399.patch \ %D%/packages/patches/nss-increase-test-timeout.patch \ %D%/packages/patches/nss-pkgconfig.patch \ %D%/packages/patches/ntfs-3g-CVE-2019-9755.patch \ @@ -1321,6 +1324,7 @@ dist_patch_DATA = \ %D%/packages/patches/openocd-nrf52.patch \ %D%/packages/patches/openssh-hurd.patch \ %D%/packages/patches/openresolv-restartcmd-guix.patch \ + %D%/packages/patches/openscad-parser-boost-1.72.patch \ %D%/packages/patches/openssl-runpath.patch \ %D%/packages/patches/openssl-1.1-c-rehash-in.patch \ %D%/packages/patches/openssl-c-rehash-in.patch \ @@ -1373,7 +1377,6 @@ dist_patch_DATA = \ %D%/packages/patches/plink-endian-detection.patch \ %D%/packages/patches/plib-CVE-2011-4620.patch \ %D%/packages/patches/plib-CVE-2012-4552.patch \ - %D%/packages/patches/plotutils-libpng-jmpbuf.patch \ %D%/packages/patches/podofo-cmake-3.12.patch \ %D%/packages/patches/portaudio-audacity-compat.patch \ %D%/packages/patches/portmidi-modular-build.patch \ @@ -1438,6 +1441,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-unittest2-python3-compat.patch \ %D%/packages/patches/python-unittest2-remove-argparse.patch \ %D%/packages/patches/python-waitress-fix-tests.patch \ + %D%/packages/patches/pypy3-7.3.1-fix-tests.patch \ %D%/packages/patches/qemu-glibc-2.27.patch \ %D%/packages/patches/qrcodegen-cpp-make-install.patch \ %D%/packages/patches/qt4-ldflags.patch \ @@ -1580,7 +1584,7 @@ dist_patch_DATA = \ %D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch \ %D%/packages/patches/weasyprint-library-paths.patch \ %D%/packages/patches/webkitgtk-share-store.patch \ - %D%/packages/patches/websocketpp-fix-for-boost-1.70.patch \ + %D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch \ %D%/packages/patches/wicd-bitrate-none-fix.patch \ %D%/packages/patches/wicd-get-selected-profile-fix.patch \ %D%/packages/patches/wicd-urwid-1.3.patch \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 36f063ca96..77981e520a 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -34,6 +34,7 @@ ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> +;;; Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -246,14 +247,14 @@ and provides a \"top-like\" mode (monitoring).") (define-public shepherd (package (name "shepherd") - (version "0.8.0") + (version "0.8.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/shepherd/shepherd-" version ".tar.gz")) (sha256 (base32 - "02lbc8z5gd8v8wfi4yh1zww8mk03w0zcwnmk4l4p3vpjlvlb63ll")))) + "0x9zr0x3xvk4qkb6jnda451d5iyrl06cz1bjzjsm0lxvjj3fabyk")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--localstatedir=/var"))) @@ -434,7 +435,7 @@ graphs and can export its output to different formats.") (define-public facter (package (name "facter") - (version "4.0.24") + (version "4.0.25") (source (origin (method git-fetch) (uri (git-reference @@ -443,7 +444,7 @@ graphs and can export its output to different formats.") (file-name (git-file-name name version)) (sha256 (base32 - "1n8yd2p7m0jf0wld6q43f2gqxyz8fiamz3p79wbl53q5qih0vba2")))) + "04nbk9rn5lfhbivsx68dggsp05czm7mzfr1i7yv6168bl92d233y")))) (build-system ruby-build-system) (arguments `(#:phases (modify-phases %standard-phases @@ -1456,6 +1457,54 @@ commands and their arguments.") ;; See <http://www.sudo.ws/sudo/license.html>. (license license:x11))) +(define-public opendoas + (package + (name "opendoas") + (version "6.6.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Duncaen/OpenDoas.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "07kkc5729p654jrgfsc8zyhiwicgmq38yacmwfvay2b3gmy728zn")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'configure + ;; The configure script doesn't accept most of the default flags. + (lambda* (#:key configure-flags #:allow-other-keys) + ;; The configure script can only be told which compiler to use + ;; through environment variables. + (setenv "CC" ,(cc-for-target)) + (apply invoke "./configure" configure-flags))) + (add-before 'install 'fix-makefile + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "bsd.prog.mk" + (("^\tchown.*$") "")) + #t))) + #:configure-flags + (list (string-append "--prefix=" (assoc-ref %outputs "out")) + ;; Nothing is done with this value (yet?) but it's supported. + ;; (string-append "--target=" (or ,(%current-target-system) "")) + "--with-timestamp") + ;; Compiler choice is not carried over from the configure script. + #:make-flags + (list (string-append "CC=" ,(cc-for-target))) + #:tests? #f)) ; no test suite + (native-inputs + `(("bison" ,bison))) + (home-page "https://github.com/Duncaen/OpenDoas") + (synopsis "Portable version of OpenBSD's doas command") + (description "Doas is a minimal replacement for the venerable sudo. It was +initially written by Ted Unangst of the OpenBSD project to provide 95% of the +features of sudo with a fraction of the codebase.") + (license (list license:bsd-3 ; libbsd/* + license:isc)))) ; everything else + (define-public wpa-supplicant-minimal (package (name "wpa-supplicant-minimal") @@ -1756,7 +1805,7 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).") (define-public acpica (package (name "acpica") - (version "20200430") + (version "20200528") (source (origin (method url-fetch) (uri (string-append @@ -1764,7 +1813,7 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).") version ".tar.gz")) (sha256 (base32 - "1hiaz9lrmjzdbi5zl0ajfflja41cixzx2j76iyx02qbjlmy9cfjc")))) + "01ajxnz9dpnvdbib7yv20dw21a1yyfgwiw3whg0xi57cf4app2md")))) (build-system gnu-build-system) (native-inputs `(("flex" ,flex) ("bison" ,bison))) @@ -3401,7 +3450,7 @@ Python loading in HPC environments.") (let ((real-name "inxi")) (package (name "inxi-minimal") - (version "3.1.00-1") + (version "3.1.01-1") (source (origin (method git-fetch) @@ -3410,7 +3459,7 @@ Python loading in HPC environments.") (commit version))) (file-name (git-file-name real-name version)) (sha256 - (base32 "0md6yfd297l8695g0rsbs4mm74dc3k00rfjl4x2n4i33mkylp6qa")))) + (base32 "0r204w0r06ibdr4dck7yw2nmvj7xq68bjr7xwwiy7liqdml0n0yc")))) (build-system trivial-build-system) (inputs `(("bash" ,bash-minimal) diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 4df2e96ecd..1008d24cd3 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -609,7 +609,7 @@ matrices, and polynomials over the integers and over finite fields.") (define-public singular (package (name "singular") - (version "4.1.2p1") + (version "4.1.3p1") (source (origin (method url-fetch) @@ -623,7 +623,7 @@ matrices, and polynomials over the integers and over finite fields.") #\.) "-") "/singular-" version ".tar.gz")) (sha256 (base32 - "0kvd55353fiqyq1msmi0kka66n5h0aqs7m3km60r01b1w2f8085m")))) + "1f02mrjwh7pd3pydfvjxsw5rph2qmkg1idwqrdsax924sa77sljw")))) (build-system gnu-build-system) (native-inputs `(("doxygen" ,doxygen) diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm index c775603445..c9582bc596 100644 --- a/gnu/packages/assembly.scm +++ b/gnu/packages/assembly.scm @@ -149,14 +149,14 @@ to the clients.") (define-public fasm (package (name "fasm") - (version "1.73.22") + (version "1.73.24") (source (origin (method url-fetch) (uri (string-append "https://flatassembler.net/fasm-" version ".tgz")) (sha256 - (base32 "1pb0rcfdsb0h89khjjrbikz5wjdllavj3ajim0rcyh7x12xr1hw5")))) + (base32 "142vxhs8mh8isvlzq7ir0asmqda410phzxmk9gk9b43dldskkj7k")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests exist @@ -347,14 +347,14 @@ Supported architectures are: (define-public xa (package (name "xa") - (version "2.3.10") + (version "2.3.11") (source (origin (method url-fetch) (uri (string-append "https://www.floodgap.com/retrotech/xa" "/dists/xa-" version ".tar.gz")) (sha256 (base32 - "0y5sd247g11jfk5msxy91hz2nhpy7smj125dzfyfhjsjnqk5nyw6")))) + "0b81r7mvzqxgnbbmhixcnrf9nc72v1nqaw19k67221g3k561dwij")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; TODO: custom test harness, not sure how it works diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 358eddb22e..c8d15a3bb7 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -851,30 +851,30 @@ emulation (valve, tape), bit fiddling (decimator, pointer-cast), etc.") (define-public csound (package (name "csound") - (version "6.13.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/csound/csound.git") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "14822ybqyp31z18gky2y9zadr9dkbhabg97y139py73w7v3af1bh")))) + (version "6.14.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/csound/csound.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1sr9knfhbm2m0wpkjq2l5n471vnl51wy4p6j4m95zqybimzb4s2j")))) (build-system cmake-build-system) - (inputs - `(("alsa-lib" ,alsa-lib) - ("boost" ,boost) - ("pulseaudio" ,pulseaudio) - ("libsndfile" ,libsndfile) - ("liblo" ,liblo) - ("ladspa" ,ladspa) - ("jack" ,jack-1) - ("gettext" ,gettext-minimal))) (native-inputs `(("bison" ,bison) ("flex" ,flex) + ("gettext" ,gettext-minimal) ("zlib" ,zlib))) + (inputs + `(("alsa-lib" ,alsa-lib) + ("boost" ,boost) + ("jack" ,jack-1) + ("ladspa" ,ladspa) + ("liblo" ,liblo) + ("libsndfile" ,libsndfile) + ("pulseaudio" ,pulseaudio))) (home-page "https://csound.com/") (synopsis "Sound and music computing system") (description @@ -1961,14 +1961,14 @@ included are the command line utilities @code{send_osc} and @code{dump_osc}.") (define-public lilv (package (name "lilv") - (version "0.24.6") + (version "0.24.8") (source (origin (method url-fetch) (uri (string-append "https://download.drobilla.net/lilv-" version ".tar.bz2")) (sha256 (base32 - "1p3hafsxgs5d4za7n66lf5nz74qssfqpmk520cm7iq2njvvlqm2z")))) + "0063i5zgf3d3accwmyx651hw0wh5ik7kji2hvfkcdbl1qia3dp6a")))) (build-system waf-build-system) (arguments `(#:tests? #f ; no check target @@ -3373,17 +3373,18 @@ with support for HD extensions.") (define-public bs1770gain (package (name "bs1770gain") - (version "0.6.9") + (version "0.7.0") + (home-page "https://manpages.debian.org/sid/bs1770gain/bs1770gain.1.en.html") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/bs1770gain/bs1770gain/" version "/bs1770gain-" version ".tar.gz")) (sha256 - (base32 "1hcbff3q6xl9rj1pzy3fwy91y6fa99wwrhb31461j9kgc173ls7r")) + (base32 "0a2dcaxvxy5m3a5sb1lhplsymvz3ypaiidc5xn9qy01h53zvyvkp")) (modules '((guix build utils))) (snippet - '(begin + `(begin ;; XXX (substitute* (find-files "." "\\.[ch]$") (("^ \\* N..o.*") "")) @@ -3395,12 +3396,11 @@ with support for HD extensions.") "configure.ac" "configure") (("https?://bs1770gain[^/]*/") - "https://manpages.debian.org/sid/bs1770gain/bs1770gain.1.en.html")) + ,home-page)) #t)))) (build-system gnu-build-system) (inputs `(("ffmpeg" ,ffmpeg) ("sox" ,sox))) - (home-page "https://manpages.debian.org/sid/bs1770gain/bs1770gain.1.en.html") (synopsis "Tool to adjust loudness of media files") (description "BS1770GAIN is a loudness scanner compliant with ITU-R BS.1770 and its diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm index 4e6c416518..0ac1833487 100644 --- a/gnu/packages/benchmark.scm +++ b/gnu/packages/benchmark.scm @@ -46,14 +46,14 @@ (define-public fio (package (name "fio") - (version "3.19") + (version "3.20") (source (origin (method url-fetch) (uri (string-append "https://brick.kernel.dk/snaps/" "fio-" version ".tar.bz2")) (sha256 (base32 - "01nc7igmcc6hda32d1y8vidd9x9pdlxvf3i1pwrzvmi6xvmbfvab")))) + "1mwqafn81a9pxy2kw9rl4p3r2brhg2ckwrcwzy0q4gffxgn3k9c7")))) (build-system gnu-build-system) (arguments '(#:test-target "test" diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index cfa0263e46..550c0387e9 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -475,20 +475,6 @@ BED, GFF/GTF, VCF.") (find-files "bin" ".*"))) #t))))))) -;; Needed for pybedtools. -(define-public bedtools-2.26 - (package (inherit bedtools) - (name "bedtools") - (version "2.26.0") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/arq5x/bedtools2/releases/" - "download/v" version "/" - "bedtools-" version ".tar.gz")) - (sha256 - (base32 - "0jhavwifnf7lmkb11h9y7dynr8d699h0rd2l52j1pfgircr2zwv5")))))) - (define-public pbbam (package (name "pbbam") @@ -806,12 +792,13 @@ intended to behave exactly the same as the original BWK awk.") ;; See https://github.com/daler/pybedtools/issues/192 #:phases (modify-phases %standard-phases - ;; See https://github.com/daler/pybedtools/issues/261 (add-after 'unpack 'disable-broken-tests (lambda _ - ;; This test (pybedtools.test.test_scripts.test_venn_mpl) needs a - ;; graphical environment. (substitute* "pybedtools/test/test_scripts.py" + ;; This test freezes. + (("def test_intron_exon_reads") + "def _do_not_test_intron_exon_reads") + ;; This test fails in the Python 2 build. (("def test_venn_mpl") "def _do_not_test_venn_mpl")) (substitute* "pybedtools/test/test_helpers.py" @@ -868,7 +855,7 @@ intended to behave exactly the same as the original BWK awk.") (mkdir-p "/tmp/test") (copy-recursively "pybedtools/test" "/tmp/test") (with-directory-excursion "/tmp/test" - (invoke "pytest"))))))) + (invoke "pytest" "-v" "--doctest-modules"))))))) (propagated-inputs `(("bedtools" ,bedtools) ("samtools" ,samtools) @@ -985,6 +972,64 @@ e.g. microbiome samples, genomes, metagenomes.") (("install_requires.append\\(\"pyqi\"\\)") "pass")) #t))))))))) +(define-public python-pairtools + (package + (name "python-pairtools") + (version "0.3.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mirnylab/pairtools") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0gr8y13q7sd6yai6df4aavl2470n1f9s3cib6r473z4hr8hcbwmc")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-references + (lambda _ + (substitute* '("pairtools/pairtools_merge.py" + "pairtools/pairtools_sort.py") + (("/bin/bash") (which "bash"))) + #t)) + (replace 'check + (lambda* (#:key inputs outputs #:allow-other-keys) + (add-installed-pythonpath inputs outputs) + (with-directory-excursion "/tmp" + (invoke "pytest" "-v"))))))) + (native-inputs + `(("python-cython" ,python-cython) + ("python-nose" ,python-nose) + ("python-pytest" ,python-pytest))) + (inputs + `(("python" ,python-wrapper))) + (propagated-inputs + `(("htslib" ,htslib) ; for bgzip, looked up in PATH + ("samtools" ,samtools) ; looked up in PATH + ("lz4" ,lz4) ; for lz4c + ("python-click" ,python-click) + ("python-numpy" ,python-numpy))) + (home-page "https://github.com/mirnylab/pairtools") + (synopsis "Process mapped Hi-C data") + (description "Pairtools is a simple and fast command-line framework to +process sequencing data from a Hi-C experiment. Process pair-end sequence +alignments and perform the following operations: + +@itemize +@item detect ligation junctions (a.k.a. Hi-C pairs) in aligned paired-end + sequences of Hi-C DNA molecules +@item sort @code{.pairs} files for downstream analyses +@item detect, tag and remove PCR/optical duplicates +@item generate extensive statistics of Hi-C datasets +@item select Hi-C pairs given flexibly defined criteria +@item restore @code{.sam} alignments from Hi-C pairs. +@end itemize +") + (license license:expat))) + (define-public bioperl-minimal (let* ((inputs `(("perl-module-build" ,perl-module-build) ("perl-data-stag" ,perl-data-stag) @@ -8702,9 +8747,9 @@ library implementing most of the pipeline's features.") (inputs `(("r-minimal" ,r-minimal) ("r-rcas" ,r-rcas) - ("guile-next" ,guile-2.2) + ("guile" ,guile-2.2) ("guile-json" ,guile-json-1) - ("guile-redis" ,guile-redis))) + ("guile-redis" ,guile2.2-redis))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://github.com/BIMSBbioinfo/rcas-web") @@ -13743,18 +13788,31 @@ bound.") (define-public python-pypairix (package (name "python-pypairix") - (version "0.3.6") + (version "0.3.7") + ;; The tarball on pypi does not include the makefile to build the + ;; programs. (source (origin - (method url-fetch) - (uri (pypi-uri "pypairix" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/4dn-dcic/pairix.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "0zs92b74s5v4xy2h16s15f3z6l4nnbw8x8zyif7xx5xpafjn0xss")))) + "1snr3lrmsld8sy77ng6ba6wcmd33xjccf1l2f3m6pi29xis9nd6p")))) (build-system python-build-system) - ;; FIXME: the tests fail because test.support cannot be loaded: - ;; ImportError: cannot import name 'support' - (arguments '(#:tests? #f)) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'build 'build-programs + (lambda _ (invoke "make"))) + (add-after 'install 'install-programs + (lambda* (#:key outputs #:allow-other-keys) + (copy-recursively "bin" (string-append + (assoc-ref outputs "out") + "/bin")) + #t))))) (inputs `(("zlib" ,zlib))) (home-page "https://github.com/4dn-dcic/pairix") diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index d28c58d663..9e7c40cd99 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -322,7 +322,7 @@ Boost.Thread.") (file-name (git-file-name name version)) (sha256 (base32 - "1nayaqshhzr1n6jj43bpvvay36d5gn075h0b95psii5x8ingszdk")))) + "13i5j43nggb46i6qpaf7gk53i7zp7pimphl7sydyfqz2m9yx5cdy")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 5273412adf..ea80cf020e 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2016, 2017 Danny Milosavljevic <dannym@scratchpost.org> ;;; Copyright © 2016, 2017 David Craven <david@craven.ch> ;;; Copyright © 2017, 2018 Efraim Flashner <efraim@flashner.co.il> -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019 nee <nee@cock.li> ;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de> @@ -1017,7 +1017,8 @@ tools, and more.") (guix build utils) (ice-9 regex) ; for string-match (srfi srfi-26)) ; for cut - #:make-flags (list "CC=gcc") + #:make-flags + (list ,(string-append "CC=" (cc-for-target))) #:tests? #f ; no tests #:phases (modify-phases %standard-phases diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index a3ecb6e692..c39e60ec8b 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2017, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2019 Carl Dong <contact@carldong.me> +;;; Copyright © 2019 Léo Le Bouter <lle-bout@zaclys.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -285,6 +286,7 @@ or false to signal an error." ((string=? system "i686-gnu") "/lib/ld.so.1") ((string=? system "aarch64-linux") "/lib/ld-linux-aarch64.so.1") ((string=? system "powerpc-linux") "/lib/ld.so.1") + ((string=? system "powerpc64-linux") "/lib/ld64.so.1") ((string=? system "powerpc64le-linux") "/lib/ld64.so.2") ((string=? system "alpha-linux") "/lib/ld-linux.so.2") ((string=? system "s390x-linux") "/lib/ld64.so.1") diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index 5c0209f42d..3e227decc9 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -236,15 +236,14 @@ whose behaviour is inconsistent across *NIX flavours.") (define-public libhx (package (name "libhx") - (version "3.24") + (version "3.25") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/libhx/libHX/" "libHX-" version ".tar.xz")) (sha256 - (base32 - "0i8v2464p830c15myknvvs6bhxaf663lrqgga95l94ygfynkw6x5")))) + (base32 "12avn16f8aqb0cq6jplz0sv7rh6f07m85dwc8dasnnwsvijwbpbj")))) (build-system gnu-build-system) (home-page "http://libhx.sourceforge.net") (synopsis "C library with common data structures and functions") diff --git a/gnu/packages/ccache.scm b/gnu/packages/ccache.scm index 529742403e..fc915965b4 100644 --- a/gnu/packages/ccache.scm +++ b/gnu/packages/ccache.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015, 2016, 2018 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,14 +30,14 @@ (define-public ccache (package (name "ccache") - (version "3.7.7") + (version "3.7.9") (source (origin (method url-fetch) (uri (string-append "https://github.com/ccache/ccache/releases/download/v" version "/ccache-" version ".tar.xz")) (sha256 - (base32 "1kcqii3hr1008gj6jgfsjibwh2ryhsplc9z99m18xwa2zvbddhdp")))) + (base32 "0jzl9idnjd9jq64qd8kny7gfd0ydvz5kyq2yslmigfdz8dsxm4zq")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl) ; for test/run ("which" ,(@ (gnu packages base) which)))) diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index bd44ae8e80..67236f86de 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -686,7 +686,7 @@ information is written to standard error.") (define-public asunder (package (name "asunder") - (version "2.9.5") + (version "2.9.6") (source (origin (method url-fetch) (uri @@ -695,7 +695,7 @@ information is written to standard error.") ".tar.bz2")) (sha256 (base32 - "069x6az2r3wlb2hd07iz0hxpxwknw7s9h7pyhnkmzv1pw9ci3kk4")))) + "1ycnd82lh7qy1pcbngd4b41s16j9hnm2kyfrncg4cwr3bfk7yg7a")))) (build-system glib-or-gtk-build-system) (arguments '(#:out-of-source? #f diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 7d7fd189bc..3edb79d55b 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -396,7 +396,7 @@ and it supports a very flexible form of test discovery.") (define-public doctest (package (name "doctest") - (version "2.3.7") + (version "2.3.8") (home-page "https://github.com/onqtam/doctest") (source (origin (method git-fetch) @@ -404,7 +404,7 @@ and it supports a very flexible form of test discovery.") (file-name (git-file-name name version)) (sha256 (base32 - "134lx7pjnglrl4wdmyr9dz3rjb6d4ir6rvapg00gp52n44dbhnrq")))) + "16w907750jnp98vdzkn72lzwy1zyryaqvfi80lbdp398pj23rq65")))) (build-system cmake-build-system) (synopsis "C++ test framework") (description @@ -584,14 +584,13 @@ but it works for any C/C++ project.") (define-public python-parameterized (package (name "python-parameterized") - (version "0.7.3") + (version "0.7.4") (source (origin (method url-fetch) (uri (pypi-uri "parameterized" version)) (sha256 - (base32 - "0g1q6n7fkanjv7i1djzw62f46xf573jvza7afabh3baqjqxy7rpd")))) + (base32 "1444fdz5bj0k10nmhxv0bv2gfrfisi7hfzqdndb0pvhf4g3qq3qr")))) (build-system python-build-system) (arguments '(#:phases (modify-phases %standard-phases @@ -1887,12 +1886,10 @@ unit tests and failing them if the unit test module does not exercise all statements in the module it tests.") (license license:gpl3+))) -;; Further releases, up to 2.4.3, have failing unit tests. See: -;; https://github.com/PyCQA/pylint/issues/3198. (define-public python-pylint (package (name "python-pylint") - (version "2.3.1") + (version "2.5.2") (source (origin (method git-fetch) @@ -1902,8 +1899,11 @@ statements in the module it tests.") (file-name (git-file-name name version)) (sha256 (base32 - "17vvzbcqmkhr4icq5p3737nbiiyj1y3g1pa08n9mb1bsnvxmqq0z")))) + "150x679mrlgm1s4ym7irf9mnsjilqyaakss4spc4pbrzkl11agnh")))) (build-system python-build-system) + ;; FIXME: Tests are failing since version 2.4.3, see: + ;; https://github.com/PyCQA/pylint/issues/3198. + (arguments '(#:tests? #f)) (native-inputs `(("python-pytest" ,python-pytest) ("python-pytest-runner" ,python-pytest-runner) @@ -1912,7 +1912,8 @@ statements in the module it tests.") `(("python-astroid" ,python-astroid) ("python-isort" ,python-isort) ("python-mccabe" ,python-mccabe) - ("python-six" ,python-six))) + ("python-six" ,python-six) + ("python-toml" ,python-toml))) (home-page "https://github.com/PyCQA/pylint") (synopsis "Python source code analyzer which looks for coding standard errors") @@ -1945,7 +1946,7 @@ possible to write plugins to add your own checks.") (base32 "02a89d8a47s7nfiv1ady3j0sg2sbyja3np145brarfp5x9qxz9x2")))) (arguments - `(,@(package-arguments pylint) + `(,@(strip-keyword-arguments '(#:tests?) (package-arguments pylint)) #:phases (modify-phases %standard-phases (replace 'check diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index ec05523e0d..b74e73ceea 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -123,7 +123,7 @@ `(("guile" ,guile-3.0) ("guile-fibers" ,guile-fibers) ("guile-gcrypt" ,guile-gcrypt) - ("guile-json" ,guile-json-3) + ("guile-json" ,guile-json-4) ("guile-sqlite3" ,guile-sqlite3) ("guile-git" ,guile-git) ;; FIXME: this is propagated by "guile-git", but it needs to be among diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 2285b519a0..6334c97ef2 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013, 2015, 2018 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2015, 2018 Ricardo Wurmus <rekado@elephly.net> -;;; Copyright © 2016, 2017, 2019 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016, 2017, 2019, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2017 Andy Wingo <wingo@igalia.com> @@ -140,18 +140,26 @@ highlighting your own code that seemed comprehensible when you wrote it.") (list (string-append "--with-ncurses=" (assoc-ref %build-inputs "ncurses")) (string-append "--with-sqlite3=" - (assoc-ref %build-inputs "sqlite"))) + (assoc-ref %build-inputs "sqlite")) + "--disable-static") #:phases (modify-phases %standard-phases (add-after 'install 'post-install (lambda* (#:key outputs #:allow-other-keys) - ;; Install the Emacs Lisp file in the right place. + ;; Install the plugin files in the right place. (let* ((out (assoc-ref outputs "out")) (data (string-append out "/share/gtags")) + (vim (string-append out "/share/vim/vimfiles/plugin")) (lisp (string-append out "/share/emacs/site-lisp"))) - (install-file (string-append data "/gtags.el") lisp) - (delete-file (string-append data "/gtags.el")) + (mkdir-p lisp) + (mkdir-p vim) + (rename-file (string-append data "/gtags.el") + (string-append lisp "/gtags.el")) + (rename-file (string-append data "/gtags.vim") + (string-append vim "/gtags.vim")) + (rename-file (string-append data "/gtags-cscope.vim") + (string-append vim "/gtags-cscope.vim")) #t)))))) (home-page "https://www.gnu.org/software/global/") (synopsis "Cross-environment source code tag system") @@ -222,7 +230,7 @@ COCOMO model or user-provided parameters.") (define-public cloc (package (name "cloc") - (version "1.84") + (version "1.86") (source (origin (method git-fetch) @@ -231,7 +239,7 @@ COCOMO model or user-provided parameters.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "14xikdwcr6pcnkk2i43zrsj88z8b3mrv0svbnbvxvarw1id83pnn")))) + (base32 "082gj2b3x11bilz8c572dd60vn6n0fhld5zhi7wk7g1wy9wlgm9w")))) (build-system gnu-build-system) (inputs `(("coreutils" ,coreutils) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index cdab7408ed..e7d74d808f 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -875,7 +875,8 @@ extract such file systems.") (symlink "pigz" (string-append bin "/unpigz")) (install-file "pigz.1" man) #t)))) - #:make-flags (list "CC=gcc") + #:make-flags + (list ,(string-append "CC=" (cc-for-target))) #:test-target "tests")) (inputs `(("zlib" ,zlib))) (home-page "https://zlib.net/pigz/") @@ -1685,7 +1686,7 @@ of archives.") (build-system gnu-build-system) (arguments `(#:configure-flags - (list "CC=gcc"))) + (list ,(string-append "CC=" (cc-for-target))))) (home-page "https://www.nongnu.org/lzip/lunzip.html") (synopsis "Small, stand-alone lzip decompressor") (description @@ -1712,7 +1713,7 @@ Lunzip is intended to be fully compatible with the regular lzip package.") (build-system gnu-build-system) (arguments `(#:configure-flags - (list "CC=gcc"))) + (list ,(string-append "CC=" (cc-for-target))))) (home-page "https://www.nongnu.org/lzip/clzip.html") (synopsis "Small, stand-alone lzip compressor and decompressor") (description @@ -2101,7 +2102,7 @@ file compression algorithm.") (define-public xarchiver (package (name "xarchiver") - (version "0.5.4.14") + (version "0.5.4.15") (source (origin (method git-fetch) @@ -2110,7 +2111,7 @@ file compression algorithm.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1iklwgykgymrwcc5p1cdbh91v0ih1m58s3w9ndl5kyd44bwlb7px")))) + (base32 "0a3y54r5zp2c0cqm77r07qrl1vh200wvqmbhm35diy22fvkq5mwc")))) (build-system glib-or-gtk-build-system) (native-inputs `(("gettext" ,gettext-minimal) @@ -2118,7 +2119,7 @@ file compression algorithm.") ("libxslt" ,libxslt) ("pkg-config" ,pkg-config))) (inputs - `(("adwaita-icon-theme" ,adwaita-icon-theme) ; Hard-coded theme + `(("adwaita-icon-theme" ,adwaita-icon-theme) ; hard-coded theme ("gtk+" ,gtk+))) (home-page "https://github.com/ib/xarchiver") (synopsis "Graphical front-end for archive operations") diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index b32f4201c0..a1d82ccbc1 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -458,7 +458,7 @@ point and then, after each tween step, plugging back the result.") (define-public abseil-cpp (package (name "abseil-cpp") - (version "20200225.1") + (version "20200225.2") (source (origin (method git-fetch) (uri (git-reference @@ -467,7 +467,7 @@ point and then, after each tween step, plugging back the result.") (file-name (git-file-name name version)) (sha256 (base32 - "035bffayslawc19q2gmlkr6n6r7k7mvriaq7352rv6gyzaplr98w")))) + "0dwxg54pv6ihphbia0iw65r64whd7v8nm4wwhcz219642cgpv54y")))) (build-system cmake-build-system) (arguments `(#:configure-flags (list "-DBUILD_SHARED_LIBS=ON" diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a7d0b718a1..1f59d4def1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -18967,14 +18967,14 @@ rust.") (define-public rust-rpassword-4 (package (name "rust-rpassword") - (version "4.0.3") + (version "4.0.5") (source (origin (method url-fetch) (uri (crate-uri "rpassword" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0jnl8wzmdazkpzqs0vsw0n0vm0v4b8chqifd6s84nl9w2ybhx7ym")))) + (base32 "17z99xazhhbaczw0ib1vnnq450j0zacdn8b2zcbdir68sdbicdwr")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 9381cb5794..d83211ede2 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -415,14 +415,14 @@ should only be used as part of the Guix cups-pk-helper service.") (define-public hplip (package (name "hplip") - (version "3.20.3") + (version "3.20.5") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/hplip/hplip/" version "/hplip-" version ".tar.gz")) (sha256 (base32 - "0sh6cg7yjc11x1cm4477iaslj9n8ksghs85hqwgfbk7m5b2pw2a1")) + "0nj79r61fzddwwzf8kcc0qkp4y9qx46v15iarz6h6y3v91wbsjq0")) (modules '((guix build utils))) (patches (search-patches "hplip-remove-imageprocessor.patch")) (snippet diff --git a/gnu/packages/cybersecurity.scm b/gnu/packages/cybersecurity.scm index aedac03b8a..8ded081c50 100644 --- a/gnu/packages/cybersecurity.scm +++ b/gnu/packages/cybersecurity.scm @@ -26,14 +26,13 @@ (define-public ropgadget (package (name "ropgadget") - (version "6.2") + (version "6.3") (source (origin (method url-fetch) (uri (pypi-uri "ROPGadget" version)) (sha256 - (base32 - "0idiicgpijar9l9kqmfdh865c2mkfgxg0q7lpz77jc09l6q0afjh")))) + (base32 "0v34w88if3p4vn46aby24msfnxj6znmkf4848n4d24jnykxcsqk9")))) (build-system python-build-system) (propagated-inputs `(("python-capstone" ,python-capstone))) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 3f0ebc47a7..78b98d82af 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -933,7 +933,7 @@ as a drop-in replacement of MySQL.") (define-public mariadb-connector-c (package (name "mariadb-connector-c") - (version "3.1.6") + (version "3.1.8") (source (origin (method url-fetch) (uri (string-append @@ -942,13 +942,12 @@ as a drop-in replacement of MySQL.") version "-src.tar.gz")) (sha256 (base32 - "083724f5daaqyzdcx508caz6fk2hs89jff85zg28ih43vxkvnrnj")))) + "0yrzhsxmjiwkhchagx8dymzhvxl3k5h40wn9wpicqjvgjb9k8523")))) (inputs `(("openssl" ,openssl))) (build-system cmake-build-system) (arguments - ;; No tests. - '(#:tests? #f)) + '(#:tests? #f)) ; no tests (home-page "https://mariadb.com/kb/en/mariadb-connector-c/") (synopsis "Client library to connect to MySQL or MariaDB") (description "The MariaDB Connector/C is used to connect applications @@ -2078,16 +2077,16 @@ database.") (define-public lmdb (package (name "lmdb") - (version "0.9.24") + (version "0.9.25") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/LMDB/lmdb.git") + (url "https://git.openldap.org/openldap/openldap.git") (commit (string-append "LMDB_" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "088q6m8fvr12w43s461h7cvpg5hj8csaqj6n9pci150dz7bk5lxm")))) + (base32 "0i60zlca8r6fib23gdgl4c80gxpx24772ggpvz94yr7zaai4k11w")))) (build-system gnu-build-system) (arguments `(#:test-target "test" @@ -2099,7 +2098,7 @@ database.") (substitute* "Makefile" (("/usr/local") (assoc-ref outputs "out"))) #t))))) - (home-page "https://symas.com/products/lightning-memory-mapped-database") + (home-page "https://symas.com/lmdb/") (synopsis "Lightning Memory-Mapped Database library") (description "The @dfn{Lightning Memory-Mapped Database} (LMDB) is a high-performance @@ -2179,14 +2178,14 @@ on another machine, accessed via TCP/IP.") (define-public python-peewee (package (name "python-peewee") - (version "2.10.2") + (version "3.9.6") (source (origin (method url-fetch) (uri (pypi-uri "peewee" version)) (sha256 (base32 - "10f2mrd5hw6rjklrzaix2lsxlgc8vx3xak54arcy6yd791zhchi3")))) + "1j4sh946k0736m7pd54z0y6i2hjhgg3kdllx1pwq8xkzzcgrx1xw")))) (build-system python-build-system) (arguments `(#:tests? #f)) ; Fails to import test data diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index 4a264427c2..cceebb00c8 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2018, 2019 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2019 Pkill -9 <pkill9@runbox.com> ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> +;;; Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -43,6 +44,7 @@ #:use-module (gnu packages gtk) #:use-module (gnu packages golang) #:use-module (gnu packages image) + #:use-module (gnu packages libusb) #:use-module (gnu packages linux) #:use-module (gnu packages llvm) #:use-module (gnu packages ncurses) @@ -596,3 +598,37 @@ GDB with very efficient reverse-execution, which in combination with standard GDB/x86 features like hardware data watchpoints, makes debugging much more fun.") (license license:expat))) + +(define-public mspdebug + (package + (name "mspdebug") + (version "0.25") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dlbeer/mspdebug.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0prgwb5vx6fd4bj12ss1bbb6axj2kjyriyjxqrzd58s5jyyy8d3c")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no test suite + #:phases + (modify-phases %standard-phases + (delete 'configure)) ; no configure script + #:make-flags + (list (string-append "CC=" ,(cc-for-target)) + "INSTALL=install" + (string-append "PREFIX=" %output)))) + (inputs + `(("libusb-compat" ,libusb-compat) + ("readline" ,readline))) + (synopsis "Debugging tool for MSP430 MCUs") + (description "MspDebug supports FET430UIF, eZ430, RF2500 and Olimex +MSP430-JTAG-TINY programmers, as well as many other compatible +devices. It can be used as a proxy for gdb or as an independent +debugger with support for programming, disassembly and reverse +engineering.") + (home-page "https://github.com/dlbeer/mspdebug") + (license license:gpl2+))) diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index 0c780932eb..f6f402b315 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -70,163 +70,162 @@ #:use-module (ice-9 match)) (define-public diffoscope - (let ((version "145")) - (package - (name "diffoscope") - (version version) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://salsa.debian.org/reproducible-builds/diffoscope.git") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "01n7q3q0hib4bd8gcq0yjghy5zhp0fh0bq1jxrn2ww8zyd4knmc3")))) - (build-system python-build-system) - (arguments - `(#:phases (modify-phases %standard-phases - ;; setup.py mistakenly requires python-magic from PyPi, even - ;; though the Python bindings of `file` are sufficient. - ;; https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815844 - (add-after 'unpack 'dependency-on-python-magic - (lambda _ - (substitute* "setup.py" - (("'python-magic',") "")))) - ;; Patch in support for known tools - (add-after 'unpack 'add-known-tools - (lambda _ - (substitute* "diffoscope/external_tools.py" - (("'debian': 'openssl'") - "'debian': 'openssl', 'guix': 'openssl'")))) - ;; This test is broken because our `file` package has a - ;; bug in berkeley-db file type detection. - (add-after 'unpack 'remove-berkeley-test - (lambda _ - (delete-file "tests/comparators/test_berkeley_db.py") - #t)) - ;; Test is dynamically generated and may have false - ;; negatives with different ocaml versions. Further - ;; background in: https://bugs.debian.org/939386 - (add-after 'unpack 'remove-ocaml-test - (lambda _ - (substitute* "tests/comparators/test_ocaml.py" - (("def test_diff.differences.:") - "def skip_test_diff(differences):")) - #t)) - (add-after 'unpack 'skip-elf-tests - ;; FIXME: libmix_differences test added in 125, and is - ;; failing, need to explore why... - (lambda _ - (substitute* "tests/comparators/test_elf.py" - (("def test_libmix_differences.libmix_differences.:") - "def skip_test_libmix_differences(libmix_differences):")) - #t)) - (add-after 'unpack 'embed-tool-references - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "diffoscope/comparators/utils/compare.py" - (("\\['xxd',") - (string-append "['" (which "xxd") "',"))) - (substitute* "diffoscope/comparators/elf.py" - (("@tool_required\\('readelf'\\)") "") - (("get_tool_name\\('readelf'\\)") - (string-append "'" (which "readelf") "'"))) - (substitute* "diffoscope/comparators/directory.py" - (("@tool_required\\('stat'\\)") "") - (("@tool_required\\('getfacl'\\)") "") - (("\\['stat',") - (string-append "['" (which "stat") "',")) - (("\\['getfacl',") - (string-append "['" (which "getfacl") "',"))) - #t)) - (add-before 'check 'writable-test-data - (lambda _ - ;; tests may need needs write access to tests - ;; directory - (for-each make-file-writable (find-files "tests")) - #t)) - (add-before 'check 'delete-failing-test - (lambda _ - ;; this requires /sbin to be on the path - (delete-file "tests/test_tools.py") - #t))))) - (inputs `(("rpm" ,rpm) ;for rpm-python - ("python-file" ,python-file) - ("python-debian" ,python-debian) - ("python-libarchive-c" ,python-libarchive-c) - ("python-tlsh" ,python-tlsh) - ("acl" ,acl) ;for getfacl - ("colordiff" ,colordiff) - ("xxd" ,xxd))) - ;; Below are modules used for tests. - (native-inputs `(("python-pytest" ,python-pytest) - ("python-chardet" ,python-chardet) - ("python-binwalk" ,python-binwalk) - ("python-h5py" ,python-h5py) - ("python-pypdf2" ,python-pypdf2) - ("python-progressbar33" ,python-progressbar33) - ;; test suite skips tests when tool is missing - ,@(match (%current-system) - ;; ghc is only available on x86 currently. - ((or "x86_64-linux" "i686-linux") - `(("ghc" ,ghc))) - (_ - `())) - ,@(match (%current-system) - ;; openjdk and dependent packages are only - ;; available on x86_64 currently. - ((or "x86_64-linux") - `(("enjarify" ,enjarify) - ;; no unversioned openjdk available - ("openjdk:jdk" ,openjdk12 "jdk") - )) - (_ - `())) - ("abootimg" ,abootimg) - ("bdb" ,bdb) - ("binutils" ,binutils) - ("bzip2" ,bzip2) - ("cdrtools" ,cdrtools) - ("colord" ,colord) - ("cpio" ,cpio) - ("docx2txt" ,docx2txt) - ("dtc" ,dtc) - ("e2fsprogs" ,e2fsprogs) - ("ffmpeg" ,ffmpeg) - ("gettext" ,gettext-minimal) - ("ghostscript" ,ghostscript) - ("giflib:bin" ,giflib "bin") - ("gnumeric" ,gnumeric) - ("gnupg" ,gnupg) - ("hdf5" ,hdf5) - ("imagemagick" ,imagemagick) - ("libarchive" ,libarchive) - ("llvm" ,llvm) - ("lz4" ,lz4) - ("mono" ,mono) - ("ocaml" ,ocaml) - ("odt2txt" ,odt2txt) - ("openssh" ,openssh) - ("openssl" ,openssl) - ("pgpdump" ,pgpdump) - ("poppler" ,poppler) - ("python-jsbeautifier" ,python-jsbeautifier) - ("r-minimal" ,r-minimal) - ("rpm" ,rpm) - ("sng" ,sng) - ("sqlite" ,sqlite) - ("squashfs-tools" ,squashfs-tools) - ("tcpdump" ,tcpdump) - ("unzip" ,unzip) - ("wabt" ,wabt) - ("xxd" ,xxd) - ("xz" ,xz) - ("zip" ,zip) - ("zstd" ,zstd))) - (home-page "https://diffoscope.org/") - (synopsis "Compare files, archives, and directories in depth") - (description - "Diffoscope tries to get to the bottom of what makes files or directories + (package + (name "diffoscope") + (version "146") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://salsa.debian.org/reproducible-builds/diffoscope.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "07kd3vshf4wlm0mv3mp6ljbxjq80mcg52w5ks6si1gnpzfbfz07p")))) + (build-system python-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + ;; setup.py mistakenly requires python-magic from PyPi, even + ;; though the Python bindings of `file` are sufficient. + ;; https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815844 + (add-after 'unpack 'dependency-on-python-magic + (lambda _ + (substitute* "setup.py" + (("'python-magic',") "")))) + ;; Patch in support for known tools + (add-after 'unpack 'add-known-tools + (lambda _ + (substitute* "diffoscope/external_tools.py" + (("'debian': 'openssl'") + "'debian': 'openssl', 'guix': 'openssl'")))) + ;; This test is broken because our `file` package has a + ;; bug in berkeley-db file type detection. + (add-after 'unpack 'remove-berkeley-test + (lambda _ + (delete-file "tests/comparators/test_berkeley_db.py") + #t)) + ;; Test is dynamically generated and may have false + ;; negatives with different ocaml versions. Further + ;; background in: https://bugs.debian.org/939386 + (add-after 'unpack 'remove-ocaml-test + (lambda _ + (substitute* "tests/comparators/test_ocaml.py" + (("def test_diff.differences.:") + "def skip_test_diff(differences):")) + #t)) + (add-after 'unpack 'skip-elf-tests + ;; FIXME: libmix_differences test added in 125, and is + ;; failing, need to explore why... + (lambda _ + (substitute* "tests/comparators/test_elf.py" + (("def test_libmix_differences.libmix_differences.:") + "def skip_test_libmix_differences(libmix_differences):")) + #t)) + (add-after 'unpack 'embed-tool-references + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "diffoscope/comparators/utils/compare.py" + (("\\['xxd',") + (string-append "['" (which "xxd") "',"))) + (substitute* "diffoscope/comparators/elf.py" + (("@tool_required\\('readelf'\\)") "") + (("get_tool_name\\('readelf'\\)") + (string-append "'" (which "readelf") "'"))) + (substitute* "diffoscope/comparators/directory.py" + (("@tool_required\\('stat'\\)") "") + (("@tool_required\\('getfacl'\\)") "") + (("\\['stat',") + (string-append "['" (which "stat") "',")) + (("\\['getfacl',") + (string-append "['" (which "getfacl") "',"))) + #t)) + (add-before 'check 'writable-test-data + (lambda _ + ;; tests may need needs write access to tests + ;; directory + (for-each make-file-writable (find-files "tests")) + #t)) + (add-before 'check 'delete-failing-test + (lambda _ + ;; this requires /sbin to be on the path + (delete-file "tests/test_tools.py") + #t))))) + (inputs `(("rpm" ,rpm) ;for rpm-python + ("python-file" ,python-file) + ("python-debian" ,python-debian) + ("python-libarchive-c" ,python-libarchive-c) + ("python-tlsh" ,python-tlsh) + ("acl" ,acl) ;for getfacl + ("colordiff" ,colordiff) + ("xxd" ,xxd))) + ;; Below are modules used for tests. + (native-inputs `(("python-pytest" ,python-pytest) + ("python-chardet" ,python-chardet) + ("python-binwalk" ,python-binwalk) + ("python-h5py" ,python-h5py) + ("python-pypdf2" ,python-pypdf2) + ("python-progressbar33" ,python-progressbar33) + ;; test suite skips tests when tool is missing + ,@(match (%current-system) + ;; ghc is only available on x86 currently. + ((or "x86_64-linux" "i686-linux") + `(("ghc" ,ghc))) + (_ + `())) + ,@(match (%current-system) + ;; openjdk and dependent packages are only + ;; available on x86_64 currently. + ((or "x86_64-linux") + `(("enjarify" ,enjarify) + ;; no unversioned openjdk available + ("openjdk:jdk" ,openjdk12 "jdk") + )) + (_ + `())) + ("abootimg" ,abootimg) + ("bdb" ,bdb) + ("binutils" ,binutils) + ("bzip2" ,bzip2) + ("cdrtools" ,cdrtools) + ("colord" ,colord) + ("cpio" ,cpio) + ("docx2txt" ,docx2txt) + ("dtc" ,dtc) + ("e2fsprogs" ,e2fsprogs) + ("ffmpeg" ,ffmpeg) + ("gettext" ,gettext-minimal) + ("ghostscript" ,ghostscript) + ("giflib:bin" ,giflib "bin") + ("gnumeric" ,gnumeric) + ("gnupg" ,gnupg) + ("hdf5" ,hdf5) + ("imagemagick" ,imagemagick) + ("libarchive" ,libarchive) + ("llvm" ,llvm) + ("lz4" ,lz4) + ("mono" ,mono) + ("ocaml" ,ocaml) + ("odt2txt" ,odt2txt) + ("openssh" ,openssh) + ("openssl" ,openssl) + ("pgpdump" ,pgpdump) + ("poppler" ,poppler) + ("python-jsbeautifier" ,python-jsbeautifier) + ("r-minimal" ,r-minimal) + ("rpm" ,rpm) + ("sng" ,sng) + ("sqlite" ,sqlite) + ("squashfs-tools" ,squashfs-tools) + ("tcpdump" ,tcpdump) + ("unzip" ,unzip) + ("wabt" ,wabt) + ("xxd" ,xxd) + ("xz" ,xz) + ("zip" ,zip) + ("zstd" ,zstd))) + (home-page "https://diffoscope.org/") + (synopsis "Compare files, archives, and directories in depth") + (description + "Diffoscope tries to get to the bottom of what makes files or directories different. It recursively unpacks archives of many kinds and transforms various binary formats into more human readable forms to compare them. It can compare two tarballs, ISO images, or PDFs just as easily. @@ -234,7 +233,7 @@ compare two tarballs, ISO images, or PDFs just as easily. Diffoscope has many optional dependencies; @code{diffoscope --list-missing-tools guix} will display optional packages to install.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public reprotest (package diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index bf009a792b..aeb43a6393 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 David Thompson <davet@gnu.org> ;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il> -;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de> ;;; @@ -47,7 +47,7 @@ #:use-module (gnu packages version-control) #:use-module (gnu packages virtualization)) -(define %docker-version "19.03.7") +(define %docker-version "19.03.9") (define-public python-docker-py (package @@ -314,7 +314,7 @@ built-in registry server of Docker.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1sik109lxmiwgrsnvfip1nnal1xkh8z1mlvys6aknjyh29ll1iq8")) + (base32 "1a9hkprkix5d7lqi88r8svvfpzh1qbzw9nrkp11lxrcf9wdan4hg")) (patches (search-patches "docker-fix-tests.patch")))) (build-system gnu-build-system) @@ -592,7 +592,7 @@ provisioning etc.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "164l33npy8acdbbrz8vcyiwx18vi55wwwikkasg0w43b5bdhz8sx")))) + (base32 "1599ff7699p3m925rdyfg7gl3cga6gy0lli7qh2ybyiw2kwf4gj9")))) (build-system go-build-system) (arguments `(#:import-path "github.com/docker/cli" diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index f8e77f07ad..ab02d1b7af 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -386,7 +386,10 @@ to open the application in a web browser, for offline usage.") Type=Application~%" out))) #t)))))) - (inputs `(("python-pyqt" ,python-pyqt))) + (native-inputs + `(("unzip" ,unzip))) + (inputs + `(("python-pyqt" ,python-pyqt))) (synopsis "School tools for physically disabled children") (description "ToutEnClic is intended to facilitate the schooling of physically disabled children in ordinary schools. It is both @@ -606,14 +609,14 @@ Portuguese, Spanish and Italian.") (define-public fet (package (name "fet") - (version "5.44.7") + (version "5.44.8") (source (origin (method url-fetch) (uri (string-append "https://www.lalescu.ro/liviu/fet/download/" "fet-" version ".tar.bz2")) (sha256 - (base32 "19b22brpb2mpvg14c2a0xmv8ipq5jg7yjmly8y3gfy8gmc3wqg5m")))) + (base32 "1i59xpkdnrd3qzgqs11vsws57g33zvkad5q3an56vd94aw7z3kpw")))) (build-system gnu-build-system) (arguments `(#:phases diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm index 098c0fc94a..3aabc6e927 100644 --- a/gnu/packages/elf.scm +++ b/gnu/packages/elf.scm @@ -112,14 +112,14 @@ object or archive file), @command{eu-strip} (for discarding symbols), (package (name "libabigail") (home-page "https://sourceware.org/libabigail/") - (version "1.6") + (version "1.7") (source (origin (method url-fetch) (uri (string-append "https://sourceware.org/pub/libabigail/" "libabigail-" version ".tar.gz")) (sha256 (base32 - "04j07lhvwbp6qp8pdwbf7iqnr7kgpabmqylsw4invpmzwnyp6g6g")))) + "0bf8w01l6wm7mm4clfg5rqi30m1ws11qqa4bp2vxghfwgi9ai8i7")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--disable-static" diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4f7b4cf6cc..23876932ac 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -73,6 +73,7 @@ ;;; Copyright © 2020 Vinicius Monego <monego@posteo.net> ;;; Copyright © 2020 Ryan Desfosses <rdes@protonmail.com> ;;; Copyright © 2020 Marcin Karpezo <sirmacik@wioo.waw.pl> +;;; Copyright © 2020 Fredrik Salomonsson <plattfot@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -296,16 +297,16 @@ configuration files, such as .gitattributes, .gitignore, and .git/config.") (define-public emacs-with-editor (package (name "emacs-with-editor") - (version "2.9.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/magit/with-editor.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1sjb3qqrn1rhmpkrn14l8rya6c3gwxwmgw74n779s54kvl9gn7a9")))) + (version "2.9.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/magit/with-editor.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1m8bm8q5zakfjdkd0662gbkvzmcrlkxy1856xns2nfiflrkpw88b")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-dash" ,emacs-dash))) @@ -509,16 +510,16 @@ support for Git-SVN.") (define-public emacs-magit-popup (package (name "emacs-magit-popup") - (version "2.12.5") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/magit/magit-popup.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "13riknyqr6vxqll80sfhvz165flvdz367rbd0pr5slb01bnfsi2i")))) + (version "2.13.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/magit/magit-popup.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1ifhph1mj7wjar62d65fjx45qsjwsyslbj7liih3v0r4by5gyxmw")))) (build-system emacs-build-system) (arguments `(#:phases @@ -649,42 +650,39 @@ deliver data to mobile and web apps.") (license license:gpl3+))) (define-public emacs-ghub - ;; We need a newer commit to avoid problems in emacs-forge. - (let ((commit "e19cd86ca4768a6d89285123933baa3f1460d696") - (revision "2")) - (package - (name "emacs-ghub") - (version (git-version "3.2.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/magit/ghub") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1d6f8sxlsl0fpkzwbpnaw77d1a5pkg63zfvf6a2fxir357lbdizx")))) - (build-system emacs-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'install 'make-info - (lambda _ - (invoke "make" "info")))))) - (native-inputs - `(("texinfo" ,texinfo))) - (propagated-inputs - `(("dash" ,emacs-dash) - ("emacs-let-alist" ,emacs-let-alist) - ("treepy" ,emacs-treepy))) - (home-page "https://github.com/magit/ghub") - (synopsis "Emacs client libraries for the APIs of various Git forges") - (description - "Ghub provides basic support for using the APIs of various Git forges from + (package + (name "emacs-ghub") + (version "3.3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/magit/ghub") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1229g0d9f4ywwjndx32x4z5jdr0kzyi44hjxmy0sifwfmg9nn251")))) + (build-system emacs-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'install 'make-info + (lambda _ + (invoke "make" "info")))))) + (native-inputs + `(("texinfo" ,texinfo))) + (propagated-inputs + `(("dash" ,emacs-dash) + ("emacs-let-alist" ,emacs-let-alist) + ("treepy" ,emacs-treepy))) + (home-page "https://github.com/magit/ghub") + (synopsis "Emacs client libraries for the APIs of various Git forges") + (description + "Ghub provides basic support for using the APIs of various Git forges from Emacs packages. It supports the REST APIs of Github, Github GraphQL, Gitlab, Gitea, Gogs and Bitbucket. It abstracts access to API resources using only a handful of functions that are not resource-specific.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-typit ;; Last release is from 2017. @@ -824,26 +822,22 @@ replacement.") (define-public emacs-haskell-mode (package (name "emacs-haskell-mode") - (version "16.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/haskell/haskell-mode") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1qk36y0v9fzass6785il65c6wb5cfj4ihhwkvgnzmbafpa8p4dvq")) - (patches - (search-patches ; backport test failure fixes - "haskell-mode-unused-variables.patch" - "haskell-mode-make-check.patch")))) - (inputs - `(("emacs-el-search" ,emacs-el-search) ; for tests - ("emacs-stream" ,emacs-stream))) ; for tests + (version "17.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/haskell/haskell-mode") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0izcasi2v02zh08c863h43m8mmsldzy8pck43cllrfn0zf24v2qn")))) (propagated-inputs `(("emacs-dash" ,emacs-dash))) (native-inputs `(("emacs" ,emacs-minimal) + ("emacs-el-search" ,emacs-el-search) + ("emacs-stream" ,emacs-stream) ("texinfo" ,texinfo))) (build-system gnu-build-system) (arguments @@ -856,8 +850,7 @@ replacement.") #:phases (modify-phases %standard-phases (delete 'configure) - (add-before - 'build 'pre-build + (add-before 'build 'pre-build (lambda* (#:key inputs #:allow-other-keys) (define (el-dir store-dir) (match (find-files store-dir "\\.el$") @@ -876,14 +869,17 @@ replacement.") (_ "")) inputs))) (substitute* (find-files "." "\\.el") (("/bin/sh") sh)) - ;; embed filename to fix test failure - (let ((file "tests/haskell-cabal-tests.el")) - (substitute* file - (("\\(buffer-file-name\\)") - (format #f "(or (buffer-file-name) ~s)" file)))) #t))) - (replace - 'install + (add-before 'check 'delete-failing-tests + ;; XXX: these tests require GHC executable, which would be a big + ;; native input. + (lambda _ + (with-directory-excursion "tests" + (for-each delete-file + '("haskell-customize-tests.el" + "inferior-haskell-tests.el"))) + #t)) + (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (el-dir (string-append out "/share/emacs/site-lisp")) @@ -900,9 +896,6 @@ replacement.") (install-file "haskell-mode.info" info)) (copy-to-dir doc '("CONTRIBUTING.md" "NEWS" "README.md")) (copy-to-dir el-dir (find-files "." "\\.elc?")) - ;; These are part of other packages. - (with-directory-excursion el-dir - (for-each delete-file '("dash.el" "ert.el"))) #t)))))) (home-page "https://github.com/haskell/haskell-mode") (synopsis "Haskell mode for Emacs") @@ -1605,36 +1598,21 @@ letter to each link using avy.") (define-public emacs-bbdb (package (name "emacs-bbdb") - (version "3.1.2") - (source (origin - (method url-fetch) - (uri (string-append "mirror://savannah/bbdb/bbdb-" - version ".tar.gz")) - (sha256 - (base32 - "1gs16bbpiiy01w9pyg12868r57kx1v3hnw04gmqsmpc40l1hyy05")) - (modules '((guix build utils))) - (snippet - ;; We don't want to build and install the PDF. - '(begin - (substitute* "doc/Makefile.in" - (("^doc_DATA = .*$") - "doc_DATA =\n")) - #t)))) - (build-system gnu-build-system) + (version "3.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "bbdb-" version ".tar")) + (sha256 + (base32 "1p56dg0mja2b2figy7yhdx714zd5j6njzn0k07zjka3jc06izvjx")))) + (build-system emacs-build-system) (arguments - '(#:phases - (modify-phases %standard-phases - (add-after 'install 'post-install - (lambda* (#:key outputs #:allow-other-keys) - ;; Add an autoloads file with the right name for guix.el. - (let* ((out (assoc-ref outputs "out")) - (site (string-append out "/share/emacs/site-lisp"))) - (with-directory-excursion site - (symlink "bbdb-loaddefs.el" "bbdb-autoloads.el"))) - #t))))) - (native-inputs `(("emacs" ,emacs-minimal))) - (home-page "https://savannah.nongnu.org/projects/bbdb/") + ;; XXX: The following file cannot be byte-compiled, because et requires + ;; `vm-autoloads', from the VM package, with is neither in Emacs nor + ;; packaged in Guix. So, don't bother for now. + `(#:exclude '("bbdb-vm\\.el"))) + (home-page "http://elpa.gnu.org/packages/bbdb.html") (synopsis "Contact management utility for Emacs") (description "BBDB is the Insidious Big Brother Database for GNU Emacs. It provides @@ -1818,14 +1796,14 @@ as a library for other Emacs packages.") (define-public emacs-auctex (package (name "emacs-auctex") - (version "12.2.2") + (version "12.2.3") (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 "1map25xn7r28aldhcz9n8pbfk2l3gvnxx8hgih3ax8hyvnfi6brh")))) + (base32 "1rbn6pghkll5apjv1fyn82v523fch9l5ksi5lnh439nq460wx1yf")))) (build-system emacs-build-system) ;; We use 'emacs' because AUCTeX requires dbus at compile time ;; ('emacs-minimal' does not provide dbus). @@ -1843,8 +1821,8 @@ as a library for other Emacs packages.") (with-directory-excursion "doc" (setenv "HOME" (getenv "TMPDIR")) ; for mktextfm (invoke "pdftex" "tex-ref") - (install-file "tex-ref.pdf" (string-append etc-dir - "/refcards"))) + (install-file "tex-ref.pdf" + (string-append etc-dir "/refcards"))) #t)))))) (native-inputs `(("perl" ,perl))) @@ -1886,14 +1864,14 @@ a set of simplified face specifications and a user-supplied color palette") (define-public emacs-howm (package (name "emacs-howm") - (version "1.4.5") + (version "1.4.6") (source (origin (method url-fetch) - (uri (string-append "https://howm.sourceforge.jp/a/howm-" - version ".tar.gz")) + (uri (string-append "https://howm.sourceforge.jp/a/" + "howm-" version ".tar.gz")) (sha256 - (base32 "1kvr5pxpc9rwhkza9025mdi0wvh0f0rpawl21rzirjk1x10903yi")))) + (base32 "17ihch1zbk08ih7gc232jlmbw7hax8ldb9glxp8d75k4asa98qh5")))) (build-system gnu-build-system) (native-inputs `(("emacs" ,emacs-minimal))) @@ -1918,6 +1896,26 @@ code@{emacs-wiki.el}, it facilitates using hyperlinks and doing full-text searches. Unlike code@{emacs-wiki.el}, it can be combined with any format.") (license license:gpl1+))) +(define-public emacs-bm + (package + (name "emacs-bm") + (version "201905") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/joodland/bm.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "180b3rc13asrmsdh7v405d54jkrininvaj52xhp71vw91ng51dkn")))) + (build-system emacs-build-system) + (home-page "https://github.com/joodland/bm") + (synopsis "Visual bookmarks for Emacs") + (description "This package provides visible, buffer local bookmarks and +the ability to jump forward and backward to the next bookmark.") + (license license:gpl2+))) + (define-public emacs-calfw (package (name "emacs-calfw") @@ -2249,28 +2247,20 @@ window).") (define-public emacs-mmm-mode (package (name "emacs-mmm-mode") - (version "0.5.7") + (version "0.5.8") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/purcell/mmm-mode.git") - (commit version))) - (file-name (git-file-name name version)) + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "mmm-mode-" version ".tar")) (sha256 - (base32 - "0lxd55yhz0ag7v1ydff55bg4h8snq5lbk8cjwxqpyq6gh4v7md1h")))) - (build-system gnu-build-system) - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("emacs" ,emacs-minimal) - ("texinfo" ,texinfo-5))) ;fails to build with Texinfo 6.7 + (base32 "05ckf4zapdpvnd3sqpw6kxaa567zh536a36m9qzx3sqyjbyn5fb4")))) + (build-system emacs-build-system) (home-page "https://github.com/purcell/mmm-mode") (synopsis "Allow multiple major modes in an Emacs buffer") (description - "MMM Mode is a minor mode that allows multiple major modes to coexist in a -single buffer.") + "MMM Mode is a minor mode that allows multiple major modes to coexist in +a single buffer.") (license license:gpl3+))) (define-public emacs-mmt @@ -2669,20 +2659,19 @@ in the center.") (define-public emacs-undo-tree (package (name "emacs-undo-tree") - (version "0.7.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "http://dr-qubit.org/git/undo-tree.git") - (commit (string-append "release/" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1nr0149y2nvrxj56gc12jqnfl01g6z9ypfsgl6pfg85cw73hnggk")))) + (version "0.7.4") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "undo-tree-" version ".el")) + (sha256 + (base32 "018ixl802f076sfyf4gkacpgrdpybin88jd8vq9zgyvc6x2dalfa")))) (build-system emacs-build-system) (home-page "http://www.dr-qubit.org/emacs.php") (synopsis "Treat undo history as a tree") - (description "Tree-like interface to Emacs undo system, providing + (description + "Tree-like interface to Emacs undo system, providing graphical tree presentation of all previous states of buffer that allows easily move between them.") (license license:gpl3+))) @@ -5891,7 +5880,7 @@ regexp that matches all known keywords.") (define-public emacs-perspective (package (name "emacs-perspective") - (version "2.2") + (version "2.8") (source (origin (method git-fetch) @@ -5901,7 +5890,7 @@ regexp that matches all known keywords.") (file-name (git-file-name name version)) (sha256 (base32 - "0pd5sqrrz6y3md20yh6ffy32jdcgb1gc9b4j14pm6r54bqxik68h")))) + "1gdacw1gkng1dhm12lhfssmac0fijsh3wpbvcmsv2jz3gpnjin1g")))) (build-system emacs-build-system) (home-page "https://github.com/nex3/perspective-el") (synopsis "Switch between named \"perspectives\"") @@ -6565,7 +6554,7 @@ allowing unprefixed keys to insert their respective characters as expected.") (define-public emacs-clojure-mode (package (name "emacs-clojure-mode") - (version "5.6.1") + (version "5.11.0") (source (origin (method git-fetch) @@ -6574,21 +6563,21 @@ allowing unprefixed keys to insert their respective characters as expected.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1qadymqzs5fn1sb347xzfw8lqq6s85vvkh4kzm35m61g5i2lm86y")))) + (base32 "1x1yszp6waa778ki6sw66w1pzcz389wd01gkcldfxxnd7z89ad5d")))) (build-system emacs-build-system) (native-inputs - `(("emacs-dash" ,emacs-dash) - ("emacs-s" ,emacs-s) - ("ert-runner" ,emacs-ert-runner))) + `(("emacs-buttercup" ,emacs-buttercup) + ("emacs-dash" ,emacs-dash) + ("emacs-s" ,emacs-s))) (arguments `(#:tests? #t - #:test-command '("ert-runner"))) + #:test-command '("buttercup"))) (home-page "https://github.com/clojure-emacs/clojure-mode") (synopsis "Major mode for Clojure code") (description "This Emacs package provides font-lock, indentation, navigation and basic refactoring for the @uref{http://clojure.org, Clojure programming language}. -It is recommended to use @code{clojure-mode} with paredit or smartparens.") +It is recommended to use @code{clojure-mode} with Paredit or Smartparens.") (license license:gpl3+))) (define-public emacs-epl @@ -7515,20 +7504,20 @@ of its name.") (define-public emacs-rainbow-mode (package (name "emacs-rainbow-mode") - (version "1.0.2") - (source (origin - (method url-fetch) - (uri (string-append - "https://elpa.gnu.org/packages/rainbow-mode-" version ".el")) - (sha256 - (base32 - "1zfqj63sr07pdlwy7caz4fxsjhmbhh939n81z6jxq9xggm8ajxkd")))) + (version "1.0.4") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "rainbow-mode-" version ".el")) + (sha256 + (base32 "0rp76gix1ph1wrmdax6y2m3i9y1dmgv7ikjz8xsl5lizkygsy9cg")))) (build-system emacs-build-system) (home-page "https://elpa.gnu.org/packages/rainbow-mode.html") (synopsis "Colorize color names in buffers") (description "This minor mode sets background color to strings that match color -names, e.g. #0000ff is displayed in white with a blue background.") +names, e.g., @samp{#0000ff} is displayed in white with a blue background.") (license license:gpl3+))) (define-public emacs-ryo-modal @@ -8007,7 +7996,7 @@ target will call @code{compile} on it.") (define-public emacs-cider (package (name "emacs-cider") - (version "0.23.0") + (version "0.25.0") (source (origin (method git-fetch) @@ -8016,20 +8005,18 @@ target will call @code{compile} on it.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "05yjkqc6d4grq9z5pxmv3anqh4zlhfg4v46jlccp6ynh030g7axs")))) + (base32 "1sdd7vzw948q01kc8im1asiq1j06q0mnn2s8kj83f8sbdnfy0qbk")))) (build-system emacs-build-system) (arguments - '(#:exclude ; Don't exclude 'cider-test.el'. + '(#:exclude ;don't exclude 'cider-test.el' '("^\\.dir-locals\\.el$" "^test/"))) (propagated-inputs `(("emacs-clojure-mode" ,emacs-clojure-mode) - ("emacs-sesman" ,emacs-sesman) - ("emacs-seq" ,emacs-seq) - ("emacs-spinner" ,emacs-spinner) ("emacs-parseedn" ,emacs-parseedn) ("emacs-pkg-info" ,emacs-pkg-info) - ("emacs-queue" ,emacs-queue))) + ("emacs-queue" ,emacs-queue) + ("emacs-sesman" ,emacs-sesman) + ("emacs-spinner" ,emacs-spinner))) (home-page "https://cider.mx/") (synopsis "Clojure development environment for Emacs") (description @@ -9003,7 +8990,7 @@ Flx has support for ido (interactively do things) through flx-ido.") (define-public emacs-cyberpunk-theme (package (name "emacs-cyberpunk-theme") - (version "1.21") + (version "1.22") (source (origin (method git-fetch) @@ -9012,7 +8999,7 @@ Flx has support for ido (interactively do things) through flx-ido.") (commit version))) (sha256 (base32 - "05mfgr9aj7knn7niadv9p6z3qrfpq2lbbi2wxxx62xywim9maw2y")) + "06nff38pcy5rgz13svkajsg0jjk73qy4a8m7p9f76yxcywxlgxlc")) (file-name (git-file-name name version)))) (build-system emacs-build-system) (home-page "https://github.com/n3mo/cyberpunk-theme.el") @@ -9075,6 +9062,27 @@ known loosely as deftheme. Many mode-specific customizations are included.") by zenburn, sinburn and similar themes, but slowly diverging from them.") (license license:gpl3+)))) +(define-public emacs-dracula-theme + (package + (name "emacs-dracula-theme") + (version "1.7.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dracula/emacs") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "15y2djc5jljlvls1x9kp50m1kp0dcksmyixafsyimj66xpq9ngh0")))) + (build-system emacs-build-system) + (home-page "https://draculatheme.com/") + (synopsis "Dark theme for Emacs") + (description + "Dracula is a dark color theme for many editors, shells and more. This +package provides the Emacs theme.") + (license license:expat))) + (define-public emacs-auto-complete (package (name "emacs-auto-complete") @@ -9123,31 +9131,23 @@ editing nginx config files.") (license license:gpl2+))) (define-public emacs-stream - (let ((commit "a3f3da155a49c133e2692bd8789b35492bfdc4f7") - (revision "1")) - (package - (name "emacs-stream") - (version (git-version "2.2.4" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Emacsmirror/stream.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0aig0yjb9z752ijh0mzildjmh44j051inchga8qll01dr8wf7332")))) - (build-system emacs-build-system) - (arguments - `(#:tests? #t - #:test-command '("emacs" "--batch" - "-l" "tests/stream-tests.el" - "-f" "ert-run-tests-batch-and-exit"))) - (home-page "https://github.com/Emacsmirror/stream") - (synopsis "Implementation of streams for Emacs") - (description "This library provides an implementation of streams for Emacs. + (package + (name "emacs-stream") + (version "2.2.5") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "stream-" version ".tar")) + (file-name (git-file-name name version)) + (sha256 + (base32 "00c3n4gyxzv7vczqms0d62kl8zsmjfyxa92mwxn2snyx857a9jfw")))) + (build-system emacs-build-system) + (home-page "http://elpa.gnu.org/packages/stream.html") + (synopsis "Implementation of streams for Emacs") + (description "This library provides an implementation of streams for Emacs. Streams are implemented as delayed evaluation of cons cells.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-cl-print (let ((commit "1a70c553dfb04352afb5b8696fe0cef8acc8f991") @@ -9303,33 +9303,26 @@ customizable by the user.") (license license:gpl2+))) (define-public emacs-zones - (let ((commit "3169815c323966ff8e252b44e3558d6d045243fe") - (revision "2")) - (package - (name "emacs-zones") - (version (git-version "0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/emacsmirror/zones.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "039msns5596rz0my7fxpanpxwg1lkhpiibm9ppnlzaajx1hszbzl")) - (patches - (search-patches - "emacs-zones-called-interactively.patch")))) - (build-system emacs-build-system) - (home-page "https://www.emacswiki.org/emacs/Zones") - (synopsis "Define and act on multiple zones of buffer text") - (description "Library @file{zones.el} lets you easily define and -subsequently act on multiple zones of buffer text. You can think of this as -enlarging the notion of region. In effect, it can remove the requirement of -target text being a contiguous sequence of characters. A set of buffer zones -is, in effect, a (typically) noncontiguous set of text.") - (license license:gpl3+)))) + (package + (name "emacs-zones") + (version "2019.7.13") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "zones-" version ".el")) + (sha256 + (base32 "0qp1ba2pkqx9d35g7z8hf8qs2k455krf2a92l4rka3ipsbnmq5k1")))) + (build-system emacs-build-system) + (home-page "https://www.emacswiki.org/emacs/Zones") + (synopsis "Define and act on multiple zones of buffer text") + (description + "Library @file{zones.el} lets you easily define and subsequently act on +multiple zones of buffer text. You can think of this as enlarging the notion +of region. In effect, it can remove the requirement of target text being +a contiguous sequence of characters. A set of buffer zones is, in effect, +a (typically) noncontiguous set of text.") + (license license:gpl3+))) (define-public emacs-mu4e-alert (package @@ -9826,7 +9819,7 @@ highlights quasi-quoted expressions.") (define-public emacspeak (package (name "emacspeak") - (version "50.0") + (version "52.0") (source (origin (method url-fetch) @@ -9834,14 +9827,17 @@ highlights quasi-quoted expressions.") "https://github.com/tvraman/emacspeak/releases/download/" version "/emacspeak-" version ".tar.bz2")) (sha256 - (base32 - "0rsj7rzfyqmyidfsjrhjnxi2d43axx6r3gac1fhv5xkkbiiqzqkb")))) + (base32 "0x5b0s38r5ih2lk7f5hasi9arrgxlmmq5jaddadbxi8in2gw2jzl")))) (build-system gnu-build-system) (arguments '(#:make-flags (list (string-append "prefix=" (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases + (add-after 'unpack 'delete-broken-symlink + (lambda _ + (delete-file "lisp/sudoku.el") + #t)) (replace 'configure (lambda _ (setenv "SHELL" (which "sh")) @@ -9866,12 +9862,12 @@ highlights quasi-quoted expressions.") '("etc" "info" "js" "lisp" "media" "servers" "sounds" "stumpwm" "xsl")) ;; Make sure emacspeak is loaded from the correct directory. - (substitute* "etc/emacspeak.sh" - (("/lisp/emacspeak-setup.el") + (substitute* "run" + (("\\./lisp/emacspeak-setup.el") (string-append lisp "/lisp/emacspeak-setup.el"))) ;; Install the convenient startup script. (mkdir-p bin) - (copy-file "etc/emacspeak.sh" (string-append bin "/emacspeak"))) + (copy-file "run" (string-append bin "/emacspeak"))) #t)) (add-after 'install 'wrap-program (lambda* (#:key inputs outputs #:allow-other-keys) @@ -9884,10 +9880,10 @@ highlights quasi-quoted expressions.") (wrap-program emacspeak `("DTK_PROGRAM" ":" prefix (,espeak))) #t)))) - #:tests? #f)) ; no check target + #:tests? #f)) ; no check target (inputs `(("emacs" ,emacs) - ("espeak" ,espeak) + ("espeak" ,espeak-ng) ("perl" ,perl) ("tcl" ,tcl) ("tclx" ,tclx))) @@ -9895,26 +9891,25 @@ highlights quasi-quoted expressions.") (synopsis "Audio desktop interface for Emacs") (description "Emacspeak is a speech interface that allows visually impaired users to -interact independently and efficiently with the computer. Audio formatting ---a technique pioneered by AsTeR-- and full support for W3C's Aural CSS (ACSS) -allows Emacspeak to produce rich aural presentations of electronic information. -By seamlessly blending all aspects of the Internet such as Web-surfing and -messaging, Emacspeak speech-enables local and remote information via a -consistent and well-integrated user interface.") +interact independently and efficiently with the computer. Audio +formatting---a technique pioneered by AsTeR---and full support for W3C's Aural +CSS (ACSS) allows Emacspeak to produce rich aural presentations of electronic +information. By seamlessly blending all aspects of the Internet such as +Web-surfing and messaging, Emacspeak speech-enables local and remote +information via a consistent and well-integrated user interface.") (license license:gpl2+))) (define-public emacs-adaptive-wrap (package (name "emacs-adaptive-wrap") - (version "0.5.1") - (source (origin - (method url-fetch) - (uri (string-append - "https://elpa.gnu.org/packages/adaptive-wrap-" - version ".el")) - (sha256 - (base32 - "0qi7gjprcpywk2daivnlavwsx53hl5wcqvpxbwinvigg42vxh3ll")))) + (version "0.7") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "adaptive-wrap-" version ".el")) + (sha256 + (base32 "10fb8gzvkbnrgzv28n1rczs03dvapr7rvi0kd73j6yf1zg2iz6qp")))) (build-system emacs-build-system) (home-page "https://elpa.gnu.org/packages/adaptive-wrap.html") (synopsis "Smart line-wrapping with wrap-prefix") @@ -10208,25 +10203,25 @@ configuration of Chinese fonts.") (define-public emacs-php-mode (package (name "emacs-php-mode") - (version "1.22.2") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ejmr/php-mode.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1r4bpyavlndd4c78cv5cc97bc0gkd4cggiyz4kd2vg6zlyc1nld3")))) + (version "1.23.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ejmr/php-mode.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0wnkcxg6djy4jvxhshiy1iw6b5cf79pjwjhfd1a060cavhfm4v5c")))) (build-system emacs-build-system) (home-page "https://github.com/ejmr/php-mode") (synopsis "Major mode for editing PHP code") - (description "@code{php-mode} is a major mode for editing PHP source -code. It's an extension of C mode; thus it inherits all C mode's navigation -functionality. But it colors according to the PHP grammar and indents -according to the PEAR coding guidelines. It also includes a couple handy -IDE-type features such as documentation search and a source and class -browser.") + (description + "PHP mode is a major mode for editing PHP source code. It's an extension +of C mode; thus it inherits all C mode's navigation functionality. But it +colors according to the PHP grammar and indents according to the PEAR coding +guidelines. It also includes a couple handy IDE-type features such as +documentation search and a source and class browser.") (license license:gpl3+))) (define-public emacs-pos-tip @@ -10304,20 +10299,18 @@ and cangjie.") (define-public emacs-posframe (package (name "emacs-posframe") - (version "0.5.0") + (version "0.7.0") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/tumashu/posframe") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "posframe-" version ".el")) (sha256 - (base32 - "1fhjxj7gi2pj5rdnmf0gddiwd8iifgjgjp01c01npz1gwwixyqh3")))) + (base32 "1kwl83jb5k1hnx0s2qw972v0gjqbbvk4sdcdb1qbdxsyw36sylc9")))) (build-system emacs-build-system) - ;; emacs-minimal does not include the function font-info - (arguments `(#:emacs ,emacs)) + ;; emacs-minimal does not include the function font-info. + (arguments + `(#:emacs ,emacs)) (home-page "https://github.com/tumashu/posframe") (synopsis "Pop a posframe (a child frame) at point") (description "@code{emacs-posframe} can pop a posframe at point. A @@ -10440,15 +10433,15 @@ It should enable you to implement low-level X11 applications.") (define-public emacs-exwm (package (name "emacs-exwm") - (version "0.23") + (version "0.24") (synopsis "Emacs X window manager") - (source (origin - (method url-fetch) - (uri (string-append "https://elpa.gnu.org/packages/exwm-" - version ".tar")) - (sha256 - (base32 - "05w1v3wrp1lzz20zd9lcvr5nhk809kgy6svvkbs15xhnr6x55ad5")))) + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "exwm-" version ".tar")) + (sha256 + (base32 "0lj1a3cmbpf4h6x8k6x8cdm1qb51ca6filydnvi5zcda8zpl060s")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-xelb" ,emacs-xelb))) @@ -10500,8 +10493,9 @@ It should enable you to implement low-level X11 applications.") (chmod exwm-executable #o555) #t)))))) (home-page "https://github.com/ch11ng/exwm") - (description "EXWM is a full-featured tiling X window manager for Emacs -built on top of XELB.") + (description + "EXWM is a full-featured tiling X window manager for Emacs built on top +of XELB.") (license license:gpl3+))) (define-public emacs-switch-window @@ -10706,7 +10700,7 @@ pressed simultaneously or a single key quickly pressed twice.") (define-public emacs-evil-surround (package (name "emacs-evil-surround") - (version "1.0.4") + (version "1.1.0") (source (origin (method git-fetch) @@ -10715,7 +10709,7 @@ pressed simultaneously or a single key quickly pressed twice.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1ajsi6xn8mliwzl24h6pp9rd91z7f20yvkphr9q7k6zpjrd7fb9q")))) + (base32 "15v2spg5rhddr97pxjfvxj36sh7knp753a9qpw8v5zjnp65kf2kn")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-evil" ,emacs-evil))) @@ -11014,14 +11008,14 @@ highlighting.") (define-public emacs-jsonrpc (package (name "emacs-jsonrpc") - (version "1.0.11") + (version "1.0.12") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "jsonrpc-" version ".el")) (sha256 - (base32 "04cy1mqd6y8k5lcpg076szjk9av9345mmsnzzh6vgbcw3dcgbr23")))) + (base32 "0cqp05awikbrn88ifld3vwnv6cxgmr83wlnsvxw8bqb96djz70ad")))) (build-system emacs-build-system) (home-page "http://elpa.gnu.org/packages/jsonrpc.html") (synopsis "JSON-RPC library") @@ -11762,45 +11756,35 @@ database of references on life sciences.") (define-public emacs-websocket (package (name "emacs-websocket") - (version "1.10") + (version "1.12") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ahyatt/emacs-websocket.git") - (commit version))) - (file-name (git-file-name name version)) + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "websocket-" version ".tar")) (sha256 - (base32 - "1dgrf7na6r6mmkknphzshlbd5fnzisg0qn0j7vfpa38wgsymaq52")))) + (base32 "0ap4z80c6pzpb69wrx0hsvwzignxmd2b9xy974by9gf5xm2wpa8w")))) (build-system emacs-build-system) - (arguments - `(#:tests? #t - ;; TODO: also enable websocket-functional-test.el - #:test-command '("emacs" "--batch" - "-l" "websocket-test.el" - "-f" "ert-run-tests-batch-and-exit"))) (home-page "https://elpa.gnu.org/packages/websocket.html") (synopsis "Emacs WebSocket client and server") - (description "This is an Elisp library for WebSocket clients to talk to -WebSocket servers, and for WebSocket servers to accept connections from -WebSocket clients. This library is designed to be used by other library -writers, to write applications that use WebSockets, and is not useful by -itself.") + (description + "This is an Elisp library for WebSocket clients to talk to WebSocket +servers, and for WebSocket servers to accept connections from WebSocket +clients. This library is designed to be used by other library writers, to +write applications that use WebSockets, and is not useful by itself.") (license license:gpl3+))) (define-public emacs-oauth2 (package (name "emacs-oauth2") - (version "0.11") + (version "0.13") (source (origin (method url-fetch) - (uri (string-append "https://elpa.gnu.org/packages/oauth2-" - version ".el")) + (uri (string-append "https://elpa.gnu.org/packages/" + "oauth2-" version ".el")) (sha256 - (base32 - "0ydkc9jazsnbbvfhd47mql52y7k06n3z7r0naqxkwb99j9blqsmp")))) + (base32 "0y5nbdwxz2hfr09xgsqgyv60vgx0rsaisibcpkz00klvgg26w33r")))) (build-system emacs-build-system) (home-page "https://elpa.gnu.org/packages/oauth2.html") (synopsis "OAuth 2.0 authorization protocol implementation") @@ -11870,8 +11854,8 @@ through them using @key{C-c C-SPC}.") (license license:gpl3+))) (define-public emacs-slack - (let ((commit "b7b9eada0bf62d40dfe764b00f55913a2d3d742e") - (revision "7")) + (let ((commit "a6d9f49bc6161f12c594d25254e77eedf4a67666") + (revision "8")) (package (name "emacs-slack") (version (git-version "0.0.2" revision commit)) @@ -11883,7 +11867,7 @@ through them using @key{C-c C-SPC}.") (file-name (git-file-name name commit)) (sha256 (base32 - "0cqr7jnfxzb0z2wy79pdwpv9cvmawjif1kin3zbp8q7zhwrq09v0")))) + "0crjjankqi4bqjk5pdz4r2ixf56n1nnq8ab1gz3sbl3v6as6262w")))) (build-system emacs-build-system) (arguments `(#:phases @@ -11962,14 +11946,14 @@ let users kill or mark things easily.") (define-public emacs-csv-mode (package (name "emacs-csv-mode") - (version "1.10") + (version "1.12") (source (origin (method url-fetch) - (uri (string-append "https://elpa.gnu.org/packages/csv-mode-" - version ".el")) + (uri (string-append "https://elpa.gnu.org/packages/" + "csv-mode-" version ".tar")) (sha256 - (base32 "0q7j2cmj7vs6hz8cnf7j7lmlcjmig3jn2p6az345z96agl8a5xsq")))) + (base32 "0bya12smlrzwv4cbcmch4kg1fazp4k0ndrh1z17ix9p8c14d0v1j")))) (build-system emacs-build-system) (home-page "https://elpa.gnu.org/packages/csv-mode.html") (synopsis "Major mode for editing comma/char separated values") @@ -12219,7 +12203,7 @@ features and provides Vim-like key bindings.") (define-public emacs-bongo (package (name "emacs-bongo") - (version "1.0") + (version "1.1") (source (origin (method git-fetch) @@ -12228,7 +12212,7 @@ features and provides Vim-like key bindings.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1q3ws2vn062dh7ci6jn2k2bcn7szh3ap64sgwkzdd6f1pas37fnr")))) + (base32 "1nszph9mn98flyhn1jq3y6mdh6jymjkvj5ng36ql016dj92apvhv")))) (build-system emacs-build-system) (home-page "https://github.com/dbrock/bongo") (synopsis "Media player for Emacs") @@ -12397,36 +12381,39 @@ the format.") (license license:gpl3+))) (define-public emacs-nov-el - (package - (name "emacs-nov-el") - (version "0.2.9") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/wasamasa/nov.el.git") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0v01l1p35mcigixs6j4c5bpc7n7bd51kxa0p3l1xl0gr92774yq3")))) - (build-system emacs-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'embed-path-to-unzip - (lambda _ - (substitute* "nov.el" - (("\\(executable-find \"unzip\"\\)") - (string-append "\"" (which "unzip") "\""))) - #t))))) - (propagated-inputs - `(("emacs-dash" ,emacs-dash) - ("emacs-esxml" ,emacs-esxml))) - (inputs - `(("unzip" ,unzip))) - (home-page "https://github.com/wasamasa/nov.el/") - (synopsis "Major mode for reading EPUBs in Emacs") - (description "@code{nov.el} provides a major mode for reading EPUB + ;; Upstream does not tag releases. Specify raw commit hash matching the + ;; release. + (let ((commit "ea0c835c1b5e6e70293f4bd64e9c89bdc42f8596")) + (package + (name "emacs-nov-el") + (version "0.3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://depp.brause.cc/nov.el.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "04phmm14ywgicjsl2bsg6w9rapd71vdkxdp5wp0brj6px27y85jz")))) + (build-system emacs-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'embed-path-to-unzip + (lambda _ + (substitute* "nov.el" + (("\\(executable-find \"unzip\"\\)") + (string-append "\"" (which "unzip") "\""))) + #t))))) + (propagated-inputs + `(("emacs-dash" ,emacs-dash) + ("emacs-esxml" ,emacs-esxml))) + (inputs + `(("unzip" ,unzip))) + (home-page "https://depp.brause.cc/nov.el/") + (synopsis "Major mode for reading EPUBs in Emacs") + (description "@code{nov.el} provides a major mode for reading EPUB documents. Features: @@ -12443,7 +12430,7 @@ Features: @item Image rescaling @end itemize ") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public epipe (package @@ -12562,31 +12549,26 @@ the same values you get in a terminal.") (license license:gpl3+))) (define-public emacs-frog-menu - (let ((commit "740bbc88b8535d31f783f3b2043a2a6683afbf31") - (revision "1")) - (package - (name "emacs-frog-menu") - (version (git-version "0.2.9" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/clemera/frog-menu") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1g77424jwq62qj06rvld44s5hp0dw8rw2pwmmag6gd536zf65xrj")))) - (build-system emacs-build-system) - (propagated-inputs - `(("emacs-posframe" ,emacs-posframe) - ("emacs-avy" ,emacs-avy))) - (home-page "https://github.com/clemera/frog-menu") - (synopsis "Quickly pick items from ad hoc menus") - (description - "This package provides a popup offering a preview of a list of -candidates on which user-defined dispatch actions can act.") - (license license:gpl3+)))) + (package + (name "emacs-frog-menu") + (version "0.2.11") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "frog-menu-" version ".el")) + (sha256 + (base32 "06iw11z61fd0g4w3562k3smcmzaq3nivvvc6gzm8y8k5pcrqzdff")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-avy" ,emacs-avy) + ("emacs-posframe" ,emacs-posframe))) + (home-page "https://github.com/clemera/frog-menu") + (synopsis "Quickly pick items from ad hoc menus") + (description + "This package provides a popup offering a preview of a list of candidates +on which user-defined dispatch actions can act.") + (license license:gpl3+))) (define-public emacs-frog-jump-buffer (let ((commit "2d7b342785ae27d45f5d252272df6eb773c78e20") @@ -13350,67 +13332,67 @@ tables of contents.") (license license:gpl3+))) (define-public emacs-ts - (let ((commit "395649a2f2ba79028331bb1fa9ec08b218950ff6") - (revision "2")) - (package - (name "emacs-ts") - (version (git-version "0.1" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/alphapapa/ts.el") - (commit commit))) - (sha256 - (base32 - "02603wv66fplsigxd87jy23hrb5g9vigszcpdqrdv0ypaqaxlr3a")) - (file-name (git-file-name name version)))) - (build-system emacs-build-system) - (propagated-inputs - `(("emacs-s" ,emacs-s) - ("emacs-dash" ,emacs-dash))) - (arguments - ;; XXX: Three tests are failing because of a timezone-related issue - ;; with how they're written. On my machine, all the failing test - ;; results are 18000 seconds (5 hours) off. + (package + (name "emacs-ts") + (version "0.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/alphapapa/ts.el") + (commit version))) + (sha256 + (base32 "0hmzc1ppnkkr0lfq5fhzqr6icv6iqz824a6bnns7zr466hhqp3qb")) + (file-name (git-file-name name version)))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-s" ,emacs-s) + ("emacs-dash" ,emacs-dash))) + (arguments + ;; XXX: Three tests are failing because of a timezone-related issue + ;; with how they're written. On my machine, all the failing test + ;; results are 18000 seconds (5 hours) off. - ;; The ts-parse-org function accepts a string without any timezone - ;; info, not assumed to be in Unix time, and converts it to a so-called - ;; ts struct. The ts-unix function (accessor) accepts a ts struct, - ;; then seems to assume the struct's corresponding time is in terms of - ;; the user's current time zone, before returning a Unix time in - ;; seconds. + ;; The ts-parse-org function accepts a string without any timezone + ;; info, not assumed to be in Unix time, and converts it to a so-called + ;; ts struct. The ts-unix function (accessor) accepts a ts struct, + ;; then seems to assume the struct's corresponding time is in terms of + ;; the user's current time zone, before returning a Unix time in + ;; seconds. - ;; The failing tests all have similar problems, but nothing else about - ;; the library seems particularly off. + ;; The failing tests all have similar problems, but nothing else about + ;; the library seems particularly off. - `(#:tests? #t - #:test-command '("emacs" "--batch" - "-l" "test/test.el" - "-f" "ert-run-tests-batch-and-exit") - #:phases - (modify-phases %standard-phases - (add-before 'check 'make-tests-writable - (lambda _ - (make-file-writable "test/test.el") - #t)) - (add-before 'check 'delete-failing-tests - (lambda _ - (emacs-batch-edit-file "test/test.el" - `(progn (progn - (goto-char (point-min)) - (dolist (test-regexp '("ert-deftest ts-format" - "ert-deftest ts-parse-org\\_>" - "ert-deftest ts-parse-org-element")) - (re-search-forward test-regexp) - (beginning-of-line) - (kill-sexp))) - (basic-save-buffer))) - #t))))) - (home-page "https://github.com/alphapapa/ts.el") - (synopsis "Timestamp and date/time library") - (description "This package facilitates manipulating dates, times, and + `(#:tests? #t + #:test-command '("emacs" "--batch" + "-l" "test/test.el" + "-f" "ert-run-tests-batch-and-exit") + #:phases + (modify-phases %standard-phases + (add-before 'check 'make-tests-writable + (lambda _ + (make-file-writable "test/test.el") + #t)) + (add-before 'check 'delete-failing-tests + (lambda _ + (emacs-batch-edit-file "test/test.el" + `(progn (progn + (goto-char (point-min)) + (dolist (test-regexp + '("ert-deftest ts-format" + "ert-deftest ts-parse-org\\_>" + "ert-deftest ts-parse-org-element" + "ert-deftest ts-update")) + (re-search-forward test-regexp) + (beginning-of-line) + (kill-sexp))) + (basic-save-buffer))) + #t))))) + (home-page "https://github.com/alphapapa/ts.el") + (synopsis "Timestamp and date/time library") + (description "This package facilitates manipulating dates, times, and timestamps by providing a @code{ts} struct.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-peg (package @@ -14096,7 +14078,7 @@ confused by comments or @code{foo-bar} matching @code{foo}.") (define-public emacs-edit-server (package (name "emacs-edit-server") - (version "1.13") + (version "1.15") (source (origin (method git-fetch) @@ -14105,7 +14087,7 @@ confused by comments or @code{foo-bar} matching @code{foo}.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "12dp1xj09jrp0kxp9xb6cak9dn6zkyis1wfn4fnhzmxxnrd8c5rn")))) + (base32 "0xxby3ghs38i1l7kag12rnzlzcg9297pm8k6kqq3aqzsg9d2950y")))) (build-system emacs-build-system) (arguments `(#:phases @@ -14378,7 +14360,7 @@ until the top-level form is no longer a macro call.") (define-public emacs-beginend (package (name "emacs-beginend") - (version "2.0.0") + (version "2.1.0") (source (origin (method git-fetch) @@ -14387,7 +14369,7 @@ until the top-level form is no longer a macro call.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1jbhg73g1rrkbwql5vi2b0ys9avfazmwzwgd90gkzwavw0ch9cvl")))) + (base32 "1ic5z3qb5sc3mjrjdlg0rqm2l59a43gwnakagns4cilln2a3xdg8")))) ;; TODO: Run tests. (build-system emacs-build-system) (inputs @@ -15186,14 +15168,14 @@ It s customizable: it's easy to add or redefine what exactly consitutes a (define-public emacs-darkroom (package (name "emacs-darkroom") - (version "0.2") - (source (origin - (method url-fetch) - (uri (string-append "https://elpa.gnu.org/packages/darkroom-" - version ".el")) - (sha256 - (base32 - "1a528brhz4vckhp77n2c1phkyqdliykpj9kzk3f834f4rwnb5mp0")))) + (version "0.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "darkroom-" version ".el")) + (sha256 + (base32 "0l1xg5kqmjw22k78qnsln0ifx2dx74xxqj0qp8xxcpqvzzx0xh86")))) (build-system emacs-build-system) (home-page "https://elpa.gnu.org/packages/darkroom.html") (synopsis "Remove visual distractions and focus on writing") @@ -15626,12 +15608,12 @@ the previously visible buffer part after each scroll.") (license license:gpl3+))) (define-public emacs-highlight-escape-sequences + ;; No release upstream. Extract version from main file. (let ((commit "08d846a7aa748209d65fecead2b6a766c3e5cb41") - (revision "1")) + (revision "0")) (package (name "emacs-highlight-escape-sequences") - (version (string-append "0.0.1" "-" revision "." - (string-take commit 7))) + (version (git-version "0.4" revision commit)) (source (origin (method git-fetch) @@ -15640,8 +15622,7 @@ the previously visible buffer part after each scroll.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 - "05mc3w1f8ykf80914a1yddw6j8cmh0h57llm07xh89s53821v2is")))) + (base32 "05mc3w1f8ykf80914a1yddw6j8cmh0h57llm07xh89s53821v2is")))) (build-system emacs-build-system) (home-page "https://github.com/dgutov/highlight-escape-sequences") (synopsis "Highlight escape sequences in Emacs") @@ -18184,20 +18165,20 @@ advice to be recorded and displayed.") (license license:gpl3+)))) (define-public emacs-general - (let ((commit "f38fb2294bd29261374b772f765730f2fa168b3e") - (revision "3")) + (let ((commit "a0b17d207badf462311b2eef7c065b884462cb7c") + (revision "4")) (package (name "emacs-general") (version (git-version "0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/noctuid/general.el.git") - (commit commit))) - (sha256 - (base32 - "1aqi5axkwfng6rm52sblf738c7rffp10sqs69dvkh2fv3ps8q28i")) - (file-name (git-file-name name version)))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/noctuid/general.el.git") + (commit commit))) + (sha256 + (base32 "0wn5rk3gkimdklip392mnjrmkymgrb7q9skifi03cbpjam1anzvv")) + (file-name (git-file-name name version)))) (build-system emacs-build-system) (native-inputs `(("emacs-buttercup" ,emacs-buttercup) @@ -18205,15 +18186,8 @@ advice to be recorded and displayed.") ("emacs-which-key" ,emacs-which-key) ("emacs-use-package" ,emacs-use-package))) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'fix-makefile - (lambda _ - (substitute* "Makefile" - (("cask exec ") "")) - #t))) - #:tests? #t - #:test-command '("make" "test"))) + `(#:tests? #t + #:test-command '("buttercup" "-L" "test/test-general.el"))) (home-page "https://github.com/noctuid/general.el") (synopsis "More convenient key definitions in emacs") (description "@code{general.el} provides a more convenient method for @@ -19015,7 +18989,7 @@ processes for Emacs") (define-public emacs-treemacs (package (name "emacs-treemacs") - (version "2.6") + (version "2.8") (source (origin (method git-fetch) (uri (git-reference @@ -19024,7 +18998,7 @@ processes for Emacs") (file-name (git-file-name name version)) (sha256 (base32 - "13gs8g05xj7np3i2q3bbxg6zgdiazzn1spxii4x0cyd4pg83c0i1")))) + "0m083g3pg0n4ymi1w0jx34awr7cqbm4r561adij9kklblxsz7sc2")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-dash" ,emacs-dash) @@ -19046,7 +19020,9 @@ processes for Emacs") (add-after 'unpack 'fix-makefile (lambda _ (substitute* "Makefile" - (("@\\$\\(CASK\\) exec ") "")) + (("@\\$\\(CASK\\) exec ") "") + ;; Guix does not need to prepare dependencies before testing. + (("test: prepare") "test:")) #t)) (add-after 'fix-makefile 'chdir-elisp ;; Elisp directory is not in root of the source. @@ -19859,40 +19835,22 @@ invoked.") (license license:gpl3+)))) (define-public emacs-web-server - (let ((commit "cafa5b7582c57252a0884b2c33da9b18fb678713") - (revision "1")) - (package - (name "emacs-web-server") - (version (git-version "0.1.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/eschulte/emacs-web-server/") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1c0lfqmbs5hvz3fh3c8wgp6ipwmxrwx9xj264bjpj3phixd5419y")))) - (build-system emacs-build-system) - (native-inputs - `(("curl" ,curl))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'set-shell - ;; Setting the SHELL environment variable is required for the tests - ;; to find sh. - (lambda _ - (setenv "SHELL" (which "sh")) - #t))) - #:tests? #t - #:test-command '("make" "check"))) - (home-page "https://github.com/eschulte/emacs-web-server/") - (synopsis "Web server with handlers in Emacs Lisp") - (description "This package supports HTTP GET and POST requests with + (package + (name "emacs-web-server") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "web-server-" version ".tar")) + (sha256 + (base32 "10lcsl4dg2yr9zjd99gq9jz150wvvh6r5y9pd88l8y9vz16f2lim")))) + (build-system emacs-build-system) + (home-page "https://github.com/eschulte/emacs-web-server/") + (synopsis "Web server with handlers in Emacs Lisp") + (description "This package supports HTTP GET and POST requests with url-encoded parameters, as well as web sockets.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-markdown-preview-mode (package @@ -20345,14 +20303,14 @@ SSH servers.") (define-public emacs-tramp (package (name "emacs-tramp") - (version "2.4.3.4") + (version "2.4.3.5") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "tramp-" version ".tar")) (sha256 - (base32 "01il42xb6s38qnb7bhn9d7gscc5p5y4da5a4dp1i1cyi823sfp8f")))) + (base32 "14djizi4ivwv4ad4nymday86jbh45w14wdhlm96743ffwr45dd2m")))) (build-system emacs-build-system) (arguments `(#:emacs ,emacs ;need D-Bus @@ -20469,15 +20427,14 @@ as: (define-public emacs-nhexl-mode (package (name "emacs-nhexl-mode") - (version "1.4") + (version "1.5") (source (origin (method url-fetch) - (uri (string-append - "https://elpa.gnu.org/packages/nhexl-mode-" - version ".el")) + (uri (string-append "https://elpa.gnu.org/packages/" + "nhexl-mode-" version ".el")) (sha256 - (base32 "1c2q4w6hkvc7z4026hiqdcsm2scd6q35x7b0dk80h8qicsbi14c8")))) + (base32 "0qvxfg7sv4iqyjxzaim6b4v9k5hav36qd4vkf9jwzw6p5fri8w8d")))) (build-system emacs-build-system) (home-page "https://elpa.gnu.org/packages/nhexl-mode.html") (synopsis "Minor mode to edit files via hex-dump format") @@ -20501,7 +20458,7 @@ moving text. In this minor mode, not only self-inserting keys overwrite existing text, but commands like `yank' and @command{kill-region} as well. @item It overrides @code{C-u} to use hexadecimal, so you can do @code{C-u a 4 C-f} to advance by #xa4 characters. -@end itemize\n") +@end itemize") (license license:gpl3+))) (define-public emacs-helm-wikipedia @@ -20803,21 +20760,24 @@ acting like notes that are made @emph{in} the document.") (license license:gpl3+)))) (define-public emacs-multi-term - (let ((commit "0804b11e52b960c80f5cd0712ee1e53ae70d83a4")) + ;; No upstream release. Extract version from main file. + (let ((commit "017c77c550115936860e2ea71b88e585371475d5") + (revision "0")) (package (name "emacs-multi-term") - (version "1.2") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/manateelazycat/multi-term.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0apvidmvb7rv05qjnjhax42ma8wrimik5vxx620dlbv17svz7iyf")))) + (version (git-version "1.5" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/manateelazycat/multi-term.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "043dqd8i8h6hbcg11rzprxin2yq5lb902zlrb7mxah44vyp8wrdi")))) (build-system emacs-build-system) - (inputs `(("zsh" ,zsh))) + (inputs + `(("zsh" ,zsh))) (home-page "https://github.com/manateelazycat/multi-term") (synopsis "Manage multiple terminal buffers in Emacs") (description @@ -20837,7 +20797,7 @@ it forcibly (define-public emacs-elpher (package (name "emacs-elpher") - (version "2.7.4") + (version "2.7.9") (source (origin (method git-fetch) @@ -20847,7 +20807,7 @@ it forcibly (file-name (git-file-name name version)) (sha256 (base32 - "13ba72sjfyg1xvam131iapzqdf9pkwpn67zlyydmm6bv9pxlr431")))) + "1vikzia87z5x3wx2qjihv0r2f29b7s9xkm6i1j0y646dwnzn6wzr")))) (build-system emacs-build-system) (native-inputs `(("texinfo" ,texinfo))) @@ -21052,30 +21012,25 @@ time.") federated microblogging social network.") (license license:gpl3+))) -;; The last release tarball is for version 0.6. We pick a commit close to -;; version 0.6.10, which doesn't have a release tarball. (define-public emacs-ebdb - (let ((commit "2a87f5ed2a53e3a4e91e8c88ba5afc49f5e945df") - (revision "0")) - (package - (name "emacs-ebdb") - (version (git-version "0.6.10" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/girzel/ebdb.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0fidy7z0c86dpqiss97sg5s92fd3fj4bdl8pqqdgg2m00jx4mrjz")))) - (build-system emacs-build-system) - (home-page "https://github.com/girzel/ebdb") - (synopsis "EIEIO port of BBDB, Emacs's contact-management package") - (description "EBDB is a contact management/addressbook package for -Emacs. It's a re-write of the Insidious Big Brother Database (BBDB) using -Emacs Lisp's (relatively new) EIEIO object oriented libraries.") - (license license:gpl3+)))) + (package + (name "emacs-ebdb") + (version "0.6.18") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "ebdb-" version ".tar")) + (sha256 + (base32 "0znbv3c7wdgak1f1zb051vg4r29fksqh53k1j77jfmqcvwkpz2mw")))) + (build-system emacs-build-system) + (home-page "https://github.com/girzel/ebdb") + (synopsis "EIEIO port of BBDB, Emacs's contact-management package") + (description + "EBDB is a contact management/addressbook package for Emacs. It's +a re-write of the Insidious Big Brother Database (BBDB) using Emacs +Lisp's (relatively new) EIEIO object oriented libraries.") + (license license:gpl3+))) (define-public emacs-refactor (package @@ -21413,14 +21368,14 @@ Emacs that integrate with major modes like Org-mode.") (define-public emacs-modus-operandi-theme (package (name "emacs-modus-operandi-theme") - (version "0.8.1") + (version "0.9.0") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "modus-operandi-theme-" version ".el")) (sha256 - (base32 "0i8s6blkhx53m1jk1bblqs7fwlbn57xkxxhsp9famcj5m0xyfimb")))) + (base32 "0wzwhzpw5g719xxz58v5bjqb8gdz1xzqwxslgm9cng4y3hwy3igh")))) (build-system emacs-build-system) (home-page "https://gitlab.com/protesilaos/modus-themes") (synopsis "Accessible light theme (WCAG AAA)") @@ -21434,14 +21389,14 @@ standard. This is the highest standard of its kind.") (define-public emacs-modus-vivendi-theme (package (name "emacs-modus-vivendi-theme") - (version "0.8.1") + (version "0.9.0") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "modus-vivendi-theme-" version ".el")) (sha256 - (base32 "121nlr5w58j4q47rh9xjjf9wzb97yl2m1n2l6g58ck4vnarwndl1")))) + (base32 "0f6cd93q9vrxfmgg6ff85ixcmq6acvrirb3kwgkf7qv16w3ipcir")))) (build-system emacs-build-system) (home-page "https://gitlab.com/protesilaos/modus-themes") (synopsis "Accessible dark theme (WCAG AAA)") @@ -21711,7 +21666,7 @@ Google guidelines.") (define-public emacs-helm-fish-completion (package (name "emacs-helm-fish-completion") - (version "0.3") + (version "0.4") (home-page "https://github.com/emacs-helm/helm-fish-completion") (source (origin @@ -21721,7 +21676,7 @@ Google guidelines.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1iv0hwr74hzgrvrr31nlnswvi87lvpg24rd1rhkr5kjicr2295fq")))) + (base32 "0mh10qq3r16hjrayrbns51gmjpjnmpzy4i05rwn14rf2icvhs6x8")))) (build-system emacs-build-system) (propagated-inputs `(("helm" ,emacs-helm) @@ -22432,6 +22387,29 @@ text, such a marking style might be used to show externally included text or example code.") (license license:gpl3+)))) +(define-public emacs-buffer-move + (package + (name "emacs-buffer-move") + (version "0.6.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/lukhas/buffer-move.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0xdks4jfqyhkh34y48iq3gz8swp0f526kwnaai5mhgvazvs4za8c")))) + (build-system emacs-build-system) + (home-page "https://github.com/lukhas/buffer-move") + (synopsis "Functions for moving Emacs' buffers around") + (description + "This package define functions for swapping buffers between windows +contained in the same frame. An alternate behavior is to have the current +window switch to the previous buffer instead of swapping with the other +window.") + (license license:gpl3+))) + (define-public emacs-company-ebdb (package (name "emacs-company-ebdb") @@ -22614,6 +22592,28 @@ two user-defined directories, as well as using more descriptive names for files and subdirectories when appropriate.") (license license:gpl3+))) +(define-public emacs-meson-mode + (package + (name "emacs-meson-mode") + (version "0.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/wentasah/meson-mode.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1720b3hpfqd989zrgcns51jbjrv4vzl9di9mccl55vkmkbqzfin0")))) + (build-system emacs-build-system) + (home-page "https://github.com/wentasah/meson-mode") + (synopsis "Major mode for Meson build system files") + (description + "This is an Emacs major mode for Meson build system files. Syntax +highlighting works reliably. Indentation works too, but there are probably +cases where it breaks.") + (license license:gpl3+))) + (define-public emacs-message-x ;; Use the latest commit, as there are no tagged releases. (let ((commit "5524de7bbfdd8749c110f48de5afb024d9f83133") @@ -22641,6 +22641,32 @@ sense in the @samp{To} and @samp{Cc} headers). When in the message body, this executes a different function (default: @code{indent-relative}).") (license license:gpl2+)))) +(define-public emacs-glsl-mode + ;; No tag, version grabbed from source .el file. + (let ((commit "b07112016436d9634cd4ef747f9af6b01366d136") + (revision "0")) + (package + (name "emacs-glsl-mode") + (version (git-version "2.4" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jimhourihan/glsl-mode") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0bav9ipfm0vy26n74ngsmjzc7fsyqz6xmriadzx55s44h8p5dn1s")))) + (build-system emacs-build-system) + (home-page "https://github.com/jimhourihan/glsl-mode") + (synopsis "Major mode for Open GLSL shader files") + (description + "This package provides a major mode for editing OpenGLSL grammar files, +usually files ending with @file{.vert}, @file{.frag}, @file{.glsl} or +@file{.geom}. It is based on C mode plus some features and pre-specified +fontifications.") + (license license:gpl3+)))) + (define-public emacs-gnus-harvest (let ((commit "feda071a87b799bd5d23cacde3ee71f0b166e75d") (revision "0")) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 7fad8a775b..9798ac370e 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -470,7 +470,7 @@ and Game Boy Color games.") (define-public sameboy (package (name "sameboy") - (version "0.12.3") + (version "0.13.1") (source (origin (method git-fetch) @@ -479,7 +479,7 @@ and Game Boy Color games.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0m5rv2x8qck1kr43xq186pp4kaiay7gd1x775n9qrljcd7z4x6fs")))) + (base32 "1il2bpbc3xyvvhbs2bgid64svjxcdl4dbqz6jy1azfmvzdp7jkrn")))) (build-system gnu-build-system) (native-inputs `(("rgbds" ,rgbds) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 2102f8d295..9d9c67b861 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2263,7 +2263,9 @@ specification can be downloaded at @url{http://3mf.io/specification/}.") ".src.tar.gz")) (sha256 (base32 - "0nbgk5q5pgnw53la0kccdcpz2f4xf6d6076rkn0q08z57hkc85ha")))) + "0nbgk5q5pgnw53la0kccdcpz2f4xf6d6076rkn0q08z57hkc85ha")) + (patches (search-patches + "openscad-parser-boost-1.72.patch")))) (build-system cmake-build-system) (inputs `(("boost" ,boost) diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 4d8c12ed3b..d852cbb275 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -292,7 +292,7 @@ Libraries with some extra bells and whistles.") (define-public enlightenment (package (name "enlightenment") - (version "0.24.0") + (version "0.24.1") (source (origin (method url-fetch) (uri @@ -300,7 +300,7 @@ Libraries with some extra bells and whistles.") "enlightenment/enlightenment-" version ".tar.xz")) (sha256 (base32 - "01053hxdmyjfb6gmz1pqmw0llrgc4356np515h5vsqcn59mhvfz7")) + "02aadl5fqvpmpjnisrc4aw7ffwyp1109y4k1wvmp33ciihbvdqmf")) (patches (search-patches "enlightenment-fix-setuid-path.patch")))) (build-system meson-build-system) (arguments diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 1f58917d0c..ca02a1e593 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -27,6 +27,7 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix build-system cmake) + #:use-module (guix build-system copy) #:use-module (guix build-system gnu) #:use-module (guix build-system linux-module) #:use-module (guix build-system trivial) @@ -53,7 +54,9 @@ #:use-module (gnu packages photo) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages readline) + #:use-module (gnu packages rsync) #:use-module (gnu packages sqlite) #:use-module (gnu packages tls) #:use-module (gnu packages valgrind) @@ -682,3 +685,100 @@ APFS.") originally developed for Solaris and is now maintained by the OpenZFS community.") (license license:cddl1.0))) + +(define-public mergerfs + (package + (name "mergerfs") + (version "2.29.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/trapexit/mergerfs/releases/download/" + version "/mergerfs-" version ".tar.gz")) + (sha256 + (base32 + "17gizw4vgbqqjd2ykkfpp276942jb5qclp0lkiwkmq1yjgyjqfmk")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; No tests exist. + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs outputs #:allow-other-keys) + (setenv "CC" "gcc") + ;; These were copied from the package libfuse. + (substitute* '("libfuse/lib/mount_util.c" "libfuse/util/mount_util.c") + (("/bin/(u?)mount" _ maybe-u) + (string-append (assoc-ref inputs "util-linux") + "/bin/" maybe-u "mount"))) + (substitute* '("libfuse/util/mount.mergerfs.c") + (("/bin/sh") + (which "sh"))) + ;; The Makefile does not allow overriding PREFIX via make variables. + (substitute* '("Makefile" "libfuse/Makefile") + (("= /usr/local") (string-append "= " (assoc-ref outputs "out"))) + ;; cannot chown as build user + (("chown root:root") "true")) + #t))))) + ;; mergerfs bundles a heavily modified copy of libfuse. + (inputs `(("util-linux" ,util-linux))) + (home-page "https://github.com/trapexit/mergerfs") + (synopsis "Featureful union filesystem") + (description "mergerfs is a union filesystem geared towards simplifying +storage and management of files across numerous commodity storage devices. It +is similar to mhddfs, unionfs, and aufs.") + (license (list + license:isc ; mergerfs + license:gpl2 license:lgpl2.0 ; Imported libfuse code. + )))) + +(define-public mergerfs-tools + (let ((commit "c926779d87458d103f3b674603bf97801ae2486d") + (revision "1")) + (package + (name "mergerfs-tools") + ;; No released version exists. + (version (git-version "0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/trapexit/mergerfs-tools.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "04hhwcib0xv4cf1mkj8zrp2aqpxkncml9iqg4m1mz6a5zhzsk0vm")))) + (build-system copy-build-system) + (inputs + `(("python" ,python) + ("python-xattr" ,python-xattr) + ("rsync" ,rsync))) + (arguments + '(#:install-plan + '(("src/" "bin/")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* (find-files "src" "^mergerfs\\.") + (("'rsync'") + (string-append "'" (assoc-ref inputs "rsync") "/bin/rsync'")) + (("'rm'") + (string-append "'" (assoc-ref inputs "coreutils") "/bin/rm'"))) + (substitute* "src/mergerfs.mktrash" + (("xattr") + (string-append (assoc-ref inputs "python-xattr") "/bin/xattr")) + (("mkdir") + (string-append (assoc-ref inputs "coreutils") "/bin/mkdir"))) + #t))))) + (synopsis "Tools to help manage data in a mergerfs pool") + (description "mergerfs-tools is a suite of programs that can audit +permissions and ownership of files and directories on a mergerfs volume, +duplicates files and directories across branches in its pool, find and remove +duplicate files, balance pool drives, consolidate files in a single mergerfs +directory onto a single drive and create FreeDesktop.org Trash specification +compatible directories.") + (home-page "https://github.com/trapexit/mergerfs-tools") + (license license:isc)))) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index f182057bb4..552c2abed3 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2017 Carlo Zancanaro <carlo@zancanaro.id.au> ;;; Copyright © 2017 Theodoros Foradis <theodoros@foradis.org> ;;; Copyright © 2017 Vasile Dumitrascu <va511e@yahoo.com> -;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2018 Adriano Peluso <catonano@gmail.com> ;;; Copyright © 2018, 2019, 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr> @@ -19,6 +19,7 @@ ;;; Copyright © 2020 Christopher Lemmer Webber <cwebber@dustycloud.org> ;;; Copyright © 2020 Tom Zander <tomz@freedommail.ch> ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com> +;;; Copyright © 2020 Vinicius Monego <monego@posteo.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -172,23 +173,22 @@ line client and a client based on Qt.") (define-public homebank (package (name "homebank") - (version "5.2.8") + (version "5.4.2") (source (origin (method url-fetch) (uri (string-append "http://homebank.free.fr/public/homebank-" version ".tar.gz")) (sha256 (base32 - "13ampiv68y30kc0p2560g3yz8whqpwnidfcnb9lndv93b9ca767y")))) + "0bkjvd819kw9cwmr3macggbg8yil3yc8v2za8pjrl6g746s89kn6")))) (build-system glib-or-gtk-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("intltool" ,intltool))) (inputs `(("gtk+" ,gtk+) + ("libofx" ,libofx) ("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 @@ -475,7 +475,7 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.") (define-public electron-cash (package (name "electron-cash") - (version "4.0.14") + (version "4.0.15") (source (origin (method git-fetch) @@ -484,7 +484,7 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1dp7cj1185h6xfz6jzh0iq58zvg3wq9hl96bkgxkf5h4ygni2vm6")))) + (base32 "0bvj64fdxpi0dbivhgv509kqq503zjp7r7xckl8q5c48j5h1zik2")))) (build-system python-build-system) (inputs `(("libevent" ,libevent) @@ -1546,6 +1546,8 @@ like Flowee the Hub, which Fulcrum connects to over RPC.") (lambda _ (substitute* "testing/CMakeLists.txt" (("test_api") "")) + (substitute* "testing/CMakeLists.txt" + (("add_subdirectory\\(api\\)") "")) #t)) (add-after 'configure 'set-build-info ;; Their genbuild.sh to generate a build.h fails in guix (no .git dir) . diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 14cf5b2dea..5964294202 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -34,6 +34,7 @@ ;;; Copyright © 2020 John Soo <jsoo1@asu.edu> ;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org> ;;; Copyright © 2020 Julien Lepiller <julien@lepiller.eu> +;;; Copyright © 2020 Zhu Zihao <all_but_last@163.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1067,7 +1068,7 @@ vector graphics.") (define-public font-tamzen (package (name "font-tamzen") - (version "1.11.4") + (version "1.11.5") (source (origin (method git-fetch) @@ -1076,8 +1077,7 @@ vector graphics.") (commit (string-append "Tamzen-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "17kgmvg6q32mqhx9g44hjvzv0si0mnpprga4z7na930g2zdd8846")))) + (base32 "00x5fipzqimglvshhqwycdhaqslbvn3rl06jnswhyxfvz16ymj7s")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) @@ -1247,6 +1247,34 @@ programming. Iosevka is completely generated from its source code.") (for-each make-file-writable (find-files "." ".*")) #t))))))) +(define-public font-sarasa-gothic + (package + (name "font-sarasa-gothic") + (version "0.12.6") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/be5invis/Sarasa-Gothic" + "/releases/download/v" version + "/sarasa-gothic-ttc-" version ".7z")) + (sha256 + (base32 "1g6k9d5lajchbhsh3g12fk5cgilyy6yw09fals9vc1f9wsqvac86")))) + (build-system font-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'unpack + (lambda* (#:key source #:allow-other-keys) + (mkdir "source") + (chdir "source") + (invoke "7z" "x" source)))))) + (native-inputs `(("p7zip" ,p7zip))) + (home-page "https://github.com/be5invis/Sarasa-Gothic") + (license license:silofl1.1) + (synopsis "Sarasa Gothic / 更纱黑体 / 更紗黑體 / 更紗ゴシック / 사라사 고딕") + (description + "Sarasa Gothic is a programming font based on Iosevka and Source Han Sans, +most CJK characters are same height, and double width as ASCII characters."))) + (define-public font-go (let ((commit "f03a046406d4d7fbfd4ed29f554da8f6114049fc") (revision "1")) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 0cfc410346..1a396e5276 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1084,7 +1084,7 @@ which speak the Mobile Interface Broadband Model (MBIM) protocol.") (define-public libqmi (package (name "libqmi") - (version "1.24.4") + (version "1.24.12") (source (origin (method url-fetch) (uri (string-append @@ -1092,7 +1092,7 @@ which speak the Mobile Interface Broadband Model (MBIM) protocol.") "libqmi-" version ".tar.xz")) (sha256 (base32 - "12licfsszr6qxpg9b2b04qm2glk8d42fcy32zr8jzwrgr7gbl5h3")))) + "0scb8a2kh0vnzx6kxanfy2s2slnfppvrwg202rxv30m8p2i92frd")))) (build-system gnu-build-system) (inputs `(("libgudev" ,libgudev))) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 2cd92ee300..ddfff4db8d 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -626,8 +626,9 @@ tired of cows, a variety of other ASCII-art messengers are available.") (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments - `(#:tests? #f ;; no check target - #:make-flags (list "CC=gcc") + `(#:tests? #f ; no check target + #:make-flags + (list ,(string-append "CC=" (cc-for-target))) #:phases (modify-phases %standard-phases (delete 'bootstrap) @@ -2053,7 +2054,7 @@ asynchronously and at a user-defined speed.") (define-public chess (package (name "chess") - (version "6.2.6") + (version "6.2.7") (source (origin (method url-fetch) @@ -2061,7 +2062,7 @@ asynchronously and at a user-defined speed.") ".tar.gz")) (sha256 (base32 - "0kxhdv01ia91v2y0cmzbll391ns2vbmn65jjrv37h4s1srszh5yn")))) + "0ilq4bfl0lwyzf11q7n2skydjhalfn3bgxhrp5hjxs5bc5d6fdp5")))) (build-system gnu-build-system) (home-page "https://www.gnu.org/software/chess/") (synopsis "Full chess implementation") @@ -6387,7 +6388,7 @@ original.") (define-public fortune-mod (package (name "fortune-mod") - (version "2.22.0") + (version "2.28.0") (source (origin (method git-fetch) @@ -6396,8 +6397,7 @@ original.") (commit (string-append "fortune-mod-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "17h2g35j8nzljsqaqhrsx75jakbmlqnsa150g2xw414fcbnjbyps")))) + (base32 "1ppzgnffgdcmq6fq4gmdq2ig10ip2bnfgklkb3i8nc6bdxm7pb89")))) (build-system cmake-build-system) (arguments `(#:test-target "check" diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 12ba6e939b..94dc6adf6f 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -88,6 +88,7 @@ (package (name "dbus") (version "1.12.16") + (replacement dbus/fixed) (source (origin (method url-fetch) (uri (string-append @@ -164,6 +165,15 @@ or through unencrypted TCP/IP suitable for use behind a firewall with shared NFS home directories.") (license license:gpl2+))) ; or Academic Free License 2.1 +;; Replacement package to fix CVE-2020-12049. +(define dbus/fixed + (package + (inherit dbus) + (source (origin + (inherit (package-source dbus)) + (patches (append (search-patches "dbus-CVE-2020-12049.patch") + (origin-patches (package-source dbus)))))))) + (define glib (package (name "glib") diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index feef08a5c0..d3150ec510 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -145,6 +145,7 @@ #:use-module (gnu packages pdf) #:use-module (gnu packages perl) #:use-module (gnu packages photo) + #:use-module (gnu packages php) #:use-module (gnu packages pkg-config) #:use-module (gnu packages polkit) #:use-module (gnu packages popt) @@ -182,6 +183,7 @@ #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (gnu artwork) + #:use-module ((guix build utils) #:select (modify-phases)) #:use-module (guix build-system cargo) #:use-module (guix build-system cmake) #:use-module (guix build-system glib-or-gtk) @@ -1499,6 +1501,63 @@ accessing key stores. It also provides the viewer for crypto files on the GNOME Desktop.") (license license:lgpl2.1+))) +(define-public gdl + (package + (name "gdl") + (version "3.34.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.gnome.org/GNOME/gdl.git") + (commit (string-append "GDL_" (string-map (match-lambda + (#\. #\_) + (c c)) + version))))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "154qcr0x6f68f4q526y87imv0rscmp34n47nk1pp82rsq52h2zna")))) + (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("glib" ,glib "bin") ; for glib-genmarshal, etc. + ("gnome-common" ,gnome-common) + ("gtk-doc" ,gtk-doc) + ("intltool" ,intltool) + ("pkg-config" ,pkg-config) + ("libtool" ,libtool) + ("which" ,which))) + (inputs + `(("libxml2" ,libxml2))) + (propagated-inputs + ;; The gdl-3.0.pc file 'Requires' GTK+. + `(("gtk+" ,gtk+))) + (home-page "https://gitlab.gnome.org/GNOME/gdl/") + (synopsis "GNOME docking library") + (description "This library provides docking features for gtk+.") + (license license:lgpl2.1+))) + +;;; A minimal variant used to break a cycle with Inkscape. +(define-public gdl-minimal + (package + (inherit gdl) + (name "gdl-minimal") + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-doc-generation + ;; XXX: There is no easy way to disable generating the + ;; documentation. + (lambda _ + (substitute* "configure.in" + (("GTK_DOC_CHECK.*") "") + (("docs/.*") "")) + (substitute* "Makefile.am" + (("gdl docs po") "gdl po")) + #t))))) + (native-inputs (alist-delete "gtk-doc" (package-native-inputs gdl))))) + (define-public libgnome-keyring (package (name "libgnome-keyring") @@ -1609,7 +1668,7 @@ forgotten when the session ends.") (define-public evince (package (name "evince") - (version "3.34.2") + (version "3.36.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/evince/" @@ -1617,7 +1676,7 @@ forgotten when the session ends.") "evince-" version ".tar.xz")) (sha256 (base32 - "05q6v9lssd21623mnj2p49clj9v9csw9kay7n4nklki025grbh1w")))) + "1msbb66lasikpfjpkwsvi7h22hqmk275850ilpdqwbd0b39vzf4c")))) (build-system glib-or-gtk-build-system) (arguments `(#:configure-flags '("--disable-nautilus" "--enable-introspection") @@ -1667,8 +1726,7 @@ forgotten when the session ends.") ("gobject-introspection" ,gobject-introspection) ("pkg-config" ,pkg-config) ("xmllint" ,libxml2))) - (home-page - "https://www.gnome.org/projects/evince/") + (home-page "https://www.gnome.org/projects/evince/") (synopsis "GNOME's document viewer") (description "Evince is a document viewer for multiple document formats. It @@ -3718,8 +3776,7 @@ libxml to ease remote use of the RESTful API.") ("pkg-config" ,pkg-config) ("python" ,python-wrapper) ("vala" ,vala) - ;; These are needed for the tests. - ;; FIXME: Add PHP once available. + ("php" ,php) ("curl" ,curl) ("gnutls" ,gnutls) ;for 'certtool' ("httpd" ,httpd))) @@ -3741,6 +3798,22 @@ libxml to ease remote use of the RESTful API.") and the GLib main loop, to integrate well with GNOME applications.") (license license:lgpl2.0+))) + +;;; A minimal version of libsoup used to prevent a cycle with Inkscape. +(define-public libsoup-minimal + (package + (inherit libsoup) + (name "libsoup-minimal") + (outputs (delete "doc" (package-outputs libsoup))) + (arguments + (substitute-keyword-arguments (package-arguments libsoup) + ((#:configure-flags configure-flags) + `(delete "-Dgtk_doc=true" ,configure-flags)) + ((#:phases phases) + `(modify-phases ,phases + (delete 'move-doc))))) + (native-inputs (alist-delete "gtk-doc" (package-native-inputs libsoup))))) + (define-public libsecret (package (name "libsecret") @@ -4051,7 +4124,7 @@ output devices.") (define-public geoclue (package (name "geoclue") - (version "2.5.5") + (version "2.5.6") (source (origin (method url-fetch) @@ -4059,8 +4132,7 @@ output devices.") (string-append "https://gitlab.freedesktop.org/geoclue/geoclue/-/archive/" version "/geoclue-" version ".tar.bz2")) (sha256 - (base32 - "1b7jqrsn4x7mxjxj8hvb2dl2cmhrpb9vibs4rvkkanky5nsx3sai")) + (base32 "0a833x5apzabxj80ywvsh8crd635vni2i9v9c1p095f6hvmfc45k")) (patches (search-patches "geoclue-config.patch")))) (build-system meson-build-system) (arguments @@ -4900,9 +4972,9 @@ discovery protocols.") (source (origin (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" + (uri (string-append "mirror://gnome/sources/totem/" (version-major+minor version) "/" - name "-" version ".tar.xz")) + "totem-" version ".tar.xz")) (sha256 (base32 "028sc6xbyi7rs884862d8f3di6zhcm0lhvlpc3r69ifzjsq9my3b")))) @@ -4915,7 +4987,6 @@ discovery protocols.") ("intltool" ,intltool) ("itstool" ,itstool) ("xmllint" ,libxml2) - ("python-pylint" ,python-pylint) ("xorg-server" ,xorg-server-for-tests))) (propagated-inputs `(("dconf" ,dconf))) @@ -6759,10 +6830,11 @@ Cisco's AnyConnect SSL VPN.") ;; libnm-gtk.pc refers to all these. `(("dbus-glib" ,dbus-glib) ("gtk+" ,gtk+) - ("network-manager" ,network-manager))) + ("network-manager" ,network-manager) + ;; nm-applet need by org.gnome.nm-applet.gschema.xml + ("libnma" ,libnma))) (inputs `(("gcr" ,gcr) - ("libnma" ,libnma) ("libgudev" ,libgudev) ("libnotify" ,libnotify) ("libsecret" ,libsecret) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 7bf9850e97..e00a09e989 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -556,8 +556,8 @@ from forcing GEXP-PROMISE." #:system system #:guile-for-build guile))) -(define %icecat-version "68.8.0-guix0-preview1") -(define %icecat-build-id "20200505000000") ;must be of the form YYYYMMDDhhmmss +(define %icecat-version "68.9.0-guix0-preview1") +(define %icecat-build-id "20200602000000") ;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' @@ -579,11 +579,11 @@ from forcing GEXP-PROMISE." "firefox-" upstream-firefox-version ".source.tar.xz")) (sha256 (base32 - "0hp8cc7xk6qj4q1s8n97qv9sdrypkzvphik96m5qv1r5s9k24nzs")))) + "01s41p985g6v544lf08zch3myssn5c76jwmkzzd68zd9m3hhalck")))) - (upstream-icecat-base-version "68.8.0") ; maybe older than base-version + (upstream-icecat-base-version "68.9.0") ; maybe older than base-version ;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version)) - (gnuzilla-commit "5358ff2963a6136f8acafdc598cad540231ad23e") + (gnuzilla-commit "d7acf32ad905a3382cb2353577a96d29aa58f589") (gnuzilla-source (origin (method git-fetch) @@ -595,7 +595,7 @@ from forcing GEXP-PROMISE." (string-take gnuzilla-commit 8))) (sha256 (base32 - "1bq0qzgkxz9q61g48bc05i0zx1z8k0pklxnmn54ch136aqgsyli4")))) + "0m49zm05m3n95diij2zyvpm74q66zxjhv9rp8zvaab0h7v2s09n9")))) (makeicecat-patch (local-file (search-patch "icecat-makeicecat.patch"))) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 8dd276562a..ae0b7c6779 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -15,7 +15,7 @@ ;;; Copyright @ 2018, 2019 Katherine Cox-Buday <cox.katherine.e@gmail.com> ;;; Copyright @ 2019 Giovanni Biscuolo <g@xelera.eu> ;;; Copyright @ 2019, 2020 Alex Griffin <a@ajgrf.com> -;;; Copyright © 2019 Arun Isaac <arunisaac@systemreboot.net> +;;; Copyright © 2019, 2020 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2020 Jack Hill <jackhill@jackhill.us> ;;; ;;; This file is part of GNU Guix. @@ -3214,7 +3214,7 @@ and aid debugging.") (define-public go-github-com-robfig-cron (package (name "go-github-com-robfig-cron") - (version "3.0.0") + (version "3.0.1") (source (origin (method git-fetch) @@ -3224,7 +3224,7 @@ and aid debugging.") (file-name (git-file-name name version)) (sha256 (base32 - "0bvq5gxkhyj21lq32nma23i4dpwp7bswnp2yks6372ilkcyisx2z")))) + "1agzbw2dfk2d1mpmddr85s5vh6ygm8kqrvfg87i9d2wqnlsnliqm")))) (build-system go-build-system) (arguments `(#:import-path "github.com/robfig/cron")) diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm index bb3ec345ba..38fa6bea47 100644 --- a/gnu/packages/gps.scm +++ b/gnu/packages/gps.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il> -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2020 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> @@ -182,7 +182,7 @@ coordinates as well as partial support for adjustments in global coordinate syst (define-public gpxsee (package (name "gpxsee") - (version "7.25") + (version "7.30") (source (origin (method git-fetch) (uri (git-reference @@ -191,7 +191,7 @@ coordinates as well as partial support for adjustments in global coordinate syst (file-name (git-file-name name version)) (sha256 (base32 - "0lml3hz2zxljl9j5wnh7bn9bj8k9v3wf6bk3g77x9nnarsmw0fcx")))) + "09gajwqc30r9a2sn972qdx3gx0gki9n0zafq986hn6zsr3z43mfs")))) (build-system gnu-build-system) (arguments '(#:phases diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 664e3fab45..b2bc63b9d0 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -21,6 +21,7 @@ ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net> ;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org> +;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -42,6 +43,7 @@ #:use-module (gnu packages algebra) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) + #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages bison) #:use-module (gnu packages boost) @@ -51,6 +53,7 @@ #:use-module (gnu packages flex) #:use-module (gnu packages fonts) #:use-module (gnu packages fontutils) + #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gl) #:use-module (gnu packages glib) @@ -61,11 +64,13 @@ #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) #:use-module (gnu packages jemalloc) + #:use-module (gnu packages maths) #:use-module (gnu packages multiprecision) #:use-module (gnu packages pdf) #:use-module (gnu packages perl) #:use-module (gnu packages photo) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages plotutils) #:use-module (gnu packages pth) #:use-module (gnu packages pulseaudio) ; libsndfile, libsamplerate #:use-module (gnu packages python) @@ -143,6 +148,61 @@ objects!") (home-page "http://www.fox-toolkit.org") (license license:lgpl2.1+))) +(define-public autotrace + (let ((commit "travis-20190624.59") + (version-base "0.40.0")) + (package + (name "autotrace") + (version (string-append version-base "-" + (if (string-prefix? "travis-" commit) + (string-drop commit 7) + commit))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/autotrace/autotrace.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0mk4yavy42dj0pszr1ggnggpvmzs4ds46caa9wr55cqsypn7bq6s")))) + (build-system gnu-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + ;; See: https://github.com/autotrace/autotrace/issues/27. + (add-after 'unpack 'include-spline.h-header + (lambda _ + (substitute* "Makefile.am" + ((".*src/types.h.*" all) + (string-append all "\t\tsrc/spline.h \\\n"))) + #t)) + ;; See: https://github.com/autotrace/autotrace/issues/26. + (replace 'check + (lambda _ + (invoke "sh" "tests/runtests.sh")))))) + (native-inputs + `(("which" ,which) + ("pkg-config" ,pkg-config) + ("autoconf" ,autoconf) + ("automake" ,automake) + ("intltool" ,intltool) + ("libtool" ,libtool) + ("gettext" ,gettext-minimal))) + (inputs + `(("glib" ,glib) + ("libjpeg" ,libjpeg-turbo) + ("libpng" ,libpng) + ("imagemagick" ,imagemagick) + ("pstoedit" ,pstoedit))) + (home-page "https://github.com/autotrace/autotrace") + (synopsis "Bitmap to vector graphics converter") + (description "AutoTrace is a utility for converting bitmap into vector +graphics. It can trace outlines and midlines, effect color reduction or +despeckling and has support for many input and output formats. It can be used +with the @command{autotrace} utility or as a C library, @code{libautotrace}.") + (license (list license:gpl2+ ;for the utility itself + license:lgpl2.1+))))) ;for use as a library + (define-public blender (package (name "blender") @@ -328,6 +388,120 @@ quaternions and other useful 2D and 3D math functions. Iex is an exception-handling library.") (license license:bsd-3))) +(define-public lib2geom + ;; Use the latest master commit, as the 1.0 release suffer build problems. + (let ((revision "1") + (commit "42e119d94934a9514c61571cfb6b4af503ece082")) + (package + (name "lib2geom") + (version (git-version "1.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/inkscape/lib2geom.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "195rs0kdbs8w62irha1nwy83bccz04wglmk578qrj1mky7fc4rjv")) + (patches + ;; Patch submitted to upstream (see: + ;; https://gitlab.com/inkscape/lib2geom/merge_requests/17). + (search-patches "lib2geom-enable-assertions.patch")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Fix py2geom module initialization (see: + ;; https://gitlab.com/inkscape/lib2geom/merge_requests/18). + (substitute* "src/py2geom/__init__.py" + (("_py2geom") "py2geom._py2geom")) + #t)))) + (build-system cmake-build-system) + (arguments + `(#:imported-modules ((guix build python-build-system) + ,@%cmake-build-system-modules) + #:configure-flags '("-D2GEOM_BUILD_SHARED=ON" + "-D2GEOM_BOOST_PYTHON=ON" + ;; Compiling the Cython bindings fail (see: + ;; https://gitlab.com/inkscape/lib2geom/issues/21). + "-D2GEOM_CYTHON_BINDINGS=OFF") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-python-lib-install-path + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((python-version (@ (guix build python-build-system) + python-version)) + (python-maj-min-version (python-version + (assoc-ref inputs "python"))) + (site-package (string-append + (assoc-ref outputs "out") + "/lib/python" python-maj-min-version + "/site-packages"))) + (substitute* '("src/cython/CMakeLists.txt" + "src/py2geom/CMakeLists.txt") + (("PYTHON_LIB_INSTALL \"[^\"]*\"") + (format #f "PYTHON_LIB_INSTALL ~s" site-package)))) + #t))))) + (native-inputs `(("python" ,python-wrapper) + ("googletest" ,googletest) + ("pkg-config" ,pkg-config))) + (inputs `(("cairo" ,cairo) + ("pycairo" ,python-pycairo) + ("double-conversion" ,double-conversion) + ("glib" ,glib) + ("gsl" ,gsl))) + (propagated-inputs + `(("boost" ,boost))) ;referred to in 2geom/pathvector.h. + (home-page "https://gitlab.com/inkscape/lib2geom/") + (synopsis "C++ 2D graphics library") + (description "2geom is a C++ library of mathematics for paths, curves, +and other geometric calculations. Designed for vector graphics, it tackles +Bézier curves, conic sections, paths, intersections, transformations, and +basic geometries.") + ;; Because the library is linked with the GNU Scientific Library + ;; (GPLv3+), the combined work must be licensed as GPLv3+ (see: + ;; https://gitlab.com/inkscape/inkscape/issues/784). + (license license:gpl3+)))) + +(define-public pstoedit + (package + (name "pstoedit") + (version "3.75") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/pstoedit/pstoedit/" + version "/pstoedit-" version ".tar.gz")) + (sha256 + (base32 + "1kv46g2wsvsvcngkavxl5gnw3l6g5xqnh4kmyx4b39a01d8xiddp")))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("ghostscript" ,ghostscript) + ("imagemagick" ,imagemagick) + ("libplot" ,plotutils) + ("libjpeg" ,libjpeg-turbo) + ("zlib" ,zlib))) ;else libp2edrvmagick++.so fails to link + (home-page "http://www.pstoedit.net/") + (synopsis "Converter for PostScript and PDF graphics") + (description "The @code{pstoedit} utility allows translating graphics +in the PostScript or PDF (Portable Document Format) formats to various +other vector formats such as: +@itemize +@item Tgif (.obj) +@item gnuplot +@item xfig (.fig) +@item Flattened PostScript +@item DXF, a CAD (Computed-Aided Design) exchange format +@item PIC (for troff/groff) +@item MetaPost (for usage with TeX/LaTeX) +@item LaTeX2e picture +@item GNU Metafile (for use with plotutils/libplot) +@item Any format supported by ImageMagick +@end itemize") + (license license:gpl2+))) + (define-public ogre (package (name "ogre") diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 350eb8445b..11d844b777 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -24,6 +24,7 @@ ;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org> ;;; Copyright © 2020 Brendan Tildesley <mail@brendan.scot> ;;; Copyright © 2020 Guillaume Le Vaillant <glv@posteo.net> +;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -649,6 +650,24 @@ is part of the GNOME accessibility project.") (license license:lgpl2.0+) (home-page "https://projects.gnome.org/accessibility/"))) +;;; A minimal variant used to prevent a cycle with Inkscape. +(define at-spi2-core-minimal + (package + (inherit at-spi2-core) + (name "at-spi2-core-minimal") + (outputs (delete "doc" (package-outputs at-spi2-core))) + (arguments + (substitute-keyword-arguments (package-arguments at-spi2-core) + ((#:configure-flags configure-flags) + `(delete "-Ddocs=true" ,configure-flags)) + ((#:phases phases) + `(modify-phases ,phases + (delete 'set-documentation-path) + (delete 'prepare-doc-directory) + (delete 'move-documentation))))) + (native-inputs + (alist-delete "gtk-doc" (package-native-inputs at-spi2-core))))) + (define-public at-spi2-atk (package (name "at-spi2-atk") @@ -671,6 +690,8 @@ is part of the GNOME accessibility project.") (setenv "DBUS_FATAL_WARNINGS" "0") (invoke "dbus-launch" "meson" "test")))))) (propagated-inputs + ;; TODO: Replace by at-spi2-core-minimal in the next staging window, or + ;; when Inkscape 0.92 is upgraded to 1.0 to avoid a cycle. `(("at-spi2-core" ,at-spi2-core))) ; required by atk-bridge-2.0.pc (inputs `(("atk" ,atk))) @@ -922,13 +943,13 @@ exceptions, macros, and a dynamic programming environment.") (version (string-append "2.18.1-" revision "." (string-take commit 7))) (source (origin - (method url-fetch) - (uri (string-append "https://gitlab.com/wingo/guile-rsvg/" - "repository/archive.tar.gz?ref=" - commit)) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/wingo/guile-rsvg/") + (commit commit))) (sha256 (base32 - "0vdzjx8l5nc4y2xjqs0g1rqn1zrwfsm30brh5gz00r1x41a2pvv2")) + "0cnbl40df2sbhpc32cma6j6w312rfvcgbxxqaixgf0ymim3fb248")) (patches (search-patches "guile-rsvg-pkgconfig.patch")) (modules '((guix build utils))) (snippet diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 6a8bf54bf8..0942e7cf74 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2890,8 +2890,8 @@ in C using Gtk+-3 and WebKitGtk.") (build-system gnu-build-system) (inputs `(("guile" ,guile-2.2) - ("guile-lib" ,guile-lib) - ("guile-readline" ,guile-readline))) + ("guile-lib" ,guile2.2-lib) + ("guile-readline" ,guile2.2-readline))) (propagated-inputs '()) (arguments `(#:configure-flags '("--without-examples") diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index ef1e19c6b8..c2dc7f6d5f 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -554,12 +554,25 @@ specification. These are the main features: ("guile" ,guile-3.0))) (inputs `(("guile" ,guile-3.0))))) -(define-public guile2.2-json - (package-for-guile-2.2 guile-json-3)) - (define-public guile3.0-json (deprecated-package "guile3.0-json" guile-json-3)) +(define-public guile-json-4 + (package + (inherit guile-json-3) + (name "guile-json") + (version "4.0.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://savannah/guile-json/guile-json-" + version ".tar.gz")) + (sha256 + (base32 + "0f25qak4i57c3x0q9hlrll911l57bb8nz57rjkd02mn2fc2h3730")))))) + +(define-public guile2.2-json + (package-for-guile-2.2 guile-json-4)) + ;; There are two guile-gdbm packages, one using the FFI and one with ;; direct C bindings, hence the verbose name. diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index 7ebe8f48eb..6a2e2c695b 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -43,7 +43,8 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix packages)) + #:use-module (guix packages) + #:use-module (guix utils)) ;; This is a module for packages related to physical hardware that don't (yet) ;; have a more specific home like gps.scm, security-token.scm, &c. @@ -203,7 +204,7 @@ Memtest86+ cannot currently be used on computers booted with UEFI.") (build-system gnu-build-system) (arguments `(#:make-flags - (list "CC=gcc") + (list ,(string-append "CC=" (cc-for-target))) #:phases (modify-phases %standard-phases (replace 'configure diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 24f1b1570c..393ee7e08b 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -25,6 +25,7 @@ ;;; Copyright © 2018 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org> ;;; Copyright © 2020 R Veera Kumar <vkor@vkten.in> +;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -74,6 +75,7 @@ #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages sphinx) + #:use-module (gnu packages textutils) #:use-module (gnu packages video) #:use-module (gnu packages web) #:use-module (gnu packages xml) @@ -856,6 +858,55 @@ compose, and analyze GIF images.") (home-page "http://giflib.sourceforge.net/") (license license:x11))) +(define-public libuemf + (package + (name "libuemf") + (version "0.2.7") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/libuemf/libUEMF-" + version ".tar.gz")) + (sha256 + (base32 + "05djs99vqf067x81xfpskh7a66y5x7b4mmjavybcy7swnm0swg7v")))) + (build-system cmake-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Overriding CMAKE_INSTALL_PREFIX is not a good idea. + (add-after 'unpack 'fix-CMakeLists.txt + (lambda _ + (substitute* "CMakeLists.txt" + ((".*SET\\(CMAKE_INSTALL_PREFIX.*") "")) + #t)) + (delete 'check) + (add-after 'install 'check + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (sources (string-append "../libUEMF-" ,version)) + (drm-tools (assoc-ref inputs "drm-tools")) + (extract (string-append drm-tools "/bin/extract")) + (execinput (string-append drm-tools "/bin/execinput"))) + (with-directory-excursion sources + (substitute* "testit.sh" + (("^EPATH=.*") + (format #f "EPATH=~a~%" bin)) + (("`which diff`") + "diff") + (("^EXTRACT=.*") + (format #f "EXTRACT=~a~%" extract)) + (("^EXECINPUT=.*") + (format #f "EXECINPUT=~a~%" execinput))) + (invoke "sh" "testit.sh")))))))) + (native-inputs `(("drm-tools" ,drm-tools))) ;for tests + (home-page "http://libuemf.sourceforge.net/") + (synopsis "Library for working with WFM, EMF and EMF+ images") + (description "The libUEMF library is a portable C99 implementation for +reading and writing @acronym{WFM, Windows Metafile}, @acronym{EMF, Enhanced +Metafile}, and @acronym{EMF+, Enhanced Metafile Plus} files.") + (license license:gpl2+))) + (define-public libungif (package (name "libungif") @@ -2016,62 +2067,56 @@ This package can be used to create @code{favicon.ico} files for web sites.") `(("libaom" ,libaom) ("dav1d" ,dav1d))) (synopsis "Encode and decode AVIF files") - (description "Libavif is a C implementation of the AV1 Image File Format -(AVIF). It can encode and decode all YUV formats and bit depths supported by -AOM, including with alpha.") + (description "Libavif is a C implementation of @acronym{AVIF, the AV1 Image +File Format}. It can encode and decode all YUV formats and bit depths supported +by AOM, including with alpha.") (home-page "https://github.com/AOMediaCodec/libavif") (license (list license:bsd-2 ; libavif itself license:expat)))) ; cJSON in the test suite (define-public mtpaint - (let ((commit "03b1b0938067b88d86d9f1b1088730f1934d411e") - (revision "1")) - (package - (name "mtpaint") - ;; The author neither releases tarballs nor uses git version tags. - ;; Instead, author puts version in git commit title. - (version (git-version "3.49.25" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/wjaguar/mtPaint/") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0izm2wvj26566fd8mqvypr7bmv7jnq8qhp4760m7z2wrc4y8pjn1")))) - (build-system gnu-build-system) - (native-inputs - `(("gettext" ,gettext-minimal) - ("pkg-config" ,pkg-config) - ("which" ,which))) - (inputs - `(("imlib2" ,imlib2) - ("libtiff" ,libtiff) - ("libpng" ,libpng) - ("libungif", libungif) - ("libjpeg", libjpeg-turbo) - ("libwebp" ,libwebp) - ("openjpeg" ,openjpeg) - ("lcms" ,lcms) - ("zlib", zlib) - ("glib" ,glib) - ;; support for gtk3 is in testing stage - ("gtk+" ,gtk+-2))) - (arguments - `(#:configure-flags - (list - ;; internationalized version - "intl" - ;; install man page - "man") - ;; no check target - #:tests? #f)) - (home-page "http://mtpaint.sourceforge.net/") - (synopsis "Create pixel art and manipulate digital images") - (description - "Mtpaint is a graphic editing program which uses the GTK+ toolkit. + (package + (name "mtpaint") + ;; The author neither releases tarballs nor uses git version tags. + ;; Instead, author puts version in git commit title. + (version "3.49.27") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/wjaguar/mtPaint") + (commit "26751cd0336414e2f16cbe25c9fe2702f34e7b5c"))) + (file-name (git-file-name name version)) + (sha256 + (base32 "12mzai9pqvyb342m21rjz0jxiy75q24sjw6ax147pzy8frzkgd54")))) + (build-system gnu-build-system) + (native-inputs + `(("gettext" ,gettext-minimal) + ("pkg-config" ,pkg-config) + ("which" ,which))) + (inputs + `(("imlib2" ,imlib2) + ("libtiff" ,libtiff) + ("libpng" ,libpng) + ("libungif", libungif) + ("libjpeg", libjpeg-turbo) + ("libwebp" ,libwebp) + ("openjpeg" ,openjpeg) + ("lcms" ,lcms) + ("zlib", zlib) + ("glib" ,glib) + ;; Support for gtk3 is in the testing stage. + ("gtk+" ,gtk+-2))) + (arguments + `(#:configure-flags + (list "intl" ; build internationalized version + "man") ; build the man page + #:tests? #f)) ; no test suite + (home-page "http://mtpaint.sourceforge.net/") + (synopsis "Create pixel art and manipulate digital images") + (description + "Mtpaint is a graphic editing program which uses the GTK+ toolkit. It can create and edit indexed palette or 24bit RGB images, offers basic painting and palette manipulation tools. It also handles JPEG, JPEG2000, GIF, TIFF, WEBP, BMP, PNG, XPM formats.") - (license license:gpl3+)))) + (license license:gpl3+))) diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm index 26d4642547..b0707d6eff 100644 --- a/gnu/packages/inkscape.scm +++ b/gnu/packages/inkscape.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016, 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017, 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,8 +31,13 @@ #:use-module (gnu packages aspell) #:use-module (gnu packages bdw-gc) #:use-module (gnu packages boost) + #:use-module (gnu packages check) #:use-module (gnu packages glib) + #:use-module (gnu packages gnome) + #:use-module (gnu packages graphics) #:use-module (gnu packages gtk) + #:use-module (gnu packages imagemagick) + #:use-module (gnu packages libreoffice) #:use-module (gnu packages maths) #:use-module (gnu packages perl) #:use-module (gnu packages pdf) @@ -107,3 +113,170 @@ apart is its use of Scalable Vector Graphics (SVG), an XML-based W3C standard, as the native format.") (license license:gpl2+))) + +(define-public inkscape-1.0 + (package + (name "inkscape") + (version "1.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://media.inkscape.org/dl/" + "resources/file/" + "inkscape-" version ".tar.xz")) + (sha256 + (base32 + "1fwl7yjkykqb86555k4fm24inhc40mrvxqwgl2v2vi9alv8j7hc9")) + (modules '((guix build utils) + (ice-9 format))) + (snippet + '(begin + (let-syntax + ;; XXX: The build system doesn't currently support using + ;; system libraries over bundled ones (see: + ;; https://gitlab.com/inkscape/inkscape/issues/876). + ((unbundle + (syntax-rules () + ((_ (name source-dir use-pkg-config?) ...) + (begin + ;; Delete bundled source directories. + (delete-file-recursively source-dir) ... + (substitute* '("src/CMakeLists.txt" + "src/3rdparty/CMakeLists.txt") + (((string-append ".*add_subdirectory\\(" + (basename source-dir) "\\).*")) + "") ...) + ;; Remove bundled entries from INKSCAPE_TARGET_LIBS. + (substitute* "src/CMakeLists.txt" + (((string-append name "_LIB.*")) "") ...) + ;; Register the external libraries, so that their + ;; headers are added to INKSCAPE_INCS_SYS and their + ;; shared libraries added to INKSCAPE_LIBS. + (if use-pkg-config? + (let* ((width (string-length "pkg_check_modules(")) + (indent (string-join (make-list width " ") ""))) + (substitute* "CMakeScripts/DefineDependsandFlags.cmake" + (("^pkg_check_modules\\(INKSCAPE_DEP REQUIRED.*" start) + (string-append start + (format #f "~a~a~%" indent name))))) + (substitute* "CMakeScripts/DefineDependsandFlags.cmake" + (("^find_package\\(Iconv REQUIRED\\).*" start) + (string-append (format #f " +find_path(~a_INCLUDE_DIR NAMES ~:*~a/~:*~a.h ~:*~a.h) +if(NOT ~:*~a_INCLUDE_DIR) + message(FATAL_ERROR \"~:*~a headers not found\") +else() + list(APPEND INKSCAPE_INCS_SYS ${~:*~a_INCLUDE_DIR}) +endif() + +find_library(~:*~a_LIB NAMES ~:*~a) +if(NOT ~:*~a_LIB) + message(FATAL_ERROR \"~:*~a library not found\") +else() + list(APPEND INKSCAPE_LIBS ~:*~a_LIB) +endif()~%~%" + name) + start)))) ... + ;; Fix the references to the headers of the + ;; unbundled libraries. + (substitute* (find-files "." "\\.h$|\\.cpp$") + (((string-append "#include (\"|<)3rdparty/" + (basename source-dir)) _ quote) + (string-append "#include " quote + (basename source-dir))) + ...)))))) + (unbundle ("2geom" "src/2geom" #t) + ;; libcroco cannot be unbundled as it is heavily + ;; modified (see: + ;; https://gitlab.com/inkscape/inkscape/issues/876#note_276114904). + ;; ("croco" "src/3rdparty/libcroco" #t) + ;; FIXME: Unbundle the following libraries once they + ;; have been packaged. + ;; ("cola" "src/3rdparty/adaptagrams/libcola") + ;; ("avoid" "src/3rdparty/adaptagrams/libavoid") + ;; ("vpsc" "src/3rdparty/adaptagrams/libvpsc") + ;; libuemf cannot be unbundled as it slightly modified + ;; from upstream (see: + ;; https://gitlab.com/inkscape/inkscape/issues/973). + ;; ("uemf" "src/3rdparty/libuemf" #f) + ;; FIXME: libdepixelize upstream is ancient and doesn't + ;; build with a recent lib2geom + ;; (see: https://bugs.launchpad.net/libdepixelize/+bug/1862458). + ;;("depixelize" "src/3rdparty/libdepixelize") + ("autotrace" "src/3rdparty/autotrace" #t))) + ;; Lift the requirement on the double-conversion library, as + ;; it is only needed by lib2geom, which is now unbundled. + (substitute* "CMakeScripts/DefineDependsandFlags.cmake" + ((".*find_package\\(DoubleConversion.*") "")) + #t)))) + (build-system cmake-build-system) + (arguments + `(#:tests? #t + #:test-target "check" ;otherwise some test binaries are missing + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-icon-cache-generator + (lambda _ + (substitute* "share/icons/application/CMakeLists.txt" + (("gtk-update-icon-cache") "true")) + #t)) + (add-after 'unpack 'disable-latex-export-tests + ;; FIXME: For some reason the test.pdf_tex file generated by the + ;; "--export-latex" lacks "some text" in its content when run in + ;; the build environment. Skip the related tests. + (lambda _ + (substitute* "testfiles/cli_tests/CMakeLists.txt" + (("add_cli_test\\(export-latex") + "message(TEST_DISABLED: export-latex")) + #t)) + (add-after 'unpack 'set-home + ;; Mute Inkscape warnings during tests. + (lambda _ + (setenv "HOME" (getcwd)) + (format #t "ARGS is set to: ~a" (getenv "ARGS")) + #t)) + ;; Move the check phase after the install phase, as when run in the + ;; tests, Inkscape relies on files that are not yet installed, such + ;; as the "share/inkscape/ui/units.xml" file. + (delete 'check) + (add-after 'install 'check + (assoc-ref %standard-phases 'check))))) + (inputs + `(("aspell" ,aspell) + ("autotrace" ,autotrace) + ("gdl" ,gdl-minimal) + ("gtkmm" ,gtkmm) + ("gtk" ,gtk+) + ("gtkspell3" ,gtkspell3) + ("gsl" ,gsl) + ("poppler" ,poppler) + ("lib2geom" ,lib2geom) + ("libjpeg" ,libjpeg-turbo) + ("libpng" ,libpng) + ("libxml2" ,libxml2) + ("libxslt" ,libxslt) + ("libgc" ,libgc) + ("libsoup" ,libsoup-minimal) + ("libcdr" ,libcdr) + ("libvisio" ,libvisio) + ("libwpd" ,libwpd) + ("libwpg" ,libwpg) + ("freetype" ,freetype) + ("popt" ,popt) + ("potrace" ,potrace) + ("lcms" ,lcms) + ("boost" ,boost))) + (native-inputs + `(("imagemagick" ,imagemagick) ;for tests + ("intltool" ,intltool) + ("glib" ,glib "bin") + ("googletest" ,googletest) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper))) + (home-page "https://inkscape.org/") + (synopsis "Vector graphics editor") + (description "Inkscape is a vector graphics editor. What sets Inkscape +apart is its use of Scalable Vector Graphics (SVG), an XML-based W3C standard, +as the native format.") + (license license:gpl3+))) ;see the file COPYING diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index b12c3ca95c..43f0f37b91 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2486,10 +2486,10 @@ new Date();")) (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")))) + (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")) (modules '((guix build utils))) (snippet @@ -2499,7 +2499,8 @@ new Date();")) #t)) (sha256 (base32 - "0yg38mwpivswccv9n96k06x3iv82i4px1a9xg9l8dswzwmfj259f")))) + "0yg38mwpivswccv9n96k06x3iv82i4px1a9xg9l8dswzwmfj259f")) + (patches (search-patches "java-openjfx-build-jdk_version.patch")))) (build-system ant-build-system) (arguments `(#:jar-name "java-openjfx.jar" diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index f2b794df52..7aa7205a0a 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1563,11 +1563,13 @@ integrated it into your application's other widgets.") `(("extra-cmake-modules" ,extra-cmake-modules) ("xorg-server" ,xorg-server))) ; for the tests (inputs - `(("kcodecs" ,kcodecs) + `(("qtbase" ,qtbase))) + (propagated-inputs + `(;; As required by KF5ContactsConfig.cmake. + ("kcodecs" ,kcodecs) ("kconfig" ,kconfig) ("kcoreaddons" ,kcoreaddons) - ("ki18n" ,ki18n) - ("qtbase" ,qtbase))) + ("ki18n" ,ki18n))) (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index cb24f0efbf..569ac43d91 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017, 2019, 2020 Hartmut Goebel <h.goebel@crazy-compilers.com> +;;; Copyright © 2020 Marius Bakke <marius@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -308,7 +309,10 @@ wrapping notes into KMime::Message objects.") (base32 "16qzs2cs4nxwrpwcdgwry95qn6wmg8s1p4w3qajx1ahkgwmsh11s")))) (build-system qt-build-system) (native-inputs - `(("extra-cmake-modules" ,extra-cmake-modules))) + `(("extra-cmake-modules" ,extra-cmake-modules) + + ;; For tests. + ("dbus" ,dbus))) (inputs `(("akonadi" ,akonadi) ("akonadi-mime" ,akonadi-mime) @@ -327,7 +331,19 @@ wrapping notes into KMime::Message objects.") ("qtbase" ,qtbase) ("xapian" ,xapian))) (arguments - `(#:tests? #f)) ;; TODO: needs dbus + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'disable-failing-test + (lambda _ + ;; FIXME: This test fails because it fails to establish + ;; a socket connection, seemingly due to failure during + ;; DBus communication. + (substitute* "agent/autotests/CMakeLists.txt" + ((".*schedulertest\\.cpp.*") + "")) + #t)) + (replace 'check + (lambda _ + (invoke "dbus-launch" "ctest")))))) (home-page "https://api.kde.org/stable/kdepimlibs-apidocs/akonadi/html/") (synopsis "Akonadi search library") (description "This package provides a library used to search in the @@ -1579,6 +1595,37 @@ and exchanging calendar data, vCalendar and iCalendar.") (license ;; GPL for programs, LGPL for libraries, FDL for documentation (list license:gpl2+ license:lgpl2.0+ license:fdl1.2+)))) +(define-public kpeoplevcard + (package + (name "kpeoplevcard") + (version "0.1") + (source (origin + (method url-fetch) + (uri (string-append "https://download.kde.org/stable/kpeoplevcard/" + version "/kpeoplevcard-" version ".tar.xz")) + (sha256 + (base32 + "1hv3fq5k0pps1wdvq9r1zjnr0nxf8qc3vwsnzh9jpvdy79ddzrcd")))) + (build-system qt-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (replace 'check-setup + (lambda _ + (setenv "HOME" "/tmp") + #t))))) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("kcontacts" ,kcontacts) + ("kpeople" ,kpeople) + ("qtbase" ,qtbase))) + (home-page "https://invent.kde.org/pim/kpeoplevcard") + (synopsis "Expose vCard contacts to KPeople") + (description + "This plugins adds support for vCard (also known as @acronym{VCF, +Virtual Contact File}) files to the KPeople contact management library.") + (license license:lgpl2.1+))) + (define-public kpimcommon (package (name "kpimcommon") diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index c52feb5725..c978504793 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -209,7 +209,7 @@ projects.") (define-public kdevelop (package (name "kdevelop") - (version "5.5.1") + (version "5.5.2") (source (origin (method url-fetch) @@ -217,7 +217,7 @@ projects.") "/" version "/src/kdevelop-" version ".tar.xz")) (sha256 - (base32 "18hxwkdbfw0qs3p19jv6d8wwwdzb9m087891i8w2bzkn21fd5pmy")))) + (base32 "1nkl3z1n1l7ly2zvmbx2sdhx5q72wcvpwhzsz3qgw1474qd9i3i2")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index a3a6ea5d1a..34579a776c 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 John Darrington <jmd@gnu.org> ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr> -;;; Copyright © 2016, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> @@ -12,6 +12,7 @@ ;;; Copyright © 2018, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2018 Jonathan Brielmaier <jonathan.brielmaier@web.de> ;;; Copyright © 2019 Chris Marusich <cmmarusich@gmail.com> +;;; Copyright © 2020 Marcin Karpezo <sirmacik@wioo.waw.pl> ;;; ;;; This file is part of GNU Guix. ;;; @@ -920,6 +921,56 @@ library.") "toutesvariantes" (synopsis "Hunspell dictionary for all variants of French")) +(define-public hunspell-dict-pl + (package + (name "hunspell-dict-pl") + (version "20200327") + (source + (origin + (method url-fetch) + ;; Since creators of dictionary host only the latest daily release, + ;; we're using version mirrored by Arch Linux, which seems good + ;; enough. They're mirroring hunspell-pl releases since 2011. + (uri (string-append "https://sources.archlinux.org/other/community/" + "hunspell-pl/sjp-myspell-pl-" + version ".zip")) + (sha256 (base32 + "14mzf8glxkp2775dcqisb1zv6r8ncm3bvzl46q352rwyl2dg1c59")))) + + (build-system trivial-build-system) + (native-inputs `(("unzip" ,unzip))) + (arguments + `(#:modules ((guix build utils)) + #:builder (begin + (use-modules (guix build utils) + (srfi srfi-26)) + + (let* ((out (assoc-ref %outputs "out")) + (hunspell (string-append out "/share/hunspell")) + (myspell (string-append out "/share/myspell")) + (doc (string-append out "/share/doc/" + ,name)) + (unzip (string-append (assoc-ref %build-inputs "unzip") + "/bin/unzip"))) + (invoke unzip "-j" "-o" (assoc-ref %build-inputs "source")) + (invoke unzip "-j" "-o" "pl_PL.zip") + (for-each (cut install-file <> hunspell) + (find-files "." + ,(string-append "pl_PL" + "\\.(dic|aff)$"))) + (mkdir-p myspell) + (symlink hunspell (string-append myspell "/dicts")) + (for-each (cut install-file <> doc) + (find-files "." "\\.(txt|org|md)$")) + #t)))) + (synopsis "Hunspell dictionary for Polish") + (description + "This package provides a dictionary for the Hunspell spell-checking +library.") + (home-page "https://sjp.pl/slownik/ort/") + (license + (list license:gpl2 license:mpl1.1 license:cc-by4.0 license:lgpl2.1 license:asl2.0)))) + (define-public hyphen (package (name "hyphen") @@ -998,7 +1049,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") (define-public libreoffice (package (name "libreoffice") - (version "6.4.2.2") + (version "6.4.4.2") (source (origin (method url-fetch) @@ -1009,7 +1060,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") (patches (search-patches "libreoffice-poppler-compat.patch")) (sha256 (base32 - "06acm41q9nda8r30b13cn9zafsw1gszjdphh6lx90s09d2sf7f23")))) + "0y6026h374787yy2f3as1q7clxmgywsfdrj62kw3577wvybqaf2l")))) (build-system glib-or-gtk-build-system) (native-inputs `(("bison" ,bison) @@ -1205,7 +1256,6 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") ;; patching the build scripts to work with GCC5. Try enabling this ;; when our default compiler is >=GCC 6. "--disable-pdfium" - "--disable-gtk" ; disable use of GTK+ 2 "--without-doxygen" "--enable-build-opensymbol"))) (home-page "https://www.libreoffice.org/") diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index a2893b2a4c..0435790845 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -370,50 +370,50 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (sha256 hash))) -(define-public linux-libre-5.6-version "5.6.15") +(define-public linux-libre-5.6-version "5.6.16") (define-public linux-libre-5.6-pristine-source (let ((version linux-libre-5.6-version) - (hash (base32 "0kh34f9vdfsi9g83fa1i1926djyzfi466w02c4y4d46ljf9pkav5"))) + (hash (base32 "1xvwk6yxi5nhiwhskpmr89a31286mw9hpm0y3l3i5ydswx6lnl15"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.6))) -(define-public linux-libre-5.4-version "5.4.43") +(define-public linux-libre-5.4-version "5.4.44") (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "0i07g72138xdf1l8x593jndq0waf3fx7plz3m6n5f9fl885bjrr6"))) + (hash (base32 "0fc4nsv1zwlknvfv1bzkjlq2vlx28wfl09hg2p7r8cn7a77bphlp"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.125") +(define-public linux-libre-4.19-version "4.19.126") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "0zmxs6q2rgssvsh76xq9xgcax7bps19x2448d1q1fj9pzc7g8hwq"))) + (hash (base32 "129ziwvk3f4xh8jvnq2krajc0bnrl2zxffqsiz63j7p3vc57wakf"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.182") +(define-public linux-libre-4.14-version "4.14.183") (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "142v7qnfska86jqzilwq00kxdrq08iaaaw7f47xp9bnhb8fiy7b7"))) + (hash (base32 "11c0vd2pwplm8wafich4zg2mnp10vvnap987c5jh96w1avpsyra2"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.225") +(define-public linux-libre-4.9-version "4.9.226") (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "1s63aymgsc4lsysy9d972ps9cyrf6bncyy5wcpv5a3wbaj678iz5"))) + (hash (base32 "1jj5ydz5cy87z7hrv54bkyl9739lpzja8580ngjhrip5iwb8q2j6"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.225") +(define-public linux-libre-4.4-version "4.4.226") (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "0pn66hf9yrjg15skq1inscr5m0slvgsd2qm8rg5id70llrb4jis9"))) + (hash (base32 "1dwvm81i62b06jsl38spfn719zrsbwq5z8viwckrpw4ma4w9k0j1"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) @@ -1789,7 +1789,7 @@ Zerofree requires the file system to be unmounted or mounted read-only.") (define-public strace (package (name "strace") - (version "5.5") + (version "5.7") (home-page "https://strace.io") (source (origin (method url-fetch) @@ -1797,7 +1797,7 @@ Zerofree requires the file system to be unmounted or mounted read-only.") "/strace-" version ".tar.xz")) (sha256 (base32 - "1zrhpzjlgfwfl8dd53llswmmharm5rbi0zch7lln5sjris69an4z")))) + "1n6cfz3i2krkyvxpdp3kmxhf7sy5xp0danzaiirbk5fdkfgvb15j")))) (build-system gnu-build-system) (arguments '(#:phases @@ -1806,6 +1806,12 @@ Zerofree requires the file system to be unmounted or mounted read-only.") (lambda _ (substitute* "strace.c" (("/bin/sh") (which "sh"))) + #t)) + (add-after 'unpack 'disable-failing-tests + (lambda _ + ;; XXX These hang forever even if the test time-out is extended. + (substitute* "tests/Makefile.in" + (("^\tstrace-DD?D?\\.test \\\\.*") "")) #t))) ;; Don't fail if the architecture doesn't support different personalities. #:configure-flags '("--enable-mpers=check") @@ -2073,7 +2079,7 @@ that the Ethernet protocol is much simpler than the IP protocol.") (define-public iproute (package (name "iproute2") - (version "5.5.0") + (version "5.7.0") (source (origin (method url-fetch) (uri (string-append @@ -2081,7 +2087,7 @@ that the Ethernet protocol is much simpler than the IP protocol.") version ".tar.xz")) (sha256 (base32 - "0ywg70f98wgfai35jl47xzpjp45a6n7crja4vc8ql85cbi1l7ids")))) + "088gs56iqhdlpw1iqjwrss4zxd4zbl2wl8s2implrrdajjxcfpbj")))) (build-system gnu-build-system) (arguments `( ;; There is a test suite, but it wants network namespaces and sudo. @@ -2151,7 +2157,7 @@ inadequately in modern network environments, and both should be deprecated.") (home-page "http://net-tools.sourceforge.net/") (build-system gnu-build-system) (arguments - '(#:modules ((guix build gnu-build-system) + `(#:modules ((guix build gnu-build-system) (guix build utils) (srfi srfi-1) (srfi srfi-26)) @@ -2191,7 +2197,7 @@ inadequately in modern network environments, and both should be deprecated.") #:tests? #f ; no test suite #:make-flags (let ((out (assoc-ref %outputs "out"))) - (list "CC=gcc" + (list ,(string-append "CC=" (cc-for-target)) (string-append "BASEDIR=" out) (string-append "INSTALLNLSDIR=" out "/share/locale") (string-append "mandir=/share/man"))))) @@ -2415,12 +2421,11 @@ configuration and monitoring interfaces.") (arguments `(#:make-flags (let* ((target ,(%current-target-system)) - (gcc (if target (string-append target "-gcc") "gcc")) (pkg-config (if target (string-append target "-pkg-config") "pkg-config"))) (list - (string-append "CC=" gcc) + ,(string-append "CC=" (cc-for-target)) (string-append "PKG_CONFIG=" (assoc-ref %build-inputs "pkg-config") "/bin/" pkg-config) @@ -3016,7 +3021,7 @@ from the module-init-tools project.") (install-file "contrib/notify_all_users.py" contrib) #t)))) #:make-flags (let* ((prefix (assoc-ref %outputs "out"))) - (list "CC=gcc" + (list ,(string-append "CC=" (cc-for-target)) (string-append "VERSION=v" ,version) (string-append "PREFIX=" prefix) (string-append "SYSCONFDIR=" prefix "/etc"))) @@ -3604,10 +3609,10 @@ create a firmware image suitable for the Linux kernel, and more.") "000pvg995qy1b15ks59gd0klri55hb33kqpg5czy84hw1pbdgm0l")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; no 'check' target + `(#:tests? #f ; no 'check' target #:make-flags (list (string-append "prefix=" %output) - "CC=gcc") - ;; no configure script + ,(string-append "CC=" (cc-for-target))) + ;; No configure script. #:phases (modify-phases %standard-phases (delete 'configure)))) (inputs `(("perl" ,perl))) @@ -3830,10 +3835,13 @@ isolation or root privileges.") "03z1qm8zbgpxagk3994lvp24yqsshjibkwg05v9p3q1w7y48xrws")))) (build-system gnu-build-system) (arguments - `(#:make-flags (let ((out (assoc-ref %outputs "out"))) - (list (string-append "binprefix=" out) - (string-append "manprefix=" out) - "CC=gcc")) + `(#:make-flags + (let ((out (assoc-ref %outputs "out"))) + (list (string-append "binprefix=" out) + (string-append "manprefix=" out) + ,(string-append "CC=" (cc-for-target)) + ;; Let Guix strip the binaries and not break cross-compilation. + "STRIP=true")) #:phases (modify-phases %standard-phases (delete 'configure)) ; no configure script @@ -3868,15 +3876,17 @@ Translation (@dfn{SAT}) are also supported.") (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments - `(#:make-flags (list "CC=gcc") + `(#:make-flags + (list ,(string-append "CC=" (cc-for-target))) #:phases (modify-phases %standard-phases - (delete 'configure) ; No ./configure script + (delete 'configure) ; no ./configure script (replace 'install (lambda _ (invoke "make" "install-spec" "PREFIX=" (string-append "DESTDIR=" %output))))) - #:tests? #f)) ; The tests require sysfs, which is not accessible from - ; the build environment + ;; The tests require sysfs, which is not accessible from from the build + ;; environment + #:tests? #f)) (synopsis "NVM-Express user space tooling for Linux") (description "Nvme-cli is a utility to provide standards compliant tooling for NVM-Express drives. It was made specifically for Linux as it relies on the @@ -4116,7 +4126,7 @@ MPEG-2 and audio over Linux IEEE 1394.") `(("udev" ,eudev))) (arguments `(#:make-flags (let ((out (assoc-ref %outputs "out"))) - (list "CC=gcc" + (list ,(string-append "CC=" (cc-for-target)) "INSTALL=install" "CHECK_RUN_DIR=0" ;; TODO: tell it where to find 'sendmail' @@ -4335,12 +4345,13 @@ applications.") (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments - '(#:make-flags - (list "CC=gcc" (string-append "prefix=" %output)) - #:tests? #f ; no tests + `(#:make-flags + (list ,(string-append "CC=" (cc-for-target)) + (string-append "prefix=" %output)) + #:tests? #f ; no tests #:phases (modify-phases %standard-phases - (delete 'configure) ; no configure script + (delete 'configure) ; no configure script (add-after 'unpack 'fix-gnuplot-path (lambda* (#:key inputs #:allow-other-keys) (let ((gnuplot (assoc-ref inputs "gnuplot"))) @@ -5469,14 +5480,14 @@ the default @code{nsswitch} and the experimental @code{umich_ldap}.") (define-public mcelog (package (name "mcelog") - (version "168") + (version "170") (source (origin (method url-fetch) (uri (string-append "https://git.kernel.org/cgit/utils/cpu/mce/" "mcelog.git/snapshot/v" version ".tar.gz")) (sha256 (base32 - "1c4faayg1gcm3002b2fdrfnv76z92mvfzccvx8w9crjp0d17sp24")) + "1m11v1y7cvpm7hwsghj23z77ps1w5jzn8000iwiyxpb939h2km5l")) (file-name (string-append name "-" version ".tar.gz")) (modules '((guix build utils))) (snippet @@ -5493,7 +5504,8 @@ the default @code{nsswitch} and the experimental @code{umich_ldap}.") #:make-flags (let ((out (assoc-ref %outputs "out"))) (list "CC=gcc" (string-append "prefix=" out) - (string-append "DOCDIR=" out "/share/doc/mcelog") + (string-append "DOCDIR=" out "/share/doc/" + ,name "-" ,version) "etcprefix=$(DOCDIR)/examples")) ;; The tests will only run as root on certain supported CPU models. #:tests? #f)) @@ -5501,10 +5513,10 @@ the default @code{nsswitch} and the experimental @code{umich_ldap}.") (home-page "https://mcelog.org/") (synopsis "Machine check monitor for x86 Linux systems") (description - "The mcelog daemon is required by the Linux kernel to log memory, I/O, CPU, -and other hardware errors on x86 systems. It can also perform user-defined -tasks, such as bringing bad pages off-line, when configurable error thresholds -are exceeded.") + "The mcelog daemon logs memory, I/O, CPU, and other hardware errors on x86 +systems running the kernel Linux. It can also perform user-defined tasks, such +as bringing bad pages off-line, when configurable error thresholds are +exceeded.") (license license:gpl2))) (define-public mtd-utils @@ -6496,10 +6508,10 @@ interface to this kernel feature.") (base32 "0aijyxrqh01x0s80yr4cgxgd001iiqqph65pxvby7f0wz8lnxnqj")))) (build-system gnu-build-system) (arguments - '(#:tests? #f ; tests ask to be run as root + `(#:tests? #f ; tests ask to be run as root #:make-flags (let ((out (assoc-ref %outputs "out"))) (list (string-append "DESTDIR=" out) - "CC=gcc")) + ,(string-append "CC=" (cc-for-target)))) #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-paths diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index b78eec7f4d..e92fd0ba1d 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -11555,3 +11555,375 @@ accompaniment to the standard ANSI facilities.") (define-public cl-osicat (sbcl-package->cl-source-package sbcl-osicat)) + +(define-public sbcl-quantile-estimator + (package + (name "sbcl-quantile-estimator") + (version "0.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/deadtrickster/quantile-estimator.cl") + (commit "84d0ea405d793f5e808c68c4ddaf25417b0ff8e5"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0rlswkf0siaabsvvch3dgxmg45fw5w8pd9b7ri2w7a298aya52z9")))) + (build-system asdf-build-system/sbcl) + (arguments + '(#:asd-system-name "quantile-estimator")) + (inputs + `(("alexandria" ,sbcl-alexandria))) + (home-page "https://github.com/deadtrickster/quantile-estimator.cl") + (synopsis + "Effective computation of biased quantiles over data streams") + (description + "Common Lisp implementation of Graham Cormode and S. +Muthukrishnan's Effective Computation of Biased Quantiles over Data +Streams in ICDE’05.") + (license license:expat))) + +(define-public cl-quantile-estimator + (sbcl-package->cl-source-package sbcl-quantile-estimator)) + +(define-public ecl-quantile-estimator + (sbcl-package->ecl-package sbcl-quantile-estimator)) + +(define-public sbcl-prometheus + (package + (name "sbcl-prometheus") + (version "0.4.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/deadtrickster/prometheus.cl.git") + (commit "7352b92296996ff383503e19bdd3bcea30409a15"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0fzczls2kfgdx18pja4lqxjrz72i583185d8nq0pb3s331hhzh0z")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("bordeaux-threads" ,sbcl-bordeaux-threads) + ("cl-ppcre" ,sbcl-cl-ppcre) + ("local-time" ,sbcl-local-time) + ("quantile-estimator" ,sbcl-quantile-estimator))) + (home-page "https://github.com/deadtrickster/prometheus.cl") + (synopsis "Prometheus.io Common Lisp client") + (description "Prometheus.io Common Lisp client.") + (license license:expat))) + +(define-public cl-prometheus + (sbcl-package->cl-source-package sbcl-prometheus)) + +(define-public ecl-prometheus + (sbcl-package->ecl-package sbcl-prometheus)) + +(define-public sbcl-prometheus.collectors.sbcl + (package + (inherit sbcl-prometheus) + (name "sbcl-prometheus.collectors.sbcl") + (inputs `(("prometheus" ,sbcl-prometheus))) + (synopsis "Prometheus collector for SBCL metrics") + (description "Prometheus collector for SBCL metrics."))) + +(define-public cl-prometheus.collectors.sbcl + (sbcl-package->cl-source-package sbcl-prometheus.collectors.sbcl)) + +(define-public sbcl-prometheus.collectors.process + (package + (inherit sbcl-prometheus) + (name "sbcl-prometheus.collectors.process") + (inputs + `(("cffi" ,sbcl-cffi) + ("cffi-grovel" ,sbcl-cffi-grovel) + ("cl-fad" ,sbcl-cl-fad) + ("prometheus" ,sbcl-prometheus) + ("split-sequence" ,sbcl-split-sequence))) + (synopsis "Prometheus collector for process metrics") + (description "Prometheus collector for process metrics."))) + +(define-public cl-prometheus.collectors.process + (sbcl-package->cl-source-package sbcl-prometheus.collectors.process)) + +(define-public ecl-prometheus.collectors.process + (sbcl-package->ecl-package sbcl-prometheus.collectors.process)) + +(define-public sbcl-prometheus.formats.text + (package + (inherit sbcl-prometheus) + (name "sbcl-prometheus.formats.text") + (inputs + `(("alexandria" ,sbcl-alexandria) + ("prometheus" ,sbcl-prometheus))) + (synopsis "Prometheus client text format") + (description "Prometheus client text format."))) + +(define-public cl-prometheus.formats.text + (sbcl-package->cl-source-package sbcl-prometheus.formats.text)) + +(define-public ecl-prometheus.formats.text + (sbcl-package->ecl-package sbcl-prometheus.formats.text)) + +(define-public sbcl-prometheus.exposers.hunchentoot + (package + (inherit sbcl-prometheus) + (name "sbcl-prometheus.exposers.hunchentoot") + (inputs + `(("hunchentoot" ,sbcl-hunchentoot) + ("prometheus" ,sbcl-prometheus) + ("prometheus.formats.text" ,sbcl-prometheus.formats.text) + ("salza2" ,sbcl-salza2) + ("trivial-utf-8" ,sbcl-trivial-utf-8))) + (synopsis "Prometheus collector for Hunchentoot metrics") + (description "Prometheus collector for Hunchentoot metrics"))) + +(define-public cl-prometheus.exposers.hunchentoot + (sbcl-package->cl-source-package sbcl-prometheus.exposers.hunchentoot)) + +(define-public sbcl-prometheus.pushgateway + (package + (inherit sbcl-prometheus) + (name "sbcl-prometheus.pushgateway") + (inputs + `(("drakma" ,sbcl-drakma) + ("prometheus" ,sbcl-prometheus) + ("prometheus.formats.text" ,sbcl-prometheus.formats.text))) + (synopsis "Prometheus Pushgateway client") + (description "Prometheus Pushgateway client."))) + +(define-public cl-prometheus.pushgateway + (sbcl-package->cl-source-package sbcl-prometheus.pushgateway)) + +(define-public ecl-prometheus.pushgateway + (sbcl-package->ecl-package sbcl-prometheus.pushgateway)) + +(define-public sbcl-uuid + (let ((commit "e7d6680c3138385c0708f7aaf0c96622eeb140e8")) + (package + (name "sbcl-uuid") + (version (git-version "2012.12.26" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dardoria/uuid.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0jnyp2kibcf5cwi60l6grjrj8wws9chasjvsw7xzwyym2lyid46f")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("ironclad" ,sbcl-ironclad) + ("trivial-utf-8" ,sbcl-trivial-utf-8))) + (home-page "https://github.com/dardoria/uuid") + (synopsis + "Common Lisp implementation of UUIDs according to RFC4122") + (description + "Common Lisp implementation of UUIDs according to RFC4122.") + (license license:llgpl)))) + +(define-public cl-uuid + (sbcl-package->cl-source-package sbcl-uuid)) + +(define-public ecl-uuid + (sbcl-package->ecl-package sbcl-uuid)) + +(define-public sbcl-dissect + (let ((commit "cffd38479f0e64e805f167bbdb240b783ecc8d45")) + (package + (name "sbcl-dissect") + (version (git-version "1.0.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Shinmera/dissect.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0rmsjkgjl90gl6ssvgd60hb0d5diyhsiyypvw9hbc0ripvbmk5r5")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("cl-ppcre" ,sbcl-cl-ppcre))) + (home-page "https://shinmera.github.io/dissect/") + (synopsis + "Introspection library for the call stack and restarts") + (description + "Dissect is a small Common Lisp library for introspecting the call stack +and active restarts.") + (license license:zlib)))) + +(define-public cl-dissect + (sbcl-package->cl-source-package sbcl-dissect)) + +(define-public ecl-dissect + (sbcl-package->ecl-package sbcl-dissect)) + +;; TODO: Uses ASDF's package-inferred-system which is not supported by +;; asdf-build-system/sbcl as of 2020-05-21. We should fix +;; asdf-build-system/sbcl. +(define-public sbcl-rove + (package + (name "sbcl-rove") + (version "0.9.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fukamachi/rove.git") + (commit "f3695db08203bf26f3b861dc22ac0f4257d3ec21"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "07ala4l2fncxf540fzxj3h5mhi9i4wqllhj0rqk8m2ljl5zbz89q")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("bordeaux-threads" ,sbcl-bordeaux-threads) + ("dissect" ,sbcl-dissect) + ("trivial-gray-streams" ,sbcl-trivial-gray-streams))) + (home-page "https://github.com/fukamachi/rove") + (synopsis + "Yet another common lisp testing library") + (description + "Rove is a unit testing framework for Common Lisp applications. +This is intended to be a successor of Prove.") + (license license:bsd-3))) + +(define-public cl-rove + (sbcl-package->cl-source-package sbcl-rove)) + +(define-public ecl-rove + (sbcl-package->ecl-package sbcl-rove)) + +(define-public sbcl-exponential-backoff + (let ((commit "8d9e8444d8b3184a524c12ce3449f91613ab714f")) + (package + (name "sbcl-exponential-backoff") + (version (git-version "0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/death/exponential-backoff.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1389hm9hxv85s0125ja4js1bvh8ay4dsy9q1gaynjv27ynik6gmv")))) + (build-system asdf-build-system/sbcl) + (home-page "https://github.com/death/exponential-backoff") + (synopsis "Exponential backoff algorithm in Common Lisp") + (description + "An implementation of the exponential backoff algorithm in Common Lisp. +Inspired by the implementation found in Chromium. Read the header file to +learn about each of the parameters.") + (license license:expat)))) + +(define-public cl-exponential-backoff + (sbcl-package->cl-source-package sbcl-exponential-backoff)) + +(define-public ecl-exponential-backoff + (sbcl-package->ecl-package sbcl-exponential-backoff)) + +(define-public sbcl-sxql + (let ((commit "5aa8b739492c5829e8623432b5d46482263990e8")) + (package + (name "sbcl-sxql") + (version (git-version "0.1.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fukamachi/sxql.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0k25p6w2ld9cn8q8s20lda6yjfyp4q89219sviayfgixnj27avnj")))) + (build-system asdf-build-system/sbcl) + (arguments + `(#:test-asd-file "sxql-test.asd")) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("cl-syntax-annot" ,sbcl-cl-syntax-annot) + ("iterate" ,sbcl-iterate) + ("optima" ,sbcl-optima) + ("split-sequence" ,sbcl-split-sequence) + ("trivial-types" ,sbcl-trivial-types))) + (native-inputs + `(("prove" ,sbcl-prove) + ("prove-asdf" ,sbcl-prove-asdf))) + (home-page "https://github.com/fukamachi/sxql") + (synopsis "SQL generator for Common Lisp") + (description "SQL generator for Common Lisp.") + (license license:bsd-3)))) + +(define-public cl-sxql + (sbcl-package->cl-source-package sbcl-sxql)) + +(define-public ecl-sxql + (sbcl-package->ecl-package sbcl-sxql)) + +(define-public sbcl-1am + (let ((commit "8b1da94eca4613fd8a20bdf63f0e609e379b0ba5")) + (package + (name "sbcl-1am") + (version (git-version "0.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/lmj/1am.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "05ss4nz1jb9kb796295482b62w5cj29msfj8zis33sp2rw2vmv2g")))) + (build-system asdf-build-system/sbcl) + (arguments + `(#:asd-system-name "1am")) + (home-page "https://github.com/lmj/1am") + (synopsis "Minimal testing framework for Common Lisp") + (description "A minimal testing framework for Common Lisp.") + (license license:expat)))) + +(define-public cl-1am + (sbcl-package->cl-source-package sbcl-1am)) + +(define-public ecl-1am + (sbcl-package->ecl-package sbcl-1am)) + +(define-public sbcl-cl-ascii-table + (let ((commit "d9f5e774a56fad1b416e4dadb8f8a5b0e84094e2") + (revision "1")) + (package + (name "sbcl-cl-ascii-table") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/telephil/cl-ascii-table.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "125fdif9sgl7k0ngjhxv0wjas2q27d075025hvj2rx1b1x948z4s")))) + (build-system asdf-build-system/sbcl) + (synopsis "Library to make ascii-art tables") + (description + "This is a Common Lisp library to present tabular data in ascii-art +tables.") + (home-page "https://github.com/telephil/cl-ascii-table") + (license license:expat)))) + +(define-public cl-ascii-table + (sbcl-package->cl-source-package sbcl-cl-ascii-table)) + +(define-public ecl-cl-ascii-table + (sbcl-package->ecl-package sbcl-cl-ascii-table)) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 21e1a0449b..a2e0f0724d 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -372,14 +372,14 @@ an interpreter, a compiler, a debugger, and much more.") (define-public sbcl (package (name "sbcl") - (version "2.0.4") + (version "2.0.5") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/sbcl/sbcl/" version "/sbcl-" version "-source.tar.bz2")) (sha256 - (base32 "1lc2i4qq1kfdybmxnj2zq2hn3hfx0vvlqim4gvlgvs3bfr0lcaqj")))) + (base32 "1jz26w1i3riv032aa35vww4cv7cjk2ww7dp70c7wk4r8s66zhl00")))) (build-system gnu-build-system) (outputs '("out" "doc")) (native-inputs @@ -592,25 +592,24 @@ statistical profiler, a code coverage tool, and many other extensions.") (uri (string-append "https://github.com/Clozure/ccl/releases/download/v" version "/" (match (%current-system) - ((or "i686-linux" "x86_64-linux") "linuxx86") ("armhf-linux" "linuxarm") - ;; Prevent errors when querying this package on unsupported - ;; platforms, e.g. when running "guix package --search=" - (_ "UNSUPPORTED")) + ;; XXX: This source only works on x86, but provide it as a + ;; catch-all to prevent errors when querying this package + ;; on unsupported platforms. + (_ "linuxx86")) ".tar.gz")) (sha256 (base32 (match (%current-system) - ((or "i686-linux" "x86_64-linux") - "15l7cfa4a7jkfwdzsfm4q3n22jnb57imxahpql3h77xin57v1gbz") ("armhf-linux" "0x4bjx6cxsjvxyagijhlvmc7jkyxifdvz5q5zvz37028va65243c") - (_ "")))))))) + (_ "15l7cfa4a7jkfwdzsfm4q3n22jnb57imxahpql3h77xin57v1gbz")))))))) (native-inputs `(("m4" ,m4))) (arguments `(#:tests? #f ;no 'check' target - #:modules ((srfi srfi-26) + #:modules ((ice-9 match) + (srfi srfi-26) (guix build utils) (guix build gnu-build-system)) #:phases @@ -622,19 +621,16 @@ statistical profiler, a code coverage tool, and many other extensions.") (add-before 'build 'pre-build ;; Enter the source directory for the current platform's lisp ;; kernel, and run 'make clean' to remove the precompiled one. - (lambda _ + (lambda* (#:key system #:allow-other-keys) (substitute* "lisp-kernel/m4macros.m4" (("/bin/pwd") (which "pwd"))) (chdir (string-append "lisp-kernel/" - ,(match (or (%current-target-system) (%current-system)) - ("i686-linux" "linuxx8632") - ("x86_64-linux" "linuxx8664") - ("armhf-linux" "linuxarm") - ;; Prevent errors when querying this package - ;; on unsupported platforms, e.g. when running - ;; "guix package --search=" - (_ "UNSUPPORTED")))) + (match system + ("i686-linux" "linuxx8632") + ("x86_64-linux" "linuxx8664") + ("armhf-linux" "linuxarm") + (_ (string-append "unknown system: " system))))) (substitute* '("Makefile") (("/bin/rm") "rm")) (setenv "CC" "gcc") @@ -642,7 +638,7 @@ statistical profiler, a code coverage tool, and many other extensions.") ;; XXX Do we need to recompile the heap image as well for Guix? ;; For now just use the one we already got in the tarball. (replace 'install - (lambda* (#:key outputs inputs #:allow-other-keys) + (lambda* (#:key outputs inputs system #:allow-other-keys) ;; The lisp kernel built by running 'make' in lisp-kernel/$system ;; is put back into the original directory, so go back. The heap ;; image is there as well. @@ -653,20 +649,18 @@ statistical profiler, a code coverage tool, and many other extensions.") (wrapper (string-append bindir "ccl")) (bash (assoc-ref inputs "bash")) (kernel - ,(match (or (%current-target-system) (%current-system)) - ("i686-linux" "lx86cl") - ("x86_64-linux" "lx86cl64") - ("armhf-linux" "armcl") - ;; Prevent errors when querying this package - ;; on unsupported platforms, e.g. when running - ;; "guix package --search=" - (_ "UNSUPPORTED"))) + (match system + ("i686-linux" "lx86cl") + ("x86_64-linux" "lx86cl64") + ("armhf-linux" "armcl") + ;; Unlikely to work, but try it anyway... + (_ system))) (heap (string-append kernel ".image"))) (install-file kernel libdir) (install-file heap libdir) - (let ((dirs '("lib" "library" "examples" "tools" "objc-bridge" - ,@(match (%current-system) + (let ((dirs `("lib" "library" "examples" "tools" "objc-bridge" + ,@(match system ("x86_64-linux" '("x86-headers64")) ("i686-linux" @@ -806,7 +800,7 @@ enough to play the original mainframe Zork all the way through.") (define-public txr (package (name "txr") - (version "238") + (version "239") (source (origin (method git-fetch) @@ -815,15 +809,12 @@ enough to play the original mainframe Zork all the way through.") (commit (string-append "txr-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0asdq4n828xb1m31s7f47mqcbjqkzxz11bwnw8v3f2249m93ync4")))) + (base32 "1jldpkd5f855m3z4zjpd1ha64f405pcdwwrnr8jnk66v22dsvdwx")))) (build-system gnu-build-system) (arguments `(#:configure-flags - (let ((target ,(%current-target-system))) - (list (string-append "cc=" (if target - (string-append target "-gcc") - "gcc")) - (string-append "--prefix=" (assoc-ref %outputs "out")))) + (list ,(string-append "cc=" (cc-for-target)) + (string-append "--prefix=" (assoc-ref %outputs "out"))) #:test-target "tests" #:phases (modify-phases %standard-phases diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 1b678d3d20..e26768267b 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2019 Brett Gilio <brettg@gnu.org> ;;; Copyright © 2020 Konrad Hinsen <konrad.hinsen@fastmail.net> +;;; Copyright © 2020 Edouard Klein <edk@beaver-labs.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1816,11 +1817,13 @@ advanced research.") "1k8szlpm19rcwcxdny9qdm3gmaqq8akb4xlvrzyz8c2d679aak6l")))) (build-system python-build-system) (propagated-inputs - `(("ipython" ,python-ipython) - ("nose" ,python-nose) + `(("ipython" ,(prompt-toolkit-2-instead-of-prompt-toolkit + python-ipython)) ("numpy" ,python-numpy) ("pandas" ,python-pandas) ("scipy" ,python-scipy))) + (native-inputs + `(("nose" ,python-nose))) (home-page "https://github.com/interpretable-ml/iml") (synopsis "Interpretable Machine Learning (iML) package") (description "Interpretable ML (iML) is a set of data type objects, diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 8fb2a3c39e..67ed8c4b68 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -17,7 +17,7 @@ ;;; Copyright © 2016, 2017 Troy Sankey <sankeytms@gmail.com> ;;; Copyright © 2016, 2017, 2018 Nikita <nikita@n0.is> ;;; Copyright © 2016 Clément Lassieur <clement@lassieur.org> -;;; Copyright © 2016, 2017, 2018, 2019 Arun Isaac <arunisaac@systemreboot.net> +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2016 John Darrington <jmd@gnu.org> ;;; Copyright © 2016, 2018 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be> @@ -347,7 +347,7 @@ to run without any changes.") (define-public fetchmail (package (name "fetchmail") - (version "6.4.5") + (version "6.4.6") (source (origin (method url-fetch) @@ -355,7 +355,7 @@ to run without any changes.") (version-major+minor version) "/" "fetchmail-" version ".tar.xz")) (sha256 - (base32 "073bjh8qbvww7f5gbd6pq640qspi7dc6cjndvm0h2jcl0a90c3yk")))) + (base32 "04b0sq1xad6gs1bfhkbmhsn1kq6y4gsx9l9ywjvd5d0rc15yrvqn")))) (build-system gnu-build-system) (inputs `(("openssl" ,openssl))) @@ -711,15 +711,15 @@ security functionality including PGP, S/MIME, SSH, and SSL.") (define-public mu (package (name "mu") - (version "1.4.7") + (version "1.4.8") (source (origin (method url-fetch) (uri (string-append "https://github.com/djcb/mu/releases/" - "download/1,4.7/" ; sic + "download/" version "/" "mu-" version ".tar.xz")) (sha256 (base32 - "19qmz9fgnjpj0cxb8y9nb2dfk7pc0a9kwfiysa0f13ps3d5k4mhm")))) + "0vww8n7r6pfl4jyijhzas3fpdl6v1ndhc99zr1fsamjldxqpxk5m")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -1259,7 +1259,7 @@ delivery.") (define-public exim (package (name "exim") - (version "4.93.0.4") + (version "4.94") (source (origin (method url-fetch) @@ -1273,7 +1273,7 @@ delivery.") (string-append "https://ftp.exim.org/pub/exim/exim4/old/" file-name)))) (sha256 - (base32 "01g4sfycv13glnmfrapwhjbdw6z1z7w5bwjldxjmglwfw5p3czak")))) + (base32 "1nsb2i5mqxfz1sl1bmbxmpb2qiaf3wffhfiw4j9vfpagy3xfhzpp")))) (build-system gnu-build-system) (inputs `(("bdb" ,bdb-5.3) ; ‘#error Version 6 and later BDB API is not supported’ @@ -2622,7 +2622,7 @@ on the fly. Both programs are written in C and are very fast.") (define-public swaks (package (name "swaks") - (version "20181104.0") + (version "20190914.0") (source (origin (method url-fetch) @@ -2631,7 +2631,7 @@ on the fly. Both programs are written in C and are very fast.") version ".tar.gz")) (sha256 (base32 - "0n1yd27xcyb1ylp5gln3yv5gzi9r377hjy1j32367kgb3247ygq2")))) + "12awq5z4sdd54cxprj834zajxhkpy4jwhzf1fhigcx1zbhdaacsp")))) (build-system perl-build-system) (inputs `(("perl-net-dns" ,perl-net-dns) diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm index 4dfac4f87b..779781f822 100644 --- a/gnu/packages/man.scm +++ b/gnu/packages/man.scm @@ -62,14 +62,14 @@ a flexible and convenient way.") (define-public man-db (package (name "man-db") - (version "2.9.1") + (version "2.9.2") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/man-db/man-db-" version ".tar.xz")) (sha256 (base32 - "0ky7aq8313xa1y0zdwdbz5yvjfjb3xy0xymbimd2d9q9bky8lgds")))) + "0z04kwv5ymmd0pzadpaag696jfckg6rbz8x4jrgj09bmqqk3yf3v")))) (build-system gnu-build-system) (arguments `(#:phases diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index e1c8f8b559..9a24625a52 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4046,30 +4046,69 @@ evaluates expressions using the standard order of operations.") (define-public xaos (package (name "xaos") - (version "3.6") + (version "4.0") (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/xaos/XaoS/" version - "/xaos-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/xaos-project/XaoS") + (commit (string-append "release-" version)))) (sha256 (base32 - "15cd1cx1dyygw6g2nhjqq3bsfdj8sj8m4va9n75i0f3ryww3x7wq")))) + "00110p5xscjsmn7avfqgydn656zbmdj3l3y2fpv9b4ihzpid8n7a")))) (build-system gnu-build-system) - (native-inputs `(("gettext" ,gettext-minimal))) + (native-inputs `(("gettext" ,gettext-minimal) + ("qtbase" ,qtbase) + ("qttools" ,qttools))) (inputs `(("libx11" ,libx11) ("zlib" ,zlib) ("libpng" ,libpng) ("gsl" ,gsl))) + ;; The upstream project file ("XaoS.pro") and the Makefile it generates are + ;; not enough for this package to install properly. These phases fix that. (arguments `(#:tests? #f ;no "check" target - #:make-flags '("LOCALEDIR=$DATAROOTDIR/locale"))) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'make-qt-deterministic + (lambda _ + ;; Make Qt deterministic. + (setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1") + #t)) + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + ;; The DESTDIR is originally set to install the xaos binary to + ;; the "bin" folder inside the build directory. Setting make + ;; flags doesn't seem to change this. + (substitute* "XaoS.pro" + (("DESTDIR.*$") + (string-append "DESTDIR=" out "/bin"))) + (substitute* "src/include/config.h" + (("/usr/share/XaoS") + (string-append out "/share/XaoS"))) + (invoke "qmake")))) + (add-after 'install 'install-data + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (share (string-append out "/share"))) + (mkdir-p share) + (for-each + (lambda (folder) + (copy-recursively folder + (string-append share "/XaoS/" folder))) + '("catalogs" "examples" "tutorial")) + (install-file "xdg/xaos.png" + (string-append share "/pixmaps")) + (install-file "xdg/xaos.desktop" + (string-append share "/applications"))) + #t))))) (synopsis "Real-time fractal zoomer") (description "GNU XaoS is a graphical program that generates fractal patterns and allows you to zoom in and out of them infinitely in a fluid, continuous manner. It also includes tutorials that help to explain how fractals are built. It can generate many different fractal types such as the Mandelbrot set.") - (home-page "https://www.gnu.org/software/xaos/") + (home-page "https://xaos-project.github.io/") (license license:gpl2+))) (define-public hypre diff --git a/gnu/packages/matrix.scm b/gnu/packages/matrix.scm index 7bbdc09688..002c1b530d 100644 --- a/gnu/packages/matrix.scm +++ b/gnu/packages/matrix.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020 Alex ter Weele <alex.ter.weele@gmail.com> +;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -59,15 +60,15 @@ an LDAP server.") (define-public synapse (package (name "synapse") - (version "1.11.0") + (version "1.14.0") (source (origin (method url-fetch) (uri (pypi-uri "matrix-synapse" version)) (sha256 (base32 - "0cqbwcz0fi4w413s1kcxvf696qi4n46n1k4ggnygqri5yq26qlfy")))) + "09drdqcjvpk9s3hq5rx9yxsxq0wak5fg5gfaiqfnbnxav2c2v7kq")))) (build-system python-build-system) - ;; TODO I think there are custom tests + ;; TODO Run tests with ‘PYTHONPATH=. trial3 tests’. (propagated-inputs `(("python-simplejson" ,python-simplejson) ; not attested but required ;; requirements (synapse/python_dependencies.py) @@ -100,6 +101,7 @@ an LDAP server.") ("python-bleach" ,python-bleach) ("python-typing-extensions" ,python-typing-extensions) ;; conditional requirements (synapse/python_dependencies.py) + ;;("python-hiredis" ,python-hiredis) ("python-matrix-synapse-ldap3" ,python-matrix-synapse-ldap3) ("python-psycopg2" ,python-psycopg2) ("python-jinja2" ,python-jinja2) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 36730bef3e..e4a9521e63 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -755,7 +755,7 @@ end-to-end encryption support; XML console.") (define-public gajim-omemo (package (name "gajim-omemo") - (version "2.6.29") + (version "2.7.4") (source (origin (method url-fetch/zipbomb) (uri (string-append @@ -763,7 +763,7 @@ end-to-end encryption support; XML console.") version ".zip")) (sha256 (base32 - "1mif5qkrvxclqbqmq6njini4laznbs5nn82w2f1hkl8c1284dvgi")))) + "00zrj57n86c2m99n0swmmaws4f8zccbgbi8fknv6f9b1vif9jc8p")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) @@ -779,7 +779,7 @@ end-to-end encryption support; XML console.") (propagated-inputs `(("python-axolotl" ,python-axolotl))) (home-page - "https://dev.gajim.org/gajim/gajim-plugins/wikis/OmemoGajimPlugin") + "https://dev.gajim.org/gajim/gajim-plugins/-/wikis/OmemoGajimPlugin") (synopsis "Gajim OMEMO plugin") (description "This package provides the Gajim OMEMO plugin. OMEMO is an XMPP diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index 60ef5560a1..2a4ca555dc 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -309,7 +309,7 @@ This package contains the binary.") (define-public mpg123 (package (name "mpg123") - (version "1.26.0") + (version "1.26.1") (source (origin (method url-fetch) @@ -319,7 +319,7 @@ This package contains the binary.") "https://www.mpg123.org/download/mpg123-" version ".tar.bz2"))) (sha256 - (base32 "0s62k45mz6264h0ljkrrs9vyagvl78q9pxhi7dnbk56pmgs0br74")))) + (base32 "0cp01wdy77ggzqzzasxd5jd9iypcly5m4c89idc9mpgknyd65mkl")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--with-default-audio=pulse"))) (native-inputs diff --git a/gnu/packages/multiprecision.scm b/gnu/packages/multiprecision.scm index 2848e63d60..b3a5ec5894 100644 --- a/gnu/packages/multiprecision.scm +++ b/gnu/packages/multiprecision.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2012, 2013, 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015, 2018 Andreas Enge <andreas@enge.fr> -;;; Copyright © 2016 Nicolas Goaziou <mail@nicolasgoaziou.fr> +;;; Copyright © 2016, 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2016, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org> @@ -29,6 +29,7 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages m4) #:use-module (gnu packages gcc) + #:use-module (gnu packages texinfo) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix utils) @@ -156,17 +157,27 @@ precision and correctly rounds the results.") (define-public mpfi (package (name "mpfi") - (version "1.5.3") + (version "1.5.4") (source (origin (method url-fetch) (uri (string-append "https://gforge.inria.fr/frs/download.php" - "/latestfile/181/" name "-" version ".tar.bz2")) + "/latestfile/181/mpfi-" version ".tgz")) (sha256 - (base32 "0bqr8yibl7jbrp0bw7xk1lm7nis7rv26jsz6y8ycvih8n9bx90r3")))) + (base32 "0mismr1ll3wp788dq2n22s5irm0dziy75byyfdwz22kjbmckhf9v")))) (build-system gnu-build-system) - (propagated-inputs `(("gmp" ,gmp) ; <mpfi.h> refers to both - ("mpfr" ,mpfr))) + (arguments + `(#:tests? #f ;tests are broken in this release + #:configure-flags '("--enable-static=no"))) + (native-inputs + `(("automake" ,automake) + ("autoreconf" ,autoconf) + ("libtool" ,libtool) + ("texinfo" ,texinfo))) + (propagated-inputs + `(("gmp" ,gmp) ; <mpfi.h> refers to both + ("mpfr" ,mpfr))) + (home-page "https://gforge.inria.fr/projects/mpfi/") (synopsis "C library for arbitrary-precision interval arithmetic") (description "@acronym{MPFI, Multiple Precision Floating-point Interval} is a portable C @@ -178,8 +189,7 @@ Floating-Point Reliably} libraries. The purpose of arbitrary-precision interval arithmetic is to get results that are both guaranteed, thanks to interval computation, and accurate, thanks to multiple-precision arithmetic.") - (license lgpl2.1+) - (home-page "https://perso.ens-lyon.fr/nathalie.revol/software.html"))) + (license lgpl2.1+))) (define-public irram (package diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 09827c7c93..a26c4fc250 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -141,6 +141,7 @@ #:use-module (gnu packages tls) #:use-module (gnu packages version-control) #:use-module (gnu packages video) + #:use-module (gnu packages vim) ;for 'xxd' #:use-module (gnu packages web) #:use-module (gnu packages wxwidgets) #:use-module (gnu packages xml) @@ -4131,14 +4132,14 @@ specification and header.") (define-public rosegarden (package (name "rosegarden") - (version "19.12") + (version "20.06") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/rosegarden/rosegarden/" version "/rosegarden-" version ".tar.bz2")) (sha256 - (base32 "1qcaxc6hdzva7kwxxhgl95437fagjbxzv4mihsgpr7y9qk08ppw1")))) + (base32 "1i9x9rkqwwdrk77xl5ra8i48cjirbc7fbisnj0nnclccwaq0wk6r")))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-DCMAKE_BUILD_TYPE=Release") @@ -4871,7 +4872,7 @@ and reverb.") (define-public lsp-plugins (package (name "lsp-plugins") - (version "1.1.21") + (version "1.1.22") (source (origin (method git-fetch) @@ -4880,8 +4881,7 @@ and reverb.") (commit (string-append "lsp-plugins-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "1zw0iip6ki9k65kh8dp53x7l4va4mi5rj793n2yn4p9y84qzwrz9")))) + (base32 "0s0i0kf5nqxxywckg03fds1w7696ly60rnlljzqvp7qfgzps1r6c")))) (build-system gnu-build-system) (arguments `(#:make-flags @@ -4940,6 +4940,49 @@ and debugging of event signal flows inside plugin graphs.") (home-page "https://open-music-kontrollers.ch/lv2/sherlock/") (license license:artistic2.0))) +(define-public spectacle-analyzer + (package + (name "spectacle-analyzer") + (version "1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jpcima/spectacle.git") + (commit (string-append "v" version)) + ;; Bundles a specific commit of the DISTRHO plugin framework. + (recursive? #t))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0xiqa6z8g68lcvnwhws4j7c4py35r9d20cirrili7ycyp3a6149a")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no check target + #:make-flags + (list "CC=gcc" + (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("xxd" ,xxd))) + (inputs + `(("cairo", cairo) + ("fftw", fftw) + ("fftwf", fftwf) + ("jack", jack-1) + ("lv2", lv2) + ("mesa", mesa))) + (synopsis "Realtime graphical spectrum analyzer") + (description "Spectacle is a real-time spectral analyzer using the +short-time Fourier transform, available as LV2 audio plugin and JACK client.") + (home-page "https://github.com/jpcima/spectacle") + ;; The project is licensed under the ISC license, and files in + ;; sources/plugin carry the Expat license. + (license (list license:isc license:expat)))) + (define-public x42-plugins (package (name "x42-plugins") diff --git a/gnu/packages/ncdu.scm b/gnu/packages/ncdu.scm index 720b8a7858..e59e0334b7 100644 --- a/gnu/packages/ncdu.scm +++ b/gnu/packages/ncdu.scm @@ -28,14 +28,14 @@ (define-public ncdu (package (name "ncdu") - (version "1.14.2") + (version "1.15") (source (origin (method url-fetch) (uri (string-append "https://dev.yorhel.nl/download/ncdu-" version ".tar.gz")) (sha256 (base32 - "1cf6a9qw7ljaw09b0g7c5i252dl7wb2mnkrbwwwf7m0c3mf7yyll")))) + "1ywpa8yg74a5xa46f0qig92xw5z5s1lmspwzcslr497brk2ksnaa")))) (build-system gnu-build-system) (inputs `(("ncurses" ,ncurses))) (synopsis "Ncurses based disk usage analyzer") diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index fd29370841..3ad68ad070 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -532,16 +532,16 @@ written in the C programming language.") (define-public librdkafka (package (name "librdkafka") - (version "0.9.1") + (version "1.4.2") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/edenhill/librdkafka/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/edenhill/librdkafka.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "10ldx7g7ymmg17snzx78vy4n8ma1rjx0agzi34g15j2fk867xmas")))) + "05mgrdzacn9kdpr68r5j0cvsvl54s52glnsc1ww9rcxx6p7hq1ly")))) (build-system gnu-build-system) (arguments '(#:phases @@ -1286,7 +1286,7 @@ private (reserved).") (define-public perl-net-dns (package (name "perl-net-dns") - (version "1.21") + (version "1.24") (source (origin (method url-fetch) @@ -1297,7 +1297,7 @@ private (reserved).") (string-append "mirror://cpan/authors/id/N/NL/NLNETLABS/Net-DNS-" version ".tar.gz"))) (sha256 - (base32 "0yknrsh0wqr9s43c0wf3dyzrsi2r7k0v75hay74gqkq850xy3vyx")))) + (base32 "0qyy5k4k0llqjjmkkfg96919gqybdc1z5fy9047n9imidjxc59hi")))) (build-system perl-build-system) (inputs `(("perl-digest-hmac" ,perl-digest-hmac))) @@ -1605,14 +1605,14 @@ HTTP proxies.") (define-public enet (package (name "enet") - (version "1.3.14") + (version "1.3.15") (source (origin (method url-fetch) (uri (string-append "http://enet.bespin.org/download/" "enet-" version ".tar.gz")) (sha256 (base32 - "0w780zc6cy8yq4cskpphx0f91lzh51vh9lwyc5ll8hhamdxgbxlq")))) + "1yxxf9bkx6dx3j8j70fj17c05likyfibb1419ls74hp58qrzdgas")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) @@ -2539,7 +2539,7 @@ SNMP v3 using both IPv4 and IPv6.") (define-public ubridge (package (name "ubridge") - (version "0.9.16") + (version "0.9.18") (source (origin (method git-fetch) @@ -2548,11 +2548,12 @@ SNMP v3 using both IPv4 and IPv6.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1bind7ylgxs743vfdmpdrpp4iamy461bc3i7nxza91kj7hyyjz6h")))) + (base32 "0jg66jhhpv4c9340fsdp64hf9h253i8r81fknxa0gq241ripp3jn")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests - #:make-flags '("CC=gcc") + #:make-flags + (list ,(string-append "CC=" (cc-for-target))) #:phases (modify-phases %standard-phases (delete 'configure) ; no configure script @@ -2611,7 +2612,7 @@ packets from wireless devices for use with hashcat or John the Ripper.") (define-public hcxdumptool (package (name "hcxdumptool") - (version "5.2.0") + (version "6.0.6") (source (origin (method git-fetch) @@ -2619,17 +2620,19 @@ packets from wireless devices for use with hashcat or John the Ripper.") (url "https://github.com/ZerBea/hcxdumptool.git") (commit version))) (sha256 - (base32 "0pg1pvg029gm4rj0fj5kcsjb32hixgn4cxsgiir7spkmacf1qm4q")) + (base32 "1b4d543y64ib92w9gcmiyjn5hz2vyjqmxk3f3yr1zk04fhw16gmf")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments `(#:make-flags - (list "CC=gcc" + (list ,(string-append "CC=" (cc-for-target)) (string-append "INSTALLDIR=" (assoc-ref %outputs "out") "/bin")) #:tests? #f ; no test suite #:phases (modify-phases %standard-phases (delete 'configure)))) + (inputs + `(("openssl" ,openssl))) (home-page "https://github.com/ZerBea/hcxdumptool") (synopsis "Small tool to capture packets from wlan devices") (description @@ -3103,7 +3106,7 @@ cables.") (define-public haproxy (package (name "haproxy") - (version "2.1.4") + (version "2.1.5") (source (origin (method url-fetch) (uri (string-append "https://www.haproxy.org/download/" @@ -3111,7 +3114,7 @@ cables.") "/src/haproxy-" version ".tar.gz")) (sha256 (base32 - "1kcizs5r538chhpwqykdngxyqfi98i03akfjnii721npjvv0y0si")))) + "188ff33610jj11knjwjqwxci4p0i63n9k0l8bdb47ckahg2ll5s2")))) (build-system gnu-build-system) (arguments `(#:make-flags diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index b19ad7e1e9..9b9baf33c1 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -191,3 +191,11 @@ applications. Applications built with NSS can support SSL v2 and v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3 certificates, and other security standards.") (license license:mpl2.0))) + +(define nss/fixed + (package + (inherit nss) + (source (origin + (inherit (package-source nss)) + (patches (append (search-patches "nss-CVE-2020-12399.patch") + (origin-patches (package-source nss)))))))) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 877e841b20..d9ba2aee2d 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -267,14 +267,14 @@ for building OCaml library and programs.") (define-public ocaml-extlib (package (name "ocaml-extlib") - (version "1.7.6") + (version "1.7.7") (source (origin (method url-fetch) - (uri (string-append "https://ygrek.org.ua/p/release/ocaml-extlib/" + (uri (string-append "https://ygrek.org/p/release/ocaml-extlib/" "extlib-" version ".tar.gz")) (sha256 (base32 - "0wfs20v1yj5apdbj7214wdsr17ayh0qqq7ihidndvc8nmmwfa1dz")))) + "1sxmzc1mx3kg62j8kbk0dxkx8mkf1rn70h542cjzrziflznap0s1")))) (build-system ocaml-build-system) (arguments `(#:phases @@ -528,7 +528,7 @@ Git-friendly development workflow.") (define-public camlp5 (package (name "camlp5") - (version "7.11") + (version "7.12") (source (origin (method git-fetch) @@ -537,7 +537,7 @@ Git-friendly development workflow.") (commit (string-append "rel" (string-delete #\. version))))) (file-name (git-file-name name version)) (sha256 - (base32 "1s1f9i0r0czxlbnsaz4kvs2ahknmqxcm5ypl75g7scjcbl0an2x4")))) + (base32 "12ix5g15bys932hyf9gs637iz76m0ji9075d83jfdmx85q30llgf")))) (build-system gnu-build-system) (inputs `(("ocaml" ,ocaml))) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 3fc6fc404a..cc3a40cb93 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -118,8 +118,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.1.0") - (commit "bdc801e1cfa8e436890da5bd755dd7759cb0f748") - (revision 4)) + (commit "ea924134f819eef072ba7df9080d39de97fd73e6") + (revision 6)) (package (name "guix") @@ -135,7 +135,7 @@ (commit commit))) (sha256 (base32 - "1wf30g45kh4nmcapd4vrcl6m2wjzly7v7dv8z0r584770i2yh836")) + "08likdidf3k1zqf8821h6a84dsrvgbdhridhkzpjymc2c884j0w4")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments @@ -322,7 +322,7 @@ $(prefix)/etc/init.d\n"))) ("guile" ,guile-3.0) ("gnutls" ,gnutls) ("guile-gcrypt" ,guile-gcrypt) - ("guile-json" ,guile-json-3) + ("guile-json" ,guile-json-4) ("guile-sqlite3" ,guile-sqlite3) ("guile-ssh" ,guile-ssh) ("guile-git" ,guile-git) @@ -371,9 +371,9 @@ $(prefix)/etc/init.d\n"))) ("glibc-utf8-locales" ,glibc-utf8-locales))) (propagated-inputs - `(("gnutls" ,(if (%current-target-system) gnutls-3.6.13 guile3.0-gnutls)) + `(("gnutls" ,(if (%current-target-system) gnutls-3.6.14 guile3.0-gnutls)) ("guile-gcrypt" ,guile-gcrypt) - ("guile-json" ,guile-json-3) + ("guile-json" ,guile-json-4) ("guile-sqlite3" ,guile-sqlite3) ("guile-ssh" ,guile-ssh) ("guile-git" ,guile-git))) @@ -542,14 +542,14 @@ out) and returning a package that uses that as its 'source'." (define-public nix (package (name "nix") - (version "2.3.4") + (version "2.3.5") (source (origin (method url-fetch) (uri (string-append "http://nixos.org/releases/nix/nix-" version "/nix-" version ".tar.xz")) (sha256 (base32 - "03fhbb8088sgz3709zd9n9rydavar79w87l9n4q9iimcw06nlqhw")))) + "1hbqsrp1ii2sfq8x2mahjrl2182qck76n8blrl1jfz3xq99m6i15")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("boost" ,boost) @@ -982,7 +982,7 @@ environments.") `(("guix" ,guix) ("guile" ,guile-3.0))) (propagated-inputs - `(("guile-json" ,guile-json-3) + `(("guile-json" ,guile-json-4) ("guile-simple-zmq" ,guile-simple-zmq) ("guile-gcrypt" ,guile-gcrypt))) (synopsis "Guix kernel for Jupyter") diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index 575f87930f..30b3c1ddda 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2020 Roel Janssen <roel@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -192,20 +193,22 @@ by managing a queue of pending work.") (define-public slurm-drmaa (package (name "slurm-drmaa") - (version "1.0.7") + (version "1.1.1") (source (origin (method url-fetch) - (uri "http://apps.man.poznan.pl/trac/slurm-drmaa/downloads/9") - (file-name (string-append name "-" version ".tar.gz")) + (uri (string-append + "https://github.com/natefoo/slurm-drmaa/releases/download/" + version "/slurm-drmaa-" version ".tar.gz")) (sha256 (base32 - "0grw55hmny2mc4nc0y1arnvxd2k0dcdfn476kzs180fibjxgfw14")))) + "19r4cm88pcpm3wli4cc61zq7354pg67cg866f3a430p15hm1knrn")))) (build-system gnu-build-system) + (arguments `(#:tests? #f)) ; The tests require "bats". (inputs `(("slurm" ,slurm))) (native-inputs `(("which" ,which))) - (home-page "http://apps.man.poznan.pl/trac/slurm-drmaa") + (home-page "https://github.com/natefoo/slurm-drmaa") (synopsis "Distributed resource management application API for SLURM") (description "PSNC DRMAA for Simple Linux Utility for Resource Management (SLURM) is diff --git a/gnu/packages/patches/biber-sortinithash.patch b/gnu/packages/patches/biber-sortinithash.patch index 1f054d25e4..5a626705e6 100644 --- a/gnu/packages/patches/biber-sortinithash.patch +++ b/gnu/packages/patches/biber-sortinithash.patch @@ -21,6 +21,15 @@ index b4f641e..c6f86c7 100644 \field{labelnamesource}{author} \field{labeltitlesource}{title} \field{title}{The Title} +@@ -116,7 +116,7 @@ my $ann2 = q| \entry{ann2}{misc}{} + \strng{authorfullhash}{90ae96c82de92e36949bc64254bbde0c} + \field{extraname}{2} + \field{sortinit}{L} +- \field{sortinithash}{2c7981aaabc885868aba60f0c09ee20f} ++ \field{sortinithash}{dad3efd0836470093a7b4a7bb756eb8c} + \field{labelnamesource}{author} + \field{labeltitlesource}{title} + \field{title}{The Title} diff --git a/t/basic-misc.t b/t/basic-misc.t index d4664b1..a9168cc 100644 --- a/t/basic-misc.t diff --git a/gnu/packages/patches/dbus-CVE-2020-12049.patch b/gnu/packages/patches/dbus-CVE-2020-12049.patch new file mode 100644 index 0000000000..71280144a1 --- /dev/null +++ b/gnu/packages/patches/dbus-CVE-2020-12049.patch @@ -0,0 +1,58 @@ +Fix CVE-2020-12049: + +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-12049 +https://lists.freedesktop.org/archives/ftp-release/2020-June/000753.html + +Taken from upstream: + +https://gitlab.freedesktop.org/dbus/dbus/-/commit/272d484283883fa9ff95b69d924fff6cd34842f5 + +diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c +--- a/dbus/dbus-sysdeps-unix.c ++++ b/dbus/dbus-sysdeps-unix.c +@@ -435,18 +435,6 @@ _dbus_read_socket_with_unix_fds (DBusSocket fd, + struct cmsghdr *cm; + dbus_bool_t found = FALSE; + +- if (m.msg_flags & MSG_CTRUNC) +- { +- /* Hmm, apparently the control data was truncated. The bad +- thing is that we might have completely lost a couple of fds +- without chance to recover them. Hence let's treat this as a +- serious error. */ +- +- errno = ENOSPC; +- _dbus_string_set_length (buffer, start); +- return -1; +- } +- + for (cm = CMSG_FIRSTHDR(&m); cm; cm = CMSG_NXTHDR(&m, cm)) + if (cm->cmsg_level == SOL_SOCKET && cm->cmsg_type == SCM_RIGHTS) + { +@@ -501,6 +489,26 @@ _dbus_read_socket_with_unix_fds (DBusSocket fd, + if (!found) + *n_fds = 0; + ++ if (m.msg_flags & MSG_CTRUNC) ++ { ++ unsigned int i; ++ ++ /* Hmm, apparently the control data was truncated. The bad ++ thing is that we might have completely lost a couple of fds ++ without chance to recover them. Hence let's treat this as a ++ serious error. */ ++ ++ /* We still need to close whatever fds we *did* receive, ++ * otherwise they'll never get closed. (CVE-2020-12049) */ ++ for (i = 0; i < *n_fds; i++) ++ close (fds[i]); ++ ++ *n_fds = 0; ++ errno = ENOSPC; ++ _dbus_string_set_length (buffer, start); ++ return -1; ++ } ++ + /* put length back (doesn't actually realloc) */ + _dbus_string_set_length (buffer, start + bytes_read); + diff --git a/gnu/packages/patches/emacs-zones-called-interactively.patch b/gnu/packages/patches/emacs-zones-called-interactively.patch deleted file mode 100644 index eefcfdd12e..0000000000 --- a/gnu/packages/patches/emacs-zones-called-interactively.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 81603e53ebaae0f0b23c4c52c7dab83e808964ec Mon Sep 17 00:00:00 2001 -From: Brian Leung <bkleung89@gmail.com> -Date: Sun, 17 Mar 2019 01:32:04 +0100 -Subject: [PATCH] This patch silences the byte-compiler. - ---- - zones.el | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/zones.el b/zones.el -index ca88d48..594ea36 100644 ---- a/zones.el -+++ b/zones.el -@@ -1075,7 +1075,7 @@ You can use `C-x n x' to widen to a previous buffer restriction. - - This is a destructive operation. The list structure of the variable - value can be modified." -- (zz-narrow-advice (interactive-p))) -+ (zz-narrow-advice (called-interactively-p 'interactive))) - - (defadvice narrow-to-defun (after zz-add-zone--defun activate) - "Push the defun limits to the current `zz-izones-var'. -@@ -1083,7 +1083,7 @@ You can use `C-x n x' to widen to a previous buffer restriction. - - This is a destructive operation. The list structure of the variable - value can be modified." -- (zz-narrow-advice (interactive-p))) -+ (zz-narrow-advice (called-interactively-p 'interactive))) - - ;; Call `zz-add-zone' if interactive or `zz-add-zone-anyway-p'. - ;; -@@ -1093,7 +1093,7 @@ You can use `C-x n x' to widen to a previous buffer restriction. - - This is a destructive operation. The list structure of the variable - value can be modified." -- (zz-narrow-advice (interactive-p))) -+ (zz-narrow-advice (called-interactively-p 'interactive))) - - ;;(@* "General Commands") - --- -2.22.0 - diff --git a/gnu/packages/patches/haskell-mode-make-check.patch b/gnu/packages/patches/haskell-mode-make-check.patch deleted file mode 100644 index a4d4d525f2..0000000000 --- a/gnu/packages/patches/haskell-mode-make-check.patch +++ /dev/null @@ -1,35 +0,0 @@ -Copied from upstream repository. -Hunk #2 is removed since it cannot be applied and it is not needed. - -From 7cead7137bf54851c1b7df5a3854351296d21276 Mon Sep 17 00:00:00 2001 -From: Vasantha Ganesh K <vasanthaganesh.k@tuta.io> -Date: Thu, 22 Jun 2017 23:38:40 +0530 -Subject: [PATCH] removed `check-conventions' from make - ---- - Makefile | 7 +- - tests/haskell-code-conventions.el | 165 ------------------------------ - 2 files changed, 1 insertion(+), 171 deletions(-) - delete mode 100644 tests/haskell-code-conventions.el - -diff --git a/Makefile b/Makefile -index b2c89d6..aa907c5 100644 ---- a/Makefile -+++ b/Makefile -@@ -79,12 +79,7 @@ build-$(EMACS_VERSION)/build-flag : build-$(EMACS_VERSION) $(patsubst %.el,build - check-%: tests/%-tests.el - $(BATCH) -l "$<" -f ert-run-tests-batch-and-exit; - --check: compile $(AUTOLOADS) check-ert check-conventions -- --check-conventions : -- $(BATCH) -l tests/haskell-code-conventions.el \ -- -f haskell-check-conventions-batch-and-exit -- @echo "conventions are okay" -+check: compile $(AUTOLOADS) check-ert - - check-ert: $(ELCHECKS) - $(BATCH) --eval "(when (= emacs-major-version 24) \ --- -2.18.0 - diff --git a/gnu/packages/patches/haskell-mode-unused-variables.patch b/gnu/packages/patches/haskell-mode-unused-variables.patch deleted file mode 100644 index b175fae28c..0000000000 --- a/gnu/packages/patches/haskell-mode-unused-variables.patch +++ /dev/null @@ -1,44 +0,0 @@ -Copied verbatim from upstream repository. - -From cee22450ee30e79952f594796721dc6b17798ee6 Mon Sep 17 00:00:00 2001 -From: Sascha Wilde <wilde@sha-bang.de> -Date: Fri, 23 Sep 2016 15:35:59 +0200 -Subject: [PATCH] Removed unused lexical variables. - ---- - haskell-lexeme.el | 3 +-- - haskell-process.el | 4 +--- - 2 files changed, 2 insertions(+), 5 deletions(-) - -diff --git a/haskell-lexeme.el b/haskell-lexeme.el -index 4256a79..b832560 100644 ---- a/haskell-lexeme.el -+++ b/haskell-lexeme.el -@@ -138,8 +138,7 @@ When match is successful, match-data will contain: - (match-text 2) - whole qualified identifier - (match-text 3) - unqualified part of identifier - (match-text 4) - closing backtick" -- (let ((begin (point)) -- (match-data-old (match-data)) -+ (let ((match-data-old (match-data)) - first-backtick-start - last-backtick-start - qid-start -diff --git a/haskell-process.el b/haskell-process.el -index b4efba2..4f3f859 100644 ---- a/haskell-process.el -+++ b/haskell-process.el -@@ -160,9 +160,7 @@ HPTYPE is the result of calling `'haskell-process-type`' function." - (defun haskell-process-log (msg) - "Effective append MSG to the process log (if enabled)." - (when haskell-process-log -- (let* ((append-to (get-buffer-create "*haskell-process-log*")) -- (windows (get-buffer-window-list append-to t t)) -- move-point-in-windows) -+ (let* ((append-to (get-buffer-create "*haskell-process-log*"))) - (with-current-buffer append-to - ;; point should follow insertion so that it stays at the end - ;; of the buffer --- -2.18.0 - diff --git a/gnu/packages/patches/icecat-makeicecat.patch b/gnu/packages/patches/icecat-makeicecat.patch index 2978a5789e..d3d95cbf28 100644 --- a/gnu/packages/patches/icecat-makeicecat.patch +++ b/gnu/packages/patches/icecat-makeicecat.patch @@ -25,7 +25,7 @@ index 8be2362..48716f2 100755 -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 fa5b2266d225878d4b35694678f79fd7e7a6d3c62759a40326129bd90f63e842 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - +-echo -n 935105e1a8a97d64daffb372690e2b566b5f07641f01470929dbbc82d20d4407 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - - -echo Extracting Firefox tarball -tar -xf firefox-${FFVERSION}esr.source.tar.xz @@ -37,7 +37,7 @@ index 8be2362..48716f2 100755 +# 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 fa5b2266d225878d4b35694678f79fd7e7a6d3c62759a40326129bd90f63e842 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - ++# echo -n 935105e1a8a97d64daffb372690e2b566b5f07641f01470929dbbc82d20d4407 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - +# +# echo Extracting Firefox tarball +# tar -xf firefox-${FFVERSION}esr.source.tar.xz diff --git a/gnu/packages/patches/java-openjfx-build-jdk_version.patch b/gnu/packages/patches/java-openjfx-build-jdk_version.patch new file mode 100644 index 0000000000..7be954467a --- /dev/null +++ b/gnu/packages/patches/java-openjfx-build-jdk_version.patch @@ -0,0 +1,27 @@ +Subject: [PATCH] openjfx: Determine the version of Java in JDK_HOME + +Icedtea contains guix in its version, so build.gradle failes to run. Openjfx +packaging is not trivial, so you will probably need to try build it with +gradlew. + +--- + build.gradle | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/build.gradle b/build.gradle +index df82f63..2c626cd 100644 +--- a/build.gradle ++++ b/build.gradle +@@ -742,9 +742,9 @@ try { + if (inStream.readLine() != null) { + String v = inStream.readLine(); + if (v != null) { +- int ib = v.indexOf(" (build "); ++ int ib = v.indexOf(" (guix build "); + if (ib != -1) { +- String ver = v.substring(ib + 8, v.size() - 1); ++ String ver = v.substring(ib + 13, v.size() - 1); + + defineProperty("jdkRuntimeVersion", ver) + defineProperty("jdkVersion", jdkRuntimeVersion.split("-")[0]) +2.24.1 diff --git a/gnu/packages/patches/lib2geom-enable-assertions.patch b/gnu/packages/patches/lib2geom-enable-assertions.patch new file mode 100644 index 0000000000..8feb44acbf --- /dev/null +++ b/gnu/packages/patches/lib2geom-enable-assertions.patch @@ -0,0 +1,36 @@ +From 4aa78f52232682b353eb15c219171e466987bac7 Mon Sep 17 00:00:00 2001 +From: Maxim Cournoyer <maxim.cournoyer@gmail.com> +Date: Thu, 16 Jan 2020 00:19:29 -0500 +Subject: [PATCH] build: Enable assertions for the RelWithDebugInfo build type. + +This fixes issue #5 (see: +https://gitlab.com/inkscape/lib2geom/issues/5). + +* CMakeLists.txt: Remove the "-DNDEBUG" CXX flag from the default +configuration for the RelWithDebugInfo build type. +--- + CMakeLists.txt | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bfeb8f03..a663a1b0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -19,6 +19,14 @@ enable_testing() + + include(CheckCXXSourceCompiles) + ++# Enable assertions for the RelWithDebugInfo build type. This is ++# useful as some tests make use of it (see: ++# https://gitlab.com/inkscape/lib2geom/issues/5). ++if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") ++ string(REPLACE "-DNDEBUG" "" ++ CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}") ++endif() ++ + # Find dependencies + find_package(Boost 1.40 REQUIRED) + find_package(DoubleConversion REQUIRED) +-- +2.24.1 + diff --git a/gnu/packages/patches/lib2geom-link-tests-against-glib.patch b/gnu/packages/patches/lib2geom-link-tests-against-glib.patch new file mode 100644 index 0000000000..2b4f7ca6bf --- /dev/null +++ b/gnu/packages/patches/lib2geom-link-tests-against-glib.patch @@ -0,0 +1,34 @@ +From f95925afef451755fc1449e57fbfdc2e7277f4b4 Mon Sep 17 00:00:00 2001 +From: Maxim Cournoyer <maxim.cournoyer@gmail.com> +Date: Sat, 11 Jan 2020 00:44:55 -0500 +Subject: [PATCH 1/3] tests: Link against GLib. + +This resolves an error about not finding <glib.h> when linking the +tests that make use of GLib. + +* src/tests/CMakeLists.txt[2GEOM_GTESTS_SRC]: Add the glib library to +the link target libraries. +--- + src/tests/CMakeLists.txt | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt +index 5ddf7f9c..626cfd87 100644 +--- a/src/tests/CMakeLists.txt ++++ b/src/tests/CMakeLists.txt +@@ -32,8 +32,10 @@ sbasis-test + + foreach(source ${2GEOM_GTESTS_SRC}) + add_executable(${source} ${source}.cpp) +- target_include_directories(${source} PRIVATE ${GSL_INCLUDE_DIRS} ${GTK3_INCLUDE_DIRS}) +- target_link_libraries(${source} 2geom gtest_main gtest ${GSL_LIBRARIES} ${GTK3_LIBRARIES}) ++ target_include_directories(${source} PRIVATE ${GSL_INCLUDE_DIRS} ++ ${GTK3_INCLUDE_DIRS} ${GLIB_INCLUDE_DIRS}) ++ target_link_libraries(${source} 2geom gtest_main gtest ${GSL_LIBRARIES} ++ ${GTK3_LIBRARIES} ${GLIB_LIBRARIES}) + add_test(NAME ${source} COMMAND ${source}) + endforeach() + +-- +2.24.1 + diff --git a/gnu/packages/patches/lib2geom-use-system-googletest.patch b/gnu/packages/patches/lib2geom-use-system-googletest.patch new file mode 100644 index 0000000000..16cce1799f --- /dev/null +++ b/gnu/packages/patches/lib2geom-use-system-googletest.patch @@ -0,0 +1,94 @@ +From 6693b9c8ff1ae1ec02c9002c0a8f5f416f0c88f0 Mon Sep 17 00:00:00 2001 +From: Maxim Cournoyer <maxim.cournoyer@gmail.com> +Date: Sun, 12 Jan 2020 23:23:33 -0500 +Subject: [PATCH 3/3] build: Prefer googletest from the system. + +Fixes issue #4. + +The build system now look for a system installed googletest or falls +back to the bundled copy of googletest otherwise. + +* CMakeLists.txt: Add call to find_package(GTest). +(include_directories): Remove "src/googletest/googletest/include" from +arg. +* src/CMakeLists.txt[NOT GTEST_FOUND]: Define the gtest and gtest_main +libraries when GTEST_FOUND is false. Globally include the googletest +headers here. Define aliases for the gtest and gtest_main libraries +that match those defined by the FindGTest module. +* src/tests/CMakeLists.txt: Replace references to gtest_main and gtest +by GTest::Main and GTest::GTest, respectively. +--- + CMakeLists.txt | 3 ++- + src/CMakeLists.txt | 15 +++++++++++---- + src/tests/CMakeLists.txt | 6 +++--- + 3 files changed, 16 insertions(+), 8 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bfeb8f03..96fbd58c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -25,13 +25,14 @@ find_package(DoubleConversion REQUIRED) + find_package(PkgConfig REQUIRED) + find_package(Cython) + find_package(Threads) ++find_package(GTest) + pkg_check_modules(GTK3 gtk+-3.0) + pkg_check_modules(GLIB glib-2.0) + pkg_check_modules(CAIRO cairo) + pkg_check_modules(GSL gsl) + + # Add global include and link directories +-include_directories(src src/googletest/googletest/include ${CMAKE_CURRENT_BINARY_DIR}) ++include_directories(src ${CMAKE_CURRENT_BINARY_DIR}) + link_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/2geom) + + check_cxx_source_compiles("#include <math.h>\nint main() { double a=0.5,b=0.5,c=0.5; sincos(a, &b, &c); return 0; }" HAVE_SINCOS) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index eefb3ac5..941dc4c7 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -1,7 +1,14 @@ +-add_library(gtest SHARED googletest/googletest/src/gtest-all.cc) +-target_include_directories(gtest PRIVATE googletest/googletest) +-target_link_libraries(gtest Threads::Threads) +-add_library(gtest_main STATIC googletest/googletest/src/gtest_main.cc) ++if(NOT GTEST_FOUND) ++ message("No system googletest library: using bundled copy.") ++ add_library(gtest SHARED googletest/googletest/src/gtest-all.cc) ++ add_library(gtest_main STATIC googletest/googletest/src/gtest_main.cc) ++ target_include_directories(gtest PRIVATE googletest/googletest) ++ target_link_libraries(gtest Threads::Threads) ++ include_directories(SYSTEM googletest/googletest/include) ++ # Aliases to share the same nomenclature with FindGTest. ++ add_library(GTest::GTest ALIAS gtest) ++ add_library(GTest::Main ALIAS gtest_main) ++endif() + + add_subdirectory(2geom) + add_subdirectory(tests) +diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt +index 626cfd87..3538f8cf 100644 +--- a/src/tests/CMakeLists.txt ++++ b/src/tests/CMakeLists.txt +@@ -34,15 +34,15 @@ foreach(source ${2GEOM_GTESTS_SRC}) + add_executable(${source} ${source}.cpp) + target_include_directories(${source} PRIVATE ${GSL_INCLUDE_DIRS} + ${GTK3_INCLUDE_DIRS} ${GLIB_INCLUDE_DIRS}) +- target_link_libraries(${source} 2geom gtest_main gtest ${GSL_LIBRARIES} +- ${GTK3_LIBRARIES} ${GLIB_LIBRARIES}) ++ target_link_libraries(${source} 2geom GTest::Main GTest::GTest ++ ${GSL_LIBRARIES} ${GTK3_LIBRARIES} ${GLIB_LIBRARIES}) + add_test(NAME ${source} COMMAND ${source}) + endforeach() + + foreach(source ${2GEOM_TESTS_SRC}) + add_executable(${source} ${source}.cpp) + target_include_directories(${source} PRIVATE ${GSL_INCLUDE_DIRS} ${GTK3_INCLUDE_DIRS}) +- target_link_libraries(${source} 2geom gtest ${GSL_LIBRARIES} ${GTK3_LIBRARIES}) ++ target_link_libraries(${source} 2geom GTest::GTest ${GSL_LIBRARIES} ${GTK3_LIBRARIES}) + add_test(NAME ${source} COMMAND ${source}) + endforeach(source) + +-- +2.24.1 + diff --git a/gnu/packages/patches/nss-CVE-2020-12399.patch b/gnu/packages/patches/nss-CVE-2020-12399.patch new file mode 100644 index 0000000000..0d91b655e2 --- /dev/null +++ b/gnu/packages/patches/nss-CVE-2020-12399.patch @@ -0,0 +1,138 @@ +Fix CVE-2020-12399 (Timing attack on DSA signature generation: NSS has +shown timing differences when performing DSA signatures, which was +exploitable and could eventually leak private keys.) + +Copied from upstream: +<https://hg.mozilla.org/projects/nss/rev/daa823a4a29bcef0fec33a379ec83857429aea2e> +but with "nss/" inserted into the file name to patch. + +# HG changeset patch +# User Robert Relyea <rrelyea@redhat.com> +# Date 1589907685 0 +# Node ID daa823a4a29bcef0fec33a379ec83857429aea2e +# Parent d2cfb4ccdf167e5ea06d2bb5bc39c50f789929c8 +Bug 1631576 - Force a fixed length for DSA exponentiation r=pereida,bbrumley + +Differential Revision: https://phabricator.services.mozilla.com/D72011 + +diff --git a/nss/lib/freebl/dsa.c b/nss/lib/freebl/dsa.c +--- a/nss/lib/freebl/dsa.c ++++ b/nss/lib/freebl/dsa.c +@@ -308,23 +308,24 @@ DSA_NewKeyFromSeed(const PQGParams *para + SECItem seedItem; + seedItem.data = (unsigned char *)seed; + seedItem.len = PQG_GetLength(¶ms->subPrime); + return dsa_NewKeyExtended(params, &seedItem, privKey); + } + + static SECStatus + dsa_SignDigest(DSAPrivateKey *key, SECItem *signature, const SECItem *digest, +- const unsigned char *kb) ++ const unsigned char *kbytes) + { + mp_int p, q, g; /* PQG parameters */ + mp_int x, k; /* private key & pseudo-random integer */ + mp_int r, s; /* tuple (r, s) is signature) */ + mp_int t; /* holding tmp values */ + mp_int ar; /* holding blinding values */ ++ mp_digit fuzz; /* blinding multiplier for q */ + mp_err err = MP_OKAY; + SECStatus rv = SECSuccess; + unsigned int dsa_subprime_len, dsa_signature_len, offset; + SECItem localDigest; + unsigned char localDigestData[DSA_MAX_SUBPRIME_LEN]; + SECItem t2 = { siBuffer, NULL, 0 }; + + /* FIPS-compliance dictates that digest is a SHA hash. */ +@@ -368,31 +369,46 @@ dsa_SignDigest(DSAPrivateKey *key, SECIt + CHECK_MPI_OK(mp_init(&q)); + CHECK_MPI_OK(mp_init(&g)); + CHECK_MPI_OK(mp_init(&x)); + CHECK_MPI_OK(mp_init(&k)); + CHECK_MPI_OK(mp_init(&r)); + CHECK_MPI_OK(mp_init(&s)); + CHECK_MPI_OK(mp_init(&t)); + CHECK_MPI_OK(mp_init(&ar)); ++ + /* + ** Convert stored PQG and private key into MPI integers. + */ + SECITEM_TO_MPINT(key->params.prime, &p); + SECITEM_TO_MPINT(key->params.subPrime, &q); + SECITEM_TO_MPINT(key->params.base, &g); + SECITEM_TO_MPINT(key->privateValue, &x); +- OCTETS_TO_MPINT(kb, &k, dsa_subprime_len); ++ OCTETS_TO_MPINT(kbytes, &k, dsa_subprime_len); ++ ++ /* k blinding create a single value that has the high bit set in ++ * the mp_digit*/ ++ if (RNG_GenerateGlobalRandomBytes(&fuzz, sizeof(mp_digit)) != SECSuccess) { ++ PORT_SetError(SEC_ERROR_NEED_RANDOM); ++ rv = SECFailure; ++ goto cleanup; ++ } ++ fuzz |= 1ULL << ((sizeof(mp_digit) * PR_BITS_PER_BYTE - 1)); + /* + ** FIPS 186-1, Section 5, Step 1 + ** + ** r = (g**k mod p) mod q + */ +- CHECK_MPI_OK(mp_exptmod(&g, &k, &p, &r)); /* r = g**k mod p */ +- CHECK_MPI_OK(mp_mod(&r, &q, &r)); /* r = r mod q */ ++ CHECK_MPI_OK(mp_mul_d(&q, fuzz, &t)); /* t = q*fuzz */ ++ CHECK_MPI_OK(mp_add(&k, &t, &t)); /* t = k+q*fuzz */ ++ /* length of t is now fixed, bits in k have been blinded */ ++ CHECK_MPI_OK(mp_exptmod(&g, &t, &p, &r)); /* r = g**t mod p */ ++ /* r is now g**(k+q*fuzz) == g**k mod p */ ++ CHECK_MPI_OK(mp_mod(&r, &q, &r)); /* r = r mod q */ ++ + /* + ** FIPS 186-1, Section 5, Step 2 + ** + ** s = (k**-1 * (HASH(M) + x*r)) mod q + */ + if (DSA_NewRandom(NULL, &key->params.subPrime, &t2) != SECSuccess) { + PORT_SetError(SEC_ERROR_NEED_RANDOM); + rv = SECFailure; +@@ -406,25 +422,34 @@ dsa_SignDigest(DSAPrivateKey *key, SECIt + goto cleanup; + } + SECITEM_TO_MPINT(t2, &ar); /* ar <-$ Zq */ + SECITEM_FreeItem(&t2, PR_FALSE); + + /* Using mp_invmod on k directly would leak bits from k. */ + CHECK_MPI_OK(mp_mul(&k, &ar, &k)); /* k = k * ar */ + CHECK_MPI_OK(mp_mulmod(&k, &t, &q, &k)); /* k = k * t mod q */ +- CHECK_MPI_OK(mp_invmod(&k, &q, &k)); /* k = k**-1 mod q */ ++ /* k is now k*t*ar */ ++ CHECK_MPI_OK(mp_invmod(&k, &q, &k)); /* k = k**-1 mod q */ ++ /* k is now (k*t*ar)**-1 */ + CHECK_MPI_OK(mp_mulmod(&k, &t, &q, &k)); /* k = k * t mod q */ +- SECITEM_TO_MPINT(localDigest, &s); /* s = HASH(M) */ ++ /* k is now (k*ar)**-1 */ ++ SECITEM_TO_MPINT(localDigest, &s); /* s = HASH(M) */ + /* To avoid leaking secret bits here the addition is blinded. */ +- CHECK_MPI_OK(mp_mul(&x, &ar, &x)); /* x = x * ar */ +- CHECK_MPI_OK(mp_mulmod(&x, &r, &q, &x)); /* x = x * r mod q */ ++ CHECK_MPI_OK(mp_mul(&x, &ar, &x)); /* x = x * ar */ ++ /* x is now x*ar */ ++ CHECK_MPI_OK(mp_mulmod(&x, &r, &q, &x)); /* x = x * r mod q */ ++ /* x is now x*r*ar */ + CHECK_MPI_OK(mp_mulmod(&s, &ar, &q, &t)); /* t = s * ar mod q */ +- CHECK_MPI_OK(mp_add(&t, &x, &s)); /* s = t + x */ +- CHECK_MPI_OK(mp_mulmod(&s, &k, &q, &s)); /* s = s * k mod q */ ++ /* t is now hash(M)*ar */ ++ CHECK_MPI_OK(mp_add(&t, &x, &s)); /* s = t + x */ ++ /* s is now (HASH(M)+x*r)*ar */ ++ CHECK_MPI_OK(mp_mulmod(&s, &k, &q, &s)); /* s = s * k mod q */ ++ /* s is now (HASH(M)+x*r)*ar*(k*ar)**-1 = (k**-1)*(HASH(M)+x*r) */ ++ + /* + ** verify r != 0 and s != 0 + ** mentioned as optional in FIPS 186-1. + */ + if (mp_cmp_z(&r) == 0 || mp_cmp_z(&s) == 0) { + PORT_SetError(SEC_ERROR_NEED_RANDOM); + rv = SECFailure; + goto cleanup; + diff --git a/gnu/packages/patches/openscad-parser-boost-1.72.patch b/gnu/packages/patches/openscad-parser-boost-1.72.patch new file mode 100644 index 0000000000..35311e6173 --- /dev/null +++ b/gnu/packages/patches/openscad-parser-boost-1.72.patch @@ -0,0 +1,26 @@ +https://github.com/openscad/openscad/commit/b6c170cc5d.patch + +From b6c170cc5dd1bc677176ee732cdb0ddae57e5cf0 Mon Sep 17 00:00:00 2001 +From: Jan Beich <jbeich@FreeBSD.org> +Date: Fri, 25 Oct 2019 15:10:26 +0000 +Subject: [PATCH] Add missing header bootlegged by Boost < 1.72 + +src/parser.y:76:6: error: no template named 'stack' in namespace 'std' +std::stack<LocalScope *> scope_stack; +~~~~~^ +--- + src/parser.y | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/parser.y b/src/parser.y +index 7f4fd56ca7..4c77c989ea 100644 +--- a/src/parser.y ++++ b/src/parser.y +@@ -46,6 +46,7 @@ + #include "printutils.h" + #include "memory.h" + #include <sstream> ++#include <stack> + #include <boost/filesystem.hpp> + #include "boost-utils.h" + #include "feature.h" diff --git a/gnu/packages/patches/plotutils-libpng-jmpbuf.patch b/gnu/packages/patches/plotutils-libpng-jmpbuf.patch deleted file mode 100644 index 07ef60996c..0000000000 --- a/gnu/packages/patches/plotutils-libpng-jmpbuf.patch +++ /dev/null @@ -1,23 +0,0 @@ -Use the `png_jmpbuf' accessor, as recommended since libpng 1.4.0: -http://www.libpng.org/pub/png/src/libpng-1.2.x-to-1.4.x-summary.txt . - ---- plotutils-2.6/libplot/z_write.c 2013-07-12 17:19:12.000000000 +0200 -+++ plotutils-2.6/libplot/z_write.c 2013-07-12 17:19:07.000000000 +0200 -@@ -164,7 +164,7 @@ _pl_z_maybe_output_image (S___(Plotter * - } - - /* cleanup after libpng errors (error handler does a longjmp) */ -- if (setjmp (png_ptr->jmpbuf)) -+ if (setjmp (png_jmpbuf (png_ptr))) - { - png_destroy_write_struct (&png_ptr, (png_info **)NULL); - return -1; -@@ -444,7 +444,7 @@ _our_error_fn_stdio (png_struct *png_ptr - #endif - } - -- longjmp (png_ptr->jmpbuf, 1); -+ longjmp (png_jmpbuf (png_ptr), 1); - } - - static void diff --git a/gnu/packages/patches/pypy3-7.3.1-fix-tests.patch b/gnu/packages/patches/pypy3-7.3.1-fix-tests.patch new file mode 100644 index 0000000000..464aad967f --- /dev/null +++ b/gnu/packages/patches/pypy3-7.3.1-fix-tests.patch @@ -0,0 +1,278 @@ +Fix a few testcases. Adapted from python-3-fix-tests.patch. + +diff -Naur pypy3.6-v7.3.1-src.orig/lib-python/3/ctypes/test/test_callbacks.py pypy3.6-v7.3.1-src/lib-python/3/ctypes/test/test_callbacks.py +--- pypy3.6-v7.3.1-src.orig/lib-python/3/ctypes/test/test_callbacks.py 1970-01-01 01:00:01.000000000 +0100 ++++ pypy3.6-v7.3.1-src/lib-python/3/ctypes/test/test_callbacks.py 2020-05-21 14:19:14.827288853 +0200 +@@ -4,6 +4,7 @@ + from ctypes import * + from ctypes.test import need_symbol + import _ctypes_test ++import platform + + class Callbacks(unittest.TestCase): + functype = CFUNCTYPE +@@ -178,6 +179,8 @@ + + self.assertLess(diff, 0.01, "%s not less than 0.01" % diff) + ++ @unittest.skipIf(platform.machine() in ['mips64'], ++ "This test fails on this platform") + def test_issue_8959_a(self): + from ctypes.util import find_library + libc_path = find_library("c") +diff -Naur pypy3.6-v7.3.1-src.orig/lib-python/3/ctypes/test/test_libc.py pypy3.6-v7.3.1-src/lib-python/3/ctypes/test/test_libc.py +--- pypy3.6-v7.3.1-src.orig/lib-python/3/ctypes/test/test_libc.py 1970-01-01 01:00:01.000000000 +0100 ++++ pypy3.6-v7.3.1-src/lib-python/3/ctypes/test/test_libc.py 2020-05-21 14:19:14.827288853 +0200 +@@ -2,6 +2,7 @@ + + from ctypes import * + import _ctypes_test ++import platform + + lib = CDLL(_ctypes_test.__file__) + +@@ -17,6 +18,8 @@ + import math + self.assertEqual(lib.my_sqrt(2.0), math.sqrt(2.0)) + ++ @unittest.skipIf(platform.machine() in ['mips64'], ++ "This test fails on this platform") + def test_qsort(self): + comparefunc = CFUNCTYPE(c_int, POINTER(c_char), POINTER(c_char)) + lib.my_qsort.argtypes = c_void_p, c_size_t, c_size_t, comparefunc +diff -Naur pypy3.6-v7.3.1-src.orig/lib-python/3/distutils/tests/test_archive_util.py pypy3.6-v7.3.1-src/lib-python/3/distutils/tests/test_archive_util.py +--- pypy3.6-v7.3.1-src.orig/lib-python/3/distutils/tests/test_archive_util.py 1970-01-01 01:00:01.000000000 +0100 ++++ pypy3.6-v7.3.1-src/lib-python/3/distutils/tests/test_archive_util.py 2020-05-21 14:19:14.827288853 +0200 +@@ -333,6 +333,7 @@ + self.assertEqual(os.path.basename(res), 'archive.tar.xz') + self.assertEqual(self._tarinfo(res), self._created_files) + ++ @unittest.skipIf(True, "getgrgid(0)[0] raises a KeyError on Guix") + def test_make_archive_owner_group(self): + # testing make_archive with owner and group, with various combinations + # this works even if there's not gid/uid support +@@ -362,6 +363,7 @@ + + @unittest.skipUnless(ZLIB_SUPPORT, "Requires zlib") + @unittest.skipUnless(UID_GID_SUPPORT, "Requires grp and pwd support") ++ @unittest.skipIf(True, "getgrgid(0)[0] raises a KeyError on Guix") + def test_tarfile_root_owner(self): + tmpdir = self._create_files() + base_name = os.path.join(self.mkdtemp(), 'archive') +diff -Naur pypy3.6-v7.3.1-src.orig/lib-python/3/distutils/tests/test_sdist.py pypy3.6-v7.3.1-src/lib-python/3/distutils/tests/test_sdist.py +--- pypy3.6-v7.3.1-src.orig/lib-python/3/distutils/tests/test_sdist.py 1970-01-01 01:00:01.000000000 +0100 ++++ pypy3.6-v7.3.1-src/lib-python/3/distutils/tests/test_sdist.py 2020-05-21 14:19:14.827288853 +0200 +@@ -443,6 +443,7 @@ + "The tar command is not found") + @unittest.skipIf(find_executable('gzip') is None, + "The gzip command is not found") ++ @unittest.skipIf(True, "getgrgid(0)[0] raises a KeyError on Guix") + def test_make_distribution_owner_group(self): + # now building a sdist + dist, cmd = self.get_cmd() +diff -Naur pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_asyncio/test_base_events.py pypy3.6-v7.3.1-src/lib-python/3/test/test_asyncio/test_base_events.py +--- pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_asyncio/test_base_events.py 1970-01-01 01:00:01.000000000 +0100 ++++ pypy3.6-v7.3.1-src/lib-python/3/test/test_asyncio/test_base_events.py 2020-05-21 14:19:14.827288853 +0200 +@@ -1296,6 +1296,8 @@ + self._test_create_connection_ip_addr(m_socket, False) + + @patch_socket ++ @unittest.skipUnless(support.is_resource_enabled('network'), ++ 'network is not enabled') + def test_create_connection_service_name(self, m_socket): + m_socket.getaddrinfo = socket.getaddrinfo + sock = m_socket.socket.return_value +diff -Naur pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_generators.py pypy3.6-v7.3.1-src/lib-python/3/test/test_generators.py +--- pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_generators.py 1970-01-01 01:00:01.000000000 +0100 ++++ pypy3.6-v7.3.1-src/lib-python/3/test/test_generators.py 2020-05-21 14:19:14.827288853 +0200 +@@ -35,6 +35,7 @@ + else: + return "FAILED" + ++ @unittest.skipIf(True, 'Keyboard interrupts do not work in the Guix build environment') + def test_raise_and_yield_from(self): + gen = self.generator1() + gen.send(None) +diff -Naur pypy3.6-v7.3.1-src.orig/lib-python/3/test/_test_multiprocessing.py pypy3.6-v7.3.1-src/lib-python/3/test/_test_multiprocessing.py +--- pypy3.6-v7.3.1-src.orig/lib-python/3/test/_test_multiprocessing.py 1970-01-01 01:00:01.000000000 +0100 ++++ pypy3.6-v7.3.1-src/lib-python/3/test/_test_multiprocessing.py 2020-05-21 14:19:14.827288853 +0200 +@@ -1212,6 +1212,7 @@ + if pid is not None: + os.kill(pid, signal.SIGINT) + ++ @unittest.skipIf(True, "This fails for unknown reasons on Guix") + def test_wait_result(self): + if isinstance(self, ProcessesMixin) and sys.platform != 'win32': + pid = os.getpid() +diff -Naur pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_normalization.py pypy3.6-v7.3.1-src/lib-python/3/test/test_normalization.py +--- pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_normalization.py 1970-01-01 01:00:01.000000000 +0100 ++++ pypy3.6-v7.3.1-src/lib-python/3/test/test_normalization.py 2020-05-21 14:19:14.827288853 +0200 +@@ -2,6 +2,7 @@ + import unittest + + from http.client import HTTPException ++from urllib.error import URLError + import sys + from unicodedata import normalize, unidata_version + +@@ -43,6 +44,8 @@ + except PermissionError: + self.skipTest(f"Permission error when downloading {TESTDATAURL} " + f"into the test data directory") ++ except URLError: ++ self.skipTest("DNS lookups are not enabled.") + except (OSError, HTTPException): + self.fail(f"Could not retrieve {TESTDATAURL}") + +diff -Naur pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_pathlib.py pypy3.6-v7.3.1-src/lib-python/3/test/test_pathlib.py +--- pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_pathlib.py 1970-01-01 01:00:01.000000000 +0100 ++++ pypy3.6-v7.3.1-src/lib-python/3/test/test_pathlib.py 2020-05-21 14:19:14.827288853 +0200 +@@ -2130,8 +2130,7 @@ + self.assertEqual(given, expect) + self.assertEqual(set(p.rglob("FILEd*")), set()) + +- @unittest.skipUnless(hasattr(pwd, 'getpwall'), +- 'pwd module does not expose getpwall()') ++ @unittest.skipIf(True, "Guix builder home is '/' which causes trouble for these tests") + def test_expanduser(self): + P = self.cls + support.import_module('pwd') +diff -Naur pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_pdb.py pypy3.6-v7.3.1-src/lib-python/3/test/test_pdb.py +--- pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_pdb.py 1970-01-01 01:00:01.000000000 +0100 ++++ pypy3.6-v7.3.1-src/lib-python/3/test/test_pdb.py 2020-05-21 14:20:24.377203281 +0200 +@@ -1136,11 +1136,11 @@ + > <doctest test.test_pdb.test_pdb_issue_20766[0]>(6)test_function() + -> print('pdb %d: %s' % (i, sess._previous_sigint_handler)) + (Pdb) continue +- pdb 1: <built-in function default_int_handler> ++ pdb 1: Handlers.SIG_IGN + > <doctest test.test_pdb.test_pdb_issue_20766[0]>(6)test_function() + -> print('pdb %d: %s' % (i, sess._previous_sigint_handler)) + (Pdb) continue +- pdb 2: <built-in function default_int_handler> ++ pdb 2: Handlers.SIG_IGN + """ + + class PdbTestCase(unittest.TestCase): +diff -Naur pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_regrtest.py pypy3.6-v7.3.1-src/lib-python/3/test/test_regrtest.py +--- pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_regrtest.py 1970-01-01 01:00:01.000000000 +0100 ++++ pypy3.6-v7.3.1-src/lib-python/3/test/test_regrtest.py 2020-05-21 14:19:14.827288853 +0200 +@@ -766,6 +766,7 @@ + output = self.run_tests('--fromfile', filename) + self.check_executed_tests(output, tests) + ++ @unittest.skipIf(True, 'Keyboard interrupts do not work in the Guix build environment.') + def test_interrupted(self): + code = TEST_INTERRUPTED + test = self.create_test('sigint', code=code) +diff -Naur pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_resource.py pypy3.6-v7.3.1-src/lib-python/3/test/test_resource.py +--- pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_resource.py 1970-01-01 01:00:01.000000000 +0100 ++++ pypy3.6-v7.3.1-src/lib-python/3/test/test_resource.py 2020-05-21 14:19:14.827288853 +0200 +@@ -146,6 +146,7 @@ + + @unittest.skipUnless(hasattr(resource, 'prlimit'), 'no prlimit') + @support.requires_linux_version(2, 6, 36) ++ @unittest.skipIf(True, "Bug: the PermissionError is not raised") + def test_prlimit(self): + self.assertRaises(TypeError, resource.prlimit) + self.assertRaises(ProcessLookupError, resource.prlimit, +diff -Naur pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_shutil.py pypy3.6-v7.3.1-src/lib-python/3/test/test_shutil.py +--- pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_shutil.py 1970-01-01 01:00:01.000000000 +0100 ++++ pypy3.6-v7.3.1-src/lib-python/3/test/test_shutil.py 2020-05-21 14:19:14.827288853 +0200 +@@ -1138,6 +1138,7 @@ + self.assertRaises(ValueError, make_archive, base_name, 'xxx') + + @support.requires_zlib ++ @unittest.skipIf(True, "getgrgid(0)[0] raises a KeyError on Guix") + def test_make_archive_owner_group(self): + # testing make_archive with owner and group, with various combinations + # this works even if there's not gid/uid support +@@ -1166,6 +1167,7 @@ + + + @support.requires_zlib ++ @unittest.skipIf(True, "getgrgid(0)[0] raises a KeyError on Guix") + @unittest.skipUnless(UID_GID_SUPPORT, "Requires grp and pwd support") + def test_tarfile_root_owner(self): + root_dir, base_dir = self._create_files() +diff -Naur pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_socket.py pypy3.6-v7.3.1-src/lib-python/3/test/test_socket.py +--- pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_socket.py 1970-01-01 01:00:01.000000000 +0100 ++++ pypy3.6-v7.3.1-src/lib-python/3/test/test_socket.py 2020-05-21 14:19:14.827288853 +0200 +@@ -815,6 +815,8 @@ + if not fqhn in all_host_names: + self.fail("Error testing host resolution mechanisms. (fqdn: %s, all: %s)" % (fqhn, repr(all_host_names))) + ++ @unittest.skipUnless(support.is_resource_enabled('network'), ++ 'network is not enabled') + def test_host_resolution(self): + for addr in [support.HOST, '10.0.0.1', '255.255.255.255']: + self.assertEqual(socket.gethostbyname(addr), addr) +@@ -934,6 +936,8 @@ + self.assertRaises(OverflowError, socket.htonl, k) + self.assertRaises(OverflowError, socket.htons, k) + ++ @unittest.skipUnless(os.path.exists("/etc/services"), ++ "getservbyname uses /etc/services, which is not in the chroot") + def testGetServBy(self): + eq = self.assertEqual + # Find one service that exists, then check all the related interfaces. +@@ -1278,6 +1282,8 @@ + raise + self.assertRaises(TypeError, s.ioctl, socket.SIO_LOOPBACK_FAST_PATH, None) + ++ @unittest.skipUnless(os.path.exists("/etc/gai.conf"), ++ "getaddrinfo() will fail") + def testGetaddrinfo(self): + try: + socket.getaddrinfo('localhost', 80) +@@ -1357,6 +1363,8 @@ + # only IP addresses are allowed + self.assertRaises(OSError, socket.getnameinfo, ('mail.python.org',0), 0) + ++ @unittest.skipUnless(os.path.exists("/etc/gai.conf"), ++ "getaddrinfo() will fail") + @unittest.skipUnless(support.is_resource_enabled('network'), + 'network is not enabled') + def test_idna(self): +diff -Naur pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_spwd.py pypy3.6-v7.3.1-src/lib-python/3/test/test_spwd.py +--- pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_spwd.py 1970-01-01 01:00:01.000000000 +0100 ++++ pypy3.6-v7.3.1-src/lib-python/3/test/test_spwd.py 2020-05-21 14:19:14.827288853 +0200 +@@ -5,8 +5,7 @@ + spwd = support.import_module('spwd') + + +-@unittest.skipUnless(hasattr(os, 'geteuid') and os.geteuid() == 0, +- 'root privileges required') ++@unittest.skipUnless(os.path.exists("/etc/shadow"), 'spwd tests require /etc/shadow') + class TestSpwdRoot(unittest.TestCase): + + def test_getspall(self): +@@ -56,8 +55,7 @@ + self.assertRaises(TypeError, spwd.getspnam, bytes_name) + + +-@unittest.skipUnless(hasattr(os, 'geteuid') and os.geteuid() != 0, +- 'non-root user required') ++@unittest.skipUnless(os.path.exists("/etc/shadow"), 'spwd tests require /etc/shadow') + class TestSpwdNonRoot(unittest.TestCase): + + def test_getspnam_exception(self): +diff -Naur pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_tarfile.py pypy3.6-v7.3.1-src/lib-python/3/test/test_tarfile.py +--- pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_tarfile.py 1970-01-01 01:00:01.000000000 +0100 ++++ pypy3.6-v7.3.1-src/lib-python/3/test/test_tarfile.py 2020-05-21 14:19:14.827288853 +0200 +@@ -2491,9 +2491,12 @@ + import pwd, grp + except ImportError: + return False +- if pwd.getpwuid(0)[0] != 'root': +- return False +- if grp.getgrgid(0)[0] != 'root': ++ try: ++ if pwd.getpwuid(0)[0] != 'root': ++ return False ++ if grp.getgrgid(0)[0] != 'root': ++ return False ++ except KeyError: + return False + return True + diff --git a/gnu/packages/patches/websocketpp-fix-for-boost-1.70.patch b/gnu/packages/patches/websocketpp-fix-for-boost-1.70.patch deleted file mode 100644 index ece414a1cb..0000000000 --- a/gnu/packages/patches/websocketpp-fix-for-boost-1.70.patch +++ /dev/null @@ -1,103 +0,0 @@ -This patch for Boost >= 1.70 was made by merging two patches that -are in the 'develop' branch (c769c92 and f810ca2). - -diff -u b/websocketpp/transport/asio/connection.hpp b/websocketpp/transport/asio/connection.hpp ---- b/websocketpp/transport/asio/connection.hpp -+++ b/websocketpp/transport/asio/connection.hpp -@@ -311,9 +311,10 @@ - * needed. - */ - timer_ptr set_timer(long duration, timer_handler callback) { -- timer_ptr new_timer = lib::make_shared<lib::asio::steady_timer>( -- lib::ref(*m_io_service), -- lib::asio::milliseconds(duration) -+ timer_ptr new_timer( -+ new lib::asio::steady_timer( -+ *m_io_service, -+ lib::asio::milliseconds(duration)) - ); - - if (config::enable_multithreading) { -@@ -461,8 +462,7 @@ - m_io_service = io_service; - - if (config::enable_multithreading) { -- m_strand = lib::make_shared<lib::asio::io_service::strand>( -- lib::ref(*io_service)); -+ m_strand.reset(new lib::asio::io_service::strand(*io_service)); - } - - lib::error_code ec = socket_con_type::init_asio(io_service, m_strand, -diff -u b/websocketpp/transport/asio/endpoint.hpp b/websocketpp/transport/asio/endpoint.hpp ---- b/websocketpp/transport/asio/endpoint.hpp -+++ b/websocketpp/transport/asio/endpoint.hpp -@@ -195,8 +195,7 @@ - - m_io_service = ptr; - m_external_io_service = true; -- m_acceptor = lib::make_shared<lib::asio::ip::tcp::acceptor>( -- lib::ref(*m_io_service)); -+ m_acceptor.reset(new lib::asio::ip::tcp::acceptor(*m_io_service)); - - m_state = READY; - ec = lib::error_code(); -@@ -688,9 +687,7 @@ - * @since 0.3.0 - */ - void start_perpetual() { -- m_work = lib::make_shared<lib::asio::io_service::work>( -- lib::ref(*m_io_service) -- ); -+ m_work.reset(new lib::asio::io_service::work(*m_io_service)); - } - - /// Clears the endpoint's perpetual flag, allowing it to exit when empty -@@ -854,8 +851,7 @@ - - // Create a resolver - if (!m_resolver) { -- m_resolver = lib::make_shared<lib::asio::ip::tcp::resolver>( -- lib::ref(*m_io_service)); -+ m_resolver.reset(new lib::asio::ip::tcp::resolver(*m_io_service)); - } - - tcon->set_uri(u); -unchanged: ---- a/websocketpp/transport/asio/security/none.hpp -+++ b/websocketpp/transport/asio/security/none.hpp -@@ -168,8 +168,7 @@ protected: - return socket::make_error_code(socket::error::invalid_state); - } - -- m_socket = lib::make_shared<lib::asio::ip::tcp::socket>( -- lib::ref(*service)); -+ m_socket.reset(new lib::asio::ip::tcp::socket(*service)); - - if (m_socket_init_handler) { - m_socket_init_handler(m_hdl, *m_socket); -unchanged: ---- a/websocketpp/transport/asio/security/tls.hpp -+++ b/websocketpp/transport/asio/security/tls.hpp -@@ -193,8 +193,7 @@ protected: - if (!m_context) { - return socket::make_error_code(socket::error::invalid_tls_context); - } -- m_socket = lib::make_shared<socket_type>( -- _WEBSOCKETPP_REF(*service),lib::ref(*m_context)); -+ m_socket.reset(new socket_type(*service, *m_context)); - - if (m_socket_init_handler) { - m_socket_init_handler(m_hdl, get_socket()); -only in patch2: -unchanged: ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -202,7 +202,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES) - endif () - - if (NOT Boost_USE_STATIC_LIBS) -- add_definitions (/DBOOST_TEST_DYN_LINK) -+ add_definitions (-DBOOST_TEST_DYN_LINK) - endif () - - set (Boost_FIND_REQUIRED TRUE) diff --git a/gnu/packages/patches/websocketpp-fix-for-cmake-3.15.patch b/gnu/packages/patches/websocketpp-fix-for-cmake-3.15.patch new file mode 100644 index 0000000000..ea759d022b --- /dev/null +++ b/gnu/packages/patches/websocketpp-fix-for-cmake-3.15.patch @@ -0,0 +1,17 @@ +From: Tobias Geerinckx-Rice <me@tobias.gr> +Date: Fri, 05 Jun 2020 18:37:51 +0200 +Subject: [PATCH] gnu: websocketpp: Fix build with CMake >= 3.15. + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 57ed01e78..43c772d78 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -215,7 +215,7 @@ + set (Boost_USE_MULTITHREADED TRUE) + set (Boost_ADDITIONAL_VERSIONS "1.39.0" "1.40.0" "1.41.0" "1.42.0" "1.43.0" "1.44.0" "1.46.1") # todo: someone who knows better spesify these! + +- find_package (Boost 1.39.0 COMPONENTS "${WEBSOCKETPP_BOOST_LIBS}") ++ find_package (Boost 1.39.0 COMPONENTS ${WEBSOCKETPP_BOOST_LIBS}) + + if (Boost_FOUND) + # Boost is a project wide global dependency. diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index edd492c711..f6881f6776 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2016, 2017, 2019, 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -56,7 +57,6 @@ (sha256 (base32 "1arkyizn5wbgvbh53aziv3s6lmd3wm9lqzkhxb3hijlp1y124hjg")) - (patches (search-patches "plotutils-libpng-jmpbuf.patch")) (modules '((guix build utils))) (snippet ;; Force the use of libXaw7 instead of libXaw. When not doing @@ -67,22 +67,28 @@ (substitute* "configure" (("-lXaw") "-lXaw7")) + ;; Use the `png_jmpbuf' accessor, as recommended since libpng + ;; 1.4.0 (see: + ;; http://www.libpng.org/pub/png/src/libpng-1.2.x-to-1.4.x-summary.txt). + (substitute* "libplot/z_write.c" + (("png_ptr->jmpbuf") + "png_jmpbuf (png_ptr)")) #t)))) (build-system gnu-build-system) + (arguments + `(#:configure-flags (list "--enable-libplotter"))) (inputs `(("libpng" ,libpng) ("libx11" ,libx11) ("libxt" ,libxt) ("libxaw" ,libxaw))) - - (home-page - "https://www.gnu.org/software/plotutils/") + (home-page "https://www.gnu.org/software/plotutils/") (synopsis "Plotting utilities and library") (description - "GNU Plotutils is a package for plotting and working with 2D graphics. -It includes a library, \"libplot\", for C and C++ for exporting 2D vector -graphics in many file formats. It also has support for 2D vector graphics -animations. The package also contains command-line programs for plotting -scientific data.") + "GNU Plotutils is a package for plotting and working with 2D graphics. +It includes the C library @code{libplot} and the C++ @code{libplotter} library +for exporting 2D vector graphics in many file formats. It also has support +for 2D vector graphics animations. The package also contains command-line +programs for plotting scientific data.") (license license:gpl2+))) (define-public guile-charting diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm index f7655c3535..c4bdbe9000 100644 --- a/gnu/packages/pretty-print.scm +++ b/gnu/packages/pretty-print.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017 Ludovic Courtès <ludo@gnu.org> -;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019 Meiyo Peng <meiyo@riseup.net> ;;; Copyright © 2020 Paul Garlick <pgarlick@tourbillion-technology.com> ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> @@ -168,14 +168,14 @@ different programming languages.") (define-public fmt (package (name "fmt") - (version "6.1.2") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/fmtlib/fmt/releases/download/" - version "/fmt-" version ".zip")) - (sha256 - (base32 - "1s1hxaby5byb07rgmrk4a0q11fxhz7b42khch7sp2qx974y0yrb3")))) + (version "6.2.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/fmtlib/fmt/releases/download/" + version "/fmt-" version ".zip")) + (sha256 + (base32 "06l8g59frbsbwj15kg6x2bbn6p8yidh6wzsigdhbdjncvm1agzll")))) (build-system cmake-build-system) (arguments '(#:configure-flags '("-DBUILD_SHARED_LIBS=ON"))) diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 9934abbf31..5c9c251c01 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015, 2016, 2017, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016 Danny Milosavljevic <dannym+a@scratchpost.org> -;;; Copyright © 2016, 2017 Arun Isaac <arunisaac@systemreboot.net> +;;; Copyright © 2016, 2017, 2020 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2017 Carlo Zancanaro <carlo@zancanaro.id.au> ;;; Copyright © 2018 Tomáš Čech <sleep_walker@gnu.org> ;;; Copyright © 2018 Nicolas Goaziou <mail@nicolasgoaziou.fr> @@ -612,22 +612,15 @@ library.") (define-public python-axolotl-curve25519 (package (name "python-axolotl-curve25519") - (version "0.1") + (version "0.4.1.post2") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/tgalal/python-axolotl-curve25519") - (commit "e4a9c4de0eae27223200579c58d1f8f6d20637e2"))) - (file-name (string-append name "-" version "-checkout")) + (method url-fetch) + (uri (pypi-uri "python-axolotl-curve25519" version)) (sha256 (base32 - "0agap5q0hmvf6cwzjqc05kw53pjgf6942pcivpazksmg1vk400ra")))) + "18v3rfyv7xi26fb97nw1xc0l6x8wi0i4xj8dlq4gblpbjxiac187")))) (build-system python-build-system) - (arguments - `(;; Prevent creation of the egg. This works around - ;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=20765 - #:configure-flags '("--root=/"))) (home-page "https://github.com/tgalal/python-axolotl-curve25519") (synopsis "Python wrapper for curve25519 library") (description "This is a python wrapper for the curve25519 library @@ -643,17 +636,14 @@ python-axolotl.") (define-public python-axolotl (package (name "python-axolotl") - (version "0.1.39") + (version "0.2.3") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/tgalal/python-axolotl") - (commit version))) - (file-name (git-file-name name version)) - (patches (search-patches "python-axolotl-AES-fix.patch")) + (method url-fetch) + (uri (pypi-uri "python-axolotl" version)) (sha256 - (base32 "0xm9qgcwf6fq7rhzfcviwhbzcbj4i7wkxkab2z55fy1x82lya9g6")))) + (base32 + "1bwdp24fmriffwx91aigs9k162albb51iskp23nc939z893q23py")))) (build-system python-build-system) (arguments `(#:phases @@ -666,9 +656,8 @@ python-axolotl.") #t))))) (propagated-inputs `(("python-axolotl-curve25519" ,python-axolotl-curve25519) - ("python-dateutil" ,python-dateutil) - ("python-protobuf" ,python-protobuf) - ("python-pycrypto" ,python-pycrypto))) + ("python-cryptography" ,python-cryptography) + ("python-protobuf" ,python-protobuf))) (home-page "https://github.com/tgalal/python-axolotl") (synopsis "Python port of libaxolotl-android") (description "This is a python port of libaxolotl-android. This diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 379062c078..acd00ce602 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -324,20 +324,20 @@ over a different origin than that of the web application.") (define-public python-furl (package (name "python-furl") - (version "0.5.6") + (version "2.0.0") (source (origin (method url-fetch) (uri (pypi-uri "furl" version)) (sha256 (base32 - "0lzpfpm686hvz3sr1mcrnd1b3lgmnw8v59gb43wfi98r3b671pqc")))) + "1v2lakx03d5w8954a39ki44xv5mllnq0a0avhxykv9hrzg0yvjpx")))) (build-system python-build-system) (propagated-inputs `(("python-six" ,python-six) ("python-orderedmultidict" ,python-orderedmultidict))) (native-inputs - `(("python-pycodestyle" ,python-pycodestyle))) + `(("python-flake8" ,python-flake8))) (home-page "https://github.com/gruns/furl") (synopsis "URL manipulation in Python") (description "Furl provides an easy-to-use alternative to the diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1418c19813..151d4a2648 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -80,6 +80,7 @@ ;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com> ;;; Copyright © 2020 Josh Holland <josh@inv.alid.pw> ;;; Copyright © 2020 Yuval Kogman <nothingmuch@woobling.org> +;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1206,17 +1207,25 @@ class.") (define-public python-can (package (name "python-can") - (version "3.3.2") + (version "3.3.3") (source (origin (method url-fetch) (uri (pypi-uri "python-can" version)) (sha256 (base32 - "0bkbxi45sckzir6s0j3h01pkfn4vkz3ymih2zjp7zw77wz0vbvsz")))) + "123lz1bl6xf3d0fvxzr4bg4884yg4m9s21z6xd2m68zhnbv9rmpc")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'relax-version-requirements + (lambda _ + (substitute* "setup.py" + (("mock~=2\\.0") "mock") + (("coverage<5") "coverage") + (("pytest~=4\\.3") "pytest") + (("hypothesis~=4\\.56") "hypothesis")) + #t)) (add-after 'unpack 'fix-broken-tests ;; The tests try to run two scripts it expects should be ;; in PATH, but they aren't at this time (see: @@ -1231,6 +1240,7 @@ class.") ("python-wrapt" ,python-wrapt))) (native-inputs `(("python-codecov" ,python-codecov) + ("python-coverage" ,python-coverage) ("python-future" ,python-future) ("python-hypothesis" ,python-hypothesis) ("python-mock" ,python-mock) @@ -1245,7 +1255,7 @@ class.") controller area network (CAN) support for Python developers; providing common abstractions to different hardware devices, and a suite of utilities for sending and receiving messages on a CAN bus.") - (license license:gpl3+))) + (license license:lgpl3+))) (define-public python-diskcache (package @@ -3726,14 +3736,14 @@ which can produce feeds in RSS 2.0, RSS 0.91, and Atom formats.") (define-public python-toml (package (name "python-toml") - (version "0.9.4") + (version "0.10.1") (source (origin (method url-fetch) (uri (pypi-uri "toml" version)) (sha256 (base32 - "0bdbpbip67wdm6c7xwc6mmbmskyradj4cdxn1iibj4fcx1nbv1lf")))) + "03wbqm5cn685cwx2664hjdpz370njl7lf0yal8s0dkp5w4mn2swj")))) (build-system python-build-system) (arguments `(#:tests? #f)) ;no tests suite in release @@ -5082,14 +5092,14 @@ where key might be occurred more than once in the container.") (define-public python-orderedmultidict (package (name "python-orderedmultidict") - (version "0.7.11") + (version "1.0") (source (origin (method url-fetch) (uri (pypi-uri "orderedmultidict" version)) (sha256 (base32 - "0dls862ibm7qbq4fnvwx0xn1v9hwyzywbff8xjjdr42dd75208yw")))) + "1idjbl933avgaadscrjw1np3xkvnz3phq0l8vw5qs0rqcjx9b65q")))) (build-system python-build-system) (arguments `(#:phases @@ -7326,14 +7336,13 @@ It is written entirely in Python.") (define-public python-backports-csv (package (name "python-backports-csv") - (version "1.0.5") + (version "1.0.7") (source (origin (method url-fetch) (uri (pypi-uri "backports.csv" version)) (sha256 - (base32 - "1imzbrradkfn8s2m1qcimyn74dn1mz2p3j381jljn166rf2i6hlc")))) + (base32 "0vdx5jlhs91iizc8j8l8811nqprwvdx39pgkdc82w2qkfgzxyxqj")))) (build-system python-build-system) (home-page "https://github.com/ryanhiebert/backports.csv") (synopsis "Backport of Python 3's csv module for Python 2") @@ -8996,17 +9005,18 @@ interactive computing.") (define-public python-widgetsnbextension (package (name "python-widgetsnbextension") - (version "3.4.2") + (version "3.5.1") (source (origin (method url-fetch) (uri (pypi-uri "widgetsnbextension" version)) (sha256 (base32 - "0rc2nivdy7k4m3vljx7wdh2jh11djapcgwhvzlbs0isl8gl8nqgs")))) + "1ismyaxbv9d56yqqqb8xl58hg0iq0bbyy014a53y1g3hfbc8g7q7")))) (build-system python-build-system) (propagated-inputs - `(("python-ipykernel" ,python-ipykernel) + `(("python-ipykernel" + ,(prompt-toolkit-2-instead-of-prompt-toolkit python-ipykernel)) ("python-notebook" ,python-notebook))) (native-inputs `(("python-certifi" ,python-certifi) @@ -9023,17 +9033,18 @@ notebooks.") (define-public python-ipywidgets (package (name "python-ipywidgets") - (version "5.2.2") + (version "7.5.1") (source (origin (method url-fetch) (uri (pypi-uri "ipywidgets" version)) (sha256 (base32 - "1lk0qrr5l9a0z7qkkn30hv5832whxwxymf1l576fmmad0n7hkxms")))) + "15sww2mvnkqlvx55gwa82v05062a8j1xpncnqna4k9sl53hgcig9")))) (build-system python-build-system) (propagated-inputs - `(("python-ipython" ,python-ipython) + `(("python-ipython" ,(prompt-toolkit-2-instead-of-prompt-toolkit + python-ipython)) ("python-traitlets" ,python-traitlets) ("python-widgetsnbextension" ,python-widgetsnbextension))) (native-inputs @@ -9053,19 +9064,20 @@ in the data.") (define-public python-jupyter-console (package (name "python-jupyter-console") - (version "6.0.0") + (version "6.1.0") (source (origin (method url-fetch) (uri (pypi-uri "jupyter_console" version)) (sha256 (base32 - "1xdjw11cppf1fxvwkw2bk13ckkwas3bdah8baingn9296mvfi31h")))) + "06s3kr5vx0l1y1b7fxb04dmrppscl7q69sl9yyfr0d057d1ssvkg")))) (build-system python-build-system) (propagated-inputs - `(("python-ipykernel" ,python-ipykernel) + `(("python-ipykernel" ,(prompt-toolkit-2-instead-of-prompt-toolkit + python-ipykernel)) ("python-jupyter-client" ,python-jupyter-client) - ("python-prompt-toolkit" ,python-prompt-toolkit) + ("python-prompt-toolkit" ,python-prompt-toolkit-2) ("python-pygments" ,python-pygments))) (native-inputs `(("python-nose" ,python-nose))) @@ -12131,14 +12143,14 @@ collections of data.") (define-public python-prompt-toolkit (package (name "python-prompt-toolkit") - (version "2.0.7") + (version "3.0.5") (source (origin (method url-fetch) - (uri (pypi-uri "prompt_toolkit" version ".tar.gz")) + (uri (pypi-uri "prompt_toolkit" version)) (sha256 (base32 - "0fgacqk73w7s932vy46pan2yp8rvjmlkag20xvaydh9mhf6h85zx")))) + "1j3x5s4gp4ih73sbcni0a0vffbzvrxbrbnkvb3fzjgxn810ilgan")))) (build-system python-build-system) (arguments `(#:phases @@ -12152,12 +12164,11 @@ collections of data.") (add-installed-pythonpath inputs outputs) (invoke "py.test")))))) (propagated-inputs - `(("python-wcwidth" ,python-wcwidth) - ("python-six" ,python-six) - ("python-pygments" ,python-pygments))) + `(("python-wcwidth" ,python-wcwidth))) (native-inputs `(("python-pytest" ,python-pytest))) - (home-page "https://github.com/jonathanslenders/python-prompt-toolkit") + (home-page + "https://github.com/prompt-toolkit/python-prompt-toolkit") (synopsis "Library for building command line interfaces in Python") (description "Prompt-Toolkit is a library for building interactive command line @@ -12167,11 +12178,31 @@ code completion, incremental search, support for Chinese double-width characters, mouse support, and auto suggestions.") (license license:bsd-3))) +(define-public python-prompt-toolkit-2 + (package (inherit python-prompt-toolkit) + (name "python-prompt-toolkit") + (version "2.0.7") + (source + (origin + (method url-fetch) + (uri (pypi-uri "prompt_toolkit" version)) + (sha256 + (base32 + "0fgacqk73w7s932vy46pan2yp8rvjmlkag20xvaydh9mhf6h85zx")))) + (propagated-inputs + `(("python-wcwidth" ,python-wcwidth) + ("python-six" ,python-six) + ("python-pygments" ,python-pygments))))) + +(define-public prompt-toolkit-2-instead-of-prompt-toolkit + (package-input-rewriting/spec + `(("python-prompt-toolkit" . ,(const python-prompt-toolkit-2))))) + (define-public python2-prompt-toolkit - (package-with-python2 python-prompt-toolkit)) + (package-with-python2 python-prompt-toolkit-2)) (define-public python-prompt-toolkit-1 - (package (inherit python-prompt-toolkit) + (package (inherit python-prompt-toolkit-2) (version "1.0.15") (source (origin @@ -13883,37 +13914,22 @@ clone, while other processes access the original tree.") (define-public python-astroid (package (name "python-astroid") - (version "2.3.3") + (version "2.4.1") (source (origin (method url-fetch) (uri (pypi-uri "astroid" version)) (sha256 - (base32 "0fnibsl2cb5mvzbfm7sycj85smx48f8w8m7ks1sqlmpr9ps0gski")))) + (base32 "1h99jal7ax07xna1djw5z7hpgb8vjrl3hrrg49p1phljwniww5sc")))) (build-system python-build-system) (propagated-inputs `(("python-lazy-object-proxy" ,python-lazy-object-proxy) ("python-six" ,python-six) - ("python-typed-ast" ,python-typed-ast) ("python-wrapt" ,python-wrapt))) (native-inputs `(("python-dateutil" ,python-dateutil) - ("python-nose" ,python-nose) ("python-pytest" ,python-pytest) ("python-pytest-runner" ,python-pytest-runner))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'remove-spurious-test - (lambda _ - ;; This can be removed after upgrading from python-3.7 - ;; https://github.com/PyCQA/astroid/issues/593 - ;; https://bugs.python.org/issue34056 - (delete-file "astroid/tests/unittest_modutils.py") - #t)) - (replace 'check - (lambda _ - (invoke "pytest" "astroid")))))) (home-page "https://github.com/PyCQA/astroid") (synopsis "Common base representation of python source code for pylint and other projects") diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 1ec002df73..9469f89bcf 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -80,12 +80,17 @@ #:use-module (gnu packages) #:use-module (gnu packages base) #:use-module (gnu packages bash) + #:use-module (gnu packages certs) + #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages dbm) #:use-module (gnu packages hurd) #:use-module (gnu packages libffi) + #:use-module (gnu packages ncurses) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages readline) + #:use-module (gnu packages shells) #:use-module (gnu packages sqlite) #:use-module (gnu packages tcl) #:use-module (gnu packages tls) @@ -631,3 +636,169 @@ run within just 256k of code space and 16k of RAM. MicroPython aims to be as compatible with normal Python as possible to allow you to transfer code with ease from the desktop to a microcontroller or embedded system.") (license license:expat))) + +(define-public pypy3 + (package + (name "pypy3") + (version "7.3.1") + (source (origin + (method url-fetch) + (uri (string-append "https://bitbucket.org/pypy/pypy/downloads/" ; + "pypy3.6-v" version "-src.tar.bz2")) + (sha256 + (base32 + "10zsk8jby8j6visk5mzikpb1cidvz27qq4pfpa26jv53klic6b0c")) + (patches (search-patches "pypy3-7.3.1-fix-tests.patch")))) + (build-system gnu-build-system) + (native-inputs + `(("python-2" ,python-2) + ("pkg-config" ,pkg-config) + ("tar" ,tar) ; Required for package.py + ("python2-pycparser" ,python2-pycparser) + ("python2-hypothesis" ,python2-hypothesis) + ("nss-certs" ,nss-certs) ; For ssl tests + ("gzip" ,gzip))) + (inputs + `(("libffi" ,libffi) + ("zlib" ,zlib) + ("ncurses" ,ncurses) + ("openssl" ,openssl) + ("expat" ,expat) + ("bzip2" ,bzip2) + ("sqlite" ,sqlite) + ("gdbm" ,gdbm) + ("tcl" ,tcl) + ("tk" ,tk) + ("glibc" ,glibc) + ("bash-minimal" ,bash-minimal) ; Used as /bin/sh + ("xz" ,xz))) ; liblzma + (arguments + `(#:tests? #f ;FIXME: Disabled for now, there are many tests failing. + #:modules ((ice-9 ftw) (ice-9 match) + (guix build utils) (guix build gnu-build-system)) + #:phases (modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'patch-source + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* '("rpython/rlib/clibffi.py") + ;; find_library does not work for libc + (("ctypes\\.util\\.find_library\\('c'\\)") "'libc.so'")) + (substitute* '("lib_pypy/cffi/_pycparser/ply/cpp.py") + ;; Make reproducible (XXX: unused?) + (("time\\.localtime\\(\\)") "time.gmtime(0)")) + (substitute* '("pypy/module/sys/version.py") + ;; Make reproducible + (("t\\.gmtime\\(\\)") "t.gmtime(0)")) + (substitute* '("lib_pypy/_tkinter/tklib_build.py") + ;; Link to versioned libtcl and libtk + (("linklibs = \\['tcl', 'tk'\\]") + "linklibs = ['tcl8.6', 'tk8.6']") + (("incdirs = \\[\\]") + (string-append "incdirs = ['" + (assoc-ref inputs "tcl") + "/include', '" + (assoc-ref inputs "tk") + "/include']"))) + (substitute* '("lib_pypy/_curses_build.py") + ;; Find curses + (("/usr/local") (assoc-ref inputs "ncurses"))) + (substitute* '("lib_pypy/_sqlite3_build.py") + ;; Always use search paths + (("sys\\.platform\\.startswith\\('freebsd'\\)") "True") + ;; Find sqlite3 + (("/usr/local") (assoc-ref inputs "sqlite")) + (("libname = 'sqlite3'") + (string-append "libname = '" + (assoc-ref inputs "sqlite") + "/lib/libsqlite3.so.0'"))) + (substitute* '("lib-python/3/subprocess.py") + ;; Fix shell path + (("/bin/sh") + (string-append (assoc-ref inputs "bash-minimal") "/bin/sh"))) + (substitute* '("lib-python/3/distutils/unixccompiler.py") + ;; gcc-toolchain does not provide symlink cc -> gcc + (("\"cc\"") "\"gcc\"")) + #t)) + (add-after + 'unpack 'set-source-file-times-to-1980 + ;; copied from python package, required by zip testcase + (lambda _ + (let ((circa-1980 (* 10 366 24 60 60))) + (ftw "." (lambda (file stat flag) + (utime file circa-1980 circa-1980) + #t)) + #t))) + (replace 'build + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "pypy/goal" + ;; Build with jit optimization. + (invoke "python2" + "../../rpython/bin/rpython" + (string-append "--make-jobs=" + (number->string (parallel-job-count))) + "-Ojit" + "targetpypystandalone")) + ;; Build c modules and package everything, so tests work. + (with-directory-excursion "pypy/tool/release" + (unsetenv "PYTHONPATH") ; Do not use the system’s python libs: + ; AttributeError: module 'enum' has no + ; attribute 'IntFlag' + (invoke "python2" "package.py" + "--archive-name" "pypy-dist" + "--builddir" (getcwd))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (if tests? + (begin + (setenv "HOME" "/tmp") ; test_with_pip tries to + ; access ~/.cache/pip + ;; Run library tests only (no interpreter unit + ;; tests). This is what Gentoo does. + (invoke + "python2" + "pypy/test_all.py" + "--pypy=pypy/tool/release/pypy-dist/bin/pypy3" + "lib-python")) + (format #t "test suite not run~%")) + #t)) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (with-directory-excursion "pypy/tool/release" + ;; Delete test data. + (for-each + (lambda (x) + (delete-file-recursively (string-append + "pypy-dist/lib-python/3/" x))) + '("tkinter/test" + "test" + "sqlite3/test" + "lib2to3/tests" + "idlelib/idle_test" + "distutils/tests" + "ctypes/test" + "unittest/test")) + ;; Patch shebang referencing python2 + (substitute* '("pypy-dist/lib-python/3/cgi.py" + "pypy-dist/lib-python/3/encodings/rot_13.py") + (("#!.+/bin/python") + (string-append "#!" (assoc-ref outputs "out") "/bin/pypy3"))) + (with-fluids ((%default-port-encoding "ISO-8859-1")) + (substitute* '("pypy-dist/lib_pypy/_md5.py" + "pypy-dist/lib_pypy/_sha1.py") + (("#!.+/bin/python") + (string-append "#!" (assoc-ref outputs "out") "/bin/pypy3")))) + (copy-recursively "pypy-dist" (assoc-ref outputs "out"))) + #t))))) + (home-page "https://www.pypy.org/") + (synopsis "Python implementation with just-in-time compilation") + (description "PyPy is a faster, alternative implementation of the Python +programming language employing a just-in-time compiler. It supports most +Python code natively, including C extensions.") + (license (list license:expat ; pypy itself; _pytest/ + license:psfl ; python standard library in lib-python/ + license:asl2.0 ; dotviewer/font/ and some of lib-python/ + license:gpl3+ ; ./rpython/rlib/rvmprof/src/shared/libbacktrace/dwarf2.* + license:bsd-3 ; lib_pypy/cffi/_pycparser/ply/ + (license:non-copyleft + "http://www.unicode.org/copyright.html"))))) + diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index d22c84fcf3..bb5ed59ac9 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -144,7 +144,7 @@ (description "Grantlee Templates can be used for theming and generation of 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+))) + (license license:lgpl2.1+))) (define-public qt-4 (package diff --git a/gnu/packages/regex.scm b/gnu/packages/regex.scm index c90ab88db1..60203ba5ca 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, 2020 Marius Bakke <mbakke@fastmail.com> -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,7 +30,7 @@ (define-public re2 (package (name "re2") - (version "2020-05-01") + (version "2020-06-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 - "0daav6ja99v5hdlwh1xzmja950y7767yw0phcbd0wpn42km39i20")) + "10jdgnp5dvkj3ay7grmdy539vv1srglnfxaqc5kb9v53cbql5hm8")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index b58788719e..0fa19e355c 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -124,7 +124,7 @@ the Linux kernel CIFS client.") (build-system gnu-build-system) (arguments `(#:make-flags - (list "CC=gcc") + (list ,(string-append "CC=" (cc-for-target))) #:phases (modify-phases %standard-phases (replace 'configure @@ -159,25 +159,29 @@ the Linux kernel CIFS client.") '("AUTHORS" "INSTALL" "LICENSE" "README.md")) #t)))))) (home-page "https://github.com/ndevilla/iniparser") - (synopsis "Standalone ini file parsing library") + (synopsis "Simple @file{.ini} configuration file parsing library") (description - "iniparser is a free stand-alone @code{ini} file parsing library (Windows -configuration files). It is written in portable ANSI C and should compile -anywhere.") + "The iniParser C library reads and writes Windows-style @file{.ini} +configuration files. These are simple text files with a basic structure +composed of sections, properties, and values. While not expressive, they +are easy to read, write, and modify. + +The library is small, thread safe, and written in portable ANSI C with no +external dependencies.") (license x11))) (define-public samba (package (name "samba") - (version "4.12.2") - (source (origin - (method url-fetch) - (uri (string-append "https://download.samba.org/pub/samba/stable/" - "samba-" version ".tar.gz")) - (sha256 - (base32 - "0l514s2xhsy1lspzgvibbzs80zi84zxr2wx4d40hq85yb2lg5434")) - (modules '((guix build utils))) + (version "4.12.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://download.samba.org/pub/samba/stable/" + "samba-" version ".tar.gz")) + (sha256 + (base32 "09w7aap1cjc41ayhaksm1igc7p7gl40fad4a1l6q4ds9a2jbrb9z")) + (modules '((guix build utils))) (snippet '(begin ;; TODO: also remove the bundled ‘third_party/popt’. diff --git a/gnu/packages/screen.scm b/gnu/packages/screen.scm index c03e2e5e5e..af519de0a3 100644 --- a/gnu/packages/screen.scm +++ b/gnu/packages/screen.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2016, 2017, 2019, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> -;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -104,7 +104,7 @@ controlling terminal and attach to it later.") (define-public byobu (package (name "byobu") - (version "5.127") + (version "5.133") (source (origin (method url-fetch) @@ -112,8 +112,7 @@ controlling terminal and attach to it later.") version "/+download/byobu_" version ".orig.tar.gz")) (sha256 - (base32 - "0fznlj454vgxgzfw3avmvvjpawggs66da5l8k6v0lnzzd75wgbsb")) + (base32 "0qvmmdnvwqbgbhn5c8asmrmjhclcl029py2d2zvmd7h5ij7s93jd")) (patches (search-patches "byobu-writable-status.patch")))) (build-system gnu-build-system) (inputs diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index a82f1c8b26..562748da4a 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -64,15 +64,14 @@ (define-public dash (package (name "dash") - (version "0.5.10.2") + (version "0.5.11") (source (origin (method url-fetch) (uri (string-append "http://gondor.apana.org.au/~herbert/dash/files/" "dash-" version ".tar.gz")) (sha256 - (base32 - "0wb0bwmqc661hylqcfdp7l7x12myw3vpqk513ncyqrjwvhckjriw")) + (base32 "1jwilfsy249d3q7fagg1ga4bgc2bg1fzw63r2nan0m77bznsdnad")) (modules '((guix build utils))) (snippet '(begin @@ -601,8 +600,9 @@ operating system.") "1z16qwix8z6a40fskdgxsibkqgdrp4q6ncp4n6hnv4r9iihy2d8r")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ;No tests are included - #:make-flags (list "CC=gcc") + `(#:tests? #f ; no tests are included + #:make-flags + (list ,(string-append "CC=" (cc-for-target))) #:phases (modify-phases %standard-phases (delete 'configure) diff --git a/gnu/packages/skarnet.scm b/gnu/packages/skarnet.scm index 31768c814e..b4cab33271 100644 --- a/gnu/packages/skarnet.scm +++ b/gnu/packages/skarnet.scm @@ -30,14 +30,14 @@ (define-public skalibs (package (name "skalibs") - (version "2.9.2.0") + (version "2.9.2.1") (source (origin (method url-fetch) (uri (string-append "https://skarnet.org/software/skalibs/skalibs-" version ".tar.gz")) (sha256 - (base32 "1i9d7w031kh338aq6xdsf8vl5amxbwxbny8lnrxlzydqvn8nxhz4")))) + (base32 "0ff551181vv9d1z5sv7yg6n4b88ajcdircs4p4nif4yl7nsrj2r5")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no tests exist @@ -62,14 +62,14 @@ and file system operations. It is used by all skarnet.org software.") (define-public execline (package (name "execline") - (version "2.6.0.0") + (version "2.6.0.2") (source (origin (method url-fetch) (uri (string-append "https://skarnet.org/software/execline/execline-" version ".tar.gz")) (sha256 - (base32 "1m6pvawxqaqjr49456vyjyl8dnqwvr19v77sjj7dnglfijwza5al")))) + (base32 "0wdg93hwpxxdqmsnd8j1nf3m2pf85n3rxaawzaih1y0ajyz6gwya")))) (build-system gnu-build-system) (inputs `(("skalibs" ,skalibs))) (arguments diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index 89dbe4578b..abaf0f7cbc 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -360,14 +360,14 @@ over the Internet in an HTTP and CDN friendly way; (define-public rclone (package (name "rclone") - (version "1.51.0") + (version "1.52.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/rclone/rclone/releases/download/" "v" version "/rclone-v" version ".tar.gz")) (sha256 - (base32 "1vi7sbdr5irlgxn080nwzs9lr893cxk59y4vnannzr8prvzvgd9y")))) + (base32 "06zkxnz0ggv8k4ayv3a8jx6ch0hclgs613wagskklqm15zv0dkdq")))) ;; FIXME: Rclone bundles some libraries Guix already provides. Need to ;; un-bundle them. (build-system go-build-system) diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index b14d76d9fa..da3f852c05 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016, 2017, 2019, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2020 Vinicius Monego <monego@posteo.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,6 +22,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix download) #:use-module (guix packages) + #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (gnu packages) @@ -28,6 +30,10 @@ #:use-module (gnu packages curl) #:use-module (gnu packages documentation) #:use-module (gnu packages gettext) + #:use-module (gnu packages glib) + #:use-module (gnu packages gnome) + #:use-module (gnu packages gstreamer) + #:use-module (gnu packages gtk) #:use-module (gnu packages ncurses) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -36,6 +42,7 @@ #:use-module (gnu packages python-web) #:use-module (gnu packages sqlite) #:use-module (gnu packages web) + #:use-module (gnu packages webkit) #:use-module (gnu packages xml)) (define-public newsboat @@ -89,6 +96,63 @@ file system, and many more features.") (license (list license:gpl2+ ; filter/* license:expat)))) ; everything else +(define-public liferea + (package + (name "liferea") + (version "1.12.6") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/lwindolf/liferea/" + "releases/download/v" version "/liferea-" + version "b.tar.bz2")) + (sha256 + (base32 "03pr1gmiv5y0i92bkhcxr8s311ll91chz19wb96jkixx32xav91d")))) + (build-system glib-or-gtk-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'prepare-build-environment + (lambda* (#:key inputs #:allow-other-keys) + ;; Workaround for https://github.com/lwindolf/liferea/issues/767. + (setenv "WEBKIT_DISABLE_COMPOSITING_MODE" "1"))) + (add-after 'install 'wrap-gi-python + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (gi-typelib-path (getenv "GI_TYPELIB_PATH")) + (python-path (getenv "PYTHONPATH"))) + (wrap-program (string-append out "/bin/liferea") + `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)) + `("PYTHONPATH" ":" prefix (,python-path)))) + #t))))) + (native-inputs + `(("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) + ("intltool" ,intltool) + ("pkg-config" ,pkg-config))) + (inputs + `(("glib-networking" ,glib-networking) + ("gnome-keyring" ,gnome-keyring) + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + ("gstreamer" ,gstreamer) + ("json-glib" ,json-glib) + ("libnotify" ,libnotify) + ("libpeas" ,libpeas) + ("libsecret" ,libsecret) + ("libxml2" ,libxml2) + ("libxslt" ,libxslt) + ("python" ,python) + ("python-pycairo" ,python-pycairo) + ("python-pygobject" ,python-pygobject) + ("webkitgtk" ,webkitgtk))) + (home-page "https://lzone.de/liferea/") + (synopsis "News reader for GTK/GNOME") + (description "Liferea is a desktop feed reader/news aggregator that +brings together all of the content from your favorite subscriptions into +a simple interface that makes it easy to organize and browse feeds.") + (license license:gpl2+))) + (define-public rtv (package (name "rtv") diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 226f3ee05a..b587cbd90e 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -90,7 +90,7 @@ (define-public tilda (package (name "tilda") - (version "1.5.0") + (version "1.5.2") (source (origin (method git-fetch) (uri (git-reference @@ -99,7 +99,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "13djibj3s7ig13c57ywy38pxy3qfmqihii2c0g15fy2h9q8xp1gx")))) + "0psq0f4s0s92bba6wwcf6b0j7i59b76svqxhvpavwv53yvhmmamn")))) (build-system glib-or-gtk-build-system) (native-inputs `(("autoconf" ,autoconf) @@ -673,15 +673,15 @@ eye-candy, customizable, and reasonably lightweight.") (define-public sakura (package (name "sakura") - (version "3.7.0") + (version "3.7.1") (source (origin (method url-fetch) - (uri (string-append "https://launchpad.net/" name "/trunk/" - version "/+download/" name "-" version - ".tar.gz")) + (uri (string-append "https://launchpad.net/sakura/trunk/" + version "/+download/sakura-" version + ".tar.bz2")) (sha256 (base32 - "15gskj5yv5qs3cj4ps43735kfx2nzjlhq4dk9ghirl8lvhhxsm5m")))) + "12wjmckf03qbnm8cb7qma0980anzajn3l92rj2yr8hhafl74x6kj")))) (build-system cmake-build-system) (arguments '(#:tests? #f)) ; no check phase @@ -1036,7 +1036,7 @@ comfortably in a pager or editor. (define-public eternalterminal (package (name "eternalterminal") - (version "5.1.10") + (version "6.0.7") (source (origin (method git-fetch) @@ -1045,7 +1045,7 @@ comfortably in a pager or editor. (commit (string-append "et-v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0jh89229bd9s82h3aj6faaybwr5xvnk8w2kgz47gq263pz021zpl")))) + (base32 "03pdspggqxkmz95qb96pig5x0xw18hy9a7ivszydr32ry6kxxx1h")))) (build-system cmake-build-system) (arguments '(#:configure-flags '("-DBUILD_TEST=ON") @@ -1055,12 +1055,6 @@ comfortably in a pager or editor. (lambda* (#:key inputs #:allow-other-keys) (let ((tests (assoc-ref inputs "googletest"))) (copy-recursively tests "external/googletest")) - #t)) - (add-after 'install 'dont-provide-gtest-libraries - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (delete-file-recursively (string-append out "/include")) - (delete-file-recursively (string-append out "/lib"))) #t))))) (inputs `(("gflags" ,gflags) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 683f9d7283..6f6ea73ffc 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -5916,8 +5916,11 @@ values (strings, macros, or numbers) pasted together.") (define-public biber (package + ;; Note: When updating Biber, make sure it matches our BibLaTeX version by + ;; checking the Biber/BibLaTeX compatibility matrix in the BibLaTeX manual + ;; at <https://ctan.org/pkg/biblatex>. (name "biber") - (version "2.11") + (version "2.12") (source (origin (method git-fetch) (uri (git-reference @@ -5930,7 +5933,7 @@ values (strings, macros, or numbers) pasted together.") "biber-sortinithash.patch")) (sha256 (base32 - "0qgkc1k9n36yfmndwz879pak6mjphld0p85lzn9g2ng0vhxsifzz")))) + "1g1hi6zvf2hmrjly1sidjaxy5440gfqm4p7p3n7kayshnjsmlskx")))) (build-system perl-build-system) (arguments `(#:phases @@ -7303,7 +7306,7 @@ to what constitutes a good table in this context. The package offers (list "/doc/latex/csquotes/" "/tex/latex/csquotes/") (base32 - "15hgn37zg433skn7ijqs1kl2z56fhy29cjxn01b5pjrnrkdar4i4") + "088gvi60d7sdl6fgg68fbz30fnpqc3yrpkx80sfw7vwgar3wm3av") #:trivial? #t))) (package (inherit template) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index d6c0aa7acb..1740404709 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -102,10 +102,6 @@ `("LUA_PATH" ":" prefix (,LUA_PATH)) `("LUA_CPATH" ":" prefix (,LUA_CPATH))) #t)))))) - (native-search-paths - (list (search-path-specification - (variable "VIS_PATH") - (files '("share/vis"))))) (inputs `(("lua" ,lua) ("ncurses" ,ncurses) ("libtermkey" ,libtermkey) @@ -502,7 +498,7 @@ scripts/input/X11/C/Shell/HTML/Dired): 49KB. (define-public ghostwriter (package (name "ghostwriter") - (version "1.8.0") + (version "1.8.1") (source (origin (method git-fetch) (uri (git-reference @@ -511,7 +507,7 @@ scripts/input/X11/C/Shell/HTML/Dired): 49KB. (file-name (git-file-name name version)) (sha256 (base32 - "13yn82m1l2pq93wbl569a2lzpc3sn8a8g30hsgdch1l9xlmhwran")))) + "0jc6szfh5sdnafhwsr1xv7cn1fznniq58bix41hb9wlbkvq7wzi6")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -747,14 +743,14 @@ and Octave. TeXmacs is completely extensible via Guile.") (define-public scintilla (package (name "scintilla") - (version "4.3.3") + (version "4.4.0") (source (origin (method url-fetch) (uri (let ((v (apply string-append (string-split version #\.)))) (string-append "https://www.scintilla.org/scintilla" v ".tgz"))) (sha256 - (base32 "0zh8c19r1zd4kr9jg2ws0n2n5ic2siz5zbns6cvylyfbpf69ghy2")))) + (base32 "10qnab10gfkzdfyqpmsl4c3mhh7533l4q6jrdfy5ssvj4da6hawd")))) (build-system gnu-build-system) (arguments `(#:make-flags (list "GTK3=1" "CC=gcc" "-Cgtk") @@ -762,20 +758,14 @@ and Octave. TeXmacs is completely extensible via Guile.") #:phases (modify-phases %standard-phases (delete 'configure) ;no configure script - (add-after 'unpack 'build-shared-library - (lambda _ - (substitute* "gtk/makefile" - (("scintilla\\.a") "libscintilla.so") - (("\\$\\(AR\\) \\$\\(ARFLAGS\\) \\$@ \\$\\^") - "$(CC) -shared $^ -o $@") - (("\\$\\(RANLIB\\) \\$@") "")) - #t)) (replace 'install + ;; Upstream provides no install script. (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (lib (string-append out "/lib")) (include (string-append out "/include"))) - (install-file "bin/libscintilla.so" lib) + (for-each (lambda (f) (install-file f lib)) + (find-files "bin/" "\\.so$")) (for-each (lambda (f) (install-file f include)) (find-files "include/" ".")) #t)))))) @@ -800,17 +790,13 @@ and multiple fonts.") (package (name "geany") (version "1.36") - (source (origin - (method url-fetch) - (uri (string-append "https://download.geany.org/" - "geany-" version ".tar.bz2")) - (sha256 - (base32 - "0gnm17cr4rf3pmkf0axz4a0fxwnvp55ji0q0lzy88yqbshyxv14i")) - (modules '((guix build utils))) - (snippet '(begin - (delete-file-recursively "scintilla") - #t)))) + (source + (origin + (method url-fetch) + (uri (string-append "https://download.geany.org/" + "geany-" version ".tar.bz2")) + (sha256 + (base32 "0gnm17cr4rf3pmkf0axz4a0fxwnvp55ji0q0lzy88yqbshyxv14i")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) @@ -823,26 +809,20 @@ and multiple fonts.") ("python-docutils" ,python-docutils))) ;for rst2html (inputs `(("gtk+" ,gtk+) - ("scintilla" ,scintilla))) + ;; FIXME: Geany bundles a 3.X release of Scintilla. It is not + ;; currently possible to replace it with our Scintilla package. + ;; ("scintilla" ,scintilla) + )) (arguments - `(#:phases + `(#:imported-modules ((guix build glib-or-gtk-build-system) + ,@%gnu-build-system-modules) + #:modules (((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) + (guix build gnu-build-system) + (guix build utils)) + #:phases (modify-phases %standard-phases - (add-after 'unpack 'use-scintilla-shared-library - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "configure.ac" - (("scintilla/Makefile") "") - (("scintilla/include/Makefile") "")) - (substitute* "Makefile.am" - (("scintilla ") "")) - (substitute* "src/Makefile.am" - (("\\$\\(top_builddir\\)/scintilla/libscintilla.la") "") - (("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))))) + (add-after 'install 'glib-or-gtk-wrap + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (home-page "https://www.geany.org") (synopsis "Fast and lightweight IDE") (description "Geany is a small and fast Integrated Development diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 6fdcfd227e..b6732dbae1 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2019 Yoshinori Arai <kumagusu08@gmail.com> ;;; Copyright © 2019 Mădălin Ionel Patrașcu <madalinionel.patrascu@mdc-berlin.de> ;;; Copyright © 2019 Wiktor Żelazny <wzelazny@vurv.cz> +;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -53,6 +54,7 @@ #:use-module (gnu packages gettext) #:use-module (gnu packages java) #:use-module (gnu packages ncurses) + #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -725,6 +727,110 @@ categories.") (license (list license:lgpl2.1 ; Main distribution. license:asl1.1)))) ; src/readdir.{c,h} +(define-public drm-tools + (package + (name "drm-tools") + (version "1.1.33") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/drmtools/drm_tools-" + version ".tar.gz")) + (sha256 + (base32 + "187zbxw21zcg8gpyc13gxlycfw0n05a6rmqq6im5wr9zk1v1wj80")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ;the test suite fails + #:phases (modify-phases %standard-phases + (add-after 'unpack 'set-install-prefixes + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (substitute* "CMakeLists.txt" + (("tmp/testinstall") + (string-drop out 1)) + (("/man/man1") + "/share/man/man1")) + #t))) + (add-after 'unpack 'adjust-test-paths + (lambda _ + (substitute* '("test_extract_increment.sh" + "test_extract_features.sh" + "test_extract_features2.sh" + "test_dmath.sh") + (("\\./extract") "extract") + (("\\./dmath") "dmath") + (("/usr/local/bin/") "") + (("/bin/rm") "rm") + (("/bin/cp") "cp")) + #t)) + (delete 'check) + ;; The produced binaries are written directly to %output/bin. + (delete 'install) + (add-after 'build 'check + (lambda* (#:key outputs tests? #:allow-other-keys) + (when tests? + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (setenv "PATH" (string-append bin ":" + (getenv "PATH"))) + (with-directory-excursion + (format #f "../drm_tools-~a" ,version) + (invoke "sh" "test_all.sh"))))))))) + (native-inputs `(("which" ,which))) ;for tests + (inputs `(("pcre" ,pcre))) + (home-page "http://drmtools.sourceforge.net/") + (synopsis "Utilities to manipulate text and binary files") + (description "The drm_tools package contains the following commands: +@table @command +@item accudate +An extended version of the \"date\" program that has sub-second accuracy. +@item binformat +Format complex binary data into text. +@item binload +Load data into a binary file using simple commands from the input. +@item binorder +Sort, merge, search, retrieve or generate test data consisting of fixed size +binary records. +@item binreplace +Find or find/replace in binary files. +@item binsplit +Split test data consisting of fixed size binary records into one or more +output streams. +@item chardiff +Find changes between two files at the character level. Unlike \"diff\", it +lists just the characters that differ, so if the 40,000th character is +different only that one character will be shown, not the entire line. +@item columnadd +Add columns of integers, decimals, and/or times. +@item datasniffer +A utility for formatting binary data dumps. +@item dmath +Double precision interactive command line math calculator. +@item extract +Extract and emit data from text files based on character or token position. +@item execinput +A utility that reads from STDIN and executes each line as a command in a +sub-process. +@item indexed_text +A utility for rapid retrieval of text by line numbers, in any order, from a +text file. +@item mdump +Format binary data. +@item msgqueue +Create message queues and send/receive messages. +@item mbin +@itemx mbout +Multiple buffer in and out. Used for buffering a lot of data between a slow +device and a fast device. Mostly for buffering streaming tape drives for use +with slower network connections, so that streaming is maintained as much as +possible to minimize wear on the tape device. +@item pockmark +Corrupt data streams - useful for testing error correction and data recovery. +@item tarsieve +Filter, list, or split a tar file. +@end table") + (license license:gpl2+))) + (define-public java-rsyntaxtextarea (package (name "java-rsyntaxtextarea") diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index ec81b7bf07..ec401416ce 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -165,7 +165,8 @@ living in the same process.") (define-public gnutls (package (name "gnutls") - (replacement gnutls-3.6.13) + ;; XXX Unversion openconnect's "gnutls" input when ungrafting. + (replacement gnutls-3.6.14) (version "3.6.12") (source (origin (method url-fetch) @@ -253,20 +254,20 @@ required structures.") (properties '((ftp-server . "ftp.gnutls.org") (ftp-directory . "/gcrypt/gnutls"))))) -(define-public gnutls-3.6.13 +(define-public gnutls-3.6.14 (package (inherit gnutls) - (version "3.6.13") + (version "3.6.14") (source (origin (method url-fetch) (uri (string-append "mirror://gnupg/gnutls/v" (version-major+minor version) - "/gnutls-3.6.13.tar.xz")) + "/gnutls-" version ".tar.xz")) (patches (search-patches "gnutls-skip-trust-store-test.patch" "gnutls-cross.patch")) (sha256 (base32 - "0f1gnm0756qms5cpx6yn6xb8d3imc2gkqmygf12n9x6r8zs1s11j")))) + "0qwxsfizynly0ns537vnhnlm5lh03la4vbsmz675n0n7vqd7ac2n")))) (native-inputs `(,@(if (%current-target-system) ;for cross-build `(("guile" ,guile-3.0)) ;to create .go files diff --git a/gnu/packages/tmux.scm b/gnu/packages/tmux.scm index 8b54849b18..160dcb3001 100644 --- a/gnu/packages/tmux.scm +++ b/gnu/packages/tmux.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016 Matthew Jordan <matthewjordandevops@yandex.com> ;;; Copyright © 2017 Vasile Dumitrascu <va511e@yahoo.com> ;;; Copyright © 2017 Stefan Reichör <stefan@xsteve.at> -;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019 Oleg Pykhalov <go.wigust@gmail.com> ;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re> ;;; @@ -141,7 +141,7 @@ windows.") (define-public tmux-xpanes (package (name "tmux-xpanes") - (version "4.1.1") + (version "4.1.2") (source (origin (method git-fetch) (uri (git-reference @@ -150,7 +150,7 @@ windows.") (file-name (git-file-name name version)) (sha256 (base32 - "13q02vdk229chgbn547wwv29cj4njvz02lmw840g8qmwh73qb2pi")))) + "0vm5mi6dqdbg0b5qh4r8sr1plpc00jryd8a2qxpp3a72cigjvvf0")))) (build-system trivial-build-system) (inputs `(("bash" ,bash))) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 1314c459f5..d0186a1b6f 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1611,7 +1611,7 @@ To load this plugin, specify the following option when starting mpv: (define-public youtube-dl (package (name "youtube-dl") - (version "2020.05.08") + (version "2020.05.29") (source (origin (method url-fetch) (uri (string-append "https://github.com/ytdl-org/youtube-dl/" @@ -1619,7 +1619,7 @@ To load this plugin, specify the following option when starting mpv: version ".tar.gz")) (sha256 (base32 - "16zxa8ss2rka7cvkqyi67s8i1h9f4nxx88w9vjbxchbga6w0scc6")))) + "111ganbfi76ipfq5gjgamjbqd7m8l4lim9wwmfnc04bzvwqqzfi3")))) (build-system python-build-system) (arguments ;; The problem here is that the directory for the man page and completion @@ -1798,7 +1798,7 @@ audio, images) from the Web. It can use either mpv or vlc for playback.") (define-public youtube-viewer (package (name "youtube-viewer") - (version "3.7.5") + (version "3.7.6") (source (origin (method git-fetch) (uri (git-reference @@ -1807,7 +1807,7 @@ audio, images) from the Web. It can use either mpv or vlc for playback.") (file-name (git-file-name name version)) (sha256 (base32 - "1caz56sxy554avz2vdv9gm7gyqcq0gyixzrh5v9ixmg6vxif5d4f")))) + "1c7wynx0fzs8awb1s4rdrl8xavqlj64z95yckhl1m1gnhahhq291")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build))) @@ -2888,18 +2888,22 @@ of modern, widely supported codecs.") (define-public intel-vaapi-driver (package (name "intel-vaapi-driver") - (version "2.4.0") + (version "2.4.1") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/intel/intel-vaapi-driver/" - "releases/download/" version "/intel-vaapi-driver-" - version ".tar.bz2")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/intel/intel-vaapi-driver") + (commit version))) (sha256 - (base32 "12fhydgwpvyh97gxqlgv77wsf9yax321h46vi49j4sxghpcxvqki")))) + (base32 "1cidki3av9wnkgwi7fklxbg3bh6kysf8w3fk2qadjr05a92mx3zp")) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))) (inputs `(("libdrm" ,libdrm) ("libva" ,libva) @@ -2933,7 +2937,7 @@ post-processing of video formats like MPEG2, H.264/AVC, and VC-1.") (define-public openh264 (package (name "openh264") - (version "2.1.0") + (version "2.1.1") (source (origin (method git-fetch) (uri (git-reference @@ -2942,7 +2946,7 @@ post-processing of video formats like MPEG2, H.264/AVC, and VC-1.") (file-name (git-file-name name version)) (sha256 (base32 - "1wba260n1932vafd5ni2jqv9kzc7lj6a1asm1cqk8jv690m6zvpi")))) + "0ffav46pz3sbj92nipd62z03fibyqgclfq9w8lgr80s6za6zdk5s")))) (build-system gnu-build-system) (native-inputs `(("nasm" ,nasm) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 05ce96c974..26c0bb54cb 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1440,7 +1440,7 @@ which is a hypervisor.") (define-public osinfo-db-tools (package (name "osinfo-db-tools") - (version "1.7.0") + (version "1.8.0") (source (origin (method url-fetch) (uri (string-append "https://releases.pagure.org/libosinfo/osinfo-db-tools-" @@ -1448,7 +1448,7 @@ which is a hypervisor.") (sha256 (base32 - "08x8mrafphyll0d35xdc143rip3ahrz6bmzhc85nwhq7yk2vxpab")))) + "038q3gzdbkfkhpicj0755mw1q4gbvn57pslpw8n2dp3lds9im0g9")))) (build-system meson-build-system) (inputs `(("libsoup" ,libsoup) @@ -1474,14 +1474,14 @@ administrators and developers in managing the database.") (define-public osinfo-db (package (name "osinfo-db") - (version "20200203") + (version "20200529") (source (origin (method url-fetch) (uri (string-append "https://releases.pagure.org/libosinfo/osinfo-db-" version ".tar.xz")) (sha256 (base32 - "1zjq1dhlci00j17dij7s3l30hybzmaykpk5b6bd5xbllp745njn5")))) + "0mbrf9j5wmjhc6jixvhp4jqyxixh1717lqrmzmipdg99xnzba81n")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index dbfd11626a..e16ac81961 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -259,7 +259,9 @@ the user specifically asks to proxy, so the @dfn{VPN} interface no longer (build-system gnu-build-system) (propagated-inputs `(("libxml2" ,libxml2) - ("gnutls" ,gnutls-3.6.13) + ;; XXX ‘DTLS is insecure in GnuTLS v3.6.3 through v3.6.12.’ + ;; See <https://gitlab.com/gnutls/gnutls/-/issues/960>. + ("gnutls" ,gnutls-3.6.14) ("zlib" ,zlib))) (inputs `(("lz4" ,lz4) @@ -551,7 +553,7 @@ WireGuard was added to Linux 5.6.") (define-public wireguard-tools (package (name "wireguard-tools") - (version "1.0.20200206") + (version "1.0.20200513") (source (origin (method git-fetch) @@ -560,7 +562,7 @@ WireGuard was added to Linux 5.6.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0ivc08lds5w39a6f2xdfih9wlk5g724hl3kpdvxvh5yff4l84qb7")))) + (base32 "1yk8hng0qw2rf76hnawjbdpjssmah88bd5fk20h1c0j1yazlx0a9")))) (build-system gnu-build-system) (arguments `(#:make-flags diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index b61ed7f3ca..c30a4ff3a2 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -4,7 +4,7 @@ ;;; 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, 2019, 2020 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> @@ -340,7 +340,7 @@ access.") (define-public qutebrowser (package (name "qutebrowser") - (version "1.11.0") + (version "1.12.0") (source (origin (method url-fetch) @@ -348,8 +348,7 @@ access.") "qutebrowser/releases/download/v" version "/" "qutebrowser-" version ".tar.gz")) (sha256 - (base32 - "0b0qlki9bp9mm41lrh6rc6qqvm4nsz8da63sby3a1f2xm9b9vvg2")))) + (base32 "0pywyhi4v6ymxpn85grrdr1agmcxsnm5jfqf3rlxqx5swbnxbfs1")))) (build-system python-build-system) (native-inputs `(("python-attrs" ,python-attrs))) ; for tests diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 9b7dba991c..366c593865 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1191,7 +1191,7 @@ other systems that want to manipulate WebAssembly files.") (define-public websocketpp (package (name "websocketpp") - (version "0.8.1") + (version "0.8.2") (source (origin (method git-fetch) @@ -1200,8 +1200,8 @@ other systems that want to manipulate WebAssembly files.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "12ffczcrryh74c1xssww35ic6yiy2l2xgdd30lshiq9wnzl2brgy")) - (patches (search-patches "websocketpp-fix-for-boost-1.70.patch")))) + (base32 "1ww4fhl8qf12hkv6jaild8zzsygdspxm1gqpk2f63gv1xfi31wpm")) + (patches (search-patches "websocketpp-fix-for-cmake-3.15.patch")))) (build-system cmake-build-system) (inputs `(("boost" ,boost) ("openssl" ,openssl))) @@ -4863,15 +4863,6 @@ NetSurf project.") (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'include-PERL5LIB-in-wrapper - (lambda _ - (substitute* "IkiWiki/Wrapper.pm" - (("^@wrapper\\_hooks") - (string-append - "@wrapper_hooks\n" - " addenv(\"PERL5LIB\", \"" - (getenv "PERL5LIB") - "\");"))))) (add-after 'patch-source-shebangs 'patch-Makefiles (lambda _ (substitute* "Makefile.PL" @@ -4889,11 +4880,31 @@ NetSurf project.") "touch" "{}" "+") #t)) (add-before 'check 'pre-check - ;; XDG_DATA_DIRS is needed by the podcast.t test. (lambda* (#:key inputs #:allow-other-keys) + ;; Six tests use IPC::Run. For these tests the PERL5LIB + ;; variable is needed in the runtime environment and also + ;; in the search path list in the setup file. + (substitute* + '("t/aggregate-file.t" "t/git-cgi.t" "t/git-untrusted.t" + "t/passwordauth.t" "t/relativity.t" "t/wrapper-environ.t") + (("(.*)\"perl\"(.*)$" _ prefix suffix) + (string-append prefix "qw(env), 'PERL5LIB='.$ENV{PERL5LIB}" + ", qw(perl)" suffix)) + (("(.*) PERL5LIB=(.*) perl(.*)$" _ prefix middle suffix) + (string-append prefix "), 'PERL5LIB='.$ENV{PERL5LIB}.':" + middle "', qw(perl" suffix)) + (("(.*)setup(.* )getcwd(.*)$" _ prefix middle suffix) + (string-append prefix "setup" middle + "$ENV{PERL5LIB}.':'.getcwd" suffix)) + (("^ENV(.*): '(.*)$" _ middle suffix) + (string-append "ENV" middle + ": '$ENV{PERL5LIB}:" suffix))) + ;; XDG_DATA_DIRS is needed by the podcast.t test. (setenv "XDG_DATA_DIRS" (string-append (assoc-ref inputs "shared-mime-info") "/share")) + ;; CC is needed by IkiWiki/Wrapper.pm. + (setenv "CC" "gcc") #t)) (add-after 'install 'wrap-programs (lambda* (#:key outputs #:allow-other-keys) @@ -4916,28 +4927,29 @@ NetSurf project.") (inputs `(("python" ,python-wrapper) ("perl-authen-passphrase" ,perl-authen-passphrase) - ("perl-cgi-formbuilder" ,perl-cgi-formbuilder) - ("perl-cgi-session" ,perl-cgi-session) ("perl-cgi-simple" ,perl-cgi-simple) ("perl-db-file" ,perl-db-file) ("perl-file-mimeinfo" ,perl-file-mimeinfo) ("perl-html-tagset" ,perl-html-tagset) ("perl-image-magick" ,perl-image-magick) + ("perl-ipc-run" ,perl-ipc-run) ("perl-lwpx-paranoidagent" ,perl-lwpx-paranoidagent) - ("perl-mail-sendmail" ,perl-mail-sendmail) - ("perl-timedate" ,perl-timedate) ("perl-xml-feed" ,perl-xml-feed) ("perl-xml-sax" ,perl-xml-sax) - ("perl-xml-simple" ,perl-xml-simple) ("perl-xml-twig" ,perl-xml-twig) ("po4a" ,po4a))) (propagated-inputs - `(("perl-html-parser" ,perl-html-parser) + `(("perl-cgi-formbuilder" ,perl-cgi-formbuilder) + ("perl-cgi-session" ,perl-cgi-session) + ("perl-html-parser" ,perl-html-parser) ("perl-html-scrubber" ,perl-html-scrubber) ("perl-html-template" ,perl-html-template) ("perl-json" ,perl-json) + ("perl-mail-sendmail" ,perl-mail-sendmail) ("perl-text-markdown-discount" ,perl-text-markdown-discount) + ("perl-timedate" ,perl-timedate) ("perl-uri" ,perl-uri) + ("perl-xml-simple" ,perl-xml-simple) ("perl-yaml-libyaml" ,perl-yaml-libyaml))) (home-page "https://ikiwiki.info/") (synopsis "Wiki compiler, capable of generating HTML") @@ -7347,7 +7359,7 @@ compressed JSON header blocks. (propagated-inputs `(("guile" ,guile-3.0) ("guile-commonmark" ,guile-commonmark) - ("guile-json" ,guile-json-3))) + ("guile-json" ,guile-json-4))) (home-page "https://github.com/UMCUGenetics/hpcguix-web") (synopsis "Web interface for cluster deployments of Guix") (description "Hpcguix-web provides a web interface to the list of packages diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 90be7d2625..3804209841 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -93,14 +93,14 @@ backend which implements them.") (define-public wpebackend-fdo (package (name "wpebackend-fdo") - (version "1.6.0") + (version "1.6.1") (source (origin (method url-fetch) (uri (string-append "https://wpewebkit.org/releases/" "wpebackend-fdo-" version ".tar.xz")) (sha256 (base32 - "0rzm16m3mw9dh2jis9avk2rhz7bijanrzlywyiaicyzrv2wxfnvz")))) + "1jdi43gciqjgvhnqxs160f3hmp1hkqhrllb0hhmldyxc4wryw3kl")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ;no tests diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 2e975354c3..06d28e30c1 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1838,9 +1838,10 @@ between windows.") "1wwqbph392iwz8skaqxb0xpklb1l6yganqz80g4x1fhrnz7idmlh")))) (build-system gnu-build-system) (arguments - '(#:tests? #f ; no test suite - #:make-flags (list "CC=gcc" - (string-append "PREFIX=" %output)) + `(#:tests? #f ; no test suite + #:make-flags + (list ,(string-append "CC=" (cc-for-target)) + (string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases (delete 'configure)))) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index b1aa2439a1..7cf8cc9a67 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -27,7 +27,7 @@ ;;; Copyright © 2018 Nam Nguyen <namn@berkeley.edu> ;;; 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, 2020 Josh Holland <josh@inv.alid.pw> ;;; Copyright © 2019 Tanguy Le Carrour <tanguy@bioneland.org> ;;; Copyright © 2020 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2020 David Wilson <david@daviwil.com> @@ -201,7 +201,7 @@ program.") (invoke "make" (string-append "DESTDIR=" (assoc-ref outputs "out")) "PREFIX=" - "BASH_COMPLETIONS_DIR=etc/bash_completiond.d" + "BASH_COMPLETIONS_DIR=etc/bash_completion.d" "install" "TARGETS=autorandr launcher manpage bash_completion")))))) (synopsis "Auto-detect connected displays and load appropriate setup") @@ -215,7 +215,7 @@ used to further tweak the behaviour of the different profiles.") (define-public bemenu (package (name "bemenu") - (version "0.2.0") + (version "0.4.1") (source (origin (method git-fetch) @@ -224,10 +224,18 @@ used to further tweak the behaviour of the different profiles.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0piax49az5kp96r1g6dcgj87fi6p4jl286wlkxsdvljzpkn8q6gv")))) - (build-system cmake-build-system) + (base32 "1fjcs9d3533ay3nz79cx3c0lmy2chgragr2lhsy0xl2ckr0iins0")))) + (build-system gnu-build-system) (arguments - '(#:configure-flags '("-DBEMENU_WAYLAND_RENDERER=ON"))) + '(#:tests? #f + #:make-flags (list "CC=gcc" + "CFLAGS=-O2 -fPIC" + (string-append "LDFLAGS=-Wl,-rpath=" + (assoc-ref %outputs "out") "/lib") + (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (delete 'configure)))) (inputs `(("cairo" ,cairo) ("libx11" ,libx11) @@ -246,7 +254,7 @@ used to further tweak the behaviour of the different profiles.") "bemenu is a dynamic menu which allows the user to flexibly select from a list of options (usually programs to launch). It renders the menu graphically with X11 or Wayland, or in a text terminal with ncurses.") - (license (list license:gpl3+ ; client program[s] and other sources + (license (list license:gpl3+ ; client program[s] and other sources license:lgpl3+)))) ; library and bindings (define-public copyq @@ -889,7 +897,7 @@ transparent text on your screen.") (define-public xbindkeys (package (name "xbindkeys") - (version "1.8.6") + (version "1.8.7") (source (origin (method url-fetch) ;; Download from the savannah mirror list fails @@ -899,11 +907,13 @@ transparent text on your screen.") ".tar.gz")) (sha256 (base32 - "060df6d8y727jp1inp7blp44cs8a7jig7vcm8ndsn6gw36z1h3bc")))) + "1wl2vc5alisiwyk8m07y1ryq8w3ll9ym83j27g4apm4ixjl8d6x2")))) (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) (inputs `(("libx11" ,libx11) - ("guile" ,guile-2.0))) + ("guile" ,guile-2.2))) (home-page "https://www.nongnu.org/xbindkeys/") (synopsis "Associate a combination of keys with a shell command") (description @@ -1899,7 +1909,7 @@ colors on all monitors attached to an XRandR-capable X11 display server.") (define-public sct (package (name "sct") - (version "0.4") + (version "0.5") (source (origin (method url-fetch) @@ -1907,12 +1917,12 @@ colors on all monitors attached to an XRandR-capable X11 display server.") (string-append "https://www.umaxx.net/dl/sct-" version ".tar.gz")) (sha256 - (base32 - "0r57z9ki8pvxhawfxys0v5h85z2x211sqxki0xvk1bga88ryldlv")))) + (base32 "0lrhx771iccbw04wrhj0ygids1pzmjfc4hvklm30m3p3flvhqf0m")))) (build-system gnu-build-system) (arguments - '(#:make-flags (list "CC=gcc") - #:tests? #f ; No tests exist. + `(#:make-flags + (list ,(string-append "CC=" (cc-for-target))) + #:tests? #f ; no test suite #:phases (modify-phases %standard-phases (delete 'configure) @@ -2259,9 +2269,9 @@ configuring visual settings in different UI toolkits separately.") (install-file "clipnotify" bin) (install-file "README.md" doc) #t)))) - #:make-flags (list "CC=gcc") - ;; the package provides no test suite: - #:tests? #f)) + #:make-flags + (list ,(string-append "CC=" (cc-for-target))) + #:tests? #f)) ; no test suite (inputs `(("libx11" ,libx11) ("libXfixes" ,libxfixes))) diff --git a/gnu/services/docker.scm b/gnu/services/docker.scm index d6dc792821..937dff7bdb 100644 --- a/gnu/services/docker.scm +++ b/gnu/services/docker.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Danny Milosavljevic <dannym@scratchpost.org> ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net> +;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -52,7 +53,10 @@ loop-back communications.") (enable-proxy? (boolean #t) - "Enable or disable the user-land proxy (enabled by default).")) + "Enable or disable the user-land proxy (enabled by default).") + (debug? + (boolean #f) + "Enable or disable debug output.")) (define %docker-accounts (list (user-group (name "docker") (system? #t)))) @@ -71,19 +75,24 @@ loop-back communications.") (mkdir-p #$state-dir)))) (define (containerd-shepherd-service config) - (let* ((package (docker-configuration-containerd config))) + (let* ((package (docker-configuration-containerd config)) + (debug? (docker-configuration-debug? config))) (shepherd-service (documentation "containerd daemon.") (provision '(containerd)) (start #~(make-forkexec-constructor - (list (string-append #$package "/bin/containerd")) + (list (string-append #$package "/bin/containerd") + #$@(if debug? + '("--log-level=debug") + '())) #:log-file "/var/log/containerd.log")) (stop #~(make-kill-destructor))))) (define (docker-shepherd-service config) (let* ((docker (docker-configuration-docker config)) (enable-proxy? (docker-configuration-enable-proxy? config)) - (proxy (docker-configuration-proxy config))) + (proxy (docker-configuration-proxy config)) + (debug? (docker-configuration-debug? config))) (shepherd-service (documentation "Docker daemon.") (provision '(dockerd)) @@ -101,6 +110,9 @@ loop-back communications.") (start #~(make-forkexec-constructor (list (string-append #$docker "/bin/dockerd") "-p" "/var/run/docker.pid" + #$@(if debug? + '("--debug" "--log-level=debug") + '()) (if #$enable-proxy? "--userland-proxy" "") "--userland-proxy-path" (string-append #$proxy "/bin/proxy")) diff --git a/gnu/services/nfs.scm b/gnu/services/nfs.scm index 4e358197e2..859097e788 100644 --- a/gnu/services/nfs.scm +++ b/gnu/services/nfs.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 John Darrington <jmd@gnu.org> ;;; Copyright © 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -261,6 +262,10 @@ (default 2049)) (nfsd-threads nfs-configuration-nfsd-threads (default 8)) + (nfsd-tcp? nfs-configuration-nfsd-tcp? + (default #t)) + (nfsd-udp? nfs-configuration-nfsd-udp? + (default #f)) (pipefs-directory nfs-configuration-pipefs-directory (default default-pipefs-directory)) ;; List of modules to debug; any of nfsd, nfs, rpc, idmap, statd, or mountd. @@ -272,6 +277,7 @@ (match-record config <nfs-configuration> (nfs-utils nfs-versions exports rpcmountd-port rpcstatd-port nfsd-port nfsd-threads + nfsd-tcp? nfsd-udp? pipefs-directory debug) (list (shepherd-service (documentation "Mount the nfsd pseudo file system.") @@ -332,7 +338,13 @@ #$@(map (lambda (version) (string-append "--nfs-version=" version)) nfs-versions) - #$(number->string nfsd-threads)))))) + #$(number->string nfsd-threads) + #$(if nfsd-tcp? + "--tcp" + "--no-tcp") + #$(if nfsd-udp? + "--udp" + "--no-udp")))))) (stop #~(lambda _ (zero? diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index 2505bde97b..ca39994516 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -180,31 +180,32 @@ (define (xorg-configuration->file config) "Compute an Xorg configuration file corresponding to CONFIG, an <xorg-configuration> record." - (define all-modules - ;; 'xorg-server' provides 'fbdevhw.so' etc. - (append (xorg-configuration-modules config) - (list xorg-server))) - - (define build - #~(begin - (use-modules (ice-9 match) - (srfi srfi-1) - (srfi srfi-26)) - - (call-with-output-file #$output - (lambda (port) - (define drivers - '#$(xorg-configuration-drivers config)) + (let ((xorg-server (xorg-configuration-server config))) + (define all-modules + ;; 'xorg-server' provides 'fbdevhw.so' etc. + (append (xorg-configuration-modules config) + (list xorg-server))) + + (define build + #~(begin + (use-modules (ice-9 match) + (srfi srfi-1) + (srfi srfi-26)) + + (call-with-output-file #$output + (lambda (port) + (define drivers + '#$(xorg-configuration-drivers config)) - (define (device-section driver) - (string-append " + (define (device-section driver) + (string-append " Section \"Device\" Identifier \"device-" driver "\" Driver \"" driver "\" EndSection")) - (define (screen-section driver resolutions) - (string-append " + (define (screen-section driver resolutions) + (string-append " Section \"Screen\" Identifier \"screen-" driver "\" Device \"device-" driver "\" @@ -218,8 +219,8 @@ Section \"Screen\" EndSubSection EndSection")) - (define (input-class-section layout variant model options) - (string-append " + (define (input-class-section layout variant model options) + (string-append " Section \"InputClass\" Identifier \"evdev keyboard catchall\" MatchIsKeyboard \"on\" @@ -243,69 +244,69 @@ Section \"InputClass\" Driver \"evdev\" EndSection\n")) - (define (expand modules) - ;; Append to MODULES the relevant /lib/xorg/modules - ;; sub-directories. - (append-map (lambda (module) - (filter-map (lambda (directory) - (let ((full (string-append module - directory))) - (and (file-exists? full) - full))) - '("/lib/xorg/modules/drivers" - "/lib/xorg/modules/input" - "/lib/xorg/modules/multimedia" - "/lib/xorg/modules/extensions"))) - modules)) - - (display "Section \"Files\"\n" port) - (for-each (lambda (font) - (format port " FontPath \"~a\"~%" font)) - '#$(xorg-configuration-fonts config)) - (for-each (lambda (module) - (format port - " ModulePath \"~a\"~%" - module)) - (append (expand '#$all-modules) - - ;; For fbdevhw.so and so on. - (list #$(file-append xorg-server - "/lib/xorg/modules")))) - (display "EndSection\n" port) - (display " + (define (expand modules) + ;; Append to MODULES the relevant /lib/xorg/modules + ;; sub-directories. + (append-map (lambda (module) + (filter-map (lambda (directory) + (let ((full (string-append module + directory))) + (and (file-exists? full) + full))) + '("/lib/xorg/modules/drivers" + "/lib/xorg/modules/input" + "/lib/xorg/modules/multimedia" + "/lib/xorg/modules/extensions"))) + modules)) + + (display "Section \"Files\"\n" port) + (for-each (lambda (font) + (format port " FontPath \"~a\"~%" font)) + '#$(xorg-configuration-fonts config)) + (for-each (lambda (module) + (format port + " ModulePath \"~a\"~%" + module)) + (append (expand '#$all-modules) + + ;; For fbdevhw.so and so on. + (list #$(file-append xorg-server + "/lib/xorg/modules")))) + (display "EndSection\n" port) + (display " Section \"ServerFlags\" Option \"AllowMouseOpenFail\" \"on\" EndSection\n" port) - (display (string-join (map device-section drivers) "\n") - port) - (newline port) - (display (string-join - (map (cut screen-section <> - '#$(xorg-configuration-resolutions config)) - drivers) - "\n") - port) - (newline port) - - (let ((layout #$(and=> (xorg-configuration-keyboard-layout config) - keyboard-layout-name)) - (variant #$(and=> (xorg-configuration-keyboard-layout config) - keyboard-layout-variant)) - (model #$(and=> (xorg-configuration-keyboard-layout config) - keyboard-layout-model)) - (options '#$(and=> (xorg-configuration-keyboard-layout config) - keyboard-layout-options))) - (when layout - (display (input-class-section layout variant model options) - port) - (newline port))) - - (for-each (lambda (config) - (display config port)) - '#$(xorg-configuration-extra-config config)))))) - - (computed-file "xserver.conf" build)) + (display (string-join (map device-section drivers) "\n") + port) + (newline port) + (display (string-join + (map (cut screen-section <> + '#$(xorg-configuration-resolutions config)) + drivers) + "\n") + port) + (newline port) + + (let ((layout #$(and=> (xorg-configuration-keyboard-layout config) + keyboard-layout-name)) + (variant #$(and=> (xorg-configuration-keyboard-layout config) + keyboard-layout-variant)) + (model #$(and=> (xorg-configuration-keyboard-layout config) + keyboard-layout-model)) + (options '#$(and=> (xorg-configuration-keyboard-layout config) + keyboard-layout-options))) + (when layout + (display (input-class-section layout variant model options) + port) + (newline port))) + + (for-each (lambda (config) + (display config port)) + '#$(xorg-configuration-extra-config config)))))) + + (computed-file "xserver.conf" build))) (define (xorg-configuration-directory modules) "Return a directory that contains the @code{.conf} files for X.org that diff --git a/gnu/system.scm b/gnu/system.scm index d929187695..ac8bbd1d16 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -1118,7 +1118,7 @@ a list of <menu-entry>, to populate the \"old entries\" menu." (generate-config-file bootloader-conf (list entry) #:old-entries old-entries - #:btrfs-subvolume-file-name + #:store-directory-prefix (btrfs-store-subvolume-file-name file-systems)))) (define* (operating-system-boot-parameters os root-device diff --git a/guix/build-system/linux-module.scm b/guix/build-system/linux-module.scm index ca104f7c75..1077215671 100644 --- a/guix/build-system/linux-module.scm +++ b/guix/build-system/linux-module.scm @@ -129,6 +129,7 @@ (phases '(@ (guix build linux-module-build-system) %standard-phases)) (outputs '("out")) + (make-flags ''()) (system (%current-system)) (guile #f) (substitutable? #t) @@ -156,6 +157,7 @@ #:arch ,(system->arch (or target system)) #:tests? ,tests? #:outputs %outputs + #:make-flags ,make-flags #:inputs %build-inputs))) (define guile-for-build @@ -181,6 +183,7 @@ target native-drvs target-drvs (guile #f) (outputs '("out")) + (make-flags ''()) (search-paths '()) (native-search-paths '()) (tests? #f) @@ -228,6 +231,7 @@ #:target ,target #:arch ,(system->arch (or target system)) #:outputs %outputs + #:make-flags ,make-flags #:inputs %build-target-inputs #:native-inputs %build-host-inputs #:search-paths diff --git a/guix/build/linux-module-build-system.scm b/guix/build/linux-module-build-system.scm index 73d6b101f6..d51d76f94b 100644 --- a/guix/build/linux-module-build-system.scm +++ b/guix/build/linux-module-build-system.scm @@ -58,12 +58,13 @@ ;; This block was copied from make-linux-libre--only took the "modules_install" ;; part. -(define* (install #:key inputs native-inputs outputs #:allow-other-keys) +(define* (install #:key make-flags inputs native-inputs outputs + #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (moddir (string-append out "/lib/modules"))) ;; Install kernel modules (mkdir-p moddir) - (invoke "make" "-C" + (apply invoke "make" "-C" (string-append (assoc-ref inputs "linux-module-builder") "/lib/modules/build") (string-append "M=" (getcwd)) @@ -76,7 +77,8 @@ (string-append "INSTALL_PATH=" out) (string-append "INSTALL_MOD_PATH=" out) "INSTALL_MOD_STRIP=1" - "modules_install"))) + "modules_install" + (or make-flags '())))) (define %standard-phases (modify-phases gnu:%standard-phases @@ -84,7 +86,8 @@ (replace 'build build) (replace 'install install))) -(define* (linux-module-build #:key inputs (phases %standard-phases) +(define* (linux-module-build #:key inputs + (phases %standard-phases) #:allow-other-keys #:rest args) "Build the given package, applying all of PHASES in order, with a Linux kernel in attendance." diff --git a/guix/combinators.scm b/guix/combinators.scm index 11cad62ccf..4707b59363 100644 --- a/guix/combinators.scm +++ b/guix/combinators.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org> +;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -56,7 +57,7 @@ (call-with-values (lambda () (proc (car lst1) (car lst2) result1 result2)) (lambda (result1 result2) - (fold2 proc result1 result2 (cdr lst1) (cdr lst2))))))))) + (loop result1 result2 (cdr lst1) (cdr lst2))))))))) (define (fold-tree proc init children roots) "Call (PROC NODE RESULT) for each node in the tree that is reachable from diff --git a/guix/git-authenticate.scm b/guix/git-authenticate.scm new file mode 100644 index 0000000000..b73f957105 --- /dev/null +++ b/guix/git-authenticate.scm @@ -0,0 +1,282 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2019, 2020 Ludovic Courtès <ludo@gnu.org> +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. + +(define-module (guix git-authenticate) + #:use-module (git) + #:use-module (guix base16) + #:use-module (guix i18n) + #:use-module (guix openpgp) + #:use-module ((guix utils) + #:select (cache-directory with-atomic-file-output)) + #:use-module ((guix build utils) + #:select (mkdir-p)) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-11) + #:use-module (srfi srfi-26) + #:use-module (srfi srfi-34) + #:use-module (srfi srfi-35) + #:use-module (rnrs bytevectors) + #:use-module (rnrs io ports) + #:use-module (ice-9 match) + #:autoload (ice-9 pretty-print) (pretty-print) + #:export (read-authorizations + commit-signing-key + commit-authorized-keys + authenticate-commit + authenticate-commits + load-keyring-from-reference + previously-authenticated-commits + cache-authenticated-commit + + git-authentication-error? + git-authentication-error-commit + unsigned-commit-error? + unauthorized-commit-error? + unauthorized-commit-error-signing-key + signature-verification-error? + signature-verification-error-keyring + signature-verification-error-signature + missing-key-error? + missing-key-error-signature)) + +;;; Commentary: +;;; +;;; This module provides tools to authenticate a range of Git commits. A +;;; commit is considered "authentic" if and only if it is signed by an +;;; authorized party. Parties authorized to sign a commit are listed in the +;;; '.guix-authorizations' file of the parent commit. +;;; +;;; Code: + +(define-condition-type &git-authentication-error &error + git-authentication-error? + (commit git-authentication-error-commit)) + +(define-condition-type &unsigned-commit-error &git-authentication-error + unsigned-commit-error?) + +(define-condition-type &unauthorized-commit-error &git-authentication-error + unauthorized-commit-error? + (signing-key unauthorized-commit-error-signing-key)) + +(define-condition-type &signature-verification-error &git-authentication-error + signature-verification-error? + (signature signature-verification-error-signature) + (keyring signature-verification-error-keyring)) + +(define-condition-type &missing-key-error &git-authentication-error + missing-key-error? + (signature missing-key-error-signature)) + + +(define (commit-signing-key repo commit-id keyring) + "Return the OpenPGP key that signed COMMIT-ID (an OID). Raise an exception +if the commit is unsigned, has an invalid signature, or if its signing key is +not in KEYRING." + (let-values (((signature signed-data) + (catch 'git-error + (lambda () + (commit-extract-signature repo commit-id)) + (lambda _ + (values #f #f))))) + (unless signature + (raise (condition + (&unsigned-commit-error (commit commit-id)) + (&message + (message (format #f (G_ "commit ~a lacks a signature") + (oid->string commit-id))))))) + + (let ((signature (string->openpgp-packet signature))) + (with-fluids ((%default-port-encoding "UTF-8")) + (let-values (((status data) + (verify-openpgp-signature signature keyring + (open-input-string signed-data)))) + (match status + ('bad-signature + ;; There's a signature but it's invalid. + (raise (condition + (&signature-verification-error (commit commit-id) + (signature signature) + (keyring keyring)) + (&message + (message (format #f (G_ "signature verification failed \ +for commit ~a") + (oid->string commit-id))))))) + ('missing-key + (raise (condition + (&missing-key-error (commit commit-id) + (signature signature)) + (&message + (message (format #f (G_ "could not authenticate \ +commit ~a: key ~a is missing") + (oid->string commit-id) + data)))))) + ('good-signature data))))))) + +(define (read-authorizations port) + "Read authorizations in the '.guix-authorizations' format from PORT, and +return a list of authorized fingerprints." + (match (read port) + (('authorizations ('version 0) + (((? string? fingerprints) _ ...) ...) + _ ...) + (map (lambda (fingerprint) + (base16-string->bytevector + (string-downcase (string-filter char-set:graphic fingerprint)))) + fingerprints)))) + +(define* (commit-authorized-keys repository commit + #:optional (default-authorizations '())) + "Return the list of OpenPGP fingerprints authorized to sign COMMIT, based on +authorizations listed in its parent commits. If one of the parent commits +does not specify anything, fall back to DEFAULT-AUTHORIZATIONS." + (define (commit-authorizations commit) + (catch 'git-error + (lambda () + (let* ((tree (commit-tree commit)) + (entry (tree-entry-bypath tree ".guix-authorizations")) + (blob (blob-lookup repository (tree-entry-id entry)))) + (read-authorizations + (open-bytevector-input-port (blob-content blob))))) + (lambda (key error) + (if (= (git-error-code error) GIT_ENOTFOUND) + default-authorizations + (throw key error))))) + + (apply lset-intersection bytevector=? + (map commit-authorizations (commit-parents commit)))) + +(define* (authenticate-commit repository commit keyring + #:key (default-authorizations '())) + "Authenticate COMMIT from REPOSITORY and return the signing key fingerprint. +Raise an error when authentication fails. If one of the parent commits does +not specify anything, fall back to DEFAULT-AUTHORIZATIONS." + (define id + (commit-id commit)) + + (define signing-key + (commit-signing-key repository id keyring)) + + (unless (member (openpgp-public-key-fingerprint signing-key) + (commit-authorized-keys repository commit + default-authorizations)) + (raise (condition + (&unauthorized-commit-error (commit id) + (signing-key signing-key)) + (&message + (message (format #f (G_ "commit ~a not signed by an authorized \ +key: ~a") + (oid->string id) + (openpgp-format-fingerprint + (openpgp-public-key-fingerprint + signing-key)))))))) + + signing-key) + +(define (load-keyring-from-blob repository oid keyring) + "Augment KEYRING with the keyring available in the blob at OID, which may or +may not be ASCII-armored." + (let* ((blob (blob-lookup repository oid)) + (port (open-bytevector-input-port (blob-content blob)))) + (get-openpgp-keyring (if (port-ascii-armored? port) + (open-bytevector-input-port (read-radix-64 port)) + port) + keyring))) + +(define (load-keyring-from-reference repository reference) + "Load the '.key' files from the tree at REFERENCE in REPOSITORY and return +an OpenPGP keyring." + (let* ((reference (branch-lookup repository reference BRANCH-ALL)) + (target (reference-target reference)) + (commit (commit-lookup repository target)) + (tree (commit-tree commit))) + (fold (lambda (name keyring) + (if (string-suffix? ".key" name) + (let ((entry (tree-entry-bypath tree name))) + (load-keyring-from-blob repository + (tree-entry-id entry) + keyring)) + keyring)) + %empty-keyring + (tree-list tree)))) + +(define* (authenticate-commits repository commits + #:key + (default-authorizations '()) + (keyring-reference "keyring") + (report-progress (const #t))) + "Authenticate COMMITS, a list of commit objects, calling REPORT-PROGRESS for +each of them. Return an alist showing the number of occurrences of each key. +The OpenPGP keyring is loaded from KEYRING-REFERENCE in REPOSITORY." + (define keyring + (load-keyring-from-reference repository keyring-reference)) + + (fold (lambda (commit stats) + (report-progress) + (let ((signer (authenticate-commit repository commit keyring + #:default-authorizations + default-authorizations))) + (match (assq signer stats) + (#f (cons `(,signer . 1) stats)) + ((_ . count) (cons `(,signer . ,(+ count 1)) + (alist-delete signer stats)))))) + '() + commits)) + + +;;; +;;; Caching. +;;; + +(define (authenticated-commit-cache-file) + "Return the name of the file that contains the cache of +previously-authenticated commits." + (string-append (cache-directory) "/authentication/channels/guix")) + +(define (previously-authenticated-commits) + "Return the previously-authenticated commits as a list of commit IDs (hex +strings)." + (catch 'system-error + (lambda () + (call-with-input-file (authenticated-commit-cache-file) + read)) + (lambda args + (if (= ENOENT (system-error-errno args)) + '() + (apply throw args))))) + +(define (cache-authenticated-commit commit-id) + "Record in ~/.cache COMMIT-ID and its closure as authenticated (only +COMMIT-ID is written to cache, though)." + (define %max-cache-length + ;; Maximum number of commits in cache. + 200) + + (let ((lst (delete-duplicates + (cons commit-id (previously-authenticated-commits)))) + (file (authenticated-commit-cache-file))) + (mkdir-p (dirname file)) + (with-atomic-file-output file + (lambda (port) + (let ((lst (if (> (length lst) %max-cache-length) + (take lst %max-cache-length) ;truncate + lst))) + (chmod port #o600) + (display ";; List of previously-authenticated commits.\n\n" + port) + (pretty-print lst port)))))) diff --git a/guix/tests/git.scm b/guix/tests/git.scm index 566660e85e..c77c544e03 100644 --- a/guix/tests/git.scm +++ b/guix/tests/git.scm @@ -21,6 +21,7 @@ #:use-module ((guix git) #:select (with-repository)) #:use-module (guix utils) #:use-module (guix build utils) + #:use-module ((guix tests gnupg) #:select (with-environment-variables)) #:use-module (ice-9 match) #:use-module (ice-9 control) #:export (git-command @@ -30,24 +31,6 @@ (define git-command (make-parameter "git")) -(define (call-with-environment-variables variables thunk) - "Call THUNK with the environment VARIABLES set." - (let ((environment (environ))) - (dynamic-wind - (lambda () - (for-each (match-lambda - ((variable value) - (setenv variable value))) - variables)) - thunk - (lambda () - (environ environment))))) - -(define-syntax-rule (with-environment-variables variables exp ...) - "Evaluate EXP with the given environment VARIABLES set." - (call-with-environment-variables variables - (lambda () exp ...))) - (define (populate-git-repository directory directives) "Initialize a new Git checkout and repository in DIRECTORY and apply DIRECTIVES. Each element of DIRECTIVES is an sexp like: @@ -97,6 +80,9 @@ Return DIRECTORY on success." ((('commit text) rest ...) (git "commit" "-m" text) (loop rest)) + ((('commit text ('signer fingerprint)) rest ...) + (git "commit" "-m" text (string-append "--gpg-sign=" fingerprint)) + (loop rest)) ((('tag name) rest ...) (git "tag" name) (loop rest)) @@ -108,6 +94,10 @@ Return DIRECTORY on success." (loop rest)) ((('merge branch message) rest ...) (git "merge" branch "-m" message) + (loop rest)) + ((('merge branch message ('signer fingerprint)) rest ...) + (git "merge" branch "-m" message + (string-append "--gpg-sign=" fingerprint)) (loop rest))))) (define (call-with-temporary-git-repository directives proc) diff --git a/guix/tests/gnupg.scm b/guix/tests/gnupg.scm new file mode 100644 index 0000000000..6e7fdbcf65 --- /dev/null +++ b/guix/tests/gnupg.scm @@ -0,0 +1,72 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020 Ludovic Courtès <ludo@gnu.org> +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. + +(define-module (guix tests gnupg) + #:use-module (guix utils) + #:use-module (guix build utils) + #:use-module (ice-9 match) + #:export (gpg-command + gpgconf-command + with-fresh-gnupg-setup + + with-environment-variables)) + +(define (call-with-environment-variables variables thunk) + "Call THUNK with the environment VARIABLES set." + (let ((environment (environ))) + (dynamic-wind + (lambda () + (for-each (match-lambda + ((variable value) + (setenv variable value))) + variables)) + thunk + (lambda () + (environ environment))))) + +(define-syntax-rule (with-environment-variables variables exp ...) + "Evaluate EXP with the given environment VARIABLES set." + (call-with-environment-variables variables + (lambda () exp ...))) + +(define gpg-command + (make-parameter "gpg")) + +(define gpgconf-command + (make-parameter "gpgconf")) + +(define (call-with-fresh-gnupg-setup imported thunk) + (call-with-temporary-directory + (lambda (home) + (with-environment-variables `(("GNUPGHOME" ,home)) + (dynamic-wind + (lambda () + (for-each (lambda (file) + (invoke (gpg-command) "--import" file)) + imported)) + thunk + (lambda () + ;; Terminate 'gpg-agent' & co. + (invoke (gpgconf-command) "--kill" "all"))))))) + +(define-syntax-rule (with-fresh-gnupg-setup imported exp ...) + "Evaluate EXP in the context of a fresh GnuPG setup where all the files +listed in IMPORTED, and only them, have been imported. This sets 'GNUPGHOME' +such that the user's real GnuPG files are left untouched. The 'gpg-agent' +process is terminated afterwards." + (call-with-fresh-gnupg-setup imported (lambda () exp ...))) diff --git a/tests/ed25519bis.key b/tests/ed25519bis.key new file mode 100644 index 0000000000..f5329105d5 --- /dev/null +++ b/tests/ed25519bis.key @@ -0,0 +1,10 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mDMEXtVsNhYJKwYBBAHaRw8BAQdAnLsYdh3BpeK1xDguJE80XW2/MSmqeeP6pbQw +8jAw0OG0IkNoYXJsaWUgR3VpeCA8Y2hhcmxpZUBleGFtcGxlLm9yZz6IlgQTFggA +PhYhBKBDaY1jer75FlruS4IkDtyrgNqDBQJe1Ww2AhsDBQkDwmcABQsJCAcCBhUK +CQgLAgQWAgMBAh4BAheAAAoJEIIkDtyrgNqDM6cA/idDdoxo9SU+witdTXt24APH +yRzHbX9Iyh4dZNIek9JwAP9E0BwSvDHB4LY9z4RWf2hJp3dm/yZ/jEpK+w4BGN4J +Ag== +=JIU0 +-----END PGP PUBLIC KEY BLOCK----- diff --git a/tests/ed25519bis.sec b/tests/ed25519bis.sec new file mode 100644 index 0000000000..059765f557 --- /dev/null +++ b/tests/ed25519bis.sec @@ -0,0 +1,10 @@ +-----BEGIN PGP PRIVATE KEY BLOCK----- + +lFgEXtVsNhYJKwYBBAHaRw8BAQdAnLsYdh3BpeK1xDguJE80XW2/MSmqeeP6pbQw +8jAw0OEAAP9lsLf3tk0OH1X4By4flYSz4PBFo40EwS4t6xx76poUphCEtCJDaGFy +bGllIEd1aXggPGNoYXJsaWVAZXhhbXBsZS5vcmc+iJYEExYIAD4WIQSgQ2mNY3q+ ++RZa7kuCJA7cq4DagwUCXtVsNgIbAwUJA8JnAAULCQgHAgYVCgkICwIEFgIDAQIe +AQIXgAAKCRCCJA7cq4DagzOnAP4nQ3aMaPUlPsIrXU17duADx8kcx21/SMoeHWTS +HpPScAD/RNAcErwxweC2Pc+EVn9oSad3Zv8mf4xKSvsOARjeCQI= +=gUik +-----END PGP PRIVATE KEY BLOCK----- diff --git a/tests/git-authenticate.scm b/tests/git-authenticate.scm new file mode 100644 index 0000000000..5937c37ee6 --- /dev/null +++ b/tests/git-authenticate.scm @@ -0,0 +1,286 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020 Ludovic Courtès <ludo@gnu.org> +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. + +(define-module (test-git-authenticate) + #:use-module (git) + #:use-module (guix git) + #:use-module (guix git-authenticate) + #:use-module (guix openpgp) + #:use-module (guix tests git) + #:use-module (guix tests gnupg) + #:use-module (guix build utils) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-34) + #:use-module (srfi srfi-64) + #:use-module (rnrs bytevectors) + #:use-module (rnrs io ports)) + +;; Test the (guix git-authenticate) tools. + +(define %ed25519-public-key-file + (search-path %load-path "tests/ed25519.key")) +(define %ed25519-secret-key-file + (search-path %load-path "tests/ed25519.sec")) +(define %ed25519bis-public-key-file + (search-path %load-path "tests/ed25519bis.key")) +(define %ed25519bis-secret-key-file + (search-path %load-path "tests/ed25519bis.sec")) + +(define (read-openpgp-packet file) + (get-openpgp-packet + (open-bytevector-input-port + (call-with-input-file file read-radix-64)))) + +(define key-fingerprint + (compose openpgp-format-fingerprint + openpgp-public-key-fingerprint + read-openpgp-packet)) + +(define (key-id file) + (define id + (openpgp-public-key-id (read-openpgp-packet))) + + (string-pad (number->string id 16) 16 #\0)) + +(define (gpg+git-available?) + (and (which (git-command)) + (which (gpg-command)) (which (gpgconf-command)))) + + +(test-begin "git-authenticate") + +(unless (which (git-command)) (test-skip 1)) +(test-assert "unsigned commits" + (with-temporary-git-repository directory + '((add "a.txt" "A") + (commit "first commit") + (add "b.txt" "B") + (commit "second commit")) + (with-repository directory repository + (let ((commit1 (find-commit repository "first")) + (commit2 (find-commit repository "second"))) + (guard (c ((unsigned-commit-error? c) + (oid=? (git-authentication-error-commit c) + (commit-id commit1)))) + (authenticate-commits repository (list commit1 commit2) + #:keyring-reference "master") + 'failed))))) + +(unless (gpg+git-available?) (test-skip 1)) +(test-assert "signed commits, default authorizations" + (with-fresh-gnupg-setup (list %ed25519-public-key-file + %ed25519-secret-key-file) + (with-temporary-git-repository directory + `((add "signer.key" ,(call-with-input-file %ed25519-public-key-file + get-string-all)) + (commit "zeroth commit") + (add "a.txt" "A") + (commit "first commit" + (signer ,(key-fingerprint %ed25519-public-key-file))) + (add "b.txt" "B") + (commit "second commit" + (signer ,(key-fingerprint %ed25519-public-key-file)))) + (with-repository directory repository + (let ((commit1 (find-commit repository "first")) + (commit2 (find-commit repository "second"))) + (authenticate-commits repository (list commit1 commit2) + #:default-authorizations + (list (openpgp-public-key-fingerprint + (read-openpgp-packet + %ed25519-public-key-file))) + #:keyring-reference "master")))))) + +(unless (gpg+git-available?) (test-skip 1)) +(test-assert "signed commits, .guix-authorizations" + (with-fresh-gnupg-setup (list %ed25519-public-key-file + %ed25519-secret-key-file) + (with-temporary-git-repository directory + `((add "signer.key" ,(call-with-input-file %ed25519-public-key-file + get-string-all)) + (add ".guix-authorizations" + ,(object->string + `(authorizations (version 0) + ((,(key-fingerprint + %ed25519-public-key-file) + (name "Charlie")))))) + (commit "zeroth commit") + (add "a.txt" "A") + (commit "first commit" + (signer ,(key-fingerprint %ed25519-public-key-file))) + (add ".guix-authorizations" + ,(object->string `(authorizations (version 0) ()))) ;empty + (commit "second commit" + (signer ,(key-fingerprint %ed25519-public-key-file))) + (add "b.txt" "B") + (commit "third commit" + (signer ,(key-fingerprint %ed25519-public-key-file)))) + (with-repository directory repository + (let ((commit1 (find-commit repository "first")) + (commit2 (find-commit repository "second")) + (commit3 (find-commit repository "third"))) + ;; COMMIT1 and COMMIT2 are fine. + (and (authenticate-commits repository (list commit1 commit2) + #:keyring-reference "master") + + ;; COMMIT3 is signed by an unauthorized key according to its + ;; parent's '.guix-authorizations' file. + (guard (c ((unauthorized-commit-error? c) + (and (oid=? (git-authentication-error-commit c) + (commit-id commit3)) + (bytevector=? + (openpgp-public-key-fingerprint + (unauthorized-commit-error-signing-key c)) + (openpgp-public-key-fingerprint + (read-openpgp-packet + %ed25519-public-key-file)))))) + (authenticate-commits repository + (list commit1 commit2 commit3) + #:keyring-reference "master") + 'failed))))))) + +(unless (gpg+git-available?) (test-skip 1)) +(test-assert "signed commits, .guix-authorizations, unauthorized merge" + (with-fresh-gnupg-setup (list %ed25519-public-key-file + %ed25519-secret-key-file + %ed25519bis-public-key-file + %ed25519bis-secret-key-file) + (with-temporary-git-repository directory + `((add "signer1.key" + ,(call-with-input-file %ed25519-public-key-file + get-string-all)) + (add "signer2.key" + ,(call-with-input-file %ed25519bis-public-key-file + get-string-all)) + (add ".guix-authorizations" + ,(object->string + `(authorizations (version 0) + ((,(key-fingerprint + %ed25519-public-key-file) + (name "Alice")))))) + (commit "zeroth commit") + (add "a.txt" "A") + (commit "first commit" + (signer ,(key-fingerprint %ed25519-public-key-file))) + (branch "devel") + (checkout "devel") + (add "devel/1.txt" "1") + (commit "first devel commit" + (signer ,(key-fingerprint %ed25519bis-public-key-file))) + (checkout "master") + (add "b.txt" "B") + (commit "second commit" + (signer ,(key-fingerprint %ed25519-public-key-file))) + (merge "devel" "merge" + (signer ,(key-fingerprint %ed25519-public-key-file)))) + (with-repository directory repository + (let ((master1 (find-commit repository "first commit")) + (master2 (find-commit repository "second commit")) + (devel1 (find-commit repository "first devel commit")) + (merge (find-commit repository "merge"))) + (define (correct? c commit) + (and (oid=? (git-authentication-error-commit c) + (commit-id commit)) + (bytevector=? + (openpgp-public-key-fingerprint + (unauthorized-commit-error-signing-key c)) + (openpgp-public-key-fingerprint + (read-openpgp-packet %ed25519bis-public-key-file))))) + + (and (authenticate-commits repository (list master1 master2) + #:keyring-reference "master") + + ;; DEVEL1 is signed by an unauthorized key according to its + ;; parent's '.guix-authorizations' file. + (guard (c ((unauthorized-commit-error? c) + (correct? c devel1))) + (authenticate-commits repository + (list master1 devel1) + #:keyring-reference "master") + #f) + + ;; MERGE is authorized but one of its ancestors is not. + (guard (c ((unauthorized-commit-error? c) + (correct? c devel1))) + (authenticate-commits repository + (list master1 master2 + devel1 merge) + #:keyring-reference "master") + #f))))))) + +(unless (gpg+git-available?) (test-skip 1)) +(test-assert "signed commits, .guix-authorizations, authorized merge" + (with-fresh-gnupg-setup (list %ed25519-public-key-file + %ed25519-secret-key-file + %ed25519bis-public-key-file + %ed25519bis-secret-key-file) + (with-temporary-git-repository directory + `((add "signer1.key" + ,(call-with-input-file %ed25519-public-key-file + get-string-all)) + (add "signer2.key" + ,(call-with-input-file %ed25519bis-public-key-file + get-string-all)) + (add ".guix-authorizations" + ,(object->string + `(authorizations (version 0) + ((,(key-fingerprint + %ed25519-public-key-file) + (name "Alice")))))) + (commit "zeroth commit") + (add "a.txt" "A") + (commit "first commit" + (signer ,(key-fingerprint %ed25519-public-key-file))) + (branch "devel") + (checkout "devel") + (add ".guix-authorizations" + ,(object->string ;add the second signer + `(authorizations (version 0) + ((,(key-fingerprint + %ed25519-public-key-file) + (name "Alice")) + (,(key-fingerprint + %ed25519bis-public-key-file)))))) + (commit "first devel commit" + (signer ,(key-fingerprint %ed25519-public-key-file))) + (add "devel/2.txt" "2") + (commit "second devel commit" + (signer ,(key-fingerprint %ed25519bis-public-key-file))) + (checkout "master") + (add "b.txt" "B") + (commit "second commit" + (signer ,(key-fingerprint %ed25519-public-key-file))) + (merge "devel" "merge" + (signer ,(key-fingerprint %ed25519-public-key-file))) + ;; After the merge, the second signer is authorized. + (add "c.txt" "C") + (commit "third commit" + (signer ,(key-fingerprint %ed25519bis-public-key-file)))) + (with-repository directory repository + (let ((master1 (find-commit repository "first commit")) + (master2 (find-commit repository "second commit")) + (devel1 (find-commit repository "first devel commit")) + (devel2 (find-commit repository "second devel commit")) + (merge (find-commit repository "merge")) + (master3 (find-commit repository "third commit"))) + (authenticate-commits repository + (list master1 master2 devel1 devel2 + merge master3) + #:keyring-reference "master")))))) + +(test-end "git-authenticate") + diff --git a/tests/syscalls.scm b/tests/syscalls.scm index 3823de7c1e..6acaa0b131 100644 --- a/tests/syscalls.scm +++ b/tests/syscalls.scm @@ -1,6 +1,8 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015 David Thompson <davet@gnu.org> +;;; Copyright © 2020 Simon South <simon@simonsouth.net> +;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -73,21 +75,21 @@ ;; Note: 'utimensat' does not change 'ctime'. (list (stat:mtime st) (stat:atime st))))) -(test-assert "swapon, ENOENT/EPERM" +(test-assert "swapon, ENOSYS/ENOENT/EPERM" (catch 'system-error (lambda () (swapon "/does-not-exist") #f) (lambda args - (memv (system-error-errno args) (list EPERM ENOENT))))) + (memv (system-error-errno args) (list EPERM ENOENT ENOSYS))))) -(test-assert "swapoff, ENOENT/EINVAL/EPERM" +(test-assert "swapoff, ENOSYS/ENOENT/EINVAL/EPERM" (catch 'system-error (lambda () (swapoff "/does-not-exist") #f) (lambda args - (memv (system-error-errno args) (list EPERM EINVAL ENOENT))))) + (memv (system-error-errno args) (list EPERM EINVAL ENOENT ENOSYS))))) (test-assert "mkdtemp!" (let* ((tmp (or (getenv "TMPDIR") "/tmp")) @@ -275,8 +277,14 @@ (let ((key "user.translator") (value "/hurd/pfinet\0") (file (open-file temp-file "w0"))) - (setxattr temp-file key value) - (string=? (getxattr temp-file key) value))) + (catch 'system-error + (lambda () + (setxattr temp-file key value) + (string=? (getxattr temp-file key) value)) + (lambda args + ;; Accept ENOTSUP, if the file-system does not support extended user + ;; attributes. + (memv (system-error-errno args) (list ENOTSUP)))))) (false-if-exception (delete-file temp-file)) (test-equal "fcntl-flock wait" |