ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 13:28:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into core-updates

Browse source
This commit is contained in:
Ludovic Courtès 2019-09-17 16:17:20 +02:00
commit 9ff87bb996
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
124 changed files with 4791 additions and 1551 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.am
View file

@ -221,6 +221,7 @@ MODULES = \
guix/import/gnu.scm \
guix/import/hackage.scm \
guix/import/json.scm \
guix/import/kde.scm \
guix/import/launchpad.scm \
guix/import/opam.scm \
guix/import/print.scm \
@ -402,6 +403,7 @@ SCM_TESTS = \
tests/modules.scm \
tests/monads.scm \
tests/nar.scm \
tests/networking.scm \
tests/opam.scm \
tests/packages.scm \
tests/pack.scm \

14
build-aux/pre-inst-env.in
View file

@ -42,17 +42,9 @@ export GUILE_LOAD_COMPILED_PATH GUILE_LOAD_PATH
PATH="$abs_top_builddir/scripts:$abs_top_builddir:$PATH"
export PATH
# Daemon helpers.
NIX_ROOT_FINDER="$abs_top_builddir/nix/scripts/list-runtime-roots"
NIX_LIBEXEC_DIR="@abs_top_builddir@/nix/scripts" # for 'authenticate', etc.
export NIX_ROOT_FINDER NIX_LIBEXEC_DIR
NIX_BUILD_HOOK="$abs_top_builddir/nix/scripts/offload"
@BUILD_DAEMON_OFFLOAD_TRUE@export NIX_BUILD_HOOK
@BUILD_DAEMON_OFFLOAD_FALSE@# No offloading support.
@BUILD_DAEMON_OFFLOAD_FALSE@unset NIX_BUILD_HOOK
# The daemon invokes 'guix'; tell it which one to use.
GUIX="$abs_top_builddir/scripts/guix"
export GUIX
# The following variables need only be defined when compiling Guix
# modules, but we define them to be on the safe side in case of

11
config-daemon.ac
View file

@ -148,17 +148,6 @@ if test "x$guix_build_daemon" = "xyes"; then
AC_SUBST([GUIX_TEST_ROOT])
GUIX_CHECK_LOCALSTATEDIR
AC_CONFIG_FILES([nix/scripts/list-runtime-roots],
[chmod +x nix/scripts/list-runtime-roots])
AC_CONFIG_FILES([nix/scripts/download],
[chmod +x nix/scripts/download])
AC_CONFIG_FILES([nix/scripts/substitute],
[chmod +x nix/scripts/substitute])
AC_CONFIG_FILES([nix/scripts/authenticate],
[chmod +x nix/scripts/authenticate])
AC_CONFIG_FILES([nix/scripts/offload],
[chmod +x nix/scripts/offload])
fi
AM_CONDITIONAL([HAVE_LIBBZ2], [test "x$HAVE_LIBBZ2" = "xyes"])

32
doc/build.scm
View file

@ -29,6 +29,7 @@
(guix gexp)
(guix git)
(guix git-download)
(guix utils)
(git)
(gnu packages base)
(gnu packages gawk)
@ -165,6 +166,35 @@ (define %makeinfo-html-options
;; Options passed to 'makeinfo --html'.
'("--css-ref=https://www.gnu.org/software/gnulib/manual.css"))
(define guile-lib/htmlprag-fixed
;; Guile-Lib with a hotfix for (htmlprag).
(package
(inherit guile-lib)
(source (origin
(inherit (package-source guile-lib))
(modules '(( guix build utils)))
(snippet
'(begin
;; When parsing
;; "<body><blockquote><p>foo</p>\n</blockquote></body>",
;; 'html->shtml' would mistakenly close 'blockquote' right
;; before <p>. This patch removes 'p' from the
;; 'parent-constraints' alist to fix that.
(substitute* "src/htmlprag.scm"
(("^[[:blank:]]*\\(p[[:blank:]]+\\. \\(body td th\\)\\).*")
""))
#t))))
(arguments
(substitute-keyword-arguments (package-arguments guile-lib)
((#:phases phases '%standard-phases)
`(modify-phases ,phases
(add-before 'check 'skip-known-failure
(lambda _
;; XXX: The above change causes one test failure among
;; the htmlprag tests.
(setenv "XFAIL_TESTS" "htmlprag.scm")
#t))))))))
(define* (syntax-highlighted-html input
#:key
(name "highlighted-syntax")
@ -174,7 +204,7 @@ (define* (syntax-highlighted-html input
to (1) add them a link to SYNTAX-CSS-URL, and (2) highlight the syntax of all
its <pre class=\"lisp\"> blocks (as produced by 'makeinfo --html')."
(define build
(with-extensions (list guile-lib guile-syntax-highlight)
(with-extensions (list guile-lib/htmlprag-fixed guile-syntax-highlight)
(with-imported-modules '((guix build utils))
#~(begin
(use-modules (htmlprag)

16
doc/contributing.texi
View file

@ -376,7 +376,7 @@ package and does not contain any version number.
For instance, the versions 2.24.20 and 3.9.12 of GTK+ may be packaged as follows:
@example
@lisp
(define-public gtk+
(package
(name "gtk+")
@ -387,15 +387,15 @@ For instance, the versions 2.24.20 and 3.9.12 of GTK+ may be packaged as follows
(name "gtk+")
(version "2.24.20")
...))
@end example
@end lisp
If we also wanted GTK+ 3.8.2, this would be packaged as
@example
@lisp
(define-public gtk+-3.8
(package
(name "gtk+")
(version "3.8.2")
...))
@end example
@end lisp
@c See <https://lists.gnu.org/archive/html/guix-devel/2016-01/msg00425.html>,
@c for a discussion of what follows.
@ -432,7 +432,7 @@ kernel.) It is best to use the full commit identifiers in
@code{origin}s, though, to avoid ambiguities. A typical package
definition may look like this:
@example
@lisp
(define my-package
(let ((commit "c3f29bc928d5900971f65965feaae59e1272a3f7")
(revision "1")) ;Guix package revision
@ -447,7 +447,7 @@ definition may look like this:
(file-name (git-file-name name version))))
;; @dots{}
)))
@end example
@end lisp
@node Synopses and Descriptions
@subsection Synopses and Descriptions
@ -825,12 +825,12 @@ recommend using the @code{qemu-binfmt-service-type} to emulate them. In
order to enable it, add the following service to the list of services in
your @code{operating-system} configuration:
@example
@lisp
(service qemu-binfmt-service-type
(qemu-binfmt-configuration
(platforms (lookup-qemu-platforms "arm" "aarch64" "mips64el"))
(guix-support? #t)))
@end example
@end lisp
Then reconfigure your system.

713
doc/guix.texi
View file

File diff suppressed because it is too large Load diff

4
etc/guix-daemon.cil.in
View file

@ -277,9 +277,5 @@
file (system_u object_r guix_daemon_exec_t (low low)))
(filecon "@storedir@/.+-(guix-.+|profile)/bin/guix-daemon"
file (system_u object_r guix_daemon_exec_t (low low)))
(filecon "@storedir@/.+-(guix-.+|profile)/libexec/guix-authenticate"
file (system_u object_r guix_daemon_exec_t (low low)))
(filecon "@storedir@/.+-(guix-.+|profile)/libexec/guix/(.*)?"
any (system_u object_r guix_daemon_exec_t (low low)))
(filecon "@guix_localstatedir@/guix/daemon-socket/socket"
any (system_u object_r guix_daemon_socket_t (low low))))

7
gnu/build/linux-container.scm
View file

@ -299,8 +299,10 @@ (define (call-with-temporary-directory proc)
(false-if-exception (delete-file-recursively tmp-dir))))))
(define* (call-with-container mounts thunk #:key (namespaces %namespaces)
(host-uids 1) (guest-uid 0) (guest-gid 0))
"Run THUNK in a new container process and return its exit status.
(host-uids 1) (guest-uid 0) (guest-gid 0)
(process-spawned-hook (const #t)))
"Run THUNK in a new container process and return its exit status; call
PROCESS-SPAWNED-HOOK with the PID of the new process that has been spawned.
MOUNTS is a list of <file-system> objects that specify file systems to mount
inside the container. NAMESPACES is a list of symbols corresponding to
the identifiers for Linux namespaces: mnt, ipc, uts, pid, user, and net. By
@ -329,6 +331,7 @@ (define* (call-with-container mounts thunk #:key (namespaces %namespaces)
(false-if-exception
(kill pid SIGKILL))))
(process-spawned-hook pid)
(match (waitpid pid)
((_ . status) status))))))

8
gnu/build/shepherd.scm
View file

@ -67,16 +67,10 @@ (define accounts
(file-system-mapping
(source "/etc/group") (target source))))
(define nscd-socket
(file-system-mapping
(source "/var/run/nscd") (target source)
(writable? #t)))
(append (cons (tmpfs "/tmp") %container-file-systems)
(let ((mappings `(,@(if (memq 'net namespaces)
'()
(cons nscd-socket
%network-file-mappings))
%network-file-mappings)
,@(if (and (memq 'mnt namespaces)
(not (memq 'user namespaces)))
accounts

2
gnu/local.mk
View file

@ -743,6 +743,7 @@ dist_patch_DATA = \
%D%/packages/patches/clementine-use-openssl.patch \
%D%/packages/patches/clisp-remove-failing-test.patch \
%D%/packages/patches/clucene-pkgconfig.patch \
%D%/packages/patches/cmake-curl-certificates.patch \
%D%/packages/patches/coda-use-system-libs.patch \
%D%/packages/patches/combinatorial-blas-awpm.patch \
%D%/packages/patches/combinatorial-blas-io-fix.patch \
@ -1399,7 +1400,6 @@ dist_patch_DATA = \
%D%/packages/patches/wavpack-CVE-2018-6767.patch \
%D%/packages/patches/wavpack-CVE-2018-7253.patch \
%D%/packages/patches/wavpack-CVE-2018-7254.patch \
%D%/packages/patches/weechat-python.patch \
%D%/packages/patches/wicd-bitrate-none-fix.patch \
%D%/packages/patches/wicd-get-selected-profile-fix.patch \
%D%/packages/patches/wicd-urwid-1.3.patch \

4
gnu/packages/admin.scm
View file

@ -2725,7 +2725,7 @@ (define-public fabric
(define-public neofetch
(package
(name "neofetch")
(version "6.0.0")
(version "6.1.0")
(source (origin
(method git-fetch)
(uri (git-reference
@ -2733,7 +2733,7 @@ (define-public neofetch
(commit version)))
(sha256
(base32
"0j0r40llyry1sgc6p9wd7jrpydps2lnj4rwajjp37697g2bik89i"))))
"022xzn9jk18k2f4b6011d8jk5nbl84i3mw3inlz4q52p2hvk8fch"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; there are no tests

4
gnu/packages/algebra.scm
View file

@ -1435,7 +1435,7 @@ (define-public m4rie
(define-public eclib
(package
(name "eclib")
(version "20190226")
(version "20190909")
(source (origin
(method git-fetch)
(uri (git-reference
@ -1444,7 +1444,7 @@ (define-public eclib
(file-name (git-file-name name version))
(sha256
(base32
"1910np1xzyjzszay24xn4b81qhpsvhp5aix9vdpknplni2mq8kwb"))))
"1gw27lqc3f525n8qdcmr2nyn16y9g10z9f6dnmckyyxcdzvhq35n"))))
(build-system gnu-build-system)
(native-inputs
`(("autoconf" ,autoconf)

20
gnu/packages/audio.scm
View file

@ -3195,24 +3195,28 @@ (define-public dcadec
(define-public bs1770gain
(package
(name "bs1770gain")
(version "0.5.2")
(version "0.6.0")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/bs1770gain/bs1770gain/"
version "/bs1770gain-" version ".tar.gz"))
(sha256
(base32
"1p6yz5q7czyf9ard65sp4kawdlkg40cfscr3b24znymmhs3p7rbk"))
(base32 "0nnqixvw3x7i22nsr54n4bgm35z9nh3d9qj5s75cfd3ajjsjndyh"))
(modules '((guix build utils)))
(snippet
'(begin
;; XXX
(substitute* "bs1770gain/bs1770gain.c"
(("\"N.*\"") "\"\""))
(substitute* "configure"
(("URL=.*$")
"https://manpages.debian.org/sid/bs1770gain/bs1770gain.1.en.html\n"))))))
(substitute* "libbg/bgx.c"
(("#define BS.* ") "#define BS ")
(("BS.*NO?.*N.*S.*E.*N.*SE?") "NO")
(("\"( #|N).*\"") "\"\""))
(substitute* (list "config.h"
"configure.ac"
"configure")
(("https?://bs1770gain[^/]*/")
"https://manpages.debian.org/sid/bs1770gain/bs1770gain.1.en.html"))
#t))))
(build-system gnu-build-system)
(inputs `(("ffmpeg" ,ffmpeg)
("sox" ,sox)))

41
gnu/packages/authentication.scm
View file

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
;;;
;;; This file is part of GNU Guix.
;;;
@ -18,10 +19,14 @@
(define-module (gnu packages authentication)
#:use-module (gnu packages)
#:use-module (gnu packages autotools)
#:use-module (gnu packages documentation)
#:use-module (gnu packages linux)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages security-token)
#:use-module (guix build-system gnu)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages))
@ -86,3 +91,39 @@ (define-public oath-toolkit
and the time-based @dfn{TOTP} algorithm (RFC6238).")
(license (list license:lgpl2.1+ ; the libraries (liboath/ & libpskc/)
license:gpl3+)))) ; the tools (everything else)
(define-public yubico-pam
(let ((commit "b5bd00db81e0e0e0ecced65c684080bb56ddc35b")
(revision "0"))
(package
(name "yubico-pam")
(version (git-version "2.26" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Yubico/yubico-pam.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"10dq8dqi3jldllj6p8r9hldx9sank9n82c44w8akxrs1vli6nj3m"))))
(build-system gnu-build-system)
(arguments
;; The pam_test fails because ykclient fails to build a Curl handle.
'(#:make-flags '("TESTS=util_test")))
(inputs
`(("linux-pam" ,linux-pam)
("libyubikey" ,libyubikey)
("ykclient" ,ykclient)
("yubikey-personalization" ,yubikey-personalization)))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)
("asciidoc" ,asciidoc)
("pkg-config" ,pkg-config)))
(home-page "https://developers.yubico.com/yubico-pam")
(synopsis "Yubico pluggable authentication module")
(description "The Yubico PAM module provides an easy way to integrate the
YubiKey into your existing user authentication infrastructure.")
(license license:bsd-2))))

615
gnu/packages/bioconductor.scm
View file

@ -50,21 +50,14 @@ (define-public r-bsgenome-celegans-ucsc-ce6
(version "1.4.0")
(source (origin
(method url-fetch)
;; We cannot use bioconductor-uri here because this tarball is
;; located under "data/annotation/" instead of "bioc/".
(uri (string-append "https://www.bioconductor.org/packages/"
"release/data/annotation/src/contrib/"
"BSgenome.Celegans.UCSC.ce6_"
version ".tar.gz"))
(uri (bioconductor-uri "BSgenome.Celegans.UCSC.ce6"
version 'annotation))
(sha256
(base32
"0mqzb353xv2c3m3vkb315dkmnxkgczp7ndnknyhpgjlybyf715v9"))))
(properties
`((upstream-name . "BSgenome.Celegans.UCSC.ce6")))
(build-system r-build-system)
;; As this package provides little more than a very large data file it
;; doesn't make sense to build substitutes.
(arguments `(#:substitutable? #f))
(propagated-inputs
`(("r-bsgenome" ,r-bsgenome)))
(home-page
@ -817,6 +810,28 @@ (define-public r-do-db
Disease Ontology.")
(license license:artistic2.0)))
(define-public r-pfam-db
(package
(name "r-pfam-db")
(version "3.8.2")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "PFAM.db" version 'annotation))
(sha256
(base32
"0rn1arzzcniy3yyc4yc44vn40g0cqss37dhwnvsgxpfayqq1k59s"))))
(properties `((upstream-name . "PFAM.db")))
(build-system r-build-system)
(propagated-inputs
`(("r-annotationdbi" ,r-annotationdbi)))
(home-page "https://bioconductor.org/packages/PFAM.db")
(synopsis "Set of protein ID mappings for PFAM")
(description
"This package provides a set of protein ID mappings for PFAM, assembled
using data from public repositories.")
(license license:artistic2.0)))
;;; Experiment data
@ -942,6 +957,29 @@ (define-public r-all
the form of an @code{exprSet} object.")
(license license:artistic2.0)))
(define-public r-affydata
(package
(name "r-affydata")
(version "1.32.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "affydata" version 'experiment))
(sha256
(base32
"1l9qhmjqgbrdl9cmd74rlnvmvr6mslbmckb83n0211whp2i0b7h5"))))
(properties `((upstream-name . "affydata")))
(build-system r-build-system)
(propagated-inputs
`(("r-affy" ,r-affy)))
(home-page "https://bioconductor.org/packages/affydata/")
(synopsis "Affymetrix data for demonstration purposes")
(description
"This package provides example datasets that represent 'real world
examples' of Affymetrix data, unlike the artificial examples included in the
package @code{affy}.")
(license license:gpl2+)))
;;; Packages
@ -965,6 +1003,147 @@ (define-public r-biocgenerics
packages.")
(license license:artistic2.0)))
(define-public r-affycomp
(package
(name "r-affycomp")
(version "1.60.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "affycomp" version))
(sha256
(base32
"1nijqljg5r3qj1y6an0i58sby76hqacj3a3nvainxic4n5wlzh0n"))))
(properties `((upstream-name . "affycomp")))
(build-system r-build-system)
(propagated-inputs `(("r-biobase" ,r-biobase)))
(home-page "https://bioconductor.org/packages/affycomp/")
(synopsis "Graphics toolbox for assessment of Affymetrix expression measures")
(description
"The package contains functions that can be used to compare expression
measures for Affymetrix Oligonucleotide Arrays.")
(license license:gpl2+)))
(define-public r-affycompatible
(package
(name "r-affycompatible")
(version "1.44.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "AffyCompatible" version))
(sha256
(base32
"1zi96qa6vkgwvvy5cn6c3p1kbfsaz74zsw2kjxarz5qs744f0xvs"))))
(properties
`((upstream-name . "AffyCompatible")))
(build-system r-build-system)
(propagated-inputs
`(("r-biostrings" ,r-biostrings)
("r-rcurl" ,r-rcurl)
("r-xml" ,r-xml)))
(home-page "https://bioconductor.org/packages/AffyCompatible/")
(synopsis "Work with Affymetrix GeneChip files")
(description
"This package provides an interface to Affymetrix chip annotation and
sample attribute files. The package allows an easy way for users to download
and manage local data bases of Affynmetrix NetAffx annotation files. It also
provides access to @dfn{GeneChip Operating System} (GCOS) and @dfn{GeneChip
Command Console} (AGCC)-compatible sample annotation files.")
(license license:artistic2.0)))
(define-public r-affycontam
(package
(name "r-affycontam")
(version "1.42.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "affyContam" version))
(sha256
(base32
"0nzk1cm26rhmym753wyhn35hqnz5lvavi3i5qfgdvhxgjy3m1jgp"))))
(properties `((upstream-name . "affyContam")))
(build-system r-build-system)
(propagated-inputs
`(("r-affy" ,r-affy)
("r-affydata" ,r-affydata)
("r-biobase" ,r-biobase)))
(home-page "https://bioconductor.org/packages/affyContam/")
(synopsis "Structured corruption of Affymetrix CEL file data")
(description
"Microarray quality assessment is a major concern of microarray analysts.
This package provides some simple approaches to in silico creation of quality
problems in CEL-level data to help evaluate performance of quality metrics.")
(license license:artistic2.0)))
(define-public r-affycoretools
(package
(name "r-affycoretools")
(version "1.56.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "affycoretools" version))
(sha256
(base32
"17dxpzhwwdwnxkdpmyjwdnacg41hw60mlc71w4nzlvs28sfsy09s"))))
(properties `((upstream-name . "affycoretools")))
(build-system r-build-system)
(propagated-inputs
`(("r-affy" ,r-affy)
("r-annotationdbi" ,r-annotationdbi)
("r-biobase" ,r-biobase)
("r-biocgenerics" ,r-biocgenerics)
("r-dbi" ,r-dbi)
("r-edger" ,r-edger)
("r-gcrma" ,r-gcrma)
("r-ggplot2" ,r-ggplot2)
("r-gostats" ,r-gostats)
("r-gplots" ,r-gplots)
("r-hwriter" ,r-hwriter)
("r-lattice" ,r-lattice)
("r-limma" ,r-limma)
("r-oligoclasses" ,r-oligoclasses)
("r-reportingtools" ,r-reportingtools)
("r-rsqlite" ,r-rsqlite)
("r-s4vectors" ,r-s4vectors)
("r-xtable" ,r-xtable)))
(home-page "https://bioconductor.org/packages/affycoretools/")
(synopsis "Functions for analyses with Affymetrix GeneChips")
(description
"This package provides various wrapper functions that have been written
to streamline the more common analyses that a Biostatistician might see.")
(license license:artistic2.0)))
(define-public r-affxparser
(package
(name "r-affxparser")
(version "1.56.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "affxparser" version))
(sha256
(base32
"1jv7k9pn4c7szi3ma2f2xsd58pkrkvjpk5wra73r6kc607qgrv33"))))
(properties `((upstream-name . "affxparser")))
(build-system r-build-system)
(home-page "https://github.com/HenrikBengtsson/affxparser")
(synopsis "Affymetrix File Parsing SDK")
(description
"This is a package for parsing Affymetrix files (CDF, CEL, CHP, BPMAP,
BAR). It provides methods for fast and memory efficient parsing of Affymetrix
files using the Affymetrix' Fusion SDK. Both ASCII- and binary-based files
are supported. Currently, there are methods for reading @dfn{chip definition
file} (CDF) and a @dfn{cell intensity file} (CEL). These files can be read
either in full or in part. For example, probe signals from a few probesets
can be extracted very quickly from a set of CEL files into a convenient list
structure.")
;; The Fusion SDK contains files under GPLv2 and LGPLv2.1. The R code is
;; under LGPLv2+.
(license (list license:lgpl2.0+ license:lgpl2.1 license:gpl2))))
(define-public r-annotate
(package
(name "r-annotate")
@ -1013,14 +1192,14 @@ (define-public r-hpar
(define-public r-regioner
(package
(name "r-regioner")
(version "1.16.2")
(version "1.16.4")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "regioneR" version))
(sha256
(base32
"1b8ybx4wcxlqw9nvajawsf0lqaqn9v89rxcawg4g3dbzlfssfc5q"))))
"0xzk057h6nkr3rvd412prxgnkpq625b90laj1kwb0i5q8j5ch760"))))
(properties `((upstream-name . "regioneR")))
(build-system r-build-system)
(propagated-inputs
@ -1039,6 +1218,54 @@ (define-public r-regioner
region sets and other genomic features.")
(license license:artistic2.0)))
(define-public r-reportingtools
(package
(name "r-reportingtools")
(version "2.24.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "ReportingTools" version))
(sha256
(base32
"16ska7mlacka0xi8x2icy8v42vaxccb3a1x73szmfvcrwr592qsc"))))
(properties
`((upstream-name . "ReportingTools")))
(build-system r-build-system)
(propagated-inputs
`(("r-annotate" ,r-annotate)
("r-annotationdbi" ,r-annotationdbi)
("r-biobase" ,r-biobase)
("r-biocgenerics" ,r-biocgenerics)
("r-category" ,r-category)
("r-deseq2" ,r-deseq2)
("r-edger" ,r-edger)
("r-ggbio" ,r-ggbio)
("r-ggplot2" ,r-ggplot2)
("r-gostats" ,r-gostats)
("r-gseabase" ,r-gseabase)
("r-hwriter" ,r-hwriter)
("r-iranges" ,r-iranges)
("r-knitr" ,r-knitr)
("r-lattice" ,r-lattice)
("r-limma" ,r-limma)
("r-pfam-db" ,r-pfam-db)
("r-r-utils" ,r-r-utils)
("r-xml" ,r-xml)))
(home-page "https://bioconductor.org/packages/ReportingTools/")
(synopsis "Tools for making reports in various formats")
(description
"The ReportingTools package enables users to easily display reports of
analysis results generated from sources such as microarray and sequencing
data. The package allows users to create HTML pages that may be viewed on a
web browser, or in other formats. Users can generate tables with sortable and
filterable columns, make and display plots, and link table entries to other
data sources such as NCBI or larger plots within the HTML page. Using the
package, users can also produce a table of contents page to link various
reports together for a particular project that can be viewed in a web
browser.")
(license license:artistic2.0)))
(define-public r-geneplotter
(package
(name "r-geneplotter")
@ -1064,6 +1291,75 @@ (define-public r-geneplotter
"This package provides functions for plotting genomic data.")
(license license:artistic2.0)))
(define-public r-oligoclasses
(package
(name "r-oligoclasses")
(version "1.46.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "oligoClasses" version))
(sha256
(base32
"0z86zrmn80kcy6fgb9i9zs82vhim73n8hlkqy7y8sbb2jwksdr72"))))
(properties `((upstream-name . "oligoClasses")))
(build-system r-build-system)
(propagated-inputs
`(("r-affyio" ,r-affyio)
("r-biobase" ,r-biobase)
("r-biocgenerics" ,r-biocgenerics)
("r-biocmanager" ,r-biocmanager)
("r-biostrings" ,r-biostrings)
("r-dbi" ,r-dbi)
("r-ff" ,r-ff)
("r-foreach" ,r-foreach)
("r-genomicranges" ,r-genomicranges)
("r-iranges" ,r-iranges)
("r-rsqlite" ,r-rsqlite)
("r-s4vectors" ,r-s4vectors)
("r-summarizedexperiment" ,r-summarizedexperiment)))
(home-page "https://bioconductor.org/packages/oligoClasses/")
(synopsis "Classes for high-throughput arrays")
(description
"This package contains class definitions, validity checks, and
initialization methods for classes used by the @code{oligo} and @code{crlmm}
packages.")
(license license:gpl2+)))
(define-public r-oligo
(package
(name "r-oligo")
(version "1.48.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "oligo" version))
(sha256
(base32
"0qkyz65zvry0syibjkvkshwijccna18jy0hlib0n5x4c8x9zs5df"))))
(properties `((upstream-name . "oligo")))
(build-system r-build-system)
(inputs `(("zlib" ,zlib)))
(propagated-inputs
`(("r-affxparser" ,r-affxparser)
("r-affyio" ,r-affyio)
("r-biobase" ,r-biobase)
("r-biocgenerics" ,r-biocgenerics)
("r-biostrings" ,r-biostrings)
("r-dbi" ,r-dbi)
("r-ff" ,r-ff)
("r-oligoclasses" ,r-oligoclasses)
("r-preprocesscore" ,r-preprocesscore)
("r-rsqlite" ,r-rsqlite)
("r-zlibbioc" ,r-zlibbioc)))
(home-page "https://bioconductor.org/packages/oligo/")
(synopsis "Preprocessing tools for oligonucleotide arrays")
(description
"This package provides a package to analyze oligonucleotide
arrays (expression/SNP/tiling/exon) at probe-level. It currently supports
Affymetrix (CEL files) and NimbleGen arrays (XYS files).")
(license license:lgpl2.0+)))
(define-public r-qvalue
(package
(name "r-qvalue")
@ -3895,14 +4191,14 @@ (define-public r-yamss
(define-public r-gtrellis
(package
(name "r-gtrellis")
(version "1.16.0")
(version "1.16.1")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "gtrellis" version))
(sha256
(base32
"00d5swg3brnx8ryzpg7hp3mg9hx3vz4yd1lv2chlp2pj2rhsir1y"))))
"069hln9vflyxic24bxrlmdmz9h3jdd2qaqy898rgk5bn0gqwcjix"))))
(build-system r-build-system)
(propagated-inputs
`(("r-circlize" ,r-circlize)
@ -4888,14 +5184,14 @@ (define-public r-annotatr
(define-public r-rsubread
(package
(name "r-rsubread")
(version "1.34.6")
(version "1.34.7")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "Rsubread" version))
(sha256
(base32
"0nnfh4hnrs5kd72m8c50cidbsxjz12szw2vynpmg8q0wpd99q550"))))
"0z4ydk9296bp76ah5y6a7za5jyn4h238xngb789zragly902x83y"))))
(properties `((upstream-name . "Rsubread")))
(build-system r-build-system)
(inputs `(("zlib" ,zlib)))
@ -5047,14 +5343,14 @@ (define-public r-flowsom
(define-public r-mixomics
(package
(name "r-mixomics")
(version "6.8.2")
(version "6.8.4")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "mixOmics" version))
(sha256
(base32
"0issfrhsgc102sr33q9v6w6jrrd32plig7szd1nm0n4r3yn4y2fc"))))
"0lw4c9lxcm83xrvl4y120i1z710qjbdqginhrw738azpr1f82hcg"))))
(properties `((upstream-name . "mixOmics")))
(build-system r-build-system)
(propagated-inputs
@ -5466,3 +5762,288 @@ (define-public r-bigmelon
"This package provides methods for working with Illumina arrays using the
@code{gdsfmt} package.")
(license license:gpl3)))
(define-public r-seqbias
(package
(name "r-seqbias")
(version "1.32.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "seqbias" version))
(sha256
(base32
"1pk97jsq0rxijsdm5wnmlw79mhy19skdq1h3mmfbdjh560md47lw"))))
(properties `((upstream-name . "seqbias")))
(build-system r-build-system)
(propagated-inputs
`(("r-biostrings" ,r-biostrings)
("r-genomicranges" ,r-genomicranges)
("r-rhtslib" ,r-rhtslib)))
(inputs
`(("zlib" ,zlib))) ; This comes from rhtslib.
(home-page "https://bioconductor.org/packages/seqbias/")
(synopsis "Estimation of per-position bias in high-throughput sequencing data")
(description
"This package implements a model of per-position sequencing bias in
high-throughput sequencing data using a simple Bayesian network, the structure
and parameters of which are trained on a set of aligned reads and a reference
genome sequence.")
(license license:lgpl3)))
(define-public r-reqon
(package
(name "r-reqon")
(version "1.30.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "ReQON" version))
(sha256
(base32
"04bljr8vgb9z9800d9v8w7a4rvjkwq48zd8n5divq30zj9k2na7a"))))
(properties `((upstream-name . "ReQON")))
(build-system r-build-system)
(propagated-inputs
`(("r-rjava" ,r-rjava)
("r-rsamtools" ,r-rsamtools)
("r-seqbias" ,r-seqbias)))
(home-page "https://bioconductor.org/packages/ReQON/")
(synopsis "Recalibrating quality of nucleotides")
(description
"This package provides an implementation of an algorithm for
recalibrating the base quality scores for aligned sequencing data in BAM
format.")
(license license:gpl2)))
(define-public r-wavcluster
(package
(name "r-wavcluster")
(version "2.18.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "wavClusteR" version))
(sha256
(base32
"02i53dskirzr9nls3dsmv7dqhvy3vikkpx7247zpy2qd9r5yvhy2"))))
(properties `((upstream-name . "wavClusteR")))
(build-system r-build-system)
(propagated-inputs
`(("r-biocgenerics" ,r-biocgenerics)
("r-biostrings" ,r-biostrings)
("r-foreach" ,r-foreach)
("r-genomicfeatures" ,r-genomicfeatures)
("r-genomicranges" ,r-genomicranges)
("r-ggplot2" ,r-ggplot2)
("r-hmisc" ,r-hmisc)
("r-iranges" ,r-iranges)
("r-mclust" ,r-mclust)
("r-rsamtools" ,r-rsamtools)
("r-rtracklayer" ,r-rtracklayer)
("r-s4vectors" ,r-s4vectors)
("r-seqinr" ,r-seqinr)
("r-stringr" ,r-stringr)
("r-wmtsa" ,r-wmtsa)))
(home-page "https://bioconductor.org/packages/wavClusteR/")
(synopsis "Identification of RNA-protein interaction sites in PAR-CLIP data")
(description
"This package provides an integrated pipeline for the analysis of
PAR-CLIP data. PAR-CLIP-induced transitions are first discriminated from
sequencing errors, SNPs and additional non-experimental sources by a non-
parametric mixture model. The protein binding sites (clusters) are then
resolved at high resolution and cluster statistics are estimated using a
rigorous Bayesian framework. Post-processing of the results, data export for
UCSC genome browser visualization and motif search analysis are provided. In
addition, the package allows to integrate RNA-Seq data to estimate the False
Discovery Rate of cluster detection. Key functions support parallel multicore
computing. While wavClusteR was designed for PAR-CLIP data analysis, it can
be applied to the analysis of other NGS data obtained from experimental
procedures that induce nucleotide substitutions (e.g. BisSeq).")
(license license:gpl2)))
(define-public r-timeseriesexperiment
(package
(name "r-timeseriesexperiment")
(version "1.2.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "TimeSeriesExperiment" version))
(sha256
(base32
"1j11g7a2p0yk38fx6wd6152l1xynghj01pfxihalw601jwf1bl0y"))))
(properties
`((upstream-name . "TimeSeriesExperiment")))
(build-system r-build-system)
(propagated-inputs
`(("r-deseq2" ,r-deseq2)
("r-dplyr" ,r-dplyr)
("r-dynamictreecut" ,r-dynamictreecut)
("r-edger" ,r-edger)
("r-ggplot2" ,r-ggplot2)
("r-hmisc" ,r-hmisc)
("r-limma" ,r-limma)
("r-magrittr" ,r-magrittr)
("r-proxy" ,r-proxy)
("r-s4vectors" ,r-s4vectors)
("r-summarizedexperiment" ,r-summarizedexperiment)
("r-tibble" ,r-tibble)
("r-tidyr" ,r-tidyr)
("r-vegan" ,r-vegan)
("r-viridis" ,r-viridis)))
(home-page "https://github.com/nlhuong/TimeSeriesExperiment/")
(synopsis "Analysis for short time-series data")
(description
"This package is a visualization and analysis toolbox for short time
course data which includes dimensionality reduction, clustering, two-sample
differential expression testing and gene ranking techniques. The package also
provides methods for retrieving enriched pathways.")
(license license:lgpl3+)))
(define-public r-variantfiltering
(package
(name "r-variantfiltering")
(version "1.20.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "VariantFiltering" version))
(sha256
(base32
"0vpghxacqcbaxx2scb5gfhcmfpw1lkls7h6qnbwbnmjwy01q2p17"))))
(properties
`((upstream-name . "VariantFiltering")))
(build-system r-build-system)
(propagated-inputs
`(("r-annotationdbi" ,r-annotationdbi)
("r-biobase" ,r-biobase)
("r-biocgenerics" ,r-biocgenerics)
("r-biocparallel" ,r-biocparallel)
("r-biostrings" ,r-biostrings)
("r-bsgenome" ,r-bsgenome)
("r-dt" ,r-dt)
("r-genomeinfodb" ,r-genomeinfodb)
("r-genomicfeatures" ,r-genomicfeatures)
("r-genomicranges" ,r-genomicranges)
("r-genomicscores" ,r-genomicscores)
("r-graph" ,r-graph)
("r-gviz" ,r-gviz)
("r-iranges" ,r-iranges)
("r-rbgl" ,r-rbgl)
("r-rsamtools" ,r-rsamtools)
("r-s4vectors" ,r-s4vectors)
("r-shiny" ,r-shiny)
("r-shinyjs" ,r-shinyjs)
("r-shinythemes" ,r-shinythemes)
("r-shinytree" ,r-shinytree)
("r-summarizedexperiment" ,r-summarizedexperiment)
("r-variantannotation" ,r-variantannotation)
("r-xvector" ,r-xvector)))
(home-page "https://github.com/rcastelo/VariantFiltering")
(synopsis "Filtering of coding and non-coding genetic variants")
(description
"Filter genetic variants using different criteria such as inheritance
model, amino acid change consequence, minor allele frequencies across human
populations, splice site strength, conservation, etc.")
(license license:artistic2.0)))
(define-public r-genomegraphs
(package
(name "r-genomegraphs")
(version "1.44.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "GenomeGraphs" version))
(sha256
(base32
"026skcn2cqchlzaqsnk11gb8d8aq1rz7lrnx4mmsba234mh4j7kd"))))
(properties `((upstream-name . "GenomeGraphs")))
(build-system r-build-system)
(propagated-inputs
`(("r-biomart" ,r-biomart)))
(home-page "https://bioconductor.org/packages/GenomeGraphs/")
(synopsis "Plotting genomic information from Ensembl")
(description
"Genomic data analyses requires integrated visualization of known genomic
information and new experimental data. GenomeGraphs uses the biomaRt package
to perform live annotation queries to Ensembl and translates this to e.g.
gene/transcript structures in viewports of the grid graphics package. This
results in genomic information plotted together with your data. Another
strength of GenomeGraphs is to plot different data types such as array CGH,
gene expression, sequencing and other data, together in one plot using the
same genome coordinate system.")
(license license:artistic2.0)))
(define-public r-wavetiling
(package
(name "r-wavetiling")
(version "1.26.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "waveTiling" version))
(sha256
(base32
"0l0saa0myabpq2rl9dq70zff8jpxr3mkanxlj65hc41f0m5xllir"))))
(properties `((upstream-name . "waveTiling")))
(build-system r-build-system)
(propagated-inputs
`(("r-affy" ,r-affy)
("r-biobase" ,r-biobase)
("r-biostrings" ,r-biostrings)
("r-genomegraphs" ,r-genomegraphs)
("r-genomicranges" ,r-genomicranges)
("r-iranges" ,r-iranges)
("r-oligo" ,r-oligo)
("r-oligoclasses" ,r-oligoclasses)
("r-preprocesscore" ,r-preprocesscore)
("r-waveslim" ,r-waveslim)))
(home-page "https://r-forge.r-project.org/projects/wavetiling/")
(synopsis "Wavelet-based models for tiling array transcriptome analysis")
(description
"This package is designed to conduct transcriptome analysis for tiling
arrays based on fast wavelet-based functional models.")
(license license:gpl2+)))
(define-public r-variancepartition
(package
(name "r-variancepartition")
(version "1.14.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "variancePartition" version))
(sha256
(base32
"1ycapwb2mq57xibrzzjz9zwxqz4nwz9f3n5gskhlr5vcs7irkjd6"))))
(properties
`((upstream-name . "variancePartition")))
(build-system r-build-system)
(propagated-inputs
`(("r-biobase" ,r-biobase)
("r-colorramps" ,r-colorramps)
("r-doparallel" ,r-doparallel)
("r-foreach" ,r-foreach)
("r-ggplot2" ,r-ggplot2)
("r-gplots" ,r-gplots)
("r-iterators" ,r-iterators)
("r-limma" ,r-limma)
("r-lme4" ,r-lme4)
("r-lmertest" ,r-lmertest)
("r-mass" ,r-mass)
("r-pbkrtest" ,r-pbkrtest)
("r-progress" ,r-progress)
("r-reshape2" ,r-reshape2)
("r-scales" ,r-scales)))
(home-page "https://bioconductor.org/packages/variancePartition/")
(synopsis "Analyze variation in gene expression experiments")
(description
"This is a package providing tools to quantify and interpret multiple
sources of biological and technical variation in gene expression experiments.
It uses a linear mixed model to quantify variation in gene expression
attributable to individual, tissue, time point, or technical variables. The
package includes dream differential expression analysis for repeated
measures.")
(license license:gpl2+)))

32
gnu/packages/bioinformatics.scm
View file

@ -7340,13 +7340,13 @@ (define-public r-bioccheck
(define-public r-s4vectors
(package
(name "r-s4vectors")
(version "0.22.0")
(version "0.22.1")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "S4Vectors" version))
(sha256
(base32
"1wkqmpy0d0fab9bjfc7i5wh2zng75pg9rn9c1z1lkki7fpwaw2jb"))))
"0cpxqb18wd3pjd7bi8lry13sm5ffqahcvvxpk5pwm5xcj30cdlm9"))))
(properties
`((upstream-name . "S4Vectors")))
(build-system r-build-system)
@ -7447,13 +7447,13 @@ (define-public r-genomeinfodb
(define-public r-edger
(package
(name "r-edger")
(version "3.26.7")
(version "3.26.8")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "edgeR" version))
(sha256
(base32
"1xbhb8aa1ygm5crkp1bmqs2x1601ppa2kgc2xlf2zh8jj8zqapg8"))))
"1wwimzviy2vklp80faz7sbbp74qcw2csbmlfgvzj7b785vwarpwg"))))
(properties `((upstream-name . "edgeR")))
(build-system r-build-system)
(propagated-inputs
@ -7569,13 +7569,13 @@ (define-public r-xvector
(define-public r-genomicranges
(package
(name "r-genomicranges")
(version "1.36.0")
(version "1.36.1")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "GenomicRanges" version))
(sha256
(base32
"1285fr8qjd7d0ixpv7d5imi0n6wzc4k6yia1rkmig71qd2gg556k"))))
"1yid84gn0052v52h84685lvk854grl1wl65psmlmxx9yyykgc0jn"))))
(properties
`((upstream-name . "GenomicRanges")))
(build-system r-build-system)
@ -7872,13 +7872,13 @@ (define-public r-genomicalignments
(define-public r-rtracklayer
(package
(name "r-rtracklayer")
(version "1.44.3")
(version "1.44.4")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "rtracklayer" version))
(sha256
(base32
"091zydz1zpz519ha0jkbvzrhxjvw5r2963qz9grmvl2jd8girvcg"))))
"0dnifr58j2si2qbnvap2wslz3xgjv3h4l7a6v7nmmc57hq6kdbym"))))
(build-system r-build-system)
(arguments
`(#:phases
@ -9628,14 +9628,14 @@ (define-public r-interactivedisplaybase
(define-public r-annotationhub
(package
(name "r-annotationhub")
(version "2.16.0")
(version "2.16.1")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "AnnotationHub" version))
(sha256
(base32
"1rpzl4x5mrwxrrf1jzm4zni6li6x34fjfyybsdvplb0ixa48zhn4"))))
"0c773cmhng907839f0bq161jky7362lxxny36ac55qxiz1giqi8j"))))
(properties `((upstream-name . "AnnotationHub")))
(build-system r-build-system)
(propagated-inputs
@ -10023,14 +10023,14 @@ (define-public r-ggbio
(define-public r-gprofiler
(package
(name "r-gprofiler")
(version "0.6.7")
(version "0.6.8")
(source
(origin
(method url-fetch)
(uri (cran-uri "gProfileR" version))
(sha256
(base32
"12nwidbnqmnfy5dnqga26byslvdnkrpz2fi19qfcby6xx0wbndk7"))))
"05d6y6b7vkkzp2qhs1cwlvp02djij1b28dbwxnrms08f8qi35iaj"))))
(properties `((upstream-name . "gProfileR")))
(build-system r-build-system)
(propagated-inputs
@ -10448,14 +10448,14 @@ (define-public r-hdf5array
(define-public r-rhdf5lib
(package
(name "r-rhdf5lib")
(version "1.6.0")
(version "1.6.1")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "Rhdf5lib" version))
(sha256
(base32
"1lpmyxlwwcy92hyxqag321ssc5z6yw3a0ws9r058jwgzyjg7i2gm"))
"0niz9dh66fcwbvqpkpsdlz9d06kwi3kfh45dhk3qz9g9qqyiakr1"))
(modules '((guix build utils)))
(snippet
'(begin
@ -10644,14 +10644,14 @@ (define-public r-scran
(define-public r-delayedmatrixstats
(package
(name "r-delayedmatrixstats")
(version "1.6.0")
(version "1.6.1")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "DelayedMatrixStats" version))
(sha256
(base32
"0632ypndblrgzfk8k98rr8c6m2r0zwzf02pzvlrhcp9bj1pvqbrz"))))
"1riyzfsq4bd513hidkw3cfkx3jywk3x87j89q70v459xsdfdc95b"))))
(properties
`((upstream-name . "DelayedMatrixStats")))
(build-system r-build-system)

12
gnu/packages/check.scm
View file

@ -2234,7 +2234,7 @@ (define-public libfaketime
(define-public umockdev
(package
(name "umockdev")
(version "0.12.1")
(version "0.13.2")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/martinpitt/umockdev/"
@ -2242,7 +2242,7 @@ (define-public umockdev
"umockdev-" version ".tar.xz"))
(sha256
(base32
"1hx5jm9afng6hw9wyp524z8nwdp6w053pca0w2c0gqpgrmvjxvd2"))))
"095v3abc321s584sga04y16lcmdzsdi88h24wcrm78v7vq484g74"))))
(build-system gnu-build-system)
(arguments
`(#:phases
@ -2255,10 +2255,12 @@ (define-public umockdev
#t)))))
(native-inputs
`(("vala" ,vala)
("python" ,python) ; for tests
("which" ,which) ; for tests
("gtk-doc" ,gtk-doc)
("pkg-config" ,pkg-config)))
("pkg-config" ,pkg-config)
;; For tests.
("python" ,python)
("which" ,which)))
(inputs
`(("glib" ,glib)
("eudev" ,eudev)

35
gnu/packages/cluster.scm
View file

@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Sou Bunnbu <iyzsong@member.fsf.org>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Andrew Miloradovsky <andrew@interpretmath.pw>
;;;
;;; This file is part of GNU Guix.
;;;
@ -21,7 +22,10 @@ (define-module (gnu packages cluster)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix build-system gnu)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix packages)
#:use-module (gnu packages autotools)
#:use-module (gnu packages gettext)
#:use-module (gnu packages linux)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages sphinx)
@ -79,3 +83,34 @@ (define-public keepalived
Redundancy Routing Protocol (@dfn{VRRP}). Each Keepalived framework can be used
independently or together to provide resilient infrastructures.")
(license license:gpl2+)))
(define-public libraft
(package
(name "libraft")
(version "0.9.5")
(home-page "https://github.com/canonical/raft")
(source (origin
(method git-fetch)
(uri (git-reference (url home-page)
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1q49f5mmv6nr6dxhnp044xwc6jlczgh0nj0bl6718wiqh28411x0"))))
(arguments '(#:configure-flags '("--disable-uv")))
;; The uv plugin tests fail, if libuv (or the example) is enabled,
;; because setting up the environment requires too much privileges.
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("gettext" ,gettext-minimal)
("libtool" ,libtool)
("pkg-config" ,pkg-config)))
(build-system gnu-build-system)
(synopsis "C implementation of the Raft consensus protocol")
(description "The library has modular design: its core part implements only
the core Raft algorithm logic, in a fully platform independent way. On top of
that, a pluggable interface defines the I/O implementation for networking
(send/receive RPC messages) and disk persistence (store log entries and
snapshots).")
(license license:asl2.0)))

12
gnu/packages/cmake.scm
View file

@ -207,6 +207,18 @@ (define-public cmake
(outputs '("out" "doc"))
(properties (alist-delete 'hidden? (package-properties cmake-minimal)))))
(define-public cmake/fixed
;; This is a variant of CMake that fixes X.509 certificate lookup:
;; <https://issues.guix.gnu.org/issue/37371>.
(package
(inherit cmake)
(version (string-append (package-version cmake) "-1"))
(source (origin
(inherit (package-source cmake))
(patches
(append (search-patches "cmake-curl-certificates.patch")
(origin-patches (package-source cmake))))))))
(define-public emacs-cmake-mode
(package
(inherit cmake)

476
gnu/packages/cran.scm
View file

@ -15,6 +15,7 @@
;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2018, 2019 Brett Gilio <brettg@posteo.net>
;;; Copyright © 2019 Nicolò Balzarotti <anothersms@gmail.com>
;;; Copyright © 2019 Wiktor Żelazny <wzelazny@vurv.cz>
;;;
;;; This file is part of GNU Guix.
;;;
@ -447,13 +448,13 @@ (define-public r-modelr
(define-public r-httpuv
(package
(name "r-httpuv")
(version "1.5.1")
(version "1.5.2")
(source (origin
(method url-fetch)
(uri (cran-uri "httpuv" version))
(sha256
(base32
"042piypg4c8sqrlcdl3dwajkafkbglsky3x7d0jpjv8s5wxnpfxm"))))
"13ax0hs2lc39ilznh1zarwqdzahcbhb8adilrfik3xg0fkljpcwk"))))
(build-system r-build-system)
(propagated-inputs
`(("r-bh" ,r-bh)
@ -796,6 +797,84 @@ (define-public r-shiny
responsive, and powerful applications with minimal effort.")
(license license:artistic2.0)))
;; This package includes minified JavaScript files. When upgrading please
;; check that there are no new minified JavaScript files.
(define-public r-shinytree
(package
(name "r-shinytree")
(version "0.2.7")
(source
(origin
(method url-fetch)
(uri (cran-uri "shinyTree" version))
(sha256
(base32
"0jfx2capckv7hf2yx3fn8i4rcmhi222ah91jnmhg497x8wgz31s3"))
(modules '((guix build utils)))
(snippet
'(begin
;; Delete minified JavaScript
(for-each delete-file
'("inst/www/jsTree-3.3.7/libs/require.js"
"inst/www/jsTree-3.3.7/libs/jquery.js"
"inst/www/jsTree-3.3.7/jstree.min.js"))
#t))))
(properties `((upstream-name . "shinyTree")))
(build-system r-build-system)
(arguments
`(#:modules ((guix build utils)
(guix build r-build-system)
(srfi srfi-1)
(ice-9 popen))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'replace-minified-javascript
(lambda* (#:key inputs #:allow-other-keys)
(with-directory-excursion "inst/www/jsTree-3.3.7/"
(symlink (string-append (assoc-ref inputs "js-requirejs")
"/share/javascript/require.min.js")
"libs/require.js")
(call-with-values
(lambda ()
(unzip2
`((,(assoc-ref inputs "js-jquery")
"libs/jquery.js")
("jstree.js"
"jstree.min.js"))))
(lambda (sources targets)
(for-each (lambda (source target)
(format #t "Processing ~a --> ~a~%"
source target)
(let ((minified (open-pipe* OPEN_READ "uglify-js" source)))
(call-with-output-file target
(lambda (port)
(dump-port minified port)))))
sources targets))))
#t)))))
(propagated-inputs
`(("r-htmlwidgets" ,r-htmlwidgets)
("r-jsonlite" ,r-jsonlite)
("r-promises" ,r-promises)
("r-shiny" ,r-shiny)
("r-stringr" ,r-stringr)))
(inputs
`(("js-requirejs" ,js-requirejs)))
(native-inputs
`(("uglify-js" ,uglify-js)
("js-jquery"
,(origin
(method url-fetch)
(uri "https://code.jquery.com/jquery-3.3.1.js")
(sha256
(base32
"1b8zxrp6xwzpw25apn8j4qws0f6sr7qr7h2va5h1mjyfqvn29anq"))))))
(home-page "https://cran.r-project.org/web/packages/shinyTree/")
(synopsis "jsTree bindings for Shiny")
(description
"This package exposes R bindings to jsTree, a JavaScript library that
supports interactive trees, to enable rich, editable trees in Shiny.")
(license license:expat)))
(define-public r-shinydashboard
(package
(name "r-shinydashboard")
@ -867,6 +946,31 @@ (define-public r-shinyfiles
well as file saving is available.")
(license license:gpl2+)))
(define-public r-shinythemes
(package
(name "r-shinythemes")
(version "1.1.2")
(source
(origin
(method url-fetch)
(uri (cran-uri "shinythemes" version))
(sha256
(base32
"12miz44n2zxfswnia7p8dirxj3miw0aqn4pkx2111ikz67ax84rf"))))
(properties `((upstream-name . "shinythemes")))
(build-system r-build-system)
(propagated-inputs `(("r-shiny" ,r-shiny)))
(home-page "http://rstudio.github.io/shinythemes/")
(synopsis "Themes for Shiny")
(description
"This package provides themes for use with Shiny. It includes several
Bootstrap themes, which are packaged for use with Shiny applications.")
;; The package is released under version 3 of the GPL, but it includes
;; source files that are covered by the Expat license. It also includes
;; fonts under SIL or the ASL.
(license (list license:gpl3 license:expat
license:silofl1.1 license:asl2.0))))
;; The package sources include minified variants of d3.js and non-minified
;; source code of d3-jetpack.
(define-public r-d3r
@ -1059,14 +1163,14 @@ (define-public r-miniui
(define-public r-feather
(package
(name "r-feather")
(version "0.3.3")
(version "0.3.5")
(source
(origin
(method url-fetch)
(uri (cran-uri "feather" version))
(sha256
(base32
"0ls8lmygyjq60467s88h66d7fczjp1d3a2106rfq4dx9lyfvdfsa"))))
"1gxd0h2m56sjjlzn4dry6s13nddxc4l5i11gsvavaf2dwbahdzsh"))))
(build-system r-build-system)
(propagated-inputs
`(("r-hms" ,r-hms)
@ -1649,14 +1753,14 @@ (define-public r-globaloptions
(define-public r-circlize
(package
(name "r-circlize")
(version "0.4.7")
(version "0.4.8")
(source
(origin
(method url-fetch)
(uri (cran-uri "circlize" version))
(sha256
(base32
"07y1bchkslpz2wl43yg5j5h1nl9z0i425a07jdmfd5avrynd8p3m"))))
"0jvr9hmxyhg0zx101iiqkrg8wfaj86kp62xpv42n2j9fkn5r1mi2"))))
(build-system r-build-system)
(propagated-inputs
`(("r-colorspace" ,r-colorspace)
@ -2663,14 +2767,14 @@ (define-public r-linprog
(define-public r-geometry
(package
(name "r-geometry")
(version "0.4.3")
(version "0.4.4")
(source
(origin
(method url-fetch)
(uri (cran-uri "geometry" version))
(sha256
(base32
"0z4491mhfmrlbb8lazjvq55alrprx7k0abg2d39fj0lsj84cls1r"))))
"1mx5n5mw63nij4n6crs9165mlls4fnh1ipw5ch467rjsidgl0mg8"))))
(build-system r-build-system)
(propagated-inputs
`(("r-magic" ,r-magic)
@ -5569,14 +5673,14 @@ (define-public r-ggsignif
(define-public r-ggpubr
(package
(name "r-ggpubr")
(version "0.2.2")
(version "0.2.3")
(source
(origin
(method url-fetch)
(uri (cran-uri "ggpubr" version))
(sha256
(base32
"0r5knv3707pmpngmj60zn761y3bh8lj89dhh1b80ss083xnxr4qw"))))
"0i81mmz4qn9yzcgfa6dhkcrx4ddlflkm2c3b40isc8all43rm8rn"))))
(build-system r-build-system)
(propagated-inputs
`(("r-cowplot" ,r-cowplot)
@ -6091,14 +6195,14 @@ (define-public r-prediction
(define-public r-insight
(package
(name "r-insight")
(version "0.4.1")
(version "0.5.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "insight" version))
(sha256
(base32
"1lw1r3mb97z5p9z25jfzlhs0sbnwp6v8kzysf0am01x4m7l3iz82"))))
"0lrh2l9n2zd9n3zzknsxz6nlasnrayx3bplxlz7m616g56gr5nfp"))))
(build-system r-build-system)
(home-page "https://easystats.github.io/insight/")
(synopsis "Easy access to model information for various model objects")
@ -6117,14 +6221,14 @@ (define-public r-insight
(define-public r-sjlabelled
(package
(name "r-sjlabelled")
(version "1.1.0")
(version "1.1.1")
(source
(origin
(method url-fetch)
(uri (cran-uri "sjlabelled" version))
(sha256
(base32
"0rnmlwpp41h04dzfjd5ncvzjzs43slaimb4v2in1axznv3haafyc"))))
"0c9wy0gsr2sbkrv2638xbi7qm0gl6jyr6sfricavhkm7l4hljjkz"))))
(build-system r-build-system)
(propagated-inputs
`(("r-haven" ,r-haven)
@ -6873,13 +6977,13 @@ (define-public r-mosaiccore
(define-public r-ggformula
(package
(name "r-ggformula")
(version "0.9.1")
(version "0.9.2")
(source
(origin
(method url-fetch)
(uri (cran-uri "ggformula" version))
(sha256
(base32 "01ngx8qh9lhmagng6abx2ky54zi3iyj5bpxlnw59slagwv7l6icx"))))
(base32 "16ycabhnp78fsiv1dc63ccgh9gmpsy2683vbmq0fdzl6w3pd87sr"))))
(build-system r-build-system)
(propagated-inputs
`(("r-ggplot2" ,r-ggplot2)
@ -7878,14 +7982,14 @@ (define-public r-multcomp
(define-public r-emmeans
(package
(name "r-emmeans")
(version "1.4")
(version "1.4.1")
(source
(origin
(method url-fetch)
(uri (cran-uri "emmeans" version))
(sha256
(base32
"1ynf9hhbch83k63lwps69ijfch30fk5v0sc418ck264c5vih26dh"))))
"1fpawaxnmj67md169a9mzrnnh2d0c973xydfg6hw865933jil9lq"))))
(build-system r-build-system)
(propagated-inputs
`(("r-estimability" ,r-estimability)
@ -8036,14 +8140,14 @@ (define-public r-tmb
(define-public r-sjstats
(package
(name "r-sjstats")
(version "0.17.5")
(version "0.17.6")
(source
(origin
(method url-fetch)
(uri (cran-uri "sjstats" version))
(sha256
(base32
"1x9ybvz84vgaabmqp4z6crbv5q6kqjg6msk1spbr11zx9dbj06ca"))))
"11z1wfi0d74d1rld0320l3vmv6rl41wa0v9bjc44rk06yc90wld2"))))
(build-system r-build-system)
(propagated-inputs
`(("r-bayestestr" ,r-bayestestr)
@ -8055,6 +8159,7 @@ (define-public r-sjstats
("r-magrittr" ,r-magrittr)
("r-mass" ,r-mass)
("r-modelr" ,r-modelr)
("r-parameters" ,r-parameters)
("r-performance" ,r-performance)
("r-purrr" ,r-purrr)
("r-rlang" ,r-rlang)
@ -8162,14 +8267,14 @@ (define-public r-performance
(define-public r-ggeffects
(package
(name "r-ggeffects")
(version "0.11.0")
(version "0.12.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "ggeffects" version))
(sha256
(base32
"1b0lxa8bljdh6h4lk7pql1lrhjlvh7p5c8qlgb8ac6ay8hb79vmi"))))
"0idfycjk05gyykfp9ibmhxfcjvd01ikh1dl0fb4nqw6znw3ar0xp"))))
(build-system r-build-system)
(propagated-inputs
`(("r-dplyr" ,r-dplyr)
@ -8196,14 +8301,14 @@ (define-public r-ggeffects
(define-public r-sjplot
(package
(name "r-sjplot")
(version "2.7.0")
(version "2.7.1")
(source
(origin
(method url-fetch)
(uri (cran-uri "sjPlot" version))
(sha256
(base32
"1m0gy991fmxvqry91kkzdkdapyalhrwql25d0hg2a2naxgfw4zpk"))))
"14shypabpahf68hd66rb1dpqhiyl3i0yx1yc85wamdvljh9fdymb"))))
(properties `((upstream-name . "sjPlot")))
(build-system r-build-system)
(propagated-inputs
@ -9122,17 +9227,18 @@ (define-public r-circular
(define-public r-activity
(package
(name "r-activity")
(version "1.2")
(version "1.3")
(source
(origin
(method url-fetch)
(uri (cran-uri "activity" version))
(sha256
(base32
"11w2bz6p9xbzdh6773dmbbh6rws0h5dj18p8m0ivzizgq932vdzs"))))
"12imqj366dp6pam5gap6ji56p5wf1073xz5g4iikfxf5l8snxw92"))))
(build-system r-build-system)
(propagated-inputs
`(("r-circular" ,r-circular)
("r-insol" ,r-insol)
("r-pbapply" ,r-pbapply)))
(home-page "https://cran.r-project.org/web/packages/activity/")
(synopsis "Animal activity statistics")
@ -9444,14 +9550,14 @@ (define-public r-colorramps
(define-public r-tidytree
(package
(name "r-tidytree")
(version "0.2.6")
(version "0.2.7")
(source
(origin
(method url-fetch)
(uri (cran-uri "tidytree" version))
(sha256
(base32
"13mhizbsawmfqjpnzb73yw6kn1f1wlz0vhyzj3g0rj6ry880rw89"))))
"15ky7hj7w08jx94wm0yikckca0apwv3jy5svd77dpzgb2lr9ff9a"))))
(build-system r-build-system)
(propagated-inputs
`(("r-ape" ,r-ape)
@ -10767,14 +10873,14 @@ (define-public r-dotcall64
(define-public r-spam
(package
(name "r-spam")
(version "2.2-2")
(version "2.3-0")
(source
(origin
(method url-fetch)
(uri (cran-uri "spam" version))
(sha256
(base32
"024dgfnjfxvsiymbzrhadinamj6qy509f4sbd1zxql8ymkyxn7vi"))))
"194n5mgvyms9ckjqixl3h33apii8h9kqspqg2si9k741k578qb3w"))))
(build-system r-build-system)
(propagated-inputs
`(("r-dotcall64" ,r-dotcall64)))
@ -11152,14 +11258,14 @@ (define-public r-ppls
(define-public r-huge
(package
(name "r-huge")
(version "1.3.2")
(version "1.3.3")
(source
(origin
(method url-fetch)
(uri (cran-uri "huge" version))
(sha256
(base32
"1j93gvi1jyq3ld9jhdqhrpm2is54rk3ilmf3yw7fx6gva0y6hjqd"))))
"18f8w4hdp9fdi2k5ip6fnrn5z47w4ybgxs2m6a7jdvd2v4wfdr69"))))
(build-system r-build-system)
(propagated-inputs
`(("r-igraph" ,r-igraph)
@ -12590,14 +12696,14 @@ (define-public r-acsnminer
(define-public r-seqinr
(package
(name "r-seqinr")
(version "3.4-5")
(version "3.6-1")
(source
(origin
(method url-fetch)
(uri (cran-uri "seqinr" version))
(sha256
(base32
"17zv0n5cji17izwmwg0jcbxbjl3w5rls91w15svcnlpxjms38ahn"))))
"0j30za6kji6y3v09cvcydiacnp65pv6ig8aw7cydl47l5s9chky4"))))
(build-system r-build-system)
(propagated-inputs
`(("r-ade4" ,r-ade4)
@ -13607,14 +13713,14 @@ (define-public r-xkcd
(define-public r-msigdbr
(package
(name "r-msigdbr")
(version "6.2.1")
(version "7.0.1")
(source
(origin
(method url-fetch)
(uri (cran-uri "msigdbr" version))
(sha256
(base32
"1264j1hs74kq7hyh68vfynadfi6mdpq46qm1hnwzkzzhmbzpb9cg"))))
"19p8z617m3my8la7n1qgb1s2msf940r372im3q30qkbcx3qxg3sd"))))
(build-system r-build-system)
(propagated-inputs
`(("r-dplyr" ,r-dplyr)
@ -13881,14 +13987,14 @@ (define-public r-europepmc
(define-public r-ggraph
(package
(name "r-ggraph")
(version "1.0.2")
(version "2.0.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "ggraph" version))
(sha256
(base32
"0fpmp326mryd1k1qvacjadksrnhbla8h960i18lmrimzrag7692c"))))
"0qj7w3af0pgmd9mil6y571jikfkln7b8csvzg6b08spwbglfy1s3"))))
(build-system r-build-system)
(propagated-inputs
`(("r-digest" ,r-digest)
@ -13896,12 +14002,14 @@ (define-public r-ggraph
("r-ggforce" ,r-ggforce)
("r-ggplot2" ,r-ggplot2)
("r-ggrepel" ,r-ggrepel)
("r-graphlayouts" ,r-graphlayouts)
("r-gtable" ,r-gtable)
("r-igraph" ,r-igraph)
("r-mass" ,r-mass)
("r-plyr" ,r-plyr)
("r-rcpp" ,r-rcpp)
("r-rlang" ,r-rlang)
("r-scales" ,r-scales)
("r-tidygraph" ,r-tidygraph)
("r-viridis" ,r-viridis)))
(home-page "https://cran.r-project.org/web/packages/ggraph/")
(synopsis "Implementation of grammar of graphics for graphs and networks")
@ -15212,3 +15320,293 @@ (define-public r-harmony
@url{doi.org/10.1101/461954}. The package includes a standalone Harmony
function and interfaces to external frameworks.")
(license license:gpl3))))
(define-public r-covr
(package
(name "r-covr")
(version "3.3.1")
(source
(origin
(method url-fetch)
(uri (cran-uri "covr" version))
(sha256
(base32
"0fvd7v53w11x6kaw61hbml8n1j2ck9l2fv2wvqdsg689xic9rqcs"))))
(properties `((upstream-name . "covr")))
(build-system r-build-system)
(propagated-inputs
`(("r-crayon" ,r-crayon)
("r-digest" ,r-digest)
("r-httr" ,r-httr)
("r-jsonlite" ,r-jsonlite)
("r-rex" ,r-rex)
("r-withr" ,r-withr)
("r-yaml" ,r-yaml)))
(home-page "https://github.com/r-lib/covr")
(synopsis "Test coverage for R packages")
(description
"Thisp package enables you to track and report code coverage for your
package and (optionally) upload the results to a coverage service. Code
coverage is a measure of the amount of code being exercised by a set of tests.
It is an indirect measure of test quality and completeness. This package is
compatible with any testing methodology or framework and tracks coverage of
both R code and compiled C/C++/FORTRAN code.")
(license license:gpl3)))
(define-public r-systemfonts
(package
(name "r-systemfonts")
(version "0.1.1")
(source
(origin
(method url-fetch)
(uri (cran-uri "systemfonts" version))
(sha256
(base32
"0m0ljid683xcam2f14x7k2zv1yx4npac38a3gfv11vhxfbnpgp0z"))))
(properties `((upstream-name . "systemfonts")))
(build-system r-build-system)
(inputs
`(("fontconfig" ,fontconfig)
("freetype" ,freetype)
("zlib" ,zlib)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "https://github.com/r-lib/systemfonts")
(synopsis "System native font finding")
(description
"This package provides system native access to the font catalogue. As
font handling varies between systems it is difficult to correctly locate
installed fonts across different operating systems. The 'systemfonts' package
provides bindings to the native libraries for finding font files that can then
be used further by e.g. graphic devices.")
(license license:expat)))
(define-public r-graphlayouts
(package
(name "r-graphlayouts")
(version "0.5.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "graphlayouts" version))
(sha256
(base32
"03dizbhhdhnzbj2i5zvqgs617kwcv4h2pha4f16adic0fph1rxl3"))))
(properties `((upstream-name . "graphlayouts")))
(build-system r-build-system)
(propagated-inputs
`(("r-igraph" ,r-igraph)
("r-rcpp" ,r-rcpp)
("r-rcpparmadillo" ,r-rcpparmadillo)))
(home-page "https://github.com/schochastics/graphlayouts")
(synopsis "Additional layout algorithms for network visualizations")
(description
"This package provides several layout algorithms to visualize networks
which are not part of the igraph library. Most are based on the concept of
stress majorization by Gansner et al. (2004)
<doi:10.1007/978-3-540-31843-9_25>. Some more specific algorithms allow to
emphasize hidden group structures in networks or focus on specific nodes.")
(license license:expat)))
(define-public r-tidygraph
(package
(name "r-tidygraph")
(version "1.1.2")
(source
(origin
(method url-fetch)
(uri (cran-uri "tidygraph" version))
(sha256
(base32
"1zpsarm74afbc7p5dlyb0whc09670qdcddw1ckb25cfc9hfh0hjn"))))
(properties `((upstream-name . "tidygraph")))
(build-system r-build-system)
(propagated-inputs
`(("r-dplyr" ,r-dplyr)
("r-igraph" ,r-igraph)
("r-magrittr" ,r-magrittr)
("r-pillar" ,r-pillar)
("r-r6" ,r-r6)
("r-rcpp" ,r-rcpp)
("r-rlang" ,r-rlang)
("r-tibble" ,r-tibble)
("r-tidyr" ,r-tidyr)))
(home-page "https://github.com/thomasp85/tidygraph")
(synopsis "Tidy API for graph manipulation")
(description
"This package provides a graph implementation that can be thought of as
two tidy data frames describing node and edge data respectively. It provides
an approach to manipulate these two virtual data frames using the API defined
in the @code{dplyr} package, and it also provides tidy interfaces to a lot of
common graph algorithms.")
(license license:expat)))
(define-public r-soupx
(let ((commit "a3354be76fb52fd795be6ddf163cf056c05c6cb8")
(revision "1"))
(package
(name "r-soupx")
(version (git-version "0.3.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/constantAmateur/SoupX")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1zmlyzrl0fz6l79gn2wswid670p88mm3y292is89sa5p3h7frr99"))))
(properties `((upstream-name . "SoupX")))
(build-system r-build-system)
(propagated-inputs
`(("r-ggplot2" ,r-ggplot2)
("r-matrix" ,r-matrix)
("r-seurat" ,r-seurat)))
(home-page "https://github.com/constantAmateur/SoupX")
(synopsis "Single cell mRNA Soup eXterminator")
(description
"This package provides a package for quantifying, profiling and
removing cell free mRNA contamination (the \"soup\") from droplet based single
cell RNA-seq experiments.")
(license license:gpl2))))
(define-public r-assertr
(package
(name "r-assertr")
(version "2.6")
(source
(origin
(method url-fetch)
(uri (cran-uri "assertr" version))
(sha256
(base32
"0g4ii6vhp0155a29ljhs64a09x0nzy5ybvwwchhk4mkcgsvnvfkj"))))
(build-system r-build-system)
(propagated-inputs
`(("r-dplyr" ,r-dplyr)
("r-mass" ,r-mass)
("r-rlang" ,r-rlang)))
(native-inputs
`(("r-knitr" ,r-knitr))) ; needed for vignette
(home-page "https://github.com/ropensci/assertr")
(synopsis "Assertive programming for R analysis pipelines")
(description
"This package provides functionality to assert conditions that have to be
met so that errors in data used in analysis pipelines can fail quickly. It is
similar to @code{stopifnot()} but more powerful, friendly, and easier for use
in pipelines.")
(license license:expat)))
(define-public r-parameters
(package
(name "r-parameters")
(version "0.1.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "parameters" version))
(sha256
(base32
"12v301va1l3xydicbf0k04anxlmyjclbbjfg0riprryhkxwwk8g5"))))
(properties `((upstream-name . "parameters")))
(build-system r-build-system)
(propagated-inputs
`(("r-bayestestr" ,r-bayestestr)
("r-insight" ,r-insight)))
(home-page "https://cran.r-project.org/web/packages/parameters")
(synopsis "Processing of model parameters")
(description
"This package provides utilities for processing the parameters of various
statistical models. Beyond computing p values, CIs, and other indices for a
wide variety of models, this package implements features like standardization
or bootstrapping of parameters and models, feature reduction (feature
extraction and variable selection) as well as conversion between indices of
effect size.")
(license license:gpl3)))
(define-public r-rgdal
(package
(name "r-rgdal")
(version "1.4-4")
(source
(origin
(method url-fetch)
(uri (cran-uri "rgdal" version))
(sha256
(base32
"1my56hdc9x40ynxx1qwqwqxjvjxybmm00w4xg5gi8zgj19pffci5"))))
(properties `((upstream-name . "rgdal")))
(build-system r-build-system)
(inputs
`(("gdal" ,gdal)
("proj.4" ,proj.4)
("zlib" ,zlib)))
(propagated-inputs
`(("r-sp" ,r-sp)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "http://rgdal.r-forge.r-project.org")
(synopsis "Bindings for the Geospatial Data Abstraction Library")
(description
"This package provides bindings to the Geospatial Data Abstraction
Library (GDAL) and access to projection/transformation operations from the
PROJ.4 library.")
(license license:gpl2+)))
(define-public r-insol
(package
(name "r-insol")
(version "1.2")
(source
(origin
(method url-fetch)
(uri (cran-uri "insol" version))
(sha256
(base32
"14ikz05375pjn9hby7kwkhcnykjilbnkdy5i8lsl7c5qdbhmqcm5"))))
(properties `((upstream-name . "insol")))
(build-system r-build-system)
(propagated-inputs
`(("r-raster" ,r-raster)
("r-rgdal" ,r-rgdal)))
(native-inputs
`(("gfortran" ,gfortran)))
(home-page "https://meteoexploration.com/R/insol/index.html")
(synopsis "Tools for calculating solar radiation")
(description
"This package provides functions to compute insolation on tilted
surfaces, computes atmospheric transmittance and related parameters such as:
Earth radius vector, declination, sunset and sunrise, daylength, equation of
time, vector in the direction of the sun, vector normal to surface, and some
atmospheric physics.")
(license license:gpl2+)))
(define-public r-lifecycle
(package
(name "r-lifecycle")
(version "0.1.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "lifecycle" version))
(sha256
(base32
"11rk7hkw63rfrf4aqmb4xrb88kg95xh8hajpjvjfwjym2v02h74n"))))
(properties `((upstream-name . "lifecycle")))
(build-system r-build-system)
(propagated-inputs
`(("r-glue" ,r-glue)
("r-rlang" ,r-rlang)))
(home-page "https://github.com/r-lib/lifecycle")
(synopsis "Manage the life cycle of your package functions")
(description
"Manage the life cycle of your exported functions with shared
conventions, documentation badges, and non-invasive deprecation warnings. The
lifecycle package defines four development stages (experimental, maturing,
stable, and questioning) and three deprecation stages (soft-deprecated,
deprecated, and defunct). It makes it easy to insert badges corresponding to
these stages in your documentation. Usage of deprecated functions are
signalled with increasing levels of non-invasive verbosity.")
(license license:gpl3)))

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

@ -2019,7 +2019,7 @@ (define-public rust-peeking-take-while
(define-public rust-percent-encoding
(package
(name "rust-percent-encoding")
(version "2.0.0")
(version "2.1.0")
(source
(origin
(method url-fetch)
@ -2027,7 +2027,7 @@ (define-public rust-percent-encoding
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0m6rkp3iy11la04p6z3492rns6n693pvmx585dvfmzzlzak2hkxs"))))
"0bp3zrsk3kr47fbpipyczidbbx4g54lzxdm77ni1i3qws10mdzfl"))))
(build-system cargo-build-system)
(home-page "https://github.com/servo/rust-url/")
(synopsis "Percent encoding and decoding")

4
gnu/packages/cups.scm
View file

@ -636,14 +636,14 @@ (define-public foomatic-filters
(define-public foo2zjs
(package
(name "foo2zjs")
(version "20190517")
(version "20190909")
(source (origin
(method url-fetch)
;; XXX: This is an unversioned URL!
(uri "http://foo2zjs.rkkda.com/foo2zjs.tar.gz")
(sha256
(base32
"13gzsd26nq4brx1xzpwmg1qnr4nk7ykgi94qr1hbjqfi561prki4"))))
"1nn84c045mbv6yzpjfggc6152bvgrmcxiyvgz9v2w3sws7ihshrm"))))
(build-system gnu-build-system)
(arguments
'(#:phases (modify-phases %standard-phases

6
gnu/packages/dictionaries.scm
View file

@ -218,7 +218,7 @@ (define-public ding
(define-public grammalecte
(package
(name "grammalecte")
(version "1.3.0")
(version "1.4.0")
(source
(origin
(method url-fetch/zipbomb)
@ -226,10 +226,10 @@ (define-public grammalecte
"Grammalecte-fr-v" version ".zip"))
(sha256
(base32
"1knysfdd1rx4vc5cmmnry4jsza0cdjy26fv505m854yfmq6zrckd"))))
"0k30b9kcczsadjjgwja03rkm11cpcc1xi6w8l6k0qfbjfpkhsh66"))))
(build-system python-build-system)
(home-page "https://grammalecte.net")
(synopsis "French spelling and grammar checker")
(synopsis "French spelling and grammar checker")
(description "Grammalecte is a grammar checker dedicated to the French
language, derived from Lightproof.

102
gnu/packages/education.scm
View file

@ -2,7 +2,7 @@
;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;;
@ -27,6 +27,7 @@ (define-module (gnu packages education)
#:use-module (gnu packages base)
#:use-module (gnu packages bash)
#:use-module (gnu packages compression)
#:use-module (gnu packages curl)
#:use-module (gnu packages databases)
#:use-module (gnu packages fonts)
#:use-module (gnu packages freedesktop)
@ -36,6 +37,7 @@ (define-module (gnu packages education)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gtk)
#:use-module (gnu packages javascript)
#:use-module (gnu packages kde)
#:use-module (gnu packages kde-frameworks) ; extra-cmake-modules
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
@ -521,3 +523,101 @@ (define-public fet
difficult timetables, it may take a longer time, a matter of hours.")
(license license:agpl3+)))
(define-public klavaro
(package
(name "klavaro")
(version "3.09")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/klavaro/klavaro-"
version ".tar.bz2"))
(sha256
(base32
"12gml7h45b1w9s318h0d5wxw92h7pgajn2kh57j0ak9saq0yb0wr"))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)
("pkg-config" ,pkg-config)))
(inputs
`(("cairo" ,cairo)
("curl" ,curl)
("gtk+" ,gtk+)
("pango" ,pango)))
(home-page "https://klavaro.sourceforge.io/en/index.html")
(synopsis "Touch typing tutor")
(description
"Klavaro is a simple tutor to teach correct typing, almost independently of
language and very flexible regarding to new or unknown keyboard layouts.")
(license license:gpl3+)))
(define-public ktouch
(package
(name "ktouch")
(version "19.08.1")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/applications/"
version "/src/ktouch-" version ".tar.xz"))
(sha256
(base32
"19rdk94pls75hdvx11hnfk3qpm6l28p9q45q5f04sknxagrfaznr"))))
(build-system cmake-build-system)
(arguments
`(#:modules ((guix build cmake-build-system)
(guix build qt-utils)
(guix build utils))
#:imported-modules (,@%cmake-build-system-modules
(guix build qt-utils))
#:phases
(modify-phases %standard-phases
(add-after 'configure 'patch-makefiles
(lambda* (#:key inputs #:allow-other-keys)
(let ((qtdec (assoc-ref inputs "qtdeclarative")))
(substitute* '("src/CMakeFiles/ktouch_autogen.dir/build.make"
"src/CMakeFiles/ktouch.dir/build.make")
(("/gnu/store/.*qmlcachegen")
(string-append qtdec "/bin/qmlcachegen"))))
#t))
(add-after 'install 'wrap-executable
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(wrap-qt-program out "ktouch"))
#t)))))
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
("kdoctools" ,kdoctools)
("pkg-config" ,pkg-config)))
(inputs
`(("kcmutils" ,kcmutils)
("kcompletion" ,kcompletion)
("kconfig" ,kconfig)
("kconfigwidgets" ,kconfigwidgets)
("kcoreaddons" ,kcoreaddons)
("kdeclarative" ,kdeclarative)
("ki18n" ,ki18n)
("kiconthemes" ,kiconthemes)
("kitemviews" ,kitemviews)
("kqtquickcharts" ,kqtquickcharts)
("ktextwidgets" ,ktextwidgets)
("kwidgetsaddons" ,kwidgetsaddons)
("kwindowsystem" ,kwindowsystem)
("kxmlgui" ,kxmlgui)
("libxcb" ,libxcb)
("libxkbfile" ,libxkbfile)
("qtbase" ,qtbase)
("qtdeclarative" ,qtdeclarative)
("qtgraphicaleffects" ,qtgraphicaleffects)
("qtquickcontrols2" ,qtquickcontrols2)
("qtx11extras" ,qtx11extras)
("qtxmlpatterns" ,qtxmlpatterns)))
(home-page "https://edu.kde.org/ktouch/")
(synopsis "Touch typing tutor")
(description
"KTouch is an aid for learning how to type with speed and accuracy. It
provides a sample text to type and indicates which fingers should be used for
each key. A collection of lessons are included for a wide range of different
languages and keyboard layouts, and typing statistics are used to dynamically
adjust the level of difficulty.")
(license license:gpl2)))

170
gnu/packages/emacs-xyz.scm
View file

@ -49,7 +49,7 @@
;;; Copyright © 2019 LaFreniere, Joseph <joseph@lafreniere.xyz>
;;; Copyright © 2019 Amar Singh <nly@disroot.org>
;;; Copyright © 2019 Baptiste Strazzulla <bstrazzull@hotmail.fr>
;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autitici.org>
;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2019 Jens Mølgaard <jens@zete.tk>
;;; Copyright © 2019 Amin Bandali <bandali@gnu.org>
;;; Copyright © 2019 Jelle Licht <jlicht@fsfe.org>
@ -2932,7 +2932,7 @@ (define-public emacs-rspec
(define-public emacs-smart-mode-line
(package
(name "emacs-smart-mode-line")
(version "2.12.0")
(version "2.13")
(source
(origin
(method git-fetch)
@ -2941,7 +2941,7 @@ (define-public emacs-smart-mode-line
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1gs4ay9hdg8gmia4ir74qawk80pqwv99hp4yhy108kpfry5mrq6z"))))
(base32 "164b697xm1rwcggv37dymhf3npbyh2bs59z8b6m5x35lb4c3lf8b"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-rich-minority" ,emacs-rich-minority)))
@ -3211,14 +3211,14 @@ (define-public emacs-ob-ipython
(define-public emacs-debbugs
(package
(name "emacs-debbugs")
(version "0.18")
(version "0.19")
(source (origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/debbugs-"
version ".tar"))
(sha256
(base32
"00kich80zdg7v3v613f9prqddkpwpm1nf9sj10f0n6wh15rzwv07"))))
"0cpby8f088cqb5mpd756a2mb706x763k15cg2xdmmsxl415k3yw4"))))
(build-system emacs-build-system)
(arguments '(#:include '("\\.el$" "\\.wsdl$" "\\.info$")))
(propagated-inputs
@ -6008,7 +6008,7 @@ (define-public emacs-highlight-indentation
(define-public emacs-elpy
(package
(name "emacs-elpy")
(version "1.28.0")
(version "1.31.0")
(source (origin
(method git-fetch)
(uri (git-reference
@ -6017,7 +6017,7 @@ (define-public emacs-elpy
(file-name (git-file-name name version))
(sha256
(base32
"073bwxwjzcbmvpcz9q2xjwzx9x7hkvjni6fwvikh6yawzjp56jis"))))
"0bvmgqs3c80bhs9v5ymgadv7vk4iamha10y7rl09pixmjm4mzagk"))))
(build-system emacs-build-system)
(arguments
`(#:include (cons* "^elpy/[^/]+\\.py$" "^snippets\\/" %default-include)
@ -13189,16 +13189,17 @@ (define-public emacs-helm-firefox
(define-public emacs-interactive-align
(package
(name "emacs-interactive-align")
(version "0.1.0")
(version "0.4.2")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/mkcms/interactive-align/"
"archive/" "v" version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(method git-fetch)
(uri (git-reference
(url "https://github.com/mkcms/interactive-align.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0sibpgb4lp6yy3pziak8f3hz4b28yj0dqy2nzh51z3d0b63h528m"))))
"0bh03w91i622hbar5dcq631ndxx1y8kd3h655pgw1g0lqkv1mlnc"))))
(build-system emacs-build-system)
(home-page "https://github.com/mkcms/interactive-align/")
(synopsis "Interactive align-regexp command in Emacs")
@ -13668,7 +13669,7 @@ (define-public emacs-noflet
(define-public emacs-dumb-jump
(package
(name "emacs-dumb-jump")
(version "0.5.2")
(version "0.5.3")
(source
(origin
(method git-fetch)
@ -13677,7 +13678,7 @@ (define-public emacs-dumb-jump
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "00ph85vp8sa3k99qrdxfz4l8zx121q9xf47vvspzg26bk9l4nwin"))))
(base32 "1njf60264snhxrd36m4z687lqfkis0p9mmrr7cf1c8l0lfdvawxi"))))
(build-system emacs-build-system)
(arguments
`(#:tests? #f ; FIXME: Tests freeze when run.
@ -14260,30 +14261,29 @@ (define-public emacs-google-translate
(license license:gpl3+)))
(define-public emacs-helm-company
(let ((commit "d3fc093a0e833b4dee6561c00d6df3d62aa50f3f"))
(package
(name "emacs-helm-company")
(version (git-version "0.2.3" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Sodel-the-Vociferous/helm-company")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1ciirsanhajdqm5iwl8k9ywf4jha1wdv4sc4d9kslyrfr9zn4q6k"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-helm" ,emacs-helm)
("emacs-company" ,emacs-company)))
(home-page "https://github.com/Sodel-the-Vociferous/helm-company")
(synopsis "Helm interface for company-mode")
(description
"This is a Helm interface to company-mode, a text completion
(package
(name "emacs-helm-company")
(version "0.2.5")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Sodel-the-Vociferous/helm-company")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1ci37w6ahnqrfpb284gjvxmimlf61sdxb9k192yy9q983cksv2hx"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-helm" ,emacs-helm)
("emacs-company" ,emacs-company)))
(home-page "https://github.com/Sodel-the-Vociferous/helm-company")
(synopsis "Helm interface for company-mode")
(description
"This is a Helm interface to company-mode, a text completion
framework.")
(license license:gpl3+))))
(license license:gpl3+)))
(define-public emacs-helm-descbinds
(let ((commit "033be73f21778633813264ce1634a6e1ad873d8e"))
@ -17804,17 +17804,17 @@ (define-public emacs-elpher
(define-public emacs-zerodark-theme
(package
(name "emacs-zerodark-theme")
(version "4.5")
(version "4.6")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.petton.fr/nico/zerodark-theme.git")
(url "https://github.com/NicolasPetton/zerodark-theme")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0nnlxzsmhsbszqigcyxak9i1a0digrd13gv6v18ck4h760mihh1m"))))
"0pfyd1iqs7l2ngwgvj9n0r9k1px7yl16h8n502xdyf0pprxcs4p6"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-flycheck" ,emacs-flycheck)
@ -18171,3 +18171,91 @@ (define-public emacs-ssh-config-mode
"This packages fontifies the ssh config keywords and creates
keybindings for skipping from host section to host section.")
(license license:gpl3+))))
(define-public emacs-tao-theme
(let ((commit "c5107fbe7e752f4e58c2d2147ff18a1ebb12937c")
(revision "0"))
(package
(name "emacs-tao-theme")
(version (git-version "0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/11111000000/tao-theme-emacs.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"07vvlglmkj87hpxz79s3bl2cjn71vain57fdxs7j9vlr5jkchxwn"))))
(build-system emacs-build-system)
(home-page "https://github.com/11111000000/tao-theme-emacs")
(synopsis "Parameterized uncolored color themes for Emacs")
(description
"This package provides two parameterized uncolored color themes for
Emacs: @code{tao-yin} and @code{tao-yang}. The default
@code{tao-theme-scale-fn} is @code{tao-theme-golden-scale}.
You can customize: @code{tao-theme-scale-fn}, that returns 16 2-digit numbers;
@code{tao-theme-scale-filter-fn}, for edge filter; and
@code{tao-theme-use-height}.")
(license license:gpl3+))))
(define-public emacs-doom-themes
(package
(name "emacs-doom-themes")
(version "2.1.6")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/hlissner/emacs-doom-themes.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "042pzcdhxi2z07jcscgjbaki9nrrm0cbgbbrnymd1r4q8ckkn8l9"))))
(build-system emacs-build-system)
(native-inputs
`(("emacs-ert-runner" ,emacs-ert-runner)))
(arguments
`(#:tests? #t
#:test-command '("ert-runner")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'move-themes
(lambda _
;; Move the source files to the top level, which is in the
;; EMACSLOADPATH.
(for-each (lambda (f)
(rename-file f (basename f)))
(find-files "./themes" ".*\\.el$"))
#t)))))
(synopsis "Wide collection of color themes for Emacs")
(description "Emacs-doom-themes contains numerous popular color themes for
Emacs that integrate with major modes like Org-mode.")
(home-page "https://github.com/hlissner/emacs-doom-themes")
(license license:expat)))
(define-public emacs-elixir-mode
(package
(name "emacs-elixir-mode")
(version "2.3.1")
(source
(origin
(method url-fetch)
(uri (string-append
"https://stable.melpa.org/packages/elixir-mode-"
version
".tar"))
(sha256
(base32
"091cizxg1aw8bkj58y048mj020ssapjflav633z9bl6gmi10dy4v"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-pkg-info" ,emacs-pkg-info)))
(home-page
"https://github.com/elixir-editors/emacs-elixir")
(synopsis "Major mode for editing Elixir files")
(description
"Elixir-Mode Provides font-locking, indentation and navigation support
for the Elixir programming language.")
(license license:gpl3+)))

8
gnu/packages/emulators.scm
View file

@ -399,7 +399,7 @@ (define-public higan
(define-public mgba
(package
(name "mgba")
(version "0.7.2")
(version "0.7.3")
(source (origin
(method git-fetch)
(uri (git-reference
@ -408,7 +408,7 @@ (define-public mgba
(file-name (git-file-name name version))
(sha256
(base32
"0g0xa1mzvan0sl1p5c784j2g5mcw9kd2b7wiahy06gy0c1nmbcnp"))
"1wrmwh50rv8bd328r8cisrihq6h90kx2bfb0vmjfbsd3l1jvgrgm"))
(modules '((guix build utils)))
(snippet
;; Make sure we don't use the bundled software.
@ -1048,7 +1048,7 @@ (define-public nestopia-ue
(define-public retroarch
(package
(name "retroarch")
(version "1.7.8")
(version "1.7.8.4")
(source
(origin
(method git-fetch)
@ -1057,7 +1057,7 @@ (define-public retroarch
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0jwy5winrm87s6xa645fwa47x242r25m6i3rwf10x59448bd19r6"))))
(base32 "1i3i23xwvmck8k2fpalr49np7xjzfg507243mybqrljawlnbxvph"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no tests

69
gnu/packages/engineering.scm
View file

@ -65,6 +65,7 @@ (define-module (gnu packages engineering)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gperf)
#:use-module (gnu packages graphics)
#:use-module (gnu packages groff)
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
@ -89,6 +90,7 @@ (define-module (gnu packages engineering)
#:use-module (gnu packages tex)
#:use-module (gnu packages version-control)
#:use-module (gnu packages wxwidgets)
#:use-module (gnu packages xml)
#:use-module (gnu packages xorg))
(define-public librecad
@ -2145,3 +2147,70 @@ (define-public lib3mf
specification can be downloaded at @url{http://3mf.io/specification/}.")
(home-page "https://3mf.io/")
(license license:bsd-2)))
(define-public openscad
(package
(name "openscad")
(version "2019.05")
(source
(origin
(method url-fetch)
(uri (string-append "https://files.openscad.org/openscad-" version
".src.tar.gz"))
(sha256
(base32
"0nbgk5q5pgnw53la0kccdcpz2f4xf6d6076rkn0q08z57hkc85ha"))))
(build-system cmake-build-system)
(inputs
`(("boost" ,boost)
("cgal" ,cgal)
("double-conversion" ,double-conversion)
("eigen" ,eigen)
("fontconfig" ,fontconfig)
("glew" ,glew)
("gmp" ,gmp)
("harfbuzz" ,harfbuzz)
("lib3mf" ,lib3mf)
("libxml2" ,libxml2)
("libzip" ,libzip)
("mpfr" ,mpfr)
("opencsg" ,opencsg)
("qscintilla" ,qscintilla)
("qtbase" ,qtbase)
("qtmultimedia" ,qtmultimedia)))
(native-inputs
`(("bison" ,bison)
("flex" ,flex)
("gettext" ,gettext-minimal)
("pkg-config" ,pkg-config)
("which" ,which)
;; the following are only needed for tests
("imagemagick" ,imagemagick)
("ps" ,procps)
("python" ,python)
("xvfb" ,xorg-server)))
(arguments
`(#:phases
(modify-phases %standard-phases
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys)
(invoke "qmake"
(string-append "PREFIX=" (assoc-ref outputs "out")))
#t))
(replace 'check
(lambda _
(with-directory-excursion "tests"
(invoke "cmake" ".")
(invoke "make")
(invoke "ctest"))
;; strip python test files since lib dir ends up in out/share
(for-each delete-file
(find-files "libraries/MCAD" ".*\\.py"))
#t)))))
(synopsis "Script-based 3D modeling application")
(description
"OpenSCAD is a 3D Computer-aided Design (CAD) application. Unlike an
interactive modeler, OpenSCAD generates 3D models from a script, giving you
full programmatic control over your models.")
(home-page "https://www.openscad.org/")
(license license:gpl2+)))

31
gnu/packages/finance.scm
View file

@ -476,16 +476,20 @@ (define-public monero
("git" ,git)
("graphviz" ,graphviz)
("pkg-config" ,pkg-config)
("protobuf" ,protobuf)
("python" ,python)
("qttools" ,qttools)))
(inputs
`(("boost" ,boost)
("cppzmq" ,cppzmq)
("expat" ,expat)
("hidapi" ,hidapi)
("libunwind" ,libunwind)
("libsodium" ,libsodium)
("libunwind" ,libunwind)
("libusb" ,libusb)
("miniupnpc" ,miniupnpc)
("openssl" ,openssl)
("protobuf" ,protobuf)
("rapidjson" ,rapidjson)
("readline" ,readline)
("unbound" ,unbound)
@ -493,9 +497,12 @@ (define-public monero
("zeromq" ,zeromq)))
(arguments
`(#:out-of-source? #t
#:configure-flags '("-DARCH=default"
"-DBUILD_TESTS=ON"
"-DBUILD_GUI_DEPS=ON")
#:configure-flags
(list "-DARCH=default"
"-DBUILD_TESTS=ON"
"-DBUILD_GUI_DEPS=ON"
(string-append "-DReadline_ROOT_DIR="
(assoc-ref %build-inputs "readline")))
#:phases
(modify-phases %standard-phases
;; tests/core_tests need a valid HOME
@ -534,7 +541,13 @@ (define-public monero
":")))
(invoke "tests/unit_tests/unit_tests"
(string-append "--gtest_filter=-"
excluded-unit-tests))))))))
excluded-unit-tests)))))
(add-after 'install 'delete-dead-links
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(delete-file (string-append out "/lib/libprotobuf.so"))
(delete-file (string-append out "/lib/libusb-1.0.so"))
#t))))))
(home-page "https://getmonero.org/")
(synopsis "Command-line interface to the Monero currency")
(description
@ -545,7 +558,7 @@ (define-public monero
(define-public monero-gui
(package
(name "monero-gui")
(version "0.14.1.0")
(version "0.14.1.2")
(source
(origin
(method git-fetch)
@ -555,7 +568,7 @@ (define-public monero-gui
(file-name (git-file-name name version))
(sha256
(base32
"0ilx47771faygf97wilm64xnqxgxa3b43q0g9v014npk0qj8pc31"))))
"1rm043r6y2mzy8pclnzbjjfxgps8pkfa2b92p66k8y8rdmgq6m1k"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
@ -563,9 +576,11 @@ (define-public monero-gui
(inputs
`(("boost" ,boost)
("hidapi" ,hidapi)
("libunwind" ,libunwind)
("libsodium" ,libsodium)
("libunwind" ,libunwind)
("libusb" ,libusb)
("openssl" ,openssl)
("protobuf" ,protobuf)
("qtbase" ,qtbase)
("qtdeclarative" ,qtdeclarative)
("qtgraphicaleffects" ,qtgraphicaleffects)

8
gnu/packages/freedesktop.scm
View file

@ -925,15 +925,15 @@ (define-public accountsservice
(define-public libmbim
(package
(name "libmbim")
(version "1.18.2")
(version "1.20.0")
(source (origin
(method url-fetch)
(uri (string-append
"https://www.freedesktop.org/software/" name "/"
name "-" version ".tar.xz"))
"https://www.freedesktop.org/software/libmbim/"
"libmbim-" version ".tar.xz"))
(sha256
(base32
"0s4jsfsydp2vykv7lnimalp9i680aas1qcx7zdpjiic64b5g48vp"))))
"0rm8j4zh9gnb3yi324cnxy91gdimc1vg5gv1kxc2m5lymb3wdxrc"))))
(build-system gnu-build-system)
(native-inputs
`(("glib:bin" ,glib "bin") ; for glib-mkenums

10
gnu/packages/game-development.scm
View file

@ -314,6 +314,16 @@ (define-public nml
(base32
"1pmvvm3sgnpngfa7884mqhq3fwdjh9sr0ca07ypnidcg0y341w53"))))
(build-system python-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-before 'build 'fix-pillow
(lambda _
;; pillow's version is not in PIL.Image.VERSION anymore
(substitute* "nml/version_info.py"
(("from PIL import Image") "import PIL")
(("Image.VERSION") "PIL.__version__"))
#t)))))
(propagated-inputs
`(("python-pillow" ,python-pillow)
("python-ply" ,python-ply)))

19
gnu/packages/games.scm
View file

@ -2213,7 +2213,24 @@ (define-public gnujump
(modify-phases %standard-phases
(add-before
'configure 'link-libm
(lambda _ (setenv "LIBS" "-lm"))))))
(lambda _ (setenv "LIBS" "-lm")))
(add-after 'install 'create-desktop-entry
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(apps (string-append out "/share/applications")))
(mkdir-p apps)
(with-output-to-file
(string-append apps "/gnujump.desktop")
(lambda _
(format #t
"[Desktop Entry]~@
Name=GNUjump~@
Comment=Jump up the tower to survive~@
Exec=~a/bin/gnujump~@
Terminal=false~@
Type=Application~@
Categories=Game;ArcadeGame~%"
out)))))))))
(inputs
`(("glu" ,glu)
("mesa" ,mesa)

72
gnu/packages/gnome.scm
View file

@ -39,6 +39,8 @@
;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2019 Jelle Licht <jlicht@fsfe.org>
;;; Copyright © 2019 Jonathan Frederickson <jonathan@terracrypt.net>
;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2019 Martin Becze <mjbecze@riseup.net>
;;;
;;; This file is part of GNU Guix.
;;;
@ -65,6 +67,7 @@ (define-module (gnu packages gnome)
#:use-module (gnu packages base)
#:use-module (gnu packages bash)
#:use-module (gnu packages bison)
#:use-module (gnu packages boost)
#:use-module (gnu packages build-tools)
#:use-module (gnu packages calendar)
#:use-module (gnu packages cdrom)
@ -2626,7 +2629,7 @@ (define-public glib-networking
(method url-fetch)
(uri (string-append "mirror://gnome/sources/glib-networking/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
"glib-networking-" version ".tar.xz"))
(sha256
(base32
"1mfw44qpmwvz6yzj8c6spx6z357wrmkk15byrkc5byagd82860fm"))))
@ -2689,7 +2692,7 @@ (define-public libsoup
(method url-fetch)
(uri (string-append "mirror://gnome/sources/libsoup/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
"libsoup-" version ".tar.xz"))
(sha256
(base32
"0amfw1yvy1kjrg41rfh2vvrw5gkwnyckqbw1fab50hm6xc1acbmx"))))
@ -2795,16 +2798,16 @@ (define-public libsoup
(define-public libsecret
(package
(name "libsecret")
(version "0.18.8")
(version "0.19.1")
(source (origin
(method url-fetch)
(uri (string-append
"mirror://gnome/sources/libsecret/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
"libsecret-" version ".tar.xz"))
(sha256
(base32
"058x64689k55wxfkdp4svhnwvv8jmqm7z5mrynybl38f4sfqiyiv"))))
"0fhflcsr70b1pps2pcvqcbdhip2ny5am9nbm634f4sj5g40y30w5"))))
(build-system gnu-build-system)
(outputs '("out" "doc"))
(arguments
@ -3353,7 +3356,7 @@ (define-public totem-pl-parser
(define-public aisleriot
(package
(name "aisleriot")
(version "3.22.8")
(version "3.22.9")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/aisleriot/"
@ -3361,7 +3364,7 @@ (define-public aisleriot
"aisleriot-" version ".tar.xz"))
(sha256
(base32
"15pm39679ymxki07sb5nvhycz4z53zwbvascyp5wm4864bn98815"))))
"0yzdh9cw5cjjgvfh75bihl968czlgfmpmn1z0fdk88sgvpjgzwji"))))
(build-system glib-or-gtk-build-system)
(arguments
'(#:configure-flags
@ -4204,9 +4207,9 @@ (define-public gvfs
(version "1.40.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
(uri (string-append "mirror://gnome/sources/gvfs/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
"gvfs-" version ".tar.xz"))
(sha256
(base32
"1cfnzamr4mvgpf6yhm28lh9cafy9z6842s8jpbqnfizfxybg8ylj"))))
@ -5902,15 +5905,15 @@ (define-public gdm
(define-public libgtop
(package
(name "libgtop")
(version "2.38.0")
(version "2.40.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
(uri (string-append "mirror://gnome/sources/libgtop/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
"libgtop-" version ".tar.xz"))
(sha256
(base32
"04mnxgzyb26wqk6qij4iw8cxwl82r8pcsna5dg8vz2j3pdi0wv2g"))))
"1m6jbqk8maa52gxrf223442fr5bvvxgb7ham6v039i3r1i62gwvq"))))
(build-system gnu-build-system)
(native-inputs
`(("gobject-introspection" ,gobject-introspection)
@ -6295,9 +6298,9 @@ (define-public tracker
(version "2.0.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
(uri (string-append "mirror://gnome/sources/tracker/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
"tracker-" version ".tar.xz"))
(sha256
(base32
"1mfc5lv820kr7ssi7hldn25gmshh65k19kh478qjsnb64sshsbyf"))))
@ -7224,9 +7227,9 @@ (define-public gfbgraph
(source (origin
(method url-fetch)
(uri (string-append
"mirror://gnome/sources/" name "/"
"mirror://gnome/sources/gfbgraph/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
"gfbgraph-" version ".tar.xz"))
(sha256
(base32
"1dp0v8ia35fxs9yhnqpxj3ir5lh018jlbiwifjfn8ayy7h47j4fs"))))
@ -7994,7 +7997,7 @@ (define-public soundconverter
(define-public workrave
(package
(name "workrave")
(version "1.10.23")
(version "1.10.34")
(source
(origin
(method git-fetch)
@ -8005,20 +8008,20 @@ (define-public workrave
version)))))
(file-name (git-file-name name version))
(sha256
(base32 "1qhlwfhwk5agv4904d6bsf83k9k89q7bms6agg967vsca4905vcw"))))
(base32 "0czwhr7nw523753ajcjjfwrf91mq8pmzr19gp0srqsvb1dsn1zcf"))))
(build-system glib-or-gtk-build-system)
(propagated-inputs `(("glib" ,glib)
("gtk+" ,gtk+)
("gdk-pixbuf" ,gdk-pixbuf)
("gtkmm" ,gtkmm)
("glibmm" ,glibmm)
("libx11" ,libx11)
("libxtst" ,libxtst)
("dconf" ,dconf)
("libice" ,libice)))
(inputs `(("libsm" ,libsm)
("python-cheetah" ,python2-cheetah)))
(native-inputs `(("glib" ,glib "bin")
(inputs `(("glib" ,glib)
("gtk+" ,gtk+)
("gdk-pixbuf" ,gdk-pixbuf)
("gtkmm" ,gtkmm)
("glibmm" ,glibmm)
("libx11" ,libx11)
("libxtst" ,libxtst)
("dconf" ,dconf)
("libice" ,libice)
("libsm" ,libsm)
("libxscrnsaver" ,libxscrnsaver)))
(native-inputs `(("boost" ,boost)
("pkg-config" ,pkg-config)
("gettext" ,gnu-gettext)
("autoconf" ,autoconf)
@ -8026,9 +8029,9 @@ (define-public workrave
("automake" ,automake)
("libtool" ,libtool)
("intltool" ,intltool)
("libxscrnsaver" ,libxscrnsaver)
("gobject-introspection" ,gobject-introspection)
("python2" ,python-2)))
("python3" ,python-3)
("python-jinja2" ,python-jinja2)))
(synopsis "Tool to help prevent repetitive strain injury (RSI)")
(description
"Workrave is a program that assists in the recovery and prevention of
@ -8147,7 +8150,7 @@ (define-public evolution
(add-after 'install 'glib-or-gtk-wrap
(assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))))
(native-inputs
`(("glib" ,glib "bin") ; glib-mkenums
`(("glib" ,glib "bin") ; glib-mkenums
("pkg-config" ,pkg-config)
("intltool" ,intltool)
("itstool" ,itstool)))
@ -8155,6 +8158,7 @@ (define-public evolution
`(("enchant" ,enchant)
("evolution-data-server" ,evolution-data-server) ; must be the same version
("gcr" ,gcr)
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
("gnome-autoar" ,gnome-autoar)
("gnome-desktop" ,gnome-desktop)
("gtkspell3" ,gtkspell3)

32
gnu/packages/gnupg.scm
View file

@ -442,7 +442,7 @@ (define-public qgpgme
(define-public guile-gcrypt
(package
(name "guile-gcrypt")
(version "0.1.0")
(version "0.2.0")
(home-page "https://notabug.org/cwebber/guile-gcrypt")
(source (origin
(method git-fetch)
@ -451,7 +451,7 @@ (define-public guile-gcrypt
(commit (string-append "v" version))))
(sha256
(base32
"1lhgh3105yi0ggrjsjibv4wp1ipz8s17pa820hk2wln3rc04wpvf"))
"1mhc5m4xygkfj7x18f8apiqpfdn9mrql0am5sk13cf5xn8x1r63z"))
(file-name (string-append name "-" version "-checkout"))))
(build-system gnu-build-system)
(native-inputs
@ -915,6 +915,34 @@ (define-public paperkey
them to transform your existing public key into a secret key.")
(license license:gpl2+)))
(define-public pgpdump
(package
(name "pgpdump")
(version "0.33")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.mew.org/~kazu/proj/pgpdump/pgpdump-"
version ".tar.gz"))
(sha256
(base32 "1j001jra2m89n6cys3n0hs574bipjdzfxhzpnd4jfyv95mqwl7n4"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no make check
#:configure-flags (list "--prefix=/")
#:make-flags (list "CC=gcc"
(string-append "DESTDIR=" (assoc-ref %outputs "out")))))
(inputs
`(("zlib" ,zlib)))
(home-page "https://www.mew.org/~kazu/proj/pgpdump/en/")
(synopsis "PGP packet visualizer")
(description "pgpdump displays the sequence of OpenPGP or PGP version 2
packets from a file.
The output of this command is similar to GnuPG's list packets command,
however, pgpdump produces more detailed and easier to understand output.")
(license license:bsd-3)))
(define-public gpa
(package
(name "gpa")

4
gnu/packages/graph.scm
View file

@ -139,14 +139,14 @@ (define-public r-igraph
(define-public r-diffusionmap
(package
(name "r-diffusionmap")
(version "1.1-0.1")
(version "1.2.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "diffusionMap" version))
(sha256
(base32
"11l4kbciawvli5nlsi4qaf8afmgk5xgqiqpdyhvaqri5mx0zhk5j"))))
"1rvk7069brlm1s9kqj4c31mwwr3mw4hmhay95cjjjfmw5xclff2j"))))
(properties `((upstream-name . "diffusionMap")))
(build-system r-build-system)
(propagated-inputs

41
gnu/packages/graphics.scm
View file

@ -13,6 +13,7 @@
;;; Copyright © 2018 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2019 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2019 Carlo Zancanaro <carlo@zancanaro.id.au>
;;; Copyright © 2019 Steve Sprang <scs@stevesprang.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -1019,3 +1020,43 @@ (define-public opensubdiv
performance subdivision surface (subdiv) evaluation on massively parallel CPU
and GPU architectures.")
(license license:asl2.0)))
(define-public opencsg
(let ((dot-to-dash (lambda (c) (if (char=? c #\.) #\- c))))
(package
(name "opencsg")
(version "1.4.2")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/floriankirsch/OpenCSG.git")
(commit (string-append "opencsg-"
(string-map dot-to-dash version)
"-release"))))
(file-name (git-file-name name version))
(sha256
(base32
"00m4vs6jn3scqczscc4591l1d6zg6anqp9v1ldf9ymf70rdyvm7m"))))
(build-system gnu-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "src/Makefile"
(("/usr/local") (assoc-ref outputs "out")))
#t))
(add-before 'build 'skip-example
(lambda _ (chdir "src") #t)))))
(inputs
`(("glew" ,glew)
("freeglut" ,freeglut)))
(synopsis "Library for rendering Constructive Solid Geometry (CSG)")
(description
"OpenCSG is a library for rendering Constructive Solid Geometry (CSG) using
OpenGL. CSG is an approach for modeling complex 3D-shapes using simpler ones.
For example, two shapes can be combined by uniting them, by intersecting them,
or by subtracting one shape from the other.")
(home-page "http://www.opencsg.org/")
(license license:gpl2))))

28
gnu/packages/guile-xyz.scm
View file

@ -5,7 +5,7 @@
;;; Copyright © 2016 Alex Sassmannshausen <alex@pompo.co>
;;; Copyright © 2016, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 Erik Edrosa <erik.edrosa@gmail.com>
;;; Copyright © 2016 Eraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2019 Eraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017 Alex Kost <alezost@gmail.com>
;;; Copyright © 2016, 2017 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@openmailbox.org>
;;; Copyright © 2016 Amirouche <amirouche@hypermove.net>
@ -48,7 +48,6 @@ (define-module (gnu packages guile-xyz)
#:use-module (gnu packages compression)
#:use-module (gnu packages databases)
#:use-module (gnu packages disk)
#:use-module (gnu packages ed)
#:use-module (gnu packages emacs)
#:use-module (gnu packages emacs-xyz)
#:use-module (gnu packages gawk)
@ -1926,30 +1925,17 @@ (define-public guile2.2-commonmark
(define-public mcron
(package
(name "mcron")
(version "1.1.1")
(version "1.1.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/mcron/mcron-"
version ".tar.gz"))
(sha256
(base32
"1i9mcp6r6my61zfiydsm3n6my41mwvl7dfala4q29qx0zn1ynlm4"))))
"069m3ri7nc8lgy3h9ka7gj3v3anqj69x9jw4l3cfq65nqkxsch4g"))))
(build-system gnu-build-system)
(arguments
'(#:phases (modify-phases %standard-phases
(add-before 'check 'set-timezone
(lambda* (#:key inputs #:allow-other-keys)
;; 'tests/job-specifier.scm' expects to be running in
;; UTC-2 or something.
;; FIXME: This issue is being investigated upstream, for
;; now we'll just skip the tests (see below):
;; <https://lists.gnu.org/archive/html/bug-mcron/2018-04/msg00005.html>.
(let ((tzdata (assoc-ref inputs "tzdata")))
(setenv "TZDIR"
(string-append tzdata
"/share/zoneinfo"))
(setenv "TZ" "UTC-2")
#t)))
(add-before 'check 'adjust-tests
(lambda _
(substitute* "tests/job-specifier.scm"
@ -1966,9 +1952,13 @@ (define-public mcron
(("\\(test-equal \"next-year\"" all)
(string-append "(test-skip 4)\n" all)))
#t)))))
(native-inputs `(("pkg-config" ,pkg-config)
(native-inputs `(("autoconf" ,autoconf)
("automake" ,automake)
("help2man" ,help2man)
("pkg-config" ,pkg-config)
("texinfo" ,texinfo)
("tzdata" ,tzdata-for-tests)))
(inputs `(("ed" ,ed) ("which" ,which) ("guile" ,guile-2.2)))
(inputs `(("guile" ,guile-2.2)))
(home-page "https://www.gnu.org/software/mcron/")
(synopsis "Run jobs at scheduled times")
(description

12
gnu/packages/guile.scm
View file

@ -405,8 +405,8 @@ (define-public guile-json
(home-page "https://github.com/aconchillo/guile-json")
(source (origin
(method url-fetch)
(uri (string-append "https://download.savannah.nongnu.org/releases/"
name "/" name "-" version ".tar.gz"))
(uri (string-append "mirror://savannah/guile-json/guile-json-"
version ".tar.gz"))
(sha256
(base32
"15gnb84d7hpazqhskkf3g9z4r6knw54wfj4ch5270kakz1lp70c9"))))
@ -444,14 +444,14 @@ (define-public guile-json-3
(package
(inherit guile-json)
(name "guile-json")
(version "3.1.0")
(version "3.2.0")
(source (origin
(method url-fetch)
(uri (string-append "https://download.savannah.nongnu.org/releases/"
name "/" name "-" version ".tar.gz"))
(uri (string-append "mirror://savannah/guile-json/guile-json-"
version ".tar.gz"))
(sha256
(base32
"1yfqscz74i4vxylabd3s9l0wbdp8bg9qxnv1ixdm3b1l7zdx00z3"))))))
"14m6b6g2maw0mkvfm4x63rqb54vgbpn1gcqs715ijw4bikfzlqfz"))))))
;; There are two guile-gdbm packages, one using the FFI and one with
;; direct C bindings, hence the verbose name.

18
gnu/packages/haskell-apps.scm
View file

@ -245,7 +245,7 @@ (define-public darcs
(define-public git-annex
(package
(name "git-annex")
(version "7.20190708")
(version "7.20190912")
(source
(origin
(method url-fetch)
@ -253,7 +253,7 @@ (define-public git-annex
"git-annex/git-annex-" version ".tar.gz"))
(sha256
(base32
"18s563swrp8mx479995pdhhmn40y3xwlbm1z3w63qsnjqmj7zlij"))))
"1a3jvl5cx32v78s3015i10cx00jprm1391rpww4mzkk1vskzn9cv"))))
(build-system haskell-build-system)
(arguments
`(#:configure-flags
@ -337,6 +337,7 @@ (define-public git-annex
("ghc-http-conduit" ,ghc-http-conduit)
("ghc-http-types" ,ghc-http-types)
("ghc-ifelse" ,ghc-ifelse)
("ghc-magic" ,ghc-magic)
("ghc-memory" ,ghc-memory)
("ghc-monad-control" ,ghc-monad-control)
("ghc-monad-logger" ,ghc-monad-logger)
@ -374,9 +375,16 @@ (define-public git-annex
checking the file contents into Git. It can store files in many places,
such as local hard drives and cloud storage services. It can also be
used to keep a folder in sync between computers.")
;; The web app is released under the AGPLv3+.
(license (list license:gpl3+
license:agpl3+))))
;; The main author has released all his changes under AGPLv3+ as of March
;; 2019 (7.20190219-187-g40ecf58d4). These are also licensed under the
;; original GPLv3+ license, but going forward new changes will be under
;; only AGPLv3+. The other licenses below cover code written by others.
;; See git-annex's COPYRIGHT file for details on each file.
(license (list license:agpl3+
license:gpl3+
license:bsd-2
license:expat
license:gpl2))))
(define-public hlint
(package

37
gnu/packages/haskell-xyz.scm
View file

@ -5,7 +5,7 @@
;;; Copyright © 2015, 2019 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017 ng0 <ng0@n0.is>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2017 David Craven <david@craven.ch>
;;; Copyright © 2017 Danny Milosavljevic <dannym@scratchpost.org>
@ -20,6 +20,7 @@
;;; Copyright © 2019 Robert Vollmert <rob@vllmrt.net>
;;; Copyright © 2019 Jacob MacDonald <jaccarmac@gmail.com>
;;; Copyright © 2019 John Soo <jsoo1@asu.edu>
;;; Copyright © 2019 Kyle Meyer <kyle@kyleam.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -463,7 +464,7 @@ (define-public ghc-attoparsec-bootstrap
(inputs
`(("ghc-scientific" ,ghc-scientific-bootstrap)))
(native-inputs '())
(properties '(hidden? #t))))
(properties '((hidden? #t)))))
(define-public ghc-attoparsec-iso8601
(package
@ -5201,7 +5202,7 @@ (define-public ghc-integer-logarithms-bootstrap
(name "ghc-integer-logarithms-bootstrap")
(arguments `(#:tests? #f))
(native-inputs '())
(properties '(hidden? #t))))
(properties '((hidden? #t)))))
(define-public ghc-interpolate
(package
@ -5954,6 +5955,28 @@ (define-public ghc-lzma-conduit
compression algorithm used in the @code{.xz} file format.")
(license license:bsd-3)))
(define-public ghc-magic
(package
(name "ghc-magic")
(version "1.1")
(source
(origin
(method url-fetch)
(uri (string-append
"https://hackage.haskell.org/package/magic/magic-"
version ".tar.gz"))
(sha256
(base32
"10p0gjjjwr1dda7hahwrwn5njbfhl67arq3v3nf1jr3vymlkn75j"))))
(build-system haskell-build-system)
(home-page "http://hackage.haskell.org/package/magic")
(synopsis "Interface to C file/magic library")
(description
"This package provides a full-featured binding to the C libmagic library.
With it, you can determine the type of a file by examining its contents rather
than its name.")
(license license:bsd-3)))
(define-public ghc-markdown-unlit
(package
(name "ghc-markdown-unlit")
@ -8667,7 +8690,7 @@ (define-public ghc-scientific-bootstrap
("ghc-hashable" ,ghc-hashable)
("ghc-primitive" ,ghc-primitive)))
(native-inputs '())
(properties '(hidden? #t))))
(properties '((hidden? #t)))))
(define-public ghc-sdl
(package
@ -8951,7 +8974,7 @@ (define-public ghc-semigroups-bootstrap
("ghc-tagged" ,ghc-tagged)
("ghc-unordered-containers" ,ghc-unordered-containers-bootstrap)
("ghc-hashable" ,ghc-hashable-bootstrap)))
(properties '(hidden? #t))))
(properties '((hidden? #t)))))
(define-public ghc-setenv
(package
@ -10781,7 +10804,7 @@ (define-public ghc-unordered-containers-bootstrap
(arguments `(#:tests? #f))
(inputs
`(("ghc-hashable" ,ghc-hashable-bootstrap)))
(properties '(hidden? #t))))
(properties '((hidden? #t)))))
(define-public ghc-unsafe
(package
@ -11322,7 +11345,7 @@ (define-public ghc-wcwidth-bootstrap
`(("ghc-setlocale" ,ghc-setlocale)
("ghc-utf8-string" ,ghc-utf8-string)
("ghc-attoparsec" ,ghc-attoparsec-bootstrap)))
(properties '(hidden? #t))))
(properties '((hidden? #t)))))
(define-public ghc-weigh
(package

8
gnu/packages/haskell.scm
View file

@ -596,7 +596,13 @@ (define-public ghc-8.6
(("^test\\('T8108'") "# guix skipped: test('T8108'"))
(substitute* "libraries/unix/tests/libposix/all.T"
(("^test\\('posix010'") "# guix skipped: test('posix010'"))
#t))))))))
#t))))))
(native-search-paths (list (search-path-specification
(variable "GHC_PACKAGE_PATH")
(files (list
(string-append "lib/ghc-" version)))
(file-pattern ".*\\.conf\\.d$")
(file-type 'directory))))))
(define-public ghc-8 ghc-8.4)

73
gnu/packages/image.scm
View file

@ -1428,6 +1428,40 @@ (define-public optipng
(home-page "http://optipng.sourceforge.net/")
(license license:zlib)))
(define-public pngsuite
(package
(name "pngsuite")
(version "2017jul19")
(source
(origin
(method url-fetch/tarbomb)
(uri (string-append "http://www.schaik.com/pngsuite2011/PngSuite-"
version ".tgz"))
(sha256
(base32
"1j7xgd9iffcnpphhzz9ld9ybrjmx9brhq0803g0450ssr52b5502"))))
(build-system gnu-build-system)
(arguments
'(#:tests? #f ; there is no test target
#:license-file-regexp "PngSuite.LICENSE"
#:phases
(modify-phases %standard-phases
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(copy-recursively "." (string-append out "/"))
#t)))
(delete 'build)
(delete 'configure))))
(home-page "http://www.schaik.com/pngsuite2011/pngsuite.html")
(synopsis "Example PNGs for use in test suites")
(description "Collection of graphics images created to test PNG
applications like viewers, converters and editors. As far as that is
possible, all formats supported by the PNG standard are represented.")
(license (license:fsdg-compatible "file://PngSuite.LICENSE" "Permission to
use, copy, modify and distribute these images for any purpose and without fee
is hereby granted."))))
(define-public libjpeg-turbo
(package
(name "libjpeg-turbo")
@ -1755,3 +1789,42 @@ (define-public slurp
to the standard output. It works well together with grim.")
;; MIT license.
(license license:expat)))
(define-public sng
(package
(name "sng")
(version "1.1.0")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/sng/sng-"
version ".tar.gz"))
(sha256
(base32 "06a6ydvx9xb3vxvrzdrg3hq0rjwwj9ibr7fyyxjxq6qx1j3mb70i"))))
(build-system gnu-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-before 'check 'link-pngsuite
;; tests expect pngsuite in source dir
(lambda* (#:key inputs #:allow-other-keys)
(symlink (assoc-ref inputs "pngsuite") "pngsuite")
#t)))
#:configure-flags
(list (string-append "--with-rgbtxt="
(assoc-ref %build-inputs "xorg-rgb")
"/share/X11/rgb.txt"))))
(inputs `(("xorg-rgb" ,xorg-rgb)
("libpng" ,libpng)))
(native-inputs `(("pngsuite" ,pngsuite)))
(home-page "http://sng.sourceforge.net")
(synopsis "Markup language for representing PNG contents")
(description "SNG (Scriptable Network Graphics) is a minilanguage designed
specifically to represent the entire contents of a PNG (Portable Network
Graphics) file in an editable form. Thus, SNGs representing elaborate
graphics images and ancillary chunk data can be readily generated or modified
using only text tools.
SNG is implemented by a compiler/decompiler called sng that
losslessly translates between SNG and PNG.")
(license license:zlib)))

20
gnu/packages/irc.scm
View file

@ -5,7 +5,7 @@
;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 ng0 <ng0@n0.is>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@ -166,15 +166,14 @@ (define-public irssi
(define-public weechat
(package
(name "weechat")
(version "2.5")
(version "2.6")
(source (origin
(method url-fetch)
(uri (string-append "https://weechat.org/files/src/weechat-"
version ".tar.xz"))
(sha256
(base32
"09sc5lf7z70x3iw87q4zh8rbyngsw89pwnzs5jk195zzqdspgj2j"))
(patches (search-patches "weechat-python.patch"))))
"0j2iflnfvv31q2l9r67r8aj3ipggqfm2r2dpy7pvdpxgwwq337ps"))))
(build-system cmake-build-system)
(native-inputs
`(("gettext" ,gettext-minimal)
@ -187,9 +186,11 @@ (define-public weechat
("aspell" ,aspell)
("curl" ,curl)
("gnutls" ,gnutls)
;; Scripting language plug-ins.
("guile" ,guile-2.0)
("lua" ,lua-5.1)
("python" ,python-2)
("python" ,python)
("perl" ,perl)
("tcl" ,tcl)))
(arguments
@ -214,14 +215,7 @@ (define-public weechat
(substitute* "tests/scripts/test-scripts.cpp"
((".*\\{ \"(javascript|php|ruby)\", " all)
(string-append "// SKIP" all)))
#t))
(add-after 'install 'wrap
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(py2 (assoc-ref inputs "python")))
(wrap-program (string-append out "/bin/weechat")
`("PATH" ":" prefix (,(string-append py2 "/bin"))))
#t))))))
#t)))))
(synopsis "Extensible chat client")
(description "WeeChat (Wee Enhanced Environment for Chat) is an
@dfn{Internet Relay Chat} (IRC) client, which is designed to be light and fast.

139
gnu/packages/javascript.scm
View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Nicolas Goaziou <mail@nicolasgoaziou.fr>
@ -144,45 +144,20 @@ (define-public js-respond
(name "js-respond")
(version "1.4.2")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/scottjehl/Respond/"
"archive/" version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(method git-fetch)
(uri (git-reference
(url "https://github.com/scottjehl/Respond")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0ds1ya2a185jp93mdn07159c2x8zczwi960ykrawpp62bwk2n93d"))))
(build-system trivial-build-system)
"00xid731rirc7sdy1gc8qal3v9g0agr2qx15hm4x97l1lcbylyn2"))))
(build-system minify-build-system)
(arguments
`(#:modules ((guix build utils))
#:builder
(begin
(use-modules (guix build utils)
(ice-9 match)
(ice-9 popen)
(srfi srfi-26))
(set-path-environment-variable
"PATH" '("bin") (map (match-lambda
((_ . input)
input))
%build-inputs))
(let ((install-directory (string-append %output
"/share/javascript/respond/")))
(invoke "tar" "xvf"
(assoc-ref %build-inputs "source")
"--strip" "1")
(mkdir-p install-directory)
(let* ((file "src/respond.js")
(installed (string-append install-directory "respond.min.js")))
(let ((minified (open-pipe* OPEN_READ "uglify-js" file)))
(call-with-output-file installed
(cut dump-port minified <>)))))
#t)))
`(#:javascript-files '("src/matchmedia.addListener.js"
"src/matchmedia.polyfill.js"
"src/respond.js")))
(home-page "https://github.com/scottjehl/Respond")
(native-inputs
`(("uglify-js" ,uglify-js)
("source" ,source)
("gzip" ,gzip)
("tar" ,tar)))
(synopsis "Polyfill for min/max-width CSS3 Media Queries")
(description "The goal of this script is to provide a fast and lightweight
script to enable responsive web designs in browsers that don't support CSS3
@ -194,13 +169,14 @@ (define-public js-html5shiv
(name "js-html5shiv")
(version "3.7.3")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/aFarkas/html5shiv/"
"archive/" version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(method git-fetch)
(uri (git-reference
(url "https://github.com/aFarkas/html5shiv")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0inlbpxpqzdyi24lqagzf7l24zxg0y02xcpqs2h4npjscazzw7hg"))))
"0y1c5nyq0brl9fjdihhax33vks4s1ij9iv113879sg3zflmgqpd0"))))
(build-system minify-build-system)
(home-page "https://github.com/aFarkas/html5shiv")
(synopsis "Enable HTML5 sectioning elements in legacy browsers")
@ -264,13 +240,14 @@ (define-public js-strftime
(name "js-strftime")
(version "0.10.0")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/samsonjs/strftime/"
"archive/v" version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(method git-fetch)
(uri (git-reference
(url"https://github.com/samsonjs/strftime")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1iya43w7y26y2dp9l4d40bhjc4scb5a9mng5ng5c8hsqr82f1375"))))
"131nmlivazwxyba25kh9lda99749fq4xsyin6lzfalaaydviby4p"))))
(build-system minify-build-system)
(arguments
`(#:javascript-files '("strftime.js")))
@ -287,13 +264,14 @@ (define-public js-highlight
(name "js-highlight")
(version "9.12.0")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/isagalaev/highlight.js/"
"archive/" version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(method git-fetch)
(uri (git-reference
(url "https://github.com/isagalaev/highlight.js")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"1jjn9mj7fwq4zpr6is438bscf03b3q8jkj0k5c3fc6pkmjnhw939"))))
"12qz22qjpd6svj58pwgcwg2x2rzhihfdrxg6lgj39nfpaln6dris"))))
(build-system minify-build-system)
(arguments
`(#:javascript-files '("src/highlight.js")))
@ -329,18 +307,41 @@ (define-public js-datatables
HTML tables with minimal effort.")
(license license:expat)))
(define-public js-requirejs
(package
(name "js-requirejs")
(version "2.3.6")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/requirejs/requirejs.git")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0cvd5y2mb3h6yil3niqn3gjqrzixdsxcz4rvc2f0hg4kzp5y0w86"))))
(build-system minify-build-system)
(arguments `(#:javascript-files '("require.js")))
(home-page "https://github.com/requirejs/requirejs/")
(synopsis "File and module loader for JavaScript")
(description "RequireJS loads plain JavaScript files as well as more
defined modules. It is optimized for in-browser use, including in a Web
Worker, but it can be used in other JavaScript environments.")
(license license:expat)))
(define-public js-selectize
(package
(name "js-selectize")
(version "0.12.4")
(version "0.12.6")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/selectize/selectize.js/"
"archive/v" version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(method git-fetch)
(uri (git-reference
(url "https://github.com/selectize/selectize.js")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0756p49aaz34mw2dx8k1gxf210mngfrri25vkba0j7wihd2af8gn"))))
"15gichl8wi6yxag2ps723nxrgyan15976dzsnvw9h9py8sbyyzjn"))))
(build-system minify-build-system)
(arguments `(#:javascript-files '("src/selectize.js")))
(home-page "http://selectize.github.io/selectize.js/")
@ -353,15 +354,16 @@ (define-public js-selectize
(define-public js-es5-shim
(package
(name "js-es5-shim")
(version "4.5.9")
(version "4.5.13")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/es-shims/es5-shim/"
"archive/v" version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(method git-fetch)
(uri (git-reference
(url "https://github.com/es-shims/es5-shim")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0yfndyijz0ykddzprpvfjb2453gzpn528klmwycwbqc1bqd3m1hl"))))
"142w384fbyllq4yggv173g82lw3wix4jqcg6hkhx1ymq89vvnpmh"))))
(build-system minify-build-system)
(arguments `(#:javascript-files
'("es5-sham.js"
@ -381,13 +383,14 @@ (define-public js-filesaver
(name "js-filesaver")
(version "1.3.8")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/eligrey/FileSaver.js/"
"archive/" version ".tar.gz"))
(file-name (string-append name "-" version))
(method git-fetch)
(uri (git-reference
(url "https://github.com/eligrey/FileSaver.js")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"1rkhfqs5plaj628kzj7qgm5qahy4v7ihygifidqr6g6265mil97h"))))
"0gvqk0hnr8fig0n4da7vj7q6z31bcyv52916xz3rbmdj3pgpiv1d"))))
(build-system minify-build-system)
(arguments
`(#:phases

32
gnu/packages/kde.scm
View file

@ -529,16 +529,16 @@ (define-public snorenotify
(define-public kdeconnect
(package
(name "kdeconnect")
(version "1.3.3")
(version "1.3.5")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/kdeconnect/"
version "/src/kdeconnect-kde-"
version "/kdeconnect-kde-"
version ".tar.xz"))
(sha256
(base32
"1vac0mw1myrswr61adv7lgif0c4wzw5wnsj0sqxj6msp4l4pfgsg"))))
"02lr3xx5s2mgddac4n3lkgr7ppf1z5m6ajs90rjix0vs8a271kp5"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags '("-DBUILD_TESTING=ON")
@ -600,4 +600,30 @@ (define-public kdeconnect
@item Browse your phone from the desktop
@item Control the desktop's volume from the phone
@end enumerate")
(properties `((upstream-name . "kdeconnect-kde")))
(license (list license:gpl2 license:gpl3)))) ; dual licensed
(define-public kqtquickcharts
(package
(name "kqtquickcharts")
(version "19.08.1")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/applications/"
version "/src/kqtquickcharts-" version ".tar.xz"))
(sha256
(base32
"1j3rivvh4sa94lsd0hi4xfvcikl05zrqd7634wxyaxs718ais6dg"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
(inputs
`(("qtbase" ,qtbase)
("qtdeclarative" ,qtdeclarative)))
(home-page "https://phabricator.kde.org/source/kqtquickcharts/")
(synopsis "Interactive charts for Qt Quick")
(description
"Kqtquickcharts is a QtQuick plugin to render beautiful and interactive
charts.")
(license license:lgpl2.1+)))

481
gnu/packages/language.scm
View file

@ -2,6 +2,7 @@
;;; Copyright © 2015, 2016 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 ng0 <ng0@n0.is>
;;; Copyright © 2019 Alex Vong <alexvong1995@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -20,13 +21,26 @@
(define-module (gnu packages language)
#:use-module (gnu packages)
#:use-module (gnu packages glib)
#:use-module (gnu packages gtk)
#:use-module (gnu packages ocr)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages perl-check)
#:use-module (gnu packages swig)
#:use-module (gnu packages web)
#:use-module (gnu packages xorg)
#:use-module (guix packages)
#:use-module (guix build-system gnu)
#:use-module (guix build-system perl)
#:use-module ((guix licenses) #:select (gpl2 gpl3 perl-license))
#:use-module (guix download))
#:use-module (guix build-system python)
#:use-module ((guix licenses)
#:select
(bsd-3 gpl2 gpl2+ gpl3 gpl3+ lgpl2.1 perl-license zpl2.1))
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix utils))
(define-public perl-lingua-en-findnumber
(package
@ -406,3 +420,466 @@ (define-public perl-text-german
(description "This module is a rather incomplete implementation of work
done by Gudrun Putze-Meier.")
(license perl-license)))
(define* (tegaki-release-uri proj version
#:optional (ext "tar.gz"))
(string-append "https://github.com/tegaki/tegaki/releases/download"
"/v" version "/" proj "-" version "." ext))
(define remove-pre-compiled-files
(lambda exts
"Return snippet for removing pre-compiled files matching one of the
extensions in EXTS."
`(begin (for-each delete-file
(find-files "."
(lambda (name _)
(any (cut string-suffix? <> name)
(map (cut string-append "." <>)
',exts)))))
#t)))
;;; modules required for the above snippet
(define remove-pre-compiled-files-modules
'((guix build utils)
(srfi srfi-1)
(srfi srfi-26)))
(define-public python2-tegaki-wagomu
(package
(name "python2-tegaki-wagomu")
(version "0.3.1")
(source
(origin
(method url-fetch)
(uri (tegaki-release-uri "tegaki-wagomu" version))
(sha256
(base32
"1pzdiq4zy1nyylaj9i6v2h4h0r05klahskzpafpp367p4rysi1x9"))
(modules remove-pre-compiled-files-modules)
(snippet (remove-pre-compiled-files "pyc"))))
(build-system python-build-system)
(arguments
`(#:python ,python-2 ; only Python 2 is supported
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-recognizer
(lambda* (#:key inputs #:allow-other-keys)
;; fix missing module and function
(substitute* "tegakiwagomu.py"
(("import Results,")
"import ")
(("def _recognize")
"def recognize")
(("Results\\(candidates\\)")
"candidates"))
#t)))))
(inputs
`(("glib" ,glib)))
(native-inputs
`(("pkg-config" ,pkg-config)
("swig" ,swig)))
(home-page "https://tegaki.github.io/")
(synopsis
"Chinese and Japanese Handwriting Recognition (Recognition engine)")
(description
"Tegaki is an ongoing project which aims to develop a free and open-source
modern implementation of handwriting recognition software, specifically
designed for Chinese (simplified and traditional) and Japanese, and that is
suitable for both the desktop and mobile devices.")
(license gpl2+))) ; all files
(define-public python2-tegaki-python
(package
(inherit python2-tegaki-wagomu)
(name "python2-tegaki-python")
(version "0.3.1")
(source
(origin
(method url-fetch)
(uri (tegaki-release-uri "tegaki-python" version))
(sha256
(base32
"0x93k7pw9nh0ywd97pr8pm7jv3f94nw044i5k0zvzhdpsjqvak7p"))
(modules remove-pre-compiled-files-modules)
(snippet (remove-pre-compiled-files "pyc"))))
(arguments
(substitute-keyword-arguments (package-arguments python2-tegaki-wagomu)
((#:phases _)
`(modify-phases %standard-phases
(add-after 'unpack 'pre-configure
(lambda* (#:key inputs #:allow-other-keys)
;; Always convert string to unicode to avoid the following error
;; when running "tegaki-build" in python2-tegaki-tools:
;;
;; sqlite3.ProgrammingError: You must not use 8-bit bytestrings
;; unless you use a text_factory that can interpret 8-bit
;; bytestrings (like text_factory = str).
;; It is highly recommended that you instead just switch your
;; application to Unicode strings.
(substitute* "tegaki/charcol.py"
(("sqlite3.OptimizedUnicode")
"lambda s: unicode(s, 'utf-8')"))
(substitute* "tegaki/engine.py"
(("/usr(/local)?")
(assoc-ref inputs "python2-tegaki-wagomu")))
#t))))))
;; override inherited inputs
(inputs '())
(native-inputs '())
(propagated-inputs
`(("python2-tegaki-wagomu" ,python2-tegaki-wagomu)
("python2-zinnia" ,python2-zinnia)))
(synopsis
"Chinese and Japanese Handwriting Recognition (Base python library)")
(license (list gpl2+ ; all files except...
bsd-3 ; dictutils.py
zpl2.1)))) ; minjson.py
(define-public python2-tegaki-pygtk
(package
(inherit python2-tegaki-wagomu)
(name "python2-tegaki-pygtk")
(version "0.3.1")
(source
(origin
(method url-fetch)
(uri (tegaki-release-uri "tegaki-pygtk" version))
(sha256
(base32
"1cip0azxhjdj2dg2z85cp1z3lz4qwx3w1j7z4xmcm7npapmsaqs2"))
(modules remove-pre-compiled-files-modules)
(snippet (remove-pre-compiled-files "pyc"))))
(arguments
(substitute-keyword-arguments (package-arguments python2-tegaki-wagomu)
((#:phases _)
`(modify-phases %standard-phases
(add-after 'unpack 'fix-paths
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "tegakigtk/fakekey.py"
(("libX11.so.6" so)
(string-append (assoc-ref inputs "libx11") "/lib/" so))
(("libXtst.so.6" so)
(string-append (assoc-ref inputs "libxtst") "/lib/" so)))
#t))))))
(inputs ; required for sending key strokes
`(("libx11" ,libx11)
("libxtst" ,libxtst)))
(native-inputs '()) ; override inherited inputs
(propagated-inputs
`(("python2-pygtk" ,python2-pygtk)
("python2-tegaki-python" ,python2-tegaki-python)))
(synopsis "Chinese and Japanese Handwriting Recognition (Base UI library)")
(license gpl2+))) ; all files
(define-public python2-tegaki-tools
(package
(inherit python2-tegaki-wagomu)
(name "python2-tegaki-tools")
(version "0.3.1")
(source
(origin
(method url-fetch)
(uri (tegaki-release-uri "tegaki-tools" version))
(sha256
(base32
"0xxv97ggh2jgldw3r7y59lv3fhz733r6l7mdn6nh4m0gvb0ja971"))
(modules remove-pre-compiled-files-modules)
(snippet (remove-pre-compiled-files "pyc"))))
(arguments
(substitute-keyword-arguments (package-arguments python2-tegaki-wagomu)
((#:phases _) '%standard-phases)))
(inputs
`(("python2-tegaki-pygtk" ,python2-tegaki-pygtk)))
;; override inherited inputs
(native-inputs '())
(propagated-inputs '())
(synopsis "Chinese and Japanese Handwriting Recognition (Advanced tools)")
;; Files in gifenc/ are licensed under gpl3+ while other files are licensed
;; under gpl2+. Therefore, the combined work is licensed under gpl3+.
(license gpl3+)))
(define-public python2-tegaki-recognize
(let ((commit "eceec69fe651d0733c8c8752dae569d2283d0f3c")
(revision "1"))
(package
(inherit python2-tegaki-tools)
(name "python2-tegaki-recognize")
;; version copied from <https://github.com/tegaki/tegaki/releases>
(version (git-version "0.3.1" revision commit))
(source
(origin
;; We use GIT-FETCH because 'tegaki-recognize.desktop.in' and
;; 'tegaki-recognize.in' are missing in the tarball.
(method git-fetch)
(uri (git-reference
(url "https://github.com/tegaki/tegaki.git")
(commit commit)))
(sha256
(base32
"09mw2if9p885phbgah5f95q3fwy7s5b46qlmpxqyzfcnj6g7afr5"))
(file-name (git-file-name name version))
(modules `((guix build utils)
(ice-9 ftw)
(srfi srfi-26)
,@remove-pre-compiled-files-modules))
(snippet
`(begin
;; remove unnecessary files with potentially different license
(for-each delete-file-recursively
(scandir "."
(negate (cut member <> '("tegaki-recognize"
"." "..")))))
,(remove-pre-compiled-files "pyc")
#t))))
(arguments
(substitute-keyword-arguments (package-arguments python2-tegaki-tools)
((#:phases _)
`(modify-phases %standard-phases
(add-after 'unpack 'chdir
(lambda _
(chdir "tegaki-recognize")
#t))
;; 'setup.py' script does not support one of the Python build
;; system's default flags, "--single-version-externally-managed"
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(invoke "python" "setup.py" "install"
(string-append "--prefix=" (assoc-ref outputs "out"))
"--root=/")
#t))))))
(synopsis "Chinese and Japanese Handwriting Recognition (Main program)")
(license gpl2+)))) ; all files
(define-public tegaki-zinnia-japanese
(package
(inherit python2-tegaki-wagomu)
(name "tegaki-zinnia-japanese")
(version "0.3")
(source
(origin
(method url-fetch)
(uri (tegaki-release-uri name version "zip"))
(sha256
(base32
"1nmg9acxhcqly9gwkyb9m0hpy76fll91ywk4b1q4xms0ajxip1h7"))
(modules remove-pre-compiled-files-modules)
(snippet (remove-pre-compiled-files "model"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no tests
#:phases
(modify-phases %standard-phases
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "Makefile"
(("/usr/local")
(assoc-ref outputs "out")))
#t)))))
;; override inherited inputs
(inputs '())
(native-inputs
`(("python2-tegaki-tools" ,python2-tegaki-tools)))
(propagated-inputs '())
(native-search-paths
(list (search-path-specification
(variable "TEGAKI_MODEL_PATH")
(files '("share/tegaki/models")))))
(synopsis "Chinese and Japanese Handwriting Recognition (Model)")
(license lgpl2.1))) ; all files
(define-public tegaki-zinnia-japanese-light
(package
(inherit tegaki-zinnia-japanese)
(name "tegaki-zinnia-japanese-light")
(version "0.3")
(source
(origin
(method url-fetch)
(uri (tegaki-release-uri name version "zip"))
(sha256
(base32
"0x0fs29ylqzxd6xvg51h7rigpbisd7q8v11df425ib2j792yfyf8"))
(modules remove-pre-compiled-files-modules)
(snippet (remove-pre-compiled-files "model"))))
(license lgpl2.1))) ; all files
(define-public tegaki-zinnia-japanese-kyoiku
(package
(inherit tegaki-zinnia-japanese)
(name "tegaki-zinnia-japanese-kyoiku")
(version "0.3")
(source
(origin
(method url-fetch)
(uri (tegaki-release-uri name version "zip"))
(sha256
(base32
"0am94bcpmbzplxdnwn9gk15sgaizvcfhmv13mk14jjvx3419cvvx"))
(modules remove-pre-compiled-files-modules)
(snippet (remove-pre-compiled-files "model"))))
(license lgpl2.1))) ; all files
(define-public tegaki-zinnia-japanese-joyo
(package
(inherit tegaki-zinnia-japanese)
(name "tegaki-zinnia-japanese-joyo")
(version "0.3")
(source
(origin
(method url-fetch)
(uri (tegaki-release-uri name version "zip"))
(sha256
(base32
"1v0j40lzdyiz01ayws0b8r7fsdy2mr32658382kz4wyk883wzx2z"))
(modules remove-pre-compiled-files-modules)
(snippet (remove-pre-compiled-files "model"))))
(license lgpl2.1))) ; all files
(define-public tegaki-zinnia-simplified-chinese
(package
(inherit tegaki-zinnia-japanese)
(name "tegaki-zinnia-simplified-chinese")
(version "0.3")
(source
(origin
(method url-fetch)
(uri (tegaki-release-uri name version "zip"))
(sha256
(base32
"18wq0jccv7lpnrfnzspyc110d6pj2v1i21xcx4fmgzz1lnln3fs5"))
(modules remove-pre-compiled-files-modules)
(snippet (remove-pre-compiled-files "model"))))
(license lgpl2.1))) ; all files
(define-public tegaki-zinnia-simplified-chinese-light
(package
(inherit tegaki-zinnia-japanese)
(name "tegaki-zinnia-simplified-chinese-light")
(version "0.3")
(source
(origin
(method url-fetch)
(uri (tegaki-release-uri name version "zip"))
(sha256
(base32
"0v24yf0w0p03lb7fyx128a75mwzad166bigvlbrzqnad789qg1sr"))
(modules remove-pre-compiled-files-modules)
(snippet (remove-pre-compiled-files "model"))))
(license lgpl2.1))) ; all files
(define-public tegaki-zinnia-traditional-chinese
(package
(inherit tegaki-zinnia-japanese)
(name "tegaki-zinnia-traditional-chinese")
(version "0.3")
(source
(origin
(method url-fetch)
(uri (tegaki-release-uri name version "zip"))
(sha256
(base32
"140nlp6hynrai2svs5670jjfw1za6ayflhyj2dl0bzsfgbk3447l"))
(modules remove-pre-compiled-files-modules)
(snippet (remove-pre-compiled-files "model"))))
(license lgpl2.1))) ; all files
(define-public tegaki-zinnia-traditional-chinese-light
(package
(inherit tegaki-zinnia-japanese)
(name "tegaki-zinnia-traditional-chinese-light")
(version "0.3")
(source
(origin
(method url-fetch)
(uri (tegaki-release-uri name version "zip"))
(sha256
(base32
"1m6yk6a57vs9wg5y50qciwi1ahhmklp2mgsjysbj4mnyzv6yhcr2"))
(modules remove-pre-compiled-files-modules)
(snippet (remove-pre-compiled-files "model"))))
(license lgpl2.1))) ; all files
(define-public tegaki-wagomu-japanese
(package
(inherit tegaki-zinnia-japanese)
(name "tegaki-wagomu-japanese")
(version "0.3")
(source
(origin
(method url-fetch)
(uri (tegaki-release-uri name version "zip"))
(sha256
(base32
"0flj5id8xwsn7csrrzqz9prdikswnwm2wms0as2vzdpxzph1az4k"))
(modules remove-pre-compiled-files-modules)
(snippet (remove-pre-compiled-files "model"))))
(license lgpl2.1))) ; all files
(define-public tegaki-wagomu-japanese-kyoiku
(package
(inherit tegaki-zinnia-japanese)
(name "tegaki-wagomu-japanese-kyoiku")
(version "0.3")
(source
(origin
(method url-fetch)
(uri (tegaki-release-uri name version "zip"))
(sha256
(base32
"0v8crfh8rdf6ndp16g52s5jlrrlwh73xp38zjn5i9dlacx8kfqg1"))
(modules remove-pre-compiled-files-modules)
(snippet (remove-pre-compiled-files "model"))))
(license lgpl2.1))) ; all files
(define-public tegaki-wagomu-japanese-joyo
(package
(inherit tegaki-zinnia-japanese)
(name "tegaki-wagomu-japanese-joyo")
(version "0.3")
(source
(origin
(method url-fetch)
(uri (tegaki-release-uri name version "zip"))
(sha256
(base32
"0wk8shpr963zp328g991qs6abpnacq4242003m687z2d6yp7nph2"))
(modules remove-pre-compiled-files-modules)
(snippet (remove-pre-compiled-files "model"))))
(license lgpl2.1))) ; all files
(define-public tegaki-wagomu-simplified-chinese
(package
(inherit tegaki-zinnia-japanese)
(name "tegaki-wagomu-simplified-chinese")
(version "0.3")
(source
(origin
(method url-fetch)
(uri (tegaki-release-uri name version "zip"))
(sha256
(base32
"0wqprynigqxqxv128i1smh81gxvmjj056d9qpznxa3n9f5ymlbj6"))
(modules remove-pre-compiled-files-modules)
(snippet (remove-pre-compiled-files "model"))))
(license lgpl2.1))) ; all files
;;; Upstream does not provide the source for tegaki-wagomu-traditional-chinese.
;;; Therefore, we use the source for tegaki-zinnia-traditional-chinese and
;;; patch the Makefile accordingly.
(define-public tegaki-wagomu-traditional-chinese
(package
(inherit tegaki-zinnia-traditional-chinese)
(name "tegaki-wagomu-traditional-chinese")
(arguments
(substitute-keyword-arguments
(package-arguments tegaki-zinnia-traditional-chinese)
((#:phases phases '%standard-phases)
`(modify-phases ,phases
(replace 'configure
(lambda args
(let ((configure (assq-ref ,phases 'configure)))
(apply configure args))
(substitute* "Makefile"
(("zinnia") "wagomu"))
#t))))))
(license lgpl2.1))) ; all files

40
gnu/packages/linux.scm
View file

@ -349,10 +349,10 @@ (define (%upstream-linux-source version hash)
"linux-" version ".tar.xz"))
(sha256 hash)))
(define-public linux-libre-5.2-version "5.2.13")
(define-public linux-libre-5.2-version "5.2.15")
(define-public linux-libre-5.2-pristine-source
(let ((version linux-libre-5.2-version)
(hash (base32 "12hpph3iynr22mfwz7745lp01waf2kg579hr56d4pvhx4iahzdhp")))
(hash (base32 "0jhc70r2rygm91qifjagg1jgbpjwyyq6m8g1n5iv81l1v84i0mpb")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-5.2)))
@ -3838,7 +3838,7 @@ (define-public gpm
(define-public btrfs-progs
(package
(name "btrfs-progs")
(version "5.2.1")
(version "5.2.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kernel.org/linux/kernel/"
@ -3846,7 +3846,7 @@ (define-public btrfs-progs
"btrfs-progs-v" version ".tar.xz"))
(sha256
(base32
"0crjv3i20nyj2dagfw6q7byshscpn6j7wlqch3apkzzzk00lmb1n"))))
"1imivxjppi8zl27gn472pwpk8bg5dijkbyi340by31vhy7dj24w2"))))
(build-system gnu-build-system)
(outputs '("out"
"static")) ; static versions of the binaries in "out"
@ -4455,18 +4455,18 @@ (define-public x86-energy-perf-policy
(define-public haveged
(package
(name "haveged")
(version "1.9.4")
(version "1.9.6")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/jirka-h/haveged.git")
(commit version)))
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1hrwzjd4byq4fdrg8svww3d8x449k80jxxrjy9v6jvzhfv19rvxr"))))
(base32 "11kr19n2f87izsj341lv5amhd1wc2ckfmqr9pq5fxix8pkbs94rh"))))
(build-system gnu-build-system)
(home-page "http://www.issihosts.com/haveged")
(home-page "https://www.issihosts.com/haveged")
(synopsis "Entropy source for the Linux random number generator")
(description
"haveged generates an unpredictable stream of random numbers for use by
@ -4475,10 +4475,10 @@ (define-public haveged
systems with high needs or limited user interaction, such as headless servers.
@command{haveged} runs as a privileged daemon, harvesting randomness from the
indirect effects of hardware events on hidden processor state using the HArdware
Volatile Entropy Gathering and Expansion (@dfn{HAVEGE}) algorithm. It tunes
itself to its environment and provides the same built-in test suite for the
output stream as used on certified hardware security devices.
indirect effects of hardware events on hidden processor state using the
@acronym{HAVEGE, HArdware Volatile Entropy Gathering and Expansion} algorithm.
It tunes itself to its environment and provides the same built-in test suite
for the output stream as used on certified hardware security devices.
The quality of the randomness produced by this algorithm has not been proven.
It is recommended to run it together with another entropy source like rngd, and
@ -5140,14 +5140,14 @@ (define-public libmnl
(define-public libnftnl
(package
(name "libnftnl")
(version "1.1.3")
(version "1.1.4")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://netfilter.org/libnftnl/"
"libnftnl-" version ".tar.bz2"))
(sha256
(base32 "03xszkcpqk3s1rqc6vh7g5j13kh3d3yjnvjhk5scds3an39rgp92"))))
(base32 "087dfc2n4saf2k68hyi4byvgz5grwpw5kfjvmkpn3wmd8y1riiy8"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
@ -5164,7 +5164,7 @@ (define-public libnftnl
(define-public nftables
(package
(name "nftables")
(version "0.9.0")
(version "0.9.2")
(source
(origin
(method url-fetch)
@ -5172,7 +5172,7 @@ (define-public nftables
"/files/nftables-" version ".tar.bz2"))
(sha256
(base32
"14bygs6vg2v448cw5r4pxqi8an29hw0m9vab8hpmgjmrzjsq30dd"))))
"1x8kalbggjq44j4916i6vyv1rb20dlh1dcsf9xvzqsry2j063djw"))))
(build-system gnu-build-system)
(arguments `(#:configure-flags
'("--disable-man-doc"))) ; FIXME: Needs docbook2x.
@ -5874,15 +5874,15 @@ (define-public genext2fs
(define-public fakeroot
(package
(name "fakeroot")
(version "1.23")
(version "1.24")
(source (origin
(method url-fetch)
(uri (string-append "http://ftp.debian.org/debian/pool/main/f/"
"fakeroot/fakeroot_" version ".orig.tar.xz"))
(uri (string-append "https://deb.debian.org/debian/pool/main/f/"
"fakeroot/fakeroot_" version ".orig.tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"1xpl0s2yjyjwlf832b6kbkaa5921liybaar13k7n45ckd9lxd700"))))
"1vb6f93hjyqnwx8dc8mm3dgma7axgqk8s7sdsjs8l2rpc0qmn11f"))))
(build-system gnu-build-system)
(arguments
`(#:phases

73
gnu/packages/lisp.scm
View file

@ -6861,3 +6861,76 @@ (define-public cl-hooks
(define-public ecl-cl-hooks
(sbcl-package->ecl-package sbcl-cl-hooks))
(define-public sbcl-s-sysdeps
(let ((commit "d28246b5dffef9e73a0e0e6cfbc4e878006fe34d")
(revision "1"))
(package
(name "sbcl-s-sysdeps")
(build-system asdf-build-system/sbcl)
(version (git-version "1" revision commit))
(home-page "https://github.com/svenvc/s-sysdeps")
(source
(origin
(method git-fetch)
(uri (git-reference
(url home-page)
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"14b69b81yrxmjlvmm3lfxk04x5v7hqz4fql121334wh72czznfh9"))))
(synopsis "Common Lisp abstraction layer over platform dependent functionality")
(description "@code{s-sysdeps} is an abstraction layer over platform
dependent functionality. This simple package is used as a building block in a
number of other open source projects.
@code{s-sysdeps} abstracts:
@itemize
@item managing processes,
@item implementing a standard TCP/IP server,
@item opening a client TCP/IP socket stream,
@item working with process locks.
@end itemize\n")
(license license:llgpl))))
(define-public cl-s-sysdeps
(sbcl-package->cl-source-package sbcl-s-sysdeps))
(define-public ecl-s-sysdeps
(sbcl-package->ecl-package sbcl-s-sysdeps))
(define-public sbcl-cl-prevalence
(let ((commit "c163c227ed85d430b82cb1e3502f72d4f88e3cfa")
(revision "1"))
(package
(name "sbcl-cl-prevalence")
(build-system asdf-build-system/sbcl)
(version (git-version "5" revision commit))
(home-page "https://github.com/40ants/cl-prevalence")
(source
(origin
(method git-fetch)
(uri (git-reference
(url home-page)
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1i9zj1q2ahgwch56an21yzbgkynz0kab9fyxkq9mg8p3xrv38jjn"))))
(inputs
`(("s-sysdeps" ,sbcl-s-sysdeps)
("s-xml" ,sbcl-s-xml)))
(synopsis "Implementation of object prevalence for Common Lisp")
(description "This Common Lisp library implements object prevalence (see
@url{https://en.wikipedia.org/wiki/System_prevalence}). It allows
for (de)serializing to and from s-exps as well as XML. Serialization of arbitrary
classes and cyclic data structures are supported.")
(license license:llgpl))))
(define-public cl-prevalence
(sbcl-package->cl-source-package sbcl-cl-prevalence))
(define-public ecl-cl-prevalence
(sbcl-package->ecl-package sbcl-cl-prevalence))

66
gnu/packages/lua.scm
View file

@ -4,7 +4,7 @@
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 doncatnip <gnopap@gmail.com>
;;; Copyright © 2016, 2017, 2019 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2016 José Miguel Sánchez García <jmi2k@openmailbox.org>
@ -39,6 +39,7 @@ (define-module (gnu packages lua)
#:use-module (gnu packages tls)
#:use-module (gnu packages xml)
#:use-module (gnu packages glib)
#:use-module (gnu packages libevent)
#:use-module (gnu packages libffi)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages xorg)
@ -450,6 +451,69 @@ (define-public lua5.1-lpeg
(define-public lua5.2-lpeg
(make-lua-lpeg "lua5.2-lpeg" lua-5.2))
(define (make-lua-luv name lua)
(package
(name name)
(version "1.30.1-0")
(source (origin
;; The release tarball includes the sources of libuv but does
;; not include the pkg-config files.
(method git-fetch)
(uri (git-reference
(url "https://github.com/luvit/luv.git")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"1lfzzyphpim28kw33k7zylcyxnf40ckhdg6hbqyzb5hszdf2hbka"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; there are none
#:configure-flags
'("-DWITH_LUA_ENGINE=Lua"
"-DWITH_SHARED_LIBUV=On"
"-DBUILD_MODULE=Off"
"-DBUILD_SHARED_LIBS=On"
"-DLUA_BUILD_TYPE=System")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'copy-lua-compat
(lambda* (#:key inputs #:allow-other-keys)
(copy-recursively (assoc-ref inputs "lua-compat")
"lua-compat")
(setenv "CPATH"
(string-append (getcwd) "/lua-compat:"
(or (getenv "CPATH") "")))
#t)))))
(inputs
`(("lua" ,lua)
("libuv" ,libuv)))
(native-inputs
`(("lua-compat"
,(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/keplerproject/lua-compat-5.3.git")
(commit "daebe77a2f498817713df37f0bb316db1d82222f")))
(file-name "lua-compat-5.3-checkout")
(sha256
(base32
"02a14nvn7aggg1yikj9h3dcf8aqjbxlws1bfvqbpfxv9d5phnrpz"))))))
(home-page "https://github.com/luvit/luv/")
(synopsis "Libuv bindings for Lua")
(description
"This library makes libuv available to Lua scripts.")
(license license:asl2.0)))
(define-public lua-luv
(make-lua-luv "lua-luv" lua))
(define-public lua5.1-luv
(make-lua-luv "lua5.1-luv" lua-5.1))
(define-public lua5.2-luv
(make-lua-luv "lua5.2-luv" lua-5.2))
;; Lua 5.3 is not supported.
(define (make-lua-bitop name lua)
(package

3
gnu/packages/lxqt.scm
View file

@ -1177,7 +1177,8 @@ (define-public qtermwidget
(base32 "0v1vvi8vf9y8nv8y0gzffaqji53s75ab5jypksih0ndcws8ryww4"))))
(build-system cmake-build-system)
(inputs
`(("qtbase" ,qtbase)))
`(("qtbase" ,qtbase)
("utf8proc" ,utf8proc)))
(native-inputs
`(("lxqt-build-tools" ,lxqt-build-tools)
("qttools" ,qttools)))

43
gnu/packages/maths.scm
View file

@ -1726,11 +1726,16 @@ (define-public gmsh
(version "2.16.0")
(source
(origin
(method url-fetch)
(uri (string-append "http://gmsh.info/src/gmsh-"
version "-source.tgz"))
(method git-fetch)
(uri (git-reference
(url "https://gitlab.onelab.info/gmsh/gmsh.git")
(commit
(string-append "gmsh_"
(string-map (lambda (x) (if (eq? x #\.) #\_ x))
version)))))
(file-name (git-file-name name version))
(sha256
(base32 "1slf0bfkwrcgn6296wb4qhbk4ahz6i4wfb10hnim08x05vrylag8"))
(base32 "08rq4jajwmlpivnm9yifz2jhaivnz065lnk0h2zv773nwl9wf162"))
(modules '((guix build utils)))
(snippet
;; Remove non-free METIS code
@ -1756,7 +1761,7 @@ (define-public gmsh
`(#:configure-flags `("-DENABLE_METIS:BOOL=OFF"
"-DENABLE_BUILD_SHARED:BOOL=ON"
"-DENABLE_BUILD_DYNAMIC:BOOL=ON")))
(home-page "http://www.geuz.org/gmsh/")
(home-page "http://gmsh.info/")
(synopsis "3D finite element grid generator")
(description "Gmsh is a 3D finite element grid generator with a built-in
CAD engine and post-processor. Its design goal is to provide a fast, light
@ -3100,6 +3105,10 @@ (define-public muparser
(define-public openblas
(package
;; TODO: Incorporate 'openblas/fixed-num-threads' changes on the next
;; rebuild cycle.
(replacement openblas/fixed-num-threads)
(name "openblas")
(version "0.3.6")
(source
@ -3170,7 +3179,7 @@ (define-public openblas
(license license:bsd-3)))
(define-public openblas-ilp64
(package (inherit openblas)
(package/inherit openblas
(name "openblas-ilp64")
(supported-systems '("x86_64-linux" "aarch64-linux" "mips64el-linux"))
(arguments
@ -3181,6 +3190,24 @@ (define-public openblas-ilp64
(synopsis "Optimized BLAS library based on GotoBLAS (ILP64 version)")
(license license:bsd-3)))
(define openblas/fixed-num-threads
;; TODO: Move that to 'openblas' proper on the next rebuild cycle.
(package
(inherit openblas)
(version (match (string-split (package-version openblas) #\.)
((numbers ... (= string-length len))
(string-join (append numbers
(list (make-string len #\a)))
"."))))
(arguments
(substitute-keyword-arguments (package-arguments openblas)
((#:make-flags flags ''())
;; This is the maximum number of threads OpenBLAS will ever use (that
;; is, if $OPENBLAS_NUM_THREADS is greater than that, then NUM_THREADS
;; is used.) If we don't set it, the makefile sets it to the number
;; of cores of the build machine, which is obviously wrong.
`(cons "NUM_THREADS=128" ,flags))))))
(define* (make-blis implementation #:optional substitutable?)
"Return a BLIS package with the given IMPLEMENTATION (see config/ in the
source tree for a list of implementations.)
@ -3837,8 +3864,8 @@ (define-public hypre
`(("doc++" ,doc++)
("netpbm" ,netpbm)
("perl" ,perl) ; needed to run 'ppmquant' during tests
("texlive" ,(texlive-union (list texlive-generic-xypic
texlive-fonts-xypic
("texlive" ,(texlive-union (list texlive-xypic
texlive-cm
texlive-latex-hyperref
texlive-bibtex)))
("ghostscript" ,ghostscript)))

31
gnu/packages/mes.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017,2018 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2017, 2018, 2019 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
@ -62,14 +62,14 @@ (define-public nyacc-0.86
(define-public nyacc
(package
(inherit nyacc-0.86)
(version "0.94.0")
(version "0.99.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://savannah/nyacc/nyacc-"
version ".tar.gz"))
(sha256
(base32
"12qnzwm1n3j8z7hbr9hy2wka9a1aasm2rvnpnvdxkjcsbdzj8fn4"))
"0hl5qxx19i4x1r0839sxm19ziqq65g4hy97yik81cc2yb9yvgyv3"))
(modules '((guix build utils)))
(snippet
'(begin
@ -93,22 +93,19 @@ (define-public nyacc
(define-public mes
(package
(name "mes")
(version "0.19")
(version "0.20")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/mes/"
"mes-" version ".tar.gz"))
(sha256
(base32
"15h4yhaywdc0djpjlin2jz1kzahpqxfki0r0aav1qm9nxxmnp1l0"))))
"04pajp8v31na34ls4730ig5f6miiplhdvkmsb9ls1b8bbmw2vb4n"))))
(build-system gnu-build-system)
(supported-systems '("i686-linux" "x86_64-linux"))
(propagated-inputs
`(("mescc-tools" ,mescc-tools)
;; XXX: MesCC appears to enter an infinite loop (?) while building
;; crt1.o when we switch to nyacc 0.94.
("nyacc" ,nyacc-0.86)))
("nyacc" ,nyacc)))
(native-inputs
`(("guile" ,guile-2.2)
,@(let ((target-system (or (%current-target-system)
@ -168,3 +165,19 @@ (define-public mescc-tools
get_machine.")
(home-page "https://savannah.nongnu.org/projects/mescc-tools")
(license gpl3+))))
(define-public mescc-tools-0.6.1
(package
(inherit mescc-tools)
(name "mescc-tools")
(version "0.6.1")
(source (origin
(method url-fetch)
(uri (string-append
"http://git.savannah.nongnu.org/cgit/mescc-tools.git/snapshot/"
name "-Release_" version
".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"06jpvq6xfjzn2al6b4rdwd3zv3h4cvilc4n9gqcnjr9cr6wjpw2n"))))))

69
gnu/packages/music.scm
View file

@ -22,6 +22,7 @@
;;; Copyright © 2019 Gabriel Hondet <gabrielhondet@gmail.com>
;;; Copyright © 2019 Timotej Lazar <timotej.lazar@araneo.si>
;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.lonestar.org>
;;; Copyright © 2019 raingloom <raingloom@protonmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -2137,7 +2138,7 @@ (define-public zynaddsubfx
(define-public yoshimi
(package
(name "yoshimi")
(version "1.6.0")
(version "1.6.0.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/yoshimi/"
@ -2145,10 +2146,10 @@ (define-public yoshimi
"/yoshimi-" version ".tar.bz2"))
(sha256
(base32
"0bcc5spnq73yp1fmm367d1mxcswqkmzs3cnpb4cxr513ir98sa50"))))
"140f2k4akj39pny8c7i794q125415gyvmy4rday0il5ncp3glik4"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; there are no tests
`(#:tests? #f ; there are no tests
#:configure-flags
(list (string-append "-DCMAKE_INSTALL_DATAROOTDIR="
(assoc-ref %outputs "out") "/share"))
@ -4521,3 +4522,65 @@ (define-public lpd8editor
controller.")
(home-page "https://github.com/charlesfleche/lpd8editor")
(license license:expat)))
(define-public fmit
(package
(name "fmit")
(version "1.2.6")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/gillesdegottex/fmit/")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"03nzkig5mw2rqwhwmg0qvc5cnk9bwh2wp13jh0mdrr935w0587mz"))))
(build-system gnu-build-system)
(arguments
'(#:phases
(modify-phases %standard-phases
(delete 'configure)
(add-before 'build 'qmake
(lambda _
(let ((out (assoc-ref %outputs "out")))
(invoke "qmake"
"fmit.pro"
(string-append "PREFIX=" out)
(string-append "PREFIXSHORTCUT=" out)
"CONFIG+=acs_qt acs_alsa acs_jack acs_portaudio"))))
(add-after 'install 'wrap-executable
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(wrap-program (string-append out "/bin/fmit")
`("QT_PLUGIN_PATH" ":" prefix
,(map (lambda (label)
(string-append (assoc-ref inputs label)
"/lib/qt5/plugins"))
'("qtbase" "qtmultimedia" "qtsvg")))
`("QML2_IMPORT_PATH" ":" prefix
,(map (lambda (label)
(string-append (assoc-ref inputs label)
"/lib/qt5/qml"))
'("qtmultimedia"))))
#t))))))
(inputs
`(("alsa-lib" ,alsa-lib)
("fftw" ,fftw)
("jack" ,jack-1)
("portaudio" ,portaudio)
("qtbase" ,qtbase)
("qtmultimedia" ,qtmultimedia)
("qtsvg" ,qtsvg)))
(native-inputs
`(("gettext" ,gnu-gettext)
("hicolor-icon-theme" ,hicolor-icon-theme)
("itstool" ,itstool)
("qttools" ,qttools)))
(synopsis "Musical instrument tuner")
(description "FMIT is a graphical utility for tuning musical instruments,
with error and volume history, and advanced features.")
(home-page "https://gillesdegottex.github.io/fmit/")
;; Most of the code is under GPL2+, but some abstract or helper classes
;; are under LGPL2.1.
(license (list license:gpl2+ license:lgpl2.1))))

8
gnu/packages/networking.scm
View file

@ -284,7 +284,7 @@ (define-public zeromq
(base32
"0qzp80ky4y2k7k1ya09v9gkivvfbz2km813snrb8jhnn634bbmzb"))))
(build-system gnu-build-system)
(home-page "http://zeromq.org")
(home-page "https://zeromq.org")
(synopsis "Library for message-based applications")
(description
"The 0MQ lightweight messaging kernel is a library which extends the
@ -1968,14 +1968,14 @@ (define-public mtr
(define-public strongswan
(package
(name "strongswan")
(version "5.8.0")
(version "5.8.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://download.strongswan.org/strongswan-"
version ".tar.bz2"))
(sha256
(base32 "0cq9m86ydd2i0awxkv4a256f4926p2f9pzlisyskl9fngl6f3c8m"))))
(base32 "034rd6kr1bmnvj8rg2kcxdjb0cgj3dn9310mmm94j1awxan71byr"))))
(build-system gnu-build-system)
(arguments
`(#:phases
@ -1998,7 +1998,7 @@ (define-public strongswan
#t)))
#:configure-flags
(list
;; Disable bsd-4 licensed plugins
;; Disable bsd-4 licensed plugins.
"--disable-des"
"--disable-blowfish")))
(inputs

8
gnu/packages/ntp.scm
View file

@ -5,6 +5,7 @@
;;; Copyright © 2015, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -108,8 +109,11 @@ (define-public openntpd
"0fn12i4kzsi0zkr4qp3dp9bycmirnfapajqvdfx02zhr4hanj0kv"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags '("--with-privsep-user=ntpd"
"--localstatedir=/var")
'(#:configure-flags `( "--with-privsep-user=ntpd"
"--localstatedir=/var"
,(string-append "--with-cacert="
(assoc-ref %build-inputs "libressl")
"/etc/ssl/cert.pem"))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'modify-install-locations

75
gnu/packages/ocr.scm
View file

@ -2,6 +2,7 @@
;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Alex Vong <alexvong1995@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -22,8 +23,11 @@ (define-module (gnu packages ocr)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system gnu)
#:use-module (guix build-system python)
#:use-module (gnu packages compression)
#:use-module (gnu packages python)
#:use-module (gnu packages image))
(define-public ocrad
@ -76,3 +80,74 @@ (define-public tesseract-ocr
supported through the Leptonica library. It can also detect whether text is
monospaced or proportional.")
(license license:asl2.0)))
(define-public zinnia
(let* ((commit "581faa8f6f15e4a7b21964be3a5ec36265c80e5b")
(revision "1")
;; version copied from 'configure.in'
(version (git-version "0.07" revision commit)))
(package
(name "zinnia")
(version version)
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/taku910/zinnia.git")
(commit commit)))
(sha256
(base32
"1izjy5qw6swg0rs2ym2i72zndb90mwrfbd1iv8xbpwckbm4899lg"))
(file-name (git-file-name name version))
(modules '((guix build utils)
(ice-9 ftw)
(srfi srfi-26)))
(snippet ; remove unnecessary files with potentially different license
'(begin
(for-each delete-file-recursively
(scandir "."
(negate (cut member <> '("zinnia"
"." "..")))))
#t))))
(build-system gnu-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(replace 'bootstrap
(lambda _
(chdir "zinnia")
(for-each make-file-writable
'("config.log" "config.status"))
#t)))))
(home-page "https://taku910.github.io/zinnia/")
(synopsis "Online hand recognition system with machine learning")
(description
"Zinnia is a simple, customizable and portable online hand recognition
system based on Support Vector Machines. Zinnia simply receives user pen
strokes as a sequence of coordinate data and outputs n-best characters sorted
by SVM confidence. To keep portability, Zinnia doesn't have any rendering
functionality. In addition to recognition, Zinnia provides training module
that allows us to create any hand-written recognition systems with low-cost.")
(license (list license:bsd-3 ; all files except...
(license:non-copyleft ; some autotools related files
"file://zinnia/aclocal.m4")
license:x11 ; 'install-sh'
license:public-domain))))) ; 'install-sh'
;;; python 2 bindings, license under the same terms as zinnia
(define-public python2-zinnia
(package
(inherit zinnia)
(name "python2-zinnia")
(build-system python-build-system)
(arguments
`(#:python ,python-2 ; CObject API is used, it was removed in Python 3.2
#:tests? #f ; avoid circular dependency on tegaki-zinnia-japanese
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'chdir
(lambda _
(chdir "zinnia/python")
#t)))))
(inputs
`(("zinnia" ,zinnia)))))

102
gnu/packages/package-management.scm
View file

@ -31,6 +31,7 @@
(define-module (gnu packages package-management)
#:use-module (gnu packages)
#:use-module (gnu packages acl)
#:use-module (gnu packages admin)
#:use-module (gnu packages attr)
#:use-module (gnu packages avahi)
#:use-module (gnu packages autotools)
@ -39,6 +40,7 @@ (define-module (gnu packages package-management)
#:use-module (gnu packages bdw-gc)
#:use-module (gnu packages bison)
#:use-module (gnu packages bootstrap) ;for 'bootstrap-guile-origin'
#:use-module (gnu packages cdrom)
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
#:use-module (gnu packages cpio)
@ -48,6 +50,7 @@ (define-module (gnu packages package-management)
#:use-module (gnu packages docbook)
#:use-module (gnu packages file)
#:use-module (gnu packages gettext)
#:use-module (gnu packages ghostscript)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg)
@ -55,11 +58,19 @@ (define-module (gnu packages package-management)
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
#:use-module (gnu packages guile-xyz)
#:use-module (gnu packages haskell)
#:use-module (gnu packages image)
#:use-module (gnu packages imagemagick)
#:use-module (gnu packages java)
#:use-module (gnu packages linux)
#:use-module (gnu packages lisp)
#:use-module (gnu packages llvm)
#:use-module (gnu packages man)
#:use-module (gnu packages mono)
#:use-module (gnu packages nettle)
#:use-module (gnu packages nss)
#:use-module (gnu packages patchutils)
#:use-module (gnu packages pdf)
#:use-module (gnu packages perl)
#:use-module (gnu packages perl-check)
#:use-module (gnu packages pkg-config)
@ -71,8 +82,10 @@ (define-module (gnu packages package-management)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages ssh)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages textutils)
#:use-module (gnu packages time)
#:use-module (gnu packages tls)
#:use-module (gnu packages video)
#:use-module (gnu packages vim)
#:use-module (gnu packages virtualization)
#:use-module (gnu packages web)
@ -110,8 +123,8 @@ (define-public guix
;; Note: the 'update-guix-package.scm' script expects this definition to
;; start precisely like this.
(let ((version "1.0.1")
(commit "c902458863d1d341ffd74970b75e69c2bb848183")
(revision 4))
(commit "0ed97e69805253656df929a6ad678016aa81f08a")
(revision 6))
(package
(name "guix")
@ -127,7 +140,7 @@ (define-public guix
(commit commit)))
(sha256
(base32
"0w93qjgy9n0qqyij12s7hm7fl4wb6h99bmfril4cqf4ynckpdvbb"))
"1h2qlbbdqi72jslx17gp2cak5494nbm8j44rz57lnplnfcn6iwaw"))
(file-name (string-append "guix-" version "-checkout"))))
(build-system gnu-build-system)
(arguments
@ -342,6 +355,19 @@ (define-public guix-daemon
#f)
((#:phases phases '%standard-phases)
`(modify-phases ,phases
(add-after 'unpack 'change-default-guix
(lambda _
;; We need to tell 'guix-daemon' which 'guix' command to use.
;; Here we use a questionable hack where we hard-code root's
;; current guix, which could be wrong (XXX). Note that scripts
;; like 'guix perform-download' do not run as root so we assume
;; that they have access to /var/guix/profiles/per-user/root.
(substitute* "nix/libstore/globals.cc"
(("guixProgram = (.*)nixBinDir + \"/guix\"" _ before)
(string-append "guixProgram = " before
"/var/guix/profiles/per-user/root\
/current-guix/bin/guix")))
#t))
(replace 'build
(lambda _
(invoke "make" "nix/libstore/schema.sql.hh")
@ -351,19 +377,7 @@ (define-public guix-daemon
(delete 'copy-bootstrap-guile)
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(invoke "make" "install-binPROGRAMS"
"install-nodist_pkglibexecSCRIPTS")
;; We need to tell 'guix-daemon' which 'guix' command to use.
;; Here we use a questionable hack where we hard-code root's
;; current guix, which could be wrong (XXX). Note that scripts
;; like 'guix perform-download' do not run as root so we assume
;; that they have access to /var/guix/profiles/per-user/root.
(let ((out (assoc-ref outputs "out")))
(substitute* (find-files (string-append out "/libexec"))
(("exec \".*/bin/guix\"")
"exec \"${GUIX:-/var/guix/profiles/per-user/root/current-guix/bin/guix}\""))
#t)))
(invoke "make" "install-binPROGRAMS")))
(delete 'wrap-program)))))))
(define-public guile2.0-guix
@ -544,7 +558,7 @@ (define-public rpm
(license license:gpl2+)))
(define-public diffoscope
(let ((version "122"))
(let ((version "123"))
(package
(name "diffoscope")
(version version)
@ -556,7 +570,7 @@ (define-public diffoscope
(file-name (git-file-name name version))
(sha256
(base32
"1pwddknk8qyv88ba63why8vbnlc14b47434lv4ijx49m7ya3zfvg"))))
"11bxms5rkhi0v4pxx29v4qgvhp3fmf0fkzci6gn5xcv4fl1zy4wj"))))
(build-system python-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
@ -573,6 +587,13 @@ (define-public diffoscope
(lambda _
(delete-file "tests/comparators/test_berkeley_db.py")
#t))
;; Test is dynamically generated and may have false
;; negatives with different ocaml versions. Further
;; background in: https://bugs.debian.org/939386
(add-after 'unpack 'remove-ocaml-test
(lambda _
(delete-file "tests/comparators/test_ocaml.py")
#t))
(add-after 'unpack 'embed-tool-references
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "diffoscope/comparators/utils/compare.py"
@ -592,10 +613,9 @@ (define-public diffoscope
#t))
(add-before 'check 'writable-test-data
(lambda _
;; tests/comparators/test_elf.py needs write access to
;; test data
(make-file-writable
"tests/data/ignore_readelf_errors_expected_diff")
;; tests may need needs write access to tests
;; directory
(for-each make-file-writable (find-files "tests"))
#t))
(add-before 'check 'delete-failing-test
(lambda _
@ -612,7 +632,43 @@ (define-public diffoscope
("xxd" ,xxd)))
;; Below are modules used for tests.
(native-inputs `(("python-pytest" ,python-pytest)
("python-chardet" ,python-chardet)))
("python-chardet" ,python-chardet)
;; test suite skips tests when tool is missing
("bdb" ,bdb)
("binutils" ,binutils)
("bzip2" ,bzip2)
("cdrtools" ,cdrtools)
("colord" ,colord)
("cpio" ,cpio)
("docx2txt" ,docx2txt)
("e2fsprogs" ,e2fsprogs)
("ffmpeg" ,ffmpeg)
("gettext" ,gettext-minimal)
("ghc" ,ghc)
("ghostscript" ,ghostscript)
("giflib:bin" ,giflib "bin")
("gnumeric" ,gnumeric)
("gnupg" ,gnupg)
("imagemagick" ,imagemagick)
("libarchive" ,libarchive)
("llvm" ,llvm)
("lz4" ,lz4)
("mono" ,mono)
("odt2txt" ,odt2txt)
;; no unversioned openjdk available
("openjdk:jdk" ,openjdk12 "jdk")
("openssh" ,openssh)
("pgpdump" ,pgpdump)
("poppler" ,poppler)
("rpm" ,rpm)
("sng" ,sng)
("sqlite" ,sqlite)
("squashfs-tools" ,squashfs-tools)
("tcpdump" ,tcpdump)
("unzip" ,unzip)
("xxd" ,xxd)
("xz" ,xz)
("zip" ,(@ (gnu packages compression) zip))))
(home-page "https://diffoscope.org/")
(synopsis "Compare files, archives, and directories in depth")
(description

40
gnu/packages/patches/cmake-curl-certificates.patch Normal file
View file

@ -0,0 +1,40 @@
By default commands such as "ctest" would not look for certificates
at all: <https://issues.guix.gnu.org/issue/37371>.
This changes CMake such that commands honor SSL_CERT_FILE and SSL_CERT_DIR
as well as /etc/ssl/certs.
--- cmake-3.13.1/Source/cmCurl.cxx 2019-09-10 17:27:36.926907260 +0200
+++ cmake-3.13.1/Source/cmCurl.cxx 2019-09-10 17:52:35.475903919 +0200
@@ -4,11 +4,8 @@
#include "cmThirdParty.h"
-#if !defined(CMAKE_USE_SYSTEM_CURL) && !defined(_WIN32) && \
- !defined(__APPLE__) && !defined(CURL_CA_BUNDLE) && !defined(CURL_CA_PATH)
# define CMAKE_FIND_CAFILE
# include "cmSystemTools.h"
-#endif
// curl versions before 7.21.5 did not provide this error code
#if defined(LIBCURL_VERSION_NUM) && LIBCURL_VERSION_NUM < 0x071505
@@ -29,6 +26,19 @@ std::string cmCurlSetCAInfo(::CURL* curl
::CURLcode res = ::curl_easy_setopt(curl, CURLOPT_CAINFO, cafile);
check_curl_result(res, "Unable to set TLS/SSL Verify CAINFO: ");
}
+
+ /* Honor the usual environment variables. */
+ else if (cmSystemTools::GetEnv("SSL_CERT_FILE", e)) {
+ ::CURLcode res =
+ ::curl_easy_setopt(curl, CURLOPT_CAINFO, e.c_str());
+ check_curl_result(res, "Unable to set TLS/SSL Verify CAINFO: ");
+ }
+ else if (cmSystemTools::GetEnv("SSL_CERT_DIR", e)) {
+ ::CURLcode res =
+ ::curl_easy_setopt(curl, CURLOPT_CAPATH, e.c_str());
+ check_curl_result(res, "Unable to set TLS/SSL Verify CAINFO: ");
+ }
+
#ifdef CMAKE_FIND_CAFILE
# define CMAKE_CAFILE_FEDORA "/etc/pki/tls/certs/ca-bundle.crt"
else if (cmSystemTools::FileExists(CMAKE_CAFILE_FEDORA, true)) {

3
gnu/packages/patches/tipp10-fix-compiling.patch
View file

@ -204,8 +204,7 @@ https://sources.debian.net/data/main/t/tipp10/2.1.0-2/debian/patches/0001-FixCom
Name=TIPP10
Comment=Touch Typing Tutor
Comment[de]=10-Finger-Schreibtrainer
-Exec=tipp10
+Exec=/usr/bin/tipp10
Exec=tipp10
Icon=tipp10.png
Terminal=false
Type=Application

40
gnu/packages/patches/weechat-python.patch
View file

@ -1,40 +0,0 @@
Get Python LDFLAGS from 'pkg-config'.
The other approach is more complex and gets it wrong: it returns
"-L/path/to/python/lib/python-2.7.10/lib/python2.7/config -lpython -lwhatever";
since that config/ sub-directory contains libpython2.7.a, we end up
statically linking Python in Weechat's python.so, which we do not want.
--- weechat-1.3/configure.ac 2015-08-16 08:27:07.000000000 +0200
+++ weechat-1.3/configure.ac 2015-11-29 18:18:52.975197048 +0100
@@ -535,29 +535,7 @@ if test "x$enable_python" = "xyes" ; the
if test -r "$PYTHON_INCLUDE/Python.h"; then
PYTHON_CFLAGS="-I$PYTHON_INCLUDE"
AC_MSG_RESULT(found)
- PYTHON_LIB=`$PYTHON -c "import sys, distutils.sysconfig; sys.stdout.write(distutils.sysconfig.get_config_var('LIBPL'))"`
- PYTHON_LFLAGS="-lpython$PYTHON_VERSION "`$PYTHON -c "import sys, distutils.sysconfig; sys.stdout.write(distutils.sysconfig.get_config_var('LIBS')+' '+distutils.sysconfig.get_config_var('SYSLIBS')+' '+distutils.sysconfig.get_config_var('LINKFORSHARED'))"`
- AC_MSG_CHECKING(for Python library)
- if test -r "$PYTHON_LIB/libpython$PYTHON_VERSION.so"; then
- PYTHON_LFLAGS="-L$PYTHON_LIB $PYTHON_LFLAGS"
- AC_MSG_RESULT(found)
- elif test -r "$PYTHON_LIB/libpython$PYTHON_VERSION.a"; then
- PYTHON_LFLAGS="-L$PYTHON_LIB $PYTHON_LFLAGS"
- AC_MSG_RESULT(found)
- elif test -r "$PYTHON_LIB/libpython$PYTHON_VERSION.dll.a"; then
- PYTHON_LFLAGS="-L$PYTHON_LIB $PYTHON_LFLAGS"
- AC_MSG_RESULT(found)
- elif test -r "$PYTHON_SYSPREFIX/lib/libpython$PYTHON_VERSION.so"; then
- PYTHON_LFLAGS="-L$PYTHON_SYSPREFIX/lib/ $PYTHON_LFLAGS"
- AC_MSG_RESULT(found)
- else
- AC_MSG_WARN([
-*** Python library couldn't be found on your system.
-*** Try to install it with your software package manager.
-*** WeeChat will be built without Python support.])
- enable_python="no"
- not_found="$not_found python"
- fi
+ PYTHON_LFLAGS=`pkg-config python2 --libs`
else
AC_MSG_WARN([
*** Python header files couldn't be found on your system.

5
gnu/packages/perl-compression.scm
View file

@ -133,7 +133,7 @@ (define-public perl-archive-extract
(define-public perl-archive-zip
(package
(name "perl-archive-zip")
(version "1.64")
(version "1.65")
(source
(origin
(method url-fetch)
@ -141,8 +141,7 @@ (define-public perl-archive-zip
"mirror://cpan/authors/id/P/PH/PHRED/Archive-Zip-"
version ".tar.gz"))
(sha256
(base32
"0zfinh8nx3rxzscp57vq3w8hihpdb0zs67vvalykcf402kr88pyy"))))
(base32 "116vcg8x7n92i7cn3bx0xck69mz9vjy0il9i8p7p7lk40kz7jcbl"))))
(build-system perl-build-system)
(native-inputs
;; For tests.

23
gnu/packages/python-check.scm
View file

@ -2,6 +2,7 @@
;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -226,11 +227,27 @@ (define-public python-pytest-virtualenv
(base32
"03w2zz3crblj1p6i8nq17946hbn3zqp9z7cfnifw47hi4a4fww12"))))
(build-system python-build-system)
(arguments '(#:tests? #f)) ; one test fails; can't find virtualenv
(arguments
`(#:phases
(modify-phases %standard-phases
;; Reference the virtualenv executable directly, to avoid the need
;; for PYTHONPATH, which gets cleared when instantiating a new
;; virtualenv with pytest-virtualenv.
(add-after 'unpack 'patch-virtualenv-executable
(lambda* (#:key inputs #:allow-other-keys)
(let* ((virtualenv (assoc-ref inputs "python-virtualenv"))
(virtualenv-bin (string-append virtualenv
"/bin/virtualenv")))
(substitute* "pytest_virtualenv.py"
(("^DEFAULT_VIRTUALENV_FIXTURE_EXECUTABLE.*$")
(format #f "DEFAULT_VIRTUALENV_FIXTURE_EXECUTABLE = '~a'"
virtualenv-bin)))
#t))))))
(propagated-inputs
`(("python-virtualenv" ,python-virtualenv)
("python-pytest-shutil" ,python-pytest-shutil)
`(("python-pytest-shutil" ,python-pytest-shutil)
("python-pytest-fixture-config" ,python-pytest-fixture-config)))
(inputs
`(("python-virtualenv" ,python-virtualenv)))
(native-inputs
`(("python-mock" ,python-mock)
("python-pytest" ,python-pytest)

213
gnu/packages/python-xyz.scm
View file

@ -3004,38 +3004,44 @@ (define-public python-pydocstyle
Server (PLS).")
(license license:expat)))
;; XXX: We must use a non-release version since the latest release version
;; requires python-jedi version < 0.15.
(define-public python-language-server
(package
(name "python-language-server")
(version "0.26.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "python-language-server" version))
(sha256
(base32
"1vs9ckfmm534n1hq3m871916wsjvi5h4gyj6wlzg13ck6506lx0s"))))
(build-system python-build-system)
(propagated-inputs
`(("python-pluggy" ,python-pluggy)
("python-jsonrpc-server" ,python-jsonrpc-server)
("python-jedi" ,python-jedi)
("python-yapf" ,python-yapf)
("python-pyflakes" ,python-pyflakes)
("python-pydocstyle" ,python-pydocstyle)
("python-pycodestyle" ,python-pycodestyle)
("python-mccabe" ,python-mccabe)
("python-rope" ,python-rope)
("python-autopep8" ,python-autopep8)
("python-pylint" ,python-pylint)))
(home-page "https://github.com/palantir/python-language-server")
(synopsis "Python implementation of the Language Server Protocol")
(description
"The Python Language Server (pyls) is an implementation of the Python 3
(let ((commit "c3cab77a85b1de4af1aec1bafea6a7320d6baec5")
(revision "1"))
(package
(name "python-language-server")
(version (git-version "0.28.3" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/palantir/python-language-server.git")
(commit commit)))
(sha256
(base32
"1q0xdwgln09sh58j0ryygj92hfgdhwcs57zjvqihya23jr5v0bz4"))))
(build-system python-build-system)
(propagated-inputs
`(("python-pluggy" ,python-pluggy)
("python-jsonrpc-server" ,python-jsonrpc-server)
("python-jedi" ,python-jedi)
("python-yapf" ,python-yapf)
("python-pyflakes" ,python-pyflakes)
("python-pydocstyle" ,python-pydocstyle)
("python-pycodestyle" ,python-pycodestyle)
("python-mccabe" ,python-mccabe)
("python-rope" ,python-rope)
("python-autopep8" ,python-autopep8)
("python-pylint" ,python-pylint)))
(home-page "https://github.com/palantir/python-language-server")
(synopsis "Python implementation of the Language Server Protocol")
(description
"The Python Language Server (pyls) is an implementation of the Python 3
language specification for the Language Server Protocol (LSP). This tool is
used in text editing environments to provide a complete and integrated
feature-set for programming Python effectively.")
(license license:expat)))
(license license:expat))))
(define-public python-black
(package
@ -3848,14 +3854,14 @@ (define-public python2-colorspacious
(define-public python-matplotlib
(package
(name "python-matplotlib")
(version "2.2.3")
(version "3.1.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "matplotlib" version))
(sha256
(base32
"1rcc7x9ig3hpchkc4cwdvym3y451w74275fxr455zkfagrsvymbk"))))
"14qc109dibp32xfd9lah54djc0rc76fhbsj9cwyb328lzqmd5sqz"))))
(build-system python-build-system)
(propagated-inputs ; the following packages are all needed at run time
`(("python-cycler" ,python-cycler)
@ -3872,7 +3878,7 @@ (define-public python-matplotlib
;; From version 1.4.0 'matplotlib' makes use of 'cairocffi' instead of
;; 'pycairo'. However, 'pygobject' makes use of a 'pycairo' 'context'
;; object. For this reason we need to import both libraries.
;; https://pythonhosted.org/cairocffi/cffi_api.html#converting-pycairo
;; https://cairocffi.readthedocs.io/en/stable/cffi_api.html#converting-pycairo-wrappers-to-cairocffi
("python-pycairo" ,python-pycairo)
("python-cairocffi" ,python-cairocffi)))
(inputs
@ -3887,11 +3893,59 @@ (define-public python-matplotlib
("tk" ,tk)))
(native-inputs
`(("pkg-config" ,pkg-config)
("python-nose" ,python-nose)
("python-mock" ,python-mock)))
("python-pytest" ,python-pytest)
("python-mock" ,python-mock)
("unzip" ,unzip)
("jquery-ui"
,(origin
(method url-fetch)
(uri "https://jqueryui.com/resources/download/jquery-ui-1.12.1.zip")
(sha256
(base32
"0kb21xf38diqgxcdi1z3s9ssq36pldvyqxy56hn6pcva6rs3c8zq"))))))
(arguments
`(#:phases
(modify-phases %standard-phases
;; XXX We disable all image comparison tests because we're using a
;; newer version of FreeType than matplotlib expects. This leads to
;; minor differences throughout the tests.
(add-after 'unpack 'fix-and-disable-failing-tests
(lambda _
(substitute* (append (find-files "lib/matplotlib/tests/"
"test_.*\\.py$")
(find-files "lib/mpl_toolkits/tests"
"test_.*\\.py$"))
(("^from matplotlib" match)
(string-append "import pytest\n" match))
(("( *)@image_comparison" match indent)
(string-append indent
"@pytest.mark.skip(reason=\"unknown minor image differences\")\n"
match)))
(substitute* "lib/matplotlib/tests/test_animation.py"
(("/bin/sh") (which "sh")))
(for-each delete-file
;; test_normal_axes, test_get_tightbbox_polar
'("lib/matplotlib/tests/test_axes.py"
;; test_outward_ticks
"lib/matplotlib/tests/test_tightlayout.py"
;; Fontconfig returns no fonts.
"lib/matplotlib/tests/test_font_manager.py"))
#t))
(add-before 'install 'install-jquery-ui
(lambda* (#:key outputs inputs #:allow-other-keys)
(let ((dir (string-append (assoc-ref outputs "out")
"/lib/python3.7/site-packages/matplotlib/backends/web_backend/")))
(mkdir-p dir)
(invoke "unzip"
(assoc-ref inputs "jquery-ui")
"-d" dir))
#t))
(delete 'check)
(add-after 'install 'check
(lambda* (#:key outputs inputs #:allow-other-keys)
(add-installed-pythonpath inputs outputs)
(invoke "python" "tests.py" "-v"
"-m" "not network")))
(add-before 'build 'configure-environment
(lambda* (#:key outputs inputs #:allow-other-keys)
(let ((cairo (assoc-ref inputs "cairo")))
@ -3903,8 +3957,8 @@ (define-public python-matplotlib
(lambda (port)
(format port "[directories]~%
basedirlist = ~a,~a~%
[rc_options]~%
backend = TkAgg~%"
[packages]~%
tests = True~%"
(assoc-ref inputs "tcl")
(assoc-ref inputs "tk")))))
#t)))))
@ -3923,6 +3977,14 @@ (define-public python2-matplotlib
(let ((matplotlib (package-with-python2
(strip-python2-variant python-matplotlib))))
(package (inherit matplotlib)
(version "2.2.3")
(source
(origin
(method url-fetch)
(uri (pypi-uri "matplotlib" version))
(sha256
(base32
"1rcc7x9ig3hpchkc4cwdvym3y451w74275fxr455zkfagrsvymbk"))))
;; Make sure to use special packages for Python 2 instead
;; of those automatically rewritten by package-with-python2.
(propagated-inputs
@ -3946,6 +4008,7 @@ (define-public python-matplotlib-documentation
`(("python-matplotlib" ,python-matplotlib)
("python-colorspacious" ,python-colorspacious)
("python-sphinx" ,python-sphinx)
("python-sphinx-copybutton" ,python-sphinx-copybutton)
("python-sphinx-gallery" ,python-sphinx-gallery)
("python-numpydoc" ,python-numpydoc)
("python-ipython" ,python-ipython)
@ -3972,6 +4035,9 @@ (define-public python-matplotlib-documentation
`(#:tests? #f ; we're only generating documentation
#:phases
(modify-phases %standard-phases
;; The tests in python-matplotlib are run after the install phase, so
;; we need to delete the extra phase here.
(delete 'check)
(replace 'build
(lambda _
(chdir "doc")
@ -4020,7 +4086,12 @@ (define-public python-matplotlib-documentation
(license (package-license python-matplotlib))))
(define-public python2-matplotlib-documentation
(package-with-python2 python-matplotlib-documentation))
(let ((parent (package-with-python2 python-matplotlib-documentation)))
(package
(inherit parent)
(native-inputs
(alist-delete "python-sphinx-copybutton"
(package-native-inputs parent))))))
(define-public python-matplotlib-venn
(package
@ -5014,7 +5085,8 @@ (define-public python-pathpy
(outputs '("out" "doc"))
(build-system python-build-system)
(propagated-inputs
`(("python-appdirs" ,python-appdirs)))
`(("python-appdirs" ,python-appdirs)
("python-importlib-metadata" ,python-importlib-metadata)))
(native-inputs
`(("python-setuptools-scm" ,python-setuptools-scm)
("python-sphinx" ,python-sphinx)
@ -5447,6 +5519,13 @@ (define-public python-ipython
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'make-docs-reproducible
(lambda _
(substitute* "IPython/sphinxext/ipython_directive.py"
((".*import datetime") "")
((".*datetime.datetime.now\\(\\)") "")
(("%timeit") "# %timeit"))
#t))
;; Tests can only be run after the library has been installed and not
;; within the source directory.
(delete 'check)
@ -7500,17 +7579,31 @@ (define-public python-debian
(package
(name "python-debian")
(home-page "https://salsa.debian.org/python-debian-team/python-debian")
(version "0.1.28")
(version "0.1.36")
(source
(origin
(method url-fetch)
(uri (pypi-uri name version))
;; Use git-fetch, as pypi doesn't include test suite.
(method git-fetch)
(uri (git-reference
(url home-page)
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0i15f0xzx679sd0ldq2sls9pnnps9fv6vhqvnv9dzf4qhma42i0y"))))
"0qy6x28bj6yfikhjww932v5xq4mf5bm1iczl7acy4c7zm6mwhqfa"))))
(build-system python-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
(add-after 'unpack 'remove-debian-specific-tests
;; python-apt, apt and dpkg are not yet available in guix,
;; and these tests heavily depend on them.
(lambda _
(delete-file "lib/debian/tests/test_deb822.py")
(delete-file "lib/debian/tests/test_debfile.py")
#t)))))
(propagated-inputs
`(("python-six" ,python-six)))
`(("python-six" ,python-six)
("python-chardet" ,python-chardet)))
(synopsis "Debian package related modules")
(description
;; XXX: Use @enumerate instead of @itemize to work around
@ -10554,25 +10647,29 @@ (define-public python2-prompt-toolkit-1
(define-public python-jedi
(package
(name "python-jedi")
(version "0.13.3")
(version "0.15.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "jedi" version))
(sha256
(base32
"0nsrjlb57njqppxmi8wjsb1dkad7qa7svx67jbkhixq66lz61c1b"))))
"0bp4pxhsynaarbvzblsn5x32lzp29svy3sxfy8i6m5iwz9s9r1ds"))))
(build-system python-build-system)
(arguments
`( ;; Many tests are failing with Python 3.7.x as of version 0.13.3 (see:
;; https://github.com/davidhalter/jedi/issues/1263)
#:tests? #f
#:phases
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'disable-file-completion-test
;; A single parameterized test currently fail (see:
;; https://github.com/davidhalter/jedi/issues/1395). Remove it.
(lambda _
(substitute* "test/test_api/test_completion.py"
((".*'example.py', 'rb\"' \\+ join\\('\\.\\.'.*") ""))
#t))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "py.test" "-vv")))))))
(lambda _
(setenv "HOME" "/tmp")
(invoke "python" "-m" "pytest"))))))
(native-inputs
`(("python-pytest" ,python-pytest)
("python-docopt" ,python-docopt)))
@ -10590,11 +10687,7 @@ (define-public python-jedi
(license license:expat)))
(define-public python2-jedi
(let ((base (package-with-python2 (strip-python2-variant python-jedi))))
(package
(inherit base)
(arguments (substitute-keyword-arguments (package-arguments base)
((#:tests? _) #t))))))
(package-with-python2 python-jedi))
(define-public ptpython
(package
@ -14729,17 +14822,21 @@ (define-public python-onetimepass
(define-public python-parso
(package
(name "python-parso")
(version "0.3.1")
(version "0.5.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "parso" version))
(sha256
(base32
"18p89iwcm8mnf380f92g9w0bhx5km8wxp392vvjcq4y1ld1llw1m"))))
"171a9ivhxwsd52h1cgsz40zgzpgzscn7yqb7sdjhy8m1lzj0wsv6"))))
(native-inputs
`(("python-pytest" ,python-pytest)))
(build-system python-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
(replace 'check
(lambda _ (invoke "pytest" "-vv"))))))
(home-page "https://github.com/davidhalter/parso")
(synopsis "Python Parser")
(description "Parso is a Python parser that supports error recovery and

6
gnu/packages/python.scm
View file

@ -509,7 +509,7 @@ (define-public python-minimal-wrapper (wrap-python3 python-minimal))
(define-public micropython
(package
(name "micropython")
(version "1.10")
(version "1.11")
(source
(origin
(method url-fetch)
@ -518,7 +518,7 @@ (define-public micropython
"/micropython-" version ".tar.gz"))
(sha256
(base32
"1g1zjip3rkx6bp16qi1bag72wivnbh56fcsl3nffanrx4j5f4z90"))
"0px3xhw16rl0l7qifq7jw1gq92wzlnhd17dmszv9m2c3wbzs9p9f"))
(modules '((guix build utils)))
(snippet
'(begin
@ -532,7 +532,7 @@ (define-public micropython
(arguments
`(#:phases
(modify-phases %standard-phases
(add-before 'build 'preprare-build
(add-before 'build 'prepare-build
(lambda _
(chdir "ports/unix")
;; see: https://github.com/micropython/micropython/pull/4246

30
gnu/packages/ruby.scm
View file

@ -17,6 +17,7 @@
;;; Copyright © 2019 Mikhail Kirillov <w96k.ru@gmail.com>
;;; Copyright © 2019 Jelle Licht <jlicht@fsfe.org>
;;; Copyright © 2019 Brian Leung <bkleung89@gmail.com>
;;; Copyright © 2019 Collin J. Doering <collin@rekahsoft.ca>
;;;
;;; This file is part of GNU Guix.
;;;
@ -670,6 +671,35 @@ (define-public ruby-rspec-rerun
(home-page "https://github.com/dblock/rspec-rerun")
(license license:expat)))
(define-public ruby-rspec-wait
(package
(name "ruby-rspec-wait")
(version "0.0.9")
(source
(origin
(method url-fetch)
(uri (rubygems-uri "rspec-wait" version))
(sha256
(base32
"0gvj1bp5ccx001dyvcgk2j49s5sl6vs9fdaqqb08z3bd1554hsww"))))
(build-system ruby-build-system)
(arguments
'(#:phases
(modify-phases %standard-phases
(replace 'check
(lambda _
(invoke "rake" "spec"))))))
(native-inputs
`(("bundler" ,bundler)))
(propagated-inputs
`(("ruby-rspec" ,ruby-rspec)))
(home-page "https://github.com/laserlemon/rspec-wait")
(synopsis "Wait for conditions in RSpec")
(description
"RSpec::Wait strives to make it easier to test asynchronous or slow
interactions.")
(license license:expat)))
(define-public ruby-rspec
(package
(name "ruby-rspec")

105
gnu/packages/shellutils.scm
View file

@ -5,6 +5,7 @@
;;; Copyright © 2017 Stefan Reichör <stefan@xsteve.at>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Benjamin Slade <slade@jnanam.net>
;;; Copyright © 2019 Collin J. Doering <collin@rekahsoft.ca>
;;;
;;; This file is part of GNU Guix.
;;;
@ -22,21 +23,107 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages shellutils)
#:use-module (gnu packages base)
#:use-module (gnu packages golang)
#:use-module (gnu packages python)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix utils)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (gnu packages autotools)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages readline)
#:use-module (gnu packages pkg-config)
#:use-module (guix utils)
#:use-module (guix build-system gnu)
#:use-module (guix build-system go)
#:use-module (guix build-system python))
#:use-module (guix build-system python)
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
#:use-module (gnu packages golang)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages readline)
#:use-module (gnu packages ruby)
#:use-module (gnu packages shells)
#:use-module (gnu packages tmux))
(define-public zsh-autosuggestions
(package
(name "zsh-autosuggestions")
(version "0.6.3")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/zsh-users/zsh-autosuggestions.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1h8h2mz9wpjpymgl2p7pc146c1jgb3dggpvzwm9ln3in336wl95c"))))
(build-system gnu-build-system)
(native-inputs
`(("ruby" ,ruby)
("ruby-byebug" ,ruby-byebug)
("ruby-pry" ,ruby-pry)
("ruby-rspec" ,ruby-rspec)
("ruby-rspec-wait" ,ruby-rspec-wait)
("tmux" ,tmux)
("zsh" ,zsh)))
(arguments
'(#:phases
(modify-phases %standard-phases
(delete 'configure)
(replace 'check ; Tests use ruby's bundler; instead execute rspec directly.
(lambda _
(setenv "TMUX_TMPDIR" (getenv "TMPDIR"))
(setenv "SHELL" (which "zsh"))
(invoke "rspec")))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(zsh-plugins
(string-append out "/share/zsh/plugins/zsh-autosuggestions")))
(invoke "make" "all")
(install-file "zsh-autosuggestions.zsh" zsh-plugins)
#t))))))
(home-page "https://github.com/zsh-users/zsh-autosuggestions")
(synopsis "Fish-like autosuggestions for zsh")
(description
"Fish-like fast/unobtrusive autosuggestions for zsh. It suggests commands
as you type.")
(license license:expat)))
(define-public sh-z
(package
(name "sh-z")
(version "1.11")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rupa/z.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"13zbgkj6y0qhvn5jpkrqbd4jjxjr789k228iwma5hjfh1nx7ghyb"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; No tests provided
#:phases
(modify-phases %standard-phases
(delete 'configure)
(delete 'build)
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(man (string-append out "/share/man/man1"))
(bin (string-append out "/bin")))
(install-file "z.sh" bin)
(chmod (string-append bin "/z.sh") #o755)
(install-file "z.1" man)
#t))))))
(synopsis "Jump about directories")
(description
"Tracks your most used directories, based on ``frecency''. After a short
learning phase, z will take you to the most ``frecent'' directory that matches
all of the regexes given on the command line in order.")
(home-page "https://github.com/rupa/z")
(license license:expat)))
(define-public envstore
(package

21
gnu/packages/sphinx.scm
View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 David Thompson <davet@gnu.org>
;;; Copyright © 2015, 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015, 2017, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015, 2016, 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2016, 2017, 2018, 2019 Marius Bakke <mbakke@fastmail.com>
@ -163,6 +163,25 @@ (define-public python-sphinxcontrib-applehelp
Apple help books.")
(license license:bsd-2)))
(define-public python-sphinx-copybutton
(package
(name "python-sphinx-copybutton")
(version "0.2.5")
(source
(origin
(method url-fetch)
(uri (pypi-uri "sphinx-copybutton" version))
(sha256
(base32
"1bk006nv5s9ym6v67cxd4d2wvd8wm6czqi21mqcs33risygksncl"))))
(build-system python-build-system)
(home-page "https://github.com/choldgraf/sphinx-copybutton")
(synopsis "Sphinx extension to add \"copy\" buttons to code blocks")
(description
"This package provides a small sphinx extension to add \"copy\" buttons
to code blocks.")
(license license:expat)))
(define-public python-sphinxcontrib-devhelp
(package
(name "python-sphinxcontrib-devhelp")

36
gnu/packages/statistics.scm
View file

@ -49,6 +49,7 @@ (define-module (gnu packages statistics)
#:use-module (gnu packages curl)
#:use-module (gnu packages emacs)
#:use-module (gnu packages emacs-xyz)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages gcc)
#:use-module (gnu packages gtk)
#:use-module (gnu packages gettext)
@ -1199,23 +1200,24 @@ (define-public r-ggdendro
(define-public r-gdtools
(package
(name "r-gdtools")
(version "0.1.9")
(version "0.2.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "gdtools" version))
(sha256
(base32
"0w4fihf52q5qxxk0lg36x6yvjjl8vw66y60ncdjs5fvnxqn5z2vb"))))
"1mvpkp8cj30fwd4bwlz96x3cff7yzfbfz7iswmf77zl0a6122inh"))))
(build-system r-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
`(("cairo" ,cairo)
("freetype2" ,freetype)
("zlib" ,zlib)))
(propagated-inputs
`(("r-rcpp" ,r-rcpp)
("r-withr" ,r-withr)))
("r-systemfonts" ,r-systemfonts)))
(home-page "https://cran.r-project.org/web/packages/gdtools")
(synopsis "Utilities for graphical rendering")
(description
@ -2436,18 +2438,24 @@ (define-public r-rstudioapi
(define-public r-devtools
(package
(name "r-devtools")
(version "2.1.0")
(version "2.2.0")
(source (origin
(method url-fetch)
(uri (cran-uri "devtools" version))
(sha256
(base32
"0393v7nr22gr5g9afgrhq4ab3lwbqy6fd3shnmlhdpqam5357xy1"))))
"05fag25mkqy13yja8x32aqr9c0ah9rbm8cfjcsmy1dv5h4j8cxa1"))))
(build-system r-build-system)
(propagated-inputs
`(("r-callr" ,r-callr)
("r-cli" ,r-cli)
("r-covr" ,r-covr)
("r-crayon" ,r-crayon)
("r-desc" ,r-desc)
("r-digest" ,r-digest)
("r-dt" ,r-dt)
("r-ellipsis" ,r-ellipsis)
("r-glue" ,r-glue)
("r-git2r" ,r-git2r)
("r-httr" ,r-httr)
("r-jsonlite" ,r-jsonlite)
@ -2458,6 +2466,7 @@ (define-public r-devtools
("r-roxygen2" ,r-roxygen2)
("r-remotes" ,r-remotes)
("r-rstudioapi" ,r-rstudioapi)
("r-rversions" ,r-rversions)
("r-sessioninfo" ,r-sessioninfo)
("r-testthat" ,r-testthat)
("r-usethis" ,r-usethis)
@ -2598,13 +2607,13 @@ (define-public r-latticeextra
(define-public r-rcpparmadillo
(package
(name "r-rcpparmadillo")
(version "0.9.600.4.0")
(version "0.9.700.2.0")
(source (origin
(method url-fetch)
(uri (cran-uri "RcppArmadillo" version))
(sha256
(base32
"07jg2667xyhmp1fbcdi5nnhmkk81da76s9rlswfq4k2sjsmbfmr0"))))
"0g25w32dnqrvhnri8x4yxqawxd8qhn7w3m8d29nxxy0gybx3y8x9"))))
(properties `((upstream-name . "RcppArmadillo")))
(build-system r-build-system)
;; All needed for vignettes
@ -3645,13 +3654,13 @@ (define-public r-mvtnorm
(define-public r-matrixstats
(package
(name "r-matrixstats")
(version "0.54.0")
(version "0.55.0")
(source (origin
(method url-fetch)
(uri (cran-uri "matrixStats" version))
(sha256
(base32
"0vx00ldsg2zvdrjn49jxczk2c9iaabgvzgpdka5j02ihh7hv83cg"))))
"06fvx0rlaz80k0lkqq2n7v0309xpz7h7ss0m9kgyikp4xs8bvmhn"))))
(properties `((upstream-name . "matrixStats")))
(build-system r-build-system)
(native-inputs
@ -3748,25 +3757,28 @@ (define-public r-tidyselect
(define-public r-tidyr
(package
(name "r-tidyr")
(version "0.8.3")
(version "1.0.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "tidyr" version))
(sha256
(base32
"0dyc4b03wi65bk7j0ma0y188syh37h57wgxji82i0h8j6pn593x1"))))
"1403j0xd93l0r7qj738ryd5zc79hbcghrzybib3c3hrnaq5s78cj"))))
(build-system r-build-system)
(propagated-inputs
`(("r-dplyr" ,r-dplyr)
("r-ellipsis" ,r-ellipsis)
("r-magrittr" ,r-magrittr)
("r-glue" ,r-glue)
("r-lifecycle" ,r-lifecycle)
("r-purrr" ,r-purrr)
("r-rlang" ,r-rlang)
("r-tidyselect" ,r-tidyselect)
("r-rcpp" ,r-rcpp)
("r-stringi" ,r-stringi)
("r-tibble" ,r-tibble)))
("r-tibble" ,r-tibble)
("r-vctrs" ,r-vctrs)))
(home-page "https://github.com/hadley/tidyr")
(synopsis "Tidy data with `spread()` and `gather()` functions")
(description

28
gnu/packages/suckless.scm
View file

@ -724,3 +724,31 @@ (define-public lchat
It is a front end for ii-like chat programs. It uses @code{tail -f} to get the
chat output in the background.")
(license license:isc))))
(define-public scron
(package
(name "scron")
(version "0.4")
(source
(origin
(method url-fetch)
(uri (string-append "https://dl.2f30.org/releases/"
name "-" version ".tar.gz"))
(sha256
(base32
"066fwa55kqcgfrsqgxh94sqbkxfsr691360xg4ljxr4i75d25s2a"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; No tests
#:make-flags (list "CC=gcc"
(string-append "PREFIX=" %output))
#:phases
(modify-phases %standard-phases
(delete 'configure)))) ; No configure script
(home-page "https://git.2f30.org/scron/")
(synopsis "Simple cron daemon")
(description
"Schedule commands to be run at specified dates and times.
Single daemon and configuration file. Log to stdout or syslog. No mail
support.")
(license license:expat)))

4
gnu/packages/sync.scm
View file

@ -264,14 +264,14 @@ (define-public casync
(define-public rclone
(package
(name "rclone")
(version "1.49.1")
(version "1.49.2")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/rclone/rclone/releases/download/"
"v" version "/rclone-v" version ".tar.gz"))
(sha256
(base32 "1d0qvj7fn5bx3zqlf6hzn1922nrmy4x341n760m1b6h9az32mc5x"))))
(base32 "1q8lf85hg2havb1xsal75r19ck166rh19lffpd3i43zgblc6gs8j"))))
;; FIXME: Rclone bundles some libraries Guix already provides. Need to
;; un-bundle them.
(build-system go-build-system)

7
gnu/packages/terminals.scm
View file

@ -7,7 +7,7 @@
;;; Copyright © 2016, 2017 José Miguel Sánchez García <jmi2k@openmailbox.org>
;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Petter <petter@mykolab.ch>
;;; Copyright © 2018 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
@ -460,7 +460,7 @@ (define-public unibilium
(define-public libvterm
(package
(name "libvterm")
(version "0+bzr681")
(version "0.1")
(source
(origin
(method url-fetch)
@ -468,12 +468,13 @@ (define-public libvterm
"libvterm-" version ".tar.gz"))
(sha256
(base32
"1s56c8p1qz6frkcri0hg4qyydv2wcccj6n2xmz1dwcdqn38ldsmb"))))
"1pcxjhvdwhr2f3lyzf2rv1vp3l62bgkjm1ybhj82qf8yly7ca6g4"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags
(list "CC=gcc"
(string-append "PREFIX=" (assoc-ref %outputs "out")))
#:tests? #f ; XXX: some tests fail in this release
#:test-target "test"
#:phases
(modify-phases %standard-phases

9
gnu/packages/tex.scm
View file

@ -6827,17 +6827,14 @@ (define-public texlive-xypic
"/fonts/afm/public/xypic/"
"/fonts/tfm/public/xypic/"
"/fonts/type1/public/xypic/"
;;"/tex/generic/xypic/" ; I guess these are generated
)
"/tex/generic/xypic/")
(base32
"0sqkkvjzzsiazvh8803qqyrcv4is3m1qs9x9v2m35jjikbqc08y8"))))
"09b51bbm189xh7039h5n8nmab5nn2bybhh26qjn08763m80zdhjg")
#:trivial? #t)))
(package
(inherit template)
(arguments
(substitute-keyword-arguments (package-arguments template)
((#:tex-directory _ #t)
"tex/generic/xypic")
((#:phases phases)
`(modify-phases ,phases
(delete 'reset-gzip-timestamps)))))

51
gnu/packages/textutils.scm
View file

@ -13,7 +13,7 @@
;;; Copyright © 2017,2019 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2018 Meiyo Peng <meiyo.peng@gmail.com>
;;; Copyright © 2019 Yoshinori Arai <kumagusu08@gmail.com>
@ -89,23 +89,22 @@ (define-public dos2unix
(define-public recode
(package
(name "recode")
(version "3.7.1")
(version "3.7.5")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/rrthomas/recode/releases/"
"download/v" version "/" name "-" version ".tar.gz"))
"download/v" version "/recode-" version ".tar.gz"))
(sha256
(base32
"0215hfj0rhlh0grg91qfx75pp6z09bpv8211qdxqihniw7y9a4fs"))
(base32 "1sl99dfx2b76paq86wv3a0lcy66f1hylf6iy04rzwxj7ccwpsk30"))
(modules '((guix build utils)))
(snippet '(begin
(delete-file "tests/Recode.c")
#t))))
(build-system gnu-build-system)
(native-inputs
`(("python" ,python-2)
("python2-cython" ,python2-cython)))
`(("python" ,python)
("python-cython" ,python-cython)))
(home-page "https://github.com/rrthomas/recode")
(synopsis "Text encoding converter")
(description "The Recode library converts files between character sets and
@ -879,6 +878,44 @@ (define-public docx2txt
(home-page "http://docx2txt.sourceforge.net")
(license license:gpl3+)))
(define-public odt2txt
(package
(name "odt2txt")
(version "0.5")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/dstosberg/odt2txt/")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0im3kzvhxkjlx57w6h13mc9584c74ma1dyymgvpq2y61av3gc35v"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no make check
#:make-flags (list "CC=gcc"
(string-append "DESTDIR=" (assoc-ref %outputs "out")))
#:phases
(modify-phases %standard-phases
;; no configure script
(delete 'configure))))
(inputs
`(("zlib" ,zlib)))
(home-page "https://github.com/dstosberg/odt2txt/")
(synopsis "Converter from OpenDocument Text to plain text")
(description "odt2txt is a command-line tool which extracts the text out
of OpenDocument Texts, as produced by OpenOffice.org, KOffice, StarOffice and
others.
odt2txt can also extract text from some file formats similar to OpenDocument
Text, such as OpenOffice.org XML (*.sxw), which was used by OpenOffice.org
version 1.x and older StarOffice versions. To a lesser extent, odt2txt may be
useful to extract content from OpenDocument spreadsheets (*.ods) and
OpenDocument presentations (*.odp).")
(license license:gpl2)))
(define-public opencc
(package
(name "opencc")

19
gnu/packages/tls.scm
View file

@ -271,6 +271,7 @@ (define-public openssl
(package
(name "openssl")
(version "1.1.1c")
(replacement openssl-1.1.1d)
(source (origin
(method url-fetch)
(uri (list (string-append "https://www.openssl.org/source/openssl-"
@ -372,6 +373,24 @@ (define-public openssl
(license license:openssl)
(home-page "https://www.openssl.org/")))
(define openssl-1.1.1d
(package/inherit
openssl
(version "1.1.1d")
(source (origin
(method url-fetch)
(uri (list (string-append "https://www.openssl.org/source/openssl-"
version ".tar.gz")
(string-append "ftp://ftp.openssl.org/source/"
"openssl-" version ".tar.gz")
(string-append "ftp://ftp.openssl.org/source/old/"
(string-trim-right version char-set:letter)
"/openssl-" version ".tar.gz")))
(patches (search-patches "openssl-1.1-c-rehash-in.patch"))
(sha256
(base32
"1whinyw402z3b9xlb3qaxv4b9sk4w1bgh9k0y8df1z4x3yy92fhy"))))))
(define-public openssl-1.0
(package
(inherit openssl)

4
gnu/packages/video.scm
View file

@ -1492,7 +1492,7 @@ (define-public libvpx-1.7
(define-public youtube-dl
(package
(name "youtube-dl")
(version "2019.08.13")
(version "2019.09.12")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/rg3/youtube-dl/releases/"
@ -1500,7 +1500,7 @@ (define-public youtube-dl
version ".tar.gz"))
(sha256
(base32
"0b94hrhbqa7jhn91pxsbphg2ylwkpkknb2y4v4sczp7rjvgmjgdj"))))
"0wmc0rl4l08hnz3agh69ld1pcmjs7czg0d2k7mnnlxhwlwi38w56"))))
(build-system python-build-system)
(arguments
;; The problem here is that the directory for the man page and completion

13
gnu/packages/vim.scm
View file

@ -735,7 +735,7 @@ (define-public neovim-syntastic
(define-public neovim
(package
(name "neovim")
(version "0.3.7")
(version "0.4.2")
(source
(origin
(method git-fetch)
@ -745,7 +745,7 @@ (define-public neovim
(file-name (git-file-name name version))
(sha256
(base32
"1j6w5jvq5v7kf7diad91qs1acr427nidnk9s24yyrz0hwdd1c2lh"))))
"13w446plvgl219lhj29jyimhiqvs1y1byrz4qpdmxgyddmx9xqss"))))
(build-system cmake-build-system)
(arguments
`(#:modules ((srfi srfi-26)
@ -754,13 +754,6 @@ (define-public neovim
#:configure-flags '("-DPREFER_LUA:BOOL=YES")
#:phases
(modify-phases %standard-phases
;; TODO: remove 'patch-tic on update
;; see: https://github.com/neovim/neovim/issues/9687
(add-after 'unpack 'patch-tic
(lambda _
(substitute* "src/nvim/tui/tui.c"
(("value != NULL") "value != NULL && value != (char *)-1"))
#t))
(add-after 'unpack 'set-lua-paths
(lambda* (#:key inputs #:allow-other-keys)
(let* ((lua-version "5.1")
@ -774,6 +767,7 @@ (define-public neovim
(string-append path "/?.lua;" path "/?/?.lua"))))
(lua-inputs (map (cute assoc-ref %build-inputs <>)
'("lua"
"lua-luv"
"lua-lpeg"
"lua-bitop"
"lua-libmpack"))))
@ -791,6 +785,7 @@ (define-public neovim
("jemalloc" ,jemalloc)
("libiconv" ,libiconv)
("lua" ,lua-5.1)
("lua-luv" ,lua5.1-luv)
("lua-lpeg" ,lua5.1-lpeg)
("lua-bitop" ,lua5.1-bitop)
("lua-libmpack" ,lua5.1-libmpack)))

17
gnu/packages/virtualization.scm
View file

@ -411,7 +411,10 @@ (define-public libvirt
(build-system gnu-build-system)
(arguments
`(#:configure-flags
(list "--with-polkit"
(list "--with-qemu"
"--with-qemu-user=nobody"
"--with-qemu-group=kvm"
"--with-polkit"
(string-append "--docdir=" (assoc-ref %outputs "out") "/share/doc/"
,name "-" ,version)
"--sysconfdir=/etc"
@ -450,23 +453,13 @@ (define-public libvirt
(apply invoke "make" "install"
"sysconfdir=/tmp/etc"
"localstatedir=/tmp/var"
make-flags)))
(add-after 'install 'wrap-libvirtd
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(wrap-program (string-append out "/sbin/libvirtd")
`("PATH" = (,(string-append (assoc-ref inputs "iproute")
"/sbin")
,(string-append (assoc-ref inputs "qemu")
"/bin"))))
#t))))))
make-flags))))))
(inputs
`(("libxml2" ,libxml2)
("eudev" ,eudev)
("libpciaccess" ,libpciaccess)
("gnutls" ,gnutls)
("dbus" ,dbus)
("qemu" ,qemu)
("libpcap" ,libpcap)
("libnl" ,libnl)
("libtirpc" ,libtirpc) ;for <rpc/rpc.h>

8
gnu/packages/vpn.scm
View file

@ -239,13 +239,13 @@ (define-public ocproxy
(define-public openconnect
(package
(name "openconnect")
(version "8.04")
(version "8.05")
(source (origin
(method url-fetch)
(uri (string-append "ftp://ftp.infradead.org/pub/openconnect/"
"openconnect-" version ".tar.gz"))
(sha256
(base32 "07zqcl2ykdc4mgix9sbv4jgpg7cybifxfgrycvf99ckq7xp9r5wq"))))
(base32 "14i9q727c2zc9xhzp1a9hz3gzb5lwgsslbhircm84dnbs192jp1k"))))
(build-system gnu-build-system)
(propagated-inputs
`(("libxml2" ,libxml2)
@ -452,14 +452,14 @@ (define-public badvpn
(define-public wireguard
(package
(name "wireguard")
(version "0.0.20190702")
(version "0.0.20190913")
(source (origin
(method url-fetch)
(uri (string-append "https://git.zx2c4.com/WireGuard/snapshot/"
"WireGuard-" version ".tar.xz"))
(sha256
(base32
"1b5s1ncwqxdgb0c6cd07x4ynnj6cpbiqp4bxqir7mm5bf6y124qs"))))
"06452jfibwar4sh7wf2k2k1a5qk5q703gxqqq5ymj6rdblc2fwwr"))))
(build-system gnu-build-system)
(outputs '("out" ; The WireGuard userspace tools
"kernel-patch")) ; A patch to build Linux with WireGuard support

4
gnu/packages/vulkan.scm
View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
@ -52,7 +52,7 @@ (define-public spirv-headers
(sha256
(base32
"0m56smanfcczjfif4yfcqhjj4d4sc088kwg6dgia8fwdsjavdm4d"))
(file-name (string-append name "-" version "-checkout"))))
(file-name (git-file-name name version))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ;; No tests

4
gnu/packages/web-browsers.scm
View file

@ -93,14 +93,14 @@ (define-public dillo
(define-public links
(package
(name "links")
(version "2.19")
(version "2.20.1")
(source (origin
(method url-fetch)
(uri (string-append "http://links.twibright.com/download/"
"links-" version ".tar.bz2"))
(sha256
(base32
"02ls11c02p7xvsdjyb43rrzr850i1yly003r812z0w5vv5yqqxbh"))))
"0184g59cxxhg9dqg5gv66f30f1wg8sx957pp5rs7b8icnwnafa5v"))))
(build-system gnu-build-system)
(arguments
`(#:phases

6
gnu/packages/web.scm
View file

@ -6389,7 +6389,7 @@ (define-public nghttp2
(method url-fetch)
(uri (string-append "https://github.com/nghttp2/nghttp2/"
"releases/download/v" version "/"
name "-" version ".tar.xz"))
"nghttp2-" version ".tar.xz"))
(sha256
(base32
"0j0lk37k8k3f61r9nw647hg4b22z1753l36n3xrp9x01civ614b7"))))
@ -6602,7 +6602,7 @@ (define-public anonip
(define-public poussetaches
(package
(name "poussetaches")
(version "0.0.1")
(version "0.0.2")
(source
(origin
(method git-fetch)
@ -6612,7 +6612,7 @@ (define-public poussetaches
(file-name (git-file-name name version))
(sha256
(base32
"07106kfcz3a39jvrv3mlqqxlihsmdhgkrjnqznyjsij9absgvdv6"))))
"0kckcwvqklavd855np9aq5js6mg84isrlwchr504yigwma0sm7hm"))))
(build-system go-build-system)
(propagated-inputs
`(("go-github-com-robfig-cron" ,go-github-com-robfig-cron)

68
gnu/packages/wget.scm
View file

@ -21,15 +21,13 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages wget)
#:use-module (guix licenses)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages)
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
#:use-module (gnu packages compression)
#:use-module (gnu packages documentation)
#:use-module (gnu packages flex)
#:use-module (gnu packages gettext)
#:use-module (gnu packages gnunet)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages libidn)
#:use-module (gnu packages pcre)
#:use-module (gnu packages perl)
@ -40,7 +38,6 @@ (define-module (gnu packages wget)
#:use-module (gnu packages xdisorg)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system gnu))
(define-public wget
@ -74,7 +71,7 @@ (define-public wget
HTTPS and FTP protocols. It can resume interrupted downloads, use file name
wild cards, supports proxies and cookies, and it can convert absolute links
in downloaded documents to relative links.")
(license gpl3+))) ; some files are under GPLv2+
(license license:gpl3+))) ; some files are under GPLv2+
(define-public wgetpaste
(package
@ -136,68 +133,47 @@ (define-public wgetpaste
(description
"@code{wgetpaste} is an extremely simple command-line interface to various
online pastebin services.")
(license public-domain)))
(license license:public-domain)))
(define-public wget2
(package
(name "wget2")
(version "1.99.1")
(version "1.99.2")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.com/gnuwget/wget2.git")
(commit (string-append name "-" version))
(recursive? #t))) ;; Needed for 'gnulib' git submodule.
(file-name (string-append name "-" version "-checkout"))
(method url-fetch)
(uri (string-append "mirror://gnu/wget/wget2-" version ".tar.gz"))
(sha256
(base32
"15wxsnjhc6bzk7f60i1djmsarh1w31gwi5h2gh9k19ncwypfj5dm"))))
"0qv55f4bablrlhc8bnic8g3mkk1kq44c4cphrk5jmv92z9aqzi6b"))))
(build-system gnu-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'skip-network-test
(add-after 'unpack 'skip-network-tests
(lambda _
(substitute* "tests/Makefile.am"
(("test-auth-digest\\$\\(EXEEXT)") ""))
#t))
(replace 'bootstrap
(lambda _
;; Make sure all the files are writable so that ./bootstrap
;; can proceed.
(for-each (lambda (file)
(chmod file #o755))
(find-files "."))
(patch-shebang "./gnulib/gnulib-tool.py")
;; Remove unnecessary inputs from bootstrap.conf
(substitute* "bootstrap.conf"
(("flex.*") "")
(("makeinfo.*") "")
(("lzip.*") "")
(("rsync.*") ""))
(invoke "sh" "./bootstrap"
"--gnulib-srcdir=gnulib"
"--no-git"))))))
(substitute* "tests/Makefile.in"
(("test-gpg-verify-no-file\\$\\(EXEEXT)") "")
(("test-gpg-valid\\$\\(EXEEXT)") "")
(("test-gpg-styles\\$\\(EXEEXT)") ""))
#t)))
#:configure-flags '("--enable-static=no")))
(inputs
`(("gnutls" ,gnutls/dane)
`(("bzip2" ,bzip2)
("gnutls" ,gnutls/dane)
("gpgme" ,gpgme)
("libiconv" ,libiconv)
("libidn2" ,libidn2)
("libmicrohttpd" ,libmicrohttpd)
("libpsl" ,libpsl)
("pcre2" ,pcre2)))
("pcre2" ,pcre2)
("zlib" ,zlib)))
;; TODO: Add libbrotlidec, libnghttp2.
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("flex" ,flex)
("gettext" ,gettext-minimal)
("libtool" ,libtool)
("pkg-config" ,pkg-config)
("python" ,python-2)))
`(("pkg-config" ,pkg-config)))
(home-page "https://gitlab.com/gnuwget/wget2")
(synopsis "Successor of GNU Wget")
(description "GNU Wget2 is the successor of GNU Wget, a file and recursive
website downloader. Designed and written from scratch it wraps around libwget,
that provides the basic functions needed by a web client.")
(license (list gpl3+ lgpl3+))))
(license (list license:gpl3+ license:lgpl3+))))

6
gnu/packages/wine.scm
View file

@ -318,7 +318,7 @@ (define-public wine-minimal
(define-public wine-staging-patchset-data
(package
(name "wine-staging-patchset-data")
(version "4.15")
(version "4.16")
(source
(origin
(method git-fetch)
@ -328,7 +328,7 @@ (define-public wine-staging-patchset-data
(file-name (git-file-name name version))
(sha256
(base32
"13g40h2ybcl6vab4zbl1ksqfqyly5hzxssza9dv8r5pmp8x54hgr"))))
"0zkvwl6rxr6xcqk4a3h43cak67w6bcyqqnajz6azif07ir3z1c61"))))
(build-system trivial-build-system)
(native-inputs
`(("bash" ,bash)
@ -374,7 +374,7 @@ (define-public wine-staging
(file-name (string-append name "-" version ".tar.xz"))
(sha256
(base32
"0bfh4vd99zwj7f4108zvs80dfvmmnnsap7i6gmf21jgcly3paygq"))))
"17qxbddv23ibbayw1ai984m0dlq63cgplms2jhsc09incjhafywd"))))
(inputs `(("autoconf" ,autoconf) ; for autoreconf
("faudio" ,faudio)
("ffmpeg" ,ffmpeg)

135
gnu/packages/wm.scm
View file

@ -21,6 +21,7 @@
;;; Copyright © 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2019 Timothy Sample <samplet@ngyro.com>
;;; Copyright © 2019 Gábor Boskovits <boskovits@gmail.com>
;;; Copyright © 2019 Kyle Andrews <kyle.c.andrews@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -127,6 +128,86 @@ (define-public bspwm
the leaves of a full binary tree.")
(license license:bsd-2)))
(define-public herbstluftwm
(package
(name "herbstluftwm")
(version "0.7.2")
(source
(origin
(method url-fetch)
(uri (string-append "https://herbstluftwm.org/tarballs/herbstluftwm-"
version ".tar.gz"))
(sha256
(base32
"1kc18aj9j3nfz6fj4qxg9s3gg4jvn6kzi3ii24hfm0vqdpy17xnz"))
(file-name (string-append "herbstluftwm-" version ".tar.gz"))))
(build-system gnu-build-system)
(inputs
`(("dzen" ,dzen)
("dmenu" ,dmenu)
("glib" ,glib)
("glibmm" ,glibmm)
("xterm" ,xterm)
("xsetroot" ,xsetroot)
("libx11" ,libx11)
("libxext" ,libxext)
("libxinerama" ,libxinerama)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(arguments
'(#:phases
(modify-phases %standard-phases
(delete 'configure)
(delete 'check)
(add-after 'install 'install-xsession
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(xsessions (string-append out "/share/xsessions")))
(mkdir-p xsessions)
(call-with-output-file
(string-append xsessions "/herbstluftwm.desktop")
(lambda (port)
(format port "~
[Desktop Entry]~@
Name=herbstluftwm~@
Comment=Manual tiling window manager~@
Exec=~a/bin/herbstluftwm~@
Type=XSession~%" out)))
#t))))
#:tests? #f
#:make-flags
(let ((out (assoc-ref %outputs "out")))
(list "CC=gcc"
(string-append "PREFIX=''")
(string-append "DESTDIR=" out)
(string-append "BASHCOMPLETIONDIR=" out
"/etc/bash_completion.d")))))
(synopsis "Tiling window manager for X11")
(description "herbstluftwm is a manual tiling window manager for X11 using
Xlib and GLib. Its main features are:
@itemize
@item
The layout is based on splitting frames into subframes which can be split
again or can be filled with windows (similar to i3 or musca).
@item
Tags (or workspaces or virtual desktops or …) can be added/removed at runtime.
Each tag contains an own layout.
@item
Exactly one tag is viewed on each monitor. The tags are monitor independent
(similar to Xmonad).
@item
It is configured at runtime via IPC calls from @command{herbstclient}. So the
configuration file is just a script which is run on startup (similar to wmii
or musca).
@end itemize")
(home-page "https://herbstluftwm.org")
(license license:bsd-2)))
(define-public i3status
(package
(name "i3status")
@ -270,42 +351,30 @@ (define-public i3lock
(license license:bsd-3)))
(define-public i3blocks
(let ((commit "ec050e79ad8489a6f8deb37d4c20ab10729c25c3")
(revision "2"))
(package
(name "i3blocks")
(version (string-append "1.4-" revision "."
(string-take commit 7)))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/vivien/i3blocks.git")
(commit commit)))
(sha256
(base32
"1fx4230lmqa5rpzph68dwnpcjfaaqv5gfkradcr85hd1z8d1qp1b"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(arguments
`(#:make-flags (list "CC=gcc" (string-append "PREFIX=" %output))
#:phases (modify-phases %standard-phases
(add-after 'install 'install-doc
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(man1 (string-append out "/share/man/man1")))
(install-file "docs/i3blocks.1" man1)
#t))))))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("pkg-config" ,pkg-config)))
(home-page "https://github.com/vivien/i3blocks")
(synopsis "Minimalist scheduler for status bar scripts")
(description "i3blocks executes your command lines and generates a
(package
(name "i3blocks")
(version "1.5")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/vivien/i3blocks.git")
(commit version)))
(sha256
(base32
"0v8mwnm8qzpv6xnqvrk43s4b9iyld4naqzbaxk4ldq1qkhai0wsv"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("pkg-config" ,pkg-config)))
(home-page "https://github.com/vivien/i3blocks")
(synopsis "Minimalist scheduler for status bar scripts")
(description "i3blocks executes your command lines and generates a
status line from their output. The generated line is meant to be displayed by
the i3 window manager through its i3bar component, as an alternative to
i3status.")
(license license:gpl3+))))
(license license:gpl3+)))
(define-public perl-anyevent-i3
(package

38
gnu/packages/xfce.scm
View file

@ -9,6 +9,7 @@
;;; Copyright © 2017 ng0 <ng0@n0.is>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Pkill -9 <pkill9@runbox.com>
;;; Copyright © 2019 L p R n d n <guix@lprndn.info>
;;;
;;; This file is part of GNU Guix.
;;;
@ -283,11 +284,14 @@ (define-public tumbler
(inputs
`(("dbus" ,dbus)
("gdk-pixbuf" ,gdk-pixbuf)
("cairo" ,cairo) ;; Needed for pdf thumbnails (poppler-glibc.pc)
("freetype" ,freetype)
("libjpeg" ,libjpeg)
("libgsf" ,libgsf)
("poppler" ,poppler)
("gstreamer" ,gstreamer)))
;; FIXME Provide gstreamer and gstreamer-tag to get video thumbnails
;; ("gstreamer" ,gstreamer)
))
(home-page "https://www.xfce.org/")
(synopsis "D-Bus service for applications to request thumbnails")
(description
@ -638,7 +642,7 @@ (define-public xfce4-settings
(define-public thunar
(package
(name "thunar")
(version "1.8.7")
(version "1.8.9")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/xfce/"
@ -646,7 +650,7 @@ (define-public thunar
"Thunar-" version ".tar.bz2"))
(sha256
(base32
"0afkp528mwwa2m18m39mvw53qgaijyynrw9wwwiyxgjiczq3l0ry"))))
"1fah2d7v3a7fp28xa5wv896rap1iad9q9y04qchca09mq1x8wxbs"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
@ -670,7 +674,7 @@ (define-public thunar
(define-public thunar-volman
(package
(name "thunar-volman")
(version "0.9.3")
(version "0.9.5")
(source
(origin
(method url-fetch)
@ -678,7 +682,7 @@ (define-public thunar-volman
(version-major+minor version) "/"
"thunar-volman-" version ".tar.bz2"))
(sha256
(base32 "1sfmz40164rg77hclrkrgnbk8cb7f325qqi7lz2hh3wbvf8r0c19"))))
(base32 "0dqqkbhn43hhmhqyx1fnmawpvysdjzw6ln4ryf629wil6dlwd9vy"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
@ -907,7 +911,7 @@ (define-public xfce4-power-manager
(define-public ristretto
(package
(name "ristretto")
(version "0.8.4")
(version "0.10.0")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/apps/ristretto/"
@ -915,14 +919,14 @@ (define-public ristretto
"ristretto-" version ".tar.bz2"))
(sha256
(base32
"18nf01djwnbjc91bdlv3p0h6pwcq1kfnjgp6yaxhxv4kdi9f82rs"))))
"0sa75m1w6yvv4xvzrwqiif6vnqgi29hjrixrh87nxss58bbms8hn"))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)
("pkg-config" ,pkg-config)))
(inputs
`(("desktop-file-utils" ,desktop-file-utils)
("gtk+" ,gtk+-2)
("gtk+" ,gtk+)
("libexif" ,libexif)
("libxfce4ui" ,libxfce4ui)
("librsvg" ,librsvg)
@ -978,6 +982,14 @@ (define-public orage
(sha256
(base32
"0qlhvnl2m33vfxqlbkic2nmfpwyd4mq230jzhs48cg78392amy9w"))))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-build-with-libical3
(lambda* _
(substitute* "src/ical-code.c" ;; .is_utc not available in libical3
((".*\\.is_utc.*$") ""))
#t)))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)
@ -1068,7 +1080,7 @@ (define-public xfburn
(define-public mousepad
(package
(name "mousepad")
(version "0.4.1")
(version "0.4.2")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/apps/mousepad/"
@ -1076,11 +1088,10 @@ (define-public mousepad
version ".tar.bz2"))
(sha256
(base32
"12si6fvhp68wz4scr339c23jxqq5ywn5nf4w55jld5lxjadkg9rr"))))
"1myy7954r1a30dk7inwy7kwki7zvfbnnsc3a8swk72vzrbgjmh44"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags '("--enable-gtk3"
;; Use the GSettings keyfile backend rather than
'(#:configure-flags '(;; Use the GSettings keyfile backend rather than
;; DConf.
"--enable-keyfile-settings")
#:phases
@ -1100,7 +1111,8 @@ (define-public mousepad
("pkg-config" ,pkg-config)))
(inputs
`(("gtk+" ,gtk+)
("gtksourceview" ,gtksourceview-3)))
("gtksourceview" ,gtksourceview-3)
("xfconf" ,xfconf)))
(home-page "https://git.xfce.org/apps/mousepad/")
(synopsis "Simple text editor for Xfce")
(description

9
gnu/services/base.scm
View file

@ -8,6 +8,7 @@
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 John Soo <jsoo1@asu.edu>
;;;
;;; This file is part of GNU Guix.
@ -41,9 +42,9 @@ (define-module (gnu services base)
#:use-module (gnu packages admin)
#:use-module ((gnu packages linux)
#:select (alsa-utils crda eudev e2fsprogs fuse gpm kbd lvm2 rng-tools))
#:use-module ((gnu packages base)
#:select (canonical-package glibc glibc-utf8-locales))
#:use-module (gnu packages bash)
#:use-module ((gnu packages base)
#:select (canonical-package coreutils glibc glibc-utf8-locales))
#:use-module (gnu packages package-management)
#:use-module ((gnu packages gnupg) #:select (guile-gcrypt))
#:use-module (gnu packages linux)
@ -2425,6 +2426,8 @@ (define %base-services
(service special-files-service-type
`(("/bin/sh" ,(file-append (canonical-package bash)
"/bin/sh"))))))
"/bin/sh"))
("/usr/bin/env" ,(file-append (canonical-package coreutils)
"/bin/env"))))))
;;; base.scm ends here

1
gnu/services/certbot.scm
View file

@ -99,6 +99,7 @@ (define certbot-command
"--manual"
(string-append "--preferred-challenges=" challenge)
"--cert-name" name
"--manual-public-ip-logging-ok"
"-d" (string-join domains ","))
(if rsa-key-size `("--rsa-key-size" ,rsa-key-size) '())
(if authentication-hook

199
gnu/services/networking.scm
View file

@ -51,6 +51,7 @@ (define-module (gnu services networking)
#:use-module (guix records)
#:use-module (guix modules)
#:use-module (guix deprecation)
#:use-module (rnrs enums)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-9)
#:use-module (srfi srfi-26)
@ -72,13 +73,22 @@ (define-module (gnu services networking)
dhcpd-configuration-pid-file
dhcpd-configuration-interfaces
%ntp-servers
ntp-configuration
ntp-configuration?
ntp-configuration-ntp
ntp-configuration-servers
ntp-allow-large-adjustment?
%ntp-servers
ntp-server
ntp-server-type
ntp-server-address
ntp-server-options
ntp-service
ntp-service-type
%openntpd-servers
openntpd-configuration
openntpd-configuration?
openntpd-service-type
@ -292,30 +302,86 @@ (define dhcpd-service-type
(list (service-extension shepherd-root-service-type dhcpd-shepherd-service)
(service-extension activation-service-type dhcpd-activation)))))
(define %ntp-servers
;; Default set of NTP servers. These URLs are managed by the NTP Pool project.
;; Within Guix, Leo Famulari <leo@famulari.name> is the administrative contact
;; for this NTP pool "zone".
'("0.guix.pool.ntp.org"
"1.guix.pool.ntp.org"
"2.guix.pool.ntp.org"
"3.guix.pool.ntp.org"))
;;;
;;; NTP.
;;;
;; TODO: Export.
(define ntp-server-types (make-enumeration
'(pool
server
peer
broadcast
manycastclient)))
(define-record-type* <ntp-server>
ntp-server make-ntp-server
ntp-server?
;; The type can be one of the symbols of the NTP-SERVER-TYPE? enumeration.
(type ntp-server-type
(default 'server))
(address ntp-server-address) ; a string
;; The list of options can contain single option names or tuples in the form
;; '(name value).
(options ntp-server-options
(default '())))
(define (ntp-server->string ntp-server)
;; Serialize the NTP server object as a string, ready to use in the NTP
;; configuration file.
(define (flatten lst)
(reverse
(let loop ((x lst)
(res '()))
(if (list? x)
(fold loop res x)
(cons (format #f "~s" x) res)))))
(match ntp-server
(($ <ntp-server> type address options)
;; XXX: It'd be neater if fields were validated at the syntax level (for
;; static ones at least). Perhaps the Guix record type could support a
;; predicate property on a field?
(unless (enum-set-member? type ntp-server-types)
(error "Invalid NTP server type" type))
(string-join (cons* (symbol->string type)
address
(flatten options))))))
(define %ntp-servers
;; Default set of NTP servers. These URLs are managed by the NTP Pool project.
;; Within Guix, Leo Famulari <leo@famulari.name> is the administrative contact
;; for this NTP pool "zone".
(list
(ntp-server
(type 'pool)
(address "0.guix.pool.ntp.org")
(options '("iburst"))))) ;as recommended in the ntpd manual
(define-record-type* <ntp-configuration>
ntp-configuration make-ntp-configuration
ntp-configuration?
(ntp ntp-configuration-ntp
(default ntp))
(servers ntp-configuration-servers
(servers %ntp-configuration-servers ;list of <ntp-server> objects
(default %ntp-servers))
(allow-large-adjustment? ntp-allow-large-adjustment?
(default #f)))
(default #t))) ;as recommended in the ntpd manual
(define (ntp-configuration-servers ntp-configuration)
;; A wrapper to support the deprecated form of this field.
(let ((ntp-servers (%ntp-configuration-servers ntp-configuration)))
(match ntp-servers
(((? string?) (? string?) ...)
(format (current-error-port) "warning: Defining NTP servers as strings is \
deprecated. Please use <ntp-server> records instead.\n")
(map (lambda (addr)
(ntp-server
(type 'server)
(address addr)
(options '()))) ntp-servers))
((($ <ntp-server>) ($ <ntp-server>) ...)
ntp-servers))))
(define ntp-shepherd-service
(match-lambda
@ -324,18 +390,21 @@ (define ntp-shepherd-service
;; TODO: Add authentication support.
(define config
(string-append "driftfile /var/run/ntpd/ntp.drift\n"
(string-join (map (cut string-append "server " <>)
servers)
(string-join (map ntp-server->string servers)
"\n")
"
# Disable status queries as a workaround for CVE-2013-5211:
# <http://support.ntp.org/bin/view/Main/SecurityNotice#DRDoS_Amplification_Attack_using>.
restrict default kod nomodify notrap nopeer noquery
restrict -6 default kod nomodify notrap nopeer noquery
restrict default kod nomodify notrap nopeer noquery limited
restrict -6 default kod nomodify notrap nopeer noquery limited
# Yet, allow use of the local 'ntpq'.
restrict 127.0.0.1
restrict -6 ::1\n"))
restrict -6 ::1
# This is required to use servers from a pool directive when using the 'nopeer'
# option by default, as documented in the 'ntp.conf' manual.
restrict source notrap nomodify noquery\n"))
(define ntpd.conf
(plain-file "ntpd.conf" config))
@ -409,6 +478,9 @@ (define-deprecated (ntp-service #:key (ntp ntp)
;;; OpenNTPD.
;;;
(define %openntpd-servers
(map ntp-server-address %ntp-servers))
(define-record-type* <openntpd-configuration>
openntpd-configuration make-openntpd-configuration
openntpd-configuration?
@ -422,9 +494,9 @@ (define-record-type* <openntpd-configuration>
(sensor openntpd-sensor
(default '()))
(server openntpd-server
(default %ntp-servers))
(servers openntpd-servers
(default '()))
(servers openntpd-servers
(default %openntpd-servers))
(constraint-from openntpd-constraint-from
(default '()))
(constraints-from openntpd-constraints-from
@ -432,45 +504,58 @@ (define-record-type* <openntpd-configuration>
(allow-large-adjustment? openntpd-allow-large-adjustment?
(default #f))) ; upstream default
(define (openntpd-shepherd-service config)
(define (openntpd-configuration->string config)
(define (quote-field? name)
(member name '("constraints from")))
(match-record config <openntpd-configuration>
(openntpd listen-on query-from sensor server servers constraint-from
constraints-from allow-large-adjustment?)
(let ()
(define config
(string-join
(filter-map
(lambda (field value)
(string-join
(map (cut string-append field <> "\n")
value)))
'("listen on " "query from " "sensor " "server " "servers "
"constraint from ")
(list listen-on query-from sensor server servers constraint-from))
;; The 'constraints from' field needs to be enclosed in double quotes.
(string-join
(map (cut string-append "constraints from \"" <> "\"\n")
constraints-from))))
(listen-on query-from sensor server servers constraint-from
constraints-from)
(string-append
(string-join
(concatenate
(filter-map (lambda (field values)
(match values
(() #f) ;discard entry with filter-map
((val ...) ;validate value type
(map (lambda (value)
(if (quote-field? field)
(format #f "~a \"~a\"" field value)
(format #f "~a ~a" field value)))
values))))
;; The entry names.
'("listen on" "query from" "sensor" "server" "servers"
"constraint from" "constraints from")
;; The corresponding entry values.
(list listen-on query-from sensor server servers
constraint-from constraints-from)))
"\n")
"\n"))) ;add a trailing newline
(define ntpd.conf
(plain-file "ntpd.conf" config))
(define (openntpd-shepherd-service config)
(let ((openntpd (openntpd-configuration-openntpd config))
(allow-large-adjustment? (openntpd-allow-large-adjustment? config)))
(list (shepherd-service
(provision '(ntpd))
(documentation "Run the Network Time Protocol (NTP) daemon.")
(requirement '(user-processes networking))
(start #~(make-forkexec-constructor
(list (string-append #$openntpd "/sbin/ntpd")
"-f" #$ntpd.conf
"-d" ;; don't daemonize
#$@(if allow-large-adjustment?
'("-s")
'()))
;; When ntpd is daemonized it repeatedly tries to respawn
;; while running, leading shepherd to disable it. To
;; prevent spamming stderr, redirect output to logfile.
#:log-file "/var/log/ntpd"))
(stop #~(make-kill-destructor)))))))
(define ntpd.conf
(plain-file "ntpd.conf" (openntpd-configuration->string config)))
(list (shepherd-service
(provision '(ntpd))
(documentation "Run the Network Time Protocol (NTP) daemon.")
(requirement '(user-processes networking))
(start #~(make-forkexec-constructor
(list (string-append #$openntpd "/sbin/ntpd")
"-f" #$ntpd.conf
"-d" ;; don't daemonize
#$@(if allow-large-adjustment?
'("-s")
'()))
;; When ntpd is daemonized it repeatedly tries to respawn
;; while running, leading shepherd to disable it. To
;; prevent spamming stderr, redirect output to logfile.
#:log-file "/var/log/ntpd"))
(stop #~(make-kill-destructor))))))
(define (openntpd-service-activation config)
"Return the activation gexp for CONFIG."

11
gnu/services/virtualization.scm
View file

@ -432,7 +432,10 @@ (define (libvirt-shepherd-service config)
(provision '(libvirtd))
(start #~(make-forkexec-constructor
(list (string-append #$libvirt "/sbin/libvirtd")
"-f" #$config-file)))
"-f" #$config-file)
#:environment-variables
;; For finding qemu binaries.
'("PATH=/run/current-system/profile/bin")))
(stop #~(make-kill-destructor))))))
(define libvirt-service-type
@ -442,8 +445,10 @@ (define libvirt-service-type
(service-extension polkit-service-type
(compose list libvirt-configuration-libvirt))
(service-extension profile-service-type
(compose list
libvirt-configuration-libvirt))
(lambda (config)
(list
(libvirt-configuration-libvirt config)
qemu)))
(service-extension activation-service-type
%libvirt-activation)
(service-extension shepherd-root-service-type

2
gnu/system/file-systems.scm
View file

@ -508,7 +508,7 @@ (define %network-file-mappings
;; symlink to a file in a tmpfs which, for an unknown reason,
;; cannot be bind mounted read-only within the container.
(writable? (string=? file "/etc/resolv.conf"))))
%network-configuration-files))
(cons "/var/run/nscd" %network-configuration-files)))
(define (file-system-type-predicate type)
"Return a predicate that, when passed a file system, returns #t if that file

59
gnu/system/linux-container.scm
View file

@ -30,6 +30,7 @@ (define-module (gnu system linux-container)
#:use-module (gnu build linux-container)
#:use-module (gnu services)
#:use-module (gnu services base)
#:use-module (gnu services networking)
#:use-module (gnu services shepherd)
#:use-module (gnu system)
#:use-module (gnu system file-systems)
@ -109,7 +110,11 @@ (define useless-services
;; Remove nscd service if network is shared with the host.
(if shared-network?
(list nscd-service-type
static-networking-service-type)
static-networking-service-type
dhcp-client-service-type
network-manager-service-type
connman-service-type
wicd-service-type)
(list))))
(operating-system
@ -147,13 +152,6 @@ (define* (container-script os #:key (mappings '()) shared-network?)
"Return a derivation of a script that runs OS as a Linux container.
MAPPINGS is a list of <file-system> objects that specify the files/directories
that will be shared with the host system."
(define nscd-run-directory "/var/run/nscd")
(define nscd-mapping
(file-system-mapping
(source nscd-run-directory)
(target nscd-run-directory)))
(define (mountable-file-system? file-system)
;; Return #t if FILE-SYSTEM should be mounted in the container.
(and (not (string=? "/" (file-system-mount-point file-system)))
@ -168,28 +166,42 @@ (define (os-file-system-specs os)
os (cons %store-mapping mappings)
#:shared-network? shared-network?
#:extra-file-systems %container-file-systems))
(nscd-os (containerized-operating-system
os (cons* nscd-mapping %store-mapping mappings)
#:shared-network? shared-network?
#:extra-file-systems %container-file-systems))
(specs (os-file-system-specs os))
(nscd-specs (os-file-system-specs nscd-os)))
(specs (os-file-system-specs os)))
(define script
(with-imported-modules (source-module-closure
'((guix build utils)
(gnu build linux-container)))
(gnu build linux-container)
(guix i18n)
(guix diagnostics)))
#~(begin
(use-modules (gnu build linux-container)
(gnu system file-systems) ;spec->file-system
(guix build utils))
(guix build utils)
(guix i18n)
(guix diagnostics)
(srfi srfi-1))
(call-with-container
(map spec->file-system
(if (and #$shared-network?
(file-exists? #$nscd-run-directory))
'#$nscd-specs
'#$specs))
(define file-systems
(filter-map (lambda (spec)
(let* ((fs (spec->file-system spec))
(flags (file-system-flags fs)))
(and (or (not (memq 'bind-mount flags))
(file-exists? (file-system-device fs)))
fs)))
'#$specs))
(define (explain pid)
;; XXX: We can't quite call 'bindtextdomain' so there's actually
;; no i18n.
(info (G_ "system container is running as PID ~a~%") pid)
;; XXX: Should we recommend 'guix container exec'? It's more
;; verbose and doesn't bring much.
(info (G_ "Run 'sudo nsenter -a -t ~a' to get a shell into it.~%")
pid)
(newline (guix-warning-port)))
(call-with-container file-systems
(lambda ()
(setenv "HOME" "/root")
(setenv "TMPDIR" "/tmp")
@ -203,7 +215,8 @@ (define script
#:host-uids 65536
#:namespaces (if #$shared-network?
(delq 'net %namespaces)
%namespaces)))))
%namespaces)
#:process-spawned-hook explain))))
(gexp->script "run-container" script)))

5
guix/build/cargo-build-system.scm
View file

@ -99,7 +99,7 @@ (define* (configure #:key inputs
(for-each
(match-lambda
((name . path)
(let* ((basepath (basename path))
(let* ((basepath (strip-store-file-name path))
(crate-dir (string-append vendor-dir "/" basepath)))
(and (crate-src? path)
;; Gracefully handle duplicate inputs
@ -168,9 +168,6 @@ (define* (check #:key
(apply invoke `("cargo" "test" ,@cargo-test-flags))
#t))
(define (touch file-name)
(call-with-output-file file-name (const #t)))
(define* (install #:key inputs outputs skip-build? #:allow-other-keys)
"Install a given Cargo package."
(let* ((out (assoc-ref outputs "out")))

43
guix/docker.scm
View file

@ -57,22 +57,36 @@ (define (image-description id time)
(created . ,time)
(container_config . #nil)))
(define (generate-tag path)
"Generate an image tag for the given PATH."
(match (string-split (basename path) #\-)
((hash name . rest) (string-append name ":" hash))))
(define (canonicalize-repository-name name)
"\"Repository\" names are restricted to roughtl [a-z0-9_.-].
Return a version of TAG that follows these rules."
(define ascii-letters
(string->char-set "abcdefghijklmnopqrstuvwxyz"))
(define (manifest path id)
(define separators
(string->char-set "_-."))
(define repo-char-set
(char-set-union char-set:digit ascii-letters separators))
(string-map (lambda (chr)
(if (char-set-contains? repo-char-set chr)
chr
#\.))
(string-trim (string-downcase name) separators)))
(define* (manifest path id #:optional (tag "guix"))
"Generate a simple image manifest."
`#(((Config . "config.json")
(RepoTags . #(,(generate-tag path)))
(Layers . #(,(string-append id "/layer.tar"))))))
(let ((tag (canonicalize-repository-name tag)))
`#(((Config . "config.json")
(RepoTags . #(,(string-append tag ":latest")))
(Layers . #(,(string-append id "/layer.tar")))))))
;; According to the specifications this is required for backwards
;; compatibility. It duplicates information provided by the manifest.
(define (repositories path id)
(define* (repositories path id #:optional (tag "guix"))
"Generate a repositories file referencing PATH and the image ID."
`((,(generate-tag path) . ((latest . ,id)))))
`((,(canonicalize-repository-name tag) . ((latest . ,id)))))
;; See https://github.com/opencontainers/image-spec/blob/master/config.md
(define* (config layer time arch #:key entry-point (environment '()))
@ -112,6 +126,7 @@ (define directive-file
(define* (build-docker-image image paths prefix
#:key
(repository "guix")
(extra-files '())
(transformations '())
(system (utsname:machine (uname)))
@ -121,7 +136,9 @@ (define* (build-docker-image image paths prefix
compressor
(creation-time (current-time time-utc)))
"Write to IMAGE a Docker image archive containing the given PATHS. PREFIX
must be a store path that is a prefix of any store paths in PATHS.
must be a store path that is a prefix of any store paths in PATHS. REPOSITORY
is a descriptive name that will show up in \"REPOSITORY\" column of the output
of \"docker images\".
When DATABASE is true, copy it to /var/guix/db in the image and create
/var/guix/gcroots and friends.
@ -243,10 +260,10 @@ (define transformation-options
#:entry-point entry-point))))
(with-output-to-file "manifest.json"
(lambda ()
(scm->json (manifest prefix id))))
(scm->json (manifest prefix id repository))))
(with-output-to-file "repositories"
(lambda ()
(scm->json (repositories prefix id)))))
(scm->json (repositories prefix id repository)))))
(apply invoke "tar" "-cf" image "-C" directory
`(,@%tar-determinism-options

44
guix/gnu-maintenance.scm
View file

@ -62,7 +62,6 @@ (define-module (guix gnu-maintenance)
%gnu-updater
%gnu-ftp-updater
%kde-updater
%xorg-updater
%kernel.org-updater))
@ -230,12 +229,6 @@ (define (ftp-server/directory package)
(or (assoc-ref (package-properties package) 'ftp-directory)
(string-append "/gnu/" name)))))
(define (sans-extension tarball)
"Return TARBALL without its .tar.* or .zip extension."
(let ((end (or (string-contains tarball ".tar")
(string-contains tarball ".zip"))))
(substring tarball 0 end)))
(define %tarball-rx
;; The .zip extensions is notably used for freefont-ttf.
;; The "-src" pattern is for "TeXmacs-1.0.7.9-src.tar.gz".
@ -261,14 +254,15 @@ (define (release-file? project file)
(string-append project
"-src")))))))
(not (regexp-exec %alpha-tarball-rx file))
(let ((s (sans-extension file)))
(let ((s (tarball-sans-extension file)))
(regexp-exec %package-name-rx s))))
(define (tarball->version tarball)
"Return the version TARBALL corresponds to. TARBALL is a file name like
\"coreutils-8.23.tar.xz\"."
(let-values (((name version)
(gnu-package-name->name+version (sans-extension tarball))))
(gnu-package-name->name+version
(tarball-sans-extension tarball))))
version))
(define* (releases project
@ -492,8 +486,9 @@ (define (url->release url)
(and (string=? url (basename url)) ;relative reference?
(release-file? package url)
(let-values (((name version)
(package-name->name+version (sans-extension url)
#\-)))
(package-name->name+version
(tarball-sans-extension url)
#\-)))
(upstream-source
(package name)
(version version)
@ -565,14 +560,16 @@ (define (latest-gnu-release package)
(release-file? name (basename file))))
files)))
(match (sort relevant (lambda (file1 file2)
(version>? (sans-extension (basename file1))
(sans-extension (basename file2)))))
(version>? (tarball-sans-extension
(basename file1))
(tarball-sans-extension
(basename file2)))))
((and tarballs (reference _ ...))
(let* ((version (tarball->version reference))
(tarballs (filter (lambda (file)
(string=? (sans-extension
(string=? (tarball-sans-extension
(basename file))
(sans-extension
(tarball-sans-extension
(basename reference))))
tarballs)))
(upstream-source
@ -615,16 +612,6 @@ (define (pure-gnu-package? package)
(define gnu-hosted?
(url-prefix-predicate "mirror://gnu/"))
(define (latest-kde-release package)
"Return the latest release of PACKAGE, the name of an KDE.org package."
(let ((uri (string->uri (origin-uri (package-source package)))))
(false-if-ftp-error
(latest-ftp-release
(package-upstream-name package)
#:server "ftp.mirrorservice.org"
#:directory (string-append "/sites/ftp.kde.org/pub/kde/"
(dirname (dirname (uri-path uri))))))))
(define (latest-xorg-release package)
"Return the latest release of PACKAGE, the name of an X.org package."
(let ((uri (string->uri (origin-uri (package-source package)))))
@ -672,13 +659,6 @@ (define %gnu-ftp-updater
(pure-gnu-package? package))))
(latest latest-release*)))
(define %kde-updater
(upstream-updater
(name 'kde)
(description "Updater for KDE packages")
(pred (url-prefix-predicate "mirror://kde/"))
(latest latest-kde-release)))
(define %xorg-updater
(upstream-updater
(name 'xorg)

1
guix/import/cran.scm
View file

@ -49,6 +49,7 @@ (define-module (guix import cran)
cran-recursive-import
%cran-updater
%bioconductor-updater
%bioconductor-version
cran-package?
bioconductor-package?

29
guix/import/crate.scm
View file

@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 David Craven <david@craven.ch>
;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2019 Martin Becze <mjbecze@riseup.net>
;;;
;;; This file is part of GNU Guix.
;;;
@ -181,9 +182,11 @@ (define %dual-license-rx
;; This regexp matches that.
(make-regexp "^(.*) OR (.*)$"))
(define (crate->guix-package crate-name)
(define* (crate->guix-package crate-name #:optional version)
"Fetch the metadata for CRATE-NAME from crates.io, and return the
`package' s-expression corresponding to that package, or #f on failure."
`package' s-expression corresponding to that package, or #f on failure.
When VERSION is specified, attempt to fetch that version; otherwise fetch the
latest version of CRATE-NAME."
(define (string->license string)
(match (regexp-exec %dual-license-rx string)
(#f (list (spdx-string->license string)))
@ -196,12 +199,18 @@ (define (normal-dependency? dependency)
(define crate
(lookup-crate crate-name))
(and crate
(let* ((version (find (lambda (version)
(string=? (crate-version-number version)
(crate-latest-version crate)))
(crate-versions crate)))
(dependencies (crate-version-dependencies version))
(define version-number
(or version
(crate-latest-version crate)))
(define version*
(find (lambda (version)
(string=? (crate-version-number version)
version-number))
(crate-versions crate)))
(and crate version*
(let* ((dependencies (crate-version-dependencies version*))
(dep-crates (filter normal-dependency? dependencies))
(dev-dep-crates (remove normal-dependency? dependencies))
(cargo-inputs (sort (map crate-dependency-id dep-crates)
@ -210,14 +219,14 @@ (define crate
(sort (map crate-dependency-id dev-dep-crates)
string-ci<?)))
(make-crate-sexp #:name crate-name
#:version (crate-version-number version)
#:version (crate-version-number version*)
#:cargo-inputs cargo-inputs
#:cargo-development-inputs cargo-development-inputs
#:home-page (or (crate-home-page crate)
(crate-repository crate))
#:synopsis (crate-description crate)
#:description (crate-description crate)
#:license (and=> (crate-version-license version)
#:license (and=> (crate-version-license version*)
string->license)))))
(define (guix-package->crate-name package)

2
guix/import/github.scm
View file

@ -161,7 +161,7 @@ (define (decorate url)
url))
(match (json-fetch (decorate release-url) #:headers headers)
(()
(#()
;; We got the empty list, presumably because the user didn't use GitHub's
;; "release" mechanism, but hopefully they did use Git tags.
(json-fetch (decorate tag-url) #:headers headers))

190
guix/import/kde.scm Normal file
View file

@ -0,0 +1,190 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 David Craven <david@craven.ch>
;;; Copyright © 2016, 2017 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2019 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;;
;;; This file is part of GNU Guix.
;;;
;;; GNU Guix is free software; you can redistribute it and/or modify it
;;; under the terms of the GNU General Public License as published by
;;; the Free Software Foundation; either version 3 of the License, or (at
;;; your option) any later version.
;;;
;;; GNU Guix is distributed in the hope that it will be useful, but
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;;; GNU General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (guix import kde)
#:use-module (guix http-client)
#:use-module (guix memoization)
#:use-module (guix gnu-maintenance)
#:use-module (guix packages)
#:use-module (guix upstream)
#:use-module (guix utils)
#:use-module (ice-9 match)
#:use-module (ice-9 rdelim)
#:use-module (ice-9 regex)
#:use-module (srfi srfi-11)
#:use-module (web uri)
#:export (%kde-updater))
;;; Commentary:
;;;
;;; This package provides not an actual importer but simply an updater for
;;; KDE packages. It grabs available files from the 'ls-lR.bz2' file
;;; available on download.kde.org.
;;;
;;; Code:
(define (tarball->version tarball)
"Return the version TARBALL corresponds to. TARBALL is a file name like
\"coreutils-8.23.tar.xz\"."
(let-values (((name version)
(gnu-package-name->name+version
(tarball-sans-extension tarball))))
version))
(define %kde-file-list-uri
;; URI of the file list (ls -lR format) for download.kde.org.
(string->uri "https://download.kde.org/ls-lR.bz2"))
(define (download.kde.org-files)
;;"Return the list of files available at download.kde.org."
(define (ls-lR-line->filename path line)
;; Remove mode, blocks, user, group, size, date, time and one space,
;; then prepend PATH
(regexp-substitute
#f (string-match "^(\\S+\\s+){6}\\S+\\s" line) path 'post))
(define (canonicalize path)
(let* ((path (if (string-prefix? "/srv/archives/ftp/" path)
(string-drop path (string-length "/srv/archives/ftp"))
path))
(path (if (string-suffix? ":" path)
(string-drop-right path 1)
path))
(path (if (not (string-suffix? "/" path))
(string-append path "/")
path)))
path))
(define (write-cache input cache)
"Read bzipped ls-lR from INPUT, and write it as a list of file paths to
CACHE."
(call-with-decompressed-port 'bzip2 input
(lambda (input)
(let loop_dirs ((files '()))
;; process a new directory block
(let ((path (read-line input)))
(if
(or (eof-object? path) (string= path ""))
(write (reverse files) cache)
(let loop_entries ((path (canonicalize path))
(files files))
;; process entries within the directory block
(let ((line (read-line input)))
(cond
((eof-object? line)
(write (reverse files) cache))
((string-prefix? "-" line)
;; this is a file entry: prepend to FILES, then re-enter
;; the loop for remaining entries
(loop_entries path
(cons (ls-lR-line->filename path line) files)
))
((not (string= line ""))
;; this is a non-file entry: ignore it, just re-enter the
;; loop for remaining entries
(loop_entries path files))
;; empty line: directory block end, re-enter the outer
;; loop for the next block
(#t (loop_dirs files)))))))))))
(define (cache-miss uri)
(format (current-error-port) "fetching ~a...~%" (uri->string uri)))
(let* ((port (http-fetch/cached %kde-file-list-uri
#:ttl 3600
#:write-cache write-cache
#:cache-miss cache-miss))
(files (read port)))
(close-port port)
files))
(define (uri->kde-path-pattern uri)
"Build a regexp from the package's URI suitable for matching the package
path version-agnostic.
Example:
Input:
mirror://kde//stable/frameworks/5.55/portingAids/kross-5.55.0.zip
Output:
//stable/frameworks/[^/]+/portingAids/
"
(define version-regexp
;; regexp for matching versions as used in the ld-lR file
(make-regexp
(string-join '("^([0-9]+\\.)+[0-9]+-?" ;; 5.12.90, 4.2.0-preview
"^[0-9]+$" ;; 20031002
".*-([0-9]+\\.)+[0-9]+$") ;; kdepim-4.6.1
"|")))
(define (version->pattern part)
;; If a path element might be a version, replace it by a catch-all part
(if (regexp-exec version-regexp part)
"[^/]+"
part))
(let* ((path (uri-path uri))
(directory-parts (string-split (dirname path) #\/)))
(make-regexp
(string-append
(string-join (map version->pattern directory-parts) "/")
"/"))))
(define (latest-kde-release package)
"Return the latest release of PACKAGE, a KDE package, or #f if it could
not be determined."
(let* ((uri (string->uri (origin-uri (package-source package))))
(path-rx (uri->kde-path-pattern uri))
(name (package-upstream-name package))
(files (download.kde.org-files))
(relevant (filter (lambda (file)
(and (regexp-exec path-rx file)
(release-file? name (basename file))))
files)))
(match (sort relevant (lambda (file1 file2)
(version>? (tarball-sans-extension
(basename file1))
(tarball-sans-extension
(basename file2)))))
((and tarballs (reference _ ...))
(let* ((version (tarball->version reference))
(tarballs (filter (lambda (file)
(string=? (tarball-sans-extension
(basename file))
(tarball-sans-extension
(basename reference))))
tarballs)))
(upstream-source
(package name)
(version version)
(urls (map (lambda (file)
(string-append "mirror://kde/" file))
tarballs)))))
(()
#f))))
(define %kde-updater
(upstream-updater
(name 'kde)
(description "Updater for KDE packages")
(pred (url-prefix-predicate "mirror://kde/"))
(latest latest-kde-release)))

17
guix/import/utils.scm
View file

@ -212,10 +212,19 @@ (define (snake-case str)
(define (beautify-description description)
"Improve the package DESCRIPTION by turning a beginning sentence fragment
into a proper sentence and by using two spaces between sentences."
(let ((cleaned (if (string-prefix? "A " description)
(string-append "This package provides a"
(substring description 1))
description)))
(let ((cleaned (cond
((string-prefix? "A " description)
(string-append "This package provides a"
(substring description 1)))
((string-prefix? "Provides " description)
(string-append "This package provides"
(substring description
(string-length "Provides"))))
((string-prefix? "Functions " description)
(string-append "This package provides functions"
(substring description
(string-length "Functions"))))
(else description))))
;; Use double spacing between sentences
(regexp-substitute/global #f "\\. \\b"
cleaned 'pre ". " 'post)))

2
guix/packages.scm
View file

@ -352,7 +352,7 @@ (define (goto port line column)
(match (package-location package)
(($ <location> file line column)
(catch 'system
(catch 'system-error
(lambda ()
;; In general we want to keep relative file names for modules.
(with-fluids ((%file-port-name-canonicalization 'relative))

13
guix/scripts/environment.scm
View file

@ -463,6 +463,10 @@ (define* (launch-environment/container #:key command bash user user-mappings
target of USER-MAPPINGS will be re-written relative to '/home/USER', and USER
will be used for the passwd entry. LINK-PROFILE? creates a symbolic link from
~/.guix-profile to the environment profile."
(define (optional-mapping->fs mapping)
(and (file-exists? (file-system-mapping-source mapping))
(file-system-mapping->bind-mount mapping)))
(mlet %store-monad ((reqs (inputs->requisites
(list (direct-store-path bash) profile))))
(return
@ -499,11 +503,6 @@ (define* (launch-environment/container #:key command bash user user-mappings
(target cwd)
(writable? #t)))
'())))
;; When in Rome, do as Nix build.cc does: Automagically
;; map common network configuration files.
(if network?
%network-file-mappings
'())
;; Mappings for the union closure of all inputs.
(map (lambda (dir)
(file-system-mapping
@ -512,6 +511,10 @@ (define* (launch-environment/container #:key command bash user user-mappings
(writable? #f)))
reqs)))
(file-systems (append %container-file-systems
(if network?
(filter-map optional-mapping->fs
%network-file-mappings)
'())
(map file-system-mapping->bind-mount
mappings))))
(exit/status

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