futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into staging

Browse Source
This commit is contained in:
Marius Bakke 2020-06-06 21:25:43 +02:00
commit 7ce1b5e7b7
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
139 changed files with 4981 additions and 2034 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.dir-locals.el
View File

@ -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.

9
Makefile.am
View File

@ -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 \

25
README
View File

@ -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.

218
build-aux/git-authenticate.scm
View File

@ -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,195 +226,9 @@
;; 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)))

138
doc/guix-cookbook.texi
View File

@ -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

21
doc/guix.texi
View File

@ -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

74
etc/completion/bash/guix
View File

@ -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

4
etc/git/pre-push
View File

@ -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

47
gnu/bootloader/grub.scm
View File

@ -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

4
gnu/installer/final.scm
View File

@ -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)

14
gnu/local.mk
View File

@ -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 \

65
gnu/packages/admin.scm
View File

@ -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)

4
gnu/packages/algebra.scm
View File

@ -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)

8
gnu/packages/assembly.scm
View File

@ -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

52
gnu/packages/audio.scm
View File

@ -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

4
gnu/packages/benchmark.scm
View File

@ -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"

112
gnu/packages/bioinformatics.scm
View File

@ -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")

2
gnu/packages/boost.scm
View File

@ -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))

5
gnu/packages/bootloaders.scm
View File

@ -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

2
gnu/packages/bootstrap.scm
View File

@ -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")

5
gnu/packages/c.scm
View File

@ -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")

6
gnu/packages/ccache.scm
View File

@ -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))))

4
gnu/packages/cdrom.scm
View File

@ -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

23
gnu/packages/check.scm
View File

@ -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

2
gnu/packages/ci.scm
View File

@ -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

22
gnu/packages/code.scm
View File

@ -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)

13
gnu/packages/compression.scm
View File

@ -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")

4
gnu/packages/cpp.scm
View File

@ -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"

4
gnu/packages/crates-io.scm
View File

@ -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

4
gnu/packages/cups.scm
View File

@ -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

5
gnu/packages/cybersecurity.scm
View File

@ -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)))

19
gnu/packages/databases.scm
View File

@ -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

36
gnu/packages/debug.scm
View File

@ -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+)))

315
gnu/packages/diffoscope.scm
View File

@ -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

8
gnu/packages/docker.scm
View File

@ -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"

9
gnu/packages/education.scm
View File

@ -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

4
gnu/packages/elf.scm
View File

@ -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"

1144
gnu/packages/emacs-xyz.scm
View File

File diff suppressed because it is too large Load Diff

4
gnu/packages/emulators.scm
View File

@ -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)

4
gnu/packages/engineering.scm
View File

@ -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)

4
gnu/packages/enlightenment.scm
View File

@ -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

100
gnu/packages/file-systems.scm
View File

@ -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))))

16
gnu/packages/finance.scm
View File

@ -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) .

34
gnu/packages/fonts.scm
View File

@ -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"))

4
gnu/packages/freedesktop.scm
View File

@ -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)))

14
gnu/packages/games.scm
View File

@ -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"

10
gnu/packages/glib.scm
View File

@ -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")

100
gnu/packages/gnome.scm
View File

@ -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)

12
gnu/packages/gnuzilla.scm
View File

@ -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")))

6
gnu/packages/golang.scm
View File

@ -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"))

6
gnu/packages/gps.scm
View File

@ -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

174
gnu/packages/graphics.scm
View File

@ -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")

31
gnu/packages/gtk.scm
View File

@ -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

4
gnu/packages/guile-xyz.scm
View File

@ -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")

19
gnu/packages/guile.scm
View File

@ -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.

5
gnu/packages/hardware.scm
View File

@ -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

147
gnu/packages/image.scm
View File

@ -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+)))

173
gnu/packages/inkscape.scm
View File

@ -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

11
gnu/packages/java.scm
View File

@ -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"

8
gnu/packages/kde-frameworks.scm
View File

@ -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

51
gnu/packages/kde-pim.scm
View File

@ -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")

4
gnu/packages/kde.scm
View File

@ -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)

58
gnu/packages/libreoffice.scm
View File

@ -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/")

104
gnu/packages/linux.scm
View File

@ -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

372
gnu/packages/lisp-xyz.scm
View File

@ -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))

65
gnu/packages/lisp.scm
View File

@ -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

7
gnu/packages/machine-learning.scm
View File

@ -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,

20
gnu/packages/mail.scm
View File

@ -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)

4
gnu/packages/man.scm
View File

@ -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

55
gnu/packages/maths.scm
View File

@ -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

8
gnu/packages/matrix.scm
View File

@ -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)

6
gnu/packages/messaging.scm
View File

@ -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

4
gnu/packages/mp3.scm
View File

@ -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

26
gnu/packages/multiprecision.scm
View File

@ -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

53
gnu/packages/music.scm
View File

@ -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")

4
gnu/packages/ncdu.scm
View File

@ -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")

41
gnu/packages/networking.scm
View File

@ -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

8
gnu/packages/nss.scm
View File

@ -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))))))))

10
gnu/packages/ocaml.scm
View File

@ -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)))

18
gnu/packages/package-management.scm
View File

@ -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")

13
gnu/packages/parallel.scm
View File

@ -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

9
gnu/packages/patches/biber-sortinithash.patch
View File

@ -17,6 +17,15 @@ index b4f641e..c6f86c7 100644
\field{extraname}{1}
\field{sortinit}{L}
- \field{sortinithash}{2c7981aaabc885868aba60f0c09ee20f}
+ \field{sortinithash}{dad3efd0836470093a7b4a7bb756eb8c}
\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}

58
gnu/packages/patches/dbus-CVE-2020-12049.patch Normal file
View File

@ -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);

43
gnu/packages/patches/emacs-zones-called-interactively.patch
View File

@ -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

35
gnu/packages/patches/haskell-mode-make-check.patch
View File

@ -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

44
gnu/packages/patches/haskell-mode-unused-variables.patch
View File

@ -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

4
gnu/packages/patches/icecat-makeicecat.patch
View File

@ -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

27
gnu/packages/patches/java-openjfx-build-jdk_version.patch Normal file
View File

@ -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

36
gnu/packages/patches/lib2geom-enable-assertions.patch Normal file
View File

@ -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

34
gnu/packages/patches/lib2geom-link-tests-against-glib.patch Normal file
View File

@ -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

94
gnu/packages/patches/lib2geom-use-system-googletest.patch Normal file
View File

@ -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

138
gnu/packages/patches/nss-CVE-2020-12399.patch Normal file
View File

@ -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(&params->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;

26
gnu/packages/patches/openscad-parser-boost-1.72.patch Normal file
View File

@ -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"

23
gnu/packages/patches/plotutils-libpng-jmpbuf.patch
View File

@ -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

278
gnu/packages/patches/pypy3-7.3.1-fix-tests.patch Normal file
View File

@ -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

103
gnu/packages/patches/websocketpp-fix-for-boost-1.70.patch
View File

@ -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)

17
gnu/packages/patches/websocketpp-fix-for-cmake-3.15.patch Normal file
View File

@ -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.

24
gnu/packages/plotutils.scm
View File

@ -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

18
gnu/packages/pretty-print.scm
View File

@ -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")))

35
gnu/packages/python-crypto.scm
View File

@ -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

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