me
/
guix
Archived
1
0
Fork 0
Code

Merge branch 'master' into core-updates 

Conflicts:
	gnu/packages/admin.scm
	gnu/packages/commencement.scm
	gnu/packages/guile.scm
	gnu/packages/linux.scm
	gnu/packages/package-management.scm
	gnu/packages/pulseaudio.scm
	gnu/packages/web.scm
master
Marius Bakke 2020-03-30 12:17:33 +02:00
parent ee401ed924 927f365566
commit ae0badf5bb
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
92 changed files with 1789 additions and 819 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.mailmap
View File

@ -6,7 +6,7 @@ Al McElrath <hello@yrns.org> <hello@atonesir.com>
Alex Sassmannshausen <alex@pompo.co> <alex.sassmannshausen@gmail.com> Alex Sassmannshausen <alex@pompo.co> <alex.sassmannshausen@gmail.com>
Alexander I. Grafov <grafov@gmail.com> Alexander I. Grafov <grafov@gmail.com>
Alírio Eyng <alirioeyng@gmail.com> Alírio Eyng <alirioeyng@gmail.com>
Amin Bandali <mab@gnu.org> <bandali@gnu.org> Amin Bandali <bandali@gnu.org> <mab@gnu.org>
Amirouche Boubekki <amirouche@hypermove.net> Amirouche Boubekki <amirouche@hypermove.net>
Andreas Enge <andreas@enge.fr> <andreas.enge@inria.fr> Andreas Enge <andreas@enge.fr> <andreas.enge@inria.fr>
Andreas Enge <andreas@enge.fr> <privat@xobs-novena> Andreas Enge <andreas@enge.fr> <privat@xobs-novena>

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

@ -61,6 +61,9 @@
("atheia" ("atheia"
;; primary: "3B12 9196 AE30 0C3C 0E90 A26F A715 5567 3271 9948" ;; primary: "3B12 9196 AE30 0C3C 0E90 A26F A715 5567 3271 9948"
"9A2B 401E D001 0650 1584 BAAC 8BC4 F447 6E8A 8E00") "9A2B 401E D001 0650 1584 BAAC 8BC4 F447 6E8A 8E00")
("bandali"
;; primary: "BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103"
"39B3 3C8D 9448 0D2D DCC2 A498 8B44 A0CD C7B9 56F2")
("bavier" ("bavier"
;; primary: "34FF 38BC D151 25A6 E340 A0B5 3453 2F9F AFCA 8B8E" ;; primary: "34FF 38BC D151 25A6 E340 A0B5 3453 2F9F AFCA 8B8E"
"A0C5 E352 2EF8 EF5C 64CD B7F0 FD73 CAC7 19D3 2566") "A0C5 E352 2EF8 EF5C 64CD B7F0 FD73 CAC7 19D3 2566")
@ -133,9 +136,6 @@
"B051 5948 F1E7 D3C1 B980 38A0 2646 FA30 BACA 7F08") "B051 5948 F1E7 D3C1 B980 38A0 2646 FA30 BACA 7F08")
("lsl88" ("lsl88"
"2AE3 1395 932B E642 FC0E D99C 9BED 6EDA 32E5 B0BC") "2AE3 1395 932B E642 FC0E D99C 9BED 6EDA 32E5 B0BC")
("mab"
;; primary: "BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103"
"39B3 3C8D 9448 0D2D DCC2 A498 8B44 A0CD C7B9 56F2")
("marusich" ("marusich"
"CBF5 9755 CBE7 E7EF EF18 3FB1 DD40 9A15 D822 469D") "CBF5 9755 CBE7 E7EF EF18 3FB1 DD40 9A15 D822 469D")
("mbakke" ("mbakke"

6
doc/guix.texi
View File

@ -22233,9 +22233,9 @@ It has the following parameters:
@item @code{nfs-utils} (default: @code{nfs-utils}) @item @code{nfs-utils} (default: @code{nfs-utils})
The nfs-utils package to use. The nfs-utils package to use.
@item @code{nfs-version} (default: @code{#f}) @item @code{nfs-versions} (default: @code{'("4.2" "4.1" "4.0")})
If a string value is provided, the @command{rpc.nfsd} daemon will be If a list of string values is provided, the @command{rpc.nfsd} daemon
limited to supporting the given version of the NFS protocol. will be limited to supporting the given versions of the NFS protocol.
@item @code{exports} (default: @code{'()}) @item @code{exports} (default: @code{'()})
This is a list of directories the NFS server should export. Each entry This is a list of directories the NFS server should export. Each entry

11
gnu/build/vm.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; 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 © 2016 Christopher Allan Webber <cwebber@dustycloud.org> ;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
@ -183,6 +183,15 @@ the #:references-graphs parameter of 'derivation'."
'()) '())
arch-specific-flags)) arch-specific-flags))
(unless (file-exists? "xchg/.exit-status")
(error "VM did not produce an exit code"))
(match (call-with-input-file "xchg/.exit-status" read)
(0 #t)
(status (error "guest VM code exited with a non-zero status" status)))
(delete-file "xchg/.exit-status")
;; When MAKE-DISK-IMAGE? is true, the image is in OUTPUT already. ;; When MAKE-DISK-IMAGE? is true, the image is in OUTPUT already.
(unless make-disk-image? (unless make-disk-image?
(if single-file-output? (if single-file-output?

4
gnu/local.mk
View File

@ -25,7 +25,7 @@
# Copyright © 2019 Jonathan Brielmaier <jonathan.brielmaier@web.de> # Copyright © 2019 Jonathan Brielmaier <jonathan.brielmaier@web.de>
# Copyright © 2019 Evan Straw <evan.straw99@gmail.com> # Copyright © 2019 Evan Straw <evan.straw99@gmail.com>
# Copyright © 2019 Brett Gilio <brettg@gnu.org> # Copyright © 2019 Brett Gilio <brettg@gnu.org>
# Copyright © 2019 Amin Bandali <mab@gnu.org> # Copyright © 2019 Amin Bandali <bandali@gnu.org>
# Copyright © 2020 Brendan Tildesley <mail@brendan.scot> # Copyright © 2020 Brendan Tildesley <mail@brendan.scot>
# Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> # Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
# #
@ -138,6 +138,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/cups.scm \ %D%/packages/cups.scm \
%D%/packages/curl.scm \ %D%/packages/curl.scm \
%D%/packages/cvassistant.scm \ %D%/packages/cvassistant.scm \
%D%/packages/cybersecurity.scm \
%D%/packages/cyrus-sasl.scm \ %D%/packages/cyrus-sasl.scm \
%D%/packages/databases.scm \ %D%/packages/databases.scm \
%D%/packages/datamash.scm \ %D%/packages/datamash.scm \
@ -1019,7 +1020,6 @@ dist_patch_DATA = \
%D%/packages/patches/gtksourceview-2-add-default-directory.patch \ %D%/packages/patches/gtksourceview-2-add-default-directory.patch \
%D%/packages/patches/gzdoom-search-in-installed-share.patch \ %D%/packages/patches/gzdoom-search-in-installed-share.patch \
%D%/packages/patches/gzdoom-find-system-libgme.patch \ %D%/packages/patches/gzdoom-find-system-libgme.patch \
%D%/packages/patches/hash-extender-test-suite.patch \
%D%/packages/patches/haskell-mode-unused-variables.patch \ %D%/packages/patches/haskell-mode-unused-variables.patch \
%D%/packages/patches/haskell-mode-make-check.patch \ %D%/packages/patches/haskell-mode-make-check.patch \
%D%/packages/patches/hdf4-architectures.patch \ %D%/packages/patches/hdf4-architectures.patch \

111
gnu/packages/admin.scm
View File

@ -32,6 +32,7 @@
;;; Copyright © 2019, 2020 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2019, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com> ;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -49,11 +50,6 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages admin) (define-module (gnu packages admin)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix utils)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#:use-module (guix build-system emacs) #:use-module (guix build-system emacs)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
@ -61,42 +57,59 @@
#:use-module (guix build-system perl) #:use-module (guix build-system perl)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module (guix build-system trivial) #:use-module (guix build-system trivial)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix utils)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages algebra) #:use-module (gnu packages algebra)
#:use-module (gnu packages autotools)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages bash) #:use-module (gnu packages bash)
#:use-module (gnu packages bison)
#:use-module (gnu packages boost)
#:use-module (gnu packages c) #:use-module (gnu packages c)
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages compression)
#:use-module (gnu packages cross-base)
#:use-module (gnu packages crypto) #:use-module (gnu packages crypto)
#:use-module (gnu packages cryptsetup) #:use-module (gnu packages cryptsetup)
#:use-module (gnu packages cyrus-sasl) #:use-module (gnu packages cyrus-sasl)
#:use-module (gnu packages dns) #:use-module (gnu packages dns)
#:use-module (gnu packages elf)
#:use-module (gnu packages file) #:use-module (gnu packages file)
#:use-module (gnu packages ncurses) #:use-module (gnu packages flex)
#:use-module (gnu packages readline)
#:use-module (gnu packages hurd)
#:use-module (gnu packages libbsd)
#:use-module (gnu packages linux)
#:use-module (gnu packages lua)
#:use-module (gnu packages guile)
#:use-module (gnu packages gettext) #:use-module (gnu packages gettext)
#:use-module (gnu packages gl)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
#:use-module (gnu packages groff)
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
#:use-module (gnu packages hurd)
#:use-module (gnu packages image)
#:use-module (gnu packages imagemagick) #:use-module (gnu packages imagemagick)
#:use-module (gnu packages inkscape) #:use-module (gnu packages inkscape)
#:use-module (gnu packages kerberos)
#:use-module (gnu packages libbsd)
#:use-module (gnu packages libftdi)
#:use-module (gnu packages libunwind)
#:use-module (gnu packages libusb)
#:use-module (gnu packages linux)
#:use-module (gnu packages lua)
#:use-module (gnu packages man)
#:use-module (gnu packages mcrypt)
#:use-module (gnu packages mpi)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages openldap)
#:use-module (gnu packages patchutils)
#:use-module (gnu packages pciutils)
#:use-module (gnu packages pcre) #:use-module (gnu packages pcre)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages perl-check) #:use-module (gnu packages perl-check)
#:use-module (gnu packages tcl)
#:use-module (gnu packages compression)
#:use-module (gnu packages cross-base)
#:use-module (gnu packages tls)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages bison)
#:use-module (gnu packages flex)
#:use-module (gnu packages gl)
#:use-module (gnu packages glib)
#:use-module (gnu packages openldap)
#:use-module (gnu packages mcrypt)
#:use-module (gnu packages patchutils)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages popt) #:use-module (gnu packages popt)
#:use-module (gnu packages python) #:use-module (gnu packages python)
@ -104,28 +117,17 @@
#:use-module (gnu packages python-web) #:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz) #:use-module (gnu packages python-xyz)
#:use-module (gnu packages qt) #:use-module (gnu packages qt)
#:use-module (gnu packages readline)
#:use-module (gnu packages sphinx) #:use-module (gnu packages sphinx)
#:use-module (gnu packages tcl)
#:use-module (gnu packages terminals) #:use-module (gnu packages terminals)
#:use-module (gnu packages texinfo) #:use-module (gnu packages texinfo)
#:use-module (gnu packages groff) #:use-module (gnu packages tls)
#:use-module (gnu packages pciutils)
#:use-module (gnu packages libunwind)
#:use-module (gnu packages libusb)
#:use-module (gnu packages libftdi)
#:use-module (gnu packages image)
#:use-module (gnu packages xorg)
#:use-module (gnu packages xdisorg)
#:use-module (gnu packages man)
#:use-module (gnu packages autotools)
#:use-module (gnu packages gnome)
#:use-module (gnu packages kerberos)
#:use-module (gnu packages gtk)
#:use-module (gnu packages xml)
#:use-module (gnu packages boost)
#:use-module (gnu packages elf)
#:use-module (gnu packages mpi)
#:use-module (gnu packages version-control) #:use-module (gnu packages version-control)
#:use-module (gnu packages web)) #:use-module (gnu packages web)
#:use-module (gnu packages xdisorg)
#:use-module (gnu packages xml)
#:use-module (gnu packages xorg))
(define-public aide (define-public aide
(package (package
@ -1605,7 +1607,7 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).")
(define-public acpica (define-public acpica
(package (package
(name "acpica") (name "acpica")
(version "20200214") (version "20200326")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -1613,7 +1615,7 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0jdasziq184l3iqyp5vhrsbi6g89n10wr0ssliiz0xi3dqwsxcqk")))) "0y08l6djjn87jmsp5kj0myjdb48000g20xlfs0a22jzzi383h3by"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("flex" ,flex) (native-inputs `(("flex" ,flex)
("bison" ,bison))) ("bison" ,bison)))
@ -2496,7 +2498,7 @@ throughput (in the same interval).")
(define-public thefuck (define-public thefuck
(package (package
(name "thefuck") (name "thefuck")
(version "3.29") (version "3.30")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -2505,7 +2507,7 @@ throughput (in the same interval).")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1qhxwjjgrzpqrqjv7l2847ywpln76lyd6j8bl9gz2r6kl0fx2fqs")) (base32 "0fnf78956pwhb9cgv1jmgypnkma5xzflkivfrkfiadbgin848yfg"))
(patches (search-patches "thefuck-test-environ.patch")))) (patches (search-patches "thefuck-test-environ.patch"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
@ -2527,7 +2529,8 @@ throughput (in the same interval).")
("python-pyte" ,python-pyte) ("python-pyte" ,python-pyte)
("python-six" ,python-six))) ("python-six" ,python-six)))
(native-inputs (native-inputs
`(("python-mock" ,python-mock) `(("go" ,go)
("python-mock" ,python-mock)
("python-pytest" ,python-pytest) ("python-pytest" ,python-pytest)
("python-pytest-mock" ,python-pytest-mock))) ("python-pytest-mock" ,python-pytest-mock)))
(home-page "https://github.com/nvbn/thefuck") (home-page "https://github.com/nvbn/thefuck")
@ -2880,7 +2883,7 @@ buffers.")
("automake" ,automake) ("automake" ,automake)
("libtool" ,libtool) ("libtool" ,libtool)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(home-page "https://cgit.freedesktop.org/xorg/app/intel-gpu-tools/") (home-page "https://gitlab.freedesktop.org/drm/igt-gpu-tools")
(synopsis "Tools for development and testing of the Intel DRM driver") (synopsis "Tools for development and testing of the Intel DRM driver")
(description "IGT GPU Tools is a collection of tools for development and (description "IGT GPU Tools is a collection of tools for development and
testing of the Intel DRM driver. There are many macro-level test suites that testing of the Intel DRM driver. There are many macro-level test suites that
@ -2893,9 +2896,6 @@ Intel DRM Driver.")
(supported-systems '("i686-linux" "x86_64-linux")) (supported-systems '("i686-linux" "x86_64-linux"))
(license license:expat))) (license license:expat)))
(define-public intel-gpu-tools
(deprecated-package "intel-gpu-tools" igt-gpu-tools))
(define-public fabric (define-public fabric
(package (package
(name "fabric") (name "fabric")
@ -2943,19 +2943,18 @@ tool for remote execution and deployment.")
(license license:bsd-2))) (license license:bsd-2)))
(define-public neofetch (define-public neofetch
(let ((commit "501d6b7594296d9eac8943140f8581daf555873d"))
(package (package
(name "neofetch") (name "neofetch")
(version (git-version "6.1.0" "1" commit)) (version "7.0.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/dylanaraps/neofetch") (url "https://github.com/dylanaraps/neofetch")
(commit commit))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1h5md9jimyc6z4d7w66j27hn8qghzyxgpkh5h9dclzxpp5cs8whb")))) "0xc0fdc7n5bhqirh83agqiy8r14l14zwca07czvj8vgnsnfybslr"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; there are no tests `(#:tests? #f ; there are no tests
@ -2971,7 +2970,7 @@ Bash. Neofetch displays information about your system next to an image, your OS
logo, or any ASCII file of your choice. The main purpose of Neofetch is to be logo, or any ASCII file of your choice. The main purpose of Neofetch is to be
used in screenshots to show other users what operating system or distribution used in screenshots to show other users what operating system or distribution
you are running, what theme or icon set you are using, etc.") you are running, what theme or icon set you are using, etc.")
(license license:expat)))) (license license:expat)))
(define-public screenfetch (define-public screenfetch
(package (package

43
gnu/packages/algebra.scm
View File

@ -10,6 +10,7 @@
;;; Copyright © 2017, 2019 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2017, 2019 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de> ;;; Copyright © 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -433,9 +434,6 @@ maple, mupad and the TI89. It is available as a standalone program (graphic
or text interfaces) or as a C++ library.") or text interfaces) or as a C++ library.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public giac-xcas
(deprecated-package "giac-xcas" giac))
(define-public flint (define-public flint
(package (package
(name "flint") (name "flint")
@ -562,42 +560,50 @@ these types and other mathematical functions.")
(define-public ntl (define-public ntl
(package (package
(name "ntl") (name "ntl")
(version "9.7.0") (version "11.4.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://shoup.net/ntl/ntl-" (uri (string-append "https://shoup.net/ntl/ntl-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (base32 (sha256
"115frp5flyvw9wghz4zph1b3llmr5nbxk1skgsggckr81fh3gmxq")))) (base32
"1lisp3064rch3jaa2wrhy1s9kll7i3ka3d0y6lj6l3l4ckfcrhdp"))
(modules '((guix build utils)))
(snippet
'(begin
(delete-file-recursively "src/libtool-origin")
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("libtool" ,libtool) `(("libtool" ,libtool)
("perl" ,perl))) ; for configuration ("perl" ,perl))) ; for configuration
;; FIXME: Add optional input gf2x once available; then also add
;; configure flag "NTL_GF2X_LIB=on".
(inputs (inputs
`(("gmp" ,gmp))) `(("gmp" ,gmp)
("gf2x" ,gf2x)))
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'configure (replace 'configure
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(chdir "src") (chdir "src")
(system* "./configure" (invoke "./configure"
(string-append "PREFIX=" (assoc-ref outputs "out")) (string-append "PREFIX=" (assoc-ref outputs "out"))
(string-append "LIBTOOL=" (assoc-ref inputs "libtool") "/bin/libtool")
;; set the library prefixes explicitly so that they get
;; embedded in the .la file
(string-append "GMP_PREFIX=" (assoc-ref inputs "gmp"))
(string-append "GF2X_PREFIX=" (assoc-ref inputs "gf2x"))
;; Do not build especially for the build machine. ;; Do not build especially for the build machine.
"NATIVE=off" "NATIVE=off"
;; Also do not tune to the build machine. "NTL_GF2X_LIB=on"
"WIZARD=off" "SHARED=on"))))))
"SHARED=on")
#t)))))
(synopsis "C++ library for number theory") (synopsis "C++ library for number theory")
(description (description
"NTL is a C++ library providing data structures and algorithms "NTL is a C++ library providing data structures and algorithms
for manipulating signed, arbitrary length integers, and for vectors, for manipulating signed, arbitrary length integers, and for vectors,
matrices, and polynomials over the integers and over finite fields.") matrices, and polynomials over the integers and over finite fields.")
(license license:gpl2+) (license license:gpl2+)
(home-page "http://shoup.net/ntl/"))) (home-page "https://shoup.net/ntl/")))
(define-public singular (define-public singular
(package (package
@ -1437,8 +1443,7 @@ of M4RI from F_2 to F_{2^e}.")
("automake" ,automake) ("automake" ,automake)
("libtool" ,libtool))) ("libtool" ,libtool)))
(inputs (inputs
`(("gmp" ,gmp) `(("ntl" ,ntl)
("ntl" ,ntl)
("pari-gp" ,pari-gp))) ("pari-gp" ,pari-gp)))
(synopsis "Ranks of elliptic curves and modular symbols") (synopsis "Ranks of elliptic curves and modular symbols")
(description "The eclib package includes mwrank (for 2-descent on (description "The eclib package includes mwrank (for 2-descent on

4
gnu/packages/assembly.scm
View File

@ -259,7 +259,7 @@ runtime")
(define-public rgbds (define-public rgbds
(package (package
(name "rgbds") (name "rgbds")
(version "0.3.9") (version "0.3.10")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -268,7 +268,7 @@ runtime")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0pzd9ig3ahpgq7jbj82grllxx1v01d620insr2m8h0c6jj25n5hv")))) "0752fbffxgxyf3jw2iij88l05dqhppgcxy7dvk82hp4wdg4cflpq"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases

4
gnu/packages/bioconductor.scm
View File

@ -7302,14 +7302,14 @@ access.")
(define-public r-multiassayexperiment (define-public r-multiassayexperiment
(package (package
(name "r-multiassayexperiment") (name "r-multiassayexperiment")
(version "1.12.5") (version "1.12.6")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "MultiAssayExperiment" version)) (uri (bioconductor-uri "MultiAssayExperiment" version))
(sha256 (sha256
(base32 (base32
"0a7zsq3adg8rph1w2qr75bpmrq53j99rsypmxj9w5mz9q23r2qlr")))) "174vzlxsyayb5il77cb3zzgszxl3l0wkprc9w6pgz4yv5ix13adi"))))
(properties (properties
`((upstream-name . "MultiAssayExperiment"))) `((upstream-name . "MultiAssayExperiment")))
(build-system r-build-system) (build-system r-build-system)

6
gnu/packages/cpp.scm
View File

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017 Ethan R. Jones <doubleplusgood23@gmail.com> ;;; Copyright © 2017 Ethan R. Jones <doubleplusgood23@gmail.com>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Fis Trivial <ybbs.daans@hotmail.com> ;;; Copyright © 2018 Fis Trivial <ybbs.daans@hotmail.com>
;;; Copyright © 2018 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
@ -262,7 +262,7 @@ intuitive syntax and trivial integration.")
(define-public xtl (define-public xtl
(package (package
(name "xtl") (name "xtl")
(version "0.6.8") (version "0.6.13")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (uri
@ -271,7 +271,7 @@ intuitive syntax and trivial integration.")
(commit version))) (commit version)))
(sha256 (sha256
(base32 (base32
"13gm8vm1b9nzvlcc632f9khnjw1xdjqj6c7k51r173y1hlk0div7")) "0py70lm2i3sxzpgca2cic8zfn6dn18q837h76a5fchl2c0kpxm91"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(native-inputs (native-inputs
`(("googletest" ,googletest) `(("googletest" ,googletest)

38
gnu/packages/cran.scm
View File

@ -677,7 +677,11 @@ LaTeX.")
(("if \\(!grepl\\(\"mingw\".*") (("if \\(!grepl\\(\"mingw\".*")
"if (FALSE)\n")) "if (FALSE)\n"))
(substitute* "src/handle.c" (substitute* "src/handle.c"
(("#ifdef _WIN32") "#if 1")) (("/\\* Only set" m)
(string-append "\
const char *_ca_bundle = getenv(\"CURL_CA_BUNDLE\");
if(_ca_bundle != NULL) { curl_easy_setopt(handle, CURLOPT_CAINFO, _ca_bundle); }
" m)))
#t))))) #t)))))
(inputs (inputs
`(("libcurl" ,curl) `(("libcurl" ,curl)
@ -2107,14 +2111,14 @@ package also provides a C++ API, that works with or without Rcpp.")
(define-public r-ggally (define-public r-ggally
(package (package
(name "r-ggally") (name "r-ggally")
(version "1.4.0") (version "1.5.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "GGally" version)) (uri (cran-uri "GGally" version))
(sha256 (sha256
(base32 (base32
"1zjmcc5bzagvy7c5cmdcl39xmx07fwi98yrj4i05w7y40kqcsiws")))) "082s321zspg5al6acigwrhg4fsrmkkk5caabg662qbcy8v6n34h6"))))
(properties `((upstream-name . "GGally"))) (properties `((upstream-name . "GGally")))
(build-system r-build-system) (build-system r-build-system)
(inputs (inputs
@ -6086,14 +6090,14 @@ results to the user.")
(define-public r-hdf5r (define-public r-hdf5r
(package (package
(name "r-hdf5r") (name "r-hdf5r")
(version "1.3.1") (version "1.3.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "hdf5r" version)) (uri (cran-uri "hdf5r" version))
(sha256 (sha256
(base32 (base32
"0hvi2cvyv6zlxgpawnmsihxclp2ln88slbrnmaxagmjswskxsrpx")))) "0c2p06k9bp9rf0fyavnxw5d8jr2bbgx3gjblahz581cpvsfksj9i"))))
(build-system r-build-system) (build-system r-build-system)
(inputs (inputs
`(("hdf5" ,hdf5) `(("hdf5" ,hdf5)
@ -6101,6 +6105,8 @@ results to the user.")
(propagated-inputs (propagated-inputs
`(("r-bit64" ,r-bit64) `(("r-bit64" ,r-bit64)
("r-r6" ,r-r6))) ("r-r6" ,r-r6)))
(native-inputs
`(("r-knitr" ,r-knitr)))
(home-page "https://hhoeflin.github.io/hdf5r") (home-page "https://hhoeflin.github.io/hdf5r")
(synopsis "Interface to the HDF5 binary data format") (synopsis "Interface to the HDF5 binary data format")
(description (description
@ -8512,18 +8518,20 @@ differentiation.")
(define-public r-bayestestr (define-public r-bayestestr
(package (package
(name "r-bayestestr") (name "r-bayestestr")
(version "0.5.2") (version "0.5.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "bayestestR" version)) (uri (cran-uri "bayestestR" version))
(sha256 (sha256
(base32 (base32
"1l0kqw793d8fnk0745fllmqwjwnj9srvqzv4baq5s05ls1gbi2mw")))) "1q24qh5p6bz4nbf4546kckh7d518x5pm1yhhbc8fwcnbca4kgqjz"))))
(properties `((upstream-name . "bayestestR"))) (properties `((upstream-name . "bayestestR")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-insight" ,r-insight))) `(("r-insight" ,r-insight)))
(native-inputs
`(("r-knitr" ,r-knitr)))
(home-page "https://github.com/easystats/bayestestR") (home-page "https://github.com/easystats/bayestestR")
(synopsis "Describe Bayesian models and posterior distributions") (synopsis "Describe Bayesian models and posterior distributions")
(description (description
@ -13178,14 +13186,14 @@ tessellation.")
(define-public r-sf (define-public r-sf
(package (package
(name "r-sf") (name "r-sf")
(version "0.8-1") (version "0.9-0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "sf" version)) (uri (cran-uri "sf" version))
(sha256 (sha256
(base32 (base32
"17wyv74m1ppc3s5jdv60r74jj23nidxpzl46vjhfclfhnpvm7sx9")))) "117r9l3v7nkdj9bfy6qr0yz0gd5bv0pwnkc9vk2gv3xqj0h1fpf6"))))
(build-system r-build-system) (build-system r-build-system)
(inputs (inputs
`(("gdal" ,gdal) `(("gdal" ,gdal)
@ -13198,7 +13206,9 @@ tessellation.")
("r-magrittr" ,r-magrittr) ("r-magrittr" ,r-magrittr)
("r-rcpp" ,r-rcpp) ("r-rcpp" ,r-rcpp)
("r-units" ,r-units))) ("r-units" ,r-units)))
(native-inputs `(("pkg-config" ,pkg-config))) (native-inputs
`(("pkg-config" ,pkg-config)
("r-knitr" ,r-knitr)))
(home-page "https://github.com/r-spatial/sf/") (home-page "https://github.com/r-spatial/sf/")
(synopsis "Simple features for R") (synopsis "Simple features for R")
(description (description
@ -13848,14 +13858,14 @@ the corresponding outputs (tables and graphs).")
(define-public r-rjava (define-public r-rjava
(package (package
(name "r-rjava") (name "r-rjava")
(version "0.9-11") (version "0.9-12")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "rJava" version)) (uri (cran-uri "rJava" version))
(sha256 (sha256
(base32 (base32
"0s9cjy1wh7snmbqwznh8f1r4ipylr7mgda4a979z963a8lqy32n2")))) "03vv0pj6san03c51iyqsyb1rwh3097dfpl2s8iswzzmc7k3shj12"))))
(properties `((upstream-name . "rJava"))) (properties `((upstream-name . "rJava")))
(build-system r-build-system) (build-system r-build-system)
(arguments (arguments
@ -15355,14 +15365,14 @@ the current document.")
(define-public r-xgboost (define-public r-xgboost
(package (package
(name "r-xgboost") (name "r-xgboost")
(version "1.0.0.1") (version "1.0.0.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "xgboost" version)) (uri (cran-uri "xgboost" version))
(sha256 (sha256
(base32 (base32
"0fx5qjpjjirzhplddqmxlysyqszp79w74x00b5shp6p2lzy6yd9a")))) "1ld2w51c5fy3bl0kvjn1iplffc4lmin9s9zz5xx7xsm44d6j6kzd"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-data-table" ,r-data-table) `(("r-data-table" ,r-data-table)

10
gnu/packages/crypto.scm
View File

@ -1089,8 +1089,8 @@ API.")
(license license:asl2.0))) (license license:asl2.0)))
(define-public hash-extender (define-public hash-extender
(let ((commit "9ecef26809a1ceea2a455f6f591b004298df551b") (let ((commit "cb8aaee49f93e9c0d2f03eb3cafb429c9eed723d")
(revision "1")) (revision "2"))
(package (package
(name "hash-extender") (name "hash-extender")
(version (git-version "0.0" revision commit)) (version (git-version "0.0" revision commit))
@ -1101,10 +1101,8 @@ API.")
(commit commit))) (commit commit)))
(sha256 (sha256
(base32 (base32
"0fqy3d559zgf71w39py0931d8na0ylils45r8zs6r79wgr6qn78c")) "1fj118566hr1wv03az2w0iqknazsqqkak0mvlcvwpgr6midjqi9b"))
(file-name (git-file-name name version)) (file-name (git-file-name name version))))
(patches
(search-patches "hash-extender-test-suite.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases

46
gnu/packages/cybersecurity.scm 100644
View File

@ -0,0 +1,46 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;;
;;; 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 cybersecurity)
#:use-module (guix download)
#:use-module (guix packages)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix build-system python)
#:use-module (gnu packages engineering))
(define-public ropgadget
(package
(name "ropgadget")
(version "6.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "ROPGadget" version))
(sha256
(base32
"0idiicgpijar9l9kqmfdh865c2mkfgxg0q7lpz77jc09l6q0afjh"))))
(build-system python-build-system)
(propagated-inputs
`(("python-capstone" ,python-capstone)))
(home-page "http://shell-storm.org/project/ROPgadget/")
(synopsis "Semiautomatic return oriented programming")
(description
"This tool lets you search for @acronym{ROP, Return Oriented Programming}
gadgets in binaries. Some facilities are included for automatically generating
chains of gadgets to execute system calls.")
(license license:bsd-3)))

4
gnu/packages/dictionaries.scm
View File

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

4
gnu/packages/education.scm
View File

@ -602,14 +602,14 @@ Portuguese, Spanish and Italian.")
(define-public fet (define-public fet
(package (package
(name "fet") (name "fet")
(version "5.43.2") (version "5.44.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.lalescu.ro/liviu/fet/download/" (uri (string-append "https://www.lalescu.ro/liviu/fet/download/"
"fet-" version ".tar.bz2")) "fet-" version ".tar.bz2"))
(sha256 (sha256
(base32 "111ijwdpdnavi2jjp8jqnwkgi1b9n79svkfw68fmga0z7d3nd62g")))) (base32 "13q3b0g1zz885g15gir8fbalvix8sy42v1p429h0751490wq5c3h"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases

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

@ -43,7 +43,7 @@
;;; Copyright © 2018, 2019 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2018, 2019 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2018, 2019, 2020 Brett Gilio <brettg@gnu.org> ;;; Copyright © 2018, 2019, 2020 Brett Gilio <brettg@gnu.org>
;;; Copyright © 2019, 2020 Dimakakos Dimos <bendersteed@teknik.io> ;;; Copyright © 2019, 2020 Dimakakos Dimos <bendersteed@teknik.io>
;;; Copyright © 2019 Brian Leung <bkleung89@gmail.com> ;;; Copyright © 2019, 2020 Brian Leung <bkleung89@gmail.com>
;;; Copyright © 2019 mikadoZero <mikadozero@yandex.com> ;;; Copyright © 2019 mikadoZero <mikadozero@yandex.com>
;;; Copyright © 2019 Gabriel Hondet <gabrielhondet@gmail.com> ;;; Copyright © 2019 Gabriel Hondet <gabrielhondet@gmail.com>
;;; Copyright © 2019, 2020 Joseph LaFreniere <joseph@lafreniere.xyz> ;;; Copyright © 2019, 2020 Joseph LaFreniere <joseph@lafreniere.xyz>
@ -51,7 +51,7 @@
;;; Copyright © 2019 Baptiste Strazzulla <bstrazzull@hotmail.fr> ;;; Copyright © 2019 Baptiste Strazzulla <bstrazzull@hotmail.fr>
;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org> ;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2019 Jens Mølgaard <jens@zete.tk> ;;; Copyright © 2019 Jens Mølgaard <jens@zete.tk>
;;; Copyright © 2019, 2020 Amin Bandali <mab@gnu.org> ;;; Copyright © 2019, 2020 Amin Bandali <bandali@gnu.org>
;;; Copyright © 2019 Jelle Licht <jlicht@fsfe.org> ;;; Copyright © 2019 Jelle Licht <jlicht@fsfe.org>
;;; Copyright © 2019 Björn Höfling <bjoern.hoefling@bjoernhoefling.de> ;;; Copyright © 2019 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;; Copyright © 2019 Stephen Webber <montokapro@gmail.com> ;;; Copyright © 2019 Stephen Webber <montokapro@gmail.com>
@ -108,6 +108,7 @@
#:use-module (gnu packages guile) #:use-module (gnu packages guile)
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
#:use-module (gnu packages gnome) #:use-module (gnu packages gnome)
#:use-module (gnu packages haskell-apps)
#:use-module (gnu packages ncurses) #:use-module (gnu packages ncurses)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages python-xyz) #:use-module (gnu packages python-xyz)
@ -211,9 +212,6 @@ implementation, Emacs and, ultimately, the schemer, giving them access to live
metadata.") metadata.")
(license license:bsd-3))) (license license:bsd-3)))
(define-public geiser
(deprecated-package "geiser" emacs-geiser))
(define-public emacs-paredit (define-public emacs-paredit
(package (package
(name "emacs-paredit") (name "emacs-paredit")
@ -239,9 +237,6 @@ for those who may want transient periods of unbalanced parentheses, such as
when typing parentheses directly or commenting out code line by line.") when typing parentheses directly or commenting out code line by line.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public paredit
(deprecated-package "paredit" emacs-paredit))
(define-public git-modes (define-public git-modes
(package (package
(name "emacs-git-modes") (name "emacs-git-modes")
@ -263,9 +258,6 @@ when typing parentheses directly or commenting out code line by line.")
configuration files, such as .gitattributes, .gitignore, and .git/config.") configuration files, such as .gitattributes, .gitignore, and .git/config.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public git-modes/old-name
(deprecated-package "git-modes" git-modes))
(define-public emacs-with-editor (define-public emacs-with-editor
(package (package
(name "emacs-with-editor") (name "emacs-with-editor")
@ -395,9 +387,6 @@ cherry picking, reverting, merging, rebasing, and other common Git
operations.") operations.")
(license license:gpl3+)))) (license license:gpl3+))))
(define-public magit
(deprecated-package "magit" emacs-magit))
(define-public emacs-magit-svn (define-public emacs-magit-svn
(let ((commit "9e33ceee32f665db59909e1c00a667ccdd04178f")) (let ((commit "9e33ceee32f665db59909e1c00a667ccdd04178f"))
(package (package
@ -424,9 +413,6 @@ operations.")
support for Git-SVN.") support for Git-SVN.")
(license license:gpl3+)))) (license license:gpl3+))))
(define-public magit-svn
(deprecated-package "magit-svn" emacs-magit-svn))
(define-public emacs-magit-popup (define-public emacs-magit-popup
(package (package
(name "emacs-magit-popup") (name "emacs-magit-popup")
@ -768,9 +754,6 @@ replacement.")
programs.") programs.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public haskell-mode
(deprecated-package "haskell-mode" emacs-haskell-mode))
(define-public emacs-dante (define-public emacs-dante
(let ((commit "38b589417294c7ea44bf65b73b8046d950f9531b") (let ((commit "38b589417294c7ea44bf65b73b8046d950f9531b")
(revision "1")) (revision "1"))
@ -1383,10 +1366,6 @@ light user interface.")
(home-page "https://www.gnu.org/software/emms/") (home-page "https://www.gnu.org/software/emms/")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-emms-player-mpv
;; A new mpv backend is included in Emms from 5.0.
(deprecated-package "emacs-emms-player-mpv" emacs-emms))
(define-public emacs-emms-mode-line-cycle (define-public emacs-emms-mode-line-cycle
(package (package
(name "emacs-emms-mode-line-cycle") (name "emacs-emms-mode-line-cycle")
@ -1485,9 +1464,6 @@ like. It can be linked with various Emacs mail clients (Message and Mail
mode, Rmail, Gnus, MH-E, and VM). BBDB is fully customizable.") mode, Rmail, Gnus, MH-E, and VM). BBDB is fully customizable.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public bbdb
(deprecated-package "bbdb" emacs-bbdb))
(define-public emacs-aggressive-indent (define-public emacs-aggressive-indent
(package (package
(name "emacs-aggressive-indent") (name "emacs-aggressive-indent")
@ -3367,27 +3343,30 @@ for Flow files.")
(define-public emacs-flycheck-grammalecte (define-public emacs-flycheck-grammalecte
(package (package
(name "emacs-flycheck-grammalecte") (name "emacs-flycheck-grammalecte")
(version "0.9") (version "1.0")
(source (origin (source
(origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://git.deparis.io/" (uri (string-append "https://git.deparis.io/"
"flycheck-grammalecte/snapshot/" "flycheck-grammalecte/snapshot/"
"flycheck-grammalecte-" version ".tar.xz")) "flycheck-grammalecte-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32 "02wxaw228dia8cps0v02327hrrribfqb4601qggjpi4l4ms1lf8b"))))
"0wjm9xyra870pci4bcrbnc9x66x18mi7iz08rkxa4clxv28xzryb"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments (arguments
`(#:include '("\\.(el|py)$") `(#:include '("\\.(el|py)$")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'fix-python (add-after 'unpack 'set-external-executables
;; Hardcode python3 executable in the Emacs library. ;; Hardcode python3 and curl executables in the Emacs library.
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((python3 (string-append (assoc-ref inputs "python") (let ((python3 (string-append (assoc-ref inputs "python")
"/bin/python3"))) "/bin/python3"))
(curl (string-append (assoc-ref inputs "curl")
"/bin/curl")))
(substitute* "flycheck-grammalecte.el" (substitute* "flycheck-grammalecte.el"
(("python3") python3)) (("\"python3?") (string-append "\"" python3))
(("\"curl") (string-append "\"" curl)))
#t))) #t)))
(add-after 'install 'link-to-grammalecte (add-after 'install 'link-to-grammalecte
;; The package expects grammalecte to be in a sub-directory. ;; The package expects grammalecte to be in a sub-directory.
@ -3404,7 +3383,8 @@ for Flow files.")
"grammalecte")) "grammalecte"))
#t)))))) #t))))))
(inputs (inputs
`(("grammalecte" ,grammalecte) `(("curl" ,curl)
("grammalecte" ,grammalecte)
("python" ,python))) ("python" ,python)))
(propagated-inputs (propagated-inputs
`(("emacs-flycheck" ,emacs-flycheck))) `(("emacs-flycheck" ,emacs-flycheck)))
@ -10055,9 +10035,6 @@ using ERT. It assumes a certain test structure setup and can therefore make
running tests easier.") running tests easier.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public ert-runner
(deprecated-package "ert-runner" emacs-ert-runner))
(define-public emacs-xtest (define-public emacs-xtest
(package (package
(name "emacs-xtest") (name "emacs-xtest")
@ -11421,9 +11398,6 @@ Groovy source files, REPL integration with run-groovy and Grails project
navigation with the grails mode.") navigation with the grails mode.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public groovy-emacs-modes
(deprecated-package "groovy-emacs-modes" emacs-groovy-modes))
(define-public emacs-org-tree-slide (define-public emacs-org-tree-slide
(let ((commit "036a36eec1cf712d3db155572aed325daa372eb5") (let ((commit "036a36eec1cf712d3db155572aed325daa372eb5")
(revision "2")) (revision "2"))
@ -14040,10 +14014,6 @@ functions.")
time is being spent during Emacs startup in order to optimize startup time.") time is being spent during Emacs startup in order to optimize startup time.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-emms-player-simple-mpv
;; A new mpv backend is included in Emms from 5.0.
(deprecated-package "emacs-emms-player-simple-mpv" emacs-emms))
(define-public emacs-magit-gerrit (define-public emacs-magit-gerrit
(let ((version "0.3") (let ((version "0.3")
(revision "1") (revision "1")
@ -15202,10 +15172,6 @@ and the Zotero research assistant: Insertion of links to Zotero items into an
Org-mode file, and citations of Zotero items in Pandoc Markdown files.") Org-mode file, and citations of Zotero items in Pandoc Markdown files.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-evil-ediff
;; Evil-Ediff is included in Evil Collection from 20180617.
(deprecated-package "emacs-evil-ediff" emacs-evil-collection))
(define-public emacs-evil-magit (define-public emacs-evil-magit
(let ((commit "4b66a1db8285457147a5436f209391016a819ea1") (let ((commit "4b66a1db8285457147a5436f209391016a819ea1")
(revision "3")) (revision "3"))
@ -15242,10 +15208,6 @@ See the README at @url{https://github.com/justbur/evil-magit} for a table
describing the key binding changes.") describing the key binding changes.")
(license license:gpl3+)))) (license license:gpl3+))))
(define-public emacs-evil-mu4e
;; Evil-mu4e is included in Evil Collection from 20180617.
(deprecated-package "emacs-evil-mu4e" emacs-evil-collection))
(define-public emacs-evil-multiedit (define-public emacs-evil-multiedit
(package (package
(name "emacs-evil-multiedit") (name "emacs-evil-multiedit")
@ -15875,10 +15837,6 @@ file.")
@end itemize") @end itemize")
(license license:gpl3+)))) (license license:gpl3+))))
(define-public emacs-wgrep-helm
;; `emacs-wgrep-helm' was mistakenly added.
(deprecated-package "emacs-wgrep-helm" emacs-wgrep))
(define-public emacs-mu4e-conversation (define-public emacs-mu4e-conversation
(let ((commit "98110bb9c300fc9866dee8e0023355f9f79c9b96") (let ((commit "98110bb9c300fc9866dee8e0023355f9f79c9b96")
(revision "5")) (revision "5"))
@ -16071,6 +16029,32 @@ text in neighboring sections.")
Pandoc, the document-conversion tool.") Pandoc, the document-conversion tool.")
(license license:bsd-3))) (license license:bsd-3)))
(define-public emacs-hlint-refactor-mode
(let ((commit "c4307f86aad6d02e32e9b30cb6edc115584c791c")
(revision "1"))
(package
(name "emacs-hlint-refactor-mode")
(version (git-version "0.0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/mpickering/hlint-refactor-mode")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1c71w9s34n0i7mm4njchxn6s3ri1y6mh3akgbg4nq41d42h8iap3"))))
(build-system emacs-build-system)
(propagated-inputs
`(("apply-refact" ,apply-refact)
("hlint" ,hlint)))
(home-page "https://github.com/mpickering/hlint-refactor-mode")
(synopsis "Emacs bindings for @code{hlint}'s @code{--refactor} option")
(description "This package applies refactoring suggestions from
@code{hlint}.")
(license license:expat))))
(define-public emacs-ccls (define-public emacs-ccls
(let ((commit "aab3e31fd716daf59f9794e62d473357263e8cc0") (let ((commit "aab3e31fd716daf59f9794e62d473357263e8cc0")
(revision "4")) (revision "4"))
@ -16297,10 +16281,10 @@ text-tree applications inside GNU Emacs. It consists of 2 subprojects:
(license license:gpl3)))) (license license:gpl3))))
(define-public emacs-helm-org-contacts (define-public emacs-helm-org-contacts
(let ((commit "0af703bd9a43032b89fdf5559673151d1ac2fffc")) (let ((commit "e7f11615802df55bb8b679450b5a5ef82a9081f9"))
(package (package
(name "emacs-helm-org-contacts") (name "emacs-helm-org-contacts")
(version (git-version "20180707" "1" commit)) (version (git-version "20200310" "1" commit))
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -16310,7 +16294,7 @@ text-tree applications inside GNU Emacs. It consists of 2 subprojects:
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1cl7cm2ic9pg4vc9cdh84vzjj1x2lpd5ymimiva8h4l17kiphk4s")))) "06a1gbrq3qcfsn0kyv4i24x1xxfrrwqa3kgfj4xa4va88q2vqyb5"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (propagated-inputs
`(("emacs-dash" ,emacs-dash) `(("emacs-dash" ,emacs-dash)
@ -21649,9 +21633,11 @@ supports generation of phonetic and numeric passwords.")
"1vmazjrfcsa9aa9aw8bq5sazdhqvhxyj837dyw5lmh8gk7z0xdaa")))) "1vmazjrfcsa9aa9aw8bq5sazdhqvhxyj837dyw5lmh8gk7z0xdaa"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(synopsis "Elisp functions for reading and parsing CSV files") (synopsis "Elisp functions for reading and parsing CSV files")
(description "@code{csv.el} provides functions for reading and parsing CSV (Comma (description
Separated Value) files. It follows the format as defined in RFC 4180 \"Common "@code{csv.el} provides functions for reading and parsing @acronym{CSV,
Format and MIME Type for CSV Files\" (@url{http://tools.ietf.org/html/rfc4180}).") Comma-Separated Values} files. It follows the format as defined in RFC 4180
@emph{Common Format and MIME Type for CSV
Files} (@url{http://tools.ietf.org/html/rfc4180}).")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-org-journal (define-public emacs-org-journal

5
gnu/packages/emacs.scm
View File

@ -19,7 +19,7 @@
;;; Copyright © 2019 Jesse John Gildersleve <jessejohngildersleve@zohomail.eu> ;;; Copyright © 2019 Jesse John Gildersleve <jessejohngildersleve@zohomail.eu>
;;; Copyright © 2019 Valentin Ignatev <valentignatev@gmail.com> ;;; Copyright © 2019 Valentin Ignatev <valentignatev@gmail.com>
;;; Copyright © 2019 Leo Prikler <leo.prikler@student.tugraz.at> ;;; Copyright © 2019 Leo Prikler <leo.prikler@student.tugraz.at>
;;; Copyright © 2019 Amin Bandali <mab@gnu.org> ;;; Copyright © 2019 Amin Bandali <bandali@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -290,6 +290,8 @@ languages.")
#t)))) #t))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments emacs) (substitute-keyword-arguments (package-arguments emacs)
((#:configure-flags flags)
`(cons* "--with-harfbuzz" ,flags))
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases `(modify-phases ,phases
;; The 'reset-gzip-timestamps phase will throw a ;; The 'reset-gzip-timestamps phase will throw a
@ -318,6 +320,7 @@ languages.")
#t))))))) #t)))))))
(inputs (inputs
`(("jansson" ,jansson) `(("jansson" ,jansson)
("harfbuzz" ,harfbuzz)
,@(package-inputs emacs))) ,@(package-inputs emacs)))
(native-inputs (native-inputs
`(("autoconf" ,autoconf) ; needed when building from trunk `(("autoconf" ,autoconf) ; needed when building from trunk

3
gnu/packages/emulators.scm
View File

@ -511,7 +511,8 @@ and Game Boy Color games.")
(with-directory-excursion "build/bin/SDL" (with-directory-excursion "build/bin/SDL"
(install-file "sameboy" bin) (install-file "sameboy" bin)
(delete-file "sameboy") (delete-file "sameboy")
(copy-recursively "." data)))))))) (copy-recursively "." data))
#t))))))
(home-page "https://sameboy.github.io/") (home-page "https://sameboy.github.io/")
(synopsis "Accurate Game Boy, Game Boy Color and Super Game Boy emulator") (synopsis "Accurate Game Boy, Game Boy Color and Super Game Boy emulator")
(description "SameBoy is a user friendly Game Boy, Game Boy Color (description "SameBoy is a user friendly Game Boy, Game Boy Color

3
gnu/packages/engineering.scm
View File

@ -791,9 +791,6 @@ language.")
(license (list license:mpl2.0 ;library (license (list license:mpl2.0 ;library
license:gpl2+))))) ;Guile bindings and GUI license:gpl2+))))) ;Guile bindings and GUI
(define-public ao
(deprecated-package "ao-cad" libfive))
;; TODO Add doc https://gitlab.com/kicad/services/kicad-doc/-/tree/master ;; TODO Add doc https://gitlab.com/kicad/services/kicad-doc/-/tree/master
(define-public kicad (define-public kicad
(package (package

3
gnu/packages/finance.scm
View File

@ -744,9 +744,6 @@ the Monero command line client and daemon.")
the Monero GUI client.") the Monero GUI client.")
(license license:bsd-3))) (license license:bsd-3)))
(define-public monero-core
(deprecated-package "monero-core" monero-gui))
(define-public python-trezor-agent (define-public python-trezor-agent
(package (package
(name "python-trezor-agent") (name "python-trezor-agent")

2
gnu/packages/firmware.scm
View File

@ -92,7 +92,7 @@
("cross-binutils" ,(cross-binutils "xtensa-elf" binutils-2.33)) ("cross-binutils" ,(cross-binutils "xtensa-elf" binutils-2.33))
("cmake" ,cmake-minimal) ("cmake" ,cmake-minimal)
("perl" ,perl))) ("perl" ,perl)))
(home-page "http://wireless.kernel.org/en/users/Drivers/ath9k_htc") (home-page "https://wireless.wiki.kernel.org/en/users/Drivers/ath9k_htc")
(synopsis "Firmware for the Atheros AR7010 and AR9271 USB 802.11n NICs") (synopsis "Firmware for the Atheros AR7010 and AR9271 USB 802.11n NICs")
(description (description
"This is the firmware for the Qualcomm Atheros AR7010 and AR9271 USB "This is the firmware for the Qualcomm Atheros AR7010 and AR9271 USB

7
gnu/packages/fonts.scm
View File

@ -29,7 +29,8 @@
;;; Copyright © 2019 Alva <alva@skogen.is> ;;; Copyright © 2019 Alva <alva@skogen.is>
;;; Copyright © 2019 Alexandros Theodotou <alex@zrythm.org> ;;; Copyright © 2019 Alexandros Theodotou <alex@zrythm.org>
;;; Copyright © 2020 Damien Cassou <damien@cassou.me> ;;; Copyright © 2020 Damien Cassou <damien@cassou.me>
;;; Copyright © 2020 Amin Bandali <mab@gnu.org> ;;; Copyright © 2020 Amin Bandali <bandali@gnu.org>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -1569,7 +1570,7 @@ This package provides the TrueType fonts.")
(define-public font-jetbrains-mono (define-public font-jetbrains-mono
(package (package
(name "font-jetbrains-mono") (name "font-jetbrains-mono")
(version "1.0.2") (version "1.0.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -1577,7 +1578,7 @@ This package provides the TrueType fonts.")
(string-append "https://download.jetbrains.com/fonts/" (string-append "https://download.jetbrains.com/fonts/"
"JetBrainsMono-" version ".zip")) "JetBrainsMono-" version ".zip"))
(sha256 (sha256
(base32 "0qlp4902i1v6ni04b6gdip8rxw6wpkdk9w7dir1yn9an5mvbkyar")))) (base32 "0zvhwmpdwpm4vywmm6i9a4najz0c7vfi411yikgkd66l5hwd1p6f"))))
(build-system font-build-system) (build-system font-build-system)
(home-page "https://www.jetbrains.com/lp/mono/") (home-page "https://www.jetbrains.com/lp/mono/")
(synopsis "Mono typeface for developers") (synopsis "Mono typeface for developers")

7
gnu/packages/fpga.scm
View File

@ -2,7 +2,7 @@
;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org> ;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2016, 2017 Theodoros Foradis <theodoros@foradis.org> ;;; Copyright © 2016, 2017 Theodoros Foradis <theodoros@foradis.org>
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Amin Bandali <mab@gnu.org> ;;; Copyright © 2019 Amin Bandali <bandali@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -271,6 +271,7 @@ Includes the actual FTDI connector.")
(uri (git-reference (uri (git-reference
(url "git://github.com/YosysHQ/nextpnr") (url "git://github.com/YosysHQ/nextpnr")
(commit commit))) (commit commit)))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0g2ar1z89b31qw5vgqj2rrcv9rzncs94184dgcsrz19p866654mf")))) "0g2ar1z89b31qw5vgqj2rrcv9rzncs94184dgcsrz19p866654mf"))))
@ -289,8 +290,8 @@ Includes the actual FTDI connector.")
"/share/icebox")) "/share/icebox"))
#:tests? #f)) #:tests? #f))
(synopsis "Place-and-Route tool for FPGAs") (synopsis "Place-and-Route tool for FPGAs")
(description "nextpnr aims to be a vendor neutral, timing driven, (description "Nextpnr aims to be a vendor neutral, timing driven,
FOSS FPGA place and route tool. ") FOSS FPGA place and route tool.")
(home-page "https://github.com/YosysHQ/nextpnr") (home-page "https://github.com/YosysHQ/nextpnr")
(license license:expat)))) (license license:expat))))

42
gnu/packages/games.scm
View File

@ -329,9 +329,6 @@ the more advanced player there are new game modes and a wide variety of
physics settings to tweak as well.") physics settings to tweak as well.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public armagetron-advanced
(deprecated-package "armagetron-advanced" armagetronad))
(define-public bastet (define-public bastet
(package (package
(name "bastet") (name "bastet")
@ -461,9 +458,6 @@ things far stranger and deadlier, and against the others like yourself, that
want what you have.") want what you have.")
(license license:cc-by-sa3.0)))) (license license:cc-by-sa3.0))))
(define-public cataclysm-dark-days-ahead
(deprecated-package "cataclysm-dark-days-ahead" cataclysm-dda))
(define-public corsix-th (define-public corsix-th
(package (package
(name "corsix-th") (name "corsix-th")
@ -1151,9 +1145,6 @@ beginners and advanced players. In addition to a command-line interface, it
also features an attractive, 3D representation of the playing board.") also features an attractive, 3D representation of the playing board.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public gnubackgammon
(deprecated-package "gnubackgammon" gnubg))
(define-public gnubik (define-public gnubik
(package (package
(name "gnubik") (name "gnubik")
@ -1704,9 +1695,6 @@ them, called Jean Raymond, found an old church in which to hide, not knowing
that beneath its ruins lay buried an ancient evil.") that beneath its ruins lay buried an ancient evil.")
(license license:gpl3))) (license license:gpl3)))
(define-public l-abbaye-des-morts
(deprecated-package "l-abbaye-des-morts" abbaye))
(define-public angband (define-public angband
(package (package
(name "angband") (name "angband")
@ -2825,9 +2813,6 @@ experience and advance levels, and are carried over from one scenario to the
next campaign.") next campaign.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public the-battle-for-wesnoth
(deprecated-package "the-battle-for-wesnoth" wesnoth))
(define-public wesnoth-server (define-public wesnoth-server
(package (package
(inherit wesnoth) (inherit wesnoth)
@ -2844,9 +2829,6 @@ next campaign.")
(description "This package contains a dedicated server for @emph{The (description "This package contains a dedicated server for @emph{The
Battle for Wesnoth}."))) Battle for Wesnoth}.")))
(define-public the-battle-for-wesnoth-server
(deprecated-package "the-battle-for-wesnoth-server" wesnoth-server))
(define-public gamine (define-public gamine
(package (package
(name "gamine") (name "gamine")
@ -3780,9 +3762,6 @@ in strikes against the evil corporation.")
license:cc0 license:cc0
license:public-domain)))) license:public-domain))))
(define-public project-starfighter
(deprecated-package "project-starfighter" starfighter))
(define-public chromium-bsu (define-public chromium-bsu
(package (package
(name "chromium-bsu") (name "chromium-bsu")
@ -4719,9 +4698,6 @@ small robot living in the nano world, repair its maker.")
;; for a statement from the author. ;; for a statement from the author.
(license license:public-domain))) (license license:public-domain)))
(define-public kiki-the-nano-bot
(deprecated-package "kiki-the-nano-bot" kiki))
(define-public teeworlds (define-public teeworlds
(package (package
(name "teeworlds") (name "teeworlds")
@ -4991,9 +4967,6 @@ underwater realm quarrel among themselves or comment on the efforts of your
fish. The whole game is accompanied by quiet, comforting music.") fish. The whole game is accompanied by quiet, comforting music.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public fish-fillets-ng
(deprecated-package "fish-fillets-ng" fillets-ng))
(define-public crawl (define-public crawl
(package (package
(name "crawl") (name "crawl")
@ -5073,9 +5046,6 @@ monsters in a quest to find the mystifyingly fabulous Orb of Zot.")
license:zlib license:zlib
license:asl2.0)))) license:asl2.0))))
(define-public dungeon-crawl-stone-soup
(deprecated-package "dungeon-crawl-stone-soup" crawl))
;; The linter here claims that patch file names should start with the package ;; The linter here claims that patch file names should start with the package
;; name. But, in this case, the patches are inherited from crawl with the ;; name. But, in this case, the patches are inherited from crawl with the
;; "crawl-" prefix instead of "crawl-tiles-". ;; "crawl-" prefix instead of "crawl-tiles-".
@ -5112,9 +5082,6 @@ monsters in a quest to find the mystifyingly fabulous Orb of Zot.")
("which" ,which))) ("which" ,which)))
(synopsis "Graphical roguelike dungeon crawler game"))) (synopsis "Graphical roguelike dungeon crawler game")))
(define-public dungeon-crawl-stone-soup-tiles
(deprecated-package "dungeon-crawl-stone-soup-tiles" crawl-tiles))
(define-public lugaru (define-public lugaru
(package (package
(name "lugaru") (name "lugaru")
@ -5518,9 +5485,6 @@ intuitive mouse control, streamlined mechanics and deep, challenging combat,
Tales of Maj’Eyal offers engaging roguelike gameplay for the 21st century.") Tales of Maj’Eyal offers engaging roguelike gameplay for the 21st century.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public tales-of-maj-eyal
(deprecated-package "tales-of-maj-eyal" tome4))
(define-public quakespasm (define-public quakespasm
(package (package
(name "quakespasm") (name "quakespasm")
@ -6986,9 +6950,6 @@ and cooperative.")
;; developers. ;; developers.
(license (list license:gpl2+ license:lgpl2.1+)))) (license (list license:gpl2+ license:lgpl2.1+))))
(define-public battle-tanks
(deprecated-package "battle-tanks" btanks))
(define-public slingshot (define-public slingshot
(package (package
(name "slingshot") (name "slingshot")
@ -7189,9 +7150,6 @@ a fortress beyond the forbidden swamp.")
(home-page "https://www.parallelrealities.co.uk/games/edgar/") (home-page "https://www.parallelrealities.co.uk/games/edgar/")
(license license:gpl2+))) (license license:gpl2+)))
(define-public the-legend-of-edgar
(deprecated-package "the-legend-of-edgar" edgar))
(define-public openclonk (define-public openclonk
(package (package
(name "openclonk") (name "openclonk")

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

@ -5,6 +5,7 @@
;;; Copyright © 2020 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2020 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2020 Jack Hill <jackhill@jackhill.us> ;;; Copyright © 2020 Jack Hill <jackhill@jackhill.us>
;;; Copyright © 2020 Ekaitz Zarraga <ekaitz@elenq.tech> ;;; Copyright © 2020 Ekaitz Zarraga <ekaitz@elenq.tech>
;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -467,9 +468,9 @@ scrollable tiling of windows and per monitor workspaces. It's inspired by paper
notebooks and tiling window managers.") notebooks and tiling window managers.")
(license license:gpl3))) (license license:gpl3)))
(define-public numix-theme (define-public numix-gtk-theme
(package (package
(name "numix-theme") (name "numix-gtk-theme")
(version "2.6.7") (version "2.6.7")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
@ -482,11 +483,14 @@ notebooks and tiling window managers.")
"12mw0kr0kkvg395qlbsvkvaqccr90cmxw5rrsl236zh43kj8grb7")))) "12mw0kr0kkvg395qlbsvkvaqccr90cmxw5rrsl236zh43kj8grb7"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:make-flags (list (string-append "DESTDIR=" (assoc-ref %outputs "out"))) '(#:make-flags
(list (string-append "INSTALL_DIR="
(assoc-ref %outputs "out")
"/share/themes/Numix"))
#:tests? #f
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure) (delete 'configure)))) ; no configure script
(delete 'check))))
(native-inputs (native-inputs
`(("glib:bin" ,glib "bin") ; for glib-compile-schemas `(("glib:bin" ,glib "bin") ; for glib-compile-schemas
("gnome-shell" ,gnome-shell) ("gnome-shell" ,gnome-shell)
@ -499,6 +503,9 @@ dark elements. It supports GNOME, Unity, Xfce, and Openbox.")
(home-page "https://numixproject.github.io") (home-page "https://numixproject.github.io")
(license license:gpl3+))) (license license:gpl3+)))
(define-public numix-theme
(deprecated-package "numix-theme" numix-gtk-theme))
(define-public papirus-icon-theme (define-public papirus-icon-theme
(let ((version "0.0.0") ;; The package does not use semver (let ((version "0.0.0") ;; The package does not use semver
(revision "0") (revision "0")

69
gnu/packages/gnome.scm
View File

@ -48,6 +48,7 @@
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com> ;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2020 raingloom <raingloom@riseup.net> ;;; Copyright © 2020 raingloom <raingloom@riseup.net>
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -8117,10 +8118,6 @@ alternative user interface themes, changes in window management behavior,
GNOME Shell appearance and extension, etc.") GNOME Shell appearance and extension, etc.")
(license license:gpl3+))) (license license:gpl3+)))
;; This package has been renamed by upstream.
(define-public gnome-tweak-tool
(deprecated-package "gnome-tweak-tool" gnome-tweaks))
(define-public gnome-shell-extensions (define-public gnome-shell-extensions
(package (package
(name "gnome-shell-extensions") (name "gnome-shell-extensions")
@ -8842,15 +8839,14 @@ views can be printed as PDF or PostScript files, or exported to HTML.")
(define-public lollypop (define-public lollypop
(package (package
(name "lollypop") (name "lollypop")
(version "1.2.7") (version "1.2.32")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://gitlab.gnome.org/World/lollypop/uploads/" (uri (string-append "https://adishatz.org/lollypop/"
"08f973788c7ca46d9285eec2ac818edb/"
"lollypop-" version ".tar.xz")) "lollypop-" version ".tar.xz"))
(sha256 (sha256
(base32 "0hvq6m4i62i0m63bg4gzpfb9rv1fk6vq5jl2g3ppcgm4srmfm77j")))) (base32 "1ng9492k8754vlqggbfsyzbmfdx4w17fzc4ad21fr92710na0w5a"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:imported-modules ((guix build python-build-system) `(#:imported-modules ((guix build python-build-system)
@ -9851,3 +9847,60 @@ to.")
license:public-domain license:public-domain
;; snowball ;; snowball
license:bsd-2)))) license:bsd-2))))
(define-public parlatype
;; This is one commit away from 2.0, because the latter introduced
;; a regression in ASR.
(let ((commit "7d22ead13ef7578f99d24146663cc1bdb7d8c2a9")
(revision "0"))
(package
(name "parlatype")
(version (git-version "2.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/gkarsay/parlatype.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "0r3k3qczbzi7bs5s1rddhpsnadyr805df40bqkx0srlxgh5mfghf"))))
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t
#:tests? #f ;require internet access
#:phases
(modify-phases %standard-phases
(add-after 'install 'wrap-parlatype
;; Add gstreamer plugin provided in this package to system's
;; plugins.
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(gst-plugin-path (string-append
out "/lib/gstreamer-1.0/"
":"
(getenv "GST_PLUGIN_SYSTEM_PATH"))))
(wrap-program (string-append out "/bin/parlatype")
`("GST_PLUGIN_SYSTEM_PATH" ":" = (,gst-plugin-path))))
#t)))))
(native-inputs
`(("appstream-glib" ,appstream-glib)
("desktop-file-utils" ,desktop-file-utils) ;for desktop-file-validate
("gettext" ,gettext-minimal)
("glib" ,glib "bin") ;for glib-compile-resources
("pkg-config" ,pkg-config)
("yelp-tools" ,yelp-tools)))
(inputs
`(("gst-plugins-base" ,gst-plugins-base)
("gst-plugins-good" ,gst-plugins-good)
("gstreamer" ,gstreamer)
("gtk+" ,gtk+)
("pocketsphinx" ,pocketsphinx)
("pulseaudio" ,pulseaudio)
("sphinxbase" ,sphinxbase)))
(home-page "http://gkarsay.github.io/parlatype/")
(synopsis "GNOME audio player for transcription")
(description "Parlatype is an audio player for the GNOME desktop
environment. Its main purpose is the manual transcription of spoken
audio files.")
(license license:gpl3+))))

8
gnu/packages/gnupg.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013, 2015, 2018 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013, 2015, 2018 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2014, 2018 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014, 2018 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
@ -11,7 +11,7 @@
;;; Copyright © 2016 Christopher Baines <mail@cbaines.net> ;;; Copyright © 2016 Christopher Baines <mail@cbaines.net>
;;; Copyright © 2016 Mike Gerwitz <mtg@gnu.org> ;;; Copyright © 2016 Mike Gerwitz <mtg@gnu.org>
;;; Copyright © 2016 Troy Sankey <sankeytms@gmail.com> ;;; Copyright © 2016 Troy Sankey <sankeytms@gmail.com>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2017, 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Petter <petter@mykolab.ch> ;;; Copyright © 2017 Petter <petter@mykolab.ch>
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2018, 2019 Marius Bakke <mbakke@fastmail.com>
@ -256,10 +256,10 @@ compatible to GNU Pth.")
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnupg/gnupg/gnupg-" version (uri (string-append "mirror://gnupg/gnupg/gnupg-" version
".tar.bz2")) ".tar.bz2"))
(patches (search-patches "gnupg-default-pinentry.patch"))
(sha256 (sha256
(base32 (base32
"0c6a4v9p6qzhsw1pfcwc459bxpc8hma0w9z8iqb9khvligack9q4")) "0c6a4v9p6qzhsw1pfcwc459bxpc8hma0w9z8iqb9khvligack9q4"))))
(patches (search-patches "gnupg-default-pinentry.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))

5
gnu/packages/gnuzilla.scm
View File

@ -1142,11 +1142,6 @@ standards of the IceCat project.")
(cpe-name . "firefox_esr") (cpe-name . "firefox_esr")
(cpe-version . ,(first (string-split version #\-))))))) (cpe-version . ,(first (string-split version #\-)))))))
(define-public conkeror
;; The Conkeror web browser relied on XULRunner, which IceCat > 50 no longer
;; provides. See <http://conkeror.org> for the original web page.
(deprecated-package "conkeror" icecat))
(define-public firefox-decrypt (define-public firefox-decrypt
(package (package
(name "firefox-decrypt") (name "firefox-decrypt")

7
gnu/packages/graph.scm
View File

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017, 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017, 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com> ;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2019 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2020 Alexander Krotov <krotov@iitp.ru> ;;; Copyright © 2020 Alexander Krotov <krotov@iitp.ru>
@ -56,15 +56,14 @@
(define-public igraph (define-public igraph
(package (package
(name "igraph") (name "igraph")
(version "0.8.0") (version "0.8.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/igraph/igraph/releases/" (uri (string-append "https://github.com/igraph/igraph/releases/"
"download/" version "/igraph-" version ".tar.gz")) "download/" version "/igraph-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32 "0wbvrac3ip3lqmbkckhnxa2swlbc86l1h8mazdlb618kx3winvi6"))))
"0jcnfvahrlj08y46vnax5y5bb294v4b9n00qsy7pbx0cc0sp6qvj"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags

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

@ -24,6 +24,7 @@
;;; Copyright © 2019, 2020 Amar Singh <nly@disroot.org> ;;; Copyright © 2019, 2020 Amar Singh <nly@disroot.org>
;;; Copyright © 2019 Timothy Sample <samplet@ngyro.com> ;;; Copyright © 2019 Timothy Sample <samplet@ngyro.com>
;;; Copyright © 2019 Martin Becze <mjbecze@riseup.net> ;;; Copyright © 2019 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2020 Evan Straw <evan.straw99@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -2238,10 +2239,6 @@ format is also supported.")
(define-public guile3.0-mcron (define-public guile3.0-mcron
(deprecated-package "guile3.0-mcron" mcron)) (deprecated-package "guile3.0-mcron" mcron))
(define-public mcron2
;; This was mthl's mcron development branch, and it became mcron 1.1.
(deprecated-package "mcron2" mcron))
(define-public guile-picture-language (define-public guile-picture-language
(let ((commit "91d10c96708d732145006dd2802acc4de08b632e") (let ((commit "91d10c96708d732145006dd2802acc4de08b632e")
(revision "1")) (revision "1"))
@ -3298,3 +3295,48 @@ according to Bitorrent BEP003.")
Relay Chat} (IRC).") Relay Chat} (IRC).")
;; Some file headers incorrectly say LGPLv2+. ;; Some file headers incorrectly say LGPLv2+.
(license license:lgpl2.1+)))) (license license:lgpl2.1+))))
(define-public guile3.0-websocket
(let ((commit "c854e0f84a40d972cbd532bbb89c97ca0126a7cf"))
(package
(name "guile3.0-websocket")
(version "0.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "git://dthompson.us/guile-websocket.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1hymvsfrmq9qxr5cxnsgdz7y757yp1cpsgxmdp3f5wxxxpqgsmzx"))))
(build-system gnu-build-system)
(arguments
'(#:make-flags
'("GUILE_AUTO_COMPILE=0")
#:phases
(modify-phases %standard-phases
;; The package was developed for Guile 2.0 and has this version
;; hardcoded in the configure.ac and Makefile.am files. Substitute
;; 3.0 instead so it can support Guile 3.0.
(add-after 'unpack 'update-guile-version
(lambda _
(substitute* "configure.ac"
(("2.0.9") "3.0.0"))
(substitute* "Makefile.am"
(("2.0") "3.0")
;; Install .go files where they belong.
(("/ccache") "/site-ccache"))
#t)))))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)))
(inputs
`(("guile" ,guile-next)))
(synopsis "Websocket server/client for Guile")
(description "Guile-websocket provides an implementation of the
WebSocket protocol as defined by RFC 6455.")
(home-page "https://git.dthompson.us/guile-websocket.git")
(license license:lgpl3+))))

40
gnu/packages/haskell-apps.scm
View File

@ -14,6 +14,7 @@
;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2019 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2020 Alexandru-Sergiu Marton <brown121407@member.fsf.org> ;;; Copyright © 2020 Alexandru-Sergiu Marton <brown121407@member.fsf.org>
;;; Copyright © 2020 Brian Leung <bkleung89@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -50,6 +51,42 @@
#:use-module (gnu packages rsync) #:use-module (gnu packages rsync)
#:use-module (gnu packages version-control)) #:use-module (gnu packages version-control))
(define-public apply-refact
(package
(name "apply-refact")
(version "0.6.0.0")
(source
(origin
(method url-fetch)
(uri (string-append
"https://hackage.haskell.org/package/apply-refact/apply-refact-"
version ".tar.gz"))
(sha256
(base32
"0p2mqgjcqr1zcmk8zgr0yq7g8z1agsa6l493lkj6g3ya9lyhxgig"))))
(build-system haskell-build-system)
(inputs
`(("ghc-refact" ,ghc-refact)
("ghc-exactprint" ,ghc-exactprint)
("ghc-syb" ,ghc-syb)
("ghc-temporary" ,ghc-temporary)
("ghc-filemanip" ,ghc-filemanip)
("ghc-unix-compat" ,ghc-unix-compat)
("ghc-optparse-applicative"
,ghc-optparse-applicative)))
(native-inputs
`(("ghc-tasty" ,ghc-tasty)
("ghc-tasty-golden" ,ghc-tasty-golden)
("ghc-tasty-expected-failure"
,ghc-tasty-expected-failure)
("ghc-silently" ,ghc-silently)))
(home-page "https://hackage.haskell.org/package/apply-refact")
(synopsis "Perform refactorings specified by the refact library")
(description
"This package lets you perform refactorings specified by the refact
library. It is primarily used with HLint's @code{--refactor} flag.")
(license license:bsd-3)))
;; In Stackage LTS 14, this package is at 2.4.1.0. However, that ;; In Stackage LTS 14, this package is at 2.4.1.0. However, that
;; version requires version 2.4.1.0 of the 'Cabal' package, which is ;; version requires version 2.4.1.0 of the 'Cabal' package, which is
;; provided by GHC 8.6.5 at version 2.4.0.1. Hence, we use an older ;; provided by GHC 8.6.5 at version 2.4.0.1. Hence, we use an older
@ -777,3 +814,6 @@ Replace some ASCII sequences by their Unicode equivalent (turned off by
default) default)
@end itemize") @end itemize")
(license license:bsd-3))) (license license:bsd-3)))
(define-public ghc-stylish-haskell
(deprecated-package "ghc-stylish-haskell" stylish-haskell))

41
gnu/packages/haskell-web.scm
View File

@ -752,6 +752,41 @@ Haskell.")
documents.") documents.")
(license license:bsd-3))) (license license:bsd-3)))
(define-public ghc-html-conduit
(package
(name "ghc-html-conduit")
(version "1.3.2.1")
(source
(origin
(method url-fetch)
(uri (string-append
"https://hackage.haskell.org/package/html-conduit/"
"html-conduit-" version ".tar.gz"))
(sha256
(base32
"196c8zcnjp1pc5qvqxd8arx3xkw0a90rvg9mmiw2l4zwnx65709n"))))
(build-system haskell-build-system)
(inputs
`(("ghc-resourcet" ,ghc-resourcet)
("ghc-conduit" ,ghc-conduit)
("ghc-xml-conduit" ,ghc-xml-conduit)
("ghc-xml-types" ,ghc-xml-types)
("ghc-attoparsec" ,ghc-attoparsec)
("ghc-conduit-extra" ,ghc-conduit-extra)))
(native-inputs
`(("ghc-hspec" ,ghc-hspec)
("ghc-hunit" ,ghc-hunit)))
(home-page "https://github.com/snoyberg/xml")
(synopsis "Parse HTML documents using xml-conduit datatypes")
(description
"This package provides a parser for HTML documents that uses
tagstream-conduit. It automatically balances mismatched tags, so that
there shouldn't be any parse failures. It does not handle a full HTML
document rendering, such as adding missing html and head tags. Note that,
since version 1.3.1, it uses an inlined copy of tagstream-conduit with
entity decoding bugfixes applied.")
(license license:expat)))
(define-public ghc-blaze-html (define-public ghc-blaze-html
(package (package
(name "ghc-blaze-html") (name "ghc-blaze-html")
@ -1094,7 +1129,7 @@ functions, widgets, etc.")
(define-public ghc-yesod-persistent (define-public ghc-yesod-persistent
(package (package
(name "ghc-yesod-persistent") (name "ghc-yesod-persistent")
(version "1.6.0.2") (version "1.6.0.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -1103,7 +1138,7 @@ functions, widgets, etc.")
"yesod-persistent-" version ".tar.gz")) "yesod-persistent-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"17adw0aaj29ia7ii3jka301442860b5wvfrms079q973gzahz5fd")))) "1gsiw2zx6z7za7a164h0fxfggkrdqz6fn0qyb2zn9qr7r2jbg1c0"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(arguments `(#:tests? #f)) ; FIXME: hspec-discover not available in PATH. (arguments `(#:tests? #f)) ; FIXME: hspec-discover not available in PATH.
(inputs `(("ghc-yesod-core" ,ghc-yesod-core) (inputs `(("ghc-yesod-core" ,ghc-yesod-core)
@ -1655,6 +1690,6 @@ non-Haskell dependencies.")
"High level web scraping library for Haskell") "High level web scraping library for Haskell")
(description (description
"Scalpel is a web scraping library inspired by libraries like Parsec "Scalpel is a web scraping library inspired by libraries like Parsec
and Perl's @code{Web::Scraper} Scalpel builds on top of TagSoup to provide a and Perl's @code{Web::Scraper}. Scalpel builds on top of TagSoup to provide a
declarative and monadic interface.") declarative and monadic interface.")
(license license:asl2.0))) (license license:asl2.0)))

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

@ -25,6 +25,7 @@
;;; Copyright © 2020 Brett Gilio <brettg@gnu.org> ;;; Copyright © 2020 Brett Gilio <brettg@gnu.org>
;;; Copyright © 2020 JoJo <jo@jo.zone> ;;; Copyright © 2020 JoJo <jo@jo.zone>
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2020 Alexandru-Sergiu Marton <brown121407@member.fsf.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -906,6 +907,45 @@ stand for certain ASCII character sequences, i.e. → instead of @code{->},
∀ instead of @code{forall} and many others.") ∀ instead of @code{forall} and many others.")
(license license:bsd-3))) (license license:bsd-3)))
(define-public ghc-basic-prelude
(package
(name "ghc-basic-prelude")
(version "0.7.0")
(source
(origin
(method url-fetch)
(uri (string-append
"https://hackage.haskell.org/package/basic-prelude/"
"basic-prelude-" version ".tar.gz"))
(sha256
(base32
"0yckmnvm6i4vw0mykj4fzl4ldsf67v8d2h0vp1bakyj84n4myx8h"))))
(build-system haskell-build-system)
(inputs
`(("ghc-hashable" ,ghc-hashable)
("ghc-unordered-containers"
,ghc-unordered-containers)
("ghc-vector" ,ghc-vector)))
(home-page "https://github.com/snoyberg/basic-prelude#readme")
(synopsis "Enhanced core prelude; a common foundation for alternate preludes")
(description
"The premise of basic-prelude is that there are a lot of very commonly
desired features missing from the standard Prelude, such as commonly used
operators (<$> and >=>, for instance) and imports for common datatypes
(e.g., ByteString and Vector). At the same time, there are lots of other
components which are more debatable, such as providing polymorphic versions
of common functions.
So basic-prelude is intended to give a common foundation for a number of
alternate preludes. The package provides two modules: CorePrelude provides
the common ground for other preludes to build on top of, while BasicPrelude
exports CorePrelude together with commonly used list functions to provide a
drop-in replacement for the standard Prelude.
Users wishing to have an improved Prelude can use BasicPrelude. Developers
wishing to create a new prelude should use CorePrelude.")
(license license:expat)))
(define-public ghc-bifunctors (define-public ghc-bifunctors
(package (package
(name "ghc-bifunctors") (name "ghc-bifunctors")
@ -3612,7 +3652,7 @@ directly uses the type system, rather than out-of-band exceptions.")
(define-public ghc-esqueleto (define-public ghc-esqueleto
(package (package
(name "ghc-esqueleto") (name "ghc-esqueleto")
(version "3.0.0") (version "3.3.1.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -3620,7 +3660,7 @@ directly uses the type system, rather than out-of-band exceptions.")
"esqueleto/esqueleto-" version ".tar.gz")) "esqueleto/esqueleto-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"187c098h2xyf2nhifkdy2bqfl6iap7a93mzwd2kirl5yyicpc9zy")))) "1qi28ma8j5kfygjxnixlazxsyrkdqv8ljz3icwqi5dlscsnj6v3v"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(arguments (arguments
`(#:haddock? #f ; Haddock reports an internal error. `(#:haddock? #f ; Haddock reports an internal error.
@ -7897,6 +7937,36 @@ class, and a lazy number type for non-negative numbers (a generalization
of Peano numbers).") of Peano numbers).")
(license license:gpl3+))) (license license:gpl3+)))
(define-public ghc-nonce
(package
(name "ghc-nonce")
(version "1.0.7")
(source
(origin
(method url-fetch)
(uri (string-append
"https://hackage.haskell.org/package/nonce/"
"nonce-" version ".tar.gz"))
(sha256
(base32
"1q9ph0aq51mvdvydnriqd12sfin36pfb8f588zgac1ybn8r64ksb"))))
(build-system haskell-build-system)
(inputs
`(("ghc-base64-bytestring" ,ghc-base64-bytestring)
("ghc-entropy" ,ghc-entropy)
("ghc-unliftio" ,ghc-unliftio)
("ghc-unliftio-core" ,ghc-unliftio-core)))
(home-page "https://github.com/prowdsponsor/nonce")
(synopsis "Generate cryptographic nonces in Haskell")
(description
"A nonce is an arbitrary number used only once in a cryptographic
communication. This package contain helper functions for generating nonces.
There are many kinds of nonces used in different situations. It's not
guaranteed that by using the nonces from this package you won't have any
security issues. Please make sure that the nonces generated via this
package are usable on your design.")
(license license:bsd-3)))
(define-public ghc-numeric-extras (define-public ghc-numeric-extras
(package (package
(name "ghc-numeric-extras") (name "ghc-numeric-extras")
@ -8684,41 +8754,36 @@ syntax and semantics as Perl 5.")
(define-public ghc-persistent (define-public ghc-persistent
(package (package
(name "ghc-persistent") (name "ghc-persistent")
(version "2.9.2") (version "2.10.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/" (uri (string-append
"persistent-" version "/" "https://hackage.haskell.org/package/persistent/"
"persistent-" version ".tar.gz")) "persistent-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1wsa3kn427v88a6r0vwr6mz23snik2krbsgc8zqp18xajqn5szj9")))) "1cxswz72sqdg2z1nbpgp1k5qr41djgk8qbf8nz7wfppsrhacyffi"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(inputs `(("ghc-old-locale" ,ghc-old-locale) (inputs
("ghc-conduit" ,ghc-conduit) `(("ghc-aeson" ,ghc-aeson)
("ghc-resourcet" ,ghc-resourcet)
("ghc-exceptions" ,ghc-exceptions)
("ghc-monad-control" ,ghc-monad-control)
("ghc-lifted-base" ,ghc-lifted-base)
("ghc-resource-pool" ,ghc-resource-pool)
("ghc-path-pieces" ,ghc-path-pieces)
("ghc-http-api-data" ,ghc-http-api-data)
("ghc-aeson" ,ghc-aeson)
("ghc-monad-logger" ,ghc-monad-logger)
("ghc-transformers-base" ,ghc-transformers-base)
("ghc-base64-bytestring" ,ghc-base64-bytestring)
("ghc-unordered-containers" ,ghc-unordered-containers)
("ghc-vector" ,ghc-vector)
("ghc-attoparsec" ,ghc-attoparsec) ("ghc-attoparsec" ,ghc-attoparsec)
("ghc-haskell-src-meta" ,ghc-haskell-src-meta) ("ghc-base64-bytestring" ,ghc-base64-bytestring)
("ghc-blaze-html" ,ghc-blaze-html) ("ghc-blaze-html" ,ghc-blaze-html)
("ghc-blaze-markup" ,ghc-blaze-markup) ("ghc-conduit" ,ghc-conduit)
("ghc-silently" ,ghc-silently)
("ghc-fast-logger" ,ghc-fast-logger) ("ghc-fast-logger" ,ghc-fast-logger)
("ghc-http-api-data" ,ghc-http-api-data)
("ghc-monad-logger" ,ghc-monad-logger)
("ghc-path-pieces" ,ghc-path-pieces)
("ghc-resource-pool" ,ghc-resource-pool)
("ghc-resourcet" ,ghc-resourcet)
("ghc-scientific" ,ghc-scientific) ("ghc-scientific" ,ghc-scientific)
("ghc-tagged" ,ghc-tagged) ("ghc-silently" ,ghc-silently)
("ghc-void" ,ghc-void))) ("ghc-unliftio-core" ,ghc-unliftio-core)
("ghc-unliftio" ,ghc-unliftio)
("ghc-unordered-containers"
,ghc-unordered-containers)
("ghc-vector" ,ghc-vector)))
(native-inputs `(("ghc-hspec" ,ghc-hspec))) (native-inputs `(("ghc-hspec" ,ghc-hspec)))
(home-page "https://www.yesodweb.com/book/persistent") (home-page "https://www.yesodweb.com/book/persistent")
(synopsis "Type-safe, multi-backend data serialization for Haskell") (synopsis "Type-safe, multi-backend data serialization for Haskell")
@ -8730,29 +8795,39 @@ way.")
(define-public ghc-persistent-sqlite (define-public ghc-persistent-sqlite
(package (package
(name "ghc-persistent-sqlite") (name "ghc-persistent-sqlite")
(version "2.9.3") (version "2.10.5.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/" (uri (string-append
"persistent-sqlite-" version "/" "https://hackage.haskell.org/package/persistent-sqlite/"
"persistent-sqlite-" version ".tar.gz")) "persistent-sqlite-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"13wbn88ixv4d4dfjl1gabm1q60fbcnygbmixz57pi3z84drrynwq")))) "0agag3cgivl6mk38pqzr0qw5lxps9p2bgdwvi5658l46hs7bixxn"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(inputs `(("ghc-persistent" ,ghc-persistent) (inputs
("ghc-unliftio-core" ,ghc-unliftio-core) `(("ghc-persistent" ,ghc-persistent)
("ghc-aeson" ,ghc-aeson) ("ghc-aeson" ,ghc-aeson)
("ghc-conduit" ,ghc-conduit) ("ghc-conduit" ,ghc-conduit)
("ghc-monad-logger" ,ghc-monad-logger)
("ghc-microlens-th" ,ghc-microlens-th) ("ghc-microlens-th" ,ghc-microlens-th)
("ghc-resourcet" ,ghc-resourcet) ("ghc-monad-logger" ,ghc-monad-logger)
("ghc-old-locale" ,ghc-old-locale)
("ghc-resource-pool" ,ghc-resource-pool) ("ghc-resource-pool" ,ghc-resource-pool)
("ghc-unordered-containers" ,ghc-unordered-containers))) ("ghc-resourcet" ,ghc-resourcet)
(native-inputs `(("ghc-hspec" ,ghc-hspec) ("ghc-unliftio-core" ,ghc-unliftio-core)
("ghc-persistent-template" ,ghc-persistent-template) ("ghc-unordered-containers"
,ghc-unordered-containers)))
(native-inputs
`(("ghc-persistent-template"
,ghc-persistent-template)
("ghc-persistent-test" ,ghc-persistent-test)
("ghc-exceptions" ,ghc-exceptions)
("ghc-fast-logger" ,ghc-fast-logger)
("ghc-hspec" ,ghc-hspec)
("ghc-hunit" ,ghc-hunit)
("ghc-quickcheck" ,ghc-quickcheck)
("ghc-system-fileio" ,ghc-system-fileio)
("ghc-system-filepath" ,ghc-system-filepath)
("ghc-temporary" ,ghc-temporary))) ("ghc-temporary" ,ghc-temporary)))
(home-page (home-page
"https://www.yesodweb.com/book/persistent") "https://www.yesodweb.com/book/persistent")
@ -8765,27 +8840,29 @@ system dependencies.")
(define-public ghc-persistent-template (define-public ghc-persistent-template
(package (package
(name "ghc-persistent-template") (name "ghc-persistent-template")
(version "2.6.0") (version "2.8.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/" (uri (string-append
"persistent-template-" version "/" "https://hackage.haskell.org/package/persistent-template/"
"persistent-template-" version ".tar.gz")) "persistent-template-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0wr1z2nfrl6jv1lprxb0d2jw4izqfcbcwvkdrhryzg95gjz8ryjv")))) "16yjrl0gh4jbs4skr7iv6a55lny59bqhd6hjmvch1cl9j5d0c0g3"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(inputs `(("ghc-persistent" ,ghc-persistent) (inputs
("ghc-monad-control" ,ghc-monad-control) `(("ghc-persistent" ,ghc-persistent)
("ghc-aeson" ,ghc-aeson) ("ghc-aeson" ,ghc-aeson)
("ghc-aeson-compat" ,ghc-aeson-compat) ("ghc-http-api-data" ,ghc-http-api-data)
("ghc-monad-control" ,ghc-monad-control)
("ghc-monad-logger" ,ghc-monad-logger) ("ghc-monad-logger" ,ghc-monad-logger)
("ghc-unordered-containers" ,ghc-unordered-containers)
("ghc-tagged" ,ghc-tagged)
("ghc-path-pieces" ,ghc-path-pieces) ("ghc-path-pieces" ,ghc-path-pieces)
("ghc-http-api-data" ,ghc-http-api-data))) ("ghc-th-lift-instances" ,ghc-th-lift-instances)
(native-inputs `(("ghc-hspec" ,ghc-hspec) ("ghc-unordered-containers"
,ghc-unordered-containers)))
(native-inputs
`(("ghc-hspec" ,ghc-hspec)
("ghc-quickcheck" ,ghc-quickcheck))) ("ghc-quickcheck" ,ghc-quickcheck)))
(home-page "https://www.yesodweb.com/book/persistent") (home-page "https://www.yesodweb.com/book/persistent")
(synopsis "Type-safe, non-relational, multi-backend persistence") (synopsis "Type-safe, non-relational, multi-backend persistence")
@ -8793,6 +8870,49 @@ system dependencies.")
functions for the ghc-persistent package.") functions for the ghc-persistent package.")
(license license:expat))) (license license:expat)))
(define-public ghc-persistent-test
(package
(name "ghc-persistent-test")
(version "2.0.3.1")
(source
(origin
(method url-fetch)
(uri (string-append
"https://hackage.haskell.org/package/persistent-test/"
"persistent-test-" version ".tar.gz"))
(sha256
(base32
"11aq5cy0n43jamf6mg4sr4300bc2zdbjxsczzxwjkb4hzs0ijsdv"))))
(build-system haskell-build-system)
(inputs
`(("ghc-aeson" ,ghc-aeson)
("ghc-blaze-html" ,ghc-blaze-html)
("ghc-conduit" ,ghc-conduit)
("ghc-monad-control" ,ghc-monad-control)
("ghc-monad-logger" ,ghc-monad-logger)
("ghc-path-pieces" ,ghc-path-pieces)
("ghc-persistent" ,ghc-persistent)
("ghc-persistent-template" ,ghc-persistent-template)
("ghc-random" ,ghc-random)
("ghc-resourcet" ,ghc-resourcet)
("ghc-transformers-base" ,ghc-transformers-base)
("ghc-unliftio" ,ghc-unliftio)
("ghc-unliftio-core" ,ghc-unliftio-core)
("ghc-unordered-containers" ,ghc-unordered-containers)))
(native-inputs
`(("ghc-quickcheck" ,ghc-quickcheck)
("ghc-quickcheck-instances" ,ghc-quickcheck-instances)
("ghc-hspec" ,ghc-hspec)
("ghc-hspec-expectations" ,ghc-hspec-expectations)
("ghc-hunit" ,ghc-hunit)))
(home-page "https://www.yesodweb.com/book/persistent")
(synopsis "Tests for the Persistent database library")
(description
"This is only for use in developing libraries that should conform to
the persistent interface, not for users of the persistent suite of database
libraries.")
(license license:expat)))
(define-public ghc-pipes (define-public ghc-pipes
(package (package
(name "ghc-pipes") (name "ghc-pipes")
@ -9086,6 +9206,46 @@ API.")
(description "This library provides profunctors for Haskell.") (description "This library provides profunctors for Haskell.")
(license license:bsd-3))) (license license:bsd-3)))
(define-public ghc-project-template
(package
(name "ghc-project-template")
(version "0.2.0.1")
(source
(origin
(method url-fetch)
(uri (string-append
"https://hackage.haskell.org/package/project-template/project-template-"
version ".tar.gz"))
(sha256
(base32
"1p69ww4rhah2qxragl615wl4a6mk4x9w09am8knmz3s4lxpljlpb"))))
(build-system haskell-build-system)
(inputs
`(("ghc-base64-bytestring" ,ghc-base64-bytestring)
("ghc-conduit" ,ghc-conduit)
("ghc-conduit-extra" ,ghc-conduit-extra)
("ghc-resourcet" ,ghc-resourcet)))
(native-inputs
`(("ghc-hspec" ,ghc-hspec)
("hspec-discover" ,hspec-discover)
("ghc-quickcheck" ,ghc-quickcheck)))
(arguments
`(#:cabal-revision
("1"
"0lq3sqnq0nr0gbvgzp0lqdl3j3mqdmdlf8xsw0j3pjh581xj3k0a")))
(home-page "https://github.com/fpco/haskell-ide")
(synopsis "Specify Haskell project templates and generate files")
(description
"Haskell library for both generating and consuming project templates.
ost IDEs provide the concept of a project template: instead of writing all
of the code for a project from scratch, you select a template, answer a few
questions, and a bunch of files are automatically generated.
project-template tries to provide a canonical Haskell library for implementing
the ideal templating system.")
(license license:bsd-3)))
(define-public ghc-psqueues (define-public ghc-psqueues
(package (package
(name "ghc-psqueues") (name "ghc-psqueues")
@ -9151,6 +9311,36 @@ Typical applications of Priority Search Queues include:
@end itemize") @end itemize")
(license license:bsd-3))) (license license:bsd-3)))
(define-public ghc-pwstore-fast
(package
(name "ghc-pwstore-fast")
(version "2.4.4")
(source
(origin
(method url-fetch)
(uri (string-append
"https://hackage.haskell.org/package/pwstore-fast/"
"pwstore-fast-" version ".tar.gz"))
(sha256
(base32
"1cpvlwzg3qznhygrr78f75p65mnljd9v5cvnagfxjqppnrkay6bj"))))
(build-system haskell-build-system)
(inputs
`(("ghc-base64-bytestring" ,ghc-base64-bytestring)
("ghc-cryptohash" ,ghc-cryptohash)
("ghc-random" ,ghc-random)
("ghc-byteable" ,ghc-byteable)))
(home-page "https://github.com/PeterScott/pwstore")
(synopsis "Secure password storage")
(description
"To store passwords securely, they should be salted, then hashed with
a slow hash function. This library uses PBKDF1-SHA256, and handles all the
details. It uses the cryptohash package for speed; if you need a pure
Haskell library, pwstore-purehaskell has the exact same API, but uses only
pure Haskell. It is about 25 times slower than this package, but still quite
usable.")
(license license:bsd-3)))
(define-public ghc-random (define-public ghc-random
(package (package
(name "ghc-random") (name "ghc-random")
@ -11118,9 +11308,6 @@ functions for breaking or splitting on substrings and replacing all
occurrences of a substring (the first in case of overlaps) with another.") occurrences of a substring (the first in case of overlaps) with another.")
(license license:bsd-3))) (license license:bsd-3)))
(define-public ghc-stylish-haskell
(deprecated-package "ghc-stylish-haskell" stylish-haskell))
(define-public ghc-svg-builder (define-public ghc-svg-builder
(package (package
(name "ghc-svg-builder") (name "ghc-svg-builder")

6
gnu/packages/image.scm
View File

@ -241,10 +241,6 @@ APNG patch provides APNG support to libpng.")
images. It can further losslessly compress them by as much as 40%.") images. It can further losslessly compress them by as much as 40%.")
(license license:zlib))) (license license:zlib)))
(define-public pngcrunch
;; This package used to be wrongfully name "pngcrunch".
(deprecated-package "pngcrunch" pngcrush))
(define-public pnglite (define-public pnglite
(let ((commit "11695c56f7d7db806920bd9229b69f230e6ffb38") (let ((commit "11695c56f7d7db806920bd9229b69f230e6ffb38")
(revision "1")) (revision "1"))
@ -1327,7 +1323,7 @@ ISO/IEC 15444-1).")
(commit (string-append "release-" version)))) (commit (string-append "release-" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "12bs2rfmmy021087i10vxibdbbvd5vld0vk3h5hymhpz7rgszcmg")))) (base32 "1dqyrq3p8bkgvj4ci50ac342hjnhyz6xxvhiwp7wpi3v3nbj7s02"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)

199
gnu/packages/java.scm
View File

@ -9,7 +9,7 @@
;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019 Gábor Boskovits <boskovits@gmail.com> ;;; Copyright © 2018, 2019 Gábor Boskovits <boskovits@gmail.com>
;;; Copyright © 2018 Chris Marusich <cmmarusich@gmail.com> ;;; Copyright © 2018 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2018, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019, 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de> ;;; Copyright © 2019, 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; ;;;
@ -3442,12 +3442,14 @@ an Ant task that extends the built-in @code{jar} task.")
(name "java-hamcrest-core") (name "java-hamcrest-core")
(version "1.3") (version "1.3")
(source (origin (source (origin
(method url-fetch) (method git-fetch)
(uri (string-append "https://github.com/hamcrest/JavaHamcrest/" (uri (git-reference
"archive/hamcrest-java-" version ".tar.gz")) (url "https://github.com/hamcrest/JavaHamcrest/")
(commit (string-append "hamcrest-java-" version))))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"11g0s105fmwzijbv08lx8jlb521yravjmxnpgdx08fvg1kjivhva")) "16fxxkrd31ahqvcaby30jgh3z1i0zxh51m24hxgz0z2agxj6bc63"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -3547,13 +3549,14 @@ testing frameworks, mocking libraries and UI validation rules.")
(name "java-junit") (name "java-junit")
(version "4.12") (version "4.12")
(source (origin (source (origin
(method url-fetch) (method git-fetch)
(uri (string-append "https://github.com/junit-team/junit/" (uri (git-reference
"archive/r" version ".tar.gz")) (url "https://github.com/junit-team/junit/")
(file-name (string-append name "-" version ".tar.gz")) (commit (string-append "r" version))))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"090dn5v1vs0b3acyaqc0gjf6p8lmd2h24wfzsbq7sly6b214anws")) "1j8avi91px1z8rjc89cfikwrvfifdmmsarwiyrcnr59ynvpz0v8h"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -3566,7 +3569,7 @@ testing frameworks, mocking libraries and UI validation rules.")
#:jar-name "junit.jar")) #:jar-name "junit.jar"))
(inputs (inputs
`(("java-hamcrest-core" ,java-hamcrest-core))) `(("java-hamcrest-core" ,java-hamcrest-core)))
(home-page "https://junit.org/") (home-page "https://junit.org/junit4/")
(synopsis "Test framework for Java") (synopsis "Test framework for Java")
(description (description
"JUnit is a simple framework to write repeatable tests for Java projects. "JUnit is a simple framework to write repeatable tests for Java projects.
@ -3579,13 +3582,14 @@ sharing common test data, and test runners for running tests.")
(name "java-plexus-utils") (name "java-plexus-utils")
(version "3.2.0") (version "3.2.0")
(source (origin (source (origin
(method url-fetch) (method git-fetch)
(uri (string-append "https://github.com/codehaus-plexus/" (uri (git-reference
"plexus-utils/archive/plexus-utils-" (url "https://github.com/codehaus-plexus/plexus-utils")
version ".tar.gz")) (commit (string-append "plexus-utils-" version))))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1ihfigar20lvk4pinii7dq05i173xphhw4iyrk6gjfy04m01j2lz")))) "1mlx7xrq7lgqjqcpg7y4hi1ghavf28vvk3har82037dqx61n0f15"))))
(build-system ant-build-system) (build-system ant-build-system)
;; FIXME: The default build.xml does not include a target to install ;; FIXME: The default build.xml does not include a target to install
;; javadoc files. ;; javadoc files.
@ -3632,13 +3636,14 @@ more.")
(name "java-plexus-interpolation") (name "java-plexus-interpolation")
(version "1.23") (version "1.23")
(source (origin (source (origin
(method url-fetch) (method git-fetch)
(uri (string-append "https://github.com/codehaus-plexus/" (uri (git-reference
"plexus-interpolation/archive/" (url "https://github.com/codehaus-plexus/plexus-interpolation")
"plexus-interpolation-" version ".tar.gz")) (commit (string-append "plexus-interpolation-" version))))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"03377yzlx5q440m6sxxgv6a5qb8fl30zzcgxgc0hxk5qgl2z1jjn")))) "005hxxg1adv71a96lz4vp65bk3v1pi76j4c45z29xzizclib16vl"))))
(build-system ant-build-system) (build-system ant-build-system)
(arguments (arguments
`(#:jar-name "plexus-interpolation.jar" `(#:jar-name "plexus-interpolation.jar"
@ -3662,13 +3667,14 @@ these two libraries to vary independently of one another.")
(name "java-plexus-classworlds") (name "java-plexus-classworlds")
(version "2.5.2") (version "2.5.2")
(source (origin (source (origin
(method url-fetch) (method git-fetch)
(uri (string-append "https://github.com/codehaus-plexus/" (uri (git-reference
"plexus-classworlds/archive/plexus-classworlds-" (url "https://github.com/codehaus-plexus/plexus-classworlds")
version ".tar.gz")) (commit (string-append "plexus-classworlds-" version))))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1qm4p0rl8d82lzhsiwnviw11jnq44s0gflg78zq152xyyr2xmh8g")))) "1iv8x55fbni2hg4l7pdpbwfq75xmvq1f25g6nxma8rcdpihsh13r"))))
(build-system ant-build-system) (build-system ant-build-system)
(arguments (arguments
`(#:jar-name "plexus-classworlds.jar" `(#:jar-name "plexus-classworlds.jar"
@ -3688,12 +3694,14 @@ components.")
(name "java-plexus-container-default-bootstrap") (name "java-plexus-container-default-bootstrap")
(version "1.7.1") (version "1.7.1")
(source (origin (source (origin
(method url-fetch) (method git-fetch)
(uri (string-append "https://github.com/codehaus-plexus/plexus-containers" (uri (git-reference
"/archive/plexus-containers-" version ".tar.gz")) (url "https://github.com/codehaus-plexus/plexus-containers")
(commit (string-append "plexus-containers-" version))))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0xw5g30qf4a83608rw9v2hv8pfsz7d69dkdhk6r0wia4q78hh1pc")))) "1316hrp5vqfv0aw7miq2fp0wwy833h66h502h29vnh5sxj27x228"))))
(build-system ant-build-system) (build-system ant-build-system)
(arguments (arguments
`(#:jar-name "container-default.jar" `(#:jar-name "container-default.jar"
@ -3727,12 +3735,14 @@ implementation.")
(name "java-plexus-io") (name "java-plexus-io")
(version "3.0.0") (version "3.0.0")
(source (origin (source (origin
(method url-fetch) (method git-fetch)
(uri (string-append "https://github.com/codehaus-plexus/plexus-io" (uri (git-reference
"/archive/plexus-io-" version ".tar.gz")) (url "https://github.com/codehaus-plexus/plexus-io")
(commit (string-append "plexus-io-" version))))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0f2j41kihaymxkpbm55smpxjja235vad8cgz94frfy3ppcp021dw")))) "1h4q9l2j9sfbscvxpnyy2hazi0r83h3am86y4r959wrl1b24xxwd"))))
(build-system ant-build-system) (build-system ant-build-system)
(arguments (arguments
`(#:jar-name "plexus-io.jar" `(#:jar-name "plexus-io.jar"
@ -3886,12 +3896,14 @@ from source tags and class annotations.")))
(name "java-plexus-cipher") (name "java-plexus-cipher")
(version "1.7") (version "1.7")
(source (origin (source (origin
(method url-fetch) (method git-fetch)
(uri (string-append "https://github.com/codehaus-plexus/plexus-cipher" (uri (git-reference
"/archive/plexus-cipher-" version ".tar.gz")) (url "https://github.com/codehaus-plexus/plexus-cipher")
(commit (string-append "plexus-cipher-" version))))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1j3r8xzlxlk340snkjp6lk2ilkxlkn8qavsfiq01f43xmvv8ymk3")))) "0m638nzlxbmnbcj5cwdpgs326ab584yv0k803zlx37r6iqwvf6b0"))))
(build-system ant-build-system) (build-system ant-build-system)
(arguments (arguments
`(#:jar-name "plexus-cipher.jar" `(#:jar-name "plexus-cipher.jar"
@ -3922,12 +3934,14 @@ and decryption.")
(name "java-plexus-compiler-api") (name "java-plexus-compiler-api")
(version "2.8.4") (version "2.8.4")
(source (origin (source (origin
(method url-fetch) (method git-fetch)
(uri (string-append "https://github.com/codehaus-plexus/plexus-compiler" (uri (git-reference
"/archive/plexus-compiler-" version ".tar.gz")) (url "https://github.com/codehaus-plexus/plexus-compiler")
(commit (string-append "plexus-compiler-" version))))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"09vmxs0807wsd26nbrwwj5l8ycmzazqycj52l7w6wjvkryywi69h")))) "1nq1gnn3s6z1j29gmi1hqbklsmm8b1lmnafb0191914f95mn18gk"))))
(build-system ant-build-system) (build-system ant-build-system)
(arguments (arguments
`(#:jar-name "plexus-compiler-api.jar" `(#:jar-name "plexus-compiler-api.jar"
@ -3973,13 +3987,14 @@ Compiler component.")))
(source (origin (source (origin
;; This project doesn't tag releases or publish tarballs, so we take ;; This project doesn't tag releases or publish tarballs, so we take
;; the "prepare release plexus-sec-dispatcher-1.4" git commit. ;; the "prepare release plexus-sec-dispatcher-1.4" git commit.
(method url-fetch) (method git-fetch)
(uri (string-append "https://github.com/sonatype/plexus-sec-dispatcher/" (uri (git-reference
"archive/7db8f88048.tar.gz")) (url "https://github.com/sonatype/plexus-sec-dispatcher/")
(commit "7db8f880486e192a1c5ea9544e01e756c3d49d0f")))
(sha256 (sha256
(base32 (base32
"1smfrk4n7xbrsxpxcp2j4i0j8q86j73w0w6xg7qz83dp6dagdjgp")) "1ng4yliy4cqpjr4fxxjbpwyk1wkch5f8vblm1kvwf328s4gibszs"))
(file-name (string-append name "-" version ".tar.gz")))) (file-name (git-file-name name version))))
(arguments (arguments
`(#:jar-name "plexus-sec-dispatcher.jar" `(#:jar-name "plexus-sec-dispatcher.jar"
#:source-dir "src/main/java" #:source-dir "src/main/java"
@ -4094,12 +4109,14 @@ Plexus components.")
(name "java-sisu-build-api") (name "java-sisu-build-api")
(version "0.0.7") (version "0.0.7")
(source (origin (source (origin
(method url-fetch) (method git-fetch)
(uri (string-append "https://github.com/sonatype/sisu-build-api/" (uri (git-reference
"archive/plexus-build-api-" version ".tar.gz")) (url "https://github.com/sonatype/sisu-build-api")
(commit (string-append "plexus-build-api-" version))))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1c3rrpma3x634xp2rm2p5iskfhzdyc7qfbhjzr70agrl1jwghgy2")))) "1d5w6c58gkx30d51v7qwv1xrhc0ly76848gihmgshj19yf6yhca0"))))
(build-system ant-build-system) (build-system ant-build-system)
(arguments (arguments
`(#:jar-name "sisu-build-api.jar" `(#:jar-name "sisu-build-api.jar"
@ -4149,12 +4166,14 @@ project and determining what files need to be rebuilt.")
(name "java-modello-core") (name "java-modello-core")
(version "1.9.1") (version "1.9.1")
(source (origin (source (origin
(method url-fetch) (method git-fetch)
(uri (string-append "https://github.com/codehaus-plexus/modello" (uri (git-reference
"/archive/modello-" version ".tar.gz")) (url "https://github.com/codehaus-plexus/modello")
(commit (string-append "modello-" version))))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0l2pvns8pmlrmjm3iknp7gpg3654y1m8qhy55b19sdwdchdcyxfh")))) "1di6ni42aqllpdvkpyfcw70352vr2i8wf6hd5nhd9kmqjb5dj5j4"))))
(build-system ant-build-system) (build-system ant-build-system)
(arguments (arguments
`(#:jar-name "modello-core.jar" `(#:jar-name "modello-core.jar"
@ -4321,7 +4340,7 @@ on the XPP3 API (XML Pull Parser).")))
(version "6.0") (version "6.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://download.forge.ow2.org/asm/" (uri (string-append "https://download.forge.ow2.org/asm/"
"asm-" version ".tar.gz")) "asm-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
@ -4423,13 +4442,14 @@ to generate and transform Java byte code.")
(name "java-objenesis") (name "java-objenesis")
(version "2.5.1") (version "2.5.1")
(source (origin (source (origin
(method url-fetch) (method git-fetch)
(uri (string-append "https://github.com/easymock/objenesis/" (uri (git-reference
"archive/" version ".tar.gz")) (url "https://github.com/easymock/objenesis")
(file-name (string-append "objenesis-" version ".tar.gz")) (commit version)))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1va5qz1i2wawwavhnxfzxnfgrcaflz9p1pg03irrjh4nd3rz8wh6")))) "054yi200wj00x6dp1sxfrwgndwywadsbn8d8ij1j0v45j9g2vdya"))))
(build-system ant-build-system) (build-system ant-build-system)
(arguments (arguments
`(#:jar-name "objenesis.jar" `(#:jar-name "objenesis.jar"
@ -4452,12 +4472,14 @@ constructor on object instantiation.")
(name "java-easymock") (name "java-easymock")
(version "3.4") (version "3.4")
(source (origin (source (origin
(method url-fetch) (method git-fetch)
(uri (string-append "https://github.com/easymock/easymock/" (uri (git-reference
"archive/easymock-" version ".tar.gz")) (url "https://github.com/easymock/easymock/")
(commit (string-append "easymock-" version))))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1yzg0kv256ndr57gpav46cyv4a1ns5sj722l50zpxk3j6sk9hnmi")))) "02vybm8hc0i0n9sp2f2iiqn54zwqhq835f76wc6b2m7819z5a8dq"))))
(build-system ant-build-system) (build-system ant-build-system)
(arguments (arguments
`(#:jar-name "easymock.jar" `(#:jar-name "easymock.jar"
@ -4502,7 +4524,7 @@ constructor on object instantiation.")
(native-inputs (native-inputs
`(("java-junit" ,java-junit) `(("java-junit" ,java-junit)
("java-hamcrest-core" ,java-hamcrest-core))) ("java-hamcrest-core" ,java-hamcrest-core)))
(home-page "http://easymock.org") (home-page "https://easymock.org/")
(synopsis "Java library providing mock objects for unit tests") (synopsis "Java library providing mock objects for unit tests")
(description "EasyMock is a Java library that provides an easy way to use (description "EasyMock is a Java library that provides an easy way to use
mock objects in unit testing.") mock objects in unit testing.")
@ -4513,13 +4535,14 @@ mock objects in unit testing.")
(name "java-jmock") (name "java-jmock")
(version "1.2.0") (version "1.2.0")
(source (origin (source (origin
(method url-fetch) (method git-fetch)
(uri (string-append "https://github.com/jmock-developers/" (uri (git-reference
"jmock-library/archive/" version ".tar.gz")) (url "https://github.com/jmock-developers/jmock-library")
(file-name (string-append "jmock-" version ".tar.gz")) (commit version)))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0xmrlhq0fszldkbv281k9463mv496143vvmqwpxp62yzjvdkx9w0")))) "0lkga995xd9b9mmzxmcd301hlw83p1h78nibh7djlx7wydscr85z"))))
(build-system ant-build-system) (build-system ant-build-system)
(arguments (arguments
`(#:build-target "jars" `(#:build-target "jars"
@ -4527,7 +4550,7 @@ mock objects in unit testing.")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'install (install-jars "build"))))) (replace 'install (install-jars "build")))))
(home-page "http://www.jmock.org") (home-page "http://jmock.org/")
(synopsis "Mock object library for test-driven development") (synopsis "Mock object library for test-driven development")
(description "JMock is a library that supports test-driven development of (description "JMock is a library that supports test-driven development of
Java code with mock objects. Mock objects help you design and test the Java code with mock objects. Mock objects help you design and test the
@ -4550,13 +4573,14 @@ The jMock library
(name "java-jmock") (name "java-jmock")
(version "2.8.2") (version "2.8.2")
(source (origin (source (origin
(method url-fetch) (method git-fetch)
(uri (string-append "https://github.com/jmock-developers/" (uri (git-reference
"jmock-library/archive/" version ".tar.gz")) (url "https://github.com/jmock-developers/jmock-library")
(file-name (string-append name "-" version ".tar.gz")) (commit version)))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"18650a9g8xffcsdb6w91pbswa7f40fp2sh6s3nclkclz5dbzq8f0")))) "12b7l22g3nrjvf2dzcw3z03fpd2chrgp0d8xkvn8w55rwb57pax6"))))
(inputs (inputs
`(("java-hamcrest-all" ,java-hamcrest-all) `(("java-hamcrest-all" ,java-hamcrest-all)
("java-asm" ,java-asm) ("java-asm" ,java-asm)
@ -6725,12 +6749,14 @@ This is a part of the Apache Commons Project.")
(name "java-javaewah") (name "java-javaewah")
(version "1.1.6") (version "1.1.6")
(source (origin (source (origin
(method url-fetch) (method git-fetch)
(uri (string-append "https://github.com/lemire/javaewah/" (uri (git-reference
"archive/JavaEWAH-" version ".tar.gz")) (url "https://github.com/lemire/javaewah/")
(commit (string-append "JavaEWAH-" version))))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1n7j1r1h24wlhwv9zdcj6yqjrhma2ixwyzm15l5vrv6yqjs6753b")))) "1m8qcb1py76v7avbjjrkvyy6fhr5dk2ywy73gbsxqry04gkm2nhw"))))
(build-system ant-build-system) (build-system ant-build-system)
(arguments `(#:jar-name "javaewah.jar")) (arguments `(#:jar-name "javaewah.jar"))
(inputs (inputs
@ -7032,13 +7058,14 @@ StringTemplate also powers ANTLR.")
(name "antlr3") (name "antlr3")
(version "3.5.2") (version "3.5.2")
(source (origin (source (origin
(method url-fetch) (method git-fetch)
(uri (string-append "https://github.com/antlr/antlr3/archive/" (uri (git-reference
version ".tar.gz")) (url "https://github.com/antlr/antlr3")
(file-name (string-append name "-" version ".tar.gz")) (commit version)))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0218v683081lg54z9hvjxinhxd4dqp870jx6n39gslm0bkyi4vd6")))) "0cafavrjmzqhklghrk8c2jqxkdwxgzskm20pbrfd3r41cn00dpnf"))))
(build-system ant-build-system) (build-system ant-build-system)
(arguments (arguments
`(#:jar-name (string-append ,name "-" ,version ".jar") `(#:jar-name (string-append ,name "-" ,version ".jar")

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

@ -1571,7 +1571,7 @@ functionality to help you organize your life.")
Kontact. It provides management of events and tasks, alarm notification, web Kontact. It provides management of events and tasks, alarm notification, web
export, network transparent handling of data, group scheduling, import and export, network transparent handling of data, group scheduling, import and
export of calendar files and more. It is able to work together with a wide export of calendar files and more. It is able to work together with a wide
variety of clanedaring services, including NextCloud, Kolab, Google Calendar variety of calendaring services, including NextCloud, Kolab, Google Calendar
and others. KOrganizer is fully customizable to your needs and is an integral and others. KOrganizer is fully customizable to your needs and is an integral
part of the Kontact suite, which aims to be a complete solution for organizing part of the Kontact suite, which aims to be a complete solution for organizing
your personal data. KOrganizer supports the two dominant standards for storing your personal data. KOrganizer supports the two dominant standards for storing

2
gnu/packages/lean.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019 Amin Bandali <mab@gnu.org> ;;; Copyright © 2019 Amin Bandali <bandali@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;

4
gnu/packages/libreoffice.scm
View File

@ -998,7 +998,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.")
(define-public libreoffice (define-public libreoffice
(package (package
(name "libreoffice") (name "libreoffice")
(version "6.4.1.2") (version "6.4.2.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -1008,7 +1008,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.")
(version-prefix version 3) "/libreoffice-" version ".tar.xz")) (version-prefix version 3) "/libreoffice-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"02iz94flpxgkvlipk3psddzw2gdq2j4nv7z01kphs5107sfs0r0d")))) "06acm41q9nda8r30b13cn9zafsw1gszjdphh6lx90s09d2sf7f23"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(native-inputs (native-inputs
`(("bison" ,bison) `(("bison" ,bison)

21
gnu/packages/linux.scm
View File

@ -5,7 +5,7 @@
;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch> ;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com> ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015, 2016, 2017, 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org> ;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016, 2017 Alex Kost <alezost@gmail.com> ;;; Copyright © 2016, 2017 Alex Kost <alezost@gmail.com>
@ -2434,14 +2434,14 @@ user-space processes.")
(name "unionfs-fuse") (name "unionfs-fuse")
(version "2.0") (version "2.0")
(source (origin (source (origin
(method url-fetch) (method git-fetch)
(uri (string-append (uri (git-reference
"https://github.com/rpodgorny/unionfs-fuse/archive/v" (url "https://github.com/rpodgorny/unionfs-fuse")
version ".tar.gz")) (commit (string-append "v" version))))
(file-name (string-append name "-" version ".tar.gz")) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0hsn8l1iblvx27bpd4dvnvnbh9ri3sv2f9xzpsnfz3379kb7skgj")))) "0lb8zgdxnjy2fjr2284hvdfn7inc1in44ynzgcr66x54bxzvynj6"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
`(("python" ,python))) `(("python" ,python)))
@ -2953,9 +2953,6 @@ device nodes from /dev/, handles hotplug events and loads drivers at boot
time.") time.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public eudev-with-hwdb
(deprecated-package "eudev-with-hwdb" eudev))
(define-public lvm2 (define-public lvm2
(package (package
(name "lvm2") (name "lvm2")
@ -5391,7 +5388,7 @@ monitoring tools for Linux. These include @code{mpstat}, @code{iostat},
(define-public light (define-public light
(package (package
(name "light") (name "light")
(version "1.2.1") (version "1.2.2")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -5399,7 +5396,7 @@ monitoring tools for Linux. These include @code{mpstat}, @code{iostat},
(url "https://github.com/haikarainen/light.git") (url "https://github.com/haikarainen/light.git")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(sha256 (sha256
(base32 "0zrjipd392bzjvxx0rjrb0cgi0ix1d83fwgw1mcy8kc4d16cgyjg")) (base32 "1a70zcf88ifsnwll486aicjnh48zisdf8f7vi34ihw61kdadsq9s"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments

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

@ -6643,8 +6643,8 @@ which implements a set of utilities.")
(sbcl-package->ecl-package sbcl-metatilities-base)) (sbcl-package->ecl-package sbcl-metatilities-base))
(define-public sbcl-cl-containers (define-public sbcl-cl-containers
(let ((commit "810927e19d933bcf38ffeb7a23ce521efc432d45") (let ((commit "b2980bac9ac87ad32b63b722ce520fa26cb36ee6")
(revision "1")) (revision "2"))
(package (package
(name "sbcl-cl-containers") (name "sbcl-cl-containers")
(version (git-version "0.12.1" revision commit)) (version (git-version "0.12.1" revision commit))
@ -6657,7 +6657,7 @@ which implements a set of utilities.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1s9faxw7svhbjpkhfrz2qxgjm3cvyjb8wpyb4m8dx4i5g7vvprkv")))) "19hmlax19hq0xjaqr8za90vwf06ymxw1m29sj053a309k3hm84gx"))))
(build-system asdf-build-system/sbcl) (build-system asdf-build-system/sbcl)
(native-inputs (native-inputs
`(("lift" ,sbcl-lift))) `(("lift" ,sbcl-lift)))
@ -11250,3 +11250,28 @@ If features:
(define-public cl-sycamore (define-public cl-sycamore
(sbcl-package->cl-source-package sbcl-sycamore)) (sbcl-package->cl-source-package sbcl-sycamore))
(define-public sbcl-trivial-package-local-nicknames
(package
(name "sbcl-trivial-package-local-nicknames")
(version "0.2")
(home-page "https://github.com/phoe/trivial-package-local-nicknames")
(source
(origin
(method git-fetch)
(uri (git-reference
(url home-page)
(commit "16b7ad4c2b120f50da65154191f468ea5598460e")))
(file-name (git-file-name name version))
(sha256
(base32 "18qc27xkjzdcqrilpk3pm7djldwq5rm3ggd5h9cr8hqcd54i2fqg"))))
(build-system asdf-build-system/sbcl)
(synopsis "Common Lisp compatibility library for package local nicknames")
(description
"This library is a portable compatibility layer around package local nicknames (PLN).
This was done so there is a portability library for the PLN API not included
in DEFPACKAGE.")
(license license:unlicense)))
(define-public cl-trivial-package-local-nicknames
(sbcl-package->cl-source-package sbcl-trivial-package-local-nicknames))

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

@ -962,21 +962,26 @@ the following advantages:
(name "vowpal-wabbit") (name "vowpal-wabbit")
(version "8.5.0") (version "8.5.0")
(source (origin (source (origin
(method url-fetch) (method git-fetch)
(uri (string-append (uri (git-reference
"https://github.com/JohnLangford/vowpal_wabbit/archive/" (url "https://github.com/JohnLangford/vowpal_wabbit")
version ".tar.gz")) (commit version)))
(sha256 (sha256
(base32 (base32
"0clp2kb7rk5sckhllxjr5a651awf4s8dgzg4659yh4hf5cqnf0gr")) "04bwzk6ifgnz3fmzid8b7avxf9n5pnx9xcjm61nkjng1vv0bpj8x"))
(file-name (string-append name "-" version ".tar.gz")))) (file-name (git-file-name name version))))
(inputs (inputs
`(("boost" ,boost) `(("boost" ,boost)
("zlib" ,zlib))) ("zlib" ,zlib)))
(arguments (arguments
`(#:configure-flags `(#:configure-flags
(list (string-append "--with-boost=" (list (string-append "--with-boost="
(assoc-ref %build-inputs "boost"))))) (assoc-ref %build-inputs "boost")))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'make-files-writable
(lambda _
(for-each make-file-writable (find-files "." ".*")) #t)))))
(build-system gnu-build-system) (build-system gnu-build-system)
(home-page "https://github.com/JohnLangford/vowpal_wabbit") (home-page "https://github.com/JohnLangford/vowpal_wabbit")
(synopsis "Fast machine learning library for online learning") (synopsis "Fast machine learning library for online learning")

13
gnu/packages/mail.scm
View File

@ -8,7 +8,7 @@
;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org> ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
;;; Copyright © 2015, 2016, 2018 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2015, 2016, 2018 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;; 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 Christopher Allan Webber <cwebber@dustycloud.org> ;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
;;; Copyright © 2016 Al McElrath <hello@yrns.org> ;;; Copyright © 2016 Al McElrath <hello@yrns.org>
;;; Copyright © 2016 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
@ -144,14 +144,14 @@
(define-public mailutils (define-public mailutils
(package (package
(name "mailutils") (name "mailutils")
(version "3.8") (version "3.9")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/mailutils/mailutils-" (uri (string-append "mirror://gnu/mailutils/mailutils-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1wkn9ch664477r4d8jk9153w5msljsbj99907k7zgzpmywbs6ba7")))) "1g1xf2lal04nsnf1iym9n9n0wxjpqbcr9nysxpm98v4pniinqwsz"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -166,7 +166,8 @@
;; Tests try to invoke 'mda' such that it looks up the ;; Tests try to invoke 'mda' such that it looks up the
;; 'root' user, which does not exist in the build ;; 'root' user, which does not exist in the build
;; environment. ;; environment.
(substitute* "mda/tests/testsuite" (substitute* '("mda/mda/tests/testsuite"
"mda/lmtpd/tests/testsuite")
(("root <") "nobody <") (("root <") "nobody <")
(("spool/root") "spool/nobody") (("spool/root") "spool/nobody")
(("root@localhost") "nobody@localhost")) (("root@localhost") "nobody@localhost"))
@ -1259,6 +1260,10 @@ which can add many functionalities to the base client.")
(install-file (string-append msmtpq "/msmtp-queue") bin) (install-file (string-append msmtpq "/msmtp-queue") bin)
(install-file (string-append msmtpq "/README.msmtpq") doc) (install-file (string-append msmtpq "/README.msmtpq") doc)
(install-file "scripts/vim/msmtp.vim" vimfiles) (install-file "scripts/vim/msmtp.vim" vimfiles)
;; Don't rely on netcat being in the PATH to test for a
;; connection, instead try tp ing debian.org.
(substitute* (string-append bin "/msmtpq")
(("EMAIL_CONN_TEST=n") "EMAIL_CONN_TEST=p"))
#t)))))) #t))))))
(synopsis (synopsis
"Simple and easy to use SMTP client with decent sendmail compatibility") "Simple and easy to use SMTP client with decent sendmail compatibility")

14
gnu/packages/man.scm
View File

@ -3,7 +3,7 @@
;;; Copyright © 2014 David Thompson <dthompson2@worcester.edu> ;;; Copyright © 2014 David Thompson <dthompson2@worcester.edu>
;;; Copyright © 2015, 2016 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2016 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015 Alex Kost <alezost@gmail.com> ;;; Copyright © 2015 Alex Kost <alezost@gmail.com>
;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015, 2016, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2018, 2019, 2020 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 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018, 2019 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2018, 2019 Marius Bakke <mbakke@fastmail.com>
@ -25,6 +25,7 @@
(define-module (gnu packages man) (define-module (gnu packages man)
#:use-module (guix licenses) #:use-module (guix licenses)
#:use-module (guix git-download)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
@ -259,13 +260,14 @@ in C99.")
(version "1.6.0") (version "1.6.0")
(source (source
(origin (origin
(method url-fetch) (method git-fetch)
(uri (string-append (uri (git-reference
"https://github.com/mvertes/txt2man/archive/txt2man-" (url "https://github.com/mvertes/txt2man")
version ".tar.gz")) (commit (string-append "txt2man-" version))))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"168cj96974n2z0igin6j1ic1m45zyic7nm5ark7frq8j78rrx4zn")))) "1razjpvlcp85hqli77mwr9nmn5jnv3lm1fxbbqjpx1brv3h1lvm5"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; no "check" target `(#:tests? #f ; no "check" target

11
gnu/packages/maths.scm
View File

@ -29,7 +29,7 @@
;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2018 Eric Brown <brown@fastmail.com> ;;; Copyright © 2018 Eric Brown <brown@fastmail.com>
;;; Copyright © 2018 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2018 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2018 Amin Bandali <mab@gnu.org> ;;; Copyright © 2018 Amin Bandali <bandali@gnu.org>
;;; Copyright © 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2019 Steve Sprang <scs@stevesprang.com> ;;; Copyright © 2019 Steve Sprang <scs@stevesprang.com>
;;; Copyright © 2019 Robert Smith <robertsmith@posteo.net> ;;; Copyright © 2019 Robert Smith <robertsmith@posteo.net>
@ -1648,9 +1648,6 @@ script files.")
"qscintilla2_qt5")) "qscintilla2_qt5"))
#t)))))))) #t))))))))
(define-public qtoctave
(deprecated-package "qtoctave" octave))
(define-public opencascade-oce (define-public opencascade-oce
(package (package
(name "opencascade-oce") (name "opencascade-oce")
@ -3124,7 +3121,7 @@ directly in C++, or quick conversion of research code into production
environments. It can be used for machine learning, pattern recognition, environments. It can be used for machine learning, pattern recognition,
signal processing, bioinformatics, statistics, econometrics, etc. The library signal processing, bioinformatics, statistics, econometrics, etc. The library
provides efficient classes for vectors, matrices and cubes, as well as 150+ provides efficient classes for vectors, matrices and cubes, as well as 150+
associated functions (eg. contiguous and non-contiguous submatrix views).") associated functions (e.g., contiguous and non-contiguous submatrix views).")
(license license:asl2.0))) (license license:asl2.0)))
(define-public muparser (define-public muparser
@ -4212,6 +4209,10 @@ as equations, scalars, vectors, and matrices.")
(guix build utils)) (guix build utils))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'enable-bytecode-determinism
(lambda _
(setenv "PYTHONHASHSEED" "0")
#t))
(add-after 'unpack 'fix-compatability (add-after 'unpack 'fix-compatability
;; Versions after 4.8.3 have immintrin.h IFDEFed for Windows only. ;; Versions after 4.8.3 have immintrin.h IFDEFed for Windows only.
(lambda _ (lambda _

4
gnu/packages/mpd.scm
View File

@ -92,7 +92,7 @@ interfacing MPD in the C, C++ & Objective C languages.")
(define-public mpd (define-public mpd
(package (package
(name "mpd") (name "mpd")
(version "0.21.20") (version "0.21.21")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (uri
@ -101,7 +101,7 @@ interfacing MPD in the C, C++ & Objective C languages.")
"/mpd-" version ".tar.xz")) "/mpd-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1q8hwl3i0a4qzdwfh44r0nh5zd2mm3rraqw5qvmz6qfrjslz0bj2")))) "1kk8q5z99zdzwv3angn03jwnxhqdad0pnyi5j67c2qiv1rgv3gg1"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:configure-flags '("-Ddocumentation=true"))) ;the default is 'false'... `(#:configure-flags '("-Ddocumentation=true"))) ;the default is 'false'...

6
gnu/packages/mtools.scm
View File

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 John Darrington <jmd@gnu.org> ;;; Copyright © 2013 John Darrington <jmd@gnu.org>
;;; Copyright © 2015, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -29,14 +29,14 @@
(define-public mtools (define-public mtools
(package (package
(name "mtools") (name "mtools")
(version "4.0.23") (version "4.0.24")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/mtools/mtools-" (uri (string-append "mirror://gnu/mtools/mtools-"
version ".tar.bz2")) version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"1qwfxzr964fasxlzhllahk8mzh7c82s808wvly95dsqsflkdp27i")) "1f9g7g8zspp8nvg1nz869il9pvxpdpchqd0vxfc89y8rjbda5x14"))
(patches (patches
(search-patches "mtools-mformat-uninitialized.patch")))) (search-patches "mtools-mformat-uninitialized.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)

26
gnu/packages/multiprecision.scm
View File

@ -3,7 +3,7 @@
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015, 2018 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2015, 2018 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2016 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2016 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2016, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2018, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
@ -50,7 +50,8 @@
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("m4" ,m4))) (native-inputs `(("m4" ,m4)))
(outputs '("out" "debug")) (outputs '("out" "debug"))
(arguments `(#:parallel-tests? #f ; mpz/reuse fails otherwise (arguments
`(#:parallel-tests? #f ; mpz/reuse fails otherwise
#:configure-flags #:configure-flags
'(;; Build a "fat binary", with routines for several '(;; Build a "fat binary", with routines for several
;; sub-architectures. ;; sub-architectures.
@ -61,7 +62,26 @@
;; they produce different headers. We need shared. ;; they produce different headers. We need shared.
`("--disable-static" `("--disable-static"
"--enable-shared")) "--enable-shared"))
(else '()))))) (else '())))
;; Remove after core-updates merge.
;; Workaround for gcc-7 transition breakage, -system and cross-build,
;; Note: See <http://bugs.gnu.org/22186> for why not 'CPATH'.
;; Note: See <http://bugs.gnu.org/30756> for why not 'C_INCLUDE_PATH' & co.
,@(if (target-mingw?)
`(#:phases
(modify-phases %standard-phases
(add-before 'configure 'setenv
(lambda _
(let ((gcc (assoc-ref %build-inputs "cross-gcc"))
(libc (assoc-ref %build-inputs "cross-libc")))
(setenv "CROSS_CPLUS_INCLUDE_PATH"
(string-append gcc "/include/c++"
":" gcc "/include"
":" libc "/include"))
(format #t "environment variable `CROSS_CPLUS_INCLUDE_PATH' set to `~a'\n"
(getenv "CROSS_CPLUS_INCLUDE_PATH"))
#t)))))
'())))
(synopsis "Multiple-precision arithmetic library") (synopsis "Multiple-precision arithmetic library")
(description (description
"The @acronym{GMP, the GNU Multiple Precision Arithmetic} library performs "The @acronym{GMP, the GNU Multiple Precision Arithmetic} library performs

106
gnu/packages/music.scm
View File

@ -1409,7 +1409,7 @@ users to select LV2 plugins and run them with jalv.")
(define-public synthv1 (define-public synthv1
(package (package
(name "synthv1") (name "synthv1")
(version "0.9.12") (version "0.9.13")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (uri
@ -1417,7 +1417,7 @@ users to select LV2 plugins and run them with jalv.")
"/synthv1-" version ".tar.gz")) "/synthv1-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1amxrl1cqwgncw5437r572frgf6xhss3cfpbgh178i8phlq1q731")))) "0bb48myvgvqcibwm68qhd4852pjr2g19rasf059a799d1hzgfq3l"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f)) ; there are no tests `(#:tests? #f)) ; there are no tests
@ -1441,7 +1441,7 @@ oscillators and stereo effects.")
(define-public drumkv1 (define-public drumkv1
(package (package
(name "drumkv1") (name "drumkv1")
(version "0.9.12") (version "0.9.13")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (uri
@ -1449,7 +1449,7 @@ oscillators and stereo effects.")
"/drumkv1-" version ".tar.gz")) "/drumkv1-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0hmnmk9vvi43wl6say0dg7j088h7mmwmfdwjhsq89c7i7cpg78da")))) "1h88sakxs0b20k8v2sh14y05fin1zqmhnid6h9mk9c37ixxg58ia"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f)) ; there are no tests `(#:tests? #f)) ; there are no tests
@ -1474,7 +1474,7 @@ effects.")
(define-public samplv1 (define-public samplv1
(package (package
(name "samplv1") (name "samplv1")
(version "0.9.12") (version "0.9.13")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (uri
@ -1482,7 +1482,7 @@ effects.")
"/samplv1-" version ".tar.gz")) "/samplv1-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0xzjxiqzcf1ygabrjsy0iachhnpy85rp9519fmj2f568r6ml6hzg")))) "0clsp6s5qfnh0xaxbd35vq2ppi72q9dfayrzlgl73800a8p7gh9m"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f)) ; there are no tests `(#:tests? #f)) ; there are no tests
@ -1507,7 +1507,7 @@ effects.")
(define-public padthv1 (define-public padthv1
(package (package
(name "padthv1") (name "padthv1")
(version "0.9.12") (version "0.9.13")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (uri
@ -1515,7 +1515,7 @@ effects.")
"/padthv1-" version ".tar.gz")) "/padthv1-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1zz3rz990k819q0rlzllqdwvag0x9k63443lb0mp8lwlczxnza6l")))) "1c1zllph86qswcxddz4vpsj6r9w21hbv4gkba0pyd3q7pbfqr7nz"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f)) ; there are no tests `(#:tests? #f)) ; there are no tests
@ -5293,3 +5293,93 @@ as JACK standalone applications.")
automation that comes as an LV2 plugin bundle with a custom UI.") automation that comes as an LV2 plugin bundle with a custom UI.")
(home-page "https://git.zrythm.org/cgit/ZLFO/") (home-page "https://git.zrythm.org/cgit/ZLFO/")
(license license:agpl3+))) (license license:agpl3+)))
(define-public vl1-emulator
(package
(name "vl1-emulator")
(version "1.1.0.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/linuxmao-org/VL1-emulator.git")
(commit (string-append "v" version))
;; bundles a specific commit of the DISTRHO plugin framework
(recursive? #t)))
(file-name (git-file-name name version))
(sha256
(base32
"1npc86vqma8gk1hawa0lii0r2xmnv846plyl1ci3bdswyrdk5chm"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ;no check target
#:make-flags
(list (string-append "PREFIX=" (assoc-ref %outputs "out"))
"CC=gcc")
#:phases
(modify-phases %standard-phases
(delete 'configure)))) ;no configure target
(inputs
`(("cairo" ,cairo)
("jack" ,jack-1)
("mesa" ,mesa)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "https://github.com/linuxmao-org/VL1-emulator")
(synopsis "Emulator of Casio VL-Tone VL1")
(description "The VL1-Emulator is an emulator of Casio VL-Tone VL1,
based on source code by PolyValens, offered as an LV2 plugin and a
standalone JACK application.")
;; Expat or CC0
(license (list license:expat license:cc0))))
(define-public regrader
(package
(inherit vl1-emulator)
(name "regrader")
(version "1.0.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/linuxmao-org/regrader.git")
(commit (string-append "v" version))
;; bundles a specific commit of the DISTRHO plugin framework
(recursive? #t)))
(file-name (git-file-name name version))
(sha256
(base32
"0gl4d5lf2afqknz22jz7hh7029sc9v1xrz6nbz9dlv42bwc0cvl0"))))
(home-page "https://github.com/linuxmao-org/regrader")
(synopsis "Delay effect plugin")
(description
"Regrader is a delay effect where the repeats degrade in resolution.
This is an unofficial port of the Regrader plugin created by Igorski. It
is available as an LV2 plugin and a standalone JACK application.")
(license license:expat)))
(define-public fogpad
(package
(inherit vl1-emulator)
(name "fogpad")
(version "1.0.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/linuxmao-org/fogpad")
(commit (string-append "v" version))
;; bundles a specific commit of the DISTRHO plugin framework
(recursive? #t)))
(file-name (git-file-name name version))
(sha256
(base32
"1j1hbya2dsqpf22zkpi4kwz3dram9g1ndxzmgfwpmf3i4jd3csgb"))))
(home-page "https://github.com/linuxmao-org/fogpad")
(synopsis "Reverb effect plugin")
(description
"Fogpad is a reverb effect in which the reflections can be frozen,
filtered, pitch shifted and ultimately disintegrated. This is an unofficial
port of the Regrader plugin created by Igorski. It is available as an LV2
plugin and a standalone JACK application.")
(license license:expat)))

24
gnu/packages/networking.scm
View File

@ -32,7 +32,7 @@
;;; Copyright © 2019 Timotej Lazar <timotej.lazar@araneo.si> ;;; Copyright © 2019 Timotej Lazar <timotej.lazar@araneo.si>
;;; Copyright © 2019 Brice Waegeneire <brice@waegenei.re> ;;; Copyright © 2019 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2019 Tonton <tonton@riseup.net> ;;; Copyright © 2019 Tonton <tonton@riseup.net>
;;; Copyright © 2019 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2019, 2020 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2019 Jan Wielkiewicz <tona_kosmicznego_smiecia@interia.pl> ;;; Copyright © 2019 Jan Wielkiewicz <tona_kosmicznego_smiecia@interia.pl>
;;; Copyright © 2019 Daniel Schaefer <git@danielschaefer.me> ;;; Copyright © 2019 Daniel Schaefer <git@danielschaefer.me>
;;; Copyright © 2019 Diego N. Barbato <dnbarbato@posteo.de> ;;; Copyright © 2019 Diego N. Barbato <dnbarbato@posteo.de>
@ -2784,7 +2784,7 @@ module @code{batman-adv}, for Layer 2.")
(define-public pagekite (define-public pagekite
(package (package
(name "pagekite") (name "pagekite")
(version "1.5.0.191126") (version "1.5.0.200327")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -2793,7 +2793,7 @@ module @code{batman-adv}, for Layer 2.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0mncfjfrr13sm84g5z49qxg5cy791h5qxphjsl77x91zs3m36c8l")))) (base32 "1vw7kjwxqd3qvm7kpxgjzl6797y0i1f16yfkfad84qpx2ij0gvdm"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -2902,6 +2902,24 @@ Such interfaces are useful for VPN software, virtualization, emulation,
simulation, and a number of other applications.") simulation, and a number of other applications.")
(license license:gpl2))) (license license:gpl2)))
(define-public wol
(package
(name "wol")
(version "0.7.1")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/wake-on-lan/wol/"
version "/wol-" version ".tar.gz"))
(sha256
(base32 "08i6l5lr14mh4n3qbmx6kyx7vjqvzdnh3j9yfvgjppqik2dnq270"))))
(build-system gnu-build-system)
(home-page "https://sourceforge.net/projects/wake-on-lan/")
(synopsis "Implements Wake On LAN functionality in a small program")
(description "Tool to send a magic packet to wake another host on the
network. This must be enabled on the target host, usually in the BIOS.")
(license license:gpl2)))
(define-public vde2 (define-public vde2
(package (package
(name "vde2") (name "vde2")

16
gnu/packages/ocr.scm
View File

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2019 Alex Vong <alexvong1995@gmail.com>
;;; ;;;
@ -57,13 +57,13 @@ it produces text in 8-bit or UTF-8 formats.")
(version "3.04.01") (version "3.04.01")
(source (source
(origin (origin
(method url-fetch) (method git-fetch)
(uri (string-append (uri (git-reference
"https://github.com/tesseract-ocr/tesseract/archive/" (url "https://github.com/tesseract-ocr/tesseract")
version ".tar.gz")) (commit version)))
(file-name (string-append name "-" version ".tar.gz")) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0snwd8as5i8vx7zkimpd2yg898jl96zf90r65a9w615f2hdkxxjp")))) (base32 "0h1x4z1h86n2gwknd0wck6gykkp99bmm02lg4a47a698g4az6ybv"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("leptonica" ,leptonica))) `(("leptonica" ,leptonica)))
@ -71,7 +71,7 @@ it produces text in 8-bit or UTF-8 formats.")
'(#:configure-flags '(#:configure-flags
(let ((leptonica (assoc-ref %build-inputs "leptonica"))) (let ((leptonica (assoc-ref %build-inputs "leptonica")))
(list (string-append "LIBLEPT_HEADERSDIR=" leptonica "/include"))))) (list (string-append "LIBLEPT_HEADERSDIR=" leptonica "/include")))))
(home-page "https://github.com/tesseract-ocr") (home-page "https://github.com/tesseract-ocr/tesseract")
(synopsis "Optical character recognition engine") (synopsis "Optical character recognition engine")
(description (description
"Tesseract is an optical character recognition (OCR) engine with very "Tesseract is an optical character recognition (OCR) engine with very

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

@ -413,8 +413,6 @@ the Nix package manager.")
(invoke "make" "install-binPROGRAMS"))) (invoke "make" "install-binPROGRAMS")))
(delete 'wrap-program))))))) (delete 'wrap-program)))))))
(define-public guile2.0-guix
(deprecated-package "guile2.0-guix" guix))
(define-public guile2.2-guix (define-public guile2.2-guix
(package (package
@ -1024,7 +1022,7 @@ for packaging and deployment of cross-compiled Windows applications.")
(define-public libostree (define-public libostree
(package (package
(name "libostree") (name "libostree")
(version "2020.2") (version "2020.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -1032,7 +1030,7 @@ for packaging and deployment of cross-compiled Windows applications.")
(version-major+minor version) "/libostree-" version ".tar.xz")) (version-major+minor version) "/libostree-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0bbk0sg4m38g7j00hy358p2azxas87minpgz3avwma6jsylj1qjg")))) "01cch4as23xspq6pck59al7x5jj60wl21g8p3iqbdxcjl1p3jxsq"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases '(#:phases

62
gnu/packages/patches/gnupg-default-pinentry.patch
View File

@ -1,15 +1,65 @@
Default to the pinentry program installed in ~/.guix-profile. Make GnuPG automatically find a pinentry installed by Guix. Try using
$HOME or, if that variable is not set, use the system password database,
or fall back to looking in "/".
More information:
https://bugs.gnu.org/24076
diff --git a/common/homedir.c b/common/homedir.c diff --git a/common/homedir.c b/common/homedir.c
index e9e75d0..74e0aaf 100644 index 4b6e46e88..f7ae68ba5 100644
--- a/common/homedir.c --- a/common/homedir.c
+++ b/common/homedir.c +++ b/common/homedir.c
@@ -968,7 +968,7 @@ get_default_pinentry_name (int reset) @@ -33,6 +33,7 @@
#include <errno.h>
#include <fcntl.h>
#include <unistd.h>
+#include <pwd.h>
#ifdef HAVE_W32_SYSTEM
#include <winsock2.h> /* Due to the stupid mingw64 requirement to
@@ -67,6 +68,10 @@
* gnupg_homedir and gnupg_set_homedir. Malloced. */
static char *the_gnupg_homedir;
+/* The user's home directory. Used in Guix to help GnuPG find the
+ * pinentry. */
+static char *the_user_homedir;
+
/* Flag indicating that home directory is not the default one. */
static byte non_default_homedir;
@@ -509,6 +514,25 @@ gnupg_homedir (void)
return the_gnupg_homedir;
}
+/* Return the user's home directory */
+const char *
+user_homedir (void)
+{
+ const char *dir;
+ dir = getenv("HOME");
+ if (dir == NULL)
+ {
+ struct passwd *pw = NULL;
+ pw = getpwuid (getuid ());
+ if (pw != NULL)
+ dir = pw->pw_dir;
+ else
+ dir = "/";
+ }
+ if (!the_user_homedir)
+ the_user_homedir = make_absfilename (dir, NULL);
+ return the_user_homedir;
+}
/* Return whether the home dir is the default one. */
int
@@ -971,6 +995,7 @@ get_default_pinentry_name (int reset)
} names[] = { } names[] = {
/* The first entry is what we return in case we found no /* The first entry is what we return in case we found no
other pinentry. */ other pinentry. */
- { gnupg_bindir, DIRSEP_S "pinentry" EXEEXT_S }, + { user_homedir, "/.guix-profile/bin/pinentry" },
+ { gnupg_homedir, "/.guix-profile/bin/pinentry" }, { gnupg_bindir, DIRSEP_S "pinentry" EXEEXT_S },
#ifdef HAVE_W32_SYSTEM #ifdef HAVE_W32_SYSTEM
/* Try Gpg4win directory (with bin and without.) */ /* Try Gpg4win directory (with bin and without.) */
{ w32_rootdir, "\\..\\Gpg4win\\bin\\pinentry.exe" },

13
gnu/packages/patches/hash-extender-test-suite.patch
View File

@ -1,13 +0,0 @@
Make the test suite exit with a non-zero exit code if some tests failed.
Pull request pending upstream: https://github.com/iagox86/hash_extender/pull/13
--- a/test.c
+++ b/test.c
@@ -79,5 +79,9 @@ void test_report(void)
printf("TESTS PASSED: %d / %d [%2.4f%%]\n", tests_passed, tests_run, 100 * (float)tests_passed / tests_run);
printf("--------------------------------------------------------------------------------\n");
}
+
+ if (tests_passed != tests_run) {
+ exit(1);
+ }
}

74
gnu/packages/pdf.scm
View File

@ -16,7 +16,7 @@
;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2019 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2019 Ben Sturmfels <ben@sturm.com.au> ;;; Copyright © 2019 Ben Sturmfels <ben@sturm.com.au>
;;; Copyright © 2019 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2019,2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -93,6 +93,78 @@
#:use-module (gnu packages xorg) #:use-module (gnu packages xorg)
#:use-module (srfi srfi-1)) #:use-module (srfi srfi-1))
(define-public flyer-composer
(package
(name "flyer-composer")
(version "1.0rc2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "flyer-composer" version))
(sha256
(base32 "17igqb5dlcgcq4nimjw6cf9qgz6a728zdx1d0rr90r2z0llcchsv"))))
(build-system python-build-system)
(arguments
`(#:tests? #f ;; TODO
#:phases
(modify-phases %standard-phases
(add-after 'install 'wrap-executable
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(qtbase (assoc-ref inputs "qtbase"))
(qml "/lib/qt5/qml"))
(wrap-program (string-append out "/bin/flyer-composer-gui")
`("QT_PLUGIN_PATH" ":" =
(,(string-append qtbase "/lib/qt5/plugins")))
`("QT_QPA_PLATFORM_PLUGIN_PATH" ":" =
(,(string-append qtbase "/lib/qt5/plugins/platforms"))))
#t))))))
(inputs
`(("python-pypdf2" ,python-pypdf2)
("python-pyqt" ,python-pyqt)
("python-poppler-qt5" ,python-poppler-qt5)
("qtbase" ,qtbase)))
(home-page "http://crazy-compilers.com/flyer-composer")
(synopsis "Rearrange PDF pages to print as flyers on one sheet")
(description "@command{flyer-composer} can be used to prepare one- or
two-sided flyers for printing on one sheet of paper.
Imagine you have designed a flyer in A6 format and want to print it using your
A4 printer. Of course, you want to print four flyers on each sheet. This is
where Flyer Composer steps in, creating a PDF which holds your flyer four
times. If you have a second page, Flyer Composer can arrange it the same way
- even if the second page is in a separate PDF file.
This package contains both the commnd line tool and the gui too.")
(license license:agpl3+)))
(define-public flyer-composer-cli
(package/inherit flyer-composer
(name "flyer-composer-cli")
(arguments
`(#:tests? #f ;; TODO
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'remove-gui
(lambda _
(delete-file-recursively "flyer_composer/gui")
(substitute* "setup.cfg"
(("^\\s+flyer-composer-gui\\s*=.*") ""))
#t)))))
(inputs
`(("python-pypdf2" ,python-pypdf2)))
(description "@command{flyer-composer} can be used to prepare one- or
two-sided flyers for printing on one sheet of paper.
Imagine you have designed a flyer in A6 format and want to print it using your
A4 printer. Of course, you want to print four flyers on each sheet. This is
where Flyer Composer steps in, creating a PDF which holds your flyer four
times. If you have a second page, Flyer Composer can arrange it the same way
- even if the second page is in a separate PDF file.
This package contains only the commnd line tool. If you like to use the gui,
please install the @code{flyer-composer-gui} package.")))
(define-public poppler (define-public poppler
(package (package
(name "poppler") (name "poppler")

3
gnu/packages/php.scm
View File

@ -353,6 +353,3 @@ systems, web content management systems and web frameworks." )
license:lgpl2.1+ ; ext/bcmath/libbcmath license:lgpl2.1+ ; ext/bcmath/libbcmath
license:bsd-2 ; ext/fileinfo/libmagic license:bsd-2 ; ext/fileinfo/libmagic
license:expat)))) ; ext/date/lib license:expat)))) ; ext/date/lib
(define-public php-with-bcmath
(deprecated-package "php-with-bcmath" php))

4
gnu/packages/plotutils.scm
View File

@ -197,14 +197,14 @@ colors, styles, options and details.")
(define-public asymptote (define-public asymptote
(package (package
(name "asymptote") (name "asymptote")
(version "2.64") (version "2.65")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/asymptote/" (uri (string-append "mirror://sourceforge/asymptote/"
version "/asymptote-" version ".src.tgz")) version "/asymptote-" version ".src.tgz"))
(sha256 (sha256
(base32 "1x4nmzklzd2xfmm03mgnpg0345dwrwr5czk9gkfl5sx7x1cgx4c0")))) (base32 "0i4qqlvzz69mhdq6kf689sa9rxfb1cwsg1nx88hryb291hddgqqm"))))
(build-system gnu-build-system) (build-system gnu-build-system)
;; Note: The 'asy' binary retains a reference to docdir for use with its ;; Note: The 'asy' binary retains a reference to docdir for use with its
;; "help" command in interactive mode, so adding a "doc" output is not ;; "help" command in interactive mode, so adding a "doc" output is not

2
gnu/packages/pulseaudio.scm
View File

@ -10,7 +10,7 @@
;;; Copyright © 2018 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2018 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2019 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2019 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2020 Amin Bandali <mab@gnu.org> ;;; Copyright © 2020 Amin Bandali <bandali@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;

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

@ -60,7 +60,7 @@
;;; Copyright © 2019 Sam <smbaines8@gmail.com> ;;; Copyright © 2019 Sam <smbaines8@gmail.com>
;;; Copyright © 2019 Jack Hill <jackhill@jackhill.us> ;;; Copyright © 2019 Jack Hill <jackhill@jackhill.us>
;;; Copyright © 2019, 2020 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2019, 2020 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2019 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2019, 2020 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2019 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2019 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2019 Jacob MacDonald <jaccarmac@gmail.com> ;;; Copyright © 2019 Jacob MacDonald <jaccarmac@gmail.com>
;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org> ;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org>
@ -74,6 +74,7 @@
;;; Copyright © 2020 Alexandros Theodotou <alex@zrythm.org> ;;; Copyright © 2020 Alexandros Theodotou <alex@zrythm.org>
;;; Copyright © 2020 Josh Marshall <joshua.r.marshall.1991@gmail.com> ;;; Copyright © 2020 Josh Marshall <joshua.r.marshall.1991@gmail.com>
;;; Copyright © 2020 Alexandros Theodotou <alex@zrythm.org> ;;; Copyright © 2020 Alexandros Theodotou <alex@zrythm.org>
;;; Copyright © 2020 Lars-Dominik Braun <ldb@leibniz-psychology.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -4641,19 +4642,22 @@ as the original project seems to have been abandoned circa 2007.")
(package-with-python2 python-socksipy-branch)) (package-with-python2 python-socksipy-branch))
(define-public python-socksipychain (define-public python-socksipychain
(let ((commit "eb5ee8741ce006ac0c5c3e2e83204062c348c155")
(revision "1")
(version "2.1.1"))
(package (package
(name "python-socksipychain") (name "python-socksipychain")
(version "2.1.0") (version (git-version version revision commit))
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/pagekite/PySocksipyChain.git") (url "https://github.com/pagekite/PySocksipyChain.git")
(commit (string-append "v" version)))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0idm9a050rd2kbgbz2sk9ib9589kj4xh1xdnggs6xbq2v2y8f6zn")))) "0fpphn6xnpm7qk8a914s4abycsbq9w6qkci07my632v0fylnm5n7"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:tests? #f)) ; Tests try to access the network. `(#:tests? #f)) ; Tests try to access the network.
@ -4664,7 +4668,7 @@ as the original project seems to have been abandoned circa 2007.")
adds support for arbitrary chaining of proxy servers and various modes of adds support for arbitrary chaining of proxy servers and various modes of
TLS/SSL encryption. It was developed for use in PageKite, and also includes TLS/SSL encryption. It was developed for use in PageKite, and also includes
a simple netcat replacement with chaining support.") a simple netcat replacement with chaining support.")
(license license:bsd-3))) (license license:bsd-3))))
(define-public python-pycodestyle (define-public python-pycodestyle
(package (package
@ -11854,12 +11858,6 @@ hardware-accelerated multitouch applications.")
(define-public python2-kivy (define-public python2-kivy
(package-with-python2 python-kivy)) (package-with-python2 python-kivy))
(define-public python-kivy-next
(deprecated-package "python-kivy-next" python-kivy))
(define-public python2-kivy-next
(deprecated-package "python2-kivy-next" python2-kivy))
(define-public python-binaryornot (define-public python-binaryornot
(package (package
(name "python-binaryornot") (name "python-binaryornot")
@ -15734,14 +15732,14 @@ and other tools.")
(define-public python-typing-extensions (define-public python-typing-extensions
(package (package
(name "python-typing-extensions") (name "python-typing-extensions")
(version "3.7.2") (version "3.7.4.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "typing_extensions" version)) (uri (pypi-uri "typing_extensions" version))
(sha256 (sha256
(base32 (base32
"0wfsv71pvkyf2na938l579jh0v3kzl6g744ijgnahcwd4d9x0b7v")))) "1wj1vcgbnm20aiinmphyxfrbv3qi9xdhvw89ab3qm42y9n4wq7h9"))))
(build-system python-build-system) (build-system python-build-system)
(home-page (home-page
"https://github.com/python/typing/blob/master/typing_extensions/README.rst") "https://github.com/python/typing/blob/master/typing_extensions/README.rst")
@ -18781,3 +18779,55 @@ allows to start and stop daemons for a quick throw-away usage. This is typicall
useful when needing these daemons to run integration testing. It originally useful when needing these daemons to run integration testing. It originally
evolved from its precursor @code{overtest}.") evolved from its precursor @code{overtest}.")
(license license:asl2.0))) (license license:asl2.0)))
(define-public python-pytest-check-links
(package
(name "python-pytest-check-links")
(version "0.3.0")
(source
(origin
(method url-fetch)
;; URI uses underscores
(uri (pypi-uri "pytest_check_links" version))
(sha256
(base32
"12x3wmrdzm6wgk0vz02hb769h68nr49q47w5q1pj95pc89hsa34v"))))
(build-system python-build-system)
(propagated-inputs
`(("python-docutils" ,python-docutils)
("python-html5lib" ,python-html5lib)
("python-nbconvert" ,python-nbconvert)
("python-nbformat" ,python-nbformat)
("python-pytest" ,python-pytest)
("python-six" ,python-six)))
(native-inputs
`(("python-pbr-minimal" ,python-pbr-minimal)))
(home-page "https://github.com/minrk/pytest-check-links")
(synopsis "Check links in files")
(description "This package provides a pytest plugin that checks URLs for
HTML-containing files.")
(license license:bsd-3)))
(define-public python-json5
(package
(name "python-json5")
(version "0.8.5")
(source
(origin
;; sample.json5 is missing from PyPi source tarball
(method git-fetch)
(uri (git-reference
(url "https://github.com/dpranke/pyjson5.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0nyngj18jlkgvm1177lc3cj47wm4yh3dqigygvcvw7xkyryafsqn"))))
(build-system python-build-system)
(home-page "https://github.com/dpranke/pyjson5")
(synopsis
"Python implementation of the JSON5 data format")
(description
"JSON5 extends the JSON data interchange format to make it slightly more
usable as a configuration language. This Python package implements parsing and
dumping of JSON5 data structures.")
(license license:asl2.0)))

6
gnu/packages/qt.scm
View File

@ -2374,7 +2374,7 @@ different kinds of sliders, and much more.")
(define-public qtwebkit (define-public qtwebkit
(package (package
(name "qtwebkit") (name "qtwebkit")
(version "5.212.0-alpha3") (version "5.212.0-alpha4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -2382,12 +2382,12 @@ different kinds of sliders, and much more.")
"qtwebkit-" version "/qtwebkit-" version ".tar.xz")) "qtwebkit-" version "/qtwebkit-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"05syvwi3jw9abwsc93rmjkna0vyh6bkfrsqhwir48ms54icfwzim")) "1rm9sjkabxna67dl7myx9d9vpdyfxfdhrk9w7b94srkkjbd2d8cw"))
(patches (search-patches "qtwebkit-pbutils-include.patch")))) (patches (search-patches "qtwebkit-pbutils-include.patch"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
`(("perl" ,perl) `(("perl" ,perl)
("python" ,python-2.7) ("python" ,python)
("ruby" ,ruby) ("ruby" ,ruby)
("bison" ,bison) ("bison" ,bison)
("flex" ,flex) ("flex" ,flex)

105
gnu/packages/rust.scm
View File

@ -55,6 +55,32 @@
#:use-module (ice-9 match) #:use-module (ice-9 match)
#:use-module (srfi srfi-26)) #:use-module (srfi srfi-26))
;; This is the hash for the empty file, and the reason it's relevant is not
;; the most obvious.
;;
;; The root of the problem is that Cargo keeps track of a file called
;; Cargo.lock, that contains the hash of the tarball source of each dependency.
;;
;; However, tarball sources aren't handled well by Guix because of the need to
;; patch shebangs in any helper scripts. This is why we use Cargo's vendoring
;; capabilities, where instead of the tarball, a directory is provided in its
;; place. (In the case of rustc, the source code already ships with vendored
;; dependencies, but crates built with cargo-build-system undergo vendoring
;; during the build.)
;;
;; To preserve the advantages of checksumming, vendored dependencies contain
;; a file called .cargo-checksum.json, which contains the hash of the tarball,
;; as well as the list of files in it, with the hash of each file.
;;
;; The patch-cargo-checksums phase of cargo-build-system runs after
;; any Guix-specific patches to the vendored dependencies and regenerates the
;; .cargo-checksum.json files, but it's hard to know the tarball checksum that
;; should be written to the file - and taking care of any unhandled edge case
;; would require rebuilding everything that depends on rust. This is why we lie,
;; and say that the tarball has the hash of an empty file. It's not a problem
;; because cargo-build-system removes the Cargo.lock file. We can't do that
;; for rustc because of a quirk of its build system, so we modify the lock file
;; to substitute the hash.
(define %cargo-reference-hash (define %cargo-reference-hash
"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855") "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855")
@ -915,20 +941,15 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\"
(("only-x86_64") "ignore-test")) (("only-x86_64") "ignore-test"))
#t))))))))) #t)))))))))
(define-public rust-1.31 (define (patch-command-exec-tests-phase test-path)
(let ((base-rust "The command-exec.rs test moves around between releases. We need to apply
(rust-bootstrapped-package rust-1.30 "1.31.1" a Guix-specific patch to it for each release. This function generates the phase
"0sk84ff0cklybcp0jbbxcw7lk7mrm6kb6km5nzd6m64dy0igrlli"))) that applies said patch, parametrized by the test-path. This is done this way
(package because the phase is more complex than the equivalents for other tests that
(inherit base-rust) move around."
(arguments `(lambda* (#:key inputs #:allow-other-keys)
(substitute-keyword-arguments (package-arguments base-rust)
((#:phases phases)
`(modify-phases ,phases
(add-after 'patch-tests 'patch-command-exec-tests
(lambda* (#:key inputs #:allow-other-keys)
(let ((coreutils (assoc-ref inputs "coreutils"))) (let ((coreutils (assoc-ref inputs "coreutils")))
(substitute* "src/test/run-pass/command-exec.rs" (substitute* ,test-path
;; This test suite includes some tests that the stdlib's ;; This test suite includes some tests that the stdlib's
;; `Command` execution properly handles situations where ;; `Command` execution properly handles situations where
;; the environment or PATH variable are empty, but this ;; the environment or PATH variable are empty, but this
@ -940,6 +961,20 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\"
((" Command::new\\(\"echo\"\\)") ((" Command::new\\(\"echo\"\\)")
(string-append "\nCommand::new(\"" coreutils "/bin/echo\")\n"))) (string-append "\nCommand::new(\"" coreutils "/bin/echo\")\n")))
#t))) #t)))
(define-public rust-1.31
(let ((base-rust
(rust-bootstrapped-package rust-1.30 "1.31.1"
"0sk84ff0cklybcp0jbbxcw7lk7mrm6kb6km5nzd6m64dy0igrlli")))
(package
(inherit base-rust)
(arguments
(substitute-keyword-arguments (package-arguments base-rust)
((#:phases phases)
`(modify-phases ,phases
(add-after 'patch-tests 'patch-command-exec-tests
,(patch-command-exec-tests-phase
"src/test/run-pass/command-exec.rs"))
;; The test has been moved elsewhere. ;; The test has been moved elsewhere.
(replace 'disable-amd64-avx-test (replace 'disable-amd64-avx-test
(lambda _ (lambda _
@ -1087,7 +1122,7 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\"
`(modify-phases ,phases `(modify-phases ,phases
(delete 'patch-process-docs-rev-cmd)))))))) (delete 'patch-process-docs-rev-cmd))))))))
(define-public rust (define-public rust-1.37
(let ((base-rust (let ((base-rust
(rust-bootstrapped-package rust-1.36 "1.37.0" (rust-bootstrapped-package rust-1.36 "1.37.0"
"1hrqprybhkhs6d9b5pjskfnc5z9v2l2gync7nb39qjb5s0h703hj"))) "1hrqprybhkhs6d9b5pjskfnc5z9v2l2gync7nb39qjb5s0h703hj")))
@ -1103,3 +1138,45 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\"
(mkdir-p cargo-home) (mkdir-p cargo-home)
(setenv "CARGO_HOME" cargo-home) (setenv "CARGO_HOME" cargo-home)
#t)))))))))) #t))))))))))
(define-public rust-1.38
(let ((base-rust
(rust-bootstrapped-package rust-1.37 "1.38.0"
"101dlpsfkq67p0hbwx4acqq6n90dj4bbprndizpgh1kigk566hk4")))
(package
(inherit base-rust)
(arguments
(substitute-keyword-arguments (package-arguments base-rust)
((#:phases phases)
`(modify-phases ,phases
(replace 'patch-command-exec-tests
,(patch-command-exec-tests-phase
"src/test/ui/command-exec.rs"))
(add-after 'patch-tests 'patch-command-uid-gid-test
(lambda _
(substitute* "src/test/ui/command-uid-gid.rs"
(("/bin/sh") (which "sh"))
(("ignore-sgx") "ignore-sgx\n// ignore-tidy-linelength"))
#t)))))))))
(define-public rust-1.39
(let ((base-rust
(rust-bootstrapped-package rust-1.38 "1.39.0"
"0mwkc1bnil2cfyf6nglpvbn2y0zfbv44zfhsd5qg4c9rm6vgd8dl")))
(package
(inherit base-rust)
(arguments
(substitute-keyword-arguments (package-arguments base-rust)
((#:phases phases)
`(modify-phases ,phases
(replace 'patch-cargo-checksums
;; The Cargo.lock format changed.
(lambda* _
(use-modules (guix build cargo-utils))
(substitute* "Cargo.lock"
(("(checksum = )\".*\"" all name)
(string-append name "\"" ,%cargo-reference-hash "\"")))
(generate-all-checksums "vendor")
#t)))))))))
(define-public rust rust-1.37)

67
gnu/packages/speech.scm
View File

@ -5,6 +5,7 @@
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -32,15 +33,20 @@
#:use-module (gnu packages audio) #:use-module (gnu packages audio)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
#:use-module (gnu packages base) ;for 'which' #:use-module (gnu packages base) ;for 'which'
#:use-module (gnu packages bison)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages documentation)
#:use-module (gnu packages emacs) #:use-module (gnu packages emacs)
#:use-module (gnu packages gcc) #:use-module (gnu packages gcc)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
#:use-module (gnu packages gstreamer)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages ncurses) #:use-module (gnu packages ncurses)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages pulseaudio) #:use-module (gnu packages pulseaudio)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages swig)
#:use-module (gnu packages texinfo) #:use-module (gnu packages texinfo)
#:use-module (gnu packages textutils)) #:use-module (gnu packages textutils))
@ -471,3 +477,64 @@ The system is written in C++ and uses the Edinburgh Speech Tools Library for
low level architecture and has a Scheme (SIOD) based command interpreter for low level architecture and has a Scheme (SIOD) based command interpreter for
control.") control.")
(license (license:non-copyleft "file://COPYING")))) (license (license:non-copyleft "file://COPYING"))))
(define-public sphinxbase
(package
(name "sphinxbase")
(version "5prealpha")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/cmusphinx/"
"sphinxbase/" version "/"
"sphinxbase-" version ".tar.gz"))
(sha256
(base32 "0vr4k8pv5a8nvq9yja7kl13b5lh0f9vha8fc8znqnm8bwmcxnazp"))))
(build-system gnu-build-system)
(arguments
`(#:parallel-tests? #f)) ;tests fail otherwise
(native-inputs
`(("bison" ,bison)
("doxygen" ,doxygen)
("perl" ,perl) ;for tests
("python" ,python)
("swig" ,swig)))
(inputs
`(("pulseaudio" ,pulseaudio)))
(home-page "https://cmusphinx.github.io/")
(synopsis "Support library required by Pocketsphinx and Sphinxtrain")
(description "This package contains the basic libraries shared by
the CMU Sphinx trainer and all the Sphinx decoders (Sphinx-II,
Sphinx-III, and PocketSphinx), as well as some common utilities for
manipulating acoustic feature and audio files.")
(license license:bsd-4)))
(define-public pocketsphinx
(package
(name "pocketsphinx")
(version "5prealpha")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/cmusphinx/"
"pocketsphinx/" version "/"
"pocketsphinx-" version ".tar.gz"))
(sha256
(base32 "1n9yazzdgvpqgnfzsbl96ch9cirayh74jmpjf7svs4i7grabanzg"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
("perl" ,perl) ;for tests
("python" ,python)
("swig" ,swig)))
(inputs
`(("gstreamer" ,gstreamer)
("libcap" ,libcap)
("pulseaudio" ,pulseaudio)
("sphinxbase" ,sphinxbase)))
(home-page "https://cmusphinx.github.io/")
(synopsis "Recognizer library written in C")
(description "PocketSphinx is one of Carnegie Mellon University's
large vocabulary, speaker-independent continuous speech recognition
engine.")
(license license:bsd-2)))

8
gnu/packages/statistics.scm
View File

@ -441,14 +441,14 @@ Applied Statistics with S\" (4th edition, 2002) by Venables and Ripley.")
(define-public r-class (define-public r-class
(package (package
(name "r-class") (name "r-class")
(version "7.3-15") (version "7.3-16")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "class" version)) (uri (cran-uri "class" version))
(sha256 (sha256
(base32 (base32
"1x1hqz8xyhbpq4krsh02glqnlzcch25agkmn4a3da9n723b37gzn")))) "1jpdgj0lsi60q0mqbhfw809w8d66whix27y6wpdzll6775g3j3ll"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-mass" ,r-mass))) `(("r-mass" ,r-mass)))
@ -1762,14 +1762,14 @@ side.")
(define-public r-locfit (define-public r-locfit
(package (package
(name "r-locfit") (name "r-locfit")
(version "1.5-9.2") (version "1.5-9.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "locfit" version)) (uri (cran-uri "locfit" version))
(sha256 (sha256
(base32 (base32
"00l0s6cxnv95zybkgki0380fih2kr1kbm7m88x56phklln3nx27b")))) "1vcw16qww4v4547w0gfvhqg60l051bsdlxa6zfcgcj9xbxf6dlyr"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-lattice" ,r-lattice))) `(("r-lattice" ,r-lattice)))

8
gnu/packages/syndication.scm
View File

@ -84,16 +84,10 @@ interface that might look familiar to @command{mutt} or @command{slrn} users.
Newsboat supports OPML import/exports, HTML rendering, podcasts (with Newsboat supports OPML import/exports, HTML rendering, podcasts (with
@command{podboat}), off-line reading, searching and storing articles to your @command{podboat}), off-line reading, searching and storing articles to your
file system, and many more features. file system, and many more features.")
It started life as a fork of the currently unmaintained Newsbeuter.")
(license (list license:gpl2+ ; filter/* (license (list license:gpl2+ ; filter/*
license:expat)))) ; everything else license:expat)))) ; everything else
(define-public newsbeuter
;; Newsbeuter is unmaintained with multiple CVEs, and was forked as Newsboat.
(deprecated-package "newsbeuter" newsboat))
(define-public rtv (define-public rtv
(package (package
(name "rtv") (name "rtv")

5
gnu/packages/terminals.scm
View File

@ -19,6 +19,7 @@
;;; Copyright © 2019 Brett Gilio <brettg@gnu.org> ;;; Copyright © 2019 Brett Gilio <brettg@gnu.org>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net> ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2020 Valentin Ignatev <valentignatev@gmail.com> ;;; Copyright © 2020 Valentin Ignatev <valentignatev@gmail.com>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -896,7 +897,7 @@ per-line fullscreen terminal rendering, and keyboard input event reporting.")
(define-public tmate (define-public tmate
(package (package
(name "tmate") (name "tmate")
(version "2.2.1") (version "2.4.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -906,7 +907,7 @@ per-line fullscreen terminal rendering, and keyboard input event reporting.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0pfl9vrswzim9ydi1n652h3rax2zrmy6sqkp0r09yy3lw83h4y1r")))) "0x5c31yq7ansmiy20a0qf59wagba9v3pq97mlkxrqxn4n1gcc6vi"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("libevent" ,libevent) `(("libevent" ,libevent)

10
gnu/packages/version-control.scm
View File

@ -152,8 +152,6 @@ as well as the classic centralized workflow.")
(define-public git (define-public git
(package (package
(name "git") (name "git")
;; XXX When updating Git, check if the special 'git-source' input to cgit
;; needs to be updated as well.
(version "2.26.0") (version "2.26.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
@ -810,7 +808,7 @@ collaboration using typical untrusted file hosts or services.")
(package (package
(name "cgit") (name "cgit")
;; Update the ‘git-source’ input as well. ;; Update the ‘git-source’ input as well.
(version "1.2.2") (version "1.2.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -818,7 +816,7 @@ collaboration using typical untrusted file hosts or services.")
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0dmjsisigjz5k4gw7gm55qhm3wazzbm4cg7a5dwf0gqg9nacx5rz")))) "193d990ym10qlslk0p8mjwp2j6rhqa7fq0y1iff65lvbyv914pss"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:tests? #f ; XXX: fail to build the in-source git. '(#:tests? #f ; XXX: fail to build the in-source git.
@ -898,9 +896,9 @@ collaboration using typical untrusted file hosts or services.")
(method url-fetch) (method url-fetch)
;; cgit is tightly bound to git. Use GIT_VER from the Makefile, ;; cgit is tightly bound to git. Use GIT_VER from the Makefile,
;; which may not match the current (package-version git). ;; which may not match the current (package-version git).
(uri "mirror://kernel.org/software/scm/git/git-2.25.0.tar.xz") (uri "mirror://kernel.org/software/scm/git/git-2.25.1.tar.xz")
(sha256 (sha256
(base32 "1l58v42aazj0x9276gk8r9mwyl9pgp9w99aakz4xfhzv7wd2jq60")))) (base32 "09lzwa183nblr6l8ib35g2xrjf9wm9yhk3szfvyzkwivdv69c9r2"))))
("openssl" ,openssl) ("openssl" ,openssl)
("groff" ,groff) ("groff" ,groff)
("python" ,python) ("python" ,python)

13
gnu/packages/video.scm
View File

@ -1640,7 +1640,7 @@ To load this plugin, specify the following option when starting mpv:
(define-public youtube-dl (define-public youtube-dl
(package (package
(name "youtube-dl") (name "youtube-dl")
(version "2020.03.08") (version "2020.03.24")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/ytdl-org/youtube-dl/" (uri (string-append "https://github.com/ytdl-org/youtube-dl/"
@ -1648,7 +1648,7 @@ To load this plugin, specify the following option when starting mpv:
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1xbka14wnalcqkhibfcqw8f5bw1m9b1f44719yifv1jk0614q4bn")))) "05l4asakakxn53wrvxn6c03fd80zdizdbj6r2cj8c1ja3sj9i8s5"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
;; The problem here is that the directory for the man page and completion ;; The problem here is that the directory for the man page and completion
@ -1860,6 +1860,8 @@ audio, images) from the Web. It can use either mpv or vlc for playback.")
`(#:modules ((guix build perl-build-system) `(#:modules ((guix build perl-build-system)
(guix build utils) (guix build utils)
(srfi srfi-26)) (srfi srfi-26))
;; gtk-2/3 variants are both installed by default but the gtk3 variant
;; is broken without perl-gtk3.
#:module-build-flags '("--gtk2") #:module-build-flags '("--gtk2")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
@ -2209,7 +2211,7 @@ capabilities.")
(define-public vapoursynth (define-public vapoursynth
(package (package
(name "vapoursynth") (name "vapoursynth")
(version "48") (version "49")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -2218,7 +2220,7 @@ capabilities.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1i6163bidlp0p9zcnxpsphr44ayfzd51fig4ri7vbrbl9lw9jaih")))) "1d298mlb24nlc2x7pixfbkd0qbpv4c706c32idsgpi96z1spkhvl"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)
@ -2309,9 +2311,6 @@ and custom quantization matrices.")
from sites like Twitch.tv and pipes them into a video player of choice.") from sites like Twitch.tv and pipes them into a video player of choice.")
(license license:bsd-2))) (license license:bsd-2)))
(define-public livestreamer
(deprecated-package "livestreamer" streamlink))
(define-public twitchy (define-public twitchy
(let ((commit "9beb36d80b16662414129693e74fa3a2fd97554e")) ; 3.4 has no tag (let ((commit "9beb36d80b16662414129693e74fa3a2fd97554e")) ; 3.4 has no tag
(package (package

3
gnu/packages/virtualization.scm
View File

@ -913,9 +913,6 @@ monitor/GPU.")
(supported-systems '("i686-linux" "x86_64-linux")) (supported-systems '("i686-linux" "x86_64-linux"))
(license license:gpl2+)))) (license license:gpl2+))))
(define-public lookingglass
(deprecated-package "lookingglass" looking-glass-client))
(define-public runc (define-public runc
(package (package
(name "runc") (name "runc")

3
gnu/packages/vulkan.scm
View File

@ -218,9 +218,6 @@ and the ICD.")
(license:x11-style "file://COPYRIGHT.txt") (license:x11-style "file://COPYRIGHT.txt")
license:bsd-3)))) license:bsd-3))))
(define-public vulkan-icd-loader
(deprecated-package "vulkan-icd-loader" vulkan-loader))
(define-public vulkan-tools (define-public vulkan-tools
(package (package
(name "vulkan-tools") (name "vulkan-tools")

43
gnu/packages/web.scm
View File

@ -42,6 +42,7 @@
;;; Copyright © 2020 Alexandros Theodotou <alex@zrythm.org> ;;; Copyright © 2020 Alexandros Theodotou <alex@zrythm.org>
;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2018, 2019, 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -4385,8 +4386,8 @@ CDF, Atom 0.3, and Atom 1.0 feeds.")
(package-with-python2 python-feedparser)) (package-with-python2 python-feedparser))
(define-public guix-data-service (define-public guix-data-service
(let ((commit "18eb9dfdcb3174bfd4bab5b9089acffa13aa1214") (let ((commit "d1c243f7fd8902f359ff06fb78dce663cf4297ce")
(revision "18")) (revision "19"))
(package (package
(name "guix-data-service") (name "guix-data-service")
(version (string-append "0.0.1-" revision "." (string-take commit 7))) (version (string-append "0.0.1-" revision "." (string-take commit 7)))
@ -4398,11 +4399,13 @@ CDF, Atom 0.3, and Atom 1.0 feeds.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0lb78cqzqaz0r4sspg272w2a3yhzhqah30j0kxf0z182b0qpmp37")))) "1ji8d4vwmv7j9h7z96hvzi3zvik594yngjrdal37w13fbxy2v6sw"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:modules ((guix build utils) '(#:modules ((guix build utils)
(guix build gnu-build-system) (guix build gnu-build-system)
(ice-9 ftw)
(ice-9 match)
(ice-9 rdelim) (ice-9 rdelim)
(ice-9 popen)) (ice-9 popen))
#:test-target "check-with-tmp-database" #:test-target "check-with-tmp-database"
@ -4430,20 +4433,28 @@ CDF, Atom 0.3, and Atom 1.0 feeds.")
"/site-ccache"))) "/site-ccache")))
(for-each (for-each
(lambda (file) (lambda (file)
(simple-format (current-error-port)
"wrapping: ~A\n"
(string-append bin "/" file))
(wrap-program (string-append bin "/" file) (wrap-program (string-append bin "/" file)
`("PATH" ":" prefix `("PATH" ":" prefix
(,bin)) ,(cons*
bin
(map (lambda (input)
(string-append
(assoc-ref inputs input)
"/bin"))
'("ephemeralpg"
"util-linux"
"postgresql"))))
`("GUILE_LOAD_PATH" ":" prefix `("GUILE_LOAD_PATH" ":" prefix
(,scm ,(getenv "GUILE_LOAD_PATH"))) (,scm ,(getenv "GUILE_LOAD_PATH")))
`("GUILE_LOAD_COMPILED_PATH" ":" prefix `("GUILE_LOAD_COMPILED_PATH" ":" prefix
(,go ,(getenv "GUILE_LOAD_COMPILED_PATH"))))) (,go ,(getenv "GUILE_LOAD_COMPILED_PATH")))))
'("guix-data-service" (scandir bin
"guix-data-service-process-branch-updated-email" (match-lambda
"guix-data-service-process-branch-updated-mbox" ((or "." "..") #f)
"guix-data-service-process-job" (_ #t))))
"guix-data-service-process-jobs"
"guix-data-service-manage-build-servers"
"guix-data-service-query-build-servers"))
#t))) #t)))
(delete 'strip)))) ; As the .go files aren't compatible (delete 'strip)))) ; As the .go files aren't compatible
(inputs (inputs
@ -4452,13 +4463,14 @@ CDF, Atom 0.3, and Atom 1.0 feeds.")
("guile-json" ,guile3.0-json) ("guile-json" ,guile3.0-json)
("guile-email" ,guile3.0-email) ("guile-email" ,guile3.0-email)
("guile-squee" ,guile3.0-squee) ("guile-squee" ,guile3.0-squee)
("postgresql" ,postgresql) ("ephemeralpg" ,ephemeralpg)
("util-linux" ,util-linux)
("postgresql" ,postgresql-11)
("sqitch" ,sqitch))) ("sqitch" ,sqitch)))
(native-inputs (native-inputs
`(("guile" ,guile-3.0) `(("guile" ,guile-3.0)
("autoconf" ,autoconf) ("autoconf" ,autoconf)
("automake" ,automake) ("automake" ,automake)
("ephemeralpg" ,ephemeralpg)
("emacs-minimal" ,emacs-minimal) ("emacs-minimal" ,emacs-minimal)
("emacs-htmlize" ,emacs-htmlize) ("emacs-htmlize" ,emacs-htmlize)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
@ -6125,14 +6137,14 @@ encoder/decoder based on the draft-12 specification for UBJSON.")
(define-public java-tomcat (define-public java-tomcat
(package (package
(name "java-tomcat") (name "java-tomcat")
(version "8.5.46") (version "8.5.53")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://apache/tomcat/tomcat-8/v" (uri (string-append "mirror://apache/tomcat/tomcat-8/v"
version "/src/apache-tomcat-" version "-src.tar.gz")) version "/src/apache-tomcat-" version "-src.tar.gz"))
(sha256 (sha256
(base32 (base32
"0fb49gsqa3r6jrwc54yynvsakq9qbzr2pbxr7a29c2zvja2v65iq")) "15lwq3clf21hzk7mma70sffpxjqn8ww5mjq6zhmwcp4m17m22z26"))
(modules '((guix build utils))) (modules '((guix build utils)))
;; Delete bundled jars. ;; Delete bundled jars.
(snippet (snippet
@ -6210,6 +6222,7 @@ encoder/decoder based on the draft-12 specification for UBJSON.")
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(copy-recursively "output/build" out)) (copy-recursively "output/build" out))
#t))))) #t)))))
(properties '((cpe-name . "tomcat")))
(home-page "https://tomcat.apache.org") (home-page "https://tomcat.apache.org")
(synopsis "Java Servlet, JavaServer Pages, Java Expression Language and Java (synopsis "Java Servlet, JavaServer Pages, Java Expression Language and Java
WebSocket") WebSocket")

5
gnu/packages/wm.scm
View File

@ -172,8 +172,7 @@ the leaves of a full binary tree.")
(arguments (arguments
'(#:phases '(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure) (delete 'configure) ; no configure script
(delete 'check)
(add-after 'install 'install-xsession (add-after 'install 'install-xsession
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
@ -195,6 +194,8 @@ the leaves of a full binary tree.")
(list "CC=gcc" (list "CC=gcc"
(string-append "PREFIX=''") (string-append "PREFIX=''")
(string-append "DESTDIR=" out) (string-append "DESTDIR=" out)
(string-append "FISHCOMPLETIONDIR="
"/share/fish/vendor_completions.d")
(string-append "BASHCOMPLETIONDIR=" out (string-append "BASHCOMPLETIONDIR=" out
"/etc/bash_completion.d"))))) "/etc/bash_completion.d")))))
(synopsis "Tiling window manager for X11") (synopsis "Tiling window manager for X11")

10
gnu/packages/xdisorg.scm
View File

@ -1064,7 +1064,7 @@ Escape key when Left Control is pressed and released on its own.")
(define-public libwacom (define-public libwacom
(package (package
(name "libwacom") (name "libwacom")
(version "1.2") (version "1.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -1072,7 +1072,7 @@ Escape key when Left Control is pressed and released on its own.")
"libwacom-" version "/libwacom-" version ".tar.bz2")) "libwacom-" version "/libwacom-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"1hv3z2qkvycqcyv99zfpbbgrlbyppdq8kk2y9x51578mwbgcy162")))) "0g48cdg2qpvrr2nk8ccibjg3iv7iqskdv66izxacqx70w47y1771"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(arguments (arguments
`(#:configure-flags '("--disable-static"))) `(#:configure-flags '("--disable-static")))
@ -1213,7 +1213,7 @@ protocol.")
(define-public xscreensaver (define-public xscreensaver
(package (package
(name "xscreensaver") (name "xscreensaver")
(version "5.43") (version "5.44")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -1221,7 +1221,7 @@ protocol.")
(string-append "https://www.jwz.org/xscreensaver/xscreensaver-" (string-append "https://www.jwz.org/xscreensaver/xscreensaver-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 "1571pj1a9998sq14y9366s2rw9wd2kq3l3dvvsk610vyd0fki3qm")))) (base32 "15bv05vpfjwsrqbazrjmm382jd7vvw0mp6y9vasn6wvxzjf0in3k"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; no check target `(#:tests? #f ; no check target
@ -1237,7 +1237,7 @@ protocol.")
"--without-readdisplay") "--without-readdisplay")
#:make-flags (list (string-append "AD_DIR=" #:make-flags (list (string-append "AD_DIR="
(assoc-ref %outputs "out") (assoc-ref %outputs "out")
"/usr/lib/X11/app-defaults")))) "/lib/X11/app-defaults"))))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("intltool" ,intltool))) ("intltool" ,intltool)))

4
gnu/packages/xfce.scm
View File

@ -1158,7 +1158,7 @@ A plugin for the Xfce panel is also available.")
(define-public xfce4-screensaver (define-public xfce4-screensaver
(package (package
(name "xfce4-screensaver") (name "xfce4-screensaver")
(version "0.1.8") (version "0.1.9")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://archive.xfce.org/src/apps/" (uri (string-append "https://archive.xfce.org/src/apps/"
@ -1168,7 +1168,7 @@ A plugin for the Xfce panel is also available.")
version ".tar.bz2")) version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"1mv0r150yb29kji2rr2462g9p574bqjax1lb6bzcqgpxlmg08mj0")))) "11p48yyjgy6crwfbyvm16yg0rkzn90ssd2wygzmwvwrx3wkzyhsp"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases

17
gnu/services/nfs.scm
View File

@ -245,8 +245,8 @@
nfs-configuration? nfs-configuration?
(nfs-utils nfs-configuration-nfs-utils (nfs-utils nfs-configuration-nfs-utils
(default nfs-utils)) (default nfs-utils))
(nfs-version nfs-configuration-nfs-version (nfs-versions nfs-configuration-nfs-versions
(default #f)) ; string (default '("4.2" "4.1" "4.0")))
(exports nfs-configuration-exports (exports nfs-configuration-exports
(default '())) (default '()))
(rpcmountd-port nfs-configuration-rpcmountd-port (rpcmountd-port nfs-configuration-rpcmountd-port
@ -270,7 +270,7 @@
(define (nfs-shepherd-services config) (define (nfs-shepherd-services config)
"Return a list of <shepherd-service> for the NFS daemons with CONFIG." "Return a list of <shepherd-service> for the NFS daemons with CONFIG."
(match-record config <nfs-configuration> (match-record config <nfs-configuration>
(nfs-utils nfs-version exports (nfs-utils nfs-versions exports
rpcmountd-port rpcstatd-port nfsd-port nfsd-threads rpcmountd-port rpcstatd-port nfsd-port nfsd-threads
pipefs-directory debug) pipefs-directory debug)
(list (shepherd-service (list (shepherd-service
@ -323,15 +323,16 @@
(requirement '(/proc/fs/nfsd rpc.statd networking)) (requirement '(/proc/fs/nfsd rpc.statd networking))
(start (start
#~(lambda _ #~(lambda _
(zero? (system* #$(file-append nfs-utils "/sbin/rpc.nfsd") (zero? (apply system* #$(file-append nfs-utils "/sbin/rpc.nfsd")
(list
#$@(if (member 'nfsd debug) #$@(if (member 'nfsd debug)
'("--debug") '("--debug")
'()) '())
"--port" #$(number->string nfsd-port) "--port" #$(number->string nfsd-port)
#$@(if nfs-version #$@(map (lambda (version)
'("--nfs-version" nfs-version) (string-append "--nfs-version=" version))
'()) nfs-versions)
#$(number->string nfsd-threads))))) #$(number->string nfsd-threads))))))
(stop (stop
#~(lambda _ #~(lambda _
(zero? (zero?

6
gnu/services/shepherd.scm
View File

@ -269,7 +269,11 @@ and return the resulting '.go' file."
(module-use! env (resolve-interface '(oop goops))) (module-use! env (resolve-interface '(oop goops)))
(module-use! env (resolve-interface '(shepherd service))) (module-use! env (resolve-interface '(shepherd service)))
(compile-file #$file #:output-file #$output (compile-file #$file #:output-file #$output
#:env env)))))) #:env env)))
;; It's faster to build locally than to download.
#:options '(#:local-build? #t
#:substitutable? #f))))
(define (shepherd-configuration-file services) (define (shepherd-configuration-file services)
"Return the shepherd configuration file for SERVICES." "Return the shepherd configuration file for SERVICES."

1
gnu/services/xorg.scm
View File

@ -798,6 +798,7 @@ the GNOME desktop environment.")
(user-account (user-account
(name "gdm") (name "gdm")
(group "gdm") (group "gdm")
(supplementary-groups '("video"))
(system? #t) (system? #t)
(comment "GNOME Display Manager user") (comment "GNOME Display Manager user")
(home-directory "/var/lib/gdm") (home-directory "/var/lib/gdm")

15
gnu/system/vm.scm
View File

@ -186,12 +186,15 @@ made available under the /xchg CIFS share."
;; the initrd. See example at ;; the initrd. See example at
;; <https://lists.gnu.org/archive/html/guix-devel/2017-10/msg00233.html>. ;; <https://lists.gnu.org/archive/html/guix-devel/2017-10/msg00233.html>.
(program-file "linux-vm-loader" (program-file "linux-vm-loader"
;; When USER-BUILDER succeeds, reboot (indicating a ;; Communicate USER-BUILDER's exit status via /xchg so that
;; success), otherwise die, which causes a kernel panic ;; the host can distinguish between success, failure, and
;; ("Attempted to kill init!"). ;; kernel panic.
#~(if (zero? (system* #$user-builder)) #~(let ((status (system* #$user-builder)))
(reboot) (call-with-output-file "/xchg/.exit-status"
(exit 1)))) (lambda (port)
(write status port)))
(sync)
(reboot))))
(let ((initrd (or initrd (let ((initrd (or initrd
(base-initrd file-systems (base-initrd file-systems

2
guix/build-system/gnu.scm
View File

@ -151,7 +151,7 @@ so that they use INPUTS (a thunk) instead of implicit inputs."
p)) p))
(define (cut? p) (define (cut? p)
(and (eq? (package-build-system p) gnu-build-system) (or (not (eq? (package-build-system p) gnu-build-system))
(memq #:implicit-inputs? (package-arguments p)))) (memq #:implicit-inputs? (package-arguments p))))
(package-mapping add-explicit-inputs cut?)) (package-mapping add-explicit-inputs cut?))

2
guix/gexp.scm
View File

@ -683,7 +683,7 @@ When TARGET is true, use it as the cross-compilation target triplet."
(and (string? obj) (store-path? obj))) (and (string? obj) (store-path? obj)))
(with-monad %store-monad (with-monad %store-monad
(mapm %store-monad (mapm/accumulate-builds
(match-lambda (match-lambda
(((? struct? thing) sub-drv ...) (((? struct? thing) sub-drv ...)
(mlet %store-monad ((obj (lower-object (mlet %store-monad ((obj (lower-object

20
guix/grafts.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -166,22 +166,14 @@ references. Call REFERENCES to get the list of references."
(define (references-oracle store input) (define (references-oracle store input)
"Return a one-argument procedure that, when passed the output file names of "Return a one-argument procedure that, when passed the output file names of
INPUT, a derivation input, or their dependencies, returns the list of INPUT, a derivation input, or their dependencies, returns the list of
references of that item. Use either local info or substitute info; build references of that item. Build INPUT if it's not available."
INPUT if no information is available."
(define (references* items) (define (references* items)
;; Return the references of ITEMS.
(guard (c ((store-protocol-error? c) (guard (c ((store-protocol-error? c)
;; As a last resort, build DRV and query the references of the ;; ITEMS are not in store so build INPUT first.
;; build result.
;; Warm up the narinfo cache, otherwise each derivation build
;; will result in one HTTP request to get one narinfo, which is
;; much less efficient than fetching them all upfront.
(substitution-oracle store
(list (derivation-input-derivation input)))
(and (build-derivations store (list input)) (and (build-derivations store (list input))
(map (cut references store <>) items)))) (map (cut references/cached store <>) items))))
(references/substitutes store items))) (map (cut references/cached store <>) items)))
(let loop ((items (derivation-input-output-paths input)) (let loop ((items (derivation-input-output-paths input))
(result vlist-null)) (result vlist-null))

20
guix/packages.scm
View File

@ -444,9 +444,9 @@ derivations."
(let ((distro (resolve-interface '(gnu packages commencement)))) (let ((distro (resolve-interface '(gnu packages commencement))))
(module-ref distro 'guile-final))) (module-ref distro 'guile-final)))
(define (guile-2.0) (define (guile-for-grafts)
"Return Guile 2.0." "Return the Guile package used to build grafting derivations."
;; FIXME: This is used as a workaround for <https://bugs.gnu.org/28211> when ;; Guile 2.2 would not work due to <https://bugs.gnu.org/28211> when
;; grafting packages. ;; grafting packages.
(let ((distro (resolve-interface '(gnu packages guile)))) (let ((distro (resolve-interface '(gnu packages guile))))
(module-ref distro 'guile-2.0))) (module-ref distro 'guile-2.0)))
@ -1031,15 +1031,15 @@ information in exceptions."
#:key (graft? (%graft?))) #:key (graft? (%graft?)))
"Compile PACKAGE into a bag for SYSTEM, possibly cross-compiled to TARGET, "Compile PACKAGE into a bag for SYSTEM, possibly cross-compiled to TARGET,
and return it." and return it."
(let ((package (or (and graft? (package-replacement package))
package)))
(cached (=> %bag-cache) (cached (=> %bag-cache)
package (list system target graft?) package (list system target)
;; Bind %CURRENT-SYSTEM and %CURRENT-TARGET-SYSTEM so that thunked ;; Bind %CURRENT-SYSTEM and %CURRENT-TARGET-SYSTEM so that thunked
;; field values can refer to it. ;; field values can refer to it.
(parameterize ((%current-system system) (parameterize ((%current-system system)
(%current-target-system target)) (%current-target-system target))
(match (if graft? (match package
(or (package-replacement package) package)
package)
((and self ((and self
($ <package> name version source build-system ($ <package> name version source build-system
args inputs propagated-inputs native-inputs args inputs propagated-inputs native-inputs
@ -1063,7 +1063,7 @@ and return it."
(package package))) (package package)))
(condition (condition
(&package-error (&package-error
(package package))))))))))) (package package))))))))))))
(define %graft-cache (define %graft-cache
;; 'eq?' cache mapping package objects to a graft corresponding to their ;; 'eq?' cache mapping package objects to a graft corresponding to their
@ -1271,7 +1271,7 @@ This is an internal procedure."
(() (()
drv) drv)
(grafts (grafts
(let ((guile (package-derivation store (guile-2.0) (let ((guile (package-derivation store (guile-for-grafts)
system #:graft? #f))) system #:graft? #f)))
;; TODO: As an optimization, we can simply graft the tip ;; TODO: As an optimization, we can simply graft the tip
;; of the derivation graph since 'graft-derivation' ;; of the derivation graph since 'graft-derivation'
@ -1297,7 +1297,7 @@ system identifying string)."
(graft-derivation store drv grafts (graft-derivation store drv grafts
#:system system #:system system
#:guile #:guile
(package-derivation store (guile-2.0) (package-derivation store (guile-for-grafts)
system #:graft? #f)))) system #:graft? #f))))
drv)))) drv))))

41
guix/profiles.scm
View File

@ -280,29 +280,37 @@ file name."
(define lookup (define lookup
(manifest-entry-lookup manifest)) (manifest-entry-lookup manifest))
(with-monad %store-monad (define candidates
(foldm %store-monad (filter-map (lambda (entry)
(lambda (entry result) (let ((other (lookup (manifest-entry-name entry)
(match (lookup (manifest-entry-name entry) (manifest-entry-output entry))))
(manifest-entry-output entry)) (and other (list entry other))))
((? manifest-entry? second) ;potential conflict (manifest-transitive-entries manifest)))
(mlet %store-monad ((first (lower-manifest-entry entry system
#:target (define lower-pair
target)) (match-lambda
((first second)
(mlet %store-monad ((first (lower-manifest-entry first system
#:target target))
(second (lower-manifest-entry second system (second (lower-manifest-entry second system
#:target #:target target)))
target))) (return (list first second))))))
;; Start by lowering CANDIDATES "in parallel".
(mlet %store-monad ((lst (mapm/accumulate-builds lower-pair candidates)))
(foldm %store-monad
(lambda (entries result)
(match entries
((first second)
(if (string=? (manifest-entry-item first) (if (string=? (manifest-entry-item first)
(manifest-entry-item second)) (manifest-entry-item second))
(return result) (return result)
(raise (condition (raise (condition
(&profile-collision-error (&profile-collision-error
(entry first) (entry first)
(conflict second))))))) (conflict second))))))))
(#f ;no conflict
(return result))))
#t #t
(manifest-transitive-entries manifest)))) lst)))
(define* (package->manifest-entry package #:optional (output "out") (define* (package->manifest-entry package #:optional (output "out")
#:key (parent (delay #f)) #:key (parent (delay #f))
@ -1523,8 +1531,7 @@ are cross-built for TARGET."
#:target target))) #:target target)))
(extras (if (null? (manifest-entries manifest)) (extras (if (null? (manifest-entries manifest))
(return '()) (return '())
(mapm %store-monad (mapm/accumulate-builds (lambda (hook)
(lambda (hook)
(hook manifest)) (hook manifest))
hooks)))) hooks))))
(define inputs (define inputs

2
guix/scripts/archive.scm
View File

@ -183,7 +183,7 @@ Export/import one or more packages from/to the store.\n"))
(alist-delete 'verbosity result))))) (alist-delete 'verbosity result)))))
(option '(#\n "dry-run") #f #f (option '(#\n "dry-run") #f #f
(lambda (opt name arg result) (lambda (opt name arg result)
(alist-cons 'dry-run? #t (alist-cons 'graft? #f result)))) (alist-cons 'dry-run? #t result)))
%standard-build-options)) %standard-build-options))

8
guix/scripts/build.scm
View File

@ -778,7 +778,7 @@ must be one of 'package', 'all', or 'transitive'~%")
(alist-cons 'manifest arg result))) (alist-cons 'manifest arg result)))
(option '(#\n "dry-run") #f #f (option '(#\n "dry-run") #f #f
(lambda (opt name arg result) (lambda (opt name arg result)
(alist-cons 'dry-run? #t (alist-cons 'graft? #f result)))) (alist-cons 'dry-run? #t result)))
(option '(#\r "root") #t #f (option '(#\r "root") #t #f
(lambda (opt name arg result) (lambda (opt name arg result)
(alist-cons 'gc-root arg result))) (alist-cons 'gc-root arg result)))
@ -920,8 +920,10 @@ build."
(with-unbound-variable-handling (with-unbound-variable-handling
(parameterize ((%graft? graft?)) (parameterize ((%graft? graft?))
(append-map (lambda (system) (append-map (lambda (system)
(append-map (cut compute-derivation <> system) (concatenate
things-to-build)) (map/accumulate-builds store
(cut compute-derivation <> system)
things-to-build)))
systems)))) systems))))
(define (show-build-log store file urls) (define (show-build-log store file urls)

2
guix/scripts/copy.scm
View File

@ -135,7 +135,7 @@ Copy ITEMS to or from the specified host over SSH.\n"))
(alist-delete 'verbosity result))))) (alist-delete 'verbosity result)))))
(option '(#\n "dry-run") #f #f (option '(#\n "dry-run") #f #f
(lambda (opt name arg result) (lambda (opt name arg result)
(alist-cons 'dry-run? #t (alist-cons 'graft? #f result)))) (alist-cons 'dry-run? #t result)))
(option '(#\h "help") #f #f (option '(#\h "help") #f #f
(lambda args (lambda args

44
guix/scripts/deploy.scm
View File

@ -30,6 +30,7 @@
#:use-module (guix status) #:use-module (guix status)
#:use-module (ice-9 format) #:use-module (ice-9 format)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (srfi srfi-26)
#:use-module (srfi srfi-34) #:use-module (srfi srfi-34)
#:use-module (srfi srfi-35) #:use-module (srfi srfi-35)
#:use-module (srfi srfi-37) #:use-module (srfi srfi-37)
@ -102,7 +103,7 @@ Perform the deployment specified by FILE.\n"))
"Show the list of machines to deploy, MACHINES." "Show the list of machines to deploy, MACHINES."
(let ((count (length machines))) (let ((count (length machines)))
(format (current-error-port) (format (current-error-port)
(N_ "The following ~*machine will be deployed:~%" (N_ "The following ~d machine will be deployed:~%"
"The following ~d machines will be deployed:~%" "The following ~d machines will be deployed:~%"
count) count)
count) count)
@ -114,6 +115,27 @@ Perform the deployment specified by FILE.\n"))
(current-error-port)) (current-error-port))
(display "\n\n" (current-error-port)))) (display "\n\n" (current-error-port))))
(define (deploy-machine* store machine)
"Deploy MACHINE, taking care of error handling."
(info (G_ "deploying to ~a...~%")
(machine-display-name machine))
(guard (c ((message-condition? c)
(report-error (G_ "failed to deploy ~a: ~a~%")
(machine-display-name machine)
(condition-message c)))
((deploy-error? c)
(when (deploy-error-should-roll-back c)
(info (G_ "rolling back ~a...~%")
(machine-display-name machine))
(run-with-store store (roll-back-machine machine)))
(apply throw (deploy-error-captured-args c))))
(run-with-store store (deploy-machine machine))
(info (G_ "successfully deployed ~a~%")
(machine-display-name machine))))
(define (guix-deploy . args) (define (guix-deploy . args)
(define (handle-argument arg result) (define (handle-argument arg result)
(alist-cons 'file arg result)) (alist-cons 'file arg result))
@ -129,21 +151,7 @@ Perform the deployment specified by FILE.\n"))
(set-build-options-from-command-line store opts) (set-build-options-from-command-line store opts)
(with-build-handler (build-notifier #:use-substitutes? (with-build-handler (build-notifier #:use-substitutes?
(assoc-ref opts 'substitutes?)) (assoc-ref opts 'substitutes?))
(for-each (lambda (machine)
(info (G_ "deploying to ~a...~%")
(machine-display-name machine))
(parameterize ((%graft? (assq-ref opts 'graft?))) (parameterize ((%graft? (assq-ref opts 'graft?)))
(guard (c ((message-condition? c) (map/accumulate-builds store
(report-error (G_ "failed to deploy ~a: ~a~%") (cut deploy-machine* store <>)
(machine-display-name machine) machines)))))))
(condition-message c)))
((deploy-error? c)
(when (deploy-error-should-roll-back c)
(info (G_ "rolling back ~a...~%")
(machine-display-name machine))
(run-with-store store (roll-back-machine machine)))
(apply throw (deploy-error-captured-args c))))
(run-with-store store (deploy-machine machine))
(info (G_ "successfully deployed ~a~%")
(machine-display-name machine)))))
machines))))))

2
guix/scripts/environment.scm
View File

@ -254,7 +254,7 @@ use '--preserve' instead~%"))
(alist-cons 'ad-hoc? #t result))) (alist-cons 'ad-hoc? #t result)))
(option '(#\n "dry-run") #f #f (option '(#\n "dry-run") #f #f
(lambda (opt name arg result) (lambda (opt name arg result)
(alist-cons 'dry-run? #t (alist-cons 'graft? #f result)))) (alist-cons 'dry-run? #t result)))
(option '(#\s "system") #t #f (option '(#\s "system") #t #f
(lambda (opt name arg result) (lambda (opt name arg result)
(alist-cons 'system arg (alist-cons 'system arg

2
guix/scripts/pack.scm
View File

@ -823,7 +823,7 @@ last resort for relocation."
(option '(#\n "dry-run") #f #f (option '(#\n "dry-run") #f #f
(lambda (opt name arg result) (lambda (opt name arg result)
(alist-cons 'dry-run? #t (alist-cons 'graft? #f result)))) (alist-cons 'dry-run? #t result)))
(option '(#\d "derivation") #f #f (option '(#\d "derivation") #f #f
(lambda (opt name arg result) (lambda (opt name arg result)
(alist-cons 'derivation-only? #t result))) (alist-cons 'derivation-only? #t result)))

3
guix/scripts/package.scm
View File

@ -487,8 +487,7 @@ kind of search path~%")
#f))) #f)))
(option '(#\n "dry-run") #f #f (option '(#\n "dry-run") #f #f
(lambda (opt name arg result arg-handler) (lambda (opt name arg result arg-handler)
(values (alist-cons 'dry-run? #t (values (alist-cons 'dry-run? #t result)
(alist-cons 'graft? #f result))
#f))) #f)))
(option '(#\v "verbosity") #t #f (option '(#\v "verbosity") #t #f
(lambda (opt name arg result arg-handler) (lambda (opt name arg result arg-handler)

2
guix/scripts/pull.scm
View File

@ -168,7 +168,7 @@ Download and deploy the latest version of Guix.\n"))
(alist-delete 'system result eq?)))) (alist-delete 'system result eq?))))
(option '(#\n "dry-run") #f #f (option '(#\n "dry-run") #f #f
(lambda (opt name arg result) (lambda (opt name arg result)
(alist-cons 'dry-run? #t (alist-cons 'graft? #f result)))) (alist-cons 'dry-run? #t result)))
(option '(#\v "verbosity") #t #f (option '(#\v "verbosity") #t #f
(lambda (opt name arg result) (lambda (opt name arg result)
(let ((level (string->number* arg))) (let ((level (string->number* arg)))

2
guix/scripts/system.scm
View File

@ -1041,7 +1041,7 @@ Some ACTIONS support additional ARGS.\n"))
(option '(#\n "dry-run") #f #f (option '(#\n "dry-run") #f #f
(lambda (opt name arg result) (lambda (opt name arg result)
(alist-cons 'dry-run? #t (alist-cons 'graft? #f result)))) (alist-cons 'dry-run? #t result)))
(option '(#\v "verbosity") #t #f (option '(#\v "verbosity") #t #f
(lambda (opt name arg result) (lambda (opt name arg result)
(let ((level (string->number* arg))) (let ((level (string->number* arg)))

64
guix/store.scm
View File

@ -106,6 +106,8 @@
file-mapping->tree file-mapping->tree
binary-file binary-file
with-build-handler with-build-handler
map/accumulate-builds
mapm/accumulate-builds
build-things build-things
build build
query-failed-paths query-failed-paths
@ -134,6 +136,7 @@
built-in-builders built-in-builders
references references
references/cached
references/substitutes references/substitutes
references* references*
query-path-info* query-path-info*
@ -1303,6 +1306,48 @@ deals with \"dynamic dependencies\" such as grafts---derivations that depend
on the build output of a previous derivation." on the build output of a previous derivation."
(call-with-build-handler handler (lambda () exp ...))) (call-with-build-handler handler (lambda () exp ...)))
;; Unresolved dynamic dependency.
(define-record-type <unresolved>
(unresolved things continuation)
unresolved?
(things unresolved-things)
(continuation unresolved-continuation))
(define (build-accumulator continue store things mode)
"This build handler accumulates THINGS and returns an <unresolved> object."
(if (= mode (build-mode normal))
(unresolved things continue)
(continue #t)))
(define (map/accumulate-builds store proc lst)
"Apply PROC over each element of LST, accumulating 'build-things' calls and
coalescing them into a single call."
(define result
(map (lambda (obj)
(with-build-handler build-accumulator
(proc obj)))
lst))
(match (append-map (lambda (obj)
(if (unresolved? obj)
(unresolved-things obj)
'()))
result)
(()
result)
(to-build
;; We've accumulated things TO-BUILD. Actually build them and resume the
;; corresponding continuations.
(build-things store (delete-duplicates to-build))
(map/accumulate-builds store
(lambda (obj)
(if (unresolved? obj)
;; Pass #f because 'build-things' is now
;; unnecessary.
((unresolved-continuation obj) #f)
obj))
result))))
(define build-things (define build-things
(let ((build (operation (build-things (string-list things) (let ((build (operation (build-things (string-list things)
(integer mode)) (integer mode))
@ -1389,6 +1434,13 @@ error if there is no such root."
;; would use a cache associated with the daemon connection instead (XXX). ;; would use a cache associated with the daemon connection instead (XXX).
(make-hash-table 100)) (make-hash-table 100))
(define (references/cached store item)
"Like 'references', but cache results."
(or (hash-ref %reference-cache item)
(let ((references (references store item)))
(hash-set! %reference-cache item references)
references)))
(define (references/substitutes store items) (define (references/substitutes store items)
"Return the list of list of references of ITEMS; the result has the same "Return the list of list of references of ITEMS; the result has the same
length as ITEMS. Query substitute information for any item missing from the length as ITEMS. Query substitute information for any item missing from the
@ -1829,6 +1881,18 @@ taking the store as its first argument."
(lambda (store . args) (lambda (store . args)
(run-with-store store (apply proc args))))) (run-with-store store (apply proc args)))))
(define (mapm/accumulate-builds mproc lst)
"Like 'mapm' in %STORE-MONAD, but accumulate 'build-things' calls and
coalesce them into a single call."
(lambda (store)
(values (map/accumulate-builds store
(lambda (obj)
(run-with-store store
(mproc obj)))
lst)
store)))
;; ;;
;; Store monad operators. ;; Store monad operators.
;; ;;

36
tests/store.scm
View File

@ -412,6 +412,42 @@
(build-derivations %store (list d2)) (build-derivations %store (list d2))
'fail))) 'fail)))
(test-assert "map/accumulate-builds"
(let* ((b (add-text-to-store %store "build" "echo $foo > $out" '()))
(s (add-to-store %store "bash" #t "sha256"
(search-bootstrap-binary "bash"
(%current-system))))
(d1 (derivation %store "the-thing"
s `("-e" ,b)
#:env-vars `(("foo" . ,(random-text)))
#:sources (list b s)))
(d2 (derivation %store "the-thing"
s `("-e" ,b)
#:env-vars `(("foo" . ,(random-text))
("bar" . "baz"))
#:sources (list b s))))
(with-build-handler (lambda (continue store things mode)
(equal? (map derivation-file-name (list d1 d2))
things))
(map/accumulate-builds %store
(lambda (drv)
(build-derivations %store (list drv))
(add-to-store %store "content-addressed"
#t "sha256"
(derivation->output-path drv)))
(list d1 d2)))))
(test-assert "mapm/accumulate-builds"
(let* ((d1 (run-with-store %store
(gexp->derivation "foo" #~(mkdir #$output))))
(d2 (run-with-store %store
(gexp->derivation "bar" #~(mkdir #$output)))))
(with-build-handler (lambda (continue store things mode)
(equal? (map derivation-file-name (pk 'zz (list d1 d2)))
(pk 'XX things)))
(run-with-store %store
(mapm/accumulate-builds built-derivations `((,d1) (,d2)))))))
(test-assert "topologically-sorted, one item" (test-assert "topologically-sorted, one item"
(let* ((a (add-text-to-store %store "a" "a")) (let* ((a (add-text-to-store %store "a" "a"))
(b (add-text-to-store %store "b" "b" (list a))) (b (add-text-to-store %store "b" "b" (list a)))