me
/
guix
Archived
1
0
Fork 0
Code

Merge branch 'master' into core-updates

master
Marius Bakke 2020-02-14 19:05:45 +01:00
parent 89da127035 64fc4f3705
commit 7edafc884c
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
143 changed files with 11626 additions and 4364 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.mailmap
View File

@ -30,6 +30,7 @@ Eric Dvorsak <eric@dvorsak.fr> <yenda1@gmail.com>
George Clemmer <myglc2@gmail.com>
ison <ison@airmail.cc> <ison111@protonmail.com>
Ivan Vilata i Balaguer <ivan@selidor.net>
Jakob L. Kreuze <zerodaysfordays@sdf.org> <zerodaysfordays@sdf.lonestar.org>
Jeff Mickey <j@codemac.net> <jm@igneous.io>
John Darrington <jmd@gnu.org> <john@darrington.wattle.id.au>
John J. Foerch <jjfoerch@earthlink.net>

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

@ -133,6 +133,8 @@
"B051 5948 F1E7 D3C1 B980 38A0 2646 FA30 BACA 7F08")
("lsl88"
"2AE3 1395 932B E642 FC0E D99C 9BED 6EDA 32E5 B0BC")
("mab"
"BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103")
("marusich"
"CBF5 9755 CBE7 E7EF EF18 3FB1 DD40 9A15 D822 469D")
("mbakke"
@ -149,6 +151,8 @@
("nckx (2nd)"
;; primary: "F5BC 5534 C36F 0087 B39D 36EF 1C9D C4FE B9DB 7C4B"
"F5DA 2032 4B87 3D0B 7A38 7672 0DB0 FF88 4F55 6D79")
("niedzejkob"
"E576 BFB2 CF6E B13D F571 33B9 E315 A758 4613 1564")
("ngz"
"ED0E F1C8 E126 BA83 1B48 5FE9 DA00 B4F0 48E9 2F2D")
("pelzflorian"

29
doc/guix.texi
View File

@ -46,7 +46,7 @@ Copyright @copyright{} 2017, 2018 Carlo Zancanaro@*
Copyright @copyright{} 2017 Thomas Danckaert@*
Copyright @copyright{} 2017 humanitiesNerd@*
Copyright @copyright{} 2017 Christopher Allan Webber@*
Copyright @copyright{} 2017, 2018, 2019 Marius Bakke@*
Copyright @copyright{} 2017, 2018, 2019, 2020 Marius Bakke@*
Copyright @copyright{} 2017, 2019, 2020 Hartmut Goebel@*
Copyright @copyright{} 2017, 2019, 2020 Maxim Cournoyer@*
Copyright @copyright{} 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice@*
@ -72,6 +72,7 @@ Copyright @copyright{} 2019 Guillaume Le Vaillant@*
Copyright @copyright{} 2020 Leo Prikler@*
Copyright @copyright{} 2019, 2020 Simon Tournier@*
Copyright @copyright{} 2020 Wiktor Żelazny@*
Copyright @copyright{} 2020 Damien Cassou@*
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
@ -3292,8 +3293,10 @@ $ guix build emacs --dry-run
@end example
@noindent
This indicates that substitutes from @code{@value{SUBSTITUTE-SERVER}} are usable and
will be downloaded, when possible, for future builds.
The text changed from ``The following derivations would be built'' to
``112.3 MB would be downloaded''. This indicates that substitutes from
@code{@value{SUBSTITUTE-SERVER}} are usable and will be downloaded, when
possible, for future builds.
@cindex substitutes, how to disable
The substitute mechanism can be disabled globally by running
@ -4158,7 +4161,7 @@ say, on another machine, by providing a channel specification in
(channel
(name 'my-personal-packages)
(url "https://example.org/personal-packages.git")
(branch "dd3df5e2c8818760a8fc0bd699e55d3b69fef2bb")))
(commit "dd3df5e2c8818760a8fc0bd699e55d3b69fef2bb")))
@end lisp
The @command{guix describe --format=channels} command can even generate this
@ -5057,12 +5060,21 @@ Alternatively, you can produce a pack in the Docker image format using
the following command:
@example
guix pack -f docker guile emacs geiser
guix pack -f docker -S /bin=bin guile guile-readline
@end example
@noindent
The result is a tarball that can be passed to the @command{docker load}
command. See the
command, followed by @code{docker run}:
@example
docker load < @var{file}
docker run -ti guile-guile-readline /bin/guile
@end example
@noindent
where @var{file} is the image returned by @var{guix pack}, and
@code{guile-guile-readline} is its ``image tag''. See the
@uref{https://docs.docker.com/engine/reference/commandline/load/, Docker
documentation} for more information.
@ -8444,6 +8456,11 @@ As an example, @var{file} might contain a package definition like this
@include package-hello.scm
@end lisp
@item --manifest=@var{manifest}
@itemx -m @var{manifest}
Build all packages listed in the given @var{manifest}
(@pxref{profile-manifest, @option{--manifest}}).
@item --expression=@var{expr}
@itemx -e @var{expr}
Build the package or derivation @var{expr} evaluates to.

2
etc/completion/bash/guix
View File

@ -178,7 +178,7 @@ _guix_complete ()
_guix_complete_installed_package "$word_at_point"
elif _guix_is_command "build"
then
if _guix_is_dash_L
if _guix_is_dash_L || _guix_is_dash_m
then
_guix_complete_file
else

43
etc/news.scm
View File

@ -1,6 +1,7 @@
;; GNU Guix news, for use by 'guix pull'.
;;
;; Copyright © 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
;;
;; Copying and distribution of this file, with or without modification, are
;; permitted in any medium without royalty provided the copyright notice and
@ -9,9 +10,36 @@
(channel-news
(version 0)
(entry (commit "e3e1a7ba08af2d58c47264c543617e499c239444")
(title (en "@command{guix pull} now supports SSH authenticated
repositories")
(de "@command{guix pull} unterstützt nun SSH-authentifizierte
Repositorys")
(fr "@command{guix pull} prend maintenant en charge
l'authentification en SSH pour les dépôts.")
(nl "@command{guix pull} ondersteunt nu SSH-geauthenticeerde
repository's."))
(body (en "The @command{guix pull} command now supports SSH
authenticated repositories as argument of @option{--url} and in custom
channels definitions. The authentication requires that an @command{ssh-agent}
is running.")
(de "Der Befehl @command{guix pull} unterstützt nun über SSH
authentifizierte Repositorys als Argument von @option{--url} und in
selbstgeschriebenen Kanaldefinitionen. Zur Authentisierung muss ein
@command{ssh-agent} laufen.")
(fr "La commande @command{guix pull} prend maintenant en
charge l'authentification SSH pour les dépôts dans l'argument @option{--url}
et dans le définitions de canaux personnalisés. L'authentification
nécessite qu'un @command{ssh-agent} soit lancé.")
(nl "Het @command{guix pull}-commando ondersteunt nu
SSH-geauthenticeerde opslag als argument na @option{--url} en bij het
schrijven van eigen kanaaldefinities. Hiervoor moet een @command{ssh-agent}
gestart zijn.")))
(entry (commit "8234fe653e61d0090138cbd4c48d877568355439")
(title (en "Guix now runs on Guile 3.0")
(de "Guix läuft jetzt auf Guile 3.0")
(fr "Guix tourne maintenant sous Guile 3.0")
(nl "Guix draait nu op Guile 3.0"))
(body (en "The Guix revision you just pulled runs on version 3.0 of
GNU@tie{}Guile (previously it would run on version 2.2). Guile 3.0 improves
@ -25,6 +53,11 @@ erzeugt werden (JIT-Kompilierung). Der Wechsel sollte für Sie völlig
transparent sein und Guix verhält sich gleich. Siehe
@uref{https://gnu.org/software/guile} für weitere Informationen zu Guile
3.0.")
(fr "La révision de Guix que tu viens de récupérer tourne sous
la version 3.0 de GNU@tie{}Guile (Guix tournait avant sous la version 2.2).
Guile 3.0 améliore la performance en générant du code natif à la volée (JIT).
Le changement devrait être totalement transparent pour toi. Voir
@uref{https://gnu.org/software/guile} pour plus d'information sur Guile 3.0.")
(nl "De Guix die u net heeft gepulld gebruikt versie 3.0 van
GNU@tie{}Guile (voorheen was dat versie 2.2). Guile@tie{}3.0 draait dezelfde
programma's doorgaans sneller door ze ‘just-in-time’ (JIT) te vertalen naar
@ -34,7 +67,8 @@ Guile@tie{}3.0.")))
(entry (commit "828a39da68a9169ef1d9f9ff02a1c66b1bcbe884")
(title (en "New @option{--diff} option for @command{guix challenge}")
(de "Neue @option{--diff}-Option für @command{guix challenge}"))
(de "Neue @option{--diff}-Option für @command{guix challenge}")
(fr "Nouvelle option @option{--diff} sur @command{guix challenge}"))
(body (en "The @command{guix challenge} command, which compares
binaries provided by different substitute servers as well as those built
locally, has a new @option{--diff} option. With @option{--diff=simple} (the
@ -42,6 +76,13 @@ default), @command{guix challenge} automatically downloads binaries and
reports the list of differing files; @option{--diff=diffoscope} instructs it
to pass them to @command{diffoscope}, which simplifies the comparison process.
Run @command{info \"(guix) Invoking guix challenge\"}, for more info.")
(fr "La commande @command{guix challenge} qui compare les binaires
fournis par différents serveurs de substituts aux contsructions locales a une
nouvelle option @option{--diff}. Avec @option{--diff=simple} (par défaut),
@command{guix challenge} télécharge automatiquement les binaires et rapporte
la liste des fichiers différents@tie{}; @option{--diff=diffoscope} lui dit
de les passer à @command{diffoscope} qui simplifie le processus de comparaison.
Lance @command{info \"(guix.fr) Invoquer guix challenge\"} pour plus d'info.")
(de "Der Befehl @command{guix challenge}, mit dem Binärdateien
von unterschiedlichen Substitut-Servern oder lokale Erstellungen miteinander
verglichen werden können, hat eine neue Befehlszeilenoption @option{--diff}

7
gnu/installer.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2018, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
@ -389,8 +389,9 @@ selected keymap."
;; We did it! Let's reboot!
(sync)
(stop-service 'root))
(_ ;installation failed
;; TODO: Honor the result of 'run-install-failed-page'.
(_
;; The installation failed, exit so that it is restarted
;; by login.
#f)))
(const #f)
(lambda (key . args)

27
gnu/installer/final.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2018, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
@ -23,6 +23,7 @@
#:use-module (gnu installer utils)
#:use-module (gnu installer user)
#:use-module (gnu services herd)
#:use-module (guix build syscalls)
#:use-module (guix build utils)
#:use-module (gnu build accounts)
#:use-module ((gnu system shadow) #:prefix sys:)
@ -96,6 +97,15 @@ USERS."
(write-passwd password (string-append etc "/passwd"))
(write-shadow shadow (string-append etc "/shadow")))
(define (umount-cow-store)
"Remove the store overlay and the bind-mount on /tmp created by the
cow-store service."
(let ((tmp-dir "/remove"))
(mkdir-p tmp-dir)
(mount (%store-directory) tmp-dir "" MS_MOVE)
(umount tmp-dir)
(umount "/tmp")))
(define* (install-system locale #:key (users '()))
"Create /etc/shadow and /etc/passwd on the installation target for USERS.
Start COW-STORE service on target directory and launch guix install command in
@ -114,5 +124,16 @@ or #f. Return #t on success and #f on failure."
;; passwords that we've put in there.
(create-user-database users (%installer-target-dir))
(start-service 'cow-store (list (%installer-target-dir)))
(run-shell-command install-command #:locale locale)))
(dynamic-wind
(lambda ()
(start-service 'cow-store (list (%installer-target-dir))))
(lambda ()
(run-shell-command install-command #:locale locale))
(lambda ()
(stop-service 'cow-store)
;; Remove the store overlay created at cow-store service start.
;; Failing to do that will result in further umount calls to fail
;; because the target device is seen as busy. See:
;; https://lists.gnu.org/archive/html/guix-devel/2018-12/msg00161.html.
(umount-cow-store)
#f))))

21
gnu/installer/newt/final.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2018, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
@ -27,6 +27,7 @@
#:use-module (guix i18n)
#:use-module (srfi srfi-34)
#:use-module (srfi srfi-35)
#:use-module (ice-9 match)
#:use-module (newt)
#:export (run-final-page))
@ -73,12 +74,18 @@ press the button to reboot."))
'success)
(define (run-install-failed-page)
(choice-window
(G_ "Installation failed")
(G_ "Restart installer")
(G_ "Retry system install")
(G_ "The final system installation step failed. You can retry the \
last step, or restart the installer.")))
(match (choice-window
(G_ "Installation failed")
(G_ "Resume")
(G_ "Restart the installer")
(G_ "The final system installation step failed. You can resume from \
a specific step, or restart the installer."))
(1 (raise
(condition
(&installer-step-abort))))
(2
;; Keep going, the installer will be restarted later on.
#t)))
(define* (run-install-shell locale
#:key (users '()))

10
gnu/local.mk
View File

@ -109,6 +109,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/check.scm \
%D%/packages/chemistry.scm \
%D%/packages/chez.scm \
%D%/packages/chicken.scm \
%D%/packages/chromium.scm \
%D%/packages/ci.scm \
%D%/packages/cinnamon.scm \
@ -818,10 +819,7 @@ dist_patch_DATA = \
%D%/packages/patches/docbook-xsl-nonrecursive-string-subst.patch \
%D%/packages/patches/doc++-include-directives.patch \
%D%/packages/patches/doc++-segfault-fix.patch \
%D%/packages/patches/docker-adjust-tests-for-changes-in-go.patch \
%D%/packages/patches/docker-engine-test-noinstall.patch \
%D%/packages/patches/docker-fix-tests.patch \
%D%/packages/patches/docker-use-fewer-modprobes.patch \
%D%/packages/patches/dovecot-trees-support-dovecot-2.3.patch \
%D%/packages/patches/doxygen-test.patch \
%D%/packages/patches/doxygen-1.8.17-runtests.patch \
@ -1029,7 +1027,6 @@ dist_patch_DATA = \
%D%/packages/patches/inkscape-poppler-0.76.patch \
%D%/packages/patches/intltool-perl-compatibility.patch \
%D%/packages/patches/irrlicht-use-system-libs.patch \
%D%/packages/patches/isc-dhcp-4.4.1-fixes-for-newer-bind.patch \
%D%/packages/patches/isl-0.11.1-aarch64-support.patch \
%D%/packages/patches/jacal-fix-texinfo.patch \
%D%/packages/patches/jamvm-arm.patch \
@ -1116,8 +1113,6 @@ dist_patch_DATA = \
%D%/packages/patches/libmpeg2-global-symbol-test.patch \
%D%/packages/patches/libmygpo-qt-fix-qt-5.11.patch \
%D%/packages/patches/libmygpo-qt-missing-qt5-modules.patch \
%D%/packages/patches/libreoffice-icu.patch \
%D%/packages/patches/libreoffice-glm.patch \
%D%/packages/patches/libseccomp-open-aarch64.patch \
%D%/packages/patches/libsndfile-armhf-type-checks.patch \
%D%/packages/patches/libsndfile-CVE-2017-8361-8363-8365.patch \
@ -1353,6 +1348,7 @@ dist_patch_DATA = \
%D%/packages/patches/qemu-CVE-2020-7039.patch \
%D%/packages/patches/qemu-CVE-2020-7211.patch \
%D%/packages/patches/qemu-fix-documentation-build-failure.patch \
%D%/packages/patches/qrcodegen-cpp-make-install.patch \
%D%/packages/patches/qt4-ldflags.patch \
%D%/packages/patches/qtbase-use-TZDIR.patch \
%D%/packages/patches/qtscript-disable-tests.patch \
@ -1370,6 +1366,7 @@ dist_patch_DATA = \
%D%/packages/patches/readline-link-ncurses.patch \
%D%/packages/patches/readline-6.2-CVE-2014-2524.patch \
%D%/packages/patches/reposurgeon-add-missing-docbook-files.patch \
%D%/packages/patches/reprotest-support-guix.patch \
%D%/packages/patches/ri-li-modernize_cpp.patch \
%D%/packages/patches/ripperx-missing-file.patch \
%D%/packages/patches/rpcbind-CVE-2017-8779.patch \
@ -1385,6 +1382,7 @@ dist_patch_DATA = \
%D%/packages/patches/rust-bootstrap-stage0-test.patch \
%D%/packages/patches/rust-coresimd-doctest.patch \
%D%/packages/patches/rust-reproducible-builds.patch \
%D%/packages/patches/rust-openssl-sys-no-vendor.patch \
%D%/packages/patches/rxvt-unicode-escape-sequences.patch \
%D%/packages/patches/sbcl-graph-asdf-definitions.patch \
%D%/packages/patches/scalapack-blacs-mpi-deprecations.patch \

2
gnu/machine.scm
View File

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019 David Thompson <davet@gnu.org>
;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.lonestar.org>
;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.org>
;;;
;;; This file is part of GNU Guix.
;;;

2
gnu/machine/digital-ocean.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.lonestar.org>
;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.org>
;;;
;;; This file is part of GNU Guix.
;;;

2
gnu/machine/ssh.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.lonestar.org>
;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.org>
;;;
;;; This file is part of GNU Guix.
;;;

42
gnu/packages/admin.scm
View File

@ -25,7 +25,7 @@
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2019 Brett Gilio <brettg@gnu.org>
;;; Copyright © 2019 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.lonestar.org>
;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.org>
;;; Copyright © 2019 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2019 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net>
@ -451,7 +451,7 @@ hostname.")
(define-public shadow
(package
(name "shadow")
(version "4.8")
(version "4.8.1")
(source (origin
(method url-fetch)
(uri (string-append
@ -459,7 +459,7 @@ hostname.")
"download/" version "/shadow-" version ".tar.xz"))
(sha256
(base32
"0r5c1p8mfwhw11gb6mjsx1k7d4c32dxai7yss8n5pwy1p61ndd34"))))
"0qmfq50sdhz6xilgxvinblll8j2iqfl7hwk45bq744y4plq4dbd3"))))
(build-system gnu-build-system)
(arguments
`(;; Assume System V `setpgrp (void)', which is the default on GNU
@ -771,14 +771,14 @@ connection alive.")
bind-release-version)))
(package
(name "isc-dhcp")
(version "4.4.1")
(version "4.4.2")
(source (origin
(method url-fetch)
(uri (string-append "https://ftp.isc.org/isc/dhcp/"
version "/dhcp-" version ".tar.gz"))
(sha256
(base32
"025nfqx4zwdgv4b3rkw26ihcj312vir08jk6yi57ndmb4a4m08ia"))))
"08a5003zdxgl41b29zjkxa92h2i40zyjgxg0npvnhpkfl5jcsz0s"))))
(build-system gnu-build-system)
(arguments
`(#:parallel-build? #f
@ -787,17 +787,6 @@ connection alive.")
(modify-phases %standard-phases
(add-after 'unpack 'replace-bundled-bind
(lambda* (#:key inputs native-inputs #:allow-other-keys)
;; XXX TODO: Remove the following invocation of 'patch' when
;; isc-dhcp is updated. It should be needed only for 4.4.1.
(let ((patch (string-append (assoc-ref (or native-inputs inputs)
"patch")
"/bin/patch"))
(the-patch (assoc-ref (or native-inputs inputs)
"fixes-for-newer-bind.patch")))
(format #t "applying '~a'...~%" the-patch)
(invoke patch "--force" "--no-backup-if-mismatch"
"-p1" "--input" the-patch))
(delete-file "bind/bind.tar.gz")
(copy-file (assoc-ref inputs "bind-source-tarball")
"bind/bind.tar.gz")
@ -885,20 +874,14 @@ connection alive.")
(native-inputs
`(("perl" ,perl)
("file" ,file)
;; XXX TODO: Remove the following patch, and also the 'patch'
;; program, when isc-dhcp is updated.
("fixes-for-newer-bind.patch"
,(search-patch "isc-dhcp-4.4.1-fixes-for-newer-bind.patch"))
("patch" ,patch)))
("file" ,file)))
(inputs `(("inetutils" ,inetutils)
("net-tools" ,net-tools)
("iproute" ,iproute)
;; XXX isc-dhcp bundles a copy of bind that has security
;; flaws, so we use a newer version.
;; isc-dhcp bundles a copy of BIND, which has proved vulnerable
;; in the past. Use a BIND-VERSION of our choosing instead.
("bind-source-tarball"
,(origin
(method url-fetch)
@ -1588,7 +1571,7 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).")
(define-public acpica
(package
(name "acpica")
(version "20191213")
(version "20200110")
(source (origin
(method url-fetch)
(uri (string-append
@ -1596,7 +1579,7 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).")
version ".tar.gz"))
(sha256
(base32
"1106d5b7q8jlgc2z0gz83jdah1yml4fz5z0jjcs7a52pv00c9am8"))))
"1hb4g6r7w8s4bhlkk36fmb4qxghnrwvad7f18cpn6zz0b4sjs7za"))))
(build-system gnu-build-system)
(native-inputs `(("flex" ,flex)
("bison" ,bison)))
@ -1622,14 +1605,13 @@ development, not the kernel implementation of ACPI.")
(define-public s-tui
(package
(name "s-tui")
(version "0.8.3")
(version "1.0.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "s-tui" version))
(sha256
(base32
"00lsh2v4i8rwfyjyxx5lijd6rnk9smcfffhzg5sv94ijpcnh216m"))))
(base32 "0r5yhlsi5xiy7ii1w4kqkaxz9069v5bbfwi3x3xnxhk51yjfgr8n"))))
(build-system python-build-system)
(inputs
`(("python-psutil" ,python-psutil)

39
gnu/packages/aidc.scm
View File

@ -4,6 +4,7 @@
;;; Copyright © 2017 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
;;;
;;; This file is part of GNU Guix.
;;;
@ -154,3 +155,41 @@ For application developers, language bindings are included for C, C++ and
Python as well as GUI widgets for GTK and Qt.")
(home-page "https://github.com/mchehab/zbar")
(license license:lgpl2.1+)))
(define-public qrcodegen-cpp
;; Currently this project's installation mechanism only exists as a GitHub
;; pull request, so we build from a recent commit that the proposed patch
;; applies to.
(let ((commit "6ea933f1596d818bd21e9a6b8d2e851fb8b4bcf1")
(revision "0"))
(package
(name "qrcodegen-cpp")
(version (git-version "1.5.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/nayuki/QR-Code-generator.git")
(commit commit)))
(file-name (git-file-name name version))
(patches (search-patches "qrcodegen-cpp-make-install.patch"))
(sha256
(base32
"19fcwqmfk2n9p2n01dv2j4x2y2mqip0j1wbmfbxjp34rqkjwcwxm"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no test suite
#:make-flags
(list (string-append "PREFIX=" (assoc-ref %outputs "out")))
#:phases
(modify-phases %standard-phases
(delete 'configure) ; No ./configure script
;; Only build the C++ variant.
(add-after 'unpack 'chdir
(lambda _
(chdir "cpp")
#t)))))
(synopsis "QR Code generator library")
(description "qrcodegen-cpp is a QR code generator library in C++. The
project also offers Java, Javascript, Python, C, and Rust implementations.")
(home-page "https://www.nayuki.io/page/qr-code-generator-library")
(license license:expat))))

6
gnu/packages/antivirus.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016, 2017, 2018, 2019 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Eric Bavier <bavier@posteo.net>
;;; Copyright © 2018 Christopher Baines <mail@cbaines.net>
;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
@ -44,14 +44,14 @@
(define-public clamav
(package
(name "clamav")
(version "0.102.1")
(version "0.102.2")
(source (origin
(method url-fetch)
(uri (string-append "https://www.clamav.net/downloads/production/"
"clamav-" version ".tar.gz"))
(sha256
(base32
"1mpdgn3isz26hd1j6p8lcb76v8hjs54k1wb655rnil4hv78aig8d"))
"1lq7r6r2yl8pp3fkn32b0bsmbbl9pg90kpvhsa2clad3xg0drz49"))
(modules '((guix build utils)))
(snippet
'(begin

9
gnu/packages/backup.scm
View File

@ -434,7 +434,7 @@ rdiff-backup is easy to use and settings have sensible defaults.")
(define-public rsnapshot
(package
(name "rsnapshot")
(version "1.4.2")
(version "1.4.3")
(source
(origin
(method url-fetch)
@ -442,8 +442,7 @@ rdiff-backup is easy to use and settings have sensible defaults.")
"https://github.com/rsnapshot/rsnapshot/releases/download/"
version "/rsnapshot-" version ".tar.gz"))
(sha256
(base32
"05jfy99a0xs6lvsjfp3wz21z0myqhmwl2grn3jr9clijbg282ah4"))))
(base32 "1lavqmmsf53pim0nvming7fkng6p0nk2a51k2c2jdq0l7snpl31b"))))
(build-system gnu-build-system)
(arguments
`(#:phases
@ -455,6 +454,10 @@ rdiff-backup is easy to use and settings have sensible defaults.")
"t/backup_exec/conf/backup_exec.conf")
(("/bin/true") (which "true"))
(("/bin/false") (which "false")))
;; Disable a test that tries to connect to localhost on port 22.
(delete-file "t/ssh_args/ssh_args.t.in")
(invoke "make" "test"))))))
(inputs
`(("perl" ,perl)

6
gnu/packages/bioconductor.scm
View File

@ -1543,7 +1543,7 @@ expressed genes in DNA microarray experiments.")
`(("r-codetools" ,r-codetools)
("r-graph" ,r-graph)
("r-xml" ,r-xml)))
(home-page "http://cran.r-project.org/web/packages/CodeDepends")
(home-page "https://cran.r-project.org/web/packages/CodeDepends")
(synopsis "Analysis of R code for reproducible research and code comprehension")
(description
"This package provides tools for analyzing R expressions or blocks of
@ -2455,7 +2455,7 @@ gene and isoform level using RNA-seq data")
("zlib" ,zlib)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "http://r-forge.r-project.org/projects/rsymphony")
(home-page "https://r-forge.r-project.org/projects/rsymphony")
(synopsis "Symphony integer linear programming solver in R")
(description
"This package was derived from Rsymphony. The package provides an R
@ -7224,7 +7224,7 @@ access.")
("r-s4vectors" ,r-s4vectors)
("r-summarizedexperiment" ,r-summarizedexperiment)
("r-tidyr" ,r-tidyr)))
(home-page "http://waldronlab.io/MultiAssayExperiment/")
(home-page "https://waldronlab.io/MultiAssayExperiment/")
(synopsis "Integration of multi-omics experiments in Bioconductor")
(description
"MultiAssayExperiment harmonizes data management of multiple assays

15
gnu/packages/bioinformatics.scm
View File

@ -5,7 +5,7 @@
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2016 Roel Janssen <roel@gnu.org>
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2016, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2016, 2018 Raoul Bonnal <ilpuccio.febo@gmail.com>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
@ -4733,7 +4733,17 @@ interrupted by stop codons. OrfM finds and prints these ORFs.")
(base32
"1kjmv891d6qbpp4shhhvkl02ff4q5xlpnls2513sm2cjcrs52f1i"))))
(build-system python-build-system)
(arguments `(#:python ,python-2)) ; pbcore requires Python 2.7
(arguments
`(#:python ,python-2 ;pbcore < 2.0 requires Python 2.7
#:phases (modify-phases %standard-phases
(add-after 'unpack 'remove-sphinx-dependency
(lambda _
;; Sphinx is only required for documentation tests, which
;; we do not run; furthermore it depends on python2-sphinx
;; which is no longer maintained.
(substitute* "requirements-dev.txt"
(("^sphinx") ""))
#t)))))
(propagated-inputs
`(("python-cython" ,python2-cython)
("python-numpy" ,python2-numpy)
@ -4741,7 +4751,6 @@ interrupted by stop codons. OrfM finds and prints these ORFs.")
("python-h5py" ,python2-h5py)))
(native-inputs
`(("python-nose" ,python2-nose)
("python-sphinx" ,python2-sphinx)
("python-pyxb" ,python2-pyxb)))
(home-page "https://pacificbiosciences.github.io/pbcore/")
(synopsis "Library for reading and writing PacBio data files")

4
gnu/packages/boost.scm
View File

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

26
gnu/packages/check.scm
View File

@ -2174,6 +2174,32 @@ JSON APIs with Behave.")
(define-public python2-rednose
(package-with-python2 python-rednose))
(define-public python-nose-random
(package
(name "python-nose-random")
(version "1.0.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/fzumstein/nose-random")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"1dvip61r2frjv35mv6mmfjc07402z73pjbndfp3mhxyjn2zhksw2"))))
(build-system python-build-system)
(native-inputs
`(("python-nose" ,python-nose)))
(home-page "https://github.com/fzumstein/nose-random")
(synopsis "Nose plugin to facilitate randomized unit testing with
Python")
(description "Python nose-random is designed to facilitate
Monte-Carlo style unit testing. The idea is to improve testing by
running your code against a large number of randomly generated input
scenarios.")
(license license:expat)))
(define-public python-nose-randomly
(package
(name "python-nose-randomly")

68
gnu/packages/chicken.scm 100644
View File

@ -0,0 +1,68 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020 Ekaitz Zarraga <ekaitz@elenq.tech>
;;;
;;; This file is part of GNU Guix.
;;;
;;; GNU Guix is free software; you can redistribute it and/or modify it
;;; under the terms of the GNU General Public License as published by
;;; the Free Software Foundation; either version 3 of the License, or (at
;;; your option) any later version.
;;;
;;; GNU Guix is distributed in the hope that it will be useful, but
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;;; GNU General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages chicken)
#:use-module (gnu packages)
#:use-module (guix packages)
#:use-module (guix build-system gnu)
#:use-module (guix download)
#:use-module (gnu packages commencement)
#:use-module ((guix licenses)
#:select (bsd-3)))
(define-public chicken
(package
(name "chicken")
(version "5.1.0")
(source (origin
(method url-fetch)
(uri (string-append "https://code.call-cc.org/releases/"
version "/chicken-" version ".tar.gz"))
(sha256
(base32
"0jsbp3kp0134f318j3wpd1n85gf8qzh034fn198gvazsv2l024aw"))))
(build-system gnu-build-system)
(arguments
`(#:modules ((guix build gnu-build-system)
(guix build utils)
(srfi srfi-1))
;; No `configure' script; run "make check" after "make install" as
;; prescribed by README.
#:phases
(modify-phases %standard-phases
(delete 'configure)
(delete 'check)
(add-after 'install 'check
(assoc-ref %standard-phases 'check)))
#:make-flags (let ((out (assoc-ref %outputs "out")))
(list "PLATFORM=linux"
(string-append "PREFIX=" out)
(string-append "VARDIR=" out "/var/lib")))
;; Parallel builds are not supported, as noted in README.
#:parallel-build? #f))
(propagated-inputs `(("gcc-toolchain", gcc-toolchain)))
(home-page "http://www.call-cc.org/")
(synopsis "R5RS Scheme implementation that compiles native code via C")
(description
"CHICKEN is a compiler for the Scheme programming language. CHICKEN
produces portable and efficient C, supports almost all of the R5RS Scheme
language standard, and includes many enhancements and extensions.")
(license bsd-3)))

9
gnu/packages/chromium.scm
View File

@ -69,7 +69,8 @@
#:use-module (gnu packages xiph)
#:use-module (gnu packages xml)
#:use-module (gnu packages xdisorg)
#:use-module (gnu packages xorg))
#:use-module (gnu packages xorg)
#:use-module (ice-9 match))
(define %preserved-third-party-files
'("base/third_party/cityhash" ;Expat
@ -278,9 +279,9 @@ from forcing GEXP-PROMISE."
(url "https://salsa.debian.org/chromium-team/chromium.git")
(commit %debian-revision)))
(file-name (git-file-name "debian-chromium-packaging"
(if (string-prefix? "debian/" %debian-revision)
(cadr (string-split %debian-revision #\/))
(string-take %debian-revision 7))))
(match (string-split %debian-revision #\/)
((_ revision) revision)
(_ (string-take %debian-revision 7)))))
(sha256
(base32
"1rbzxcwfp7v0c6rkvn9jl9by7p363cnbdyqazwiak1z03kmw3nkz"))))

18
gnu/packages/cran.scm
View File

@ -537,7 +537,7 @@ particularly easy to create complete web applications using httpuv alone.")
(base32
"0lyvhnr6n57h3a89bvipii7x17nvfaycm9j5j50bfrlr48jv9ic8"))))
(build-system r-build-system)
(home-page "http://arxiv.org/abs/1403.2805")
(home-page "https://arxiv.org/abs/1403.2805")
(synopsis "Robust, high performance JSON parser and generator for R")
(description
"The jsonlite package provides a fast JSON parser and generator optimized
@ -2645,7 +2645,7 @@ contexts.")
"0v4ax1v8diw2w7fdhfzz1z0bwixkmcrc39ax3y116f399rc06qbs"))))
(properties `((upstream-name . "SQUAREM")))
(build-system r-build-system)
(home-page "http://www.jhsph.edu/agingandhealth/People/Faculty_personal_pages/Varadhan.html")
(home-page "https://coah.jhu.edu/people/Faculty_personal_Pages/Varadhan.html")
(synopsis "Squared Extrapolation Methods for Accelerating EM-Like Monotone Algorithms")
(description
"This package provides algorithms for accelerating the convergence of
@ -3994,7 +3994,7 @@ Markdown documents.")
("r-registry" ,r-registry)
("r-tsp" ,r-tsp)))
(native-inputs `(("gfortran" ,gfortran)))
(home-page "http://s2.smu.edu/IDA/seriation/")
(home-page "https://s2.smu.edu/IDA/seriation/")
(synopsis "Infrastructure for ordering objects using seriation")
(description
"This package provides infrastructure for seriation with an
@ -5240,7 +5240,7 @@ regression and information measures are implemented.")
(build-system r-build-system)
(propagated-inputs
`(("r-ttr" ,r-ttr)))
(home-page "http://cran.r-project.org/web/packages/smoother")
(home-page "https://cran.r-project.org/web/packages/smoother")
(synopsis "Functions relating to the smoothing of numerical data")
(description
"This package provides a collection of methods for smoothing numerical
@ -6248,7 +6248,7 @@ to help insert or delete content at a specific location in the document.")
("r-rcpp" ,r-rcpp)
("r-rcpparmadillo" ,r-rcpparmadillo)
("r-rjags" ,r-rjags)))
(home-page "http://www.r-bayesian-networks.org")
(home-page "https://r-bayesian-networks.org/")
(synopsis "Modelling multivariate data with additive bayesian networks")
(description
"Bayesian network analysis is a form of probabilistic graphical models
@ -8360,7 +8360,7 @@ correlation, censored, ordered and multivariate problems.")
("r-rlang" ,r-rlang)
("r-tibble" ,r-tibble)
("r-tidyselect" ,r-tidyselect)))
(home-page "http://mc-stan.org/bayesplot")
(home-page "https://mc-stan.org/bayesplot")
(synopsis "Plotting for Bayesian models")
(description
"This package provides plotting functions for posterior analysis, model
@ -14559,7 +14559,7 @@ analysis.")
(inputs
`(("libpng" ,libpng)
("zlib" ,zlib)))
(home-page "http://www.rforge.net/png/")
(home-page "https://www.rforge.net/png/")
(synopsis "Read and write PNG images")
(description
"This package provides an easy and simple way to read, write and display
@ -15443,7 +15443,7 @@ customize styles using a readable syntax.")
(base32 "02p3612rpydk195n2qr77lp1j2w8zsw1ckkk98c8angm4r5q8dsc"))))
(build-system r-build-system)
(native-inputs `(("gfortran" ,gfortran)))
(home-page "http://www-stat.stanford.edu/~tibs/glasso")
(home-page "https://statweb.stanford.edu/~tibs/glasso/")
(synopsis "Graphical Lasso: estimation of Gaussian graphical models")
(description
"This is a package for estimation of a sparse inverse covariance matrix
@ -16363,7 +16363,7 @@ long-term reliability under stochastic load profiles.")
`(("r-slam" ,r-slam)))
(inputs
`(("glpk" ,glpk)))
(home-page "http://R-Forge.R-project.org/projects/rglp/")
(home-page "https://r-forge.r-project.org/projects/rglp/")
(synopsis "R interface to the GNU Linear Programming Kit")
(description
"This package provides an R interface to the GNU Linear Programming Kit,

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

File diff suppressed because it is too large Load Diff

7
gnu/packages/crypto.scm
View File

@ -133,7 +133,7 @@ communication, encryption, decryption, signatures, etc.")
(define-public signify
(package
(name "signify")
(version "27")
(version "28")
(home-page "https://github.com/aperezdc/signify")
(source (origin
(method url-fetch)
@ -141,13 +141,12 @@ communication, encryption, decryption, signatures, etc.")
"/download/v" version "/signify-" version ".tar.xz"))
(sha256
(base32
"0ngjsqz95yb0knlw9zs02fnclif40s63r1mydgiv17ii3mds82df"))))
"05v970glhpaxv0m4cnidfxsdnsjp12nf2crzrdq4ml7g5a3g6hdq"))))
(build-system gnu-build-system)
;; TODO Build with libwaive (described in README.md), to implement something
;; like OpenBSD's pledge().
(arguments
`(#:tests? #f ; no test suite
#:make-flags
`(#:make-flags
(list "CC=gcc"
(string-append "PREFIX=" (assoc-ref %outputs "out")))
#:phases

4
gnu/packages/cups.scm
View File

@ -673,14 +673,14 @@ printer/driver specific, but spooler-independent PPD file.")
(define-public foo2zjs
(package
(name "foo2zjs")
(version "20190909")
(version "20200207")
(source (origin
(method url-fetch)
;; XXX: This is an unversioned URL!
(uri "http://foo2zjs.rkkda.com/foo2zjs.tar.gz")
(sha256
(base32
"1nn84c045mbv6yzpjfggc6152bvgrmcxiyvgz9v2w3sws7ihshrm"))))
"0pf1sm29gnrhhpyvq95jskvr874h5r4kls9w10gc24z23fjmr5zx"))))
(build-system gnu-build-system)
(arguments
'(#:phases (modify-phases %standard-phases

4
gnu/packages/databases.scm
View File

@ -1133,7 +1133,7 @@ including field and record folding.")))
(define-public rocksdb
(package
(name "rocksdb")
(version "6.5.2")
(version "6.6.4")
(source (origin
(method git-fetch)
(uri (git-reference
@ -1142,7 +1142,7 @@ including field and record folding.")))
(file-name (git-file-name name version))
(sha256
(base32
"01f5lcrcr809jhkkvxhv743hwpcxszj4r30hy9qy1i0mvjky02vf"))
"1h7y31b05w4vv4v509l368j9qlbv5assmdq9hp2788zipqbpywc0"))
(modules '((guix build utils)))
(snippet
'(begin

5
gnu/packages/dictionaries.scm
View File

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

74
gnu/packages/diffoscope.scm
View File

@ -44,6 +44,7 @@
#:use-module (gnu packages java)
#:use-module (gnu packages linux)
#:use-module (gnu packages llvm)
#:use-module (gnu packages man)
#:use-module (gnu packages mono)
#:use-module (gnu packages ocaml)
#:use-module (gnu packages package-management)
@ -217,9 +218,80 @@
"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.")
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+))))
(define-public reprotest
(package
(name "reprotest")
(version "0.7.13")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://salsa.debian.org/reproducible-builds/reprotest.git")
(commit version)))
(file-name (git-file-name name version))
(patches (search-patches "reprotest-support-guix.patch"))
(sha256
(base32
"0jj9sqxbdpypnc0y8md352wwzh1by6nyhmx5fwqnvrbznrng332f"))))
(inputs
`(("python-debian" ,python-debian)
("python-distro" ,python-distro)
("python-libarchive-c", python-libarchive-c)
("python-rstr" ,python-rstr)))
(native-inputs
`(("diffoscope" ,diffoscope)
("help2man" ,help2man)
("libfaketime" ,libfaketime)
("python-coverage" ,python-coverage)
("python-docutils" ,python-docutils)
("python-pytest " ,python-pytest)
("python-tlsh" ,python-tlsh)
("python-tox" ,python-tox)
("unzip" ,unzip)
("xxd" ,xxd)))
(build-system python-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
;; Neither glibc-locales nor glibc-utf8-locales have the C.UTF-8
;; locale or several other locales used in reprotest.
(add-after 'unpack 'adjust-locales
(lambda _
(substitute* "reprotest/build.py"
(("'C.UTF-8'") "'en_US.UTF-8'")
(("'ru_RU.CP1251'") "'ru_RU.KOI8-R'")
(("'kk_KZ.RK1048'") "'kk_KZ'"))
(substitute* "reprotest/lib/adt_testbed.py"
(("export LANG=C.UTF-8") "export LANG=en_US.UTF-8"))
#t))
(add-after 'install 'install-doc
(lambda* (#:key outputs #:allow-other-keys)
(let* ((mandir1 (string-append
(assoc-ref outputs "out") "/share/man/man1"))
(docdir (string-append
(assoc-ref outputs "out") "/share/doc/" ,name "-" ,version)))
(invoke "make" "-C" "doc")
(mkdir-p mandir1)
(install-file "doc/reprotest.1" mandir1)
(mkdir-p docdir)
(install-file "./README.rst" docdir)
(install-file "./README-dev.rst" docdir))
#t)))))
(home-page "https://salsa.debian.org/reproducible-builds/reprotest")
(synopsis "Build software and check it for reproducibility")
(description "Reprotest builds the same source code twice in different
environments, and then checks the binaries produced by each build for
differences. If any are found, then diffoscope or diff is used to display
them in detail for later analysis.")
(license (list license:gpl3+ license:gpl2+))))
(define-public trydiffoscope
(package
(name "trydiffoscope")

54
gnu/packages/djvu.scm
View File

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;;
;;; This file is part of GNU Guix.
;;;
@ -18,9 +19,15 @@
(define-module (gnu packages djvu)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix utils)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu))
#:use-module (guix build-system gnu)
#:use-module (gnu packages glib)
#:use-module (gnu packages image)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages qt)
#:use-module (gnu packages xorg))
(define-public djvulibre
(package
@ -48,3 +55,48 @@
including viewers, browser plugins, decoders, simple encoders, and
utilities.")
(license license:gpl2+)))
(define-public djview
(package
(name "djview")
(version "4.10.6")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/djvu/DjView/"
(version-major+minor version) "/"
"djview-" version ".tar.gz"))
(sha256
(base32 "08bwv8ppdzhryfcnifgzgdilb12jcnivl4ig6hd44f12d76z6il4"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
("qttools" ,qttools)))
(inputs
`(("djvulibre" ,djvulibre)
("glib" ,glib)
("libxt" ,libxt)
("libtiff" ,libtiff)
("qtbase" ,qtbase)))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-desktop-file
;; Executable is "djview", not "djview4".
(lambda _
(substitute* "desktopfiles/djvulibre-djview4.desktop"
(("Exec=djview4 %f") "Exec=djview %f"))
#t)))))
(home-page "http://djvu.sourceforge.net/djview4.html")
(synopsis "Viewer for the DjVu image format")
(description "DjView is a standalone viewer for DjVu files.
Its features include navigating documents, zooming and panning page images,
producing and displaying thumbnails, displaying document outlines, searching
documents for particular words in the hidden text layer, copying hidden text
to the clipboard, saving pages and documents as bundled or indirect multi-page
files, and printing page and documents.
The viewer can simultaneously display several pages using a side-by-side or
a continuous layout.")
(license license:gpl2+)))

1
gnu/packages/dns.scm
View File

@ -407,7 +407,6 @@ to result in system-wide compromise.")
`(("expat" ,expat)
("libevent" ,libevent)
("protobuf" ,protobuf)
("python" ,python-3)
("python-wrapper" ,python-wrapper)
("openssl" ,openssl)))
(arguments

21
gnu/packages/docker.scm
View File

@ -46,7 +46,7 @@
#:use-module (gnu packages version-control)
#:use-module (gnu packages virtualization))
(define %docker-version "18.09.5")
(define %docker-version "19.03.5")
(define-public python-docker-py
(package
@ -313,12 +313,9 @@ built-in registry server of Docker.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0cirpd9l2qazp2jyanwzvrkx2m98nksjdvn43ff38p89w6133ipb"))
(base32 "1dlknwn0fh82nbzdzxdk6pfhqwph9vcw3vs3111wfr19y5hwncq9"))
(patches
(search-patches "docker-engine-test-noinstall.patch"
"docker-fix-tests.patch"
"docker-use-fewer-modprobes.patch"
"docker-adjust-tests-for-changes-in-go.patch"))))
(search-patches "docker-fix-tests.patch"))))
(build-system gnu-build-system)
(arguments
`(#:modules
@ -419,6 +416,7 @@ built-in registry server of Docker.")
"/" relative-path
"\"")) ...)))))
(substitute-LookPath*
("containerd" "containerd" "bin/containerd")
("ps" "procps" "bin/ps")
("mkfs.xfs" "xfsprogs" "bin/mkfs.xfs")
("lvmdiskscan" "lvm2" "sbin/lvmdiskscan")
@ -492,6 +490,14 @@ built-in registry server of Docker.")
(delete-file "daemon/graphdriver/btrfs/btrfs_test.go")
(delete-file "daemon/graphdriver/overlay/overlay_test.go")
(delete-file "daemon/graphdriver/overlay2/overlay_test.go")
(delete-file "pkg/chrootarchive/archive_unix_test.go")
(delete-file "daemon/container_unix_test.go")
;; This file uses cgroups and /proc.
(delete-file "pkg/sysinfo/sysinfo_linux_test.go")
;; This file uses cgroups.
(delete-file "runconfig/config_test.go")
;; This file uses /var.
(delete-file "daemon/oci_linux_test.go")
#t))
(replace 'configure
(lambda _
@ -558,6 +564,7 @@ built-in registry server of Docker.")
(native-inputs
`(("eudev" ,eudev) ; TODO: Should be propagated by lvm2 (.pc -> .pc)
("go" ,go)
("gotestsum" ,gotestsum)
("pkg-config" ,pkg-config)))
(synopsis "Docker container component library, and daemon")
(description "This package provides a framework to assemble specialized
@ -579,7 +586,7 @@ provisioning etc.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0mxxjzkwdny8p2dmyjich7x1gn7hdlfppzjy2skk2k5bwv7nxpmi"))))
(base32 "07ldz46y74b3la4ah65v5bzbfx09yy6kncvxrr0zfx0s1214ar3m"))))
(build-system go-build-system)
(arguments
`(#:import-path "github.com/docker/cli"

14
gnu/packages/dunst.scm
View File

@ -2,6 +2,7 @@
;;; Copyright © 2015, 2017, 2018 Alex Kost <alezost@gmail.com>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
;;;
;;; This file is part of GNU Guix.
;;;
@ -26,6 +27,7 @@
#:use-module (gnu packages base)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gtk)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
@ -52,9 +54,16 @@
;; Otherwise it tries to install service file
;; to "dbus" store directory.
(string-append "SERVICEDIR_DBUS=" %output
"/share/dbus-1/services"))
"/share/dbus-1/services")
"dunstify")
#:phases (modify-phases %standard-phases
(delete 'configure))))
(delete 'configure)
(add-after 'install 'install-dunstify
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(install-file "dunstify"
(string-append out "/bin")))
#t)))))
(native-inputs
`(("pkg-config" ,pkg-config)
("perl" ,perl) ; for pod2man
@ -65,6 +74,7 @@
("glib" ,glib)
("cairo" ,cairo)
("pango" ,pango)
("libnotify" ,libnotify) ; for dunstify
("libx11" ,libx11)
("libxscrnsaver" ,libxscrnsaver)
("libxinerama" ,libxinerama)

113
gnu/packages/education.scm
View File

@ -5,6 +5,7 @@
;;; Copyright © 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019, 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2020 Robert Smith <robertsmith@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@ -24,6 +25,7 @@
(define-module (gnu packages education)
#:use-module (ice-9 regex)
#:use-module (gnu packages)
#:use-module (gnu packages audio)
#:use-module (gnu packages base)
#:use-module (gnu packages bash)
#:use-module (gnu packages compression)
@ -40,14 +42,18 @@
#:use-module (gnu packages javascript)
#:use-module (gnu packages kde)
#:use-module (gnu packages kde-frameworks) ; extra-cmake-modules
#:use-module (gnu packages mp3)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages qt)
#:use-module (gnu packages sdl)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages tls)
#:use-module (gnu packages video)
#:use-module (gnu packages xorg)
#:use-module (gnu packages xml)
#:use-module ((guix licenses) #:prefix license:)
@ -126,7 +132,7 @@ of categories with some of the activities available in that category.
(define-public gcompris-qt
(package
(name "gcompris-qt")
(version "0.96")
(version "0.97")
(source
(origin
(method url-fetch)
@ -134,11 +140,16 @@ of categories with some of the activities available in that category.
"https://gcompris.net/download/qt/src/gcompris-qt-"
version ".tar.xz"))
(sha256
(base32 "06483il59l46ny2w771sg45dgzjwv1ph7vidzzbj0wb8wbk2rg52"))))
(base32 "0hl3a1jjnrpnbqkpx3rl3fl86yfv503lh48djb888hplvr4nf747"))))
(build-system cmake-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'disable-failing-test
(lambda _
(substitute* "tests/core/CMakeLists.txt"
(("DownloadManagerTest\\.cpp") "#"))
#t))
(add-before 'check 'start-xorg-server
(lambda* (#:key inputs #:allow-other-keys)
;; The test suite requires a running X server.
@ -167,6 +178,7 @@ of categories with some of the activities available in that category.
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
("gettext" ,gettext-minimal)
("kdoctools" ,kdoctools)
("perl" ,perl)
("qttools" ,qttools)
("xorg-server" ,xorg-server-for-tests)))
@ -715,6 +727,103 @@ languages and keyboard layouts, and typing statistics are used to dynamically
adjust the level of difficulty.")
(license license:gpl2)))
(define-public anki
(package
(name "anki")
;; Later versions have dependencies on npm packages not yet in Guix.
(version "2.1.16")
(source
(origin
(method url-fetch)
(uri (string-append "https://apps.ankiweb.net/downloads/archive/anki-"
version "-source.tgz"))
(sha256
(base32 "1gfr51rnllkyzli73p4r51h5ypzfa3m7lic3m3rzpywmqwrxs07k"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags (list (string-append "PREFIX=" %output))
#:tests? #f ;no check target
#:modules ((guix build gnu-build-system)
(guix build utils)
(ice-9 match))
#:phases
(modify-phases %standard-phases
(delete 'configure) ;no configure script
(add-after 'install 'wrap
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((bin (string-append (assoc-ref outputs "out") "/bin"))
;; List of paths to the site-packages directories of Python
;; library inputs.
(site-packages
(map (lambda (pyinput)
(string-append
(cdr pyinput)
"/lib/python"
;; Calculate the python version to avoid breaking
;; with future 3.X releases.
,(version-major+minor
(package-version python-wrapper))
"/site-packages"))
(filter (match-lambda
((label . _)
(string-prefix? "python-" label)))
inputs)))
(qtwebengineprocess
(string-append (assoc-ref inputs "qtwebengine")
"/lib/qt5/libexec/QtWebEngineProcess")))
;; The program fails to find the QtWebEngineProcess program, so
;; we set QTWEBENGINEPROCESS_PATH to help it. PYTHONPATH is
;; wrapped to avoid declaring Python libraries as propagated
;; inputs.
(for-each (lambda (program)
(wrap-program program
`("QTWEBENGINEPROCESS_PATH" =
(,qtwebengineprocess))
`("PYTHONPATH" = ,site-packages)))
(find-files bin ".")))
#t)))))
(native-inputs
`(("xdg-utils" ,xdg-utils)))
(inputs
`(("lame" ,lame)
("mpv" ,mpv)
("python" ,python-wrapper)
("python-beautifulsoup4" ,python-beautifulsoup4)
("python-decorator" ,python-decorator)
("python-distro" ,python-distro)
("python-jsonschema" ,python-jsonschema)
("python-markdown" ,python-markdown)
("python-pyaudio" ,python-pyaudio)
;; `python-pyqtwebengine' must precede `python-pyqt' in PYTHONPATH.
("python-pyqtwebengine" ,python-pyqtwebengine)
("python-pyqt" ,python-pyqt)
("python-requests" ,python-requests)
("python-send2trash" ,python-send2trash)
("python-sip" ,python-sip)
;; `qtwebengine' is included in `pyqtwebengine', included here for easy
;; wrapping.
("qtwebengine" ,qtwebengine)))
(home-page "https://apps.ankiweb.net/")
(synopsis "Powerful, intelligent flash cards")
(description "Anki is a program which makes remembering things
easy. Because it's a lot more efficient than traditional study
methods, you can either greatly decrease your time spent studying, or
greatly increase the amount you learn.
Anyone who needs to remember things in their daily life can benefit
from Anki. Since it is content-agnostic and supports images, audio,
videos and scientific markup (via LaTeX), the possibilities are
endless. For example:
@itemize
@item Learning a language
@item Studying for medical and law exams
@item Memorizing people's names and faces
@item Brushing up on geography
@item Mastering long poems
@item Even practicing guitar chords!
@end itemize")
(license license:agpl3+)))
(define-public t4k-common
(package
(name "t4k-common")

24
gnu/packages/elf.scm
View File

@ -6,6 +6,7 @@
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020 Mark Wielaard <mark@klomp.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -54,9 +55,10 @@
(build-system gnu-build-system)
;; Separate programs because that's usually not what elfutils users want,
;; and because they duplicate what Binutils provides.
;; and because they duplicate what Binutils provides (but are named
;; differently, using the eu- prefix and can be installed in parallel).
(outputs '("out" ; libelf.so, elfutils/*.h, etc.
"bin")) ; ld, nm, objdump, etc.
"bin")) ; eu-nm, eu-objdump, etc.
(arguments
;; Programs don't have libelf.so in their RUNPATH and libraries don't
@ -84,11 +86,21 @@
(native-inputs `(("m4" ,m4)))
(inputs `(("zlib" ,zlib)))
(home-page "https://sourceware.org/elfutils/")
(synopsis "Linker and ELF manipulation tools")
(synopsis "Collection of utilities and libraries to handle ELF files and
DWARF data")
(description
"This package provides command-line tools to manipulate binaries in the
Executable and Linkable Format (@dfn{ELF}). This includes @command{ld},
@command{ar}, @command{objdump}, @command{addr2line}, and more.")
"Elfutils is a collection of utilities and libraries to read, create and
modify Executable and Linkable Format (@dfn{ELF}) binary files, find and
handle Debugging With Arbitrary Record Formats (@dfn{DWARF}) debug data,
symbols, thread state and stacktraces for processes and core files on
GNU/Linux. Elfutils includes @file{libelf} for manipulating ELF files,
@file{libdw} for inspecting DWARF data and process state and utilities like
@command{eu-stack} (to show backtraces), @command{eu-nm} (for listing symbols
from object files), @command{eu-size} (for listing the section sizes of an
object or archive file), @command{eu-strip} (for discarding symbols),
@command{eu-readelf} (to see the raw ELF file structures),
@command{eu-elflint} (to check for well-formed ELF files),
@command{eu-elfcompress} (to compress or decompress ELF sections), and more.")
;; Libraries are dual-licensed LGPLv3.0+ | GPLv2, and programs are GPLv3+.
(license lgpl3+)))

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

@ -18,7 +18,7 @@
;;; Copyright © 2016, 2017, 2018 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2016, 2017, 2018, 2019 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2017 Christopher Baines <mail@cbaines.net>
;;; Copyright © 2017, 2018, 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2017, 2018, 2019, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2017, 2018, 2019 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2017 Vasile Dumitrascu <va511e@yahoo.com>
;;; Copyright © 2017, 2018 Kyle Meyer <kyle@kyleam.com>
@ -163,14 +163,16 @@
(define-public emacs-geiser
(package
(name "emacs-geiser")
(version "0.10")
(version "0.11")
(source (origin
(method url-fetch)
(uri (string-append "mirror://savannah/geiser/" version
"/geiser-" version ".tar.gz"))
(method git-fetch)
(uri (git-reference
(url "https://gitlab.com/jaor/geiser/")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0pj3l7p8d60c9b4vfprnv6g5l61d74pls4b5dvd84cn4ky9mzwjv"))))
"0fb2h984hn7bnyiziplp7kgk29zdzc9yainsv0k1li436irlp9dd"))))
(build-system gnu-build-system)
(arguments
'(#:phases
@ -183,7 +185,11 @@
"geiser-autoloads.el"))
#t)))))
(inputs `(("guile" ,guile-2.2)))
(native-inputs `(("emacs" ,emacs-minimal)))
(native-inputs
`(("emacs" ,emacs-minimal)
("autoconf" ,autoconf)
("automake" ,automake)
("texinfo" ,texinfo)))
(home-page "https://nongnu.org/geiser/")
(synopsis "Collection of Emacs modes for Guile and Racket hacking")
(description
@ -1982,6 +1988,27 @@ filters, new key bindings and faces. It can be enabled by
@code{tablist-mode} or @code{tablist-minor-mode} commands.")
(license license:gpl3+)))
(define-public emacs-djvu
(package
(name "emacs-djvu")
(version "1.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/"
"djvu-" version ".el"))
(sha256
(base32 "0njgyx09q225hliacsnjk8wallg5i6xkz6bj501pb05nwqfbvfk7"))))
(build-system emacs-build-system)
(home-page "http://elpa.gnu.org/packages/djvu.html")
(synopsis "Edit and view Djvu files via djvused")
(description
"This package is a front end for the command-line program djvused from
DjVuLibre, see @url{http://djvu.sourceforge.net/}. It assumes you have the
programs @command{djvused}, @command{djview}, @command{ddjvu}, and
@command{djvm} installed.")
(license license:gpl3+)))
(define-public emacs-pdf-tools
(package
(name "emacs-pdf-tools")
@ -7353,8 +7380,8 @@ sly-quickload command that prompts the user for a package to install. ")
(license license:gpl3+))))
(define-public emacs-sly-asdf
(let ((commit "4e323bc28da2f07fd799b6a31b94fd93848b5f3c")
(revision "2"))
(let ((commit "ad248056ded3099b0528b6111ba335e835d9e5a7")
(revision "3"))
(package
(name "emacs-sly-asdf")
(version (git-version "0.1.0" revision commit))
@ -7368,10 +7395,11 @@ sly-quickload command that prompts the user for a package to install. ")
(file-name (git-file-name name version))
(sha256
(base32
"16sc33jhc6ik4ilsyqc3cjpi6v0wdmwjlwrzjwd6yym11bscsmad"))))
"0lip0spmglny3y612pxn3rfnpdaj12c9f7ya7bprryg2gvcdippa"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-sly" ,emacs-sly)))
`(("emacs-sly" ,emacs-sly)
("emacs-popup" ,emacs-popup)))
(arguments
'(#:include (cons* "\\.lisp$" "\\.asd$" %default-include)))
(synopsis "ASDF contrib for SLY")
@ -8050,13 +8078,13 @@ passive voice.")
(name "emacs-org")
;; emacs-org-contrib inherits from this package. Please update it as
;; well.
(version "9.3.2")
(version "9.3.3")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/org-" version ".tar"))
(sha256
(base32 "1275s3hzyka2wwxl6nc2sndnwyl7kbc1nnl0hrznxb3wpy2abfd6"))))
(base32 "0yafckcx5ka2rpmv24x7ns6f3s1h216x2lbgaxsf1dmklbjcfvwv"))))
(build-system emacs-build-system)
(home-page "https://orgmode.org/")
(synopsis "Outline-based notes management and organizer")
@ -8070,14 +8098,14 @@ programming and reproducible research.")
(package
(inherit emacs-org)
(name "emacs-org-contrib")
(version "20200126")
(version "20200206")
(source
(origin
(method url-fetch)
(uri (string-append "https://orgmode.org/elpa/"
"org-plus-contrib-" version ".tar"))
(sha256
(base32 "08yik0i8ya2x5j4vsnwxdcdlcxbiq58lvy30vcbdbf0hqrd40kjv"))))
(base32 "1fdxh8zgjnb500wkcl0bc0fdzbsln6p044b4s4nz85wkfw0jkfs5"))))
(arguments
`(#:modules ((guix build emacs-build-system)
(guix build utils)
@ -8094,11 +8122,11 @@ programming and reproducible research.")
(map basename (find-files out)))
(org+contrib-files
(map basename (find-files org)))
(duplicates (lset-intersection
string=? contrib-files org+contrib-files)))
(duplicates (lset-intersection string=?
contrib-files
org+contrib-files)))
(with-directory-excursion
(string-append
out "/share/emacs/site-lisp")
(string-append out "/share/emacs/site-lisp")
(for-each delete-file duplicates))
#t))))))
(propagated-inputs
@ -8574,35 +8602,35 @@ been adapted to work with mu4e.")
(define-public emacs-yasnippet
(package
(name "emacs-yasnippet")
(version "0.13.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/joaotavora/yasnippet.git")
(commit version)))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0fkkplycrw8f8r30hjjxl1wm7p2irq2ipzzc1g7cc52abaal796p"))
(modules '((guix build utils)))
(snippet
'(begin
;; YASnippet expects a "snippets" subdirectory in the same
;; directory as yasnippet.el, but we don't install it
;; because it's a git submodule pointing to an external
;; repository. Adjust `yas-snippet-dirs' to prevent
;; warnings about a missing directory.
(substitute* "yasnippet.el"
(("^ +'yas-installed-snippets-dir\\)\\)\n")
"))\n"))
#t))))
(version "0.14.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/joaotavora/yasnippet.git")
(commit version)))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "0via9dzw8m5lzymg1h78xkwjssh39zr3g6ccyamlf1rjzjsyxknv"))
(modules '((guix build utils)))
(snippet
'(begin
;; YASnippet expects a "snippets" subdirectory in the same
;; directory as yasnippet.el, but we don't install it because it's
;; a git submodule pointing to an external repository. Adjust
;; `yas-snippet-dirs' to prevent warnings about a missing
;; directory.
(substitute* "yasnippet.el"
(("^ +'yas-installed-snippets-dir\\)\\)\n")
"))\n"))
#t))))
(build-system emacs-build-system)
(arguments
`(#:tests? #t
#:test-command '("emacs" "--batch"
"-l" "yasnippet-tests.el"
"-f" "ert-run-tests-batch-and-exit")
;; FIXME: one failing test
;; FIXME: one failing test.
#:phases
(modify-phases %standard-phases
(add-before 'check 'make-tests-writable
@ -8612,11 +8640,10 @@ been adapted to work with mu4e.")
(add-before 'check 'delete-rebinding-test
(lambda _
(emacs-batch-edit-file "yasnippet-tests.el"
`(progn (progn (goto-char (point-min))
(re-search-forward
"ert-deftest test-rebindings")
(beginning-of-line)
(kill-sexp))
`(progn (goto-char (point-min))
(re-search-forward "ert-deftest test-rebindings")
(beginning-of-line)
(kill-sexp)
(basic-save-buffer)))
#t)))))
(home-page "https://github.com/joaotavora/yasnippet")
@ -8627,50 +8654,40 @@ abbreviation and automatically expand it into function templates.")
(license license:gpl3+)))
(define-public emacs-yasnippet-snippets
(let ((commit "885050d34737e2fb36a3e7759d60c09347bd4ce0")
(revision "1"))
(package
(name "emacs-yasnippet-snippets")
(version (string-append "1-" revision "." (string-take commit 8)))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/AndreaCrotti/yasnippet-snippets")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1m935zgglw0iakzrixld5rcjz3wnj84f8wy2mvc3pggjri9l0qr9"))))
(build-system trivial-build-system)
(arguments
`(#:modules ((ice-9 ftw)
(ice-9 regex)
(guix build utils))
#:builder
(begin
(use-modules (ice-9 ftw)
(ice-9 regex)
(guix build utils))
(with-directory-excursion (assoc-ref %build-inputs "source")
(for-each (lambda (dir)
(copy-recursively
dir
(string-append %output
"/share/emacs/yasnippet-snippets/"
dir)))
(scandir "." (lambda (fname)
(and (string-match "-mode$" fname)
(directory-exists? fname))))))
#t)))
(home-page "https://github.com/AndreaCrotti/yasnippet-snippets")
(synopsis "Collection of YASnippet snippets for many languages")
(description
"Provides Andrea Crotti's collection of YASnippet snippets. After installation,
(package
(name "emacs-yasnippet-snippets")
(version "0.20")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/AndreaCrotti/yasnippet-snippets")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "095w7cdmfwmmr6426mbq15n0a5izgbmv9408m9yh1pqz5x3v3vsx"))))
(build-system trivial-build-system)
(arguments
`(#:modules ((guix build utils))
#:builder
(begin
(use-modules (guix build utils))
(let* ((source (assoc-ref %build-inputs "source"))
(out (assoc-ref %outputs "out"))
(snippet-dir
(string-append out "/share/emacs/yasnippet-snippets/")))
(with-directory-excursion source
(mkdir-p snippet-dir)
(copy-recursively "snippets" snippet-dir)))
#t)))
(home-page "https://github.com/AndreaCrotti/yasnippet-snippets")
(synopsis "Collection of YASnippet snippets for many languages")
(description
"Provides Andrea Crotti's collection of YASnippet snippets. After installation,
the snippets will be in \"~/.guix-profile/share/emacs/yasnippet-snippets/\".
To make YASnippet aware of these snippets, add the above directory to
@code{yas-snippet-dirs}.")
(license license:expat))))
(license license:gpl3+)))
(define-public emacs-helm-c-yasnippet
(let ((commit "65ca732b510bfc31636708aebcfe4d2d845b59b0")
@ -12604,8 +12621,8 @@ automatically fetched from well-curated sources, and formatted as BibTeX.")
(license license:gpl3+)))
(define-public emacs-helm-bibtex
(let ((commit "8ed898fb5a68f18e9bb9973832a5c1f8abcfc463")
(revision "1"))
(let ((commit "d4471232be26793fbf56c0ac3690b5f537c378b9")
(revision "2"))
(package
(name "emacs-helm-bibtex")
(version (string-append "2.0.0" "-" revision "."
@ -12619,7 +12636,7 @@ automatically fetched from well-curated sources, and formatted as BibTeX.")
(file-name (git-file-name name version))
(sha256
(base32
"14lyx0vbqr97p3anzrsp7m3q0kqclyjcdwplpraim403fcklzbnz"))))
"1bkzhic6qckb267025il1r3xcpz99kisphxiafni1pxvf9jafr0j"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-helm" ,emacs-helm)
@ -21374,3 +21391,64 @@ sense on the @samp{Newsgroups} header, whereas mail alias expansion makes
sense in the @samp{To} and @samp{Cc} headers). When in the message body, this
executes a different function (default: @code{indent-relative}).")
(license license:gpl2+))))
(define-public emacs-gnus-harvest
(let ((commit "feda071a87b799bd5d23cacde3ee71f0b166e75d")
(revision "0"))
(package
(name "emacs-gnus-harvest")
(version (git-version "1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/jwiegley/gnus-harvest.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "08zb7vc3v3wdxkzgi902vlc5ybfvm8fxrvm5drnwfsjj9873pbcb"))))
(build-system emacs-build-system)
(inputs
`(("sqlite" ,sqlite)))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-before 'build 'patch-exec-paths
(lambda* (#:key inputs #:allow-other-keys)
(let ((sqlite (assoc-ref inputs "sqlite"))
(file "gnus-harvest.el"))
(make-file-writable file)
(emacs-substitute-variables file
("gnus-harvest-sqlite-program"
(string-append sqlite "/bin/sqlite3"))))
#t)))))
(home-page "https://github.com/jwiegley/gnus-harvest")
(synopsis
"Harvest email addresses from read/written Gnus articles")
(description "@code{gnus-harvest} notices email address in every message
or post you read or write, and collects them in a SQLite database, which can
be easily and quickly queried to determine the completion list. It optionally
uses BBDB and Message-X.")
(license license:gpl3+))))
(define-public emacs-auto-dictionary-mode
(package
(name "emacs-auto-dictionary-mode")
(version "1.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/nschum/auto-dictionary-mode")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "191294k92qp8gmfypf0q8j8qrym96aqikzvyb9p03wqvbr3r1dsk"))))
(build-system emacs-build-system)
(home-page "http://nschum.de/src/emacs/auto-dictionary/")
(synopsis "Automatic dictionary switcher for Emacs spell checking")
(description "@code{auto-dictionary} is a minor mode that hooks into
Flyspell's on-the-fly spell checking and extends these checks to also detect
language. Auto-dictionary then sets @code{ispell-dictionary} to use the
detected language.")
(license license:gpl2+)))

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

@ -249,7 +249,7 @@ from the jfsutils package. It is meant to be used in initrds.")
(define-public disorderfs
(package
(name "disorderfs")
(version "0.5.6")
(version "0.5.8")
(source
(origin
(method git-fetch)
@ -259,7 +259,7 @@ from the jfsutils package. It is meant to be used in initrds.")
(file-name (git-file-name name version))
(sha256
(base32
"1zn2ydap8k9fwjl3ivgrg6l32s5p4ik6ca6j1idp7c77znlv6cpp"))))
"0pk9i0dycjq0wl6dp37r2hbadgpgmzbmjk2xpbjl36x4yrm4jns8"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
@ -274,7 +274,7 @@ from the jfsutils package. It is meant to be used in initrds.")
#:test-target "test"
;; FIXME: Tests require 'run-parts' which is not in Guix yet.
#:tests? #f))
(home-page "https://github.com/ReproducibleBuilds/disorderfs")
(home-page "https://salsa.debian.org/reproducible-builds/disorderfs")
(synopsis "FUSE file system that introduces non-determinism")
(description
"An overlay FUSE file system that introduces non-determinism

4
gnu/packages/finance.scm
View File

@ -97,7 +97,7 @@
(define-public bitcoin-core
(package
(name "bitcoin-core")
(version "0.18.1")
(version "0.19.0.1")
(source (origin
(method url-fetch)
(uri
@ -105,7 +105,7 @@
version "/bitcoin-" version ".tar.gz"))
(sha256
(base32
"15mz0gmm058gmq2gdpffbw25jpv7mksyhyfws6i7mqvrapqr6zaw"))))
"1172dl4b8h2a80ilk9sfgbl8yi55k6hs4b1m07nic2ls4irgkjbs"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)

22
gnu/packages/fonts.scm
View File

@ -28,6 +28,7 @@
;;; Copyright © 2019 Baptiste Strazzulla <bstrazzull@hotmail.fr>
;;; Copyright © 2019 Alva <alva@skogen.is>
;;; Copyright © 2019 Alexandros Theodotou <alex@zrythm.org>
;;; Copyright © 2020 Damien Cassou <damien@cassou.me>
;;;
;;; This file is part of GNU Guix.
;;;
@ -1563,3 +1564,24 @@ have been designed to be very distinguishable from each other.")
displays (7SEG, 14SEG). DSEG includes the roman alphabet and symbol glyphs.
This package provides the TrueType fonts.")
(license license:silofl1.1)))
(define-public font-jetbrains-mono
(package
(name "font-jetbrains-mono")
(version "1.0.2")
(source
(origin
(method url-fetch)
(uri
(string-append "https://download.jetbrains.com/fonts/"
"JetBrainsMono-" version ".zip"))
(sha256
(base32 "0qlp4902i1v6ni04b6gdip8rxw6wpkdk9w7dir1yn9an5mvbkyar"))))
(build-system font-build-system)
(home-page "https://www.jetbrains.com/lp/mono/")
(synopsis "Mono typeface for developers")
(description
"JetBrains Mono is a font family dedicated to developers. JetBrains
Mono’s typeface forms are simple and free from unnecessary details. Rendered
in small sizes, the text looks crisper.")
(license license:asl2.0)))

2
gnu/packages/fontutils.scm
View File

@ -120,7 +120,7 @@ anti-aliased glyph bitmap generation with 256 gray levels.")
finely hand-hinting the last 1%. It is ideal for web fonts and supports many
scripts.")
(license (list license:gpl2+ license:freetype)) ;choose one or the other
(home-page "http://www.freetype.org/ttfautohint/")))
(home-page "https://www.freetype.org/ttfautohint/")))
(define-public woff-tools
(package

17
gnu/packages/freedesktop.scm
View File

@ -266,7 +266,7 @@ the freedesktop.org XDG Base Directory specification.")
(define-public elogind
(package
(name "elogind")
(version "241.4")
(version "243.4")
(source (origin
(method git-fetch)
(uri (git-reference
@ -275,7 +275,7 @@ the freedesktop.org XDG Base Directory specification.")
(file-name (git-file-name name version))
(sha256
(base32
"13nd0chackqclgvw43910k4pkw2q773dh6wq9s5f3d97ibnik48k"))))
"141frvgyk4fafcxsix94qc0d9ffrwksld8lqq4hq6xsgjlvv0mrs"))))
(build-system meson-build-system)
(arguments
`(#:configure-flags
@ -283,9 +283,11 @@ the freedesktop.org XDG Base Directory specification.")
(sysconf (string-append out "/etc"))
(libexec (string-append out "/libexec/elogind"))
(dbuspolicy (string-append out "/etc/dbus-1/system.d"))
(shadow (assoc-ref %build-inputs "shadow"))
(shepherd (assoc-ref %build-inputs "shepherd"))
(halt-path (string-append shepherd "/sbin/halt"))
(kexec-path "") ;not available in Guix yet
(nologin-path (string-append shadow "/sbin/nologin"))
(poweroff-path (string-append shepherd "/sbin/shutdown"))
(reboot-path (string-append shepherd "/sbin/reboot")))
(list
@ -299,7 +301,9 @@ the freedesktop.org XDG Base Directory specification.")
(string-append "-Dkexec-path=" kexec-path)
(string-append "-Dpoweroff-path=" poweroff-path)
(string-append "-Dreboot-path=" reboot-path)
(string-append "-Dnologin-path=" nologin-path)
"-Dcgroup-controller=elogind"
"-Dman=true"
;; Disable some tests.
"-Dtests=false"
"-Dslow-tests=false"))
@ -311,6 +315,14 @@ the freedesktop.org XDG Base Directory specification.")
(("join_paths\\(bindir, 'pkttyagent'\\)")
"'\"/run/current-system/profile/bin/pkttyagent\"'"))
#t))
(add-after 'unpack 'adjust-dbus-socket-address
(lambda _
;; Look for the D-Bus socket in /var/run instead of /run. Remove
;; this for versions > 243.4.
(substitute* "src/libelogind/sd-bus/bus-internal.h"
(("=/run/dbus/system_bus_socket")
"=/var/run/dbus/system_bus_socket"))
#t))
(add-after 'unpack 'change-pid-file-path
(lambda _
(substitute* "src/login/elogind.c"
@ -330,6 +342,7 @@ the freedesktop.org XDG Base Directory specification.")
(inputs
`(("linux-pam" ,linux-pam)
("libcap" ,libcap)
("shadow" ,shadow) ;for 'nologin'
("shepherd" ,shepherd) ;for 'halt' and 'reboot', invoked
;when pressing the power button
("dbus" ,dbus)

4
gnu/packages/ftp.scm
View File

@ -46,7 +46,7 @@
(define-public lftp
(package
(name "lftp")
(version "4.8.4")
(version "4.9.1")
(source (origin
(method url-fetch)
;; See https://lftp.tech/get.html for mirrors.
@ -58,7 +58,7 @@
"ftp/lftp/lftp-" version ".tar.xz")))
(sha256
(base32
"0qks22357xv9y6ripmf5j2n5svh8j5z0yniphfk89sjwkqg2gg2f"))))
"0jq2g8h1bx06ya9fsja748vwb2qrca4wsfrgi3fmaa8hznpgqsar"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))

443
gnu/packages/games.scm
View File

@ -2,7 +2,7 @@
;;; Copyright © 2013 John Darrington <jmd@gnu.org>
;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2014, 2016 David Thompson <dthompson2@worcester.edu>
;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Eric Bavier <bavier@posteo.net>
;;; Copyright © 2014 Cyrill Schenkel <cyrill.schenkel@gmail.com>
;;; Copyright © 2014 Sylvain Beucler <beuc@beuc.net>
;;; Copyright © 2014, 2015, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
@ -446,7 +446,7 @@ canyons and wait for the long I-shaped block to clear four rows at a time.")
("sdl2-image" ,sdl2-image)
("sdl2-ttf" ,sdl2-ttf)
("sdl2-mixer" ,sdl2-mixer)))
(home-page "http://en.cataclysmdda.com/")
(home-page "https://cataclysmdda.org/")
(synopsis "Survival horror roguelike video game")
(description
"Cataclysm: Dark Days Ahead (or \"DDA\" for short) is a roguelike set
@ -4033,7 +4033,7 @@ throwing people around in pseudo-randomly generated buildings.")
(define-public hyperrogue
(package
(name "hyperrogue")
(version "11.2d")
(version "11.2q")
;; When updating this package, be sure to update the "hyperrogue-data"
;; origin in native-inputs.
(source (origin
@ -4044,7 +4044,7 @@ throwing people around in pseudo-randomly generated buildings.")
"-src.tgz"))
(sha256
(base32
"1b532s94zv1jsni7bvh848m42arxcclsr0x3n7c689iamwqzrxmn"))))
"1w4khi2limxhgiq7xnz0rc9nzbk86bhbyzrcd5hdghnhsviaiggq"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no check target
@ -4122,7 +4122,7 @@ throwing people around in pseudo-randomly generated buildings.")
"-win.zip"))
(sha256
(base32
"0vq4l1xaqpjj3hmxn1vn2b3bbkn1hrag42ck9f30blinv347bwhf"))))
"1k81zrbq5gmrccjac1i5c6v8j2iilfg2vwrnm8snjmmcnh5z1fgj"))))
("unzip" ,unzip)))
(inputs
`(("font-dejavu" ,font-dejavu)
@ -5556,7 +5556,7 @@ elements to achieve a simple goal in the most complex way possible.")
(define-public pioneer
(package
(name "pioneer")
(version "20190203")
(version "20200203")
(source (origin
(method git-fetch)
(uri (git-reference
@ -5565,7 +5565,7 @@ elements to achieve a simple goal in the most complex way possible.")
(file-name (git-file-name name version))
(sha256
(base32
"1g34wvgyvz793dhm1k64kl82ib0cavkbg0f2p3fp05b457ycljff"))))
"1011xsi94jhw98mhm8kryq8ajig0qfbrdx5xdasi92bd4nk7lcp8"))))
(build-system cmake-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
@ -7720,6 +7720,301 @@ the World and demonstrating that he is even more evil than his brother Vlad.")
;; Drascula uses a BSD-like license.
(license (license:non-copyleft "file:///readme.txt"))))
(define (make-lure-package name language hash)
(package
(name name)
(version "1.1")
(source
(origin
(method url-fetch)
(uri (string-append
"mirror://sourceforge/scummvm/extras/"
"Lure%20of%20the%20Temptress/"
name "-" version ".zip"))
(sha256
(base32 hash))))
(build-system trivial-build-system)
(arguments
`(#:modules ((guix build utils))
#:builder
(begin
(use-modules (guix build utils))
(let* ((out (assoc-ref %outputs "out"))
(share (string-append out "/share"))
(data (string-append share "/" ,name "/" ,language))
(apps (string-append share "/applications"))
(bin (string-append out "/bin"))
(executable (string-append bin "/" ,name))
(scummvm (assoc-ref %build-inputs "scummvm")))
(let ((unzip (string-append (assoc-ref %build-inputs "unzip")
"/bin/unzip")))
(invoke unzip "-j" (assoc-ref %build-inputs "source")))
(let ((doc (string-append share "/doc/" ,name "-" ,version)))
(for-each (lambda (f) (install-file f doc))
(find-files "." "\\.(txt|PDF|pdf)$")))
(for-each (lambda (f) (install-file f data))
(find-files "." "\\.(vga|VGA)$"))
;; Build the executable.
(mkdir-p bin)
(let ((bash (assoc-ref %build-inputs "bash")))
(with-output-to-file executable
(lambda ()
(format #t "#!~a/bin/bash~%" bash)
(format #t "exec ~a/bin/scummvm -q ~a -p ~a lure~%"
scummvm ,language data))))
(chmod executable #o755)
;; Create desktop file. There is no dedicated
;; icon for the game, so we borrow SCUMMVM's.
(mkdir-p apps)
(with-output-to-file (string-append apps "/" ,name ".desktop")
(lambda _
(format #t
"[Desktop Entry]~@
Name=Lure of the Temptress~@
GenericName=Lure~@
Exec=~a~@
Icon=~a/share/icons/hicolor/scalable/apps/scummvm.svg~@
Categories=AdventureGame;Game;RolePlaying;~@
Keywords=game;adventure;roleplaying;2D,fantasy;~@
Comment=Classic 2D point and click adventure game~@
Comment[de]=klassisches 2D-Abenteuerspiel in Zeigen-und-Klicken-Manier~@
Comment[fr]=Jeu classique d'aventure pointer-et-cliquer en 2D~@
Comment[it]=Gioco classico di avventura punta e clicca 2D~@
Type=Application~%"
executable scummvm)))
#t))))
(native-inputs
`(("unzip" ,unzip)))
(inputs
`(("bash" ,bash)
("scummvm" ,scummvm)))
(home-page "https://www.scummvm.org")
(synopsis "2D point and click fantasy adventure game")
(description
"Lure of the Temptress is a classic 2D point and click adventure game.
You are Diermot, an unwilling hero who'd prefer a quiet life, and are, to all
intents and purposes, a good man. After decades of unrest the King has united
the warring factions in his kingdom and all his lands are at peace, except
a remote region around a town called Turnvale. A revolt has recently taken
place in Turnvale, a revolt orchestrated by an apprentice sorceress called
Selena, the titular temptress. The king calls together his finest horsemen
and heads off (with you in tow) to Turnvale just to witness how hellish
mercenary monsters called Skorl are invading the town.
The king's men are defeated, the king is killed and you fall of your horse and
bang your head heavily on the ground. You have been *unconscious for a while
when you realize that you are in a dingy cell guarded by a not so friendly
Skorl. Maybe it would be an idea to try and escape...")
(license (license:non-copyleft "file:///README"))))
(define-public lure
(make-lure-package
"lure" "en" "0201i70qcs1m797kvxjx3ygkhg6kcl5yf49sihba2ga8l52q45zk"))
(define-public lure-de
(make-lure-package
"lure-de" "de" "0sqq7h5llml6rv85x0bfv4bgzwhs4c82p4w4zmfcaab6cjlad0sy"))
(define-public lure-es
(make-lure-package
"lure-es" "es" "1dvv5znvlsakw6w5r16calv9jkgw27aymgybsf4q22lcmpxbj1lk"))
(define-public lure-fr
(make-lure-package
"lure-fr" "fr" "1y51jjb7f8023832g44vd1jsb6ni85586pi2n5hjg9qjk6gi90r9"))
(define-public lure-it
(make-lure-package
"lure-it" "it" "1ks6n39r1cllisrrh6pcr39swsdv7ng3gx5c47vaw71zzfr70hjj"))
(define (make-queen-package name file-prefix release language hash)
(package
(name name)
(version release)
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/scummvm/extras/"
"Flight%20of%20the%20Amazon%20Queen/"
file-prefix release ".zip"))
(sha256
(base32 hash))))
(build-system trivial-build-system)
(arguments
`(#:modules ((guix build utils))
#:builder
(begin
(use-modules (guix build utils))
(let* ((out (assoc-ref %outputs "out"))
(share (string-append out "/share"))
(data (string-append share "/" ,name))
(apps (string-append share "/applications"))
(bin (string-append out "/bin"))
(executable (string-append bin "/" ,name))
(scummvm (assoc-ref %build-inputs "scummvm")))
(let ((unzip (string-append (assoc-ref %build-inputs "unzip")
"/bin/unzip")))
(invoke unzip "-j" (assoc-ref %build-inputs "source")))
(let ((doc (string-append share "/doc/" ,name "-" ,version)))
(install-file "readme.txt" doc))
(install-file "queen.1c" data)
(mkdir-p bin)
(let ((bash (assoc-ref %build-inputs "bash")))
(with-output-to-file executable
(lambda ()
(format #t "#!~a/bin/bash~%" bash)
(format #t "exec ~a/bin/scummvm -q fr -p ~a queen~%"
scummvm data))))
(chmod executable #o755)
;; Create desktop file. There is no dedicated
;; icon for the game, so we borrow SCUMMVM's.
(mkdir-p apps)
(with-output-to-file (string-append apps "/" ,name ".desktop")
(lambda _
(format #t
"[Desktop Entry]~@
Name=Flight of the Amazon Queen~@
GenericName=Queen~@
Comment=Embark on a quest to rescue a kidnapped princess and in the process, discover the true sinister intentions of a suspiciously located Lederhosen company~@
Comment[de]=Begib dich auf ein Abenteuer, um eine entführte Prinzessin zu retten und entdecke die wahren, finsteren Absichten eines verdächtig erscheinenden Lederhosen-Unternehmens~@
Type=Application~@
Exec=~a~@
Icon=~a/share/icons/hicolor/scalable/apps/scummvm.svg~@
Categories=AdventureGame;Game;RolePlaying;~@
Keywords=adventure;game;roleplaying;fantasy;~%"
executable scummvm))))
#t)))
(native-inputs
`(("unzip" ,unzip)))
(inputs
`(("bash" ,bash)
("scummvm" ,scummvm)))
(home-page "https://www.scummvm.org/")
(synopsis "Classic 2D point and click adventure game")
(description "Flight of the Amazon Queen is a 2D point-and-click
adventure game set in the 1940s.
You assume the role of Joe King, a pilot for hire who is given the job
of flying Faye Russell (a famous movie star) into the Amazon jungle
for a photo shoot. Of course, things never go according to plans.
After an unfortunate turn of events they find themselves stranded in
the heart of the Amazon jungle, where Joe will embark on a quest to
rescue a kidnapped princess and in the process, discover the true
sinister intentions of a suspiciously located Lederhosen company. In
a rich 2D environment, Joe will cross paths with a variety of unlikely
jungle inhabitants including, but not limited to, a tribe of Amazon
women and 6-foot-tall pygmies.")
(license (license:non-copyleft "file:///readme.txt"))))
(define-public queen
(make-queen-package
"queen" "FOTAQ_Talkie-" "1.1" "en"
"1a6q71q1dl9vvw2qqsxk5h1sv0gaqy6236zr5905w2is01gdsp52"))
(define-public queen-de
(make-queen-package
"queen-de" "FOTAQ_Ger_talkie-" "1.0" "de"
"13vn43x7214vyprlpqabvv71k890nff3d6fjscflr1ll7acjca3f"))
(define-public queen-fr
(make-queen-package
"queen-fr" "FOTAQ_Fr_Talkie_" "1.0" "fr"
"0hq5g4qrkcwm2kn5i4kv4hijs9hi7bw9xl1vrwd1l69qqn30crwy"))
(define-public queen-it
(make-queen-package
"queen-it" "FOTAQ_It_Talkie_" "1.0" "it"
"1h76y70lrpzfjkm53n4nr364nhyka54vbz9r7sadzyzl7c7ilv4d"))
(define-public sky
(package
(name "sky")
(version "1.2") ;1.3 is floppy version
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/scummvm/extras/"
"Beneath%20a%20Steel%20Sky/"
"bass-cd-" version ".zip"))
(sha256
(base32 "14s5jz67kavm8l15gfm5xb7pbpn8azrv460mlxzzvdpa02a9n82k"))))
(build-system trivial-build-system)
(arguments
`(#:modules ((guix build utils))
#:builder
(begin
(use-modules (guix build utils))
(let* ((out (assoc-ref %outputs "out"))
(share (string-append out "/share"))
(data (string-append share "/" ,name))
(apps (string-append share "/applications"))
(bin (string-append out "/bin"))
(executable (string-append bin "/" ,name))
(scummvm (assoc-ref %build-inputs "scummvm")))
(let ((unzip (string-append (assoc-ref %build-inputs "unzip")
"/bin/unzip")))
(invoke unzip "-j" (assoc-ref %build-inputs "source")))
(let ((doc (string-append share "/doc/bass-" ,version)))
(install-file "readme.txt" doc))
(for-each (lambda (f) (install-file f data))
(find-files "." "^sky\\."))
;; Build the executable.
(mkdir-p bin)
(let ((bash (assoc-ref %build-inputs "bash")))
(with-output-to-file executable
(lambda ()
(format #t "#!~a/bin/bash~%" bash)
(format #t "exec ~a/bin/scummvm -p ~a sky~%" scummvm data))))
(chmod executable #o755)
;; Create desktop file. There is no dedicated
;; icon for the game, so we borrow SCUMMVM's.
(mkdir-p apps)
(with-output-to-file (string-append apps "/" ,name ".desktop")
(lambda _
(format #t
"[Desktop Entry]~@
Name=Beneath a Steel Sky~@
GenericName=Bass~@
Exec=~a~@
Icon=~a/share/icons/hicolor/scalable/apps/scummvm.svg~@
Categories=AdventureGame;Game;RolePlaying;~@
Keywords=adventure;game;roleplaying;cyberpunk;~@
Comment=A science-fiction adventure game set in a bleak post-apocalyptic vision of the future~@
Comment[de]=Ein Science-Fiction-Abenteuerspiel \
angesiedelt in einer düsteren, postapokalyptischen Vision der Zukunft~@
Type=Application~%"
executable scummvm)))
#t))))
(native-inputs
`(("unzip" ,unzip)))
(inputs
`(("bash" ,bash)
("scummvm" ,scummvm)))
(home-page "https://www.scummvm.org/")
(synopsis "Classic 2D point an click science-fiction adventure game")
(description
"Beneath a Steel Sky is a science-fiction thriller set in a bleak
post-apocalyptic vision of the future. It revolves around Union City,
where selfishness, rivalry, and corruption by its citizens seems to be
all too common, those who can afford it live underground, away from
the pollution and social problems which are plaguing the city.
You take on the role of Robert Foster, an outcast of sorts from the
city since a boy who was raised in a remote environment outside of
Union City simply termed ``the gap''. Robert's mother took him away
from Union City as a child on their way to ``Hobart'' but the
helicopter crashed on its way. Unfortunately, Robert's mother died,
but he survived and was left to be raised by a local tribe from the
gap.
Years later, Union City security drops by and abducts Robert, killing
his tribe in the process; upon reaching the city the helicopter taking
him there crashes with him escaping, high upon a tower block in the
middle of the city. He sets out to discover the truth about his past,
and to seek vengeance for the killing of his tribe.")
(license (license:non-copyleft "file:///readme.txt"))))
(define-public gnurobots
(package
(name "gnurobots")
@ -9656,3 +9951,137 @@ challenges.")
license:bsd-3 ;src/md5sum
license:lgpl2.1+ ;src/iqsort.h
license:expat))))
(define-public eboard
(package
(name "eboard")
(version "1.1.3")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/fbergo/eboard.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1z4pwpqyvxhlda99h6arh2rjk90fbms9q29fqizjblrdn01dlxn1"))))
(build-system gnu-build-system)
(native-inputs
`(("perl" ,perl)
("pkg-config" ,pkg-config)))
(inputs
`(("gtk+" ,gtk+-2)
("libpng" ,libpng)
("gstreamer" ,gstreamer)))
(arguments
`(#:tests? #f
#:phases
(modify-phases %standard-phases
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys)
(make-file-writable "eboard-config")
(setenv "CC" "gcc")
(invoke "./configure"
(string-append "--prefix=" (assoc-ref outputs "out")))
#t))
(add-before 'install 'make-required-directories
(lambda* (#:key outputs #:allow-other-keys)
(mkdir-p (string-append (assoc-ref outputs "out")
"/share/eboard"))
#t)))))
(synopsis "Graphical user interface to play chess")
(description
"Eboard is a chess board interface for ICS (Internet Chess Servers)
and chess engines.")
(home-page "https://www.bergo.eng.br/eboard/")
(license license:gpl2+)))
(define-public chessx
(package
(name "chessx")
(version "1.5.0")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/chessx/chessx/"
version "/chessx-" version ".tgz"))
(sha256
(base32 "09rqyra28w3z9ldw8sx07k5ap3sjlli848p737maj7c240rasc6i"))))
(build-system qt-build-system)
(native-inputs
`(("qttools" ,qttools)))
(inputs
`(("qtbase" ,qtbase)
("qtmultimedia" ,qtmultimedia)
("qtsvg" ,qtsvg)
("zlib" ,zlib)))
(arguments
`(#:tests? #f
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-paths
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "chessx.pro"
(("\\$\\$\\[QT_INSTALL_BINS\\]/lrelease")
(string-append (assoc-ref inputs "qttools") "/bin/lrelease")))
#t))
(add-after 'fix-paths 'make-qt-deterministic
(lambda _
(setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1")
#t))
(replace 'configure
(lambda _
(invoke "qmake")
#t))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(install-file "release/chessx" (string-append out "/bin"))
(install-file "unix/chessx.desktop"
(string-append out "/share/applications")))
#t)))))
(synopsis "Chess game database")
(description
"ChessX is a chess database. With ChessX you can operate on your
collection of chess games in many ways: browse, edit, add, organize, analyze,
etc. You can also play games on FICS or against an engine.")
(home-page "http://chessx.sourceforge.net/")
(license license:gpl2+)))
(define-public stockfish
(package
(name "stockfish")
(version "11")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/official-stockfish/Stockfish.git")
(commit (string-append "sf_" version))))
(file-name (git-file-name name version))
(sha256
(base32 "12mppipinymj8s1ipq9a7is453vncly49c32ym9wvyklsgyxfzlk"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f
#:make-flags (list "-C" "src"
"build"
(string-append "PREFIX="
(assoc-ref %outputs "out"))
(string-append "ARCH="
,(match (%current-system)
("x86_64-linux" "x86-64")
("i686-linux" "x86-32")
("aarch64-linux" "general-64")
("armhf-linux" "armv7")
("mips64el-linux" "general-64")
(_ "general-32"))))
#:phases (modify-phases %standard-phases
(delete 'configure))))
(synopsis "Strong chess engine")
(description
"Stockfish is a very strong chess engines. It is much stronger than the
best human chess grandmasters. It can be used with UCI-compatible GUIs like
ChessX.")
(home-page "https://stockfishchess.org/")
(license license:gpl3+)))

10
gnu/packages/gdb.scm
View File

@ -131,6 +131,16 @@ written in C, C++, Ada, Objective-C, Pascal and more.")
(define-public gdb/next
(package/inherit
gdb-8.3
(version "9.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/gdb/gdb-" version ".tar.xz"))
(sha256
(base32
"0dqp1p7w836iwijg1zb4a784n0j4pyjiw5v6h8fg5lpx6b40x7k9"))))
(arguments
`(#:out-of-source? #t
,@(package-arguments gdb-8.3)))
(inputs
`(("source-highlight" ,source-highlight)
,@(package-inputs gdb-8.3)))

4
gnu/packages/gimp.scm
View File

@ -2,7 +2,7 @@
;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018, 2019, 202 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Leo Famulari <leo@famulari.name>
;;; Copyright © 2018 Thorsten Wilms <t_w_@freenet.de>
;;;
@ -255,7 +255,7 @@ that is extensible via a plugin system.")
("gtk+" ,gtk+-2)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "http://registry.gimp.org/node/19596")
(home-page "https://www.lprp.fr/gimp_plugin_en/#fourier")
(synopsis "GIMP plug-in to edit image in fourier space")
(description
"This package provides a simple plug-in to apply the fourier transform on

19
gnu/packages/gl.scm
View File

@ -11,6 +11,7 @@
;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -422,6 +423,24 @@ device drivers allows Mesa to be used in many different environments ranging
from software emulation to complete hardware acceleration for modern GPUs.")
(license license:x11)))
;; Mesa 19.3.2 causes a test failure in some packages, so add this newer
;; version separately until the next rebuild cycle.
(define-public mesa-19.3.3
(package/inherit
mesa
(version "19.3.3")
(source (origin
(inherit (package-source mesa))
(uri (list (string-append "https://mesa.freedesktop.org/archive/"
"mesa-" version ".tar.xz")
(string-append "ftp://ftp.freedesktop.org/pub/mesa/"
"mesa-" version ".tar.xz")
(string-append "ftp://ftp.freedesktop.org/pub/mesa/"
version "/mesa-" version ".tar.xz")))
(sha256
(base32
"02czqdqf64i3az5p1allnxycyjad3x35cj0hz0017mi5pc84ikl1"))))))
(define-public mesa-opencl
(package
(inherit mesa)

34
gnu/packages/gnome-xyz.scm
View File

@ -114,6 +114,40 @@ which haven't been updated for some years. The new app icons are ported from
the Obsidian icon theme.")
(license license:gpl3)))
(define-public gnome-shell-extension-appindicator
(package
(name "gnome-shell-extension-appindicator")
(version "30")
(source (origin
(method git-fetch)
(uri (git-reference
(url
"https://github.com/ubuntu/gnome-shell-extension-appindicator.git")
(commit (string-append "v" version))))
(sha256
(base32
"1fjhx23jqwv3d0smwhnjvc35gqhwk9p5f96ic22pfax653cn5vh8"))
(file-name (git-file-name name version))))
(build-system trivial-build-system)
(arguments
'(#:modules ((guix build utils))
#:builder
(begin
(use-modules (guix build utils))
(let* ((source (assoc-ref %build-inputs "source"))
(install-dir (string-append (assoc-ref %outputs "out")
"/share/gnome-shell/extensions"
"/appindicatorsupport@rgcjonas.gmail.com")))
(mkdir-p install-dir)
(copy-recursively source install-dir)
#t))))
(synopsis "Adds KStatusNotifierItem support to GNOME Shell")
(description "This extension integrates Ubuntu AppIndicators
and KStatusNotifierItems (KDE's successor of the systray) into
GNOME Shell.")
(home-page "https://github.com/ubuntu/gnome-shell-extension-appindicator/")
(license license:gpl2+)))
(define-public gnome-shell-extension-dash-to-dock
(package
(name "gnome-shell-extension-dash-to-dock")

51
gnu/packages/gnome.scm
View File

@ -40,7 +40,7 @@
;;; Copyright © 2019 Jelle Licht <jlicht@fsfe.org>
;;; Copyright © 2019 Jonathan Frederickson <jonathan@terracrypt.net>
;;; Copyright © 2019, 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2019 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2019, 2020 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2019 David Wilson <david@daviwil.com>
;;; Copyright © 2019, 2020 Raghav Gururajan <raghavgururajan@disroot.org>
;;; Copyright © 2019 Jonathan Brielmaier <jonathan.brielmaier@web.de>
@ -2170,6 +2170,10 @@ from forcing GEXP-PROMISE."
#+(canonical-package tar)))
(invoke "tar" "xvf" #+upstream-source)
(with-directory-excursion (string-append "librsvg-" #$version)
;; The following crate(s) are needed in addition to the ones replaced:
(begin
(invoke
"tar" "xvf" #+(package-source rust-autocfg-0.1) "-C" "vendor"))
(for-each
(lambda (crate)
(delete-file-recursively (string-append "vendor/" (car crate)))
@ -2179,7 +2183,7 @@ from forcing GEXP-PROMISE."
("approx" . #+(package-source rust-approx-0.3))
("arrayvec" . #+(package-source rust-arrayvec-0.4))
("atty" . #+(package-source rust-atty-0.2))
("autocfg" . #+(package-source rust-autocfg-0.1))
("autocfg" . #+(package-source rust-autocfg-1.0))
("bitflags" . #+(package-source rust-bitflags-1))
;; block 0.1
("bstr" . #+(package-source rust-bstr-0.2))
@ -2228,9 +2232,9 @@ from forcing GEXP-PROMISE."
("itertools" . #+(package-source rust-itertools-0.8))
("itoa" . #+(package-source rust-itoa-0.4))
("language-tags" . #+(package-source rust-language-tags-0.2))
("lazy_static" . #+(package-source rust-lazy-static-1.3))
("lazy_static" . #+(package-source rust-lazy-static-1))
("libc" . #+(package-source rust-libc-0.2))
;; libm 0.1
("libm" . #+(package-source rust-libm-0.1))
;; locale_config 0.3
("log" . #+(package-source rust-log-0.4))
("mac" . #+(package-source rust-mac-0.1))
@ -3761,7 +3765,7 @@ and the GLib main loop, to integrate well with GNOME applications.")
(define-public libsecret
(package
(name "libsecret")
(version "0.19.1")
(version "0.20.1")
(source (origin
(method url-fetch)
(uri (string-append
@ -3770,7 +3774,7 @@ and the GLib main loop, to integrate well with GNOME applications.")
"libsecret-" version ".tar.xz"))
(sha256
(base32
"0fhflcsr70b1pps2pcvqcbdhip2ny5am9nbm634f4sj5g40y30w5"))))
"0ir4ynpf8b64xss1azvsi5x6697lik7hkf3z0xxa2qv2xja3xxsp"))))
(build-system gnu-build-system)
(outputs '("out" "doc"))
(arguments
@ -4069,43 +4073,34 @@ output devices.")
(define-public geoclue
(package
(name "geoclue")
(version "2.4.8")
(version "2.5.5")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.freedesktop.org/software/" name
"/releases/" (version-major+minor version) "/"
name "-" version ".tar.xz"))
(uri
(string-append "https://gitlab.freedesktop.org/geoclue/geoclue/-/archive/"
version "/geoclue-" version ".tar.bz2"))
(sha256
(base32
"08yg1r7m0n9hwyvcy769qkmkf8lslqwv69cjfffwnc3zm5km25qj"))
"1b7jqrsn4x7mxjxj8hvb2dl2cmhrpb9vibs4rvkkanky5nsx3sai"))
(patches (search-patches "geoclue-config.patch"))))
(build-system glib-or-gtk-build-system)
(build-system meson-build-system)
(arguments
'(;; The tests want to run the system bus.
#:tests? #f
#:configure-flags (list ;; Disable bits requiring ModemManager.
"--disable-3g-source"
"--disable-cdma-source"
"--disable-modem-gps-source"
"--with-dbus-service-user=geoclue")
#:phases
(modify-phases %standard-phases
(add-before 'configure 'patch-/bin/true
(lambda _
(substitute* "configure"
(("/bin/true") (which "true")))
#t)))))
'(#:configure-flags (list "-Dbus-srv-user=geoclue")))
(native-inputs
`(("pkg-config" ,pkg-config)
("gobject-introspection" ,gobject-introspection)
("modem-manager" ,modem-manager)
("libnotify" ,libnotify)
("gtk-doc", gtk-doc)
("intltool" ,intltool)))
(inputs
`(("avahi" ,avahi)
("glib" ,glib)
("glib:bin" ,glib "bin")
("glib-networking" ,glib-networking)
("json-glib" ,json-glib)
("libsoup" ,libsoup)))
(home-page "https://www.freedesktop.org/wiki/Software/GeoClue/")
(home-page "https://gitlab.freedesktop.org/geoclue/geoclue/-/wikis/home")
(synopsis "Geolocation service")
(description "Geoclue is a D-Bus service that provides location
information. The primary goal of the Geoclue project is to make creating

2
gnu/packages/gnunet.scm
View File

@ -93,7 +93,7 @@
`(("exiv2" ,exiv2)
("bzip2" ,bzip2)
("flac" ,flac)
("ffmpeg" ,ffmpeg-3.4)
("ffmpeg" ,ffmpeg)
("file" ,file) ;libmagic, for the MIME plug-in
("glib" ,glib)
("gstreamer" ,gstreamer)

12
gnu/packages/gnuzilla.scm
View File

@ -552,8 +552,8 @@ from forcing GEXP-PROMISE."
#:system system
#:guile-for-build guile)))
(define %icecat-version "68.4.1-guix0-preview1")
(define %icecat-build-id "20200108000000") ;must be of the form YYYYMMDDhhmmss
(define %icecat-version "68.5.0-guix0-preview1")
(define %icecat-build-id "20200211000000") ;must be of the form YYYYMMDDhhmmss
;; 'icecat-source' is a "computed" origin that generates an IceCat tarball
;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat'
@ -575,11 +575,11 @@ from forcing GEXP-PROMISE."
"firefox-" upstream-firefox-version ".source.tar.xz"))
(sha256
(base32
"0q7kv70w1d33m12hkzyay6nkgvz9qczrl6hqx0n1c6grs097f2m0"))))
"1ld6jinnln0si6p8qy93v5nzd21ckhl266vz425lwqipibwq9rsj"))))
(upstream-icecat-base-version "68.4.1") ; maybe older than base-version
(upstream-icecat-base-version "68.5.0") ; maybe older than base-version
;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version))
(gnuzilla-commit "2d1b1bc45fdae5a99c4e8ea25593ebb9c8d7bfdf")
(gnuzilla-commit "2dc3c0bed6f8a41a8426ae66db92729af5c27c70")
(gnuzilla-source
(origin
(method git-fetch)
@ -591,7 +591,7 @@ from forcing GEXP-PROMISE."
(string-take gnuzilla-commit 8)))
(sha256
(base32
"0hc9sx3yb71xvr9s1p0z5fx8jfqpssb8wz0h2nzhy2nyp9bb2jzl"))))
"1xwr1xjs4j2i6skm8hknh37gzsd6r396n0lchbwlahig7w6z506y"))))
(makeicecat-patch
(local-file (search-patch "icecat-makeicecat.patch"))))

416
gnu/packages/golang.scm
View File

@ -4,7 +4,7 @@
;;; Copyright © 2016 Andy Wingo <wingo@igalia.com>
;;; Copyright © 2016, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017 Petter <petter@mykolab.ch>
;;; Copyright © 2016, 2017, 2019 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Sergei Trofimovich <slyfox@inbox.ru>
;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
@ -16,6 +16,7 @@
;;; Copyright @ 2019 Giovanni Biscuolo <g@xelera.eu>
;;; Copyright @ 2019 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2019 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2020 Jack Hill <jackhill@jackhill.us>
;;;
;;; This file is part of GNU Guix.
;;;
@ -216,11 +217,11 @@ in the style of communicating sequential processes (@dfn{CSP}).")
(supported-systems '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux"))
(license license:bsd-3)))
(define-public go-1.12
(define-public go-1.13
(package
(inherit go-1.4)
(name "go")
(version "1.12.16")
(version "1.13.7")
(source
(origin
(method url-fetch)
@ -228,7 +229,7 @@ in the style of communicating sequential processes (@dfn{CSP}).")
name version ".src.tar.gz"))
(sha256
(base32
"1y0x10fsvgpc1x24b9q9y6kv9b0kwf7879am3p0gym2abgc5wvnf"))))
"1x21kfpzfkvmqd42pan6nl862m7jjl4niqxxpcgm46awbz645bg4"))))
(arguments
(substitute-keyword-arguments (package-arguments go-1.4)
((#:phases phases)
@ -367,7 +368,6 @@ in the style of communicating sequential processes (@dfn{CSP}).")
(docs (string-append doc_out "/share/doc/" ,name "-" ,version))
(src (string-append
(assoc-ref outputs "tests") "/share/" ,name "-" ,version)))
(delete-file-recursively "../pkg/bootstrap")
;; Prevent installation of the build cache, which contains
;; store references to most of the tools used to build Go and
;; would unnecessarily increase the size of Go's closure if it
@ -405,7 +405,7 @@ in the style of communicating sequential processes (@dfn{CSP}).")
,@(package-native-inputs go-1.4)))
(supported-systems %supported-systems)))
(define-public go go-1.12)
(define-public go go-1.13)
(define-public go-github-com-alsm-ioprogress
(let ((commit "063c3725f436e7fba0c8f588547bee21ffec7ac5")
@ -623,8 +623,8 @@ Go programming language.")
(license license:bsd-3))))
(define-public go-golang-org-x-crypto
(let ((commit "b7391e95e576cacdcdd422573063bc057239113d")
(revision "3"))
(let ((commit "9756ffdc24725223350eb3266ffb92590d28f278")
(revision "4"))
(package
(name "go-golang-org-x-crypto")
(version (git-version "0.0.0" revision commit))
@ -637,7 +637,7 @@ Go programming language.")
version "-checkout"))
(sha256
(base32
"1jqfh81mhgwcc6b9l0bs6rb0707s01qpvn7896i5bsmig46lc7zm"))))
"0q7hxaaq6lp0v8qqzifvysl47z5rfdlrxkh3d29vsl3wyby3dxl8"))))
(build-system go-build-system)
(arguments
'(#:import-path "golang.org/x/crypto"
@ -665,8 +665,8 @@ for the Go language.")
(license license:bsd-3))))
(define-public go-golang-org-x-net
(let ((commit "d28f0bde5980168871434b95cfc858db9f2a7a99")
(revision "3"))
(let ((commit "ba9fcec4b297b415637633c5a6e8fa592e4a16c3")
(revision "4"))
(package
(name "go-golang-org-x-net")
(version (git-version "0.0.0" revision commit))
@ -678,7 +678,7 @@ for the Go language.")
(file-name (git-file-name name version))
(sha256
(base32
"18xj31h70m7xxb7gc86n9i21w6d7djbjz67zfaljm4jqskz6hxkf"))))
"1hbqvy6r0s5h0dpdqw8fynl3cq0acin3iyqki9xvl5r8h33yb9bx"))))
(build-system go-build-system)
(arguments
`(#:import-path "golang.org/x/net"
@ -693,8 +693,8 @@ for the Go language.")
(license license:bsd-3))))
(define-public go-golang-org-x-sys
(let ((commit "04f50cda93cbb67f2afa353c52f342100e80e625")
(revision "4"))
(let ((commit "749cb33beabd9aa6d3178e3de05bcc914f70b2bf")
(revision "5"))
(package
(name "go-golang-org-x-sys")
(version (git-version "0.0.0" revision commit))
@ -706,7 +706,7 @@ for the Go language.")
(file-name (git-file-name name version))
(sha256
(base32
"0hmfsz9y1ingwsn482hlzzmzs7kr3cklm0ana0mbdk70isw2bxnw"))))
"0dm3257q3rv2kyn5lmqqim2fqg634v6rhrqq4glvbk4wx4l3v337"))))
(build-system go-build-system)
(arguments
`(#:import-path "golang.org/x/sys"
@ -750,8 +750,8 @@ support for low-level interaction with the operating system.")
(license license:bsd-3)))
(define-public go-golang-org-x-time
(let ((commit "6dc17368e09b0e8634d71cac8168d853e869a0c7")
(revision "1"))
(let ((commit "9d24e82272b4f38b78bc8cff74fa936d31ccd8ef")
(revision "2"))
(package
(name "go-golang-org-x-time")
(version (git-version "0.0.0" revision commit))
@ -763,7 +763,7 @@ support for low-level interaction with the operating system.")
(file-name (git-file-name name version))
(sha256
(base32
"1fx4cf5fpdz00g3c7vxzy92hdcg0vh4yqw00qp5s52j72qixynbk"))))
"1f5nkr4vys2vbd8wrwyiq2f5wcaahhpxmia85d1gshcbqjqf8dkb"))))
(build-system go-build-system)
(arguments
`(#:import-path "golang.org/x/time"
@ -1423,7 +1423,7 @@ values.")
(define-public go-github-com-mattn-go-isatty
(package
(name "go-github-com-mattn-go-isatty")
(version "0.0.7")
(version "0.0.11")
(source
(origin
(method git-fetch)
@ -1433,7 +1433,7 @@ values.")
(file-name (git-file-name name version))
(sha256
(base32
"1i77aq4gf9as03m8fpfh8fq49n4z9j7548blrcsidm1xhslzk5xd"))))
"0h671sv7hfprja495kavazkalkx7xzaqksjh13brcnwq67ijrali"))))
(build-system go-build-system)
(propagated-inputs
`(("go-golang-org-x-sys" ,go-golang-org-x-sys)))
@ -1792,7 +1792,7 @@ and lookup requests. Browse requests are not supported yet.")
(define-public go-github-com-gogo-protobuf
(package
(name "go-github-com-gogo-protobuf")
(version "1.2.1")
(version "1.3.1")
(source (origin
(method git-fetch)
(uri (git-reference
@ -1801,7 +1801,7 @@ and lookup requests. Browse requests are not supported yet.")
(file-name (git-file-name name version))
(sha256
(base32
"06yqa6h0kw3gr5pc3qmas7f7435a96zf7iw7p0l00r2hqf6fqq6m"))))
"0x77x64sxjgfhmbijqfzmj8h4ar25l2w97h01q3cqs1wk7zfnkhp"))))
(build-system go-build-system)
(arguments
`(#:import-path "github.com/gogo/protobuf"
@ -1957,27 +1957,25 @@ needing to use secp256k1 elliptic curve cryptography.")
(license license:isc))))
(define-public go-github-com-minio-sha256-simd
(let ((commit "cc1980cb03383b1d46f518232672584432d7532d")
(revision "3"))
(package
(name "go-github-com-minio-sha256-simd")
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/minio/sha256-simd.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"04fp98nal0wsb26zwhw82spn5camxslc68g3xp8g4af9w6k9g31j"))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/minio/sha256-simd"))
(home-page "https://github.com/minio/sha256-simd")
(synopsis "Accelerate SHA256 computations in pure Go")
(description "Accelerate SHA256 computations in pure Go using AVX512 and
(package
(name "go-github-com-minio-sha256-simd")
(version "0.1.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/minio/sha256-simd.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1j0iqsckm97g4l79vd4mc7apbmkdar23jpzqpnpdhwpfd834j8lp"))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/minio/sha256-simd"))
(home-page "https://github.com/minio/sha256-simd")
(synopsis "Accelerate SHA256 computations in pure Go")
(description "Accelerate SHA256 computations in pure Go using AVX512 and
AVX2 for Intel and ARM64 for ARM. On AVX512 it provides an up to 8x
improvement (over 3 GB/s per core) in comparison to AVX2.
@ -1990,7 +1988,7 @@ This package uses Golang assembly. The AVX512 version is based on the Intel's
\"multi-buffer crypto library for IPSec\" whereas the other Intel
implementations are described in \"Fast SHA-256 Implementations on Intel
Architecture Processors\" by J. Guilford et al.")
(license license:asl2.0))))
(license license:asl2.0)))
(define-public go-github-com-libp2p-go-libp2p-crypto
(let ((commit "7240b40a3ddc47c4d17c15baabcbe45e5219171b")
@ -2471,7 +2469,7 @@ as conversion to and from @command{net.Addr}.")
(define-public go-github-com-urfave-cli
(package
(name "go-github-com-urfave-cli")
(version "1.21.0")
(version "1.22.2")
(source
(origin
(method git-fetch)
@ -2481,10 +2479,12 @@ as conversion to and from @command{net.Addr}.")
(file-name (git-file-name name version))
(sha256
(base32
"104jldhxn6d97l5vsbsl0q8hgy1bxrahbr6dbfqrlppva51jmydd"))))
"10mcnvi5qmn00vpyk6si8gjka7p654wr9hac4zc9w5h3ickhvbdc"))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/urfave/cli"))
(propagated-inputs
`(("go-github-com-go-md2man" ,go-github-com-go-md2man)))
(home-page "https://github.com/urfave/cli")
(synopsis "Simple, fast, and fun package for building command line apps in Go")
(description "@command{cli} is a simple, fast, and fun package for
@ -2492,6 +2492,107 @@ building command line apps in Go. The goal is to enable developers to write
fast and distributable command line applications in an expressive way.")
(license license:expat)))
(define-public go-github-com-go-md2man
(package
(name "go-github-com-go-md2man")
(version "2.0.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/cpuguy83/go-md2man")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0r1f7v475dxxgzqci1mxfliwadcrk86ippflx9n411325l4g3ghv"))
(modules '((guix build utils)))
(snippet '(begin
(delete-file-recursively "vendor")
#t))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/cpuguy83/go-md2man"))
(propagated-inputs
`(("go-github-com-russross-blackfriday" ,go-github-com-russross-blackfriday)))
(home-page "https://github.com/cpuguy83/go-md2man")
(synopsis "Convert markdown into roff")
(description "Go-md2man is a Go program that converts markdown to roff for
the purpose of building man pages.")
(license license:expat)))
(define-public go-github-com-russross-blackfriday
(package
(name "go-github-com-russross-blackfriday")
(version "2.0.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/russross/blackfriday")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0nlz7isdd4rgnwzs68499hlwicxz34j2k2a0b8jy0y7ycd2bcr5j"))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/russross/blackfriday"))
(propagated-inputs
`(("go-github-com-shurcool-sanitized-anchor-name"
,go-github-com-shurcool-sanitized-anchor-name)))
(native-inputs
`(("go-github-com-pmezard-go-difflib" ,go-github-com-pmezard-go-difflib)))
(home-page "https://github.com/russross/blackfriday")
(synopsis "Markdown processor in Go")
(description "Blackfriday is a Markdown processor in Go.")
(license license:bsd-2)))
(define-public go-github-com-shurcool-sanitized-anchor-name
(package
(name "go-github-com-shurcool-sanitized-anchor-name")
(version "1.0.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/shurcooL/sanitized_anchor_name")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1gv9p2nr46z80dnfjsklc6zxbgk96349sdsxjz05f3z6wb6m5l8f"))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/shurcooL/sanitized_anchor_name"))
(home-page "https://github.com/shurcooL/sanitized_anchor_name")
(synopsis "Create sanitized anchor names")
(description "This package provides a Go program for creating sanitized
anchor names.")
(license license:expat)))
(define-public go-github-com-pmezard-go-difflib
(package
(name "go-github-com-pmezard-go-difflib")
(version "1.0.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/pmezard/go-difflib")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/pmezard/go-difflib/difflib"
#:unpack-path "github.com/pmezard/go-difflib/"))
(home-page "https://github.com/pmezard/go-difflib")
(synopsis "Go diff implementation")
(description "This package provides unified and context-aware diffs in Go.")
(license license:bsd-3)))
(define-public go-github-com-whyrusleeping-json-filter
(let ((commit "ff25329a9528f01c5175414f16cc0a6a162a5b8b")
(revision "0"))
@ -2862,7 +2963,7 @@ mutex, simply ignore the RLock/RUnlock functions.")
(define-public go-github-com-marten-seemann-qtls
(package
(name "go-github-com-marten-seemann-qtls")
(version "0.2.3")
(version "0.3.2")
(source (origin
(method git-fetch)
(uri (git-reference
@ -2871,7 +2972,7 @@ mutex, simply ignore the RLock/RUnlock functions.")
(file-name (git-file-name name version))
(sha256
(base32
"0b9p7bwkm9hfg1mb565q4nw5k7xyks0z2xagz5fp95azy2psbnfg"))))
"1mdymj66qrqy80pfkwy9s9z9ifkg251whngw5lim09zm90wv2q7a"))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/marten-seemann/qtls"
@ -2912,7 +3013,7 @@ implementation of generics.")
(define-public go-github-com-lucas-clemente-quic-go
(package
(name "go-github-com-lucas-clemente-quic-go")
(version "0.11.2")
(version "0.12.1")
(source (origin
(method git-fetch)
(uri (git-reference
@ -2921,7 +3022,7 @@ implementation of generics.")
(file-name (git-file-name name version))
(sha256
(base32
"0gqm5mc8alg84ra7yxach34il1jvcij8f76qdqcahnd3d2nhjbia"))))
"156nhq4dvw7mr08j952248v81q7702phbn4mp228319sahnbv65h"))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/lucas-clemente/quic-go"
@ -2930,7 +3031,8 @@ implementation of generics.")
(propagated-inputs
`(("go-golang-org-x-crypto" ,go-golang-org-x-crypto)
("go-github-com-cheekybits-genny" ,go-github-com-cheekybits-genny)
("go-github-com-marten-seemann-qtls" ,go-github-com-marten-seemann-qtls)))
("go-github-com-marten-seemann-qtls" ,go-github-com-marten-seemann-qtls)
("go-github-com-golang-protobuf-proto" ,go-github-com-golang-protobuf-proto)))
(synopsis "QUIC in Go")
(description "This package provides a Go language implementation of the QUIC
network protocol.")
@ -2938,28 +3040,26 @@ network protocol.")
(license license:expat)))
(define-public go-github-com-pkg-errors
(let ((commit "27936f6d90f9c8e1145f11ed52ffffbfdb9e0af7")
(revision "0"))
(package
(name "go-github-com-pkg-errors")
(version (git-version "0.8.1" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/pkg/errors.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0yzmgi6g4ak4q8y7w6x0n5cbinlcn8yc3gwgzy4yck00qdn25d6y"))))
(build-system go-build-system)
(arguments
`(#:import-path "github.com/pkg/errors"))
(synopsis "Go error handling primitives")
(description "This package provides @code{error}, which offers simple
(package
(name "go-github-com-pkg-errors")
(version "0.9.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/pkg/errors.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1hlivqlcnm9wrj0v7h43gamw7mvg6svz9sm31fx28zn4ll25ablh"))))
(build-system go-build-system)
(arguments
`(#:import-path "github.com/pkg/errors"))
(synopsis "Go error handling primitives")
(description "This package provides @code{error}, which offers simple
error handling primitives in Go.")
(home-page "https://github.com/pkg/errors")
(license license:bsd-2))))
(home-page "https://github.com/pkg/errors")
(license license:bsd-2)))
(define-public go-github-com-maruel-panicparse
(package
@ -3077,3 +3177,175 @@ alternative to @code{reflect.DeepEqual} for comparing whether two values
are semantically equal in Go (for writing tests).")
(home-page "https://godoc.org/github.com/google/go-cmp/cmp")
(license license:asl2.0)))
(define-public go-golang.org-x-sync-errgroup
(let ((commit "cd5d95a43a6e21273425c7ae415d3df9ea832eeb")
(revision "0"))
(package
(name "go-golang.org-x-sync-errgroup")
(version (git-version "0.0.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://go.googlesource.com/sync")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1nqkyz2y1qvqcma52ijh02s8aiqmkfb95j08f6zcjhbga3ds6hds"))))
(build-system go-build-system)
(arguments
'(#:import-path "golang.org/x/sync/errgroup"
#:unpack-path "golang.org/x/sync"))
(synopsis "Synchronization, error propagation, and Context cancelation
for groups of goroutines working on subtasks of a common task.")
(description "This package provides synchronization, error propagation,
and Context cancelation for groups of goroutines working on subtasks of a
common task.")
(home-page "https://godoc.org/golang.org/x/sync/errgroup")
(license license:bsd-3))))
(define (go-gotest-tools-source version sha256-base32-hash)
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/gotestyourself/gotest.tools.git")
(commit (string-append "v" version))))
(file-name (git-file-name "go-gotest-tools" version))
(sha256
(base32 sha256-base32-hash))))
;; Note that version 3.0.0 is incompatible to 2.3.0.
;; See also <https://github.com/gotestyourself/gotest.tools/issues/166>.
(define (go-gotest-tools-package suffix)
(package
(name (string-append "go-gotest-tools-"
(string-replace-substring suffix "/" "-")))
(version "2.3.0")
(source
(go-gotest-tools-source version
"0071rjxp4xzcr3vprkaj1hdk35a3v45bx8v0ipk16wwc5hx84i2i"))
(build-system go-build-system)
(arguments
`(#:import-path ,(string-append "gotest.tools/" suffix)
#:unpack-path "gotest.tools"))
(synopsis "@code{gotest-tools} part")
(description "This package provides a part of @code{gotest-tools}.")
(home-page "https://github.com/gotestyourself/gotest.tools")
(license license:asl2.0)))
(define-public go-gotest-tools-internal-format
(package (inherit (go-gotest-tools-package "internal/format"))
(native-inputs
`(("go-github-com-pkg-errors" ,go-github-com-pkg-errors)
("go-github-com-google-go-cmp-cmp"
,go-github-com-google-go-cmp-cmp)))
(synopsis "Formats messages for use with gotest-tools")
(description "This package provides a way to format messages for use
with gotest-tools.")))
(define-public go-gotest-tools-internal-difflib
(package (inherit (go-gotest-tools-package "internal/difflib"))
(synopsis "Differences for use with gotest-tools")
(description "This package computes differences for use
with gotest-tools.")))
(define-public go-gotest-tools-internal-source
(package (inherit (go-gotest-tools-package "internal/source"))
(native-inputs
`(("go-github-com-pkg-errors" ,go-github-com-pkg-errors)
("go-github-com-google-go-cmp-cmp" ,go-github-com-google-go-cmp-cmp)))
(synopsis "Source code AST formatters for gotest-tools")
(description "This package provides source code AST formatters for
gotest-tools.")))
(define-public go-gotest-tools-assert
(package (inherit (go-gotest-tools-package "assert"))
(name "go-gotest-tools-assert")
(arguments
`(#:tests? #f ; Test failure concerning message formatting (FIXME)
#:import-path "gotest.tools/assert"
#:unpack-path "gotest.tools"))
;(propagated-inputs
; `(("go-gotest-tools-internal-format" ,go-gotest-tools-internal-format)))
(native-inputs
`(("go-github-com-pkg-errors" ,go-github-com-pkg-errors)
("go-github-com-google-go-cmp-cmp"
,go-github-com-google-go-cmp-cmp)))
(synopsis "Compare values and fail a test when a comparison fails")
(description "This package provides a way to compare values and fail a
test when a comparison fails.")
(home-page "https://github.com/gotestyourself/gotest.tools")
(license license:asl2.0)))
(define-public gotestsum
(package
(name "gotestsum")
(version "0.4.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/gotestyourself/gotestsum.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0y71qr3ss3hgc8c7nmvpwk946xy1jc5d8whsv6y77wb24ncla7n0"))))
(build-system go-build-system)
(arguments
'(#:import-path "gotest.tools/gotestsum"))
(native-inputs
`(("go-github-com-fatih-color" ,go-github-com-fatih-color)
("go-golang.org-x-sync-errgroup" ,go-golang.org-x-sync-errgroup)
("go-github-com-pkg-errors" ,go-github-com-pkg-errors)
("go-github-com-sirupsen-logrus"
,go-github-com-sirupsen-logrus)
("go-github-com-spf13-pflag" ,go-github-com-spf13-pflag)
("go-github-com-jonboulle-clockwork"
,go-github-com-jonboulle-clockwork)
("go-golang-org-x-crypto" ,go-golang-org-x-crypto)
("go-gotest-tools-assert" ,go-gotest-tools-assert)
("go-github-com-google-go-cmp-cmp"
,go-github-com-google-go-cmp-cmp)
;; TODO: This would be better as a propagated-input of
;; go-gotest-tools-assert, but that does not work for
;; some reason.
("go-gotest-tools-internal-format"
,go-gotest-tools-internal-format)
("go-gotest-tools-internal-difflib"
,go-gotest-tools-internal-difflib)
("go-gotest-tools-internal-source"
,go-gotest-tools-internal-source)
("go-github-com-google-go-cmp-cmp"
,go-github-com-google-go-cmp-cmp)))
(synopsis "Go test runner with output optimized for humans")
(description "This package provides a @code{go test} runner with output
optimized for humans, JUnit XML for CI integration, and a summary of the
test results.")
(home-page "https://github.com/gotestyourself/gotestsum")
(license license:asl2.0)))
(define-public go-github-com-golang-protobuf-proto
(package
(name "go-github-com-golang-protobuf-proto")
(version "1.3.1")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/golang/protobuf.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl"))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/golang/protobuf/proto"
#:unpack-path "github.com/golang/protobuf"
;; Requires unpackaged golang.org/x/sync/errgroup
#:tests? #f))
(synopsis "Go support for Protocol Buffers")
(description "This package provides Go support for the Protocol Buffers
data serialization format.")
(home-page "https://github.com/golang/protobuf")
(license license:bsd-3)))

6
gnu/packages/gpodder.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2019, 2020 Pierre Langlois <pierre.langlois@gmx.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -37,7 +37,7 @@
(define-public gpodder
(package
(name "gpodder")
(version "3.10.11")
(version "3.10.13")
(source
(origin
(method git-fetch)
@ -46,7 +46,7 @@
(commit version)))
(sha256
(base32
"15f5z3cnch9lpzbz73l4wjykv9n74y8djz5db53la2ql4ihaxfz9"))
"1h542syaxsx1hslfzlk3fx1nbp190zjw35kigw7a1kx1jwvfwapg"))
(file-name (git-file-name name version))))
(build-system python-build-system)
(native-inputs

29
gnu/packages/graph.scm
View File

@ -4,6 +4,7 @@
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2020 Alexander Krotov <krotov@iitp.ru>
;;;
;;; This file is part of GNU Guix.
;;;
@ -38,6 +39,7 @@
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
#:use-module (gnu packages cran)
#:use-module (gnu packages gd)
#:use-module (gnu packages graphviz)
#:use-module (gnu packages maths)
#:use-module (gnu packages multiprecision)
@ -501,3 +503,30 @@ isolating planarity obstructions.")
(description "rw computes rank-width and rank-decompositions
of graphs.")
(license license:gpl2+)))
(define-public mscgen
(package
(name "mscgen")
(version "0.20")
(source
(origin
(method url-fetch)
(uri (string-append "http://www.mcternan.me.uk/mscgen/software/mscgen-src-"
version ".tar.gz"))
(sha256
(base32
"08yw3maxhn5fl1lff81gmcrpa4j9aas4mmby1g9w5qcr0np82d1w"))))
(build-system gnu-build-system)
(inputs
`(("gd" ,gd)))
(home-page "http://www.mcternan.me.uk/mscgen/")
(synopsis "Message Sequence Chart Generator")
(description "Mscgen is a small program that parses Message Sequence Chart
descriptions and produces PNG, SVG, EPS or server side image maps (ismaps) as
the output. Message Sequence Charts (MSCs) are a way of representing entities
and interactions over some time period and are often used in combination with
SDL. MSCs are popular in Telecoms to specify how protocols operate although
MSCs need not be complicated to create or use. Mscgen aims to provide a simple
text language that is clear to create, edit and understand, which can also be
transformed into common image formats for display or printing.")
(license license:gpl2+)))

13
gnu/packages/graphics.scm
View File

@ -16,7 +16,7 @@
;;; Copyright © 2019 Steve Sprang <scs@stevesprang.com>
;;; Copyright © 2019 John Soo <jsoo1@asu.edu>
;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2019, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2019 Tanguy Le Carrour <tanguy@bioneland.org>
;;;
;;; This file is part of GNU Guix.
@ -330,7 +330,7 @@ many more.")
(define-public ilmbase
(package
(name "ilmbase")
(version "2.4.0")
(version "2.4.1")
(source (origin
(method git-fetch)
(uri (git-reference
@ -339,7 +339,7 @@ many more.")
(file-name (git-file-name "ilmbase" version))
(sha256
(base32
"0g3rz11cvb7gnphp2np9z7bfl7v4dprq4w5hnsvx7yrasgsdyn8s"))
"020gyl8zv83ag6gbcchmqiyx9rh2jca7j8n52zx1gk4rck7kwc01"))
(patches (search-patches "ilmbase-fix-tests.patch"
"ilmbase-openexr-pkg-config.patch"))))
(build-system cmake-build-system)
@ -854,7 +854,7 @@ exec -a \"$0\" ~a/.brdf-real~%"
("glew" ,glew)
("freeglut" ,freeglut)
("zlib" ,zlib)))
(home-page "http://www.disneyanimation.com/technology/brdf.html")
(home-page "https://www.disneyanimation.com/technology/brdf.html")
(synopsis
"Analyze bidirectional reflectance distribution functions (BRDFs)")
(description
@ -1061,7 +1061,10 @@ requirements.")
(native-inputs
`(("xorg-server" ,xorg-server-for-tests)))
(inputs
`(("glew" ,glew)
`(;; The test suite fails when using Mesa 19.3.2, so we provide this newer
;; version. Remove this input when the 'mesa' package is updated.
("mesa" ,mesa-19.3.3)
("glew" ,glew)
("libxrandr" ,libxrandr)
("libxcursor" ,libxcursor)
("libxinerama" ,libxinerama)

34
gnu/packages/gstreamer.scm
View File

@ -8,6 +8,7 @@
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020 Leo Prikler <leo.prikler@student.tugraz.at>
;;;
;;; This file is part of GNU Guix.
;;;
@ -476,6 +477,39 @@ distribution problems in some jurisdictions, e.g. due to patent threats.")
compression formats through the use of the libav library.")
(license license:gpl2+)))
(define-public gst-editing-services
(package
(name "gst-editing-services")
(version "1.16.2")
(source (origin
(method url-fetch)
(uri (string-append
"https://gstreamer.freedesktop.org/src/" name "/"
"gstreamer-editing-services-" version ".tar.xz"))
(sha256
(base32
"05hcf3prna8ajjnqd53221gj9syarrrjbgvjcbhicv0c38csc1hf"))))
(build-system meson-build-system)
(arguments
;; FIXME: 16/22 failing tests.
`(#:tests? #f))
(inputs
`(("gst-plugins-base" ,gst-plugins-base)
("libxml2" ,libxml2)))
(native-inputs
`(("flex" ,flex)
("gst-plugins-bad" ,gst-plugins-bad)
("gst-plugins-good" ,gst-plugins-good)
("perl" ,perl)
("pkg-config" ,pkg-config)
("python" ,python)))
(home-page "https://gstreamer.freedesktop.org/")
(synopsis "GStreamer library for non-linear editors")
(description
"This is a high-level library for facilitating the creation of audio/video
non-linear editors.")
(license license:gpl2+)))
(define-public python-gst
(package
(name "python-gst")

51
gnu/packages/ham-radio.scm
View File

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017, 2018, 2019 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2019 Evan Straw <evan.straw99@gmail.com>
;;; Copyright © 2019, 2020 Evan Straw <evan.straw99@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -22,6 +22,8 @@
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
#:use-module (gnu packages gtk)
#:use-module (gnu packages image)
#:use-module (gnu packages libusb)
@ -29,6 +31,7 @@
#:use-module (gnu packages pulseaudio)
#:use-module (gnu packages python)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages sdr)
#:use-module (gnu packages xml)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
@ -127,3 +130,49 @@ satellites, the POES NOAA weather satellite series. These transmissions are
on a frequency of 137 MHz. They can be received using an inexpensive antenna
and a dedicated receiver.")
(license license:gpl2+)))
(define-public redsea
(package
(name "redsea")
(version "0.18")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/windytan/redsea")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1y96g0ra2krjb2kypm8s5gdfia45yci4f36klsvyzg8d53v5cwhn"))))
(build-system gnu-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
;; The configure.ac file does not explicitly link against libiconv
;; except on Mac OS, causing the build to fail. This phase comments
;; out the original AC_SUBST macro (located inside a conditional) and
;; adds an explicit use of it underneath, so that libiconv is always
;; linked against.
(add-after 'unpack 'patch-libiconv
(lambda _
(substitute* "configure.ac"
(("^ +AC_SUBST")
"# AC_SUBST")
(("esac")
"esac\nAC_SUBST([ICONV], [\"-liconv\"])"))
#t)))))
(inputs
`(("libiconv" ,libiconv)
("libsndfile" ,libsndfile)
("liquid-dsp" ,liquid-dsp)))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)))
(home-page "https://github.com/windytan/redsea")
(synopsis "Lightweight RDS to JSON decoder")
(description "redsea is a lightweight command-line @dfn{FM Radio Data
System} (FM-RDS) decoder. Redsea can be used with any RTL-SDR USB radio stick
with the rtl_fm tool, or any other @dfn{software-defined radio} (SDR) via
csdr, for example. It can also decode raw ASCII bitstream, the hex format
used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).")
(license license:expat)))

109
gnu/packages/haskell-xyz.scm
View File

@ -24,6 +24,7 @@
;;; Copyright © 2019 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2020 Brett Gilio <brettg@gnu.org>
;;; Copyright © 2020 JoJo <jo@jo.zone>
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;;
;;; This file is part of GNU Guix.
;;;
@ -8165,6 +8166,114 @@ easily work with command-line options.")
command line options in Haskell.")
(license license:bsd-3)))
(define-public ghc-jira-wiki-markup
(package
(name "ghc-jira-wiki-markup")
(version "1.0.0")
(source
(origin
(method url-fetch)
(uri (string-append
"https://hackage.haskell.org/package/jira-wiki-markup/"
"jira-wiki-markup-" version ".tar.gz"))
(sha256
(base32 "1sl2jjcsqg61si33mxjwpf8zdn56kbbgcwqqqzbgifx2qbv4wmf8"))))
(build-system haskell-build-system)
(native-inputs
`(("ghc-tasty" ,ghc-tasty)
("ghc-tasty-hunit" ,ghc-tasty-hunit)))
(home-page "https://github.com/tarleb/jira-wiki-markup")
(synopsis "Handle Jira wiki markup")
(description
"Parse jira wiki text into an abstract syntax tree for easy transformation
to other formats.")
(license license:expat)))
(define-public ghc-emojis
(package
(name "ghc-emojis")
(version "0.1")
(source
(origin
(method url-fetch)
(uri (string-append
"https://hackage.haskell.org/package/emojis/"
"emojis-" version ".tar.gz"))
(sha256
(base32 "1c6zkj9gmk1y90gbdrn50hyp7mw1mggzhnr2khqd728ryipw60ss"))))
(build-system haskell-build-system)
(native-inputs
`(("ghc-hunit" ,ghc-hunit)))
(home-page "https://github.com/jgm/emojis#readme")
(synopsis "Conversion between emoji characters and their names.")
(description
"This package provides functions for converting emoji names to emoji
characters and vice versa.
How does it differ from the @code{emoji} package?
@itemize
@item It supports a fuller range of emojis, including all those supported by
GitHub
@item It supports lookup of emoji aliases from emoji
@item It uses Text rather than String
@item It has a lighter dependency footprint: in particular, it does not
require aeson
@item It does not require TemplateHaskell
@end itemize")
(license license:bsd-3)))
(define-public ghc-text-conversions
(package
(name "ghc-text-conversions")
(version "0.3.0")
(source
(origin
(method url-fetch)
(uri (string-append
"https://hackage.haskell.org/package/text-conversions/"
"text-conversions-" version ".tar.gz"))
(sha256
(base32 "089c56vdj9xysqfr1hnvbnrghlg83q6w10xk02gflpsidcpvwmhp"))))
(build-system haskell-build-system)
(inputs
`(("ghc-base16-bytestring" ,ghc-base16-bytestring)
("ghc-base64-bytestring" ,ghc-base64-bytestring)
("ghc-errors" ,ghc-errors)))
(native-inputs
`(("ghc-hspec" ,ghc-hspec)
("hspec-discover" ,hspec-discover)))
(home-page "https://github.com/cjdev/text-conversions#readme")
(synopsis "Safe conversions between textual types")
(description "Safe conversions between textual types")
(license license:isc)))
(define-public ghc-doclayout
(package
(name "ghc-doclayout")
(version "0.3")
(source
(origin
(method url-fetch)
(uri (string-append
"https://hackage.haskell.org/package/doclayout/"
"doclayout-" version ".tar.gz"))
(sha256
(base32 "1wmnwq28jcyd6c80srivsnd5znmyl9sgmwwnlk2crwiiwqadbal7"))))
(build-system haskell-build-system)
(inputs
`(("ghc-safe" ,ghc-safe)))
(native-inputs
`(("ghc-tasty" ,ghc-tasty)
("ghc-tasty-golden" ,ghc-tasty-golden)
("ghc-tasty-hunit" ,ghc-tasty-hunit)))
(home-page "https://github.com/jgm/doclayout")
(synopsis "Pretty-printing library for laying out text documents")
(description
"doclayout is a pretty-printing library for laying out text documents,
with several features not present in pretty-printing libraries designed for
code. It was designed for use in @code{Pandoc}.")
(license license:bsd-3)))
(define-public ghc-pandoc
(package
(name "ghc-pandoc")

2
gnu/packages/i2p.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.lonestar.org>
;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.org>
;;;
;;; This file is part of GNU Guix.
;;;

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

@ -100,7 +100,7 @@ microblogging services.
Other notable features include:
@itemize
@item Support for user + friends time-lines.
@item Support for @Reply time-lines.
@item Support for @@Reply time-lines.
@item Support for sending and receiving direct messages.
@item Twitpic.com integration.
@item The ability to use multiple accounts simultaneously.

34
gnu/packages/libreoffice.scm
View File

@ -41,6 +41,7 @@
#:use-module (guix utils)
#:use-module (ice-9 match)
#:use-module (gnu packages)
#:use-module (gnu packages aidc)
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
#:use-module (gnu packages bison)
@ -67,6 +68,7 @@
#:use-module (gnu packages image)
#:use-module (gnu packages java)
#:use-module (gnu packages linux)
#:use-module (gnu packages logging)
#:use-module (gnu packages maths)
#:use-module (gnu packages nss)
#:use-module (gnu packages openldap)
@ -85,7 +87,7 @@
(define-public ixion
(package
(name "ixion")
(version "0.14.1")
(version "0.15.0")
(source
(origin
(method url-fetch)
@ -93,13 +95,14 @@
version ".tar.xz"))
(sha256
(base32
"14gdd6div4l22vnz3jn2qjxgjly98ck6p8c1v7386c41rx7kilba"))))
"1rmrl2zjzi4z0abf2cd54acypkccdhx2065dlyzy6xg83gv0mxmi"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
`(("mdds" ,mdds)
("python" ,python)))
("python" ,python)
("spdlog" ,spdlog)))
(home-page "https://gitlab.com/ixion/ixion")
(synopsis "General purpose formula parser and interpreter")
(description "Ixion is a library for calculating the results of formula
@ -111,7 +114,7 @@ their dependencies automatically upon calculation.")
(define-public orcus
(package
(name "orcus")
(version "0.14.1")
(version "0.15.3")
(source
(origin
(method url-fetch)
@ -119,7 +122,7 @@ their dependencies automatically upon calculation.")
name "-" version ".tar.xz"))
(sha256
(base32
"1ays13a1x15j81dsrq0d3697v1bbqd3bfz3ajn6kb9d61y2drlgj"))))
"14gbnqsv5n2fm4sxa17014f440clrzls6p2w2ixk9wipg4950v9s"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
@ -362,14 +365,14 @@ AbiWord documents.")
(define-public libcdr
(package
(name "libcdr")
(version "0.1.5")
(version "0.1.6")
(source
(origin
(method url-fetch)
(uri (string-append "https://dev-www.libreoffice.org/src/" name "/"
name "-" version ".tar.xz"))
(sha256 (base32
"0j1skr11jwvafn0l6p37v3i4lqc8wcn489g8f7c4mqwbk94mrkka"))))
"0qgqlw6i25zfq1gf7f6r5hrhawlrgh92sg238kjpf2839aq01k81"))))
(build-system gnu-build-system)
(native-inputs
`(("cppunit" ,cppunit)
@ -401,7 +404,7 @@ CorelDRAW documents of all versions.")
"0jhsbdimiyijdqriy0zzkjjgc4wi6fjimhdg4mdybrlwg7l7f5p6"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags '("--with-mdds=1.4")))
`(#:configure-flags '("--with-mdds=1.5")))
(native-inputs
`(("cppunit" ,cppunit)
("doxygen" ,doxygen)
@ -939,7 +942,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.")
(define-public libreoffice
(package
(name "libreoffice")
(version "6.3.4.2")
(version "6.4.0.3")
(source
(origin
(method url-fetch)
@ -949,17 +952,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.")
(version-prefix version 3) "/libreoffice-" version ".tar.xz"))
(sha256
(base32
"1774vmf3lr5x24ikpn1z5vqcdwrhiwfkjy7sx09jqkvpm6d5awnb"))
(patches (search-patches "libreoffice-icu.patch"
"libreoffice-glm.patch"))
(modules '((guix build utils)))
(snippet
'(begin
(for-each (lambda (file)
;; Adjust to renamed function in Poppler 0.72.
(substitute* file (("getCString") "c_str")))
(find-files "sdext/source/pdfimport/xpdfwrapper"))
#t))))
"09ra8a3ylb08xhy8wy233fs0f87klkpsbi9n3zss0c688afxjcf5"))))
(build-system glib-or-gtk-build-system)
(native-inputs
`(("bison" ,bison)
@ -1032,6 +1025,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.")
("postgresql" ,postgresql)
("python" ,python)
("python-lxml" ,python-lxml)
("qrcodegen-cpp" ,qrcodegen-cpp)
("redland" ,redland)
("sane-backends" ,sane-backends)
("unixodbc" ,unixodbc)

12
gnu/packages/libusb.scm
View File

@ -481,24 +481,26 @@ over USB.")
(define-public libmtp
(package
(name "libmtp")
(version "1.1.16")
(version "1.1.17")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/libmtp/libmtp/" version
"/libmtp-" version ".tar.gz"))
(sha256
(base32
"185vh9bds6dcy00ycggg69g4v7m3api40zv8vrcfb3fk3vfzjs2v"))))
"1p3r38nvdip40ab1h4scj3mzfjkx6kd14szjqyw9r6wz5pslr8zq"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
`(("libgcrypt" ,libgcrypt)))
(propagated-inputs
;; libmtp.pc refers to all these.
`(("libgcrypt" ,libgcrypt)
("libusb" ,libusb)))
`(("libusb" ,libusb)))
(arguments
`(#:configure-flags
(list (string-append "--with-udev="
(list "--disable-static"
(string-append "--with-udev="
(assoc-ref %outputs "out")
"/lib/udev"))))
(home-page "http://libmtp.sourceforge.net/")

81
gnu/packages/linux.scm
View File

@ -358,42 +358,42 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
"linux-" version ".tar.xz"))
(sha256 hash)))
(define-public linux-libre-5.4-version "5.4.17")
(define-public linux-libre-5.4-version "5.4.19")
(define-public linux-libre-5.4-pristine-source
(let ((version linux-libre-5.4-version)
(hash (base32 "1fbl5knf6pini9lsx8mqkdmf3qbsydqvaxggh6nd1vk9mzv2npwl")))
(hash (base32 "1f3pzg8vai5qz19gy9gf3rxs2z4dsw78zjkkfnha8iiy2mqvk14m")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-5.4)))
(define-public linux-libre-4.19-version "4.19.101")
(define-public linux-libre-4.19-version "4.19.103")
(define-public linux-libre-4.19-pristine-source
(let ((version linux-libre-4.19-version)
(hash (base32 "1i4bkwankl5q95kgqmmyzdkwmf3b8ppkb8ild9bw12mkpmm1a9my")))
(hash (base32 "0hxvqkjy63370sr9j4j0a1kzqwxxdn3i8i6wwc5c2gbzpmqlay5l")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-4.19)))
(define-public linux-libre-4.14-version "4.14.169")
(define-public linux-libre-4.14-version "4.14.170")
(define-public linux-libre-4.14-pristine-source
(let ((version linux-libre-4.14-version)
(hash (base32 "0jc24zvqz3vsv65xxcivzkj6nv27vsy62l50n2h1ysy5jdwsk3nq")))
(hash (base32 "1hqp3spi4cqgkqkzx5g2nbp6isz0kdcsj56ilsp6siqiglj662ll")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-4.14)))
(define-public linux-libre-4.9-version "4.9.212")
(define-public linux-libre-4.9-version "4.9.213")
(define-public linux-libre-4.9-pristine-source
(let ((version linux-libre-4.9-version)
(hash (base32 "0c5yjilaq86j6i2hzlxbp2ia7jhnf7kv952ffv7jxdf90sk3irxd")))
(hash (base32 "0r7bqpvbpiiniwsm338b38mv6flfgm1r09avxqsakhkh8rvgz1dg")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-4.9)))
(define-public linux-libre-4.4-version "4.4.212")
(define-public linux-libre-4.4-version "4.4.213")
(define-public linux-libre-4.4-pristine-source
(let ((version linux-libre-4.4-version)
(hash (base32 "0mx3qyj6w6h7gw7drsfsgl4iyz1695sjnf9hqh4kczci48kw5rj7")))
(hash (base32 "1cmwn9zvz14jqjy6qkszglhs2p5h6yh82b2269cbzvibg8y3rxq0")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-4.4)))
@ -1538,7 +1538,7 @@ Zerofree requires the file system to be unmounted or mounted read-only.")
(define-public strace
(package
(name "strace")
(version "5.4")
(version "5.5")
(home-page "https://strace.io")
(source (origin
(method url-fetch)
@ -1546,7 +1546,7 @@ Zerofree requires the file system to be unmounted or mounted read-only.")
"/strace-" version ".tar.xz"))
(sha256
(base32
"0hd7sb7l99y9rcj8jjc1b6m3ryds17krsymdg3dvd40jsla0bl7p"))))
"1zrhpzjlgfwfl8dd53llswmmharm5rbi0zch7lln5sjris69an4z"))))
(build-system gnu-build-system)
(arguments
'(#:phases
@ -2840,14 +2840,16 @@ time.")
(define-public lvm2
(package
(name "lvm2")
(version "2.02.177")
(version "2.03.08")
(source (origin
(method url-fetch)
(uri (string-append "ftp://sources.redhat.com/pub/lvm2/releases/LVM2."
version ".tgz"))
(uri (list (string-append "ftp://sourceware.org/pub/lvm2/LVM2."
version ".tgz")
(string-append "ftp://sources.redhat.com/pub/lvm2/releases/LVM2."
version ".tgz")))
(sha256
(base32
"1wl0isn0yz5wvglwylnlqkppafwmvhliq5bd92vjqp5ir4za49a0"))
"1j0yis658564rk1ddabkl8vbavp0fdd10gd6qhgyzc3akzf620kf"))
(modules '((guix build utils)))
(snippet
'(begin
@ -2855,7 +2857,7 @@ time.")
;; Honor sysconfdir.
(substitute* "make.tmpl.in"
(("confdir = .*$")
(("^confdir = .*$")
"confdir = @sysconfdir@\n")
(("DEFAULT_SYS_DIR = @DEFAULT_SYS_DIR@")
"DEFAULT_SYS_DIR = @sysconfdir@"))
@ -2866,7 +2868,8 @@ time.")
`(("pkg-config" ,pkg-config)
("procps" ,procps))) ;tests use 'pgrep'
(inputs
`(("udev" ,eudev)))
`(("libaio" ,libaio)
("udev" ,eudev)))
(arguments
`(#:phases
(modify-phases %standard-phases
@ -2896,14 +2899,6 @@ time.")
"/lib,-rpath="
(assoc-ref %outputs "out")
"/lib/device-mapper")
;; TODO: Patch make.tmpl.in to take LDFLAGS
;; into account so that we don't need to also
;; set CLDFLAGS.
(string-append "CLDFLAGS=-Wl,-rpath="
(assoc-ref %outputs "out")
"/lib,-rpath="
(assoc-ref %outputs "out")
"/lib/device-mapper")
;; This is needed when cross-compiling.
,@(if (%current-target-system)
'("ac_cv_func_malloc_0_nonnull=yes"
@ -2936,7 +2931,26 @@ mapper. Kernel components are part of Linux-libre.")
(substitute-keyword-arguments (package-arguments lvm2)
((#:configure-flags flags '())
;; LVM2 doesn't use Libtool, hence the custom option.
`(cons "--enable-static_link" ,flags))))
`(append '("--enable-static_link")
;; Building dmeventd statically is complicated due to a
;; requirement on libdevmapper.a, which is being phased out
;; in favor of libdevice-mapper.a, which in turn is is not
;; easily made available at dmeventd build time. Just ignore
;; it until the situation improves.
(delete "--enable-dmeventd" ,flags)))
((#:phases phases)
`(modify-phases ,phases
(add-before 'configure 'adjust-Makefile
(lambda _
;; These fixes are related to the upstream libdm->device_mapper
;; migration and will hopefully be fixed upstream in due time.
(substitute* "tools/Makefile.in"
;; This variable is empty in a static configuration and causes
;; an erroneous GCC command line.
(("-L\\$\\(interfacebuilddir\\)") "")
;; Remove obsolete reference to libdevmapper.a.
(("-ldevmapper") ""))
#t))))))
(synopsis "Logical volume management for Linux (statically linked)")))
(define-public wireless-tools
@ -5258,15 +5272,16 @@ interface in sysfs, which can be accomplished with the included udev rules.")
(define-public tlp
(package
(name "tlp")
(version "1.3.0")
(version "1.3.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/linrunner/TLP/archive/"
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(method git-fetch)
(uri (git-reference
(url "https://github.com/linrunner/TLP.git")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "169k3xypq5rq0xiggrlpr73yr2r2x7b2d9vcr9ac96qrgph7sk7r"))))
(base32 "14fcnaz9pw534v4d8dddqq4wcvpf1kghr8zlrk62r5lrl46sp1p5"))))
(native-inputs
`(("shellcheck" ,shellcheck)))
(inputs

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

@ -16,6 +16,7 @@
;;; Copyright © 2019 Jesse Gildersleve <jessejohngildersleve@protonmail.com>
;;; Copyright © 2019, 2020 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2019 Brett Gilio <brettg@gnu.org>
;;; Copyright © 2020 Konrad Hinsen <konrad.hinsen@fastmail.net>
;;;
;;; This file is part of GNU Guix.
;;;
@ -166,29 +167,27 @@ interactive development model in mind.")
(sbcl-package->ecl-package sbcl-fiveam))
(define-public sbcl-bordeaux-threads
(let ((commit "5dce49fbc829f4d136a734f5ef4f5d599660984f")
(revision "1"))
(package
(name "sbcl-bordeaux-threads")
(version (git-version "0.8.6" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/sionescu/bordeaux-threads.git")
(commit commit)))
(sha256
(base32 "1gkh9rz7zw57n3110ikcf4835950wr4hgp8l79id5ai6nd86x7wv"))
(file-name
(git-file-name "bordeaux-threads" version))))
(inputs `(("alexandria" ,sbcl-alexandria)))
(native-inputs `(("fiveam" ,sbcl-fiveam)))
(build-system asdf-build-system/sbcl)
(synopsis "Portable shared-state concurrency library for Common Lisp")
(description "BORDEAUX-THREADS is a proposed standard for a minimal
(package
(name "sbcl-bordeaux-threads")
(version "0.8.7")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/sionescu/bordeaux-threads.git")
(commit (string-append "v" version))))
(sha256
(base32 "1whpfmyxp2fsw6viqj45fqgsifgr534c575bfh5vaqw5m84b6alp"))
(file-name
(git-file-name "bordeaux-threads" version))))
(inputs `(("alexandria" ,sbcl-alexandria)))
(native-inputs `(("fiveam" ,sbcl-fiveam)))
(build-system asdf-build-system/sbcl)
(synopsis "Portable shared-state concurrency library for Common Lisp")
(description "BORDEAUX-THREADS is a proposed standard for a minimal
MP/Threading interface. It is similar to the CLIM-SYS threading and lock
support.")
(home-page "https://common-lisp.net/project/bordeaux-threads/")
(license license:x11))))
(home-page "https://common-lisp.net/project/bordeaux-threads/")
(license license:x11)))
(define-public cl-bordeaux-threads
(sbcl-package->cl-source-package sbcl-bordeaux-threads))
@ -267,7 +266,7 @@ logical continuation of Stefil. It focuses on interactive debugging.")
(define-public sbcl-flexi-streams
(package
(name "sbcl-flexi-streams")
(version "1.0.16")
(version "1.0.18")
(source
(origin
(method git-fetch)
@ -276,7 +275,7 @@ logical continuation of Stefil. It focuses on interactive debugging.")
(commit (string-append "v" version))))
(file-name (git-file-name "flexi-streams" version))
(sha256
(base32 "0gvykjlmja060zqq6nn6aqxlshh6r6ijahmmgf20q0d839rwpgxc"))))
(base32 "0bjv7fd2acknidc5dyi3h85pn10krxv5jyxs1xg8jya2rlfv7f1j"))))
(build-system asdf-build-system/sbcl)
(arguments
`(#:phases
@ -304,7 +303,7 @@ streams which are similar to string streams.")
(define-public sbcl-cl-ppcre
(package
(name "sbcl-cl-ppcre")
(version "2.0.11")
(version "2.1.1")
(source
(origin
(method git-fetch)
@ -313,7 +312,7 @@ streams which are similar to string streams.")
(commit (string-append "v" version))))
(file-name (git-file-name "cl-ppcre" version))
(sha256
(base32 "0q3iany07vgqm144lw6pj0af2d3vsikpbkwcxr30fci3kzsq4f49"))))
(base32 "0dwvr29diqzcg5n6jvbk2rnd90i05l7n828hhw99khmqd0kz7xsi"))))
(build-system asdf-build-system/sbcl)
(native-inputs `(("flexi-streams" ,sbcl-flexi-streams)))
(synopsis "Portable regular expression library for Common Lisp")
@ -330,32 +329,30 @@ compatible with ANSI-compliant Common Lisp implementations.")
(sbcl-package->ecl-package sbcl-cl-ppcre))
(define sbcl-cl-unicode-base
(let ((revision "1")
(commit "9fcd06fba1ddc9e66aed2f2d6c32dc9b764f03ea"))
(package
(name "sbcl-cl-unicode-base")
(version (string-append "0.1.5-" revision "." (string-take commit 7)))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/edicl/cl-unicode.git")
(commit commit)))
(file-name (string-append "cl-unicode-" version "-checkout"))
(sha256
(base32
"1jicprb5b3bv57dy1kg03572gxkcaqdjhak00426s76g0plmx5ki"))))
(build-system asdf-build-system/sbcl)
(arguments
'(#:asd-file "cl-unicode.asd"
#:asd-system-name "cl-unicode/base"))
(inputs
`(("cl-ppcre" ,sbcl-cl-ppcre)))
(home-page "http://weitz.de/cl-unicode/")
(synopsis "Portable Unicode library for Common Lisp")
(description "CL-UNICODE is a portable Unicode library Common Lisp, which
(package
(name "sbcl-cl-unicode-base")
(version "0.1.6")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/edicl/cl-unicode.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0ykx2s9lqfl74p1px0ik3l2izd1fc9jd1b4ra68s5x34rvjy0hza"))))
(build-system asdf-build-system/sbcl)
(arguments
'(#:asd-file "cl-unicode.asd"
#:asd-system-name "cl-unicode/base"))
(inputs
`(("cl-ppcre" ,sbcl-cl-ppcre)))
(home-page "http://weitz.de/cl-unicode/")
(synopsis "Portable Unicode library for Common Lisp")
(description "CL-UNICODE is a portable Unicode library Common Lisp, which
is compatible with perl. It is pretty fast, thread-safe, and compatible with
ANSI-compliant Common Lisp implementations.")
(license license:bsd-2))))
(license license:bsd-2)))
(define-public sbcl-cl-unicode
(package
@ -629,6 +626,9 @@ from other CLXes around the net.")
`(("sbcl-cl-ppcre" ,sbcl-cl-ppcre)
("sbcl-cl-unicode" ,sbcl-cl-unicode)))))
(define-public ecl-cl-ppcre-unicode
(sbcl-package->ecl-package sbcl-cl-ppcre-unicode))
;; The slynk that users expect to install includes all of slynk's contrib
;; modules. Therefore, we build the base module and all contribs first; then
;; we expose the union of these as `sbcl-slynk'. The following variable
@ -1417,7 +1417,7 @@ In addition to regular Packrat / Parsing Grammar / TDPL features ESRAP supports:
(define-public sbcl-split-sequence
(package
(name "sbcl-split-sequence")
(version "1.4.1")
(version "2.0.0")
(source
(origin
(method git-fetch)
@ -1426,13 +1426,11 @@ In addition to regular Packrat / Parsing Grammar / TDPL features ESRAP supports:
(commit (string-append "v" version))))
(sha256
(base32
"0c3zp6b7fmmp93sfhq112ind4zkld49ycw68z409xpnz3gc0wpf0"))
"0jcpnx21hkfwqj5fvp7kc6pn1qcz9hk7g2s5x8h0349x1j2irln0"))
(file-name (git-file-name "split-sequence" version))))
(build-system asdf-build-system/sbcl)
(arguments
;; TODO: Tests seem to be broken.
;; https://github.com/sharplispers/split-sequence/issues/8
`(#:tests? #f))
(native-inputs
`(("fiveam" ,sbcl-fiveam)))
(synopsis "Member of the Common Lisp Utilities family of programs")
(description
"Splits sequence into a list of subsequences delimited by objects
@ -1570,7 +1568,7 @@ with @command{colorize} support."))))
(define-public sbcl-cl-fad
(package
(name "sbcl-cl-fad")
(version "0.7.5")
(version "0.7.6")
(source
(origin
(method git-fetch)
@ -1579,7 +1577,7 @@ with @command{colorize} support."))))
(commit (string-append "v" version))))
(sha256
(base32
"1l1qmk9z57q84bz5r04sxsksggsnd7dgkxlybzh9imz6ma7sm52m"))
"1gc8i82v6gks7g0lnm54r4prk2mklidv2flm5fvbr0a7rsys0vpa"))
(file-name (string-append "cl-fad" version "-checkout"))))
(build-system asdf-build-system/sbcl)
(inputs
@ -3180,44 +3178,43 @@ Lisp (from GBBopen project).")
(define-public ecl-portable-threada
(sbcl-package->ecl-package sbcl-portable-threads))
(define-public sbcl-usocket-boot0
(define sbcl-usocket-boot0
;; usocket's test rely on usocket-server which depends on usocket itself.
;; We break this cyclic dependency with -boot0 that packages usocket.
(let ((commit "86e7efbfe50101931edf4b67cdcfa7e221ecfde9"))
(package
(name "sbcl-usocket-boot0")
(version (git-version "0.7.1" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/usocket/usocket/")
(commit commit)))
(file-name (git-file-name "usocket" version))
(sha256
(base32
"1lk6ipakrib7kdgzw44hrgmls9akp5pz4h35yynw0k5zwmmq6374"))))
(build-system asdf-build-system/sbcl)
(inputs
`(("split-sequence" ,sbcl-split-sequence)))
(arguments
`(#:tests? #f
#:asd-system-name "usocket"))
(home-page "https://common-lisp.net/project/usocket/")
(synopsis "Universal socket library for Common Lisp (server side)")
(description
"This library strives to provide a portable TCP/IP and UDP/IP socket
(package
(name "sbcl-usocket-boot0")
(version "0.8.3")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/usocket/usocket/")
(commit (string-append "v" version))))
(file-name (git-file-name "usocket" version))
(sha256
(base32
"0x746wr2324l6bn7skqzgkzcbj5kd0zp2ck0c8rldrw0rzabg826"))))
(build-system asdf-build-system/sbcl)
(inputs
`(("split-sequence" ,sbcl-split-sequence)))
(arguments
`(#:tests? #f
#:asd-system-name "usocket"))
(home-page "https://common-lisp.net/project/usocket/")
(synopsis "Universal socket library for Common Lisp (server side)")
(description
"This library strives to provide a portable TCP/IP and UDP/IP socket
interface for as many Common Lisp implementations as possible, while keeping
the abstraction and portability layer as thin as possible.")
(license license:expat))))
(license license:expat)))
(define-public sbcl-usocket-server
(package
(inherit sbcl-usocket-boot0)
(name "sbcl-usocket-server")
(inputs
`(("usocket" ,sbcl-usocket-boot0)
("portable-threads" ,sbcl-portable-threads)))
`(("bordeaux-threads" ,sbcl-bordeaux-threads)
("usocket" ,sbcl-usocket-boot0)))
(arguments
'(#:asd-system-name "usocket-server"))
(synopsis "Universal socket library for Common Lisp (server side)")))
@ -3243,7 +3240,7 @@ the abstraction and portability layer as thin as possible.")
(define-public cl-usocket
(sbcl-package->cl-source-package sbcl-usocket))
(define-public ecl-socket
(define-public ecl-usocket
(sbcl-package->ecl-package sbcl-usocket))
(define-public sbcl-s-xml
@ -3666,45 +3663,45 @@ the format used by the popular compression tool bzip2.")
(sbcl-package->cl-source-package sbcl-chipz))
(define-public sbcl-drakma
(let ((version "2.0.4")
(commit "7647c0ae842ff2058624e53979c7f297760c97a7")
(revision "1"))
(package
(name "sbcl-drakma")
(version (git-version version revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/edicl/drakma.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1c4i9wakhj5pxfyyykxshdmv3180sbkrx6fcyynikmc0jd0rh84r"))))
(build-system asdf-build-system/sbcl)
(inputs
`(("sbcl-puri" ,sbcl-puri)
("sbcl-cl-base64" ,sbcl-cl-base64)
("sbcl-chunga" ,sbcl-chunga)
("sbcl-flexi-streams" ,sbcl-flexi-streams)
("sbcl-cl-ppcre" ,sbcl-cl-ppcre)
("sbcl-chipz" ,sbcl-chipz)
("sbcl-usocket" ,sbcl-usocket)
("sbcl-cl+ssl" ,sbcl-cl+ssl)))
(native-inputs
`(("sbcl-fiveam" ,sbcl-fiveam)))
(home-page "https://edicl.github.io/drakma/")
(synopsis "HTTP client written in Common Lisp")
(description
"Drakma is a full-featured HTTP client implemented in Common Lisp. It
(package
(name "sbcl-drakma")
(version "2.0.7")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/edicl/drakma.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1441idnyif9xzx3ln1p3fg36k2v9h4wasjqrzc8y52j61420qpci"))))
(build-system asdf-build-system/sbcl)
(inputs
`(("sbcl-puri" ,sbcl-puri)
("sbcl-cl-base64" ,sbcl-cl-base64)
("sbcl-chunga" ,sbcl-chunga)
("sbcl-flexi-streams" ,sbcl-flexi-streams)
("sbcl-cl-ppcre" ,sbcl-cl-ppcre)
("sbcl-chipz" ,sbcl-chipz)
("sbcl-usocket" ,sbcl-usocket)
("sbcl-cl+ssl" ,sbcl-cl+ssl)))
(native-inputs
`(("sbcl-fiveam" ,sbcl-fiveam)))
(home-page "https://edicl.github.io/drakma/")
(synopsis "HTTP client written in Common Lisp")
(description
"Drakma is a full-featured HTTP client implemented in Common Lisp. It
knows how to handle HTTP/1.1 chunking, persistent connections, re-usable
sockets, SSL, continuable uploads, file uploads, cookies, and more.")
(license license:bsd-2))))
(license license:bsd-2)))
(define-public cl-drakma
(sbcl-package->cl-source-package sbcl-drakma))
(define-public ecl-drakma
(sbcl-package->ecl-package sbcl-drakma))
(define-public sbcl-hunchentoot
(package
(name "sbcl-hunchentoot")
@ -4105,36 +4102,37 @@ Lisp.")
(sbcl-package->cl-source-package sbcl-fast-http))
(define-public sbcl-static-vectors
(let ((commit "0681eac1f49370cde03e64b077251e8abf47d702")
(revision "1"))
(package
(name "sbcl-static-vectors")
(version (git-version "1.8.3" revision commit))
(source
(origin
(package
(name "sbcl-static-vectors")
(version "1.8.4")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/sionescu/static-vectors.git")
(commit commit)))
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "138nlsq14hv8785ycjm6jw3i6ablhq8vcwys7q09y80arcgrg6r3"))))
(native-inputs
`(("sbcl-fiveam" ,sbcl-fiveam)))
(inputs
`(("sbcl-cffi-grovel" ,sbcl-cffi-grovel)
("sbcl-cffi" ,sbcl-cffi)))
(build-system asdf-build-system/sbcl)
(home-page "http://common-lisp.net/projects/iolib/")
(synopsis "Allocate SIMPLE-ARRAYs in static memory")
(description
"With @code{static-vectors}, you can create vectors allocated in static
(base32 "0qvf9z6bhwhm8n45fjwkm7j8dcb58szfvndky65cyn4lpdval7m1"))))
(native-inputs
`(("sbcl-fiveam" ,sbcl-fiveam)))
(inputs
`(("sbcl-cffi-grovel" ,sbcl-cffi-grovel)
("sbcl-cffi" ,sbcl-cffi)))
(build-system asdf-build-system/sbcl)
(home-page "https://github.com/sionescu/static-vectors")
(synopsis "Allocate SIMPLE-ARRAYs in static memory")
(description
"With @code{static-vectors}, you can create vectors allocated in static
memory.")
(license license:expat))))
(license license:expat)))
(define-public cl-static-vectors
(sbcl-package->cl-source-package sbcl-static-vectors))
(define-public ecl-static-vectors
(sbcl-package->ecl-package sbcl-static-vectors))
(define-public sbcl-marshal
(let ((commit "eff1b15f2b0af2f26f71ad6a4dd5c4beab9299ec")
(revision "1"))
@ -5225,7 +5223,7 @@ decoding routines for IDNA, the International Domain Names in Applications.")
(package
(name "sbcl-swap-bytes")
(build-system asdf-build-system/sbcl)
(version "1.1")
(version "1.2")
(home-page "https://github.com/sionescu/swap-bytes")
(source
(origin
@ -5236,14 +5234,11 @@ decoding routines for IDNA, the International Domain Names in Applications.")
(file-name (git-file-name name version))
(sha256
(base32
"1qysbv0jngdfkv53y874qjhcxc4qi8ixaqq6j8bzxh5z0931wv55"))))
"1hw1v1lw26rifyznpnj1csphha9jgzwpiic16ni3pvs6hcsni9rz"))))
(inputs
`(("trivial-features" ,sbcl-trivial-features)))
(native-inputs
`(("fiveam" ,sbcl-fiveam)))
(arguments
;; TODO: Tests fail, why?
`(#:tests? #f))
(synopsis "Efficient endianness conversion for Common Lisp")
(description "This Common Lisp library provides optimized byte-swapping
primitives. The library can change endianness of unsigned integers of length
@ -5970,6 +5965,42 @@ This package uses fare-quasiquote with named-readtable.")))
(sbcl-package->cl-source-package sbcl-fare-quasiquote-readtable))
;; TODO: Add support for component-less system in asdf-build-system/sbcl.
(define-public sbcl-fare-quasiquote-extras
(package
(inherit sbcl-fare-quasiquote)
(name "sbcl-fare-quasiquote-extras")
(build-system asdf-build-system/sbcl)
(inputs
`(("fare-quasiquote-optima" ,sbcl-fare-quasiquote-optima)
("fare-quasiquote-readtable" ,sbcl-fare-quasiquote-readtable)))
(arguments
`(#:phases
(modify-phases %standard-phases
(replace 'build
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(lib (string-append out "/lib/" (%lisp-type))))
(mkdir-p lib)
(install-file "fare-quasiquote-extras.asd" lib)
#t)))
(add-after 'create-asd-file 'fix-asd-file
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(lib (string-append out "/lib/" (%lisp-type)))
(asd (string-append lib "/fare-quasiquote-extras.asd")))
(substitute* asd
((":class")
"")
(("asdf/bundle:prebuilt-system")
"")
((":components")
"")
(("\\(\\(:compiled-file \"fare-quasiquote-extras--system\"\\)\\)")
"")))
#t)))))
(description "This library combines @code{fare-quasiquote-readtable} and
@code{fare-quasiquote-optima}.")))
(define-public cl-fare-quasiquote-extras
(package
(inherit cl-fare-quasiquote)
@ -5983,7 +6014,7 @@ This package uses fare-quasiquote with named-readtable.")))
@code{fare-quasiquote-optima}.")))
(define-public sbcl-trivia.level0
(let ((commit "902e0c65602bbfe96ae82e679330b3771ddc7603")
(let ((commit "574901ac376ae54c9d37169fd5efab9b3b8fcc63")
(revision "1"))
(package
(name "sbcl-trivia.level0")
@ -5999,7 +6030,7 @@ This package uses fare-quasiquote with named-readtable.")))
(file-name (git-file-name name version))
(sha256
(base32
"11qbab30qqnfy9mx3x9fvgcw1jbvh1qn2cqv3p8xdn2m8981jvhr"))))
"0hf53n71xzr9sjwrxis5fivx3drclf4s39h5ck8vh21ndqj9zvdk"))))
(inputs
`(("alexandria" ,sbcl-alexandria)))
(synopsis "Pattern matching in Common Lisp")
@ -6877,8 +6908,8 @@ compression/decompression using bindings to the lzlib C library.")
(sbcl-package->ecl-package sbcl-lzlib))
(define-public sbcl-chanl
(let ((commit "2362b57550c2c9238cc882d03553aaa1040b7340")
(revision "0"))
(let ((commit "56e90a126c78b39bb621a01585e8d3b985238e8c")
(revision "1"))
(package
(name "sbcl-chanl")
(version (git-version "0.4.1" revision commit))
@ -6891,7 +6922,7 @@ compression/decompression using bindings to the lzlib C library.")
(file-name (git-file-name name version))
(sha256
(base32
"0ag3wz7yrqwp0s5069wwda98z3rrqd25spg8sa8rdqghj084w28w"))))
"0b1cf6c12qx5cy1fw2z42jgh566rp3l8nv5qf0qqc569s7bgmrh4"))))
(build-system asdf-build-system/sbcl)
(native-inputs
`(("fiveam" ,sbcl-fiveam)))
@ -6909,26 +6940,7 @@ threads.")
(sbcl-package->cl-source-package sbcl-chanl))
(define-public ecl-chanl
(let ((base (sbcl-package->ecl-package sbcl-chanl)))
(package
(inherit base)
(arguments
(substitute-keyword-arguments (package-arguments base)
;; The CHANL.ACTORS package uses the :ARGUMENTS option of
;; DEFINE-METHOD-COMBINATION, which is not implemented in ECL yet
;; (see https://gitlab.com/embeddable-common-lisp/ecl/issues/305).
;; So let's disable it for now, as it allows compiling the library
;; and using the rest of it.
((#:phases phases '%standard-phases)
`(modify-phases ,phases
(add-after 'unpack 'disable-chanl-actors
(lambda _
(substitute* "chanl.asd"
(("\\(:file \"actors\"\\)") ""))
#t))))
;; Disable the tests for now, as the SEND-SEQUENCE test seems to
;; never end.
((#:tests? _ #f) #f))))))
(sbcl-package->ecl-package sbcl-chanl))
(define-public sbcl-cl-store
(let ((commit "c787337a16ea8cf8a06227f35933a4ec774746b3")
@ -7181,7 +7193,7 @@ implementation specific equivalent.")
("trivial-garbage" ,sbcl-trivial-garbage)
("bordeaux-threads" ,sbcl-bordeaux-threads)
("named-readtables" ,sbcl-named-readtables)
("fare-quasiquote-extras" ,cl-fare-quasiquote-extras)
("fare-quasiquote-extras" ,sbcl-fare-quasiquote-extras)
("parse-declarations-1.0" ,sbcl-parse-declarations)
("global-vars" ,sbcl-global-vars)
("trivial-file-size" ,sbcl-trivial-file-size)
@ -7543,6 +7555,9 @@ docstrings for your library.")
(define-public cl-documentation-utils
(sbcl-package->cl-source-package sbcl-documentation-utils))
(define-public ecl-documentation-utils
(sbcl-package->ecl-package sbcl-documentation-utils))
(define-public sbcl-form-fiddle
(let ((commit "e0c23599dbb8cff3e83e012f3d86d0764188ad18")
(revision "0"))
@ -10163,3 +10178,415 @@ them as PNG files.")
(define-public ecl-cl-qrencode
(sbcl-package->ecl-package sbcl-cl-qrencode))
(define-public sbcl-hdf5-cffi
(let ((commit "5b5c88f191e470e4fe96b462334e3ce0806eed5c")
(revision "1"))
(package
(name "sbcl-hdf5-cffi")
(version (git-version "1.8.18" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/hdfgroup/hdf5-cffi.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0vda3075423xz83qky998lpac5b04dwfv7bwgh9jq8cs5v0zrxjf"))))
(build-system asdf-build-system/sbcl)
(synopsis "Common Lisp bindings for the HDF5 library")
(description
"@code{hdf5-cffi} is a CFFI wrapper for the HDF5 library.")
(home-page "https://github.com/hdfgroup/hdf5-cffi")
(license (license:non-copyleft
(string-append "https://github.com/HDFGroup/hdf5-cffi/raw/"
commit
"/LICENSE")))
(inputs
`(("cffi" ,sbcl-cffi)
("cffi-grovel" ,sbcl-cffi-grovel)
("hdf5" ,hdf5-1.10)))
(native-inputs
`(("fiveam" ,sbcl-fiveam)))
(arguments
`(#:asd-system-name "hdf5-cffi"
#:asd-file "hdf5-cffi.asd"
#:test-asd-file "hdf5-cffi.test.asd"
;; Tests depend on hdf5-cffi.examples.asd in addition to hdf5-cffi.asd,
;; I don't know if there is a way to tell asdf-build-system to load
;; an additional system first, so tests are disabled.
#:tests? #f
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-paths
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "src/library.lisp"
(("libhdf5.so")
(string-append
(assoc-ref inputs "hdf5")
"/lib/libhdf5.so")))))
(add-after 'unpack 'fix-dependencies
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "hdf5-cffi.asd"
((":depends-on \\(:cffi\\)")
":depends-on (:cffi :cffi-grovel)"))
(substitute* "hdf5-cffi.test.asd"
((":depends-on \\(:cffi :hdf5-cffi")
":depends-on (:cffi :cffi-grovel :hdf5-cffi"))))))))))
(define-public cl-hdf5-cffi
(sbcl-package->cl-source-package sbcl-hdf5-cffi))
(define-public ecl-hdf5-cffi
(sbcl-package->ecl-package sbcl-hdf5-cffi))
(define-public sbcl-cl-randist
(package
(name "sbcl-cl-randist")
(version "0.4.2")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/lvaruzza/cl-randist.git")
(commit "f088a54b540a7adefab7c04094a6103f9edda3d0")))
(file-name (git-file-name name version))
(sha256
(base32
"0l8hyd6nbxb7f50vyxz3rbbm7kgr1fnadc40jywy4xj5vi5kpj5g"))))
(build-system asdf-build-system/sbcl)
(synopsis "Random distributions for Common Lisp")
(description
"Manual translation from C to Common Lisp of some random number
generation functions from the GSL library.")
(home-page "https://github.com/lvaruzza/cl-randist")
(license license:bsd-2)
(arguments
`(#:asd-system-name "cl-randist"
#:asd-file "cl-randist.asd"
#:tests? #f))))
(define-public cl-randist
(sbcl-package->cl-source-package sbcl-cl-randist))
(define-public ecl-cl-randist
(sbcl-package->ecl-package sbcl-cl-randist))
(define-public sbcl-float-features
(package
(name "sbcl-float-features")
(version "1.0.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Shinmera/float-features.git")
(commit "d3ef60181635b0849aa28cfc238053b7ca4644b0")))
(file-name (git-file-name name version))
(sha256
(base32
"0yj419k7n59x6rh3grwr6frgwwyria2il6f7wxpfazm8cskv4lzr"))))
(build-system asdf-build-system/sbcl)
(synopsis "Common Lisp IEEE float portability library")
(description
"Portability library for IEEE float features that are not
covered by the Common Lisp standard.")
(home-page "https://github.com/Shinmera/float-features")
(license license:zlib)
(inputs
`(("documentation-utils" ,sbcl-documentation-utils)))
(arguments
`(#:asd-system-name "float-features"
#:asd-file "float-features.asd"
#:tests? #f))))
(define-public cl-float-features
(sbcl-package->cl-source-package sbcl-float-features))
(define-public ecl-float-features
(sbcl-package->ecl-package sbcl-float-features))
(define-public sbcl-function-cache
(package
(name "sbcl-function-cache")
(version "1.0.3")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/AccelerationNet/function-cache.git")
(commit "6a5ada401e57da2c8abf046f582029926e61fce8")))
(file-name (git-file-name name version))
(sha256
(base32
"000vmd3f5rx5hs9nvphfric0gkzaadns31c6mxaslpv0k7pkrmc6"))))
(build-system asdf-build-system/sbcl)
(synopsis "Function caching / memoization library for Common Lisp")
(description
"A common lisp library that provides extensible function result
caching based on arguments (an expanded form of memoization).")
(home-page "https://github.com/AccelerationNet/function-cache")
(license
(license:non-copyleft
"https://github.com/AccelerationNet/function-cache/blob/master/README.md"))
(inputs
`(("alexandria" ,sbcl-alexandria)
("cl-interpol" ,sbcl-cl-interpol)
("iterate" ,sbcl-iterate)
("symbol-munger" ,sbcl-symbol-munger)
("closer-mop" ,sbcl-closer-mop)))
(arguments
`(#:asd-system-name "function-cache"
#:asd-file "function-cache.asd"
#:tests? #f))))
(define-public cl-function-cache
(sbcl-package->cl-source-package sbcl-function-cache))
(define-public ecl-function-cache
(sbcl-package->ecl-package sbcl-function-cache))
(define-public sbcl-type-r
(let ((commit "83c89e38f2f7a7b16f1012777ecaf878cfa6a267")
(revision "1"))
(package
(name "sbcl-type-r")
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/guicho271828/type-r.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1arsxc2539rg8vbrdirz4xxj1b06mc6g6rqndz7a02g127qvk2sm"))))
(build-system asdf-build-system/sbcl)
(synopsis "Parser interface for Common Lisp built-in compound types")
(description
"Collections of accessor functions and patterns to access
the elements in compound type specifier, e.g. @code{dimensions} in
@code{(array element-type dimensions)}")
(home-page "https://github.com/guicho271828/type-r")
(license license:lgpl3+)
(inputs
`(("trivia" ,sbcl-trivia)
("alexandria" ,sbcl-alexandria)))
(native-inputs
`(("fiveam" ,sbcl-fiveam)))
(arguments
`(#:asd-system-name "type-r"
#:asd-file "type-r.asd"
#:test-asd-file "type-r.test.asd")))))
(define-public cl-type-r
(sbcl-package->cl-source-package sbcl-type-r))
(define-public sbcl-trivialib-type-unify
(let ((commit "62492ebf04db567dcf435ae84c50b7b8202ecf99")
(revision "1"))
(package
(name "sbcl-trivialib-type-unify")
(version (git-version "0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/guicho271828/trivialib.type-unify.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1bkyfzbwv75p50zp8n1n9rh2r29pw3vgz91gmn2gzzkyq3khj1vh"))))
(build-system asdf-build-system/sbcl)
(synopsis "Common Lisp type unification")
(description
"Unifies a parametrized type specifier against an actual type specifier.
Importantly, it handles complicated array-subtypes and number-related types
correctly.")
(home-page "https://github.com/guicho271828/trivialib.type-unify")
(license license:lgpl3+)
(inputs
`(("alexandria" ,sbcl-alexandria)
("trivia" ,sbcl-trivia)
("introspect-environment" ,sbcl-introspect-environment)
("type-r" ,sbcl-type-r)))
(native-inputs
`(("fiveam" ,sbcl-fiveam)))
(arguments
`(#:asd-system-name "trivialib.type-unify"
#:asd-file "trivialib.type-unify.asd"
#:test-asd-file "trivialib.type-unify.test.asd")))))
(define-public cl-trivialib-type-unify
(sbcl-package->cl-source-package sbcl-trivialib-type-unify))
(define-public sbcl-specialized-function
(let ((commit "b96b6afaf8358bf91cc0703e62a5a4ee20d2b7bc")
(revision "1"))
(package
(name "sbcl-specialized-function")
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/numcl/specialized-function.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"12j45ff0n26578vmfbhb9mfbdchw4wy023k0m2ppgl9s0z4bhjaj"))))
(build-system asdf-build-system/sbcl)
(synopsis "Julia-like dispatch for Common Lisp")
(description
"This library is part of NUMCL. It provides a macro
@code{SPECIALIZED} that performs a Julia-like dispatch on the arguments,
lazily compiling a type-specific version of the function from the same
code. The main target of this macro is speed.")
(home-page "https://github.com/numcl/specialized-function")
(license license:lgpl3+)
(inputs
`(("trivia" ,sbcl-trivia)
("alexandria" ,sbcl-alexandria)
("iterate" ,sbcl-iterate)
("lisp-namespace" ,sbcl-lisp-namespace)
("type-r" ,sbcl-type-r)
("trivial-cltl2" ,sbcl-trivial-cltl2)))
(native-inputs
`(("fiveam" ,sbcl-fiveam)))
(arguments
`(#:asd-system-name "specialized-function"
#:asd-file "specialized-function.asd"
#:test-asd-file "specialized-function.test.asd")))))
(define-public cl-specialized-function
(sbcl-package->cl-source-package sbcl-specialized-function))
(define-public sbcl-constantfold
(let ((commit "0ff1d97a3fbcb89264f6a2af6ce62b73e7b421f4")
(revision "1"))
(package
(name "sbcl-constantfold")
(version (git-version "0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/numcl/constantfold.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"153h0569z6bff1qbad0bdssplwwny75l7ilqwcfqfdvzsxf9jh06"))))
(build-system asdf-build-system/sbcl)
(synopsis "Support library for numcl")
(description
"Support library for numcl. Registers a function as an
additional form that is considered as a candidate for a constant.")
(home-page "https://github.com/numcl/constantfold")
(license license:lgpl3+)
(inputs
`(("trivia" ,sbcl-trivia)
("alexandria" ,sbcl-alexandria)
("iterate" ,sbcl-iterate)
("lisp-namespace" ,sbcl-lisp-namespace)))
(native-inputs
`(("fiveam" ,sbcl-fiveam)))
(arguments
`(#:asd-system-name "constantfold"
#:asd-file "constantfold.asd"
#:test-asd-file "constantfold.test.asd")))))
(define-public cl-constantfold
(sbcl-package->cl-source-package sbcl-constantfold))
(define-public sbcl-gtype
(let ((commit "42275e3606242ae91e9c8dfa30c18ced50a35b66")
(revision "1"))
(package
(name "sbcl-gtype")
(version (git-version "0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/numcl/gtype.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1f56dba998v945jcxhha391557n6md1ql25b7icfwwfivhmlaa9b"))))
(build-system asdf-build-system/sbcl)
(synopsis "C++/Julia-like parametric types in Common Lisp")
(description
"Support library for numcl that provides Julia-like runtime parametric
type correctness in Common Lisp. It is based on CLtL2 extensions.")
(home-page "https://github.com/numcl/gtype")
(license license:lgpl3+)
(inputs
`(("trivialib.type-unify" ,sbcl-trivialib-type-unify)
("trivial-cltl2" ,sbcl-trivial-cltl2)
("trivia" ,sbcl-trivia)
("alexandria" ,sbcl-alexandria)
("iterate" ,sbcl-iterate)
("type-r" ,sbcl-type-r)))
(native-inputs
`(("fiveam" ,sbcl-fiveam)))
(arguments
`(#:asd-system-name "gtype"
#:asd-file "gtype.asd"
#:test-asd-file "gtype.test.asd")))))
(define-public cl-gtype
(sbcl-package->cl-source-package sbcl-gtype))
(define-public sbcl-numcl
(let ((commit "1cf7dfa59f763a24a501092870e9c5ee745d0c17")
(revision "1"))
(package
(name "sbcl-numcl")
(version (git-version "0.1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/numcl/numcl.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0i3jby9hf4ii7blivgyza80g0vmjfhk8537i5i7kqqk0i5sdnym2"))))
(build-system asdf-build-system/sbcl)
(synopsis "Numpy clone in Common Lisp")
(description
"This is a Numpy clone in Common Lisp. At the moment the
library is written in pure Common Lisp, focusing more on correctness
and usefulness, not speed. Track the progress at
@url{https://github.com/numcl/numcl/projects/1}.")
(home-page "https://github.com/numcl/numcl")
(license license:lgpl3+)
(inputs
`(("trivia" ,sbcl-trivia)
("alexandria" ,sbcl-alexandria)
("iterate" ,sbcl-iterate)
("lisp-namespace" ,sbcl-lisp-namespace)
("type-r" ,sbcl-type-r)
("constantfold" ,sbcl-constantfold)
("cl-randist" ,sbcl-cl-randist)
("float-features" ,sbcl-float-features)
("function-cache" ,sbcl-function-cache)
("specialized-function" ,sbcl-specialized-function)
("gtype" ,sbcl-gtype)))
(native-inputs
`(("fiveam" ,sbcl-fiveam)))
(arguments
`(#:asd-system-name "numcl"
#:asd-file "numcl.asd"
#:test-asd-file "numcl.test.asd")))))
(define-public cl-numcl
(sbcl-package->cl-source-package sbcl-numcl))

4
gnu/packages/lisp.scm
View File

@ -797,7 +797,7 @@ enough to play the original mainframe Zork all the way through.")
(define-public txr
(package
(name "txr")
(version "230")
(version "232")
(source
(origin
(method git-fetch)
@ -808,7 +808,7 @@ enough to play the original mainframe Zork all the way through.")
(patches (search-patches "txr-shell.patch"))
(sha256
(base32
"1ma6nbqsnl4f8ndh47zzc8n5vzcny66v0z3ndddgm3g0bqaxzjzm"))))
"1vcnask4a1rxrljp4rcbkfihrndkv25l256l125vv39gjhf315xp"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags '("cc=gcc")

171
gnu/packages/lua.scm
View File

@ -10,6 +10,7 @@
;;; Copyright © 2016 José Miguel Sánchez García <jmi2k@openmailbox.org>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Fis Trivial <ybbs.daans@hotmail.com>
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;;
;;; This file is part of GNU Guix.
;;;
@ -34,6 +35,7 @@
#:use-module (guix utils)
#:use-module (guix build-system gnu)
#:use-module (guix build-system cmake)
#:use-module (guix build-system trivial)
#:use-module (gnu packages)
#:use-module (gnu packages readline)
#:use-module (gnu packages tls)
@ -338,40 +340,130 @@ secure session between the peers.")
(define-public lua5.2-sec
(make-lua-sec "lua5.2-sec" lua-5.2))
(define-public lua-lgi
(define-public lua-penlight
(package
(name "lua-lgi")
(version "0.9.2")
(name "lua-penlight")
(version "1.7.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/pavouk/lgi")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"03rbydnj411xpjvwsyvhwy4plm96481d7jax544mvk7apd8sd5jj"))))
(build-system gnu-build-system)
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Tieske/Penlight.git")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0qc2d1riyr4b5a0gnsmdw2lz5pw65s4ac60hc34w3mmk9l6yg6nl"))))
(build-system trivial-build-system)
(inputs
`(("lua" ,lua)))
(propagated-inputs
`(("lua-filesystem" ,lua-filesystem)))
(arguments
'(#:make-flags (list "CC=gcc"
(string-append "PREFIX=" (assoc-ref %outputs "out")))
`(#:modules ((guix build utils))
#:builder
(begin
(use-modules (guix build utils))
(let* ((source (assoc-ref %build-inputs "source"))
(lua-version ,(version-major+minor (package-version lua)))
(destination (string-append (assoc-ref %outputs "out")
"/share/lua/" lua-version)))
(mkdir-p destination)
(with-directory-excursion source
(copy-recursively "lua/" destination)))
#t)))
(home-page "http://tieske.github.io/Penlight/")
(synopsis "Collection of general purpose libraries for the Lua language")
(description "Penlight is a set of pure Lua libraries focusing on
input data handling (such as reading configuration files), functional
programming (such as map, reduce, placeholder expressions,etc), and OS
path management. Much of the functionality is inspired by the Python
standard libraries.")
(license license:expat)))
(define-public lua-ldoc
(package
(name "lua-ldoc")
(version "1.4.6")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/stevedonovan/LDoc.git")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1h0cf7bp4am54r0j8lhjs2l1c7q5vz74ba0jvw9qdbaqimls46g8"))))
(build-system gnu-build-system)
(inputs
`(("lua" ,lua)))
(propagated-inputs
`(("lua-penlight" ,lua-penlight)))
(arguments
`(#:tests? #f ;tests must run after installation.
#:phases
(modify-phases %standard-phases
(delete 'configure) ; no configure script
(add-after 'unpack 'fix-installation-directory
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(lua-version ,(version-major+minor (package-version lua))))
(substitute* "makefile"
(("LUA=.*") "#\n")
(("(LUA_PREFIX=).*" _ prefix)
(string-append prefix out "\n"))
(("(LUA_BINDIR=).*" _ prefix)
(string-append prefix out "/bin\n"))
(("(LUA_SHAREDIR=).*" _ prefix)
(string-append prefix out "/share/lua/" lua-version "\n"))))
#t))
(delete 'configure)
(add-before 'install 'create-bin-directory
(lambda* (#:key outputs #:allow-other-keys)
(mkdir-p (string-append (assoc-ref outputs "out") "/bin"))
#t)))))
(home-page "http://stevedonovan.github.io/ldoc/")
(synopsis "Lua documentation generator")
(description
"LDoc is a LuaDoc-compatible documentation generation system for
Lua source code. It parses the declaration and documentation comments
in a set of Lua source files and produces a set of XHTML pages
describing the commented declarations and functions.")
(license license:expat)))
(define (make-lua-lgi name lua)
(package
(name name)
(version "0.9.2")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/pavouk/lgi")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "03rbydnj411xpjvwsyvhwy4plm96481d7jax544mvk7apd8sd5jj"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags
(list "CC=gcc"
(string-append "PREFIX=" (assoc-ref %outputs "out")))
#:phases
(modify-phases %standard-phases
(delete 'configure) ; no configure script
(add-before 'build 'set-env
(lambda* (#:key inputs #:allow-other-keys)
;; we need to load cairo dynamically
(let* ((cairo (string-append
(assoc-ref inputs "cairo") "/lib" )))
;; We need to load cairo dynamically.
(let* ((cairo (string-append (assoc-ref inputs "cairo") "/lib")))
(setenv "LD_LIBRARY_PATH" cairo)
#t)))
(add-before 'build 'set-lua-version
(lambda _
;; lua version and therefore install directories are hardcoded
;; FIXME: This breaks when we update lua to >=5.3
;; Lua version and therefore install directories are hardcoded.
(substitute* "./lgi/Makefile"
(("LUA_VERSION=5.1") "LUA_VERSION=5.2"))
(("LUA_VERSION=5.1")
(format #f
"LUA_VERSION=~a"
,(version-major+minor (package-version lua)))))
#t))
(add-before 'check 'skip-test-gtk
(lambda _
@ -392,26 +484,35 @@ secure session between the peers.")
(assoc-ref inputs "xorg-server")))
(setenv "DISPLAY" ":1")
#t)))))
(inputs
`(("gobject-introspection" ,gobject-introspection)
("glib" ,glib)
("pango" ,pango)
("gtk" ,gtk+-2)
("lua" ,lua)
("cairo" ,cairo)
("libffi" ,libffi)
("xorg-server" ,xorg-server)))
(native-inputs
`(("pkg-config" ,pkg-config)
("dbus" ,dbus))) ;tests use 'dbus-run-session'
`(("dbus" ,dbus) ;tests use 'dbus-run-session'
("pkg-config" ,pkg-config)))
(inputs
`(("cairo" ,cairo)
("glib" ,glib)
("gobject-introspection" ,gobject-introspection)
("gtk" ,gtk+-2)
("libffi" ,libffi)
("lua" ,lua)
("pango" ,pango)
("xorg-server" ,xorg-server)))
(home-page "https://github.com/pavouk/lgi/")
(synopsis "Lua bridge to GObject based libraries")
(description
"LGI is gobject-introspection based dynamic Lua binding to GObject
based libraries. It allows using GObject-based libraries directly from Lua.
"LGI is gobject-introspection based dynamic Lua binding to GObject based
libraries. It allows using GObject-based libraries directly from Lua.
Notable examples are GTK+, GStreamer and Webkit.")
(license license:expat)))
(define-public lua-lgi
(make-lua-lgi "lua-lgi" lua))
(define-public lua5.1-lgi
(make-lua-lgi "lua5.1-lgi" lua-5.1))
(define-public lua5.2-lgi
(make-lua-lgi "lua5.2-lgi" lua-5.2))
(define (make-lua-lpeg name lua)
(package
(name name)

2
gnu/packages/lxde.scm
View File

@ -281,7 +281,7 @@ with freedesktop.org standard.")
(string-append "--sysconfdir="
(assoc-ref %outputs "out")
"/etc"))))
(home-page "http://ignorantguru.github.io/spacefm/")
(home-page "https://ignorantguru.github.io/spacefm/")
(synopsis "Multi-panel tabbed file manager")
(description "SpaceFM is a graphical, multi-panel, tabbed file manager
based on PCManFM with built-in virtual file system, udev-based device manager,

10
gnu/packages/lxqt.scm
View File

@ -8,6 +8,7 @@
;;; Copyright © 2018, 2019 Meiyo Peng <meiyo@riseup.net>
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019, 2020 Reza Alizadeh Majd <r.majd@pantherx.org>
;;; Copyright © 2020 Fakhri Sajadi <f.sajadi@pantherx.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -379,6 +380,7 @@ the operating system LXQt is running on.")
("qtx11extras" ,qtx11extras)
("solid" ,solid)
("xf86-input-libinput" ,xf86-input-libinput)
("xkeyboard-config" ,xkeyboard-config)
("zlib" ,zlib)))
(native-inputs
`(("pkg-config" ,pkg-config)
@ -394,6 +396,14 @@ the operating system LXQt is running on.")
(("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}")
"DESTINATION \"etc/xdg"))
#t))
(add-after 'unpack 'set-xkeyboard-config-file-name
(lambda* (#:key inputs #:allow-other-keys)
;; Set the file name to xkeyboard-config.
(let ((xkb (assoc-ref inputs "xkeyboard-config")))
(substitute* "lxqt-config-input/keyboardlayoutconfig.h"
(("/usr/share/X11/xkb/rules/base.lst")
(string-append xkb "/share/X11/xkb/rules/base.lst")))
#t)))
(add-after 'unpack 'patch-translations-dir
(lambda* (#:key outputs #:allow-other-keys)
(substitute* '("lxqt-config-file-associations/CMakeLists.txt"

11
gnu/packages/mail.scm
View File

@ -397,9 +397,11 @@ aliasing facilities to work just as they would on normal mail.")
`(("cyrus-sasl" ,cyrus-sasl)
("gdbm" ,gdbm)
("gpgme" ,gpgme)
("libidn2" ,libidn2)
("ncurses" ,ncurses)
("openssl" ,openssl)
("perl" ,perl)))
("perl" ,perl)
("sqlite" ,sqlite)))
(arguments
`(#:configure-flags '("--enable-smtp"
"--enable-imap"
@ -407,8 +409,11 @@ aliasing facilities to work just as they would on normal mail.")
"--enable-gpgme"
"--enable-hcache" ; for header caching
"--enable-sidebar"
"--enable-autocrypt"
"--with-ssl"
"--with-sasl"
"--with-sqlite3" ; required for Autocrypt
"--with-idn2" ; recommended for Autocrypt
;; so that mutt does not check whether the path
;; exists, which it does not in the chroot
"--with-mailpath=/var/mail")))
@ -2301,14 +2306,14 @@ transfer protocols.")
(define-public opensmtpd
(package
(name "opensmtpd")
(version "6.6.2p1")
(version "6.6.3p1")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.opensmtpd.org/archives/"
"opensmtpd-" version ".tar.gz"))
(sha256
(base32 "16nz2n4s3djlasd6m6dqfwggf6igyfxzq5igny5i0qb8lnn13f33"))))
(base32 "1dqysjlyl0x3qzdzc9sjrla0063vpmlyq735lzf88p7wgzmw1xwy"))))
(build-system gnu-build-system)
(inputs
`(("bdb" ,bdb)

6
gnu/packages/man.scm
View File

@ -4,7 +4,7 @@
;;; Copyright © 2015, 2016 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015 Alex Kost <alezost@gmail.com>
;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018, 2019 Marius Bakke <mbakke@fastmail.com>
;;;
@ -162,7 +162,7 @@ the traditional flat-text whatis databases.")
(define-public man-pages
(package
(name "man-pages")
(version "5.04")
(version "5.05")
(source
(origin
(method url-fetch)
@ -172,7 +172,7 @@ the traditional flat-text whatis databases.")
(string-append "mirror://kernel.org/linux/docs/man-pages/Archive/"
"man-pages-" version ".tar.xz")))
(sha256
(base32 "1bx4ws24bjq6iyfyilg7aih5f0qrhy9l97ksrwcd4yxvjh8gn13x"))))
(base32 "0izb6shcczvg37cyd3kzxsfsrffqj1qw9nqhhq9mi4kd36qkbcfm"))))
(build-system gnu-build-system)
(arguments
'(#:phases (modify-phases %standard-phases (delete 'configure))

6
gnu/packages/maths.scm
View File

@ -74,6 +74,7 @@
#:use-module (gnu packages compression)
#:use-module (gnu packages curl)
#:use-module (gnu packages cyrus-sasl)
#:use-module (gnu packages dbm)
#:use-module (gnu packages documentation)
#:use-module (gnu packages elf)
#:use-module (gnu packages flex)
@ -1491,7 +1492,7 @@ can solve two kinds of problems:
(define-public octave-cli
(package
(name "octave-cli")
(version "5.1.0")
(version "5.2.0")
(source
(origin
(method url-fetch)
@ -1499,11 +1500,12 @@ can solve two kinds of problems:
version ".tar.lz"))
(sha256
(base32
"11wwxpy2q1bhxs2v41bqn05i2sb0905cj1xil6mg8l4k2kka4cq6"))))
"1848dq6nxzal8gwjrcp6xhi5gq96w89nss9d9rz75q408gb3mbl6"))))
(build-system gnu-build-system)
(inputs
`(("alsa-lib" ,alsa-lib)
("arpack" ,arpack-ng)
("bdb" ,bdb)
("curl" ,curl)
("fftw" ,fftw)
("fftwf" ,fftwf)

2
gnu/packages/messaging.scm
View File

@ -1816,7 +1816,7 @@ QMatrixClient project.")
(synopsis "Graphical client for the Matrix instant messaging protocol")
(description "Quaternion is a Qt5 desktop client for the Matrix instant
messaging protocol. It uses libqmatrixclient and is its reference client
implementation. Quaternion and libqmatriclient together form the
implementation. Quaternion and libqmatrixclient together form the
QMatrixClient project.")
(license (list license:gpl3+ ; all source code
license:lgpl3+)))) ; icons/breeze

29
gnu/packages/music.scm
View File

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2019 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
;;; Copyright © 2016 Al McElrath <hello@yrns.org>
;;; Copyright © 2016, 2017, 2019 Efraim Flashner <efraim@flashner.co.il>
@ -21,7 +21,7 @@
;;; Copyright © 2018 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;; Copyright © 2019 Gabriel Hondet <gabrielhondet@gmail.com>
;;; Copyright © 2019 Timotej Lazar <timotej.lazar@araneo.si>
;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.lonestar.org>
;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.org>
;;; Copyright © 2019 raingloom <raingloom@protonmail.com>
;;; Copyright © 2019 David Wilson <david@daviwil.com>
;;; Copyright © 2019, 2020 Alexandros Theodotou <alex@zrythm.org>
@ -2213,7 +2213,7 @@ capabilities, custom envelopes, effects, etc.")
(define-public yoshimi
(package
(name "yoshimi")
(version "1.6.1")
(version "1.7.0.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/yoshimi/"
@ -2221,7 +2221,7 @@ capabilities, custom envelopes, effects, etc.")
"/yoshimi-" version ".tar.bz2"))
(sha256
(base32
"1shnz429zgl0b4y5bpb61frk1747jwqfahq4hx44c972580zghzh"))))
"1pkqrrr51vlxh96vy0c0rf5ijjvymys4brsw9rv1bdp1bb8izw6c"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; there are no tests
@ -2999,7 +2999,7 @@ using the beets FetchArt plugin.")
module files. It attempts to recreate the module replay and user experience of
the popular DOS program Fasttracker II, with special playback modes available
for improved Amiga ProTracker 2/3 compatibility.")
(home-page "http://milkytracker.titandemo.org/")
(home-page "https://milkytracker.titandemo.org/")
;; 'src/milkyplay' is under Modified BSD, the rest is under GPL3 or later.
(license (list license:bsd-3 license:gpl3+))))
@ -3878,7 +3878,7 @@ audio samples and various soft sythesizers. It can receive input from a MIDI ke
(define-public musescore
(package
(name "musescore")
(version "3.4.1")
(version "3.4.2")
(source
(origin
(method git-fetch)
@ -3887,7 +3887,7 @@ audio samples and various soft sythesizers. It can receive input from a MIDI ke
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "16rx4x0czhwjg8vppcc7iw0cvii9q2l730cqhmhvip9r8wwamsvj"))
(base32 "14a9sg87nx7xca1qfbkplnpbx9pyg9k9vy87dq0g401ag6g6bi66"))
(modules '((guix build utils)))
(snippet
;; Un-bundle OpenSSL and remove unused libraries.
@ -3927,6 +3927,7 @@ audio samples and various soft sythesizers. It can receive input from a MIDI ke
("pulseaudio" ,pulseaudio)
("qtbase" ,qtbase)
("qtdeclarative" ,qtdeclarative)
("qtquickcontrols2" ,qtquickcontrols2)
("qtscript" ,qtscript)
("qtsvg" ,qtsvg)
("qtxmlpatterns" ,qtxmlpatterns)))
@ -5142,7 +5143,7 @@ and as an LV2 plugin.")
(define-public zrythm
(package
(name "zrythm")
(version "0.7.345")
(version "0.7.474")
(source
(origin
(method url-fetch)
@ -5150,13 +5151,21 @@ and as an LV2 plugin.")
version ".tar.xz"))
(sha256
(base32
"1csiwq38a1ckx23lairfpl7qjkz71wsa7a9vsxl3k58f9ybibiil"))))
"0qq9v8y27zhamcb7nq7pl76874ws8x8cxhp5r685b8binvl9p0az"))))
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t
#:configure-flags
`("-Denable_tests=true" "-Dmanpage=true"
"-Dinstall_dseg_font=false" "-Denable_ffmpeg=true")))
"-Dinstall_dseg_font=false" "-Denable_ffmpeg=true")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-xdg-open
(lambda _
(substitute* "src/utils/io.c"
(("OPEN_DIR_CMD")
(string-append "\"" (which "xdg-open") "\"")))
#t)))))
(inputs
`(("alsa-lib" ,alsa-lib)
("jack" ,jack-1)

2
gnu/packages/musl.scm
View File

@ -44,7 +44,7 @@
(synopsis "Small C standard library")
(description "musl is a simple and lightweight C standard library. It
strives to be correct in the sense of standards-conformance and safety.")
(home-page "https://www.musl-libc.org")
(home-page "https://musl.libc.org")
;; Musl as a whole is released under the Expat license. Parts of it are
;; derived from various third-party projects that are released under
;; non-copyleft licenses. See the COPYRIGHT file for details.

6
gnu/packages/nano.scm
View File

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Rene Saavedra <rennes@openmailbox.org>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
@ -30,13 +30,13 @@
(define-public nano
(package
(name "nano")
(version "4.7")
(version "4.8")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://gnu/nano/nano-" version ".tar.xz"))
(sha256
(base32 "1x9nqy2kgaz6087p63i71gdjsqbdc9jjpx1ymlyclfakvsby3h2q"))))
(base32 "0qwf4ld0fl2bpnjh23z2pq7wcs6d14m2364360xmf7dbd0fgcj63"))))
(build-system gnu-build-system)
(inputs
`(("gettext" ,gettext-minimal)

83
gnu/packages/networking.scm
View File

@ -36,6 +36,8 @@
;;; Copyright © 2019 Jan Wielkiewicz <tona_kosmicznego_smiecia@interia.pl>
;;; Copyright © 2019 Daniel Schaefer <git@danielschaefer.me>
;;; Copyright © 2019 Diego N. Barbato <dnbarbato@posteo.de>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
;;;
;;; This file is part of GNU Guix.
;;;
@ -64,6 +66,7 @@
#:use-module (guix build-system perl)
#:use-module (guix build-system python)
#:use-module (guix build-system trivial)
#:use-module (guix utils)
#:use-module (gnu packages)
#:use-module (gnu packages admin)
#:use-module (gnu packages adns)
@ -2824,6 +2827,43 @@ easy-to-understand binary values.")
(home-page "http://jodies.de/ipcalc")
(license license:gpl2+)))
(define-public tunctl
(package
(name "tunctl")
(version "1.5")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/tunctl/tunctl/" version "/"
"tunctl-" version ".tar.gz"))
(sha256
(base32 "1zsgn7w6l2zh2q0j6qaw8wsx981qcr536qlz1lgb3b5zqr66qama"))))
(build-system gnu-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(delete 'bootstrap) ;there is no configure.ac file
(delete 'configure) ;there is no configure script
(delete 'check) ;there are no tests
(replace 'build
(lambda _
(setenv "CC" "gcc")
(invoke "make" "tunctl")))
;; TODO: Requires docbook2x to generate man page from SGML.
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin")))
(install-file "tunctl" bin))
#t)))))
(home-page "http://tunctl.sourceforge.net")
(synopsis "Utility to set up and maintain TUN/TAP network interfaces")
(description "Tunctl is used to set up and maintain persistent TUN/TAP
network interfaces, enabling user applications to simulate network traffic.
Such interfaces are useful for VPN software, virtualization, emulation,
simulation, and a number of other applications.")
(license license:gpl2)))
(define-public vde2
(package
(name "vde2")
@ -2853,3 +2893,46 @@ cables.")
(license:non-copyleft ; slirpvde
"file://COPYING.slirpvde"
"See COPYING.slirpvde in the distribution.")))))
(define-public haproxy
(package
(name "haproxy")
(version "2.1.3")
(source (origin
(method url-fetch)
(uri (string-append "https://www.haproxy.org/download/"
(version-major+minor version)
"/src/haproxy-" version ".tar.gz"))
(sha256
(base32
"0n8bw3d6gikr8c56ycrvksp1sl0b4yfzp19867cxkl3l0daqwrxv"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags
(let* ((out (assoc-ref %outputs "out")))
(list (string-append "PREFIX=" out)
(string-append "DOCDIR=" out "/share/" ,name)
"TARGET=linux-glibc"
"USE_LUA=1"
"USE_OPENSSL=1"
"USE_ZLIB=1"
"USE_PCRE_2=1"))
#:tests? #f ; there are only regression tests, using varnishtest
#:phases
(modify-phases %standard-phases
(delete 'configure))))
(inputs
`(("lua" ,lua)
("openssl" ,openssl)
("pcre2" ,pcre2)
("zlib" ,zlib)))
(home-page "https://www.haproxy.org/")
(synopsis "Reliable, high performance TCP/HTTP load balancer")
(description "HAProxy is a free, very fast and reliable solution offering
high availability, load balancing, and proxying for TCP and HTTP-based
applications. It is particularly suited for web sites crawling under very
high loads while needing persistence or Layer7 processing. Supporting tens of
thousands of connections is clearly realistic with today's hardware.")
(license (list license:gpl2+
license:lgpl2.1
license:lgpl2.1+))))

4
gnu/packages/node.scm
View File

@ -117,6 +117,10 @@
;; This requires a DNS resolver.
(delete-file "test/parallel/test-dns.js")
;; FIXME: This test fails randomly:
;; https://github.com/nodejs/node/issues/31213
(delete-file "test/parallel/test-net-listen-after-destroying-stdin.js")
;; These tests have an expiry date: they depend on the validity of
;; TLS certificates that are bundled with the source. We want this
;; package to be reproducible forever, so remove those.

91
gnu/packages/opencl.scm
View File

@ -20,6 +20,7 @@
(define-module (gnu packages opencl)
#:use-module (guix build-system gnu)
#:use-module (guix build-system cmake)
#:use-module (guix build-system python)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:)
@ -35,6 +36,7 @@
#:use-module (gnu packages ncurses)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages ruby)
#:use-module (gnu packages video)
#:use-module (gnu packages xdisorg)
@ -342,3 +344,92 @@ implementation, and as a portability layer. Thus, if your desired target has
an LLVM backend, it should be able to get OpenCL support easily by using
pocl.")
(license license:expat)))
(define-public python-pytools
(package
(name "python-pytools")
(version "2020.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pytools" version))
(sha256
(base32
"19h47pqfrq7ax7601i5g8icpb6b42h8zzwq0dqfdcjjqamwd2cn1"))))
(build-system python-build-system)
(propagated-inputs
`(("python-appdirs" ,python-appdirs)
("python-decorator" ,python-decorator)
("python-numpy" ,python-numpy)
("python-six" ,python-six)
("python-mpi4py" ,python-mpi4py)))
(home-page "https://pypi.org/project/pytools/")
(synopsis "Assorted tools for Python")
(description
"Pytools is a bag of things that are ``missing'' from the Python standard
library:
@itemize
@item
small helper functions such as @code{len_iterable}, @code{argmin},
tuple generation, permutation generation, ASCII table pretty printing,
GvR's @code{monkeypatch_xxx} hack, the elusive @code{flatten}, and much more.
@item
Michele Simionato's decorator module
@item
A time-series logging module, @code{pytools.log}.
@item
Batch job submission, @code{pytools.batchjob}.
@item
A lexer, @code{pytools.lex}.
@end itemize\n")
(license license:expat)))
(define-public python-pyopencl
(package
(name "python-pyopencl")
(version "2019.1.1")
(source
(origin
;; The tarball on PyPI lacks test programs such as
;; 'pygpu_language_opencl.cpp' so fetch it from Git.
;; XXX: The server at git.tiker.net is unreliable.
(method git-fetch)
(uri (git-reference
(url "http://git.tiker.net/trees/pyopencl.git")
(commit (string-append "v" version))
(recursive? #t)))
(file-name (git-file-name name version))
(sha256
(base32
"12q0rs8yla571vcfpsh0mfrjbdiayv0hi8r1rq0f178m3i3qjz80"))))
(build-system python-build-system)
(arguments
'(#:phases (modify-phases %standard-phases
(add-before 'build 'set-home
(lambda _
;; Some of the Python build scripts expect 'HOME' to be
;; set.
(setenv "HOME" (getcwd))
#t)))
;; Tests in 'compyte/ndarray/setup_opencl.py' appear to rely on
;; 'nvcc', which is not an option.
#:tests? #f))
(inputs
`(("opencl-headers" ,opencl-headers-1.2) ;POCL only supports OpenCL 1.2
("pybind11" ,pybind11)
("ocl-icd" ,ocl-icd))) ;libOpenCL
(propagated-inputs
`(("python-appdirs" ,python-appdirs)
("python-decorator" ,python-decorator)
("python-numpy" ,python-numpy)
("python-pytools" ,python-pytools)
("python-six" ,python-six)
("python-mako" ,python-mako)))
(home-page "http://mathema.tician.de/software/pyopencl")
(synopsis "Python wrapper for OpenCL")
(description
"PyOpenCL lets you access parallel computing devices such as GPUs from
Python @i{via} OpenCL.")
(license license:expat)))

6
gnu/packages/parallel.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2013, 2014, 2020 Eric Bavier <bavier@posteo.net>
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Pjotr Prins <pjotr.guix@thebird.nl>
@ -54,14 +54,14 @@
(define-public parallel
(package
(name "parallel")
(version "20191222")
(version "20200122")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://gnu/parallel/parallel-"
version ".tar.bz2"))
(sha256
(base32 "0xvw578440s9cc382n7z2l8npj30nwr6wwmkyxn2pj1pcszfjagy"))))
(base32 "070cv3b1ja8lmn2a5h1ry6b5y35jpm4z5r9yv9nb5kd5im11wvqi"))))
(build-system gnu-build-system)
(arguments
`(#:phases

15
gnu/packages/password-utils.scm
View File

@ -25,6 +25,7 @@
;;; Copyright © 2019 Jens Mølgaard <jens@zete.tk>
;;; Copyright © 2019 Tanguy Le Carrour <tanguy@bioneland.org>
;;; Copyright © 2020 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
;;;
;;; This file is part of GNU Guix.
;;;
@ -497,17 +498,11 @@ any X11 window.")
"sed" "tree" "which" "xclip"))))
(wrap-program (string-append out "/bin/pass")
`("PATH" ":" prefix (,(string-join path ":"))))
#t)))
(add-after 'wrap-path 'install-shell-completions
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bashcomp (string-append out "/etc/bash_completion.d")))
;; TODO: install fish and zsh completions.
(mkdir-p bashcomp)
(copy-file "src/completion/pass.bash-completion"
(string-append bashcomp "/pass"))
#t))))
#:make-flags (list "CC=gcc" (string-append "PREFIX=" %output))
#:make-flags (list "CC=gcc" (string-append "PREFIX=" %output)
"WITH_ALLCOMP=yes"
(string-append "BASHCOMPDIR="
%output "/etc/bash_completion.d"))
;; Parallel tests may cause a race condition leading to a
;; timeout in some circumstances.
#:parallel-tests? #f

67
gnu/packages/patches/docker-adjust-tests-for-changes-in-go.patch
View File

@ -1,67 +0,0 @@
From 4983ef7c1693ad6dfbe4e3809b12541241d7ff56 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Wed, 14 Aug 2019 02:51:08 +0200
Subject: [PATCH] Adjust tests for changes in Go 1.12.8 / 1.11.13
```
00:38:11 === Failed
00:38:11 === FAIL: opts TestParseDockerDaemonHost (0.00s)
00:38:11 hosts_test.go:87: tcp tcp:a.b.c.d address expected error "Invalid bind address format: tcp:a.b.c.d" return, got "parse tcp://tcp:a.b.c.d: invalid port \":a.b.c.d\" after host" and addr
00:38:11 hosts_test.go:87: tcp tcp:a.b.c.d/path address expected error "Invalid bind address format: tcp:a.b.c.d/path" return, got "parse tcp://tcp:a.b.c.d/path: invalid port \":a.b.c.d\" after host" and addr
00:38:11
00:38:11 === FAIL: opts TestParseTCP (0.00s)
00:38:11 hosts_test.go:129: tcp tcp:a.b.c.d address expected error Invalid bind address format: tcp:a.b.c.d return, got parse tcp://tcp:a.b.c.d: invalid port ":a.b.c.d" after host and addr
00:38:11 hosts_test.go:129: tcp tcp:a.b.c.d/path address expected error Invalid bind address format: tcp:a.b.c.d/path return, got parse tcp://tcp:a.b.c.d/path: invalid port ":a.b.c.d" after host and addr
```
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 683766613a8c1dca8f95b19ddb7e083bb3aef266
Component: engine
---
opts/hosts_test.go | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/opts/hosts_test.go b/opts/hosts_test.go
index 8c54ec0f4b..7a0a943adf 100644
--- a/opts/hosts_test.go
+++ b/opts/hosts_test.go
@@ -53,8 +53,8 @@ func TestParseHost(t *testing.T) {
func TestParseDockerDaemonHost(t *testing.T) {
invalids := map[string]string{
- "tcp:a.b.c.d": "Invalid bind address format: tcp:a.b.c.d",
- "tcp:a.b.c.d/path": "Invalid bind address format: tcp:a.b.c.d/path",
+ "tcp:a.b.c.d": "",
+ "tcp:a.b.c.d/path": "",
"udp://127.0.0.1": "Invalid bind address format: udp://127.0.0.1",
"udp://127.0.0.1:2375": "Invalid bind address format: udp://127.0.0.1:2375",
"tcp://unix:///run/docker.sock": "Invalid proto, expected tcp: unix:///run/docker.sock",
@@ -83,7 +83,7 @@ func TestParseDockerDaemonHost(t *testing.T) {
"localhost:5555/path": "tcp://localhost:5555/path",
}
for invalidAddr, expectedError := range invalids {
- if addr, err := parseDaemonHost(invalidAddr); err == nil || err.Error() != expectedError {
+ if addr, err := parseDaemonHost(invalidAddr); err == nil || expectedError != "" && err.Error() != expectedError {
t.Errorf("tcp %v address expected error %q return, got %q and addr %v", invalidAddr, expectedError, err, addr)
}
}
@@ -99,8 +99,8 @@ func TestParseTCP(t *testing.T) {
defaultHTTPHost = "tcp://127.0.0.1:2376"
)
invalids := map[string]string{
- "tcp:a.b.c.d": "Invalid bind address format: tcp:a.b.c.d",
- "tcp:a.b.c.d/path": "Invalid bind address format: tcp:a.b.c.d/path",
+ "tcp:a.b.c.d": "",
+ "tcp:a.b.c.d/path": "",
"udp://127.0.0.1": "Invalid proto, expected tcp: udp://127.0.0.1",
"udp://127.0.0.1:2375": "Invalid proto, expected tcp: udp://127.0.0.1:2375",
}
@@ -125,7 +125,7 @@ func TestParseTCP(t *testing.T) {
"localhost:5555/path": "tcp://localhost:5555/path",
}
for invalidAddr, expectedError := range invalids {
- if addr, err := ParseTCPAddr(invalidAddr, defaultHTTPHost); err == nil || err.Error() != expectedError {
+ if addr, err := ParseTCPAddr(invalidAddr, defaultHTTPHost); err == nil || expectedError != "" && err.Error() != expectedError {
t.Errorf("tcp %v address expected error %v return, got %s and addr %v", invalidAddr, expectedError, err, addr)
}
}

23
gnu/packages/patches/docker-engine-test-noinstall.patch
View File

@ -1,23 +0,0 @@
Last-Update: 2018-06-18
Forwarded: not-needed
Author: Dmitry Smirnov <onlyjob@debian.org>
Description: prevents test-time installation that causes FTBFS.
~~~~
go test net: open /usr/lib/go-1.10/pkg/linux_amd64/net.a: permission denied
~~~~
--- a/hack/test/unit
+++ b/hack/test/unit
@@ -18,12 +18,8 @@
exclude_paths="/vendor/|/integration"
pkg_list=$(go list $TESTDIRS | grep -vE "($exclude_paths)")
-# install test dependencies once before running tests for each package. This
-# significantly reduces the runtime.
-go test -i "${BUILDFLAGS[@]}" $pkg_list
-
for pkg in $pkg_list; do
go test "${BUILDFLAGS[@]}" \
-cover \
-coverprofile=profile.out \

137
gnu/packages/patches/docker-use-fewer-modprobes.patch
View File

@ -1,137 +0,0 @@
This patch makes docker find out whether a filesystem type is supported
by trying to mount a filesystem of that type rather than invoking "modprobe".
See <https://github.com/moby/moby/pull/38930>.
--- docker-18.09.0-checkout/daemon/graphdriver/overlay/overlay.go.orig 1970-01-01 01:00:00.000000000 +0100
+++ docker-18.09.0-checkout/daemon/graphdriver/overlay/overlay.go 2019-03-19 09:16:03.487087490 +0100
@@ -8,7 +8,6 @@
"io"
"io/ioutil"
"os"
- "os/exec"
"path"
"path/filepath"
"strconv"
@@ -201,9 +200,16 @@
}
func supportsOverlay() error {
- // We can try to modprobe overlay first before looking at
- // proc/filesystems for when overlay is supported
- exec.Command("modprobe", "overlay").Run()
+ // Access overlay filesystem so that Linux loads it (if possible).
+ mountTarget, err := ioutil.TempDir("", "supportsOverlay")
+ if err != nil {
+ logrus.WithField("storage-driver", "overlay2").Error("Could not create temporary directory, so assuming that 'overlay' is not supported.")
+ return graphdriver.ErrNotSupported
+ } else {
+ /* The mounting will fail--after the module has been loaded.*/
+ defer os.RemoveAll(mountTarget)
+ unix.Mount("overlay", mountTarget, "overlay", 0, "")
+ }
f, err := os.Open("/proc/filesystems")
if err != nil {
--- docker-18.09.0-checkout/daemon/graphdriver/overlay2/overlay.go.orig 2019-03-18 23:42:23.728525231 +0100
+++ docker-18.09.0-checkout/daemon/graphdriver/overlay2/overlay.go 2019-03-19 08:54:31.411906113 +0100
@@ -10,7 +10,6 @@
"io"
"io/ioutil"
"os"
- "os/exec"
"path"
"path/filepath"
"strconv"
@@ -261,9 +260,16 @@
}
func supportsOverlay() error {
- // We can try to modprobe overlay first before looking at
- // proc/filesystems for when overlay is supported
- exec.Command("modprobe", "overlay").Run()
+ // Access overlay filesystem so that Linux loads it (if possible).
+ mountTarget, err := ioutil.TempDir("", "supportsOverlay2")
+ if err != nil {
+ logrus.WithField("storage-driver", "overlay2").Error("Could not create temporary directory, so assuming that 'overlay' is not supported.")
+ return graphdriver.ErrNotSupported
+ } else {
+ /* The mounting will fail--after the module has been loaded.*/
+ defer os.RemoveAll(mountTarget)
+ unix.Mount("overlay", mountTarget, "overlay", 0, "")
+ }
f, err := os.Open("/proc/filesystems")
if err != nil {
--- docker-18.09.0-checkout/daemon/graphdriver/devmapper/deviceset.go.orig 2019-03-19 09:19:16.592844887 +0100
+++ docker-18.09.0-checkout/daemon/graphdriver/devmapper/deviceset.go 2019-03-19 09:21:18.019361761 +0100
@@ -540,8 +539,14 @@
return err // error text is descriptive enough
}
- // Check if kernel supports xfs filesystem or not.
- exec.Command("modprobe", "xfs").Run()
+ mountTarget, err := ioutil.TempDir("", "supportsXFS")
+ if err != nil {
+ return errors.Wrapf(err, "error checking for xfs support")
+ } else {
+ /* The mounting will fail--after the module has been loaded.*/
+ defer os.RemoveAll(mountTarget)
+ unix.Mount("none", mountTarget, "xfs", 0, "")
+ }
f, err := os.Open("/proc/filesystems")
if err != nil {
--- docker-18.09.0-checkout/vendor/github.com/docker/libnetwork/iptables/iptables.go.orig 2019-03-19 09:47:19.430111170 +0100
+++ docker-18.09.0-checkout/vendor/github.com/docker/libnetwork/iptables/iptables.go 2019-03-19 10:38:01.445136177 +0100
@@ -72,11 +71,12 @@
}
func probe() {
- if out, err := exec.Command("modprobe", "-va", "nf_nat").CombinedOutput(); err != nil {
- logrus.Warnf("Running modprobe nf_nat failed with message: `%s`, error: %v", strings.TrimSpace(string(out)), err)
+ path, err := exec.LookPath("iptables")
+ if err != nil {
+ return
}
- if out, err := exec.Command("modprobe", "-va", "xt_conntrack").CombinedOutput(); err != nil {
- logrus.Warnf("Running modprobe xt_conntrack failed with message: `%s`, error: %v", strings.TrimSpace(string(out)), err)
+ if out, err := exec.Command(path, "--wait", "-t", "nat", "-L", "-n").CombinedOutput(); err != nil {
+ logrus.Warnf("Running iptables --wait -t nat -L -n failed with message: `%s`, error: %v", strings.TrimSpace(string(out)), err)
}
}
--- docker-18.09.0-checkout/vendor/github.com/docker/libnetwork/ns/init_linux.go.orig 2019-03-19 11:23:20.738316699 +0100
+++ docker-18.09.0-checkout/vendor/github.com/docker/libnetwork/ns/init_linux.go 2019-03-19 11:27:57.149753073 +0100
@@ -76,12 +76,8 @@ func NlHandle() *netlink.Handle {
func getSupportedNlFamilies() []int {
fams := []int{syscall.NETLINK_ROUTE}
// NETLINK_XFRM test
- if err := loadXfrmModules(); err != nil {
- if checkXfrmSocket() != nil {
- logrus.Warnf("Could not load necessary modules for IPSEC rules: %v", err)
- } else {
- fams = append(fams, syscall.NETLINK_XFRM)
- }
+ if err := checkXfrmSocket(); err != nil {
+ logrus.Warnf("Could not load necessary modules for IPSEC rules: %v", err)
} else {
fams = append(fams, syscall.NETLINK_XFRM)
}
@@ -99,16 +95,6 @@ func getSupportedNlFamilies() []int {
return fams
}
-func loadXfrmModules() error {
- if out, err := exec.Command("modprobe", "-va", "xfrm_user").CombinedOutput(); err != nil {
- return fmt.Errorf("Running modprobe xfrm_user failed with message: `%s`, error: %v", strings.TrimSpace(string(out)), err)
- }
- if out, err := exec.Command("modprobe", "-va", "xfrm_algo").CombinedOutput(); err != nil {
- return fmt.Errorf("Running modprobe xfrm_algo failed with message: `%s`, error: %v", strings.TrimSpace(string(out)), err)
- }
- return nil
-}
-
// API check on required xfrm modules (xfrm_user, xfrm_algo)
func checkXfrmSocket() error {
fd, err := syscall.Socket(syscall.AF_NETLINK, syscall.SOCK_RAW, syscall.NETLINK_XFRM)

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 a00a7712d0f919162ce8181a9a3fc3e9ef37adf1caff0945a863b4c0c1d9f360 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c -
-echo -n 52e784f98a37624e8b207f1b23289c2c88f66dd923798cae891a586a6d94a6d1 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 a00a7712d0f919162ce8181a9a3fc3e9ef37adf1caff0945a863b4c0c1d9f360 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c -
+# echo -n 52e784f98a37624e8b207f1b23289c2c88f66dd923798cae891a586a6d94a6d1 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c -
+#
+# echo Extracting Firefox tarball
+# tar -xf firefox-${FFVERSION}esr.source.tar.xz

100
gnu/packages/patches/isc-dhcp-4.4.1-fixes-for-newer-bind.patch
View File

@ -1,100 +0,0 @@
These fixes are needed to adapt isc-dhcp-4.4.1 to build
successfully after its bundled copy of bind has been updated.
It is derived from the following upstream commits:
commit 8194daabfd590f17825f0c61e9534bee5c99cc86
Author: Thomas Markwalder <tmark@isc.org>
Date: Fri Sep 14 13:41:14 2018 -0400
[master] Added includes of new BIND9 compatibility headers, updated util/bind.sh
Merges in rt48072.
commit cc35f84943df44dac2499f3e16e8aaba7d54191d
Author: Thomas Markwalder <tmark@isc.org>
Date: Tue Mar 19 08:36:23 2019 -0400
[master] Avoid Bind9 python dependency
merges [#3,!1] Avoid Bind9 python dependency
--- a/bind/Makefile.in
+++ b/bind/Makefile.in
@@ -23,7 +23,7 @@ exec_prefix = @exec_prefix@
bindconfig = --without-openssl --without-libxml2 --without-libjson \
--without-gssapi --disable-threads --without-lmdb \
- --includedir=@includedir@ --libdir=@libdir@ \
+ --includedir=@includedir@ --libdir=@libdir@ --without-python\
@BINDLT@ @BINDIOMUX@ @BINDCONFIG@ --enable-full-report
@BIND_ATF_FALSE@cleandirs = ./lib ./include
diff --git a/includes/omapip/isclib.h b/includes/omapip/isclib.h
index 75a87ff6..538b927f 100644
--- a/includes/omapip/isclib.h
+++ b/includes/omapip/isclib.h
@@ -48,6 +48,9 @@
#include <string.h>
#include <netdb.h>
+#include <isc/boolean.h>
+#include <isc/int.h>
+
#include <isc/buffer.h>
#include <isc/lex.h>
#include <isc/lib.h>
diff --git a/includes/omapip/result.h b/includes/omapip/result.h
index 91243e1b..860298f6 100644
--- a/includes/omapip/result.h
+++ b/includes/omapip/result.h
@@ -26,6 +26,7 @@
#ifndef DHCP_RESULT_H
#define DHCP_RESULT_H 1
+#include <isc/boolean.h>
#include <isc/lang.h>
#include <isc/resultclass.h>
#include <isc/types.h>
diff --git a/server/dhcpv6.c b/server/dhcpv6.c
index a7110f98..cde4f617 100644
--- a/server/dhcpv6.c
+++ b/server/dhcpv6.c
@@ -1034,7 +1034,8 @@ void check_pool6_threshold(struct reply_state *reply,
shared_name,
inet_ntop(AF_INET6, &lease->addr,
tmp_addr, sizeof(tmp_addr)),
- used, count);
+ (long long unsigned)(used),
+ (long long unsigned)(count));
}
return;
}
@@ -1066,7 +1067,8 @@ void check_pool6_threshold(struct reply_state *reply,
"address: %s; high threshold %d%% %llu/%llu.",
shared_name,
inet_ntop(AF_INET6, &lease->addr, tmp_addr, sizeof(tmp_addr)),
- poolhigh, used, count);
+ poolhigh, (long long unsigned)(used),
+ (long long unsigned)(count));
/* handle the low threshold now, if we don't
* have one we default to 0. */
@@ -1436,12 +1438,15 @@ pick_v6_address(struct reply_state *reply)
log_debug("Unable to pick client address: "
"no addresses available - shared network %s: "
" 2^64-1 < total, %llu active, %llu abandoned",
- shared_name, active - abandoned, abandoned);
+ shared_name, (long long unsigned)(active - abandoned),
+ (long long unsigned)(abandoned));
} else {
log_debug("Unable to pick client address: "
"no addresses available - shared network %s: "
"%llu total, %llu active, %llu abandoned",
- shared_name, total, active - abandoned, abandoned);
+ shared_name, (long long unsigned)(total),
+ (long long unsigned)(active - abandoned),
+ (long long unsigned)(abandoned));
}
return ISC_R_NORESOURCES;

58
gnu/packages/patches/libreoffice-glm.patch
View File

@ -1,58 +0,0 @@
Fix build with GLM 0.9.9.
This patch is an amalgamation of these upstream commits:
https://github.com/LibreOffice/core/commit/953c4add8fd76d88f49a81ae4c21a1fdcc007e57
https://github.com/LibreOffice/core/commit/5f1bf6598b5725ad1e50ae9f7ec7524cc8a834fa
diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk
index 28bc87b89057..69d4c0552636 100644
--- a/chart2/Library_chartcore.mk
+++ b/chart2/Library_chartcore.mk
@@ -23,6 +23,12 @@ $(eval $(call gb_Library_add_defs,chartcore,\
-DOOO_DLLIMPLEMENTATION_CHARTVIEW \
))
+ifeq ($(SYSTEM_GLM),TRUE)
+$(eval $(call gb_Library_add_defs,chartcore,\
+ -DGLM_ENABLE_EXPERIMENTAL \
+))
+endif
+
$(eval $(call gb_Library_set_precompiled_header,chartcore,$(SRCDIR)/chart2/inc/pch/precompiled_chartcore))
$(eval $(call gb_Library_use_externals,chartcore,\
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index c1f3cc5324e7..0b684c6185a9 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -49,6 +49,12 @@ $(eval $(call gb_Library_add_defs,vcl,\
-DENABLE_MERGELIBS=$(if $(MERGELIBS),1,0) \
))
+ifeq ($(SYSTEM_GLM),TRUE)
+$(eval $(call gb_Library_add_defs,vcl,\
+ -DGLM_ENABLE_EXPERIMENTAL \
+))
+endif
+
$(eval $(call gb_Library_use_sdk_api,vcl))
$(eval $(call gb_Library_use_custom_headers,vcl,\
diff --git a/vcl/Executable_icontest.mk b/vcl/Executable_icontest.mk
index ce163303f8a4..8c917b71cd0e 100644
--- a/vcl/Executable_icontest.mk
+++ b/vcl/Executable_icontest.mk
@@ -19,6 +19,12 @@ $(eval $(call gb_Executable_use_externals,icontest,\
))
endif
+ifeq ($(SYSTEM_GLM),TRUE)
+$(eval $(call gb_Executable_add_defs,icontest,\
+ -DGLM_ENABLE_EXPERIMENTAL \
+))
+endif
+
$(eval $(call gb_Executable_use_api,icontest,\
offapi \
udkapi \

126
gnu/packages/patches/libreoffice-icu.patch
View File

@ -1,126 +0,0 @@
This patch fixes the build of Libreoffice 6.0.5 with icu 61.1.
It was downloaded from https://bugs.gentoo.org/651702.
--- a/forms/source/xforms/datatypes.hxx
+++ a/forms/source/xforms/datatypes.hxx
@@ -36,6 +36,8 @@
#include <memory>
+using icu::RegexMatcher;
+
namespace xforms
{
--- a/i18npool/inc/collator_unicode.hxx
+++ a/i18npool/inc/collator_unicode.hxx
@@ -26,6 +26,8 @@
#include <unicode/tblcoll.h>
+using icu::RuleBasedCollator;
+
// ----------------------------------------------------
// class Collator_Unicode
// ----------------------------------------------------
--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
+++ a/i18npool/source/breakiterator/breakiterator_unicode.cxx
@@ -30,6 +30,9 @@
#include <rtl/ustring.hxx>
#include <string.h>
+using icu::BreakIterator;
+using icu::RuleBasedBreakIterator;
+
U_CDECL_BEGIN
extern const char OpenOffice_dat[];
U_CDECL_END
--- a/i18npool/source/collator/collator_unicode.cxx
+++ a/i18npool/source/collator/collator_unicode.cxx
@@ -29,6 +29,8 @@
#include <com/sun/star/i18n/CollatorOptions.hpp>
#include <cppuhelper/supportsservice.hxx>
+using icu::Collator;
+
using namespace ::com::sun::star;
using namespace ::com::sun::star::i18n;
using namespace ::com::sun::star::lang;
--- a/i18npool/source/collator/gencoll_rule.cxx
+++ a/i18npool/source/collator/gencoll_rule.cxx
@@ -31,6 +31,8 @@
#include <unicode/tblcoll.h>
+using icu::RuleBasedCollator;
+
/* Main Procedure */
void data_write(char* file, char* name, sal_uInt8 *data, sal_Int32 len)
--- a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
+++ a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
@@ -29,6 +29,8 @@
#include <unicode/normlzr.h>
#include <memory>
+using icu::NumberFormat;
+
using namespace ::com::sun::star::i18n;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star;
--- a/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx
+++ a/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx
@@ -12,6 +12,8 @@
#include <unicode/translit.h>
#include <unicode/uchar.h>
+using icu::UnicodeString;
+
namespace i18npool {
ignoreDiacritics_CTL::ignoreDiacritics_CTL()
--- a/i18nutil/source/utility/unicode.cxx
+++ a/i18nutil/source/utility/unicode.cxx
@@ -34,6 +34,9 @@
// which (obviously) breaks UnicodeType::CURRENCY_SYMBOL
#undef CURRENCY_SYMBOL
+using icu::NumberFormat;
+using icu::UnicodeString;
+
using namespace ::com::sun::star::i18n;
template<class L, typename T>
--- a/lotuswordpro/source/filter/localtime.cxx
+++ a/lotuswordpro/source/filter/localtime.cxx
@@ -57,6 +57,8 @@
#include <limits.h>
#include <unicode/timezone.h>
+using icu::TimeZone;
+
const long DAY_SEC =24 * 60 * 60;
const long YEAR_SEC = 365 * DAY_SEC;
const long FOURYEAR_SEC = 4 * YEAR_SEC + DAY_SEC;
--- a/opencl/source/openclconfig.cxx
+++ a/opencl/source/openclconfig.cxx
@@ -17,6 +17,8 @@
#include <sal/log.hxx>
#include <sal/types.h>
+using icu::RegexMatcher;
+
OpenCLConfig::OpenCLConfig() :
mbUseOpenCL(true)
{
--- a/vcl/inc/scrptrun.h
+++ a/vcl/inc/scrptrun.h
@@ -45,6 +45,8 @@
#include <unicode/uscript.h>
#include <vector>
+using icu::UObject;
+
namespace vcl {
struct ParenStackEntry

29
gnu/packages/patches/lvm2-static-link.patch
View File

@ -3,23 +3,34 @@ and libm via libdevmapper.a.
--- LVM2.2.02.166/tools/Makefile.in 2016-11-22 21:31:15.521045149 +0100
+++ LVM2.2.02.166/tools/Makefile.in 2016-11-22 21:31:24.085082767 +0100
@@ -148,7 +148,7 @@ endif
lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a $(interfacebuilddir)/libdevmapper.a
$(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ \
- $(OBJECTS) lvm-static.o $(LVMLIBS) $(STATIC_LIBS) $(LIBS)
+ $(OBJECTS) lvm-static.o $(LVMLIBS) $(STATIC_LIBS) $(LIBS) $(PTHREAD_LIBS) $(M_LIBS)
@@ -137,7 +137,7 @@
lvm.static: $(OBJECTS) lvm-static.o $(LVMINTERNAL_LIBS)
@echo " [CC] $@"
$(Q) $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ $+ \
- $(DMEVENT_LIBS) $(STATIC_LIBS) $(LVMLIBS)
+ $(DMEVENT_LIBS) $(STATIC_LIBS) $(LVMLIBS) $(PTHREAD_LIBS)
liblvm2cmd.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o
cat $(top_builddir)/lib/liblvm-internal.a > $@
@echo " [AR] $@"
--- a/make.tmpl.in 2018-07-31 22:00:39.969983104 +0200
+++ b/make.tmpl.in 2018-07-31 22:00:58.467613682 +0200
@@ -53,7 +53,7 @@
@@ -63,7 +63,7 @@
LIBS = @LIBS@
LIBS += @LIBS@ $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) $(RT_LIBS) $(M_LIBS)
# Extra libraries always linked with static binaries
-STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS)
+STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) $(M_LIBS)
DEFS += @DEFS@
# FIXME set this only where it's needed, not globally?
CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@
--- a/libdm/make.tmpl.in 2018-12-18 15:22:34.000000000 +0100
+++ b/libdm/make.tmpl.in 2019-01-29 21:45:33.637345799 +0100
@@ -57,7 +57,7 @@
LIBS = @LIBS@
LIBS += $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) $(RT_LIBS) -lm
# Extra libraries always linked with static binaries
-STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS)
+STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) $(PTHREAD_LIBS) $(M_LIBS)
DEFS += @DEFS@
# FIXME set this only where it's needed, not globally?
CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@

448
gnu/packages/patches/qrcodegen-cpp-make-install.patch 100644
View File

@ -0,0 +1,448 @@
Make the library installable. Patch copied from pull request:
https://github.com/nayuki/QR-Code-generator/pull/72
From 1625fc1665e1f83eb73c0f5670dcfda96dc0b3e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Tue, 3 Dec 2019 11:57:24 +0100
Subject: [PATCH 1/7] Do not append to C/XX/FLAGS but just set them if not
defined already
---
c/Makefile | 2 +-
cpp/Makefile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/c/Makefile b/c/Makefile
index fd0c367..b27449c 100644
--- a/c/Makefile
+++ b/c/Makefile
@@ -29,7 +29,7 @@
# - CFLAGS: Any extra user-specified compiler flags (can be blank).
# Recommended compiler flags:
-CFLAGS += -std=c99 -O
+CFLAGS ?= -std=c99 -O
# Extra flags for diagnostics:
# CFLAGS += -g -Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -fsanitize=undefined,address
diff --git a/cpp/Makefile b/cpp/Makefile
index f83c512..666f976 100644
--- a/cpp/Makefile
+++ b/cpp/Makefile
@@ -29,7 +29,7 @@
# - CXXFLAGS: Any extra user-specified compiler flags (can be blank).
# Recommended compiler flags:
-CXXFLAGS += -std=c++11 -O
+CXXFLAGS ?= -std=c++11 -O
# Extra flags for diagnostics:
# CXXFLAGS += -g -Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -fsanitize=undefined,address
From 2e496a0f59d5c6782c1e3e2a3ca36d0272b384f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Tue, 3 Dec 2019 11:59:59 +0100
Subject: [PATCH 2/7] Make use of -fPIC parameter when building'
---
c/Makefile | 2 +-
cpp/Makefile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/c/Makefile b/c/Makefile
index b27449c..bf79462 100644
--- a/c/Makefile
+++ b/c/Makefile
@@ -77,7 +77,7 @@ $(LIBFILE): $(LIBOBJ)
# Object files
%.o: %.c .deps/timestamp
- $(CC) $(CFLAGS) -c -o $@ -MMD -MF .deps/$*.d $<
+ $(CC) $(CFLAGS) -fPIC -c -o $@ -MMD -MF .deps/$*.d $<
# Have a place to store header dependencies automatically generated by compiler
.deps/timestamp:
diff --git a/cpp/Makefile b/cpp/Makefile
index 666f976..f37cf66 100644
--- a/cpp/Makefile
+++ b/cpp/Makefile
@@ -73,7 +73,7 @@ $(LIBFILE): $(LIBOBJ)
# Object files
%.o: %.cpp .deps/timestamp
- $(CXX) $(CXXFLAGS) -c -o $@ -MMD -MF .deps/$*.d $<
+ $(CXX) $(CXXFLAGS) -fPIC -c -o $@ -MMD -MF .deps/$*.d $<
# Have a place to store header dependencies automatically generated by compiler
.deps/timestamp:
From 29489faaa5a3b014c5c2d95ca34033df470de73c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Tue, 3 Dec 2019 12:07:19 +0100
Subject: [PATCH 3/7] Generate both shared and static libraries
---
c/Makefile | 14 ++++++++++----
cpp/Makefile | 14 ++++++++++----
2 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/c/Makefile b/c/Makefile
index bf79462..38eda2d 100644
--- a/c/Makefile
+++ b/c/Makefile
@@ -51,16 +51,19 @@ CFLAGS ?= -std=c99 -O
# ---- Targets to build ----
LIB = qrcodegen
-LIBFILE = lib$(LIB).a
+ARFILE = lib$(LIB).a
+LIBFILE = lib$(LIB).so
+# Bump the soname number when the ABI changes and gets incompatible
+SO_NAME = $(LIBFILE).1
LIBOBJ = qrcodegen.o
MAINS = qrcodegen-demo qrcodegen-test qrcodegen-worker
# Build all binaries
-all: $(LIBFILE) $(MAINS)
+all: $(LIBFILE) $(ARFILE) $(MAINS)
# Delete build output
clean:
- rm -f -- $(LIBOBJ) $(LIBFILE) $(MAINS:=.o) $(MAINS)
+ rm -f -- $(LIBOBJ) $(LIBFILE) $(ARFILE) $(MAINS:=.o) $(MAINS)
rm -rf .deps
# Executable files
@@ -72,9 +75,12 @@ qrcodegen-test: qrcodegen-test.c $(LIBOBJ:%.o=%.c)
$(CC) $(CFLAGS) -DQRCODEGEN_TEST -o $@ $^
# The library
-$(LIBFILE): $(LIBOBJ)
+$(ARFILE): $(LIBOBJ)
$(AR) -crs $@ -- $^
+$(LIBFILE): $(LIBOBJ)
+ $(CC) -shared -Wl,-soname,$(SO_NAME) $(LDFLAGS) -o $@ $^
+
# Object files
%.o: %.c .deps/timestamp
$(CC) $(CFLAGS) -fPIC -c -o $@ -MMD -MF .deps/$*.d $<
diff --git a/cpp/Makefile b/cpp/Makefile
index f37cf66..606cdad 100644
--- a/cpp/Makefile
+++ b/cpp/Makefile
@@ -51,16 +51,19 @@ CXXFLAGS ?= -std=c++11 -O
# ---- Targets to build ----
LIB = qrcodegen
-LIBFILE = lib$(LIB).a
+ARFILE = lib$(LIB).a
+LIBFILE = lib$(LIB).so
+# Bump the soname number when the ABI changes and gets incompatible
+SO_NAME = $(LIBFILE).1
LIBOBJ = QrCode.o
MAINS = QrCodeGeneratorDemo QrCodeGeneratorWorker
# Build all binaries
-all: $(LIBFILE) $(MAINS)
+all: $(LIBFILE) $(ARFILE) $(MAINS)
# Delete build output
clean:
- rm -f -- $(LIBOBJ) $(LIBFILE) $(MAINS:=.o) $(MAINS)
+ rm -f -- $(LIBOBJ) $(LIBFILE) $(ARFILE) $(MAINS:=.o) $(MAINS)
rm -rf .deps
# Executable files
@@ -68,9 +71,12 @@ clean:
$(CXX) $(CXXFLAGS) -o $@ $< -L . -l $(LIB)
# The library
-$(LIBFILE): $(LIBOBJ)
+$(ARFILE): $(LIBOBJ)
$(AR) -crs $@ -- $^
+$(LIBFILE): $(LIBOBJ)
+ $(CC) -shared -Wl,-soname,$(SO_NAME) $(LDFLAGS) -o $@ $^
+
# Object files
%.o: %.cpp .deps/timestamp
$(CXX) $(CXXFLAGS) -fPIC -c -o $@ -MMD -MF .deps/$*.d $<
From 064f38d6a8dc0a457728a47ee4ca1e927e46d5ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Tue, 3 Dec 2019 12:45:34 +0100
Subject: [PATCH 4/7] Create install targets for C and CPP
---
c/Makefile | 26 ++++++++++++++++++++++++++
cpp/Makefile | 27 +++++++++++++++++++++++++++
2 files changed, 53 insertions(+)
diff --git a/c/Makefile b/c/Makefile
index 38eda2d..7521944 100644
--- a/c/Makefile
+++ b/c/Makefile
@@ -34,6 +34,8 @@ CFLAGS ?= -std=c99 -O
# Extra flags for diagnostics:
# CFLAGS += -g -Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -fsanitize=undefined,address
+# Version information
+VERSION = 1.5.0
# ---- Controlling make ----
@@ -55,9 +57,15 @@ ARFILE = lib$(LIB).a
LIBFILE = lib$(LIB).so
# Bump the soname number when the ABI changes and gets incompatible
SO_NAME = $(LIBFILE).1
+REAL_NAME = $(LIBFILE).$(VERSION)
+HEADERS = qrcodegen.h
LIBOBJ = qrcodegen.o
MAINS = qrcodegen-demo qrcodegen-test qrcodegen-worker
+# define paths to install
+INCLUDEDIR ?= $(DESTDIR)/usr/include/qrcodegen
+LIBDIR ?= $(DESTDIR)/usr/lib
+
# Build all binaries
all: $(LIBFILE) $(ARFILE) $(MAINS)
@@ -66,6 +74,24 @@ clean:
rm -f -- $(LIBOBJ) $(LIBFILE) $(ARFILE) $(MAINS:=.o) $(MAINS)
rm -rf .deps
+install-shared: $(LIBFILE)
+ install -d $(LIBDIR) || true
+ install -m 0644 $(LIBFILE) $(LIBDIR)/$(REAL_NAME)
+ rm -f $(LIBDIR)/$(SO_NAME)
+ ln -s $(REAL_NAME) $(LIBDIR)/$(SO_NAME)
+ rm -f $(LIBDIR)/$(LIBFILE)
+ ln -s $(SO_NAME) $(LIBDIR)/$(LIBFILE)
+
+install-static: $(ARFILE)
+ install -d $(LIBDIR) || true
+ install -m 0644 $(ARFILE) $(LIBDIR)/$(ARFILE)
+
+install-header: $(HEADERS)
+ install -d $(INCLUDEDIR) || true
+ install -m 0644 $(HEADERS) $(INCLUDEDIR)/
+
+install: install-shared install-static install-header
+
# Executable files
%: %.o $(LIBFILE)
$(CC) $(CFLAGS) -o $@ $< -L . -l $(LIB)
diff --git a/cpp/Makefile b/cpp/Makefile
index 606cdad..3271bd8 100644
--- a/cpp/Makefile
+++ b/cpp/Makefile
@@ -34,6 +34,8 @@ CXXFLAGS ?= -std=c++11 -O
# Extra flags for diagnostics:
# CXXFLAGS += -g -Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -fsanitize=undefined,address
+# Version information
+VERSION = 1.5.0
# ---- Controlling make ----
@@ -55,9 +57,16 @@ ARFILE = lib$(LIB).a
LIBFILE = lib$(LIB).so
# Bump the soname number when the ABI changes and gets incompatible
SO_NAME = $(LIBFILE).1
+REAL_NAME = $(LIBFILE).$(VERSION)
+HEADERS = QrCode.hpp
LIBOBJ = QrCode.o
MAINS = QrCodeGeneratorDemo QrCodeGeneratorWorker
+# define paths to install
+INCLUDEDIR ?= $(DESTDIR)/usr/include/qrcodegen
+LIBDIR ?= $(DESTDIR)/usr/lib
+
+
# Build all binaries
all: $(LIBFILE) $(ARFILE) $(MAINS)
@@ -66,6 +75,24 @@ clean:
rm -f -- $(LIBOBJ) $(LIBFILE) $(ARFILE) $(MAINS:=.o) $(MAINS)
rm -rf .deps
+install-shared: $(LIBFILE)
+ install -d $(LIBDIR) || true
+ install -m 0644 $(LIBFILE) $(LIBDIR)/$(REAL_NAME)
+ rm -f $(LIBDIR)/$(SO_NAME)
+ ln -s $(REAL_NAME) $(LIBDIR)/$(SO_NAME)
+ rm -f $(LIBDIR)/$(LIBFILE)
+ ln -s $(SO_NAME) $(LIBDIR)/$(LIBFILE)
+
+install-static: $(ARFILE)
+ install -d $(LIBDIR) || true
+ install -m 0644 $(ARFILE) $(LIBDIR)/$(ARFILE)
+
+install-header: $(HEADERS)
+ install -d $(INCLUDEDIR) || true
+ install -m 0644 $(HEADERS) $(INCLUDEDIR)/
+
+install: install-shared install-static install-header
+
# Executable files
%: %.o $(LIBFILE)
$(CXX) $(CXXFLAGS) -o $@ $< -L . -l $(LIB)
From a635ff4654f94ab26b458c46a8841543e5bc8c67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Tue, 3 Dec 2019 12:50:39 +0100
Subject: [PATCH 5/7] Rename cpp library to qrcodegencpp to avoid conflict
---
cpp/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cpp/Makefile b/cpp/Makefile
index 3271bd8..42fa4ff 100644
--- a/cpp/Makefile
+++ b/cpp/Makefile
@@ -52,7 +52,7 @@ VERSION = 1.5.0
# ---- Targets to build ----
-LIB = qrcodegen
+LIB = qrcodegencpp
ARFILE = lib$(LIB).a
LIBFILE = lib$(LIB).so
# Bump the soname number when the ABI changes and gets incompatible
From c073e7dfad6454dfd725a69c347f8272d29ea41c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Tue, 7 Jan 2020 09:18:59 +0100
Subject: [PATCH 6/7] Add PREFIX variable and few minor fixes from code review
---
c/Makefile | 9 +++++----
cpp/Makefile | 9 +++++----
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/c/Makefile b/c/Makefile
index 7521944..874933e 100644
--- a/c/Makefile
+++ b/c/Makefile
@@ -29,7 +29,7 @@
# - CFLAGS: Any extra user-specified compiler flags (can be blank).
# Recommended compiler flags:
-CFLAGS ?= -std=c99 -O
+CFLAGS += -std=c99
# Extra flags for diagnostics:
# CFLAGS += -g -Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -fsanitize=undefined,address
@@ -63,8 +63,9 @@ LIBOBJ = qrcodegen.o
MAINS = qrcodegen-demo qrcodegen-test qrcodegen-worker
# define paths to install
-INCLUDEDIR ?= $(DESTDIR)/usr/include/qrcodegen
-LIBDIR ?= $(DESTDIR)/usr/lib
+PREFIX ?= /usr/local
+INCLUDEDIR ?= $(DESTDIR)$(PREFIX)/include/qrcodegen
+LIBDIR ?= $(DESTDIR)$(PREFIX)/lib
# Build all binaries
all: $(LIBFILE) $(ARFILE) $(MAINS)
@@ -105,7 +106,7 @@ $(ARFILE): $(LIBOBJ)
$(AR) -crs $@ -- $^
$(LIBFILE): $(LIBOBJ)
- $(CC) -shared -Wl,-soname,$(SO_NAME) $(LDFLAGS) -o $@ $^
+ $(CC) $(CFLAGS) -shared -Wl,-soname,$(SO_NAME) $(LDFLAGS) -o $@ $^
# Object files
%.o: %.c .deps/timestamp
diff --git a/cpp/Makefile b/cpp/Makefile
index 42fa4ff..f8d9b7f 100644
--- a/cpp/Makefile
+++ b/cpp/Makefile
@@ -29,7 +29,7 @@
# - CXXFLAGS: Any extra user-specified compiler flags (can be blank).
# Recommended compiler flags:
-CXXFLAGS ?= -std=c++11 -O
+CXXFLAGS += -std=c++11
# Extra flags for diagnostics:
# CXXFLAGS += -g -Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -fsanitize=undefined,address
@@ -63,8 +63,9 @@ LIBOBJ = QrCode.o
MAINS = QrCodeGeneratorDemo QrCodeGeneratorWorker
# define paths to install
-INCLUDEDIR ?= $(DESTDIR)/usr/include/qrcodegen
-LIBDIR ?= $(DESTDIR)/usr/lib
+PREFIX ?= /usr/local
+INCLUDEDIR ?= $(DESTDIR)$(PREFIX)/include/qrcodegen
+LIBDIR ?= $(DESTDIR)$(PREFIX)/lib
# Build all binaries
@@ -102,7 +103,7 @@ $(ARFILE): $(LIBOBJ)
$(AR) -crs $@ -- $^
$(LIBFILE): $(LIBOBJ)
- $(CC) -shared -Wl,-soname,$(SO_NAME) $(LDFLAGS) -o $@ $^
+ $(CXX) $(CXXFLAGS) -shared -Wl,-soname,$(SO_NAME) $(LDFLAGS) -o $@ $^
# Object files
%.o: %.cpp .deps/timestamp
From b43c1de5cc874535a7f549cef437f6849528e455 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Tue, 7 Jan 2020 13:12:32 +0100
Subject: [PATCH 7/7] Install static and shared library as an executable
---
c/Makefile | 4 ++--
cpp/Makefile | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/c/Makefile b/c/Makefile
index 874933e..631cc71 100644
--- a/c/Makefile
+++ b/c/Makefile
@@ -77,7 +77,7 @@ clean:
install-shared: $(LIBFILE)
install -d $(LIBDIR) || true
- install -m 0644 $(LIBFILE) $(LIBDIR)/$(REAL_NAME)
+ install -m 0755 $(LIBFILE) $(LIBDIR)/$(REAL_NAME)
rm -f $(LIBDIR)/$(SO_NAME)
ln -s $(REAL_NAME) $(LIBDIR)/$(SO_NAME)
rm -f $(LIBDIR)/$(LIBFILE)
@@ -85,7 +85,7 @@ install-shared: $(LIBFILE)
install-static: $(ARFILE)
install -d $(LIBDIR) || true
- install -m 0644 $(ARFILE) $(LIBDIR)/$(ARFILE)
+ install -m 0755 $(ARFILE) $(LIBDIR)/$(ARFILE)
install-header: $(HEADERS)
install -d $(INCLUDEDIR) || true
diff --git a/cpp/Makefile b/cpp/Makefile
index f8d9b7f..bbd861e 100644
--- a/cpp/Makefile
+++ b/cpp/Makefile
@@ -78,7 +78,7 @@ clean:
install-shared: $(LIBFILE)
install -d $(LIBDIR) || true
- install -m 0644 $(LIBFILE) $(LIBDIR)/$(REAL_NAME)
+ install -m 0755 $(LIBFILE) $(LIBDIR)/$(REAL_NAME)
rm -f $(LIBDIR)/$(SO_NAME)
ln -s $(REAL_NAME) $(LIBDIR)/$(SO_NAME)
rm -f $(LIBDIR)/$(LIBFILE)
@@ -86,7 +86,7 @@ install-shared: $(LIBFILE)
install-static: $(ARFILE)
install -d $(LIBDIR) || true
- install -m 0644 $(ARFILE) $(LIBDIR)/$(ARFILE)
+ install -m 0755 $(ARFILE) $(LIBDIR)/$(ARFILE)
install-header: $(HEADERS)
install -d $(INCLUDEDIR) || true

79
gnu/packages/patches/reprotest-support-guix.patch 100644
View File

@ -0,0 +1,79 @@
From 31bd4fe777cbff3ebca74115e5735a8b8f584fa7 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@reproducible-builds.org>
Date: Thu, 6 Feb 2020 23:17:58 -0800
Subject: [PATCH] Add support for GNU Guix.
---
reprotest/lib/adt_testbed.py | 2 ++
reprotest/lib/system_interface/guix.py | 39 ++++++++++++++++++++++++++
2 files changed, 41 insertions(+)
create mode 100644 reprotest/lib/system_interface/guix.py
diff --git a/reprotest/lib/adt_testbed.py b/reprotest/lib/adt_testbed.py
index ef704d6..60bf763 100644
--- a/reprotest/lib/adt_testbed.py
+++ b/reprotest/lib/adt_testbed.py
@@ -40,6 +40,7 @@ import urllib.parse
from reprotest.lib.system_interface.debian import DebianInterface
from reprotest.lib.system_interface.arch import ArchInterface
from reprotest.lib.system_interface.fedora import FedoraInterface
+from reprotest.lib.system_interface.guix import GuixInterface
from reprotest.lib import adtlog
from reprotest.lib import VirtSubproc
@@ -47,6 +48,7 @@ SYSTEM_INTERFACES = {
'debian': DebianInterface,
'arch': ArchInterface,
'fedora': FedoraInterface,
+ 'guix': GuixInterface,
}
timeouts = {
diff --git a/reprotest/lib/system_interface/guix.py b/reprotest/lib/system_interface/guix.py
new file mode 100644
index 0000000..2b06104
--- /dev/null
+++ b/reprotest/lib/system_interface/guix.py
@@ -0,0 +1,39 @@
+# adt_testbed.py is part of autopkgtest
+# autopkgtest is a tool for testing Debian binary packages. The
+# system_interface module is an addition for reprotest to make
+# this module distro-agnostic
+#
+# autopkgtest is Copyright (C) 2006-2015 Canonical Ltd.
+# the system_interface module is Copyright (C) 2017 Santiago Torres-Arias
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+# See the file CREDITS for a full list of credits information (often
+# installed as /usr/share/doc/autopkgtest/CREDITS).
+import subprocess
+
+from . import SystemInterface
+
+class GuixInterface(SystemInterface):
+ """
+ SystemInterface implementation for GNU Guix hosts. Contains commands that
+ are specific to the GNU Guix toolchain.
+ """
+
+ def get_arch(self):
+ return ['uname', '-m']
+
+ def can_query_packages(self):
+ return False
--
2.20.1

23
gnu/packages/patches/rust-openssl-sys-no-vendor.patch 100644
View File

@ -0,0 +1,23 @@
https://sources.debian.org/data/main/r/rust-openssl-sys/0.9.53-1/debian/patches/disable-vendor.patch
"MIT" licensed according to debian/copyright file
slightly modified to only change the vendored openssl-src dependency
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -31,14 +31,11 @@
[build-dependencies.cc]
version = "1.0"
-[build-dependencies.openssl-src]
-version = "111.0.1"
-optional = true
-
[build-dependencies.pkg-config]
version = "0.3.9"
[features]
vendored = ["openssl-src"]
+openssl-src = []
[target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg]
version = "0.2"

4
gnu/packages/patchutils.scm
View File

@ -322,7 +322,7 @@ you to figure out what is going on in that merge you keep avoiding.")
(define-public patchwork
(package
(name "patchwork")
(version "2.1.4")
(version "2.1.5")
(source (origin
(method git-fetch)
(uri (git-reference
@ -331,7 +331,7 @@ you to figure out what is going on in that merge you keep avoiding.")
(file-name (git-file-name name version))
(sha256
(base32
"0zi1hcqb0pi2diyznbv0c1631qk4rx02zl8ghyrr59g3ljlyr18y"))))
"1n4hfwlgmw6mj5kp261zfx47mgb0l7g2yzl1rf0rnm8x69lr3as6"))))
(build-system python-build-system)
(arguments
`(;; TODO: Tests require a running database

94
gnu/packages/pdf.scm
View File

@ -17,6 +17,7 @@
;;; Copyright © 2019 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2019 Ben Sturmfels <ben@sturm.com.au>
;;; Copyright © 2019 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;;
;;; This file is part of GNU Guix.
;;;
@ -45,6 +46,7 @@
#:use-module (guix build-system python)
#:use-module (guix build-system trivial)
#:use-module (gnu packages)
#:use-module (gnu packages audio)
#:use-module (gnu packages autotools)
#:use-module (gnu packages backup)
#:use-module (gnu packages base)
@ -55,6 +57,7 @@
#:use-module (gnu packages djvu)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages game-development)
#:use-module (gnu packages gcc)
#:use-module (gnu packages gettext)
#:use-module (gnu packages ghostscript)
#:use-module (gnu packages gl)
@ -74,6 +77,7 @@
#:use-module (gnu packages perl)
#:use-module (gnu packages photo)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages pulseaudio)
#:use-module (gnu packages python)
#:use-module (gnu packages python-check)
#:use-module (gnu packages python-web)
@ -82,8 +86,10 @@
#:use-module (gnu packages sdl)
#:use-module (gnu packages sphinx)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages tex)
#:use-module (gnu packages tls)
#:use-module (gnu packages xdisorg)
#:use-module (gnu packages xml)
#:use-module (gnu packages xorg)
#:use-module (srfi srfi-1))
@ -752,6 +758,94 @@ program capable of converting PDF into other formats.")
using a stylus.")
(license license:gpl2+)))
(define-public xournalpp
(package
(name "xournalpp")
(version "1.0.17")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/xournalpp/xournalpp.git")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0xw2mcgnm4sa9hrhfgp669lfypw97drxjmz5w8i5whaprpvmkxzw"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags (list "-DENABLE_CPPUNIT=ON") ;enable tests
#:imported-modules ((guix build glib-or-gtk-build-system)
,@%cmake-build-system-modules)
#:modules (((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
(guix build cmake-build-system)
(guix build utils))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-permissions-on-po-files
(lambda _
;; Always generate translations. A recent upstream patch
;; disabled it.
(substitute* "po/CMakeLists.txt"
(("gettext_create_translations \\(\"\\$\\{potfile\\}\"\\)")
"gettext_create_translations (\"${potfile}\" ALL)"))
;; Make sure 'msgmerge' can modify the PO files.
(for-each (lambda (po) (chmod po #o666))
(find-files "." "\\.po$"))
#t))
(add-after 'install 'glib-or-gtk-wrap
(assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))))
(native-inputs
`(("cppunit" ,cppunit)
("gcc" ,gcc-8) ;requires gcc 8+
("gettext" ,gettext-minimal)
("pkg-config" ,pkg-config)))
(inputs
`(("alsa-lib" ,alsa-lib)
("glib" ,glib)
("gtk+" ,gtk+)
("libsndfile" ,libsndfile)
("libxml2" ,libxml2)
("libzip" ,libzip)
("lua" ,lua) ;FIXME: It cannot find the Lua library.
("poppler" ,poppler)
("portaudio" ,portaudio)
("texlive-bin" ,texlive-bin)))
(home-page "https://github.com/xournalpp/xournalpp")
(synopsis "Handwriting notetaking software with PDF annotation support")
(description "Xournal++ is a hand note taking software written in
C++ with the target of flexibility, functionality and speed. Stroke
recognizer and other parts are based on Xournal code.
Xournal++ features:
@itemize
@item Support for Pen pressure, e.g., Wacom Tablet
@item Support for annotating PDFs
@item Fill shape functionality
@item PDF Export (with and without paper style)
@item PNG Export (with and without transparent background)
@item Allow to map different tools / colors etc. to stylus buttons /
mouse buttons
@item Sidebar with Page Previews with advanced page sorting, PDF
Bookmarks and Layers (can be individually hidden, editing layer can be
selected)
@item enhanced support for image insertion
@item Eraser with multiple configurations
@item LaTeX support
@item bug reporting, autosave, and auto backup tools
@item Customizeable toolbar, with multiple configurations, e.g., to
optimize toolbar for portrait / landscape
@item Page Template definitions
@item Shape drawing (line, arrow, circle, rectangle)
@item Shape resizing and rotation
@item Rotation snapping every 45 degrees
@item Rect snapping to grid
@item Audio recording and playback alongside with handwritten notes
@item Multi Language Support, Like English, German, Italian...
@item Plugins using LUA Scripting
@end itemize")
(license license:gpl2+)))
(define-public python-reportlab
(package
(name "python-reportlab")

21
gnu/packages/perl.scm
View File

@ -24,6 +24,7 @@
;;; Copyright © 2019 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2019 Stephen J. Scheck <sscheck@cpan.org>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -1371,6 +1372,26 @@ parser in your Perl programme and allows sharing configuration files between
languages.")
(license bsd-3)))
(define-public perl-config-grammar
(package
(name "perl-config-grammar")
(version "1.13")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://cpan/authors/id/D/DS/DSCHWEI/"
"Config-Grammar-" version ".tar.gz"))
(sha256
(base32 "1qynf5bk6mnk90nggm3z8rdz2535kmqg46s0vj93pi68r6ia7cx8"))))
(build-system perl-build-system)
(home-page "https://metacpan.org/release/Config-Grammar")
(synopsis "Grammar-based config parser")
(description
"Config::Grammar is a module to parse configuration files. The
configuration may consist of multiple-level sections with assignments and
tabular data.")
(license (package-license perl))))
(define-public perl-config-any
(package
(name "perl-config-any")

8
gnu/packages/protobuf.scm
View File

@ -75,7 +75,7 @@ data in motion, or as a file format for data at rest.")
(define-public protobuf
(package
(name "protobuf")
(version "3.10.1")
(version "3.11.3")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/google/protobuf/releases/"
@ -83,7 +83,7 @@ data in motion, or as a file format for data at rest.")
version ".tar.gz"))
(sha256
(base32
"16xrclp3xw4hzni1h53px9s99657hs5790726lchm3hrvsyyabp8"))))
"0l8a1sgzhwwx5j5hv9n9zx8vkdwwn5gvd9dcpkkz4h0j17k1zywz"))))
(build-system gnu-build-system)
(inputs `(("zlib" ,zlib)))
(outputs (list "out"
@ -203,14 +203,14 @@ encoder in C++. The developer using protozero has to manually translate the
(define-public python-protobuf
(package
(name "python-protobuf")
(version "3.10.0")
(version "3.11.3")
(source
(origin
(method url-fetch)
(uri (pypi-uri "protobuf" version))
(sha256
(base32
"1zjq3qi0wgqi0fwxgqlgwvj9ri1m4kmnz3jnpd803lqc5k0vb0yv"))))
"07qby3yc2a8a1vsxnc79j687q4r68k1d3npni7bldwmd3m6rfz67"))))
(build-system python-build-system)
(propagated-inputs
`(("python-six" ,python-six)))

77
gnu/packages/pulseaudio.scm
View File

@ -10,6 +10,7 @@
;;; Copyright © 2018 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2019 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2020 Amin Bandali <mab@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -39,9 +40,11 @@
#:use-module (gnu packages audio)
#:use-module (gnu packages autotools)
#:use-module (gnu packages avahi)
#:use-module (gnu packages boost)
#:use-module (gnu packages check)
#:use-module (gnu packages dbm)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gtk)
#:use-module (gnu packages libcanberra)
#:use-module (gnu packages web)
@ -385,3 +388,77 @@ install one or more of the following packages alongside pulseaudio-dlna:
@item vorbis-tools - Vorbis transcoding support
@end itemize")
(license l:gpl3+))))
(define-public pamixer
(package
(name "pamixer")
(version "1.4")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/cdemoulins/pamixer.git")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1i14550n8paijwwnhksv5izgfqm3s5q2773bdfp6vyqybkll55f7"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; There is no test suite.
#:make-flags
(list (string-append "PREFIX=" (assoc-ref %outputs "out")))
#:phases
(modify-phases %standard-phases
(delete 'configure) ; There's no configure phase.
(add-before 'install 'mkdir-bin
(lambda _
(mkdir-p (string-append (assoc-ref %outputs "out") "/bin"))
#t)))))
(inputs
`(("boost" ,boost)
("pulseaudio" ,pulseaudio)))
(home-page "https://github.com/cdemoulins/pamixer")
(synopsis "PulseAudio command line mixer")
(description
"pamixer is like amixer but for PulseAudio, allowing easy control of the
volume levels of the sinks (get, set, decrease, increase, toggle mute, etc).")
(license l:gpl3+)))
(define-public pasystray
(package
(name "pasystray")
(version "0.7.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/christophgysin/pasystray.git")
(commit (string-append name "-" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0xx1bm9kimgq11a359ikabdndqg5q54pn1d1dyyjnrj0s41168fk"))))
(build-system gnu-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-before 'bootstrap 'remove-bootstrap.sh
(lambda _
;; Interferes with the bootstrap phase.
(delete-file "bootstrap.sh")
#t)))))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("pkg-config" ,pkg-config)))
(inputs
`(("avahi" ,avahi)
("gtk+" ,gtk+)
("libnotify" ,libnotify)
("libx11" ,libx11)
("pulseaudio" ,pulseaudio)))
(home-page "https://github.com/christophgysin/pasystray")
(synopsis "PulseAudio controller for the system tray")
(description "@command{pasystray} enables control of various
PulseAudio server settings from the X11 system tray. See the project
README.md for a detailed list of features.")
(license l:lgpl2.1+)))

125
gnu/packages/python-xyz.scm
View File

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013, 2014, 2015, 2016, 2019 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014, 2017 Eric Bavier <bavier@member.fsf.org>
@ -1990,6 +1990,28 @@ between Julian dates and Gregorian dates.")
(define-public python2-jdcal
(package-with-python2 python-jdcal))
(define-public python-jsondiff
(package
(name "python-jsondiff")
(version "1.2.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "jsondiff" version))
(sha256
(base32
"00v3689175aqzdscrxpffm712ylp8jvcpqdg51ca22ni6721p51l"))))
(build-system python-build-system)
(native-inputs
`(("python-nose" ,python-nose)
("python-nose-random" ,python-nose-random)))
(home-page
"https://github.com/fzumstein/jsondiff")
(synopsis "Compare JSON and JSON-like structures in Python")
(description "@code{jsondiff} is a Python library which lets you
compare, diff, and patch JSON and JSON-like structures in Python.")
(license license:expat)))
(define-public python-jsonschema
(package
(name "python-jsonschema")
@ -2922,6 +2944,27 @@ for SSH and SFTP. It has the following main usages:
@end itemize")
(license license:asl2.0)))
(define-public python-rstr
(package
(name "python-rstr")
(version "2.2.6")
(source
(origin
(method url-fetch)
(uri (pypi-uri "rstr" version))
(sha256
(base32
"197dw8mbq0pjjz1l6h1ksi62vgn7x55d373ch74y06744qiq5sjx"))))
(build-system python-build-system)
(home-page
"http://bitbucket.org/leapfrogdevelopment/rstr/overview")
(synopsis "Generate random strings in Python")
(description "This package provides a python module for generating
random strings of various types. It could be useful for fuzz testing,
generating dummy data, or other applications. It has no dependencies
outside the standard library.")
(license license:bsd-3)))
(define-public python-scp
(package
(name "python-scp")
@ -6716,14 +6759,14 @@ Python.")
(define-public python-markdown
(package
(name "python-markdown")
(version "3.1.1")
(version "3.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "Markdown" version))
(sha256
(base32
"0yhylk4ffqqs7x086fav4pnfsl1021v7lghznzkififprmmqfl1f"))))
"1gwqrhrp0n9xllgmjc8n1p260968kr0dd2jncjkj4r617q61imss"))))
(build-system python-build-system)
(native-inputs
`(("python-nose" ,python-nose)
@ -6735,10 +6778,21 @@ Python.")
Markdown. The library features international input, various Markdown
extensions, and several HTML output formats. A command line wrapper
markdown_py is also provided to convert Markdown files to HTML.")
(properties `((python2-variant . ,(delay python2-markdown))))
(license license:bsd-3)))
;; Markdown 3.2 dropped support for Python 2.
(define-public python2-markdown
(package-with-python2 python-markdown))
(let ((base (package-with-python2 (strip-python2-variant python-markdown))))
(package/inherit
base
(version "3.1.1")
(source (origin
(method url-fetch)
(uri (pypi-uri "Markdown" version))
(sha256
(base32
"0yhylk4ffqqs7x086fav4pnfsl1021v7lghznzkififprmmqfl1f")))))))
(define-public python-ptyprocess
(package
@ -7427,14 +7481,14 @@ responses, rather than doing any computation.")
(define-public python-pip
(package
(name "python-pip")
(version "19.2.1")
(version "20.0.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pip" version))
(sha256
(base32
"100sd12ss4mbdj5lf3wawad29cm573b27765mq098x6xhcj71395"))))
"0zwnlsjn6mb742cr995zfbk9v56ygxp8w3k49601r9by9kmcic3x"))))
(build-system python-build-system)
(arguments
'(#:tests? #f)) ; there are no tests in the pypi archive.
@ -8867,7 +8921,7 @@ Pytest but stripped of Pytest specific details.")
`(; FIXME: Missing: ("python-pytest-timeout" ,python-pytest-timeout)
("python-pytest" ,python-pytest) ; >= 2.3.5
("python-setuptools-scm" ,python-setuptools-scm)))
(home-page "http://tox.testrun.org/")
(home-page "https://tox.readthedocs.io")
(synopsis "Virtualenv-based automation of test activities")
(description "Tox is a generic virtualenv management and test command line
tool. It can be used to check that a package installs correctly with
@ -10505,13 +10559,13 @@ Wikipedia code samples at
(define-public python-cleo
(package
(name "python-cleo")
(version "0.6.8")
(version "0.7.6")
(source (origin
(method url-fetch)
(uri (pypi-uri "cleo" version))
(sha256
(base32
"06zp695hq835rkaq6irr1ds1dp2qfzyf32v60vxpd8rcnxv319l5"))))
"02dlc0rn43zgvw0s5v4j80bca9n1jfpwy3r78gn9qjgk0qj39kwr"))))
(build-system python-build-system)
(native-inputs
`( ;; For testing
@ -10520,6 +10574,7 @@ Wikipedia code samples at
("python-pytest" ,python-pytest)))
(propagated-inputs
`(("python-backpack" ,python-backpack)
("python-clikit" ,python-clikit)
("python-pastel" ,python-pastel)
("python-pylev" ,python-pylev)))
(home-page "https://github.com/sdispater/cleo")
@ -10535,14 +10590,14 @@ docstring and colored output.")
(define-public python-tomlkit
(package
(name "python-tomlkit")
(version "0.5.7")
(version "0.5.8")
(source
(origin
(method url-fetch)
(uri (pypi-uri "tomlkit" version))
(sha256
(base32
"18820ga5z3if1w8dvykxrfm000akracq01ic402xrbljgbn5grn4"))))
"0sf2a4q61kf344hjbw8kb6za1hlccl89j9lzqw0l2zpddp0hrh9j"))))
(build-system python-build-system)
(native-inputs
`(("python-pytest" ,python-pytest)))
@ -10602,14 +10657,14 @@ more, possibly remote, memcached servers.")
(define-public python-clikit
(package
(name "python-clikit")
(version "0.2.4")
(version "0.4.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "clikit" version))
(sha256
(base32
"0dc8czib5f4j9px1ivcpqnmivnx2zjpc0xb00ldrhsqylks7r06n"))))
"10gab65pq0jdf589n33sj2513pxal2lisl4xwf1ijysdjxmpdr4a"))))
(build-system python-build-system)
(propagated-inputs
`(("python-pastel" ,python-pastel)
@ -15453,7 +15508,7 @@ under Python 2.7.")
(define-public pybind11
(package
(name "pybind11")
(version "2.3.0")
(version "2.4.3")
(source (origin
(method git-fetch)
(uri (git-reference
@ -15461,23 +15516,43 @@ under Python 2.7.")
(commit (string-append "v" version))))
(sha256
(base32
"11b6dniri8m05spfd2a19irz82shf4sdca73566bniggrf3zclnf"))
"0k89w4bsfbpzw963ykg1cyszi3h3nk393qd31m6y46pcfxkqh4rd"))
(file-name (git-file-name name version))))
(build-system cmake-build-system)
(native-inputs
`(("python" ,python)
("python-pytest" ,python-pytest)))
`(("python" ,python-wrapper)
;; The following dependencies are used for tests.
("python-pytest" ,python-pytest)
("catch" ,catch-framework2-1)
("eigen" ,eigen)))
(arguments
`(#:test-target "check"))
`(#:configure-flags
(list (string-append "-DCATCH_INCLUDE_DIR="
(assoc-ref %build-inputs "catch")
"/include/catch"))
#:phases (modify-phases %standard-phases
(add-after 'install 'install-python
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(with-directory-excursion "../source"
(setenv "PYBIND11_USE_CMAKE" "yes")
(invoke "python" "setup.py" "install"
"--single-version-externally-managed"
"--root=/"
(string-append "--prefix=" out)))))))
#:test-target "check"))
(home-page "https://github.com/pybind/pybind11/")
(synopsis "Seamless operability between C++11 and Python")
(description "pybind11 is a lightweight header-only library that exposes
C++ types in Python and vice versa, mainly to create Python bindings of
existing C++ code. Its goals and syntax are similar to the excellent
Boost.Python library by David Abrahams: to minimize boilerplate code in
traditional extension modules by inferring type information using compile-time
introspection.")
(license license:expat)))
(description
"@code{pybind11} is a lightweight header-only library that exposes C++
types in Python and vice versa, mainly to create Python bindings of existing
C++ code. Its goals and syntax are similar to the @code{Boost.Python}
library: to minimize boilerplate code in traditional extension modules by
inferring type information using compile-time introspection.")
(license license:bsd-3)))
(define-public python-fasteners
(package

222
gnu/packages/rust-apps.scm
View File

@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019, 2020 John Soo <jsoo1@asu.edu>
;;; Copyright © 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;;
;;; This file is part of GNU Guix.
;;;
@ -24,14 +25,184 @@
#:use-module (guix packages)
#:use-module (gnu packages compression)
#:use-module (gnu packages crates-io)
#:use-module (gnu packages documentation)
#:use-module (gnu packages jemalloc)
#:use-module (gnu packages pcre)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages tls)
#:use-module (gnu packages version-control))
(define-public exa
(package
(name "exa")
(version "0.9.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "exa" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
"1s902xgplz1167k0r7x235p914lprpsqy2if0kpa1mlb0fswqqq4"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-ansi-term" ,rust-ansi-term-0.12)
("rust-datetime" ,rust-datetime-0.4)
("rust-env-logger" ,rust-env-logger-0.6)
("rust-git2" ,rust-git2-0.9)
("rust-glob" ,rust-glob-0.3)
("rust-lazy-static" ,rust-lazy-static-1)
("rust-libc" ,rust-libc-0.2)
("rust-locale" ,rust-locale-0.2)
("rust-log" ,rust-log-0.4)
("rust-natord" ,rust-natord-1.0)
("rust-num-cpus" ,rust-num-cpus-1.11)
("rust-number-prefix" ,rust-number-prefix-0.3)
("rust-scoped-threadpool" ,rust-scoped-threadpool-0.1)
("rust-term-grid" ,rust-term-grid-0.1)
("rust-term-size" ,rust-term-size-0.3)
("rust-unicode-width" ,rust-unicode-width-0.1)
("rust-users" ,rust-users-0.9)
("rust-zoneinfo-compiled" ,rust-zoneinfo-compiled-0.4))
#:cargo-development-inputs
(("rust-datetime" ,rust-datetime-0.4))
#:phases
(modify-phases %standard-phases
(add-after 'configure 'dont-vendor-sources
(lambda* (#:key inputs #:allow-other-keys)
(let ((openssl (assoc-ref inputs "openssl")))
(setenv "OPENSSL_DIR" openssl))
#t))
;; Ignoring failing tests.
;; Reported in https://github.com/ogham/exa/issues/318
(add-before 'check 'disable-failing-tests
(lambda _
(substitute* "src/options/mod.rs"
(("^.*fn oneline_across.*" oneline-across)
(string-append "#[ignore]\n" oneline-across)))
(substitute* "src/options/view.rs"
(("test!\\(across:.*") "")
(("test!\\(empty:.*") "")
(("test!\\(gracross:.*") "")
(("test!\\(grid:.*") "")
(("test!\\(icons:.*") "")
(("test!\\(just_binary:.*") "")
(("test!\\(just_blocks:.*") "")
(("test!\\(just_bytes:.*") "")
(("test!\\(just_git:.*") "")
(("test!\\(just_group:.*") "")
(("test!\\(just_header:.*") "")
(("test!\\(just_inode:.*") "")
(("test!\\(just_links:.*") "")
(("test!\\(leg:.*") "")
(("test!\\(lid:.*") "")
(("test!\\(original_g:.*") ""))
#t))
(add-after 'install 'install-extras
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(share (string-append out "/share"))
(man1 (string-append share "/man/man1")))
(install-file "contrib/man/exa.1" man1)
(mkdir-p (string-append out "/etc/bash_completion.d"))
(mkdir-p (string-append share "/fish/vendor_completions.d"))
(mkdir-p (string-append share "/zsh/site-functions"))
(copy-file "contrib/completions.bash"
(string-append out "/etc/bash_completion.d/exa"))
(copy-file "contrib/completions.fish"
(string-append share "/fish/vendor_completions.d/exa.fish"))
(copy-file "contrib/completions.zsh"
(string-append share "/zsh/site-functions/_exa"))
#t))))))
(inputs
`(("libgit2" ,libgit2)
("zlib" ,zlib)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "https://the.exa.website/")
(synopsis "Modern replacement for ls")
(description "@code{exa} is a modern replacement for the command-line
program @code{ls}. It uses colours to distinguish file types and metadata. It
also knows about symlinks, extended attributes, and Git.")
(license license:expat)))
(define-public fd
(package
(name "fd")
(version "7.4.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "fd-find" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
"147m872zff0srwq9vaxkkbab06g3fkklbk1g2lx90vdhgs37f5xj"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-ansi-term" ,rust-ansi-term-0.12)
("rust-atty" ,rust-atty-0.2)
("rust-clap" ,rust-clap-2)
("rust-ctrlc" ,rust-ctrlc-3.1)
("rust-globset" ,rust-globset-0.4)
("rust-humantime" ,rust-humantime-1.3)
("rust-ignore" ,rust-ignore-0.4)
("rust-jemallocator" ,rust-jemallocator-0.3)
("rust-lazy-static" ,rust-lazy-static-1)
("rust-libc" ,rust-libc-0.2)
("rust-lscolors" ,rust-lscolors-0.6)
("rust-num-cpus" ,rust-num-cpus-1.10)
("rust-regex" ,rust-regex-1.3)
("rust-regex-syntax" ,rust-regex-syntax-0.6)
("rust-version-check" ,rust-version-check-0.9))
#:cargo-development-inputs
(("rust-diff" ,rust-diff-0.1)
("rust-filetime" ,rust-filetime-0.2)
("rust-tempdir" ,rust-tempdir-0.3))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-jemalloc
(lambda* (#:key inputs #:allow-other-keys)
(let ((jemalloc (assoc-ref inputs "jemalloc")))
(setenv "JEMALLOC_OVERRIDE"
(string-append jemalloc "/lib/libjemalloc.so")))
#t))
(add-after 'install 'install-extra
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(install-completion
(lambda (completion out-dir)
(for-each
(lambda (f)
(install-file f (string-append out out-dir)))
(find-files "target/release/build/" completion)))))
;; Manpages
(install-file "doc/fd.1" (string-append out "/share/man/man1"))
;; Completions
(install-completion "^fd.bash$" "/etc/bash-completion.d")
(install-completion "^fd.fish$" "/share/fish/vendor_completions.d")
(install-completion "^_fd$" "/share/zsh/site-functions")
(rename-file (string-append out "/etc/bash-completion.d/fd.bash")
(string-append out "/etc/bash-completion.d/fd"))
#t))))))
(inputs `(("jemalloc" ,jemalloc)))
(home-page "https://github.com/sharkdp/fd")
(synopsis "Simple, fast and user-friendly alternative to find")
(description
"@code{fd} is a simple, fast and user-friendly alternative to @code{find}.
While it does not seek to mirror all of find's powerful functionality, it
provides defaults for 80% of the use cases.")
(license (list license:expat license:asl2.0))))
(define-public ripgrep
(package
(name "ripgrep")
(version "11.0.1")
(version "11.0.2")
(source
(origin
(method url-fetch)
@ -40,25 +211,54 @@
(string-append name "-" version ".tar.gz"))
(sha256
(base32
"0bn40lz9n08llq615p4qqqbi24zbkf0appfx3zgxg34a86ga9zds"))))
"0vqjr96s2rs45715hzf0g0wjahig4zjyiqfijmzzg4jyh9ni80yr"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-bstr" ,rust-bstr-0.1)
(("rust-bstr" ,rust-bstr-0.2)
("rust-clap" ,rust-clap-2)
("rust-grep" ,rust-grep-0.2)
("rust-ignore" ,rust-ignore-0.4)
("rust-lazy-static" ,rust-lazy-static-1.3)
("rust-jemallocator" ,rust-jemallocator-0.3)
("rust-lazy-static" ,rust-lazy-static-1)
("rust-log" ,rust-log-0.4)
("rust-num-cpus" ,rust-num-cpus-1.10)
("rust-regex" ,rust-regex-1.1)
("rust-serde-json" ,rust-serde-json-1.0)
("rust-termcolor" ,rust-termcolor-1.0))
#:cargo-development-inputs
(("rust-clap" ,rust-clap-2)
("rust-lazy-static" ,rust-lazy-static-1.3)
("rust-serde" ,rust-serde-1.0)
("rust-serde-derive" ,rust-serde-derive-1.0))))
(("rust-serde" ,rust-serde-1.0)
("rust-serde-derive" ,rust-serde-derive-1.0))
#:modules ((ice-9 match)
(guix build cargo-build-system)
(guix build utils))
#:phases
(modify-phases %standard-phases
(add-after 'build 'install-manpage
;; NOTE: This is done before 'check so that there's only one output
;; directory with the man page.
(lambda* (#:key outputs #:allow-other-keys)
(match (find-files "target" "^rg\\.1$")
((manpage)
(install-file manpage (string-append
(assoc-ref outputs "out")
"/share/man/man1"))))
#t))
(replace 'install
;; Adapted from (guix build cargo-build-system). The flags need to
;; be passed to `cargo install' too, as otherwise it will build
;; another binary, without the features.
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(mkdir-p out)
(setenv "CARGO_TARGET_DIR" "./target")
(invoke "cargo" "install" "--path" "." "--root" out
"--features" "pcre2")))))
#:cargo-build-flags '("--release" "--features" "pcre2")))
(native-inputs
`(("asciidoc" ,asciidoc)
("pcre2" ,pcre2)
("pkg-config" ,pkg-config)))
(home-page "https://github.com/BurntSushi/ripgrep")
(synopsis "Line-oriented search tool")
(description
@ -70,7 +270,7 @@ gitignore rules.")
(define-public rust-cbindgen
(package
(name "rust-cbindgen")
(version "0.12.2")
(version "0.13.0")
(source
(origin
(method url-fetch)
@ -78,7 +278,7 @@ gitignore rules.")
(file-name (string-append name "-" version ".crate"))
(sha256
(base32
"13jzbmjz1bmmfr0i80hw6ar484mgabx3hbpb2ynhk0ddqi0yr58m"))))
"1kywaz62cglg8fv0p7mp1m946gwmrf62s8ffndd5zpf1mz21j472"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
@ -134,7 +334,7 @@ gitignore rules.")
(("rust-git2" ,rust-git2-0.11)
("rust-handlebars" ,rust-handlebars-2.0)
("rust-ignore" ,rust-ignore-0.4)
("rust-lazy-static" ,rust-lazy-static-1.4)
("rust-lazy-static" ,rust-lazy-static-1)
("rust-regex" ,rust-regex-1.3)
("rust-serde-json" ,rust-serde-json-1.0)
("rust-tempfile" ,rust-tempfile-3.0))

2
gnu/packages/rust.scm
View File

@ -182,7 +182,7 @@
(copy-file "run_rustc/Makefile"
(string-append run_rustc "/Makefile"))
#t))))))
(synopsis "Compiler for the Rust progamming language")
(synopsis "Compiler for the Rust programming language")
(description "Rust is a systems programming language that provides memory
safety and thread safety guarantees.")
(home-page "https://github.com/thepowersgang/mrustc")

26
gnu/packages/samba.scm
View File

@ -4,7 +4,7 @@
;;; Copyright © 2016, 2017, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@openmailbox.org>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017, 2018 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017, 2018, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019 Rutger Helling <rhelling@mykolab.com>
@ -423,26 +423,16 @@ key-value pair databases and a real LDAP database.")
(define-public ppp
(package
(name "ppp")
(version "2.4.7")
(version "2.4.8")
(source (origin
(method url-fetch)
(uri (string-append "https://www.samba.org/ftp/ppp/ppp-"
version ".tar.gz"))
(patches
(list (origin
;; Use OpenSSL for cryptography instead of the obsolete glibc
;; crypto functions that were removed in glibc 2.28.
(method url-fetch)
(uri (string-append "https://github.com/paulusmack/ppp/commit/"
"3c7b86229f7bd2600d74db14b1fe5b3896be3875"
".patch"))
(file-name "ppp-use-openssl-crypto.patch")
(sha256
(base32
"0qlbi247lx3injpy8a1gcij9yilik0vfaibkpvdp88k3sa1rs69z")))))
(method git-fetch)
(uri (git-reference
(url "https://github.com/paulusmack/ppp")
(commit (string-append "ppp-" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0c7vrjxl52pdwi4ckrvfjr08b31lfpgwf3pp0cqy76a77vfs7q02"))))
"1i88m79h6g3fzsb4yw3k8bq1grsx3hsyawm7id2vcaab0gfqzjjv"))))
(build-system gnu-build-system)
(arguments
'(#:tests? #f ; no check target

7
gnu/packages/scanner.scm
View File

@ -131,6 +131,13 @@ package contains the library, but no drivers.")
((#:phases phases)
`(modify-phases ,phases
(delete 'disable-backends)
(add-after 'disable-failing-tests 'disable-failing-backend-tests
(lambda _
;; Disable test that fails on i686:
;; <https://bugs.gnu.org/39449>
(substitute* "testsuite/backend/genesys/Makefile.in"
((" genesys_unit_tests\\$\\(EXEEXT\\)") ""))
#t))
(add-after 'unpack 'add-backends
(lambda _
(substitute* "backend/dll.conf.in"

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