ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 15:36:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into staging

Browse source
This commit is contained in:
Marius Bakke 2020-03-09 21:45:32 +01:00
commit b3b5714fa7
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
93 changed files with 1790 additions and 848 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/contributing.texi
View file

@ -12,7 +12,7 @@ particularly welcome help on packaging (@pxref{Packaging Guidelines}).
We want to provide a warm, friendly, and harassment-free environment, so
that anyone can contribute to the best of their abilities. To this end
our project uses a ``Contributor Covenant'', which was adapted from
@url{http://contributor-covenant.org/}. You can find a local version in
@url{https://contributor-covenant.org/}. You can find a local version in
the @file{CODE-OF-CONDUCT} file in the source tree.
Contributors are not required to use their legal name in patches and

14
doc/guix.texi
View file

@ -74,6 +74,7 @@ Copyright @copyright{} 2019, 2020 Simon Tournier@*
Copyright @copyright{} 2020 Wiktor Żelazny@*
Copyright @copyright{} 2020 Damien Cassou@*
Copyright @copyright{} 2020 Jakub Kądziołka@*
Copyright @copyright{} 2020 Jack Hill@*
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
@ -21008,6 +21009,10 @@ and several @code{domains}.
Mandatory email used for registration, recovery contact, and important
account notifications.
@item @code{server} (default: @code{#f})
Optional URL of ACME server. Setting this overrides certbot's default,
which is the Let's Encrypt server.
@item @code{rsa-key-size} (default: @code{2048})
Size of the RSA key.
@ -22445,6 +22450,9 @@ Only evaluate specifications and build derivations once.
When substituting a pre-built binary fails, fall back to building
packages locally.
@item @code{extra-options} (default: @code{'()})
Extra options to pass when running the Cuirass processes.
@item @code{cuirass} (default: @code{cuirass})
The Cuirass package to use.
@end table
@ -25245,6 +25253,12 @@ If set, this is the @code{getmail-retriever-configuration} object with
which to configure getmail to fetch mail from the guix-commits mailing
list.
@item @code{extra-options} (default: @var{'()})
Extra command line options for @code{guix-data-service}.
@item @code{extra-process-jobs-options} (default: @var{'()})
Extra command line options for @code{guix-data-service-process-jobs}.
@end table
@end deftp

10
gnu/local.mk
View file

@ -714,10 +714,11 @@ dist_patch_DATA = \
%D%/packages/patches/aegisub-boost68.patch \
%D%/packages/patches/agg-am_c_prototype.patch \
%D%/packages/patches/akonadi-paths.patch \
%D%/packages/patches/akonadi-Revert-Make-installation-properly-relocatabl.patch \
%D%/packages/patches/akonadi-Revert-Make-installation-properly-relo.patch \
%D%/packages/patches/akonadi-timestamps.patch \
%D%/packages/patches/allegro-mesa-18.2.5-and-later.patch \
%D%/packages/patches/amule-crypto-6.patch \
%D%/packages/patches/anki-mpv-args.patch \
%D%/packages/patches/antiword-CVE-2014-8123.patch \
%D%/packages/patches/antlr3-3_1-fix-java8-compilation.patch \
%D%/packages/patches/antlr3-3_3-fix-java8-compilation.patch \
@ -979,7 +980,6 @@ dist_patch_DATA = \
%D%/packages/patches/guile-2.2-skip-oom-test.patch \
%D%/packages/patches/guile-default-utf8.patch \
%D%/packages/patches/guile-gdbm-ffi-support-gdbm-1.14.patch \
%D%/packages/patches/guile-finalization-crash.patch \
%D%/packages/patches/guile-linux-syscalls.patch \
%D%/packages/patches/guile-present-coding.patch \
%D%/packages/patches/guile-relocatable.patch \
@ -1114,7 +1114,6 @@ dist_patch_DATA = \
%D%/packages/patches/libmpeg2-global-symbol-test.patch \
%D%/packages/patches/libmygpo-qt-fix-qt-5.11.patch \
%D%/packages/patches/libmygpo-qt-missing-qt5-modules.patch \
%D%/packages/patches/libseccomp-open-aarch64.patch \
%D%/packages/patches/libsndfile-armhf-type-checks.patch \
%D%/packages/patches/libsndfile-CVE-2017-8361-8363-8365.patch \
%D%/packages/patches/libsndfile-CVE-2017-8362.patch \
@ -1255,7 +1254,7 @@ dist_patch_DATA = \
%D%/packages/patches/sdl-pango-api_additions.patch \
%D%/packages/patches/sdl-pango-blit_overflow.patch \
%D%/packages/patches/sdl-pango-fillrect_crash.patch \
%D%/packages/patches/sdl-pango-fix-explicit-SDLPango_CopyFTBitmapToSurface.patch \
%D%/packages/patches/sdl-pango-fix-explicit-SDLPango_CopyFTBitmapTo.patch \
%D%/packages/patches/sdl-pango-matrix_declarations.patch \
%D%/packages/patches/sdl-pango-sans-serif.patch \
%D%/packages/patches/patchutils-test-perms.patch \
@ -1348,6 +1347,7 @@ dist_patch_DATA = \
%D%/packages/patches/qemu-CVE-2020-1711.patch \
%D%/packages/patches/qemu-CVE-2020-7039.patch \
%D%/packages/patches/qemu-CVE-2020-7211.patch \
%D%/packages/patches/qemu-CVE-2020-8608.patch \
%D%/packages/patches/qemu-fix-documentation-build-failure.patch \
%D%/packages/patches/qrcodegen-cpp-make-install.patch \
%D%/packages/patches/qt4-ldflags.patch \
@ -1406,7 +1406,6 @@ dist_patch_DATA = \
%D%/packages/patches/snappy-add-O2-flag-in-CmakeLists.txt.patch \
%D%/packages/patches/sooperlooper-build-with-wx-30.patch \
%D%/packages/patches/soundconverter-remove-gconf-dependency.patch \
%D%/packages/patches/spice-fix-test-armhf.patch \
%D%/packages/patches/steghide-fixes.patch \
%D%/packages/patches/suitesparse-mongoose-cmake.patch \
%D%/packages/patches/superlu-dist-awpm-grid.patch \
@ -1488,7 +1487,6 @@ dist_patch_DATA = \
%D%/packages/patches/wicd-wpa2-ttls.patch \
%D%/packages/patches/wmctrl-64-fix.patch \
%D%/packages/patches/wmfire-update-for-new-gdk-versions.patch \
%D%/packages/patches/woff2-libbrotli.patch \
%D%/packages/patches/wordnet-CVE-2008-2149.patch \
%D%/packages/patches/wordnet-CVE-2008-3908-pt1.patch \
%D%/packages/patches/wordnet-CVE-2008-3908-pt2.patch \

4
gnu/packages/admin.scm
View file

@ -211,10 +211,10 @@ (define-public shepherd
`(("pkg-config" ,pkg-config)
;; This is the Guile we use as a cross-compiler...
("guile" ,guile-2.2/bug-fix)))
("guile" ,guile-2.2.7)))
(inputs
;; ... and this is the one that appears in shebangs when cross-compiling.
`(("guile" ,guile-2.2/bug-fix) ;for <https://bugs.gnu.org/37757>
`(("guile" ,guile-2.2.7) ;for <https://bugs.gnu.org/37757>
;; The 'shepherd' command uses Readline when used interactively. It's
;; an unusual use case though, so we don't propagate it.

2
gnu/packages/assembly.scm
View file

@ -111,7 +111,7 @@ (define-public yasm
(inputs
`(("python" ,python-wrapper)
("xmlto" ,xmlto)))
(home-page "http://yasm.tortall.net/")
(home-page "https://yasm.tortall.net/")
(synopsis "Rewrite of the NASM assembler")
(description
"Yasm is a complete rewrite of the NASM assembler.

65
gnu/packages/audio.scm
View file

@ -45,26 +45,14 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages audio)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix utils)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix build-system gnu)
#:use-module (guix build-system waf)
#:use-module (guix build-system trivial)
#:use-module (guix build-system cmake)
#:use-module (guix build-system meson)
#:use-module (guix build-system python)
#:use-module (guix build-system glib-or-gtk)
#:use-module (gnu packages)
#:use-module (gnu packages algebra)
#:use-module (gnu packages autotools)
#:use-module (gnu packages avahi)
#:use-module (gnu packages boost)
#:use-module (gnu packages backup)
#:use-module (gnu packages base)
#:use-module (gnu packages bison)
#:use-module (gnu packages boost)
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
#:use-module (gnu packages curl)
@ -78,25 +66,29 @@ (define-module (gnu packages audio)
#:use-module (gnu packages gcc)
#:use-module (gnu packages gettext)
#:use-module (gnu packages glib)
#:use-module (gnu packages gtk)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnunet) ; libmicrohttpd
#:use-module (gnu packages gperf)
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
#:use-module (gnu packages icu4c)
#:use-module (gnu packages image)
#:use-module (gnu packages libbsd)
#:use-module (gnu packages libusb)
#:use-module (gnu packages linux)
#:use-module (gnu packages llvm)
#:use-module (gnu packages maths)
#:use-module (gnu packages mp3) ;taglib
#:use-module (gnu packages multiprecision)
#:use-module (gnu packages music)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages onc-rpc)
#:use-module (gnu packages qt)
#:use-module (gnu packages libbsd)
#:use-module (gnu packages linux)
#:use-module (gnu packages libusb)
#:use-module (gnu packages llvm)
#:use-module (gnu packages mp3) ;taglib
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages pulseaudio) ;libsndfile, libsamplerate
#:use-module (gnu packages python)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages qt)
#:use-module (gnu packages rdf)
#:use-module (gnu packages readline)
#:use-module (gnu packages sdl)
@ -110,9 +102,18 @@ (define-module (gnu packages audio)
#:use-module (gnu packages xiph)
#:use-module (gnu packages xml)
#:use-module (gnu packages xorg)
#:use-module (gnu packages maths)
#:use-module (gnu packages multiprecision)
#:use-module (gnu packages music)
#:use-module (guix build-system cmake)
#:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system gnu)
#:use-module (guix build-system meson)
#:use-module (guix build-system python)
#:use-module (guix build-system trivial)
#:use-module (guix build-system waf)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix utils)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-26))
@ -3930,11 +3931,22 @@ (define-public carla
(list (string-append "PREFIX=" (assoc-ref %outputs "out")))
#:phases
(modify-phases %standard-phases
(delete 'configure) ; no configure script
(add-before 'build 'set-CC-variable-and-show-features
(lambda _
(setenv "CC" "gcc")
(invoke "make" "features")))
(delete 'configure))))
(add-after 'install 'make-carla-executable
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(chmod (string-append out "/share/carla/carla") #o555)
#t)))
(add-after 'install 'wrap-executables
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(wrap-script (string-append out "/bin/carla")
`("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH"))))
#t))))))
(inputs
`(("alsa-lib" ,alsa-lib)
("ffmpeg" ,ffmpeg)
@ -3952,7 +3964,10 @@ (define-public carla
("python-wrapper" ,python-wrapper)
("libx11" ,libx11)
("qtbase" ,qtbase)
("zlib" ,zlib)))
("zlib" ,zlib)
;; For WRAP-SCRIPT above.
("guile" ,guile-2.2)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "https://kx.studio/Applications:Carla")

24
gnu/packages/bioconductor.scm
View file

@ -4026,14 +4026,14 @@ (define-public r-genomicscores
(define-public r-atacseqqc
(package
(name "r-atacseqqc")
(version "1.10.2")
(version "1.10.3")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "ATACseqQC" version))
(sha256
(base32
"0dzrizacy3br8fiy1vnsl5zf242lg1hqv9dyv5ayqh2n480is57f"))))
"18zf90iksglbs13cwr4jjwsv332a19lf4bpdmy69jz8bpwrklv22"))))
(properties `((upstream-name . "ATACseqQC")))
(build-system r-build-system)
(propagated-inputs
@ -4055,6 +4055,8 @@ (define-public r-atacseqqc
("r-rsamtools" ,r-rsamtools)
("r-rtracklayer" ,r-rtracklayer)
("r-s4vectors" ,r-s4vectors)))
(native-inputs
`(("r-knitr" ,r-knitr)))
(home-page "https://bioconductor.org/packages/ATACseqQC/")
(synopsis "ATAC-seq quality control")
(description
@ -4315,14 +4317,14 @@ (define-public r-ebimage
(define-public r-yamss
(package
(name "r-yamss")
(version "1.12.0")
(version "1.12.1")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "yamss" version))
(sha256
(base32
"1n49a2vg1667wycrjww29xfafngllvpb5nq5wy6pgn0akva91nky"))))
"12jr7hbrwhb1gfjadj1024hv80ra22miy46dn40nmsrbklkfn3rw"))))
(build-system r-build-system)
(propagated-inputs
`(("r-biocgenerics" ,r-biocgenerics)
@ -4693,14 +4695,14 @@ (define-public r-massspecwavelet
(define-public r-xcms
(package
(name "r-xcms")
(version "3.8.1")
(version "3.8.2")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "xcms" version))
(sha256
(base32
"18iglvlvlxrdwn2apdvihj9jxmx0kwm5z37rml67xcj9sfdi3bjb"))))
"0bfl56v3l6k31i11l09nx1yqfjy6z5yragm6k83z4w0mpgk18y7g"))))
(build-system r-build-system)
(propagated-inputs
`(("r-biobase" ,r-biobase)
@ -5943,14 +5945,14 @@ (define-public r-mixomics
(define-public r-depecher
(package
(name "r-depecher")
(version "1.2.1")
(version "1.2.2")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "DepecheR" version))
(sha256
(base32
"08ja6ayvbax9m3x9w3xzi72z97miiha2nbsild1gp77n6sgn5i35"))))
"199j2kw0xnw7y4v1gakm2jgyc7zzlj8xh0570f2yjq55gp1kggbm"))))
(properties `((upstream-name . "DepecheR")))
(build-system r-build-system)
(propagated-inputs
@ -5970,6 +5972,8 @@ (define-public r-depecher
("r-reshape2" ,r-reshape2)
("r-robustbase" ,r-robustbase)
("r-viridis" ,r-viridis)))
(native-inputs
`(("r-knitr" ,r-knitr)))
(home-page "https://bioconductor.org/packages/DepecheR/")
(synopsis "Identify traits of clusters in high-dimensional entities")
(description
@ -7290,14 +7294,14 @@ (define-public r-experimenthub
(define-public r-multiassayexperiment
(package
(name "r-multiassayexperiment")
(version "1.12.3")
(version "1.12.4")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "MultiAssayExperiment" version))
(sha256
(base32
"1vf6l88j3n6109j6sd08wfqxqpj2k20dvr8ll9zl1szsn18b4gny"))))
"01cnp00y5bk551c8gqgqp5468dvccg72i0rvh5cxgbx1c42zy6xn"))))
(properties
`((upstream-name . "MultiAssayExperiment")))
(build-system r-build-system)

90
gnu/packages/bioinformatics.scm
View file

@ -6536,31 +6536,56 @@ (define-public stringtie
(define-public taxtastic
(package
(name "taxtastic")
(version "0.8.5")
(version "0.8.11")
(source (origin
(method url-fetch)
(uri (pypi-uri "taxtastic" version))
;; The Pypi version does not include tests.
(method git-fetch)
(uri (git-reference
(url "https://github.com/fhcrc/taxtastic.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"03pysw79lsrvz4lwzis88j15067ffqbi4cid5pqhrlxmd6bh8rrk"))))
"1sv8mkg64jn7zdwf1jj71c16686yrwxk0apb1l8sjszy9p166g0p"))))
(build-system python-build-system)
(arguments
`(#:python ,python-2
#:phases
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'prepare-directory
(lambda _
;; The git checkout must be writable for tests.
(for-each make-file-writable (find-files "."))
;; This test fails, but the error is not caught by the test
;; framework, so the tests fail...
(substitute* "tests/test_taxit.py"
(("self.cmd_fails\\(''\\)")
"self.cmd_fails('nothing')"))
;; This version file is expected to be created with git describe.
(mkdir-p "taxtastic/data")
(with-output-to-file "taxtastic/data/ver"
(lambda () (display ,version)))
#t))
(add-after 'unpack 'python37-compatibility
(lambda _
(substitute* "taxtastic/utils.py"
(("import csv") "import csv, errno")
(("os.errno") "errno"))
#t))
(replace 'check
(lambda _ (invoke "python" "-m" "unittest" "discover" "-v") #t)))))
;; Note, this fails to run with "-v" as it tries to write to a
;; closed output stream.
(lambda _ (invoke "python" "-m" "unittest") #t)))))
(propagated-inputs
`(("python-sqlalchemy" ,python2-sqlalchemy)
("python-decorator" ,python2-decorator)
("python-biopython" ,python2-biopython)
("python-pandas" ,python2-pandas)
("python-psycopg2" ,python2-psycopg2)
("python-fastalite" ,python2-fastalite)
("python-pyyaml" ,python2-pyyaml)
("python-six" ,python2-six)
("python-jinja2" ,python2-jinja2)
("python-dendropy" ,python2-dendropy)))
`(("python-sqlalchemy" ,python-sqlalchemy)
("python-decorator" ,python-decorator)
("python-biopython" ,python-biopython)
("python-pandas" ,python-pandas)
("python-psycopg2" ,python-psycopg2)
("python-fastalite" ,python-fastalite)
("python-pyyaml" ,python-pyyaml)
("python-six" ,python-six)
("python-jinja2" ,python-jinja2)
("python-dendropy" ,python-dendropy)))
(home-page "https://github.com/fhcrc/taxtastic")
(synopsis "Tools for taxonomic naming and annotation")
(description
@ -9091,6 +9116,8 @@ (define-public r-methylkit
("r-rtracklayer" ,r-rtracklayer)
("r-s4vectors" ,r-s4vectors)
("r-zlibbioc" ,r-zlibbioc)))
(native-inputs
`(("r-knitr" ,r-knitr))) ; for vignettes
(inputs
`(("zlib" ,zlib)))
(home-page "https://github.com/al2na/methylKit")
@ -9360,6 +9387,8 @@ (define-public r-vsn
("r-ggplot2" ,r-ggplot2)
("r-lattice" ,r-lattice)
("r-limma" ,r-limma)))
(native-inputs
`(("r-knitr" ,r-knitr))) ; for vignettes
(home-page "https://bioconductor.org/packages/release/bioc/html/vsn.html")
(synopsis "Variance stabilization and calibration for microarray data")
(description
@ -13238,18 +13267,14 @@ (define-public find-circ
(define-public python-scanpy
(package
(name "python-scanpy")
(version "1.4")
;; Fetch from git because the pypi tarball does not include tests.
(version "1.4.5.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/theislab/scanpy.git")
(commit version)))
(file-name (git-file-name name version))
(method url-fetch)
(uri (pypi-uri "scanpy" version))
(sha256
(base32
"0zn6x6c0cnm1a20i6isigwb51g3pr9zpjk8r1minjqnxi5yc9pm4"))))
"14kh1ji70xxhmri5q8sgcibsidhr6f221wxrcw8a5xvibj5da17j"))))
(build-system python-build-system)
(arguments
`(#:phases
@ -13276,18 +13301,23 @@ (define-public python-scanpy
("python-igraph" ,python-igraph)
("python-joblib" ,python-joblib)
("python-louvain" ,python-louvain)
("python-legacy-api-wrap" ,python-legacy-api-wrap)
("python-matplotlib" ,python-matplotlib)
("python-natsort" ,python-natsort)
("python-networkx" ,python-networkx)
("python-numba" ,python-numba)
("python-packaging" ,python-packaging)
("python-pandas" ,python-pandas)
("python-patsy" ,python-patsy)
("python-scikit-learn" ,python-scikit-learn)
("python-scipy" ,python-scipy)
("python-seaborn" ,python-seaborn)
("python-statsmodels" ,python-statsmodels)
("python-tables" ,python-tables)))
("python-tables" ,python-tables)
("python-umap-learn" ,python-umap-learn)))
(native-inputs
`(("python-pytest" ,python-pytest)))
`(("python-pytest" ,python-pytest)
("python-setuptools-scm" ,python-setuptools-scm)))
(home-page "https://github.com/theislab/scanpy")
(synopsis "Single-Cell Analysis in Python.")
(description "Scanpy is a scalable toolkit for analyzing single-cell gene
@ -13953,7 +13983,7 @@ (define-public jamm
(define-public ngless
(package
(name "ngless")
(version "1.0.1")
(version "1.1.0")
(source
(origin
(method git-fetch)
@ -13963,7 +13993,7 @@ (define-public ngless
(file-name (git-file-name name version))
(sha256
(base32
"06ygv8q2zjqsnrid1302yrlhhvb8ik48nq6n0higk3i1mdc8r0dg"))))
"1wim8wpqyff080dfcazynrmjwqas38m24m0v350w245mmhrapdma"))))
(build-system haskell-build-system)
(arguments
`(#:haddock? #f ; The haddock phase fails with: NGLess/CmdArgs.hs:20:1:
@ -14423,6 +14453,8 @@ (define-public python-velocyto
(base32
"0fgygyzqgrq32dv6a00biq1p1cwi6kbl5iqblxq1kklj6b2mzmhs"))))
(build-system python-build-system)
(native-inputs
`(("python-joblib" ,python-joblib)))
(propagated-inputs
`(("python-click" ,python-click)
("python-cython" ,python-cython)

23
gnu/packages/ccache.scm
View file

@ -30,30 +30,29 @@ (define-module (gnu packages ccache)
(define-public ccache
(package
(name "ccache")
(version "3.6")
(version "3.7.7")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.samba.org/ftp/ccache/ccache-"
version ".tar.xz"))
(uri (string-append "https://github.com/ccache/ccache/releases/download/v"
version "/ccache-" version ".tar.xz"))
(sha256
(base32 "07wv75xdcxpdkfsz9h5ffrm8pjbvr1dh6wnb02nyzz18cdbjkcd6"))))
(base32 "1kcqii3hr1008gj6jgfsjibwh2ryhsplc9z99m18xwa2zvbddhdp"))))
(build-system gnu-build-system)
(native-inputs `(("perl" ,perl) ; for test/run
("which" ,(@ (gnu packages base) which))))
(inputs `(("zlib" ,zlib)))
(arguments
'(#:phases (modify-phases %standard-phases
(add-before 'check 'setup-tests
(lambda _
(substitute* '("unittest/test_hashutil.c" "test/suites/base.bash")
(("#!/bin/sh") (string-append "#!" (which "sh"))))
#t)))))
(home-page "https://ccache.samba.org/")
(add-before 'check 'setup-tests
(lambda _
(substitute* '("unittest/test_hashutil.c" "test/suites/base.bash")
(("#!/bin/sh") (string-append "#!" (which "sh"))))
#t)))))
(home-page "https://ccache.dev/")
(synopsis "Compiler cache")
(description
"Ccache is a compiler cache. It speeds up recompilation by caching
previous compilations and detecting when the same compilation is being done
again. Supported languages are C, C++, Objective-C, Objective-C++, and
Fortran 77.")
again. Supported languages are C, C++, Objective-C and Objective-C++.")
(license gpl3+)))

4
gnu/packages/chromium.scm
View file

@ -839,7 +839,9 @@ (define-public ungoogled-chromium
;; Building Chromium takes ... a very long time. On a single core, a busy
;; mid-end x86 system may need more than 24 hours to complete the build.
(properties '((timeout . 144000))) ;40 hours
(properties '((timeout . 144000) ;40 hours
;; The linking step may take more than an hour on some hardware.
(max-silent-time . 7200)))
(home-page "https://github.com/Eloston/ungoogled-chromium")
(description

47
gnu/packages/compression.scm
View file

@ -890,49 +890,6 @@ (define-public pixz
tarballs.")
(license license:bsd-2)))
(define-public brotli
(let ((commit "e992cce7a174d6e2b3486616499d26bb0bad6448")
(revision "1"))
(package
(name "brotli")
(version (string-append "0.1-" revision "."
(string-take commit 7)))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/bagder/libbrotli.git")
(commit commit)
(recursive? #t)))
(file-name (string-append name "-" version ".tar.xz"))
(sha256
(base32
"1qxxsasvwbbbh6dl3138y9h3fg0q2v7xdk5jjc690bdg7g1wrj6n"))
(modules '((guix build utils)))
(snippet '(begin
;; This is a recursive submodule that is
;; unnecessary for this package, so delete it.
(delete-file-recursively "brotli/terryfy")
#t))))
(build-system gnu-build-system)
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)))
(arguments
`(#:phases (modify-phases %standard-phases
(add-after 'unpack 'autogen
(lambda _
(mkdir "m4")
(invoke "autoreconf" "-vfi"))))))
(home-page "https://github.com/bagder/libbrotli/")
(synopsis "Implementation of the Brotli compression algorithm")
(description
"Brotli is a general-purpose lossless compression algorithm. It is
similar in speed to deflate but offers denser compression. This package
provides encoder and a decoder libraries: libbrotlienc and libbrotlidec,
respectively, based on the reference implementation from Google.")
(license license:expat))))
(define-public bsdiff
(package
(name "bsdiff")
@ -1890,6 +1847,10 @@ (define-public google-brotli
The specification of the Brotli Compressed Data Format is defined in RFC 7932.")
(license license:expat)))
(define-public brotli
;; We used to provide an older version under the name "brotli".
(deprecated-package "brotli" google-brotli))
(define-public ucl
(package
(name "ucl")

2
gnu/packages/cpp.scm
View file

@ -462,7 +462,7 @@ (define-public abseil-cpp
;;
;; ld: CMakeFiles/absl_periodic_sampler_test.dir/internal/periodic_sampler_test.cc.o:
;; undefined reference to symbol '_ZN7testing4Mock16UnregisterLockedEPNS_8internal25UntypedFunctionMockerBaseE'
;; ld: /gnu/store/bxapb1f1l8frjpbjckk3zdxhmcig3xzk-googletest-1.10.0/lib/libgmock.so:
;; ld: /gnu/store/...-googletest-1.10.0/lib/libgmock.so:
;; error adding symbols: DSO missing from command line
;; collect2: error: ld returned 1 exit status
"-DCMAKE_EXE_LINKER_FLAGS=-lgtest -lpthread -lgmock")

102
gnu/packages/cran.scm
View file

@ -2660,14 +2660,14 @@ (define-public r-squarem
(define-public r-lava
(package
(name "r-lava")
(version "1.6.6")
(version "1.6.7")
(source
(origin
(method url-fetch)
(uri (cran-uri "lava" version))
(sha256
(base32
"0nfab5fgnmxh8cplg8rd8cp34fny5j0k5wn4baj51r6ck7fq9g3s"))))
"0ffzxbb8pvfh1m6j61az4ga37snyhylq2941fyc76w7w9i2sixv3"))))
(build-system r-build-system)
(propagated-inputs
`(("r-numderiv" ,r-numderiv)
@ -3165,19 +3165,21 @@ (define-public r-pdist
(define-public r-ggrepel
(package
(name "r-ggrepel")
(version "0.8.1")
(version "0.8.2")
(source
(origin
(method url-fetch)
(uri (cran-uri "ggrepel" version))
(sha256
(base32
"10vjrcmx8yknfbx93d9a4y3z8gafri0fhimw6hcq733dmdvkml6m"))))
"1qaifn3dazdqbqlii210xhw7yf142iw7g9p2axmmxbz90p0by08d"))))
(build-system r-build-system)
(propagated-inputs
`(("r-ggplot2" ,r-ggplot2)
("r-rcpp" ,r-rcpp)
("r-scales" ,r-scales)))
(native-inputs
`(("r-knitr" ,r-knitr))) ; for vignettes
(home-page "http://github.com/slowkow/ggrepel")
(synopsis "Repulsive text and label geometries for ggplot2")
(description
@ -3634,14 +3636,14 @@ (define-public r-laeken
(define-public r-vcd
(package
(name "r-vcd")
(version "1.4-5")
(version "1.4-6")
(source
(origin
(method url-fetch)
(uri (cran-uri "vcd" version))
(sha256
(base32
"0pqf1sdp0d60aqc7721hy2zfcp57902by0i28jqbn683dd50c21a"))))
"0rjz49py5l6wnaimw6k8rcyzlvs8cyz5g2xwqj2qis92ly0l103z"))))
(build-system r-build-system)
(propagated-inputs
`(("r-colorspace" ,r-colorspace)
@ -4422,14 +4424,14 @@ (define-public r-aggregation
(define-public r-quantmod
(package
(name "r-quantmod")
(version "0.4-15")
(version "0.4-16")
(source
(origin
(method url-fetch)
(uri (cran-uri "quantmod" version))
(sha256
(base32
"0lyzaf5ypk93v6zj9gdghy05cc7cxgn9yasv1apx5r6qsjcfgwky"))))
"12l5br8abr1yagxqjnjvqzp79sqsv5vx56cxs37gk73r474f4vc2"))))
(build-system r-build-system)
(propagated-inputs
`(("r-curl" ,r-curl)
@ -4812,6 +4814,8 @@ (define-public r-heatmaply
("r-seriation" ,r-seriation)
("r-viridis" ,r-viridis)
("r-webshot" ,r-webshot)))
(native-inputs
`(("r-knitr" ,r-knitr)))
(home-page "https://cran.r-project.org/package=heatmaply")
(synopsis "Interactive cluster heat maps using plotly")
(description
@ -6375,15 +6379,17 @@ (define-public r-prediction
(define-public r-insight
(package
(name "r-insight")
(version "0.8.1")
(version "0.8.2")
(source
(origin
(method url-fetch)
(uri (cran-uri "insight" version))
(sha256
(base32
"1y889bydmji3pcq2bdf6xl6ikmd45wbwl53ssvsk05b5ahkyxi76"))))
"0fjf7dwpv1a7qfbzixppg348z1ksq19kdjm08vcb2am7w0k3plcj"))))
(build-system r-build-system)
(native-inputs
`(("r-knitr" ,r-knitr)))
(home-page "https://easystats.github.io/insight/")
(synopsis "Easy access to model information for various model objects")
(description
@ -6504,14 +6510,14 @@ (define-public r-moonbook
(define-public r-flextable
(package
(name "r-flextable")
(version "0.5.8")
(version "0.5.9")
(source
(origin
(method url-fetch)
(uri (cran-uri "flextable" version))
(sha256
(base32
"1x24rz1r5xin122czg85d7nrkwpaabb60p50m3yrd3dh81vfp0hk"))))
"1rkz0nhwjy1l8sb0kmna5v492n2ydnk7gydswnmf88r8vfyjczhw"))))
(build-system r-build-system)
(propagated-inputs
`(("r-base64enc" ,r-base64enc)
@ -7277,6 +7283,8 @@ (define-public r-mosaic
("r-mosaicdata" ,r-mosaicdata)
("r-readr" ,r-readr)
("r-tidyr" ,r-tidyr)))
(native-inputs
`(("r-knitr" ,r-knitr)))
(home-page "https://github.com/ProjectMOSAIC/mosaic/")
(synopsis "Mathematics, statistics, and computation teaching utilities")
(description
@ -7590,13 +7598,13 @@ (define-public r-parmigene
(define-public r-pscl
(package
(name "r-pscl")
(version "1.5.2")
(version "1.5.5")
(source
(origin
(method url-fetch)
(uri (cran-uri "pscl" version))
(sha256
(base32 "1phf3awsfr4ncqfqzin5m1pz0g7y1zhbcm2sz7358ssw914fd7rc"))))
(base32 "0vzf5wazs92bhqhqd66v3vwmbfmnh67gb2466g1xxawim649nk05"))))
(build-system r-build-system)
(propagated-inputs
`(("r-mass" ,r-mass)))
@ -8663,14 +8671,14 @@ (define-public r-gh
(define-public r-fs
(package
(name "r-fs")
(version "1.3.1")
(version "1.3.2")
(source
(origin
(method url-fetch)
(uri (cran-uri "fs" version))
(sha256
(base32
"1g26rgx13dzigp2vrlld6h28q33lwbax97zvwdrq2pc3iz54v4yn"))))
"1w30bflx4d7a6f3dn96bf7s7v6aqpvz2yzzxal6qz9jyhb16bxaz"))))
(build-system r-build-system)
(propagated-inputs
`(("r-rcpp" ,r-rcpp)))
@ -9183,20 +9191,18 @@ (define-public r-weights
(define-public r-rcppannoy
(package
(name "r-rcppannoy")
(version "0.0.15")
(version "0.0.16")
(source
(origin
(method url-fetch)
(uri (cran-uri "RcppAnnoy" version))
(sha256
(base32
"1rlw6npwwcp066midvkhnzf0xmmfkkdf6f581j3j1s2naqss3fvl"))))
"0bfa35lp6vc4b0h3ymvdx50br233q8vvyjml34ngi81rj0imz3fr"))))
(properties `((upstream-name . "RcppAnnoy")))
(build-system r-build-system)
(propagated-inputs
`(("r-rcpp" ,r-rcpp)))
(native-inputs
`(("r-knitr" ,r-knitr))) ; for vignettes
(home-page "https://cran.r-project.org/web/packages/RcppAnnoy/")
(synopsis "Rcpp bindings for Annoy, a library for Approximate Nearest Neighbors")
(description
@ -10545,14 +10551,14 @@ (define-public r-pixmap
(define-public r-rapidjsonr
(package
(name "r-rapidjsonr")
(version "1.1")
(version "1.2.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "rapidjsonr" version))
(sha256
(base32
"0h4phjjhykbb45rg5b1xn48vqxdcvcngbm0416ds8in7j469wbwd"))))
"07zdirhbzmvq3cp4xn8ngk1lgxbbabzays315zxbs3sxrz6lzjb2"))))
(build-system r-build-system)
(home-page "https://cran.r-project.org/web/packages/rapidjsonr")
(synopsis "JSON parser")
@ -13599,13 +13605,13 @@ (define-public r-sparql
(define-public r-bookdown
(package
(name "r-bookdown")
(version "0.17")
(version "0.18")
(source (origin
(method url-fetch)
(uri (cran-uri "bookdown" version))
(sha256
(base32
"10b4gnd6z3w13pysqqan43blxcbk7bgbzc7wr83b23ag1lh2n40j"))))
"1my6g16phx21v5cvfqcnjibh3zcv02xkix347aafd6a7r3hnxpq5"))))
(build-system r-build-system)
(propagated-inputs
`(("r-htmltools" ,r-htmltools)
@ -15328,20 +15334,22 @@ (define-public r-xgboost
(define-public r-umap
(package
(name "r-umap")
(version "0.2.4.1")
(version "0.2.5.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "umap" version))
(sha256
(base32
"1pnh3hv8ihiz2nszqp797lkrdhhna2a6mzpizbsk0s9m8cj4wxva"))))
"0qp8zbh6fn8kn6q2h2lyjgmq3pr6gqwsd8ymqx25px13zjhxch9d"))))
(build-system r-build-system)
(propagated-inputs
`(("r-openssl" ,r-openssl)
("r-rcpp" ,r-rcpp)
("r-reticulate" ,r-reticulate)
("r-rspectra" ,r-rspectra)))
(native-inputs
`(("r-knitr" ,r-knitr)))
(home-page "https://github.com/tkonopka/umap")
(synopsis "Uniform manifold approximation and projection")
(description
@ -15682,13 +15690,13 @@ (define-public r-harmony
(define-public r-covr
(package
(name "r-covr")
(version "3.4.0")
(version "3.5.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "covr" version))
(sha256
(base32 "0p44kr6yz5sqza5zvq6divqglzkpv0if9pjpjmzhmdaaddjrqzg5"))))
(base32 "1pvr95h7jg9hqq1qq1cccy323pkxldrwafl08151cc410499k4fb"))))
(properties `((upstream-name . "covr")))
(build-system r-build-system)
(propagated-inputs
@ -15699,6 +15707,8 @@ (define-public r-covr
("r-rex" ,r-rex)
("r-withr" ,r-withr)
("r-yaml" ,r-yaml)))
(native-inputs
`(("r-knitr" ,r-knitr))) ; for vignettes
(home-page "https://github.com/r-lib/covr")
(synopsis "Test coverage for R packages")
(description
@ -15941,19 +15951,21 @@ (define-public r-insol
(define-public r-lifecycle
(package
(name "r-lifecycle")
(version "0.1.0")
(version "0.2.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "lifecycle" version))
(sha256
(base32
"11rk7hkw63rfrf4aqmb4xrb88kg95xh8hajpjvjfwjym2v02h74n"))))
"0912865c6675fsblrfdk6s568krsj1x8qbk1kipy7m05xs6nwx19"))))
(properties `((upstream-name . "lifecycle")))
(build-system r-build-system)
(propagated-inputs
`(("r-glue" ,r-glue)
("r-rlang" ,r-rlang)))
(native-inputs
`(("r-knitr" ,r-knitr))) ; for vignettes
(home-page "https://github.com/r-lib/lifecycle")
(synopsis "Manage the life cycle of your package functions")
(description
@ -16016,13 +16028,13 @@ (define-public r-quadprog
(define-public r-desolve
(package
(name "r-desolve")
(version "1.27.1")
(version "1.28")
(source
(origin
(method url-fetch)
(uri (cran-uri "deSolve" version))
(sha256
(base32 "05sax045qrk550gsn2i7krb9rbg51rx88x4v190acsigqknxffrv"))))
(base32 "0jasvdzig0pzhzspmy20089az19r91xjfb9q6h8gj7c4mr6fymac"))))
(properties `((upstream-name . "deSolve")))
(build-system r-build-system)
(native-inputs
@ -19978,7 +19990,7 @@ (define-public r-d3network
(home-page "http://christophergandrud.github.io/d3Network/")
(synopsis "Create D3 JavaScript network, tree, dendrogram, and Sankey graphs")
(description
"This packages is intended to make it easy to create D3 JavaScript
"This package is intended to make it easy to create D3 JavaScript
network, tree, dendrogram, and Sankey graphs from R using data frames.")
(license license:gpl3+)))
@ -20691,3 +20703,27 @@ (define-public r-zseq
function has a hyperlink to its corresponding item in the @dfn{On-Line
Encyclopedia of Integer Sequences} (OEIS) in the function help page.")
(license license:gpl3+)))
(define-public r-isoband
(package
(name "r-isoband")
(version "0.2.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "isoband" version))
(sha256
(base32
"1r023s73qypnvpx18znr9ymylr022m90v65mz2jasn0a1kjrfcbq"))))
(properties `((upstream-name . "isoband")))
(build-system r-build-system)
(propagated-inputs
`(("r-rcpp" ,r-rcpp)
("r-testthat" ,r-testthat)))
(home-page "https://github.com/wilkelab/isoband")
(synopsis "Generate isolines and isobands from regularly spaced elevation grids")
(description
"This package provides a fast C++ implementation to generate contour
lines (isolines) and contour polygons (isobands) from regularly spaced grids
containing elevation data.")
(license license:expat)))

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

@ -10004,8 +10004,8 @@ (define-public rust-named-pipe-0.4
`(#:skip-build? #t ; Only builds on Windows.
#:cargo-inputs (("rust-winapi" ,rust-winapi-0.3))))
(home-page "https://github.com/blackbeam/named_pipe")
(synopsis "Wrapper for overlapped (asyncronous) IO of Windows's named pipes")
(description "This package provides a wrapper for overlapped (asyncronous)
(synopsis "Wrapper for overlapped (asynchronous) IO of Windows's named pipes")
(description "This package provides a wrapper for overlapped (asynchronous)
IO of Windows's named pipes.")
(license (list license:expat license:asl2.0))))

6
gnu/packages/cups.scm
View file

@ -5,7 +5,7 @@
;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@ -420,14 +420,14 @@ (define-public cups-pk-helper
(define-public hplip
(package
(name "hplip")
(version "3.19.12")
(version "3.20.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/hplip/hplip/" version
"/hplip-" version ".tar.gz"))
(sha256
(base32
"0mdj0sqgfxjqa550adiw1gn4z9n6wcvn55slivgf0ndn5x89iwxp"))
"1hkiyj29vzmz14cy68g94i617ymxinzvjvcsfdd78kcbd1s9vi4h"))
(modules '((guix build utils)))
(patches (search-patches "hplip-remove-imageprocessor.patch"))
(snippet

35
gnu/packages/databases.scm
View file

@ -3373,3 +3373,38 @@ (define-public libdbi-drivers
@end itemize")
(home-page "http://libdbi-drivers.sourceforge.net/")
(license license:lgpl2.1+)))
(define-public soci
(package
(name "soci")
(version "4.0.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/SOCI/soci/")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"06faswdxd2frqr9xnx6bxc7zwarlzsbdi3bqpz7kwdxsjvq41rnb"))))
(build-system cmake-build-system)
(inputs
`(("postgresql" ,postgresql)
("sqlite" ,sqlite)
("odbc" ,unixodbc)
("boost" ,boost)
("mysql" ,mysql)))
(arguments
`(#:tests? #f ; Tests may require running database management systems.
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-lib-path
(lambda _
(substitute* "CMakeLists.txt"
(("set\\(SOCI_LIBDIR \"lib64\"\\)") "")))))))
(synopsis "C++ Database Access Library")
(description
"SOCI is an abstraction layer for several database backends, including
PostreSQL, SQLite, ODBC and MySQL.")
(home-page "http://soci.sourceforge.net/")
(license license:boost1.0)))

2
gnu/packages/dictionaries.scm
View file

@ -199,7 +199,7 @@ (define-public ding
(synopsis "Dictionary lookup program with a German-English dictionary")
(description "Ding is a dictionary lookup program for the X window system.
It comes with a German-English dictionary with approximately 270,000 entries.")
(home-page "http://www-user.tu-chemnitz.de/~fri/ding/")
(home-page "https://www-user.tu-chemnitz.de/~fri/ding/")
(license license:gpl2+)))
(define-public grammalecte

8
gnu/packages/dns.scm
View file

@ -386,14 +386,14 @@ (define-public nsd
(define-public unbound
(package
(name "unbound")
(version "1.9.6")
(version "1.10.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.unbound.net/downloads/unbound-"
version ".tar.gz"))
(sha256
(base32 "1w5aylh2gfvfvqkgrq46aw427x9c0a3hwm0f985s55wim5pgr60x"))))
(base32 "0mg9divpysr42sp0m693a70693dp8025v6c9dv1yabr4g1jlhbqm"))))
(build-system gnu-build-system)
(outputs '("out" "python"))
(native-inputs
@ -590,14 +590,14 @@ (define-public yadifa
(define-public knot
(package
(name "knot")
(version "2.9.2")
(version "2.9.3")
(source
(origin
(method url-fetch)
(uri (string-append "https://secure.nic.cz/files/knot-dns/"
"knot-" version ".tar.xz"))
(sha256
(base32 "1vmndmbzwwrqczhygkhpdn5xxljcnaa3d0z5yw6vb2bmm8rxz319"))
(base32 "0zm0642hkb16sqkqpa84f89f3s0bw44m837r1nia8m89swvz3bgj"))
(modules '((guix build utils)))
(snippet
'(begin

6
gnu/packages/education.scm
View file

@ -738,7 +738,8 @@ (define-public anki
(uri (string-append "https://apps.ankiweb.net/downloads/archive/anki-"
version "-source.tgz"))
(sha256
(base32 "1gfr51rnllkyzli73p4r51h5ypzfa3m7lic3m3rzpywmqwrxs07k"))))
(base32 "1gfr51rnllkyzli73p4r51h5ypzfa3m7lic3m3rzpywmqwrxs07k"))
(patches (search-patches "anki-mpv-args.patch"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags (list (string-append "PREFIX=" %output))
@ -779,6 +780,9 @@ (define-public anki
(wrap-program program
`("QTWEBENGINEPROCESS_PATH" =
(,qtwebengineprocess))
`("PATH" prefix (,(string-append
(assoc-ref inputs "mpv")
"/bin")))
`("PYTHONPATH" = ,site-packages)))
(find-files bin ".")))
#t)))))

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

@ -61,6 +61,7 @@
;;; Copyright © 2020 Robert Smith <robertsmith@posteo.net>
;;; Copyright © 2020 Evan Straw <evan.straw99@gmail.com>
;;; Copyright © 2020 Masaya Tojo <masaya@tojo.tokyo>
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
;;;
;;; This file is part of GNU Guix.
;;;
@ -971,13 +972,13 @@ (define-public emacs-anaphora
(define-public emacs-xr
(package
(name "emacs-xr")
(version "1.16")
(version "1.17")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/xr-" version ".tar"))
(sha256
(base32 "1s6pkbr7gkan0r9gfmix75m587d8cg6l11722v70zzgf2z9w2xg9"))))
(base32 "0kicy15hww85kf7vii1j4yypa9z44d5vbpm65vwb6fzz0lv639zm"))))
(build-system emacs-build-system)
(home-page "https://elpa.gnu.org/packages/xr.html")
(synopsis "Convert string regexp to rx notation")
@ -1075,14 +1076,14 @@ (define-public emacs-reformatter
(define-public emacs-relint
(package
(name "emacs-relint")
(version "1.14")
(version "1.15")
(source
(origin
(method url-fetch)
(uri (string-append
"https://elpa.gnu.org/packages/relint-" version ".tar"))
(sha256
(base32 "0hjzhxcygb2r2s3g2pk3z9x3appy1y8gkw8gpg9cpkl6lpwcsh2f"))))
(base32 "0sxmdsacj8my942k8j76m2y68nzab7190acv7cwgflc5n4f07yxa"))))
(build-system emacs-build-system)
(propagated-inputs `(("emacs-xr" ,emacs-xr)))
(home-page "https://github.com/mattiase/relint")
@ -4685,7 +4686,7 @@ (define-public emacs-ffap-rfc-space
(package
(name "emacs-ffap-rfc-space")
(version "12")
(home-page "http://user42.tuxfamily.org/ffap-rfc-space/index.html")
(home-page "https://user42.tuxfamily.org/ffap-rfc-space/index.html")
(source (origin
(method url-fetch)
(uri "http://download.tuxfamily.org/user42/ffap-rfc-space.el")
@ -7390,8 +7391,8 @@ (define-public emacs-cider
;; There hasn't been a tag or release since 2016, so we take the latest
;; commit.
(define-public emacs-sly
(let ((commit "0a3b81770e46b93b9ffd8b9ac5254e0b88d1b13d")
(revision "3"))
(let ((commit "86a63df73360be51529806c7ed9b775b3f02284d")
(revision "4"))
(package
(name "emacs-sly")
(version (git-version "1.0.0" revision commit))
@ -7404,7 +7405,7 @@ (define-public emacs-sly
(file-name (git-file-name name version))
(sha256
(base32
"1q5ga4mxa0ffa4zb2y0zfwmgzjggx4fn1y4bl2x7ac6ynvb32zkj"))))
"0sx6fdckcfcld41db0695svvlvllnfaazwx513686gnykwfd209n"))))
(build-system emacs-build-system)
(native-inputs
`(("texinfo" ,texinfo)))
@ -21734,6 +21735,32 @@ (define-public emacs-csv
Format and MIME Type for CSV Files\" (@url{http://tools.ietf.org/html/rfc4180}).")
(license license:gpl3+)))
(define-public emacs-org-journal
(package
(name "emacs-org-journal")
(version "2.0.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/bastibe/org-journal.git")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "18dqd0jy2x530lk0h4fcn9cld9qh4w7b3vxa60fpiia628vsv1dg"))))
(build-system emacs-build-system)
(home-page "https://github.com/bastibe/org-journal")
(synopsis "Simple Org mode journaling mode")
(description
"Org Journal is a set of functions to maintain a simple personal diary /
journal using in Emacs, adapted from
@url{https://www.emacswiki.org/emacs/PersonalDiary}. Convenient bindings
allow the creation of journal records in the current daily, weekly, monthly or
yearly file and search within all records or specified time intervals. All
records can be browsed and searched from the Emacs Calendar for convenience.
All entries in a specified TODO state will be carried over to the next day.")
(license license:bsd-3)))
(define-public emacs-ddskk
;; XXX: Upstream adds code names to their release tags, so version and code
;; name below need to be updated together.

2
gnu/packages/engineering.scm
View file

@ -178,7 +178,7 @@ (define-public librecad
(native-inputs
`(("pkg-config" ,pkg-config)
("which" ,which)))
(home-page "http://librecad.org/")
(home-page "https://librecad.org/")
(synopsis "Computer-aided design (CAD) application")
(description
"LibreCAD is a 2D Computer-aided design (CAD) application for creating

38
gnu/packages/fonts.scm
View file

@ -11,7 +11,7 @@
;;; Copyright © 2016 Jookia <166291@gmail.com>
;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016 Dmitry Nikolaev <cameltheman@gmail.com>
;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2016 Toni Reina <areina@riseup.net>
;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
@ -1234,22 +1234,22 @@ (define-public font-google-material-design-icons
resolutions.")
(license license:asl2.0)))
(define-public font-open-dyslexic
(define-public font-opendyslexic
(package
(name "font-open-dyslexic")
(version "20160623")
(name "font-opendyslexic")
(version "0.91.12")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/antijingoist/open-dyslexic.git")
(commit (string-append version "-Stable"))))
(file-name (git-file-name name version))
(sha256
(base32
"0nr7s92nk1kbr459154idnib977ixc70z6g9mbra3lp73nyrmyvz"))))
(origin
(method url-fetch/zipbomb)
(uri (string-append "https://github.com/antijingoist/opendyslexic/"
"releases/download/v" version
"/opendyslexic-0.910.12-rc2-2019.10.17.zip"))
(sha256
(base32
"11ml7v4iyf3hr0fbnkwz8afb8vi58wbcfnmn4gyvrwh9jk5pybdr"))))
(build-system font-build-system)
(home-page "https://opendyslexic.org")
(native-inputs `(("unzip" ,unzip)))
(home-page "https://opendyslexic.org/")
(synopsis "Font for dyslexics and high readability")
(description "OpenDyslexic is a font designed to help readability for some
of the symptoms of dyslexia. Letters have heavy weighted bottoms to provide
@ -1258,12 +1258,10 @@ (define-public font-open-dyslexic
line of text. The unique shapes of each letter can help prevent flipping and
swapping. The italic style for OpenDyslexic has been crafted to be used for
emphasis while still being readable.")
(license
(license:fsdg-compatible
"https://www.gnome.org/fonts/#Final_Bitstream_Vera_Fonts"
"The Font Software may be sold as part of a larger software package but
no copy of one or more of the Font Software typefaces may be sold by
itself."))))
(license license:silofl1.1)))
(define-public font-open-dyslexic
(deprecated-package "font-open-dyslexic" font-opendyslexic))
(define-public font-dosis
(package

65
gnu/packages/fontutils.scm
View file

@ -257,44 +257,35 @@ (define-public ttf2pt1
(license license:bsd-3)))
(define-public woff2
(let ((commit "4e698b8c6c5e070d53c340db9ddf160e21070ede")
(revision "1"))
(package
(name "woff2")
(version (string-append "20160306-" revision "."
(string-take commit 7)))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/google/woff2.git")
(commit commit)))
(file-name (string-append name "-" version ".tar.xz"))
(sha256
(base32
"0wka0yhf0cjmd4rv2jckxpyv6lb5ckj4nj0k1ajq5hrjy7f30lcp"))
(patches (list (search-patch "woff2-libbrotli.patch")))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
`(("brotli" ,brotli)))
(arguments
`(#:tests? #f ;no tests
#:phases (modify-phases %standard-phases
(delete 'configure)
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin")))
(install-file "woff2_compress" bin)
(install-file "woff2_decompress" bin)
#t))))))
(synopsis "Compress TrueType fonts to WOFF2")
(description
"This package provides utilities for compressing/decompressing TrueType
(package
(name "woff2")
(version "1.0.2")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/google/woff2.git")
(commit (string-append "v" version))))
(file-name (string-append name "-" version ".git"))
(sha256
(base32
"13l4g536h0pr84ww4wxs2za439s0xp1va55g6l478rfbb1spp44y"))))
(build-system cmake-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
`(("google-brotli" ,google-brotli)))
(arguments
;; package has no tests
`(#:tests? #f
;; we can’t have both, shared libraries and binaries, so turn off the
;; former
#:configure-flags (list "-DBUILD_SHARED_LIBS=OFF")))
(synopsis "Compress TrueType fonts to WOFF2")
(description
"This package provides utilities for compressing/decompressing TrueType
fonts to/from the WOFF2 format.")
(license license:asl2.0)
(home-page "https://github.com/google/woff2"))))
(license license:asl2.0)
(home-page "https://github.com/google/woff2")))
(define-public fontconfig
(package

64
gnu/packages/geo.scm
View file

@ -328,7 +328,7 @@ (define-public libspatialite
(define-public proj
(package
(name "proj")
(version "6.2.0")
(version "6.3.1")
(source
(origin
(method url-fetch)
@ -336,7 +336,7 @@ (define-public proj
version ".tar.gz"))
(sha256
(base32
"0l1as8f4zfg74fms6h5p5psziw0lpznja1xnirzsscpnfbwc005k"))))
"1y46ij32j9b4x1kjnnlykcwk3kkjwkg44sfc1ziwm3a3g0ki3q3d"))))
(build-system gnu-build-system)
(inputs
`(("sqlite" ,sqlite)))
@ -554,6 +554,7 @@ (define-public spatialite-gui
`(("freexl" ,freexl)
("geos" ,geos)
("libgaiagraphics" ,libgaiagraphics)
("libjpeg-turbo" ,libjpeg-turbo)
("libspatialite" ,libspatialite)
("libxml2" ,libxml2)
("proj.4" ,proj.4)
@ -571,7 +572,7 @@ (define-public spatialite-gui
(define-public gdal
(package
(name "gdal")
(version "3.0.2")
(version "3.0.4")
(source (origin
(method url-fetch)
(uri (string-append
@ -579,7 +580,7 @@ (define-public gdal
version ".tar.gz"))
(sha256
(base32
"0f80izh9wshrsw55kg9abpip74hk6frk3hgqrkqbyn3f6i8g2z3q"))
"10symyajj1b7j98f889lqxxbmhcyvlhq9gg0l42h69bv22wx45gw"))
(modules '((guix build utils)))
(snippet
`(begin
@ -1459,3 +1460,58 @@ (define-public qmapshack
QLandkarte GT application.")
(home-page "https://github.com/Maproom/qmapshack/wiki")
(license license:gpl3+)))
(define-public readosm
(package
(name "readosm")
(version "1.1.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.gaia-gis.it/gaia-sins/"
"readosm-" version ".tar.gz"))
(sha256
(base32 "1v20pnda67imjd70fn0zw30aar525xicy3d3v49md5cvqklws265"))))
(build-system gnu-build-system)
(inputs
`(("expat" ,expat)
("zlib" ,zlib)))
(synopsis "Data extractor for OpenStreetMap files")
(description
"ReadOSM is a library to extract valid data from within an OpenStreetMap
input file (in @code{.osm} or @code{.osm.pbf} format).")
(home-page "https://www.gaia-gis.it/fossil/readosm/index")
(license (list license:gpl2+
license:lgpl2.1+
license:mpl1.1))))
(define-public spatialite-tools
(package
(name "spatialite-tools")
(version "4.3.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.gaia-gis.it/gaia-sins/"
"spatialite-tools-" version ".tar.gz"))
(sha256
(base32 "12fggjhi8cgwvw8f6nk76f83b8lqkc07abxyj5ap6f2gq2dqafgp"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
`(("expat" ,expat)
("freexl" ,freexl)
("geos" ,geos)
("libspatialite" ,libspatialite)
("libxml2" ,libxml2)
("proj.4" ,proj.4)
("readosm" ,readosm)
("sqlite" ,sqlite)
("zlib" ,zlib)))
(synopsis "Collection of command line tools for SpatiaLite")
(description
"@code{spatialite-tools} is a collection of Command Line Interface (CLI)
tools supporting SpatiaLite.")
(home-page "https://www.gaia-gis.it/fossil/spatialite-tools/index")
(license license:gpl3+)))

7
gnu/packages/gkrellm.scm
View file

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@ -31,15 +31,14 @@ (define-module (gnu packages gkrellm)
(define-public gkrellm
(package
(name "gkrellm")
(version "2.3.10")
(version "2.3.11")
(source
(origin
(method url-fetch)
(uri (string-append "http://gkrellm.srcbox.net/releases/gkrellm-"
version ".tar.bz2"))
(sha256
(base32
"0rnpzjr0ys0ypm078y63q4aplcgdr5nshjzhmz330n6dmnxci7lb"))))
(base32 "01lccz4fga40isv09j8rjgr0qy10rff9vj042n6gi6gdv4z69q0y"))))
(build-system gnu-build-system)
(inputs
`(("gettext" ,gettext-minimal)

153
gnu/packages/gnome.scm
View file

@ -46,6 +46,7 @@
;;; Copyright © 2019 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;;; Copyright © 2019 Leo Prikler <leo.prikler@student.tugraz.at>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz>
;;;
;;; This file is part of GNU Guix.
;;;
@ -5030,15 +5031,15 @@ (define-public totem
(define-public rhythmbox
(package
(name "rhythmbox")
(version "3.4.3")
(version "3.4.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
(uri (string-append "mirror://gnome/sources/rhythmbox/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
"rhythmbox-" version ".tar.xz"))
(sha256
(base32
"1yx3n7p9vmv23jsv98fxwq95n78awdxqm8idhyhxx2d6vk4w1hgx"))))
"142xcvw4l19jyr5i72nbnrihs953pvrrzcbijjn9dxmxszbv03pf"))))
(build-system glib-or-gtk-build-system)
(arguments
`(#:configure-flags
@ -7425,7 +7426,7 @@ (define-public gnome-autoar
(define-public tracker
(package
(name "tracker")
(version "2.2.2")
(version "2.3.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/tracker/"
@ -7433,7 +7434,7 @@ (define-public tracker
"tracker-" version ".tar.xz"))
(sha256
(base32
"1rp2c6k7ajcm553p9kpni87zgi9aplm3s01rl7pk575az5i399y6"))))
"1nzbnvwwsk6kv6kqbxwlz8vk70l9ai6b4r9qypw51vp4qy72ny54"))))
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t
@ -7444,64 +7445,58 @@ (define-public tracker
(assoc-ref %outputs "out") "/lib/tracker-2.0"))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'disable-broken-tests
(lambda _
;; These fail because the SPARQL backend could not be loaded.
;; That's because /etc/machine-id is missing, but
;; DBUS_FATAL_WARNINGS does not help here.
(substitute* "tests/libtracker-sparql/meson.build"
(("'sparql',") ""))
(substitute* "tests/tracker-steroids/meson.build"
(("test\\(.*") ""))
#t))
;; Two tests fail if LANG is not set.
(add-before 'check 'pre-check
(lambda _
(setenv "LANG" "en_US.UTF-8")
;; For the missing /etc/machine-id.
(setenv "DBUS_FATAL_WARNINGS" "0")
;; Some tests expect to write to $HOME.
(setenv "HOME" "/tmp")
#t)))))
(native-inputs
`(("glib:bin" ,glib "bin")
("gnome-common" ,gnome-common)
("gobject-introspection" ,gobject-introspection)
("python-pygobject" ,python-pygobject)
("intltool" ,intltool)
("pkg-config" ,pkg-config)
("vala" ,vala)))
(inputs
`(("gtk+" ,gtk+)
("dbus" ,dbus)
`(("dbus" ,dbus)
("sqlite" ,sqlite)
("python" ,python)
("poppler" ,poppler)
("libpng" ,libpng)
("libtiff" ,libtiff)
("zlib" ,zlib)
("libxml2" ,libxml2)
("libunistring" ,libunistring)
("icu4c" ,icu4c) ; libunistring gets miner-miner-fs test to fail.
("json-glib" ,json-glib)
("openjpeg" ,openjpeg-1)
("libseccomp" ,libseccomp)
("libsoup" ,libsoup)
("libuuid" ,util-linux)
("network-manager" ,network-manager)))
("libsoup" ,libsoup)))
(synopsis "Metadata database, indexer and search tool")
(home-page "https://wiki.gnome.org/Projects/Tracker")
(description
"Tracker is an advanced framework for first class objects with associated
metadata and tags. It provides a one stop solution for all metadata, tags,
shared object databases, search tools and indexing.")
"Tracker is a search engine and triplestore for desktop, embedded and mobile.
It is a middleware component aimed at desktop application developers who want
their apps to browse and search user content. It's not designed to be used
directly by desktop users, but it provides a commandline tool named
@command{tracker} for the adventurous.
Tracker allows your application to instantly perform full-text searches across
all documents. This feature is used by the @{emph{search} bar in GNOME Files, for
example. This is achieved by indexing the user's home directory in the
background.
Tracker also allows your application to query and list content that the user
has stored. For example, GNOME Music displays all the music files that are
found by Tracker. This means that GNOME Music doesn't need to maintain a
database of its own.
If you need to go beyond simple searches, Tracker is also a linked data
endpoint and it understands SPARQL. ")
;; https://gitlab.gnome.org/GNOME/tracker/-/blob/master/COPYING:
;; src/libtracker-*/* and src/tracker-extract/* are covered by lgpl2.1+,
;; src/gvdb/* are covered by lgpl2.0+, and the rest is gpl2+.
;; libstemmer is bsd-3 and the rest is gpl2+.
(license (list license:gpl2+
license:lgpl2.1+
license:lgpl2.0+))))
license:bsd-3
license:lgpl2.1+))))
(define-public tracker-miners
(package
(name "tracker-miners")
(version "2.2.2")
(version "2.3.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/tracker-miners/"
@ -7509,7 +7504,7 @@ (define-public tracker-miners
"/tracker-miners-" version ".tar.xz"))
(sha256
(base32
"0kk5xaajamb8jlm6cfdbc2m3axzr6bnph84m7697xmb0pkg8hdiw"))))
"1kizavw9gbdjkw4wykgv0fcl2y6fj788nycx9p4byn6ylb1277h6"))))
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t
@ -8739,15 +8734,14 @@ (define-public gucharmap
(define-public bluefish
(package
(name "bluefish")
(version "2.2.10")
(version "2.2.11")
(source
(origin
(method url-fetch)
(uri (string-append "http://www.bennewitz.com/bluefish/stable/source/"
name "-" version ".tar.gz"))
"bluefish-" version ".tar.gz"))
(sha256
(base32
"1jw4has7lbp77lqmzvnnjmqcf0lacjfnka873lkkwdyrpzc4c1q4"))))
(base32 "0a7kf78q4cj2ap4igjks9kbmmr74brsrl4y2f9wbxpl0b0v2ck2x"))))
(build-system gnu-build-system)
(native-inputs
`(("desktop-file-utils" ,desktop-file-utils)
@ -8756,7 +8750,7 @@ (define-public bluefish
(inputs
`(("enchant" ,enchant)
("gtk+" ,gtk+)
("python" ,python-2)
("python" ,python-wrapper)
("xmllint" ,libxml2)
("gucharmap" ,gucharmap)))
(home-page "http://bluefish.openoffice.nl")
@ -9616,7 +9610,7 @@ (define-public libhandy
(define-public libgit2-glib
(package
(name "libgit2-glib")
(version "0.28.0.1")
(version "0.99.0.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@ -9624,19 +9618,20 @@ (define-public libgit2-glib
name "-" version ".tar.xz"))
(sha256
(base32
"0a0g7aw66rfgnqr4z7fgbk5zzcjq66m4rp8v4val3a212941h0g7"))))
"1pmrcnsa7qdda73c3dxf47733mwprmj5ljpw3acxbj6r8k27anp0"))))
(build-system meson-build-system)
(native-inputs
`(("glib:bin" ,glib "bin") ;; For glib-mkenums
("gobject-introspection" ,gobject-introspection)
("intltool" ,intltool)
("libssh2" ,libssh2)
("pkg-config" ,pkg-config)
("python-pygobject" ,python-pygobject)
("python-wrapper" ,python-wrapper)
("vala" ,vala)))
(inputs
`(("glib" ,glib)
("libssh2" ,libssh2)))
(propagated-inputs
`(;; In Requires of libgit2-glib.pc.
("libgit2" ,libgit2)))
(synopsis "GLib wrapper around the libgit2 Git access library")
(description "libgit2-glib is a GLib wrapper library around the libgit2 Git
@ -9690,7 +9685,6 @@ (define-public gitg
("json-glib" ,json-glib)
("libdazzle" ,libdazzle)
("libgee" ,libgee)
("libgit2" ,libgit2) ; propagated by libgit2-glib
("libgit2-glib" ,libgit2-glib)
("libpeas" ,libpeas)
("libsecret" ,libsecret)
@ -9878,3 +9872,58 @@ (define-public polari
integrate seamlessly with the GNOME desktop.")
(home-page "https://wiki.gnome.org/Apps/Polari")
(license license:gpl2+)))
(define-public gnome-boxes
(package
(name "gnome-boxes")
(version "3.35.91")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/gnome-boxes/"
(version-major+minor version) "/"
"gnome-boxes-" version ".tar.xz"))
(sha256
(base32
"0l96spz6pc8q4l5p9a58cc0kgvdr7pbc89hy6ixn72k5pl3s7fxj"))))
(build-system meson-build-system)
(arguments
'(#:glib-or-gtk? #t
#:configure-flags (list "-Drdp=false"
(string-append "-Dc_link_args=-Wl,-rpath="
(assoc-ref %outputs "out")
"/lib/gnome-boxes"))))
(native-inputs
`(("glib:bin" ,glib "bin") ; for glib-compile-resources
("gtk+:bin" ,gtk+ "bin") ; for gtk-update-icon-cache
("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database
("itstool" ,itstool)
("intltool" ,intltool)
("vala" ,vala)
("pkg-config" ,pkg-config)))
(inputs
`(("libarchive" ,libarchive)
("gtk" ,gtk+)
("gtk-vnc" ,gtk-vnc)
("libosinfo" ,libosinfo)
("libsecret" ,libsecret)
("libsoup" ,libsoup)
("libusb" ,libusb)
("libvirt" ,libvirt)
("libvirt-glib" ,libvirt-glib)
("libxml" ,libxml2)
("spice-gtk" ,spice-gtk)
("sparql-query" ,sparql-query)
("vte" ,vte)
("webkitgtk" ,webkitgtk)
("tracker" ,tracker)
("libgudev" ,libgudev)))
(home-page "https://wiki.gnome.org/Apps/Boxes")
(synopsis "View, access, and manage remote and virtual systems")
(description "GNOME Boxes is a simple application to view, access, and
manage remote and virtual systems.")
(license (list
;; For data/icons/empty-boxes.png.
license:cc-by2.0
;; For all others.
license:lgpl2.0+))))

2
gnu/packages/golang.scm
View file

@ -3197,7 +3197,7 @@ (define-public go-golang.org-x-sync-errgroup
(arguments
'(#:import-path "golang.org/x/sync/errgroup"
#:unpack-path "golang.org/x/sync"))
(synopsis "Synchronization, error propagation, and Context cancelation
(synopsis "Synchronization, error propagation, and Context cancellation
for groups of goroutines working on subtasks of a common task.")
(description "This package provides synchronization, error propagation,
and Context cancelation for groups of goroutines working on subtasks of a

18
gnu/packages/guile.scm
View file

@ -250,17 +250,21 @@ (define-public guile-2.2
(variable "GUILE_LOAD_COMPILED_PATH")
(files '("lib/guile/2.2/site-ccache")))))))
(define-public guile-2.2/bug-fix
;; This variant contains a bug fix for a relatively rare crash that could
(define-public guile-2.2.7
;; This version contains a bug fix for a relatively rare crash that could
;; affect shepherd as PID 1: <https://bugs.gnu.org/37757>.
(package
(inherit guile-2.2)
(version (string-append (package-version guile-2.2) "-1"))
(version "2.2.7")
(source (origin
(inherit (package-source guile-2.2))
(patches
(append (search-patches "guile-finalization-crash.patch")
(origin-patches (package-source guile-2.2))))))))
(uri (string-append "mirror://gnu/guile/guile-" version
".tar.xz"))
(sha256
(base32
"013mydzhfswqci6xmyc1ajzd59pfbdak15i0b090nhr9bzm7dxyd"))))))
(define-deprecated guile-2.2/bug-fix guile-2.2.7)
(define-public guile-2.2/fixed
;; A package of Guile 2.2 that's rarely changed. It is the one used
@ -291,7 +295,7 @@ (define-public guile-3.0
(version "3.0.0")
(source (origin
(inherit (package-source guile-2.2))
(uri (string-append "ftp://ftp.gnu.org/gnu/guile/guile-"
(uri (string-append "mirror://gnu/guile/guile-"
version ".tar.xz"))
(sha256
(base32

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

@ -615,7 +615,7 @@ (define-public raincat
("ghc-sdl2" ,ghc-sdl2)
("ghc-sdl2-image" ,ghc-sdl2-image)
("ghc-sdl2-mixer" ,ghc-sdl2-mixer)))
(home-page "http://www.bysusanlin.com/raincat/")
(home-page "https://www.gamecreation.org/games/raincat")
(synopsis "Puzzle game with a cat in lead role")
(description "Project Raincat is a game developed by Carnegie Mellon
students through GCS during the Fall 2008 semester. Raincat features game

2
gnu/packages/idris.scm
View file

@ -121,7 +121,7 @@ (define-public idris
(list (search-path-specification
(variable "IDRIS_LIBRARY_PATH")
(files '("lib/idris")))))
(home-page "http://www.idris-lang.org")
(home-page "https://www.idris-lang.org")
(synopsis "General purpose language with full dependent types")
(description "Idris is a general purpose language with full dependent
types. It is compiled, with eager evaluation. Dependent types allow types to

4
gnu/packages/image.scm
View file

@ -1291,7 +1291,7 @@ (define-public jasper
(define-public zimg
(package
(name "zimg")
(version "2.9.2")
(version "2.9.3")
(source
(origin
(method git-fetch)
@ -1300,7 +1300,7 @@ (define-public zimg
(commit (string-append "release-" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0jlgrlfs9maixd8mx7gk2kfawz8ixnihkxi7vhyzfy1gq49vmxm2"))))
(base32 "12bs2rfmmy021087i10vxibdbbvd5vld0vk3h5hymhpz7rgszcmg"))))
(build-system gnu-build-system)
(native-inputs
`(("autoconf" ,autoconf)

30
gnu/packages/java.scm
View file

@ -3530,7 +3530,7 @@ (define-public java-junit
#:jar-name "junit.jar"))
(inputs
`(("java-hamcrest-core" ,java-hamcrest-core)))
(home-page "http://junit.org/")
(home-page "https://junit.org/")
(synopsis "Test framework for Java")
(description
"JUnit is a simple framework to write repeatable tests for Java projects.
@ -4680,7 +4680,7 @@ (define-public java-commons-math3
(native-inputs
`(("java-junit" ,java-junit)
("java-hamcrest-core" ,java-hamcrest-core)))
(home-page "http://commons.apache.org/math/")
(home-page "https://commons.apache.org/math/")
(synopsis "Apache Commons mathematics library")
(description "Commons Math is a library of lightweight, self-contained
mathematics and statistics components addressing the most common problems not
@ -4862,7 +4862,7 @@ (define-public java-commons-beanutils
(native-inputs
`(("junit" ,java-junit)
("collections-test" ,java-commons-collections-test-classes)))
(home-page "http://commons.apache.org/beanutils/")
(home-page "https://commons.apache.org/beanutils/")
(synopsis "Dynamically set or get properties in Java")
(description "BeanUtils provides a simplified interface to reflection and
introspection to set or get dynamically determined properties through their
@ -4897,7 +4897,7 @@ (define-public java-commons-io
(native-inputs
`(("java-junit" ,java-junit)
("java-hamcrest-core" ,java-hamcrest-core)))
(home-page "http://commons.apache.org/io/")
(home-page "https://commons.apache.org/io/")
(synopsis "Common useful IO related classes")
(description "Commons-IO contains utility classes, stream implementations,
file filters and endian classes.")
@ -5013,7 +5013,7 @@ (define-public java-commons-lang
(add-after 'install 'install-doc (install-javadoc "target/apidocs")))))
(native-inputs
`(("java-junit" ,java-junit)))
(home-page "http://commons.apache.org/lang/")
(home-page "https://commons.apache.org/lang/")
(synopsis "Extension of the java.lang package")
(description "The Commons Lang components contains a set of Java classes
that provide helper methods for standard Java classes, especially those found
@ -5077,7 +5077,7 @@ (define-public java-commons-lang3
("java-commons-io" ,java-commons-io)
("java-hamcrest-all" ,java-hamcrest-all)
("java-easymock" ,java-easymock)))
(home-page "http://commons.apache.org/lang/")
(home-page "https://commons.apache.org/lang/")
(synopsis "Extension of the java.lang package")
(description "The Commons Lang components contains a set of Java classes
that provide helper methods for standard Java classes, especially those found
@ -5185,7 +5185,7 @@ (define-public java-commons-jxpath
("java-commons-beanutils" ,java-commons-beanutils)))
(native-inputs
`(("java-junit" ,java-junit)))
(home-page "http://commons.apache.org/jxpath/")
(home-page "https://commons.apache.org/jxpath/")
(synopsis "Simple interpreter of an expression language called XPath.")
(description "The org.apache.commons.jxpath package defines a simple
interpreter of an expression language called XPath. JXPath applies XPath
@ -5444,7 +5444,7 @@ (define-public java-commons-logging-minimal
"LogKitLogger.java"))
(delete-file-recursively "src/test")
#t)))))
(home-page "http://commons.apache.org/logging/")
(home-page "https://commons.apache.org/logging/")
(synopsis "Common API for logging implementations")
(description "The Logging package is a thin bridge between different
logging implementations. A library that uses the commons-logging API can be
@ -5661,7 +5661,7 @@ (define-public java-commons-net
(native-inputs
`(("java-junit" ,java-junit)
("java-hamcrest-core" ,java-hamcrest-core)))
(home-page "http://commons.apache.org/net/")
(home-page "https://commons.apache.org/net/")
(synopsis "Client library for many basic Internet protocols")
(description "The Apache Commons Net library implements the client side of
many basic Internet protocols. The purpose of the library is to provide
@ -6503,7 +6503,7 @@ (define-public java-log4j-api
`(("java-osgi-core" ,java-osgi-core)
("java-hamcrest-core" ,java-hamcrest-core)
("java-junit" ,java-junit)))
(home-page "http://logging.apache.org/log4j/2.x/")
(home-page "https://logging.apache.org/log4j/2.x/")
(synopsis "API module of the Log4j logging framework for Java")
(description
"This package provides the API module of the Log4j logging framework for
@ -6671,7 +6671,7 @@ (define-public java-commons-daemon
(add-after 'install 'install-doc (install-javadoc "dist/docs/api")))))
(native-inputs
`(("java-junit" ,java-junit)))
(home-page "http://commons.apache.org/daemon/")
(home-page "https://commons.apache.org/daemon/")
(synopsis "Library to launch Java applications as daemons")
(description "The Daemon package from Apache Commons can be used to
implement Java applications which can be launched as daemons. For example the
@ -9167,7 +9167,7 @@ (define-public java-testng
("cglib" ,java-cglib)
("asm" ,java-asm)
("aopalliance" ,java-aopalliance)))
(home-page "http://testng.org")
(home-page "https://testng.org")
(synopsis "Testing framework")
(description "TestNG is a testing framework inspired from JUnit and NUnit
but introducing some new functionalities that make it more powerful and easier
@ -10266,7 +10266,7 @@ (define-public java-joda-convert
(native-inputs
`(("java-junit" ,java-junit)
("java-hamcrest-core" ,java-hamcrest-core)))
(home-page "http://www.joda.org/joda-convert/")
(home-page "https://www.joda.org/joda-convert/")
(synopsis "Conversion between Objects and Strings")
(description "Joda-Convert provides a small set of classes to aid
conversion between Objects and Strings. It is not intended to tackle the
@ -10637,7 +10637,7 @@ (define-public java-openchart2
`(("unzip" ,unzip)
("java-junit" ,java-junit)
("java-hamcrest-core" ,java-hamcrest-core)))
(home-page "http://approximatrix.com/products/openchart2/")
(home-page "https://approximatrix.com/products/openchart2/")
(synopsis "Simple plotting for Java")
(description "Openchart2 provides a simple, yet powerful, interface for
Java programmers to create two-dimensional charts and plots. The library
@ -10733,7 +10733,7 @@ (define-public java-commons-vfs
("java-commons-logging-minimal" ,java-commons-logging-minimal)
("java-commons-net" ,java-commons-net)
("java-jsch" ,java-jsch)))
(home-page "http://commons.apache.org/proper/commons-vfs/")
(home-page "https://commons.apache.org/proper/commons-vfs/")
(synopsis "Java file system library")
(description "Commons VFS provides a single API for accessing various
different file systems. It presents a uniform view of the files from various

4
gnu/packages/kde-multimedia.scm
View file

@ -688,6 +688,8 @@ (define-public libkcompactdisc
("solid" ,solid)))
(home-page "https://cgit.kde.org/libkcompactdisc.git/")
(synopsis "KDE library for playing & ripping CDs")
(description "KDE library for playing & ripping CDs.")
(description "The KDE Compact Disc library provides an API for
applications using the KDE Platform to interface with the CD drives for audio
CDs.")
(license ;; GPL for programs, LGPL for libraries
(list license:gpl2+ license:lgpl2.0+))))

55
gnu/packages/kde-pim.scm
View file

@ -52,7 +52,7 @@ (define-public akonadi
(patches (search-patches
"akonadi-paths.patch"
"akonadi-timestamps.patch"
"akonadi-Revert-Make-installation-properly-relocatabl.patch"))))
"akonadi-Revert-Make-installation-properly-relo.patch"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@ -329,8 +329,8 @@ (define-public akonadi-search
`(#:tests? #f)) ;; TODO: needs dbus
(home-page "https://api.kde.org/stable/kdepimlibs-apidocs/akonadi/html/")
(synopsis "Akonadi search library")
(description "Xapian-based indexing and query infrastructure for
Akonadi.")
(description "This package provides a library used to search in the
Akonadi PIM data server. It uses Xapian for indexing and querying.")
(license ;; GPL for programs, LGPL for libraries
(list license:gpl2+ license:lgpl2.0+))))
@ -371,7 +371,8 @@ (define-public kalarmcal
`(#:tests? #f)) ;; TODO: TZ setup
(home-page "https://api.kde.org/stable/kdepimlibs-apidocs/")
(synopsis "Library for handling kalarm calendar data")
(description "This library provides an API for KAlarm alarms.")
(description "This library provides access to and handling of kalarm
calendar data.")
(license license:lgpl2.0+)))
(define-public kcalutils
@ -454,7 +455,8 @@ (define-public kdepim-apps-libs
("qtbase" ,qtbase)))
(home-page "https://cgit.kde.org/kdepim-apps-libs.git")
(synopsis "KDE PIM mail related libraries and data files")
(description "KDE PIM mail related libraries and data files.")
(description "This packages provides mail related libraries and data files
for KDE PIM.")
(license ;; GPL for programs, LGPL for libraries
(list license:gpl2+ license:lgpl2.0+))))
@ -541,7 +543,7 @@ (define-public kidentitymanagement
#t)))))
(home-page "https://kontact.kde.org/")
(synopsis "Library for shared identities between mail applications")
(description "Library for shared identities between mail applications.")
(description "This library provides an API for managing user identities.")
(license ;; GPL for programs, LGPL for libraries, FDL for documentation
(list license:gpl2+ license:lgpl2.0+ license:fdl1.2+))))
@ -601,7 +603,9 @@ (define-public kldap
("openldap" ,openldap)))
(home-page "https://api.kde.org/stable/kdepimlibs-apidocs/")
(synopsis "Library for accessing LDAP")
(description "This library provides an API for LDAP.")
(description " This is a library for accessing LDAP with a convenient Qt
style C++ API. LDAP (Lightweight Directory Access Protocol) is an application
protocol for querying and modifying directory services running over TCP/IP. ")
(license license:lgpl2.0+)))
(define-public kleopatra
@ -694,7 +698,8 @@ (define-public kmailimporter
("qtbase" ,qtbase)))
(home-page "https://cgit.kde.org/mailimporter.git")
(synopsis "KDE mail importer library")
(description "KDE mail importer library.")
(description "This package provides libraries for importing mails other
e-mail client programs into KMail and KDE PIM.")
(license ;; GPL for programs, LGPL for libraries
(list license:gpl2+ license:lgpl2.0+))))
@ -736,7 +741,7 @@ (define-public kmailtransport
`(#:tests? #f)) ;; TODO - 3/3 tests fail, require drkonqi
(home-page "https://api.kde.org/stable/kdepimlibs-apidocs/")
(synopsis "Mail transport service library")
(description " This library provides an API and support code for managing
(description "This library provides an API and support code for managing
mail transport.")
(license license:lgpl2.0+)))
@ -760,7 +765,8 @@ (define-public kmbox
("qtbase" ,qtbase)))
(home-page "https://api.kde.org/stable/kdepimlibs-apidocs/")
(synopsis "Library for handling mbox mailboxes")
(description "A library for accessing mail storages in MBox format.")
(description "This is a library for handling mailboxes in mbox format,
using a Qt/KMime C++ API.")
(license license:lgpl2.0+ )))
(define-public kmime
@ -794,7 +800,11 @@ (define-public kmime
#t)))))
(home-page "https://api.kde.org/stable/kdepimlibs-apidocs/")
(synopsis "Library for handling MIME data")
(description "A library for MIME handling.")
(description "This library provides an API for handling MIME
data. MIME (Multipurpose Internet Mail Extensions) is an Internet Standard
that extends the format of e-mail to support text in character sets other than
US-ASCII, non-text attachments, multi-part message bodies, and header
information in non-ASCII character sets.")
(license license:lgpl2.0+)))
(define-public kontactinterface
@ -821,7 +831,8 @@ (define-public kontactinterface
("qtbase" ,qtbase)))
(home-page "https://api.kde.org/stable/kdepimlibs-apidocs/")
(synopsis "Kontact interface library")
(description "Kontact Interface library.")
(description " This library provides the glue necessary for
application \"Parts\" to be embedded as a Kontact component (or plugin).")
(license license:lgpl2.0+)))
(define-public kpimcommon
@ -881,8 +892,8 @@ (define-public kpimcommon
(arguments
`(#:tests? #f)) ;; TODO tests hang
(home-page "https://cgit.kde.org/pimcommon.git")
(synopsis "Common library for KDE PIM")
(description "Common library for KDE PIM.")
(synopsis "Common libraries for KDE PIM")
(description "This package provides common libraries for KDE PIM.")
(license ;; GPL for programs, LGPL for libraries
(list license:gpl2+ license:lgpl2.0+))))
@ -922,7 +933,9 @@ (define-public kpimtextedit
`(#:tests? #f)) ;; TODO - test suite hangs
(home-page "https://api.kde.org/stable/kdepimlibs-apidocs/")
(synopsis "Library providing a textedit with PIM-specific features")
(description "A library for PIM-specific text editing utilities.")
(description "This package provides a textedit with PIM-specific features.
It also provides so-called rich text builders which can convert the formatted
text in the text edit to all kinds of markup, like HTML or BBCODE.")
(license ;; GPL for programs, LGPL for libraries, FDL for documentation
(list license:gpl2+ license:lgpl2.0+ license:fdl1.2+))))
@ -990,8 +1003,12 @@ (define-public ktnef
("ki18n" ,ki18n)
("qtbase" ,qtbase)))
(home-page "https://api.kde.org/stable/kdepimlibs-apidocs/ktnef/html/")
(synopsis "Viewer for mail attachments using TNEF format")
(description "Viewer for mail attachments using TNEF format")
(synopsis "Library for handling mail attachments using TNEF format")
(description "Ktnef is a library for handling data in the TNEF
format (Transport Neutral Encapsulation Format, a proprietary format of e-mail
attachment used by Microsoft Outlook and Microsoft Exchange Server). The API
permits access to the actual attachments, the message properties (TNEF/MAPI),
and allows one to view/extract message formatted text in Rich Text Format.")
(license license:lgpl2.0+)))
(define-public libkdepim
@ -1037,8 +1054,8 @@ (define-public libkdepim
("kwidgetsaddons" ,kwidgetsaddons)
("qtbase" ,qtbase)))
(home-page "https://cgit.kde.org/libkdepim.git")
(synopsis "Libraries for common kdepim apps")
(description "Libraries for common kdepim apps.")
(synopsis "Libraries for common KDE PIM apps")
(description "This package provided libraries for common KDE PIM apps.")
(license ;; GPL for programs, LGPL for libraries
(list license:gpl2+ license:lgpl2.0+))))

12
gnu/packages/kde-systemtools.scm
View file

@ -161,7 +161,15 @@ (define-public khelpcenter
`(#:tests? #f)) ;; 1/1 test fails
(home-page "https://kde.org/applications/system/org.kde.Help")
(synopsis "KDE documentation viewer")
(description "KDE documentation viewer")
(description "KHelpCenter uses meta data files which describe the
documentation available in the system. Each document is represented by a meta
data file and shown as an entry in the KHelpCenter navigation tree view. The
meta data contains information about title and short description of the
document, the location of the document and some more information like how to
search the document and translations of title and description. Document
hierarchy is represented as hierarchy of the meta data files. Directories are
also described by a meta data file which contains the same information as a
document meta data file.")
(license license:gpl2+)))
(define-public konsole
@ -306,7 +314,7 @@ (define-public ksystemlog
(description "This program is developed for being used by beginner users,
which don't know how to find information about their Linux system, and how the
log files are in their computer. But it is also designed for advanced users,
who want to quickly see problems occuring on their server.
who want to quickly see problems occurring on their server.
This package is part of the KDE administration module.")
(license license:gpl2+)))

2
gnu/packages/kerberos.scm
View file

@ -97,7 +97,7 @@ (define-public mit-krb5
cryptography.")
(license (license:non-copyleft "file://NOTICE"
"See NOTICE in the distribution."))
(home-page "http://web.mit.edu/kerberos/")
(home-page "https://web.mit.edu/kerberos/")
(properties '((cpe-name . "kerberos")))))
(define-public shishi

35
gnu/packages/linux.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013, 2014, 2015, 2016 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Mark H Weaver <mhw@netris.org>
@ -362,18 +362,18 @@ (define (%upstream-linux-source version hash)
"linux-" version ".tar.xz"))
(sha256 hash)))
(define-public linux-libre-5.4-version "5.4.23")
(define-public linux-libre-5.4-version "5.4.24")
(define-public linux-libre-5.4-pristine-source
(let ((version linux-libre-5.4-version)
(hash (base32 "1jhyg2yc03fka92l7hwdajim6q5rk538hjdr1gwgvpfyyp6sla1z")))
(hash (base32 "1cvy3mxwzll4f9j8i3hfmi0i0zq75aiafq1jskp9n4kq9iwar83z")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-5.4)))
(define-public linux-libre-4.19-version "4.19.107")
(define-public linux-libre-4.19-version "4.19.108")
(define-public linux-libre-4.19-pristine-source
(let ((version linux-libre-4.19-version)
(hash (base32 "0h02pxzzwc5w2kfqw686bpxc13a93yq449lyzxxkxq1qilcsqjv5")))
(hash (base32 "18shyy1z2s8r26qb4rcz7gwl43dnmycjjywp9gss5zlfn2jyrbh9")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-4.19)))
@ -2886,6 +2886,26 @@ (define-public eudev
time.")
(license license:gpl2+)))
;; TODO: Merge with eudev on the next rebuild cycle.
(define-public eudev/btrfs-fix
(package/inherit
eudev
(version (string-append (package-version eudev) "-1"))
(arguments
(substitute-keyword-arguments (package-arguments eudev)
((#:phases phases '%standard-phases)
`(modify-phases ,phases
(add-before 'configure 'patch-bindir-in-btrfs-rules
(lambda* (#:key outputs #:allow-other-keys)
;; The "@bindir@" substitution incorrectly expands to a literal
;; "${exec_prefix}" (see <https://bugs.gnu.org/39926>). Work
;; around it.
(let ((out (assoc-ref outputs "out")))
(substitute* "rules/64-btrfs.rules.in"
(("@bindir@")
(string-append out "/bin")))
#t)))))))))
(define-public eudev-with-hwdb
(deprecated-package "eudev-with-hwdb" eudev))
@ -5025,7 +5045,7 @@ (define-public mtd-utils
(define-public libseccomp
(package
(name "libseccomp")
(version "2.4.2")
(version "2.4.3")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/seccomp/libseccomp/"
@ -5033,8 +5053,7 @@ (define-public libseccomp
"/libseccomp-" version ".tar.gz"))
(sha256
(base32
"0nsq81acrbkdr8zairxbwa33bj2a6126npp76b4srjl472sjfkxm"))
(patches (search-patches "libseccomp-open-aarch64.patch"))))
"07crwxqzvl5k2b90a47ii9wgvi09s9hsy5b5jddw9ylp351d25fg"))))
(build-system gnu-build-system)
(native-inputs
`(("which" ,which)))

101
gnu/packages/lisp-xyz.scm
View file

@ -5357,10 +5357,10 @@ (define-public sbcl-iolib.grovel
#t)))))
(synopsis "CFFI Groveller for IOLib, a Common Lisp I/O library")))
(define-public sbcl-iolib
(define sbcl-iolib+syscalls
(package
(inherit sbcl-iolib.asdf)
(name "sbcl-iolib")
(name "sbcl-iolib+syscalls")
(inputs
`(("iolib.asdf" ,sbcl-iolib.asdf)
("iolib.conf" ,sbcl-iolib.conf)
@ -5375,7 +5375,7 @@ (define-public sbcl-iolib
`(("fiveam" ,sbcl-fiveam)))
(arguments
'(#:asd-file "iolib.asd"
#:asd-system-name "iolib"
#:asd-system-name "iolib/syscalls"
#:test-asd-file "iolib.tests.asd"
#:phases
(modify-phases %standard-phases
@ -5392,41 +5392,58 @@ (define-public sbcl-iolib
"")))))))
(synopsis "Common Lisp I/O library")))
(define-public cl-iolib
(sbcl-package->cl-source-package sbcl-iolib))
(define sbcl-iolib+multiplex
(package
(inherit sbcl-iolib)
(inherit sbcl-iolib+syscalls)
(name "sbcl-iolib+multiplex")
(inputs
`(("iolib+syscalls" ,sbcl-iolib+syscalls)
,@(package-inputs sbcl-iolib+syscalls)))
(arguments
(substitute-keyword-arguments (package-arguments sbcl-iolib)
(substitute-keyword-arguments (package-arguments sbcl-iolib+syscalls)
((#:asd-system-name _) "iolib/multiplex")))))
(define sbcl-iolib+syscalls
(package
(inherit sbcl-iolib)
(name "sbcl-iolib+syscalls")
(arguments
(substitute-keyword-arguments (package-arguments sbcl-iolib)
((#:asd-system-name _) "iolib/syscalls")))))
(define sbcl-iolib+streams
(package
(inherit sbcl-iolib)
(inherit sbcl-iolib+syscalls)
(name "sbcl-iolib+streams")
(inputs
`(("iolib+multiplex" ,sbcl-iolib+multiplex)
,@(package-inputs sbcl-iolib+syscalls)))
(arguments
(substitute-keyword-arguments (package-arguments sbcl-iolib)
(substitute-keyword-arguments (package-arguments sbcl-iolib+syscalls)
((#:asd-system-name _) "iolib/streams")))))
(define sbcl-iolib+sockets
(package
(inherit sbcl-iolib)
(inherit sbcl-iolib+syscalls)
(name "sbcl-iolib+sockets")
(inputs
`(("iolib+syscalls" ,sbcl-iolib+syscalls)
("iolib+streams" ,sbcl-iolib+streams)
,@(package-inputs sbcl-iolib+syscalls)))
(arguments
(substitute-keyword-arguments (package-arguments sbcl-iolib)
(substitute-keyword-arguments (package-arguments sbcl-iolib+syscalls)
((#:asd-system-name _) "iolib/sockets")))))
(define-public sbcl-iolib
(package
(inherit sbcl-iolib+syscalls)
(name "sbcl-iolib")
(inputs
`(("iolib+multiplex" ,sbcl-iolib+multiplex)
("iolib+streams" ,sbcl-iolib+streams)
("iolib+sockets" ,sbcl-iolib+sockets)
,@(package-inputs sbcl-iolib+syscalls)))
(arguments
(substitute-keyword-arguments (package-arguments sbcl-iolib+syscalls)
((#:asd-system-name _) "iolib")))))
(define-public cl-iolib
(sbcl-package->cl-source-package sbcl-iolib))
(define-public sbcl-ieee-floats
(let ((commit "566b51a005e81ff618554b9b2f0b795d3b29398d")
(revision "1"))
@ -6350,16 +6367,13 @@ (define-public cl-dbus
(sha256
(base32
"0fw2q866yddbf23nk9pxphm9gsasx35vjyss82xzvndnjmzlqfl5"))))
;; Inputs must be propagated or else packages depending on this won't have the necessary packages.
;; Inputs must be propagated or else packages depending on this won't
;; have the necessary packages.
(propagated-inputs
`(("alexandria" ,sbcl-alexandria)
("trivial-garbage" ,sbcl-trivial-garbage)
("babel" ,sbcl-babel)
("iolib" ,sbcl-iolib)
("iolib+multiplex" ,(@@ (gnu packages lisp-xyz) sbcl-iolib+multiplex))
("iolib+syscalls" ,(@@ (gnu packages lisp-xyz) sbcl-iolib+syscalls))
("iolib+streams" ,(@@ (gnu packages lisp-xyz) sbcl-iolib+streams))
("iolib+sockets" ,(@@ (gnu packages lisp-xyz) sbcl-iolib+sockets))
("ieee-floats" ,sbcl-ieee-floats)
("flexi-streams" ,sbcl-flexi-streams)
("cl-xmlspam" ,sbcl-cl-xmlspam)
@ -11197,3 +11211,42 @@ (define-public sbcl-clsql-mysql
"-o" shared-lib)
#t)))))))
(synopsis "MySQL driver for Common Lisp SQL interface library")))
(define-public sbcl-sycamore
(let ((commit "fd2820fec165ad514493426dea209728f64e6d18"))
(package
(name "sbcl-sycamore")
(version "0.0.20120604")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/ndantam/sycamore/")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "00bv1aj89q5vldmq92zp2364jq312zjq2mbd3iyz1s2b4widzhl7"))))
(build-system asdf-build-system/sbcl)
(arguments
`(#:asd-file "src/sycamore.asd"))
(inputs
`(("alexandria" ,sbcl-alexandria)
("cl-ppcre" ,sbcl-cl-ppcre)))
(synopsis "Purely functional data structure library in Common Lisp")
(description
"Sycamore is a fast, purely functional data structure library in Common Lisp.
If features:
@itemize
@item Fast, purely functional weight-balanced binary trees.
@item Leaf nodes are simple-vectors, greatly reducing tree height.
@item Interfaces for tree Sets and Maps (dictionaries).
@item Ropes.
@item Purely functional pairing heaps.
@item Purely functional amortized queue.
@end itemize\n")
(home-page "http://ndantam.github.io/sycamore/")
(license license:bsd-3))))
(define-public cl-sycamore
(sbcl-package->cl-source-package sbcl-sycamore))

10
gnu/packages/machine-learning.scm
View file

@ -798,7 +798,7 @@ (define-public dlib
(define-public python-scikit-learn
(package
(name "python-scikit-learn")
(version "0.20.4")
(version "0.22.1")
(source
(origin
(method git-fetch)
@ -808,7 +808,7 @@ (define-public python-scikit-learn
(file-name (git-file-name name version))
(sha256
(base32
"08zbzi8yx5wdlxfx9jap61vg1malc9ajf576w7a0liv6jvvrxlpj"))))
"1xqxv210gsmjw094vc5ghq2y9lmm74qkk22pq6flcjzj51b86jxf"))))
(build-system python-build-system)
(arguments
`(#:phases
@ -835,7 +835,8 @@ (define-public python-scikit-learn
(inputs
`(("openblas" ,openblas)))
(native-inputs
`(("python-pytest" ,python-pytest)
`(("python-joblib" ,python-joblib)
("python-pytest" ,python-pytest)
("python-pandas" ,python-pandas) ;for tests
("python-cython" ,python-cython)))
(propagated-inputs
@ -2105,7 +2106,8 @@ (define-public python-umap-learn
"02ada2yy6km6zgk2836kg1c97yrcpalvan34p8c57446finnpki1"))))
(build-system python-build-system)
(native-inputs
`(("python-nose" ,python-nose)))
`(("python-joblib" ,python-joblib)
("python-nose" ,python-nose)))
(propagated-inputs
`(("python-numba" ,python-numba)
("python-numpy" ,python-numpy)

8
gnu/packages/mail.scm
View file

@ -1166,7 +1166,7 @@ (define-public compface
(define-public claws-mail
(package
(name "claws-mail")
(version "3.17.4")
(version "3.17.5")
(source (origin
(method url-fetch)
(uri (string-append
@ -1174,7 +1174,7 @@ (define-public claws-mail
".tar.xz"))
(sha256
(base32
"00mfhaac16sv67rwiq98hr4nl5zmd1h2afswwwksdcsi3q9x23jr"))))
"1gjrmdmhc7zzilrlss9yl86ybv9sra8v0qi7mkwv7d9azidx5kns"))))
(build-system gnu-build-system)
(native-inputs `(("pkg-config" ,pkg-config)))
(inputs `(("bogofilter" ,bogofilter)
@ -1380,7 +1380,7 @@ (define-public exim
(define-public dovecot
(package
(name "dovecot")
(version "2.3.9.3")
(version "2.3.10")
(source
(origin
(method url-fetch)
@ -1388,7 +1388,7 @@ (define-public dovecot
(version-major+minor version) "/"
"dovecot-" version ".tar.gz"))
(sha256
(base32 "0lcnqib63nv32xr3nr4s3x8k77mbgrhc13swjl2xqnzw4fabd7zq"))))
(base32 "1ibiz3k2flablkcqbkvfzsjnq5b5kxximhcrplflsjl57mr88ca7"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))

4
gnu/packages/man.scm
View file

@ -60,14 +60,14 @@ (define-public libpipeline
(define-public man-db
(package
(name "man-db")
(version "2.9.0")
(version "2.9.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://savannah/man-db/man-db-"
version ".tar.xz"))
(sha256
(base32
"0qg2sdn8mayya0ril484iz1r7hi46l68d2d80cr6lvc7x3csqjjx"))))
"0ky7aq8313xa1y0zdwdbz5yvjfjb3xy0xymbimd2d9q9bky8lgds"))))
(build-system gnu-build-system)
(arguments
`(#:phases

24
gnu/packages/maths.scm
View file

@ -11,7 +11,7 @@
;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2015 Fabian Harfert <fhmgufs@web.de>
;;; Copyright © 2016 Roel Janssen <roel@gnu.org>
;;; Copyright © 2016, 2018 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2016, 2018, 2020 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016, 2017 Thomas Danckaert <post@thomasdanckaert.be>
@ -3030,7 +3030,7 @@ (define-public maxima
(define-public wxmaxima
(package
(name "wxmaxima")
(version "20.01.3")
(version "20.02.4")
(source
(origin
(method git-fetch)
@ -3039,10 +3039,13 @@ (define-public wxmaxima
(commit (string-append "Version-" version))))
(file-name (git-file-name name version))
(sha256
(base32 "18fj2m1qwlbavivpixph112wq9hxy3hh7c8q07djc3bhrzf2a7v7"))))
(base32 "106a7jrjwfmymzj70nsv44fm3jbxngr8pmkaghhpwy0ln38lhf54"))))
(build-system cmake-build-system)
(native-inputs
`(("gettext" ,gettext-minimal)))
`(("gettext" ,gettext-minimal)
("xorg-server" ,xorg-server-for-tests)))
;; TODO: Add libomp for multithreading support.
;; As of right now, enabling libomp causes the imageCells.wxm test to fail.
(inputs
`(("wxwidgets" ,wxwidgets)
("maxima" ,maxima)
@ -3051,9 +3054,16 @@ (define-public wxmaxima
("gtk+" ,gtk+)
("shared-mime-info" ,shared-mime-info)))
(arguments
`(#:tests? #f ; no check target
`(#:test-target "test"
#:phases
(modify-phases %standard-phases
(add-before 'check 'pre-check
(lambda _
;; Tests require a running X server.
(system "Xvfb :1 &")
(setenv "DISPLAY" ":1")
(setenv "HOME" (getcwd))
#t))
(add-after 'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys)
(wrap-program (string-append (assoc-ref outputs "out")
@ -3222,7 +3232,7 @@ (define-public openblas
`(("cunit" ,cunit)
("fortran" ,gfortran)
("perl" ,perl)))
(home-page "http://www.openblas.net/")
(home-page "https://www.openblas.net/")
(synopsis "Optimized BLAS library based on GotoBLAS")
(description
"OpenBLAS is a BLAS library forked from the GotoBLAS2-1.13 BSD version.")
@ -5232,7 +5242,7 @@ (define-public speedcrunch
keyboard. Some distinctive features are auto-completion of functions and
variables, a formula book, and quick insertion of constants from various
fields of knowledge.")
(home-page "http://speedcrunch.org/")
(home-page "https://speedcrunch.org/")
(license license:gpl2+)))
(define-public minisat

2
gnu/packages/messaging.scm
View file

@ -1238,7 +1238,7 @@ (define-public ytalk
(build-system gnu-build-system)
(inputs
`(("ncurses" ,ncurses)))
(home-page "http://ytalk.ourproject.org")
(home-page "https://ytalk.ourproject.org")
(synopsis "Multi-user chat program")
(description "Ytalk is a replacement for the BSD talk program. Its main
advantage is the ability to communicate with any arbitrary number of users at

60
gnu/packages/music.scm
View file

@ -2353,6 +2353,64 @@ (define-public jack-capture
can connect to any JACK port and record the output into a stereo WAV file.")
(license license:gpl2+)))
(define-public jack-select
(package
(name "jack-select")
(version "1.5.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "jack-select" version))
(sha256
(base32
"1zijk9ly2fczxsnnrqr8s0ajmlyx1j1vd8gk0rm5dj5zyhhmia7f"))))
(build-system gnu-build-system)
(arguments
`(#:modules ((guix build gnu-build-system)
((guix build python-build-system) #:prefix python:)
(guix build utils))
#:imported-modules (,@%gnu-build-system-modules
(guix build python-build-system))
#:make-flags
(list (string-append "PREFIX=" (assoc-ref %outputs "out")))
#:tests? #f ; there are none
#:phases
(modify-phases %standard-phases
(replace 'configure
(lambda* (#:key inputs #:allow-other-keys)
;; python-dbus cannot be found but it's really there. See
;; https://github.com/SpotlightKid/jack-select/issues/2
(substitute* "setup.py"
(("'dbus-python',") ""))
;; Fix reference to dlopened libraries.
(substitute* "jackselect/alsainfo.py"
(("libasound.so.2")
(string-append (assoc-ref inputs "alsa-lib")
"/lib/libasound.so.2")))
#t))
(replace 'build
(assoc-ref python:%standard-phases 'build))
(add-after 'install 'wrap
(assoc-ref python:%standard-phases 'wrap)))))
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
`(("alsa-lib" ,alsa-lib)
("python" ,python-wrapper)
("python-pyudev" ,python-pyudev)
("python-pyxdg" ,python-pyxdg)
("python-dbus" ,python-dbus)
("python-pygobject" ,python-pygobject)))
(home-page "https://github.com/SpotlightKid/jack-select")
(synopsis "Systray application to quickly change the JACK-DBus configuration")
(description "This application displays an icon in the system tray (also
known as notification area) of your desktop, which shows the status of the
JACK audio server and when you click on it, a menu pops up, which lets you
quickly select from the JACK configuration presets you created with QjackCtl.
When you select a preset, its JACK engine and driver configuration settings
are loaded via DBus into JACK and then the server is restarted. This allows
you to switch between different audio setups with just two mouse clicks.")
(license license:expat)))
(define-public cursynth
(package
(name "cursynth")
@ -2870,7 +2928,7 @@ (define-public instantmusic
(find-files "instantmusic.egg-info"
"PKG-INFO|.*\\.txt"))
#t)))))
(home-page "http://iyask.me/Instant-Music-Downloader/")
(home-page "https://github.com/yask123/Instant-Music-Downloader")
(synopsis "Command-line program to download a song from YouTube")
(description "InstantMusic downloads a song from YouTube in MP3 format.
Songs can be searched by artist, name or even by a part of the song text.")

8
gnu/packages/ntp.scm
View file

@ -41,7 +41,7 @@ (define-module (gnu packages ntp)
(define-public ntp
(package
(name "ntp")
(version "4.2.8p13")
(version "4.2.8p14")
(source
(origin
(method url-fetch)
@ -54,7 +54,7 @@ (define-public ntp
(version-major+minor version)
"/ntp-" version ".tar.gz")))
(sha256
(base32 "0f1a4fya7v5s0426nim8ydvvlcashb8hicgs9xlm76ndrz7751r8"))
(base32 "1dsfbrad5adwjnm3k0y0ip8dzs7r2nmw66vjil8gvapnh7qf8q0r"))
(modules '((guix build utils)))
(snippet
'(begin
@ -92,9 +92,9 @@ (define-public ntp
(description "NTP is a system designed to synchronize the clocks of
computers over a network.")
(license (l:x11-style
"http://www.eecis.udel.edu/~mills/ntp/html/copyright.html"
"https://www.eecis.udel.edu/~mills/ntp/html/copyright.html"
"A non-copyleft free licence from the University of Delaware"))
(home-page "http://www.ntp.org")))
(home-page "https://www.ntp.org")))
(define-public openntpd
(package

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

@ -983,7 +983,7 @@ (define-public msitools
(define-public libostree
(package
(name "libostree")
(version "2020.1")
(version "2020.2")
(source (origin
(method url-fetch)
(uri (string-append
@ -991,7 +991,7 @@ (define-public libostree
(version-major+minor version) "/libostree-" version ".tar.xz"))
(sha256
(base32
"0sgx81w6skiivbr2gfhljf9nvnqfwwnwfgpqqa10fjdkjrqwvpk8"))))
"0bbk0sg4m38g7j00hy358p2azxas87minpgz3avwma6jsylj1qjg"))))
(build-system gnu-build-system)
(arguments
'(#:phases

0
gnu/packages/patches/akonadi-Revert-Make-installation-properly-relocatabl.patch → gnu/packages/patches/akonadi-Revert-Make-installation-properly-relo.patch
View file

42
gnu/packages/patches/anki-mpv-args.patch Normal file
View file

@ -0,0 +1,42 @@
Modified from upstream commit:
https://github.com/ankitects/anki/commit/ccd715013609133c55e83924734efa78abc03326
Fixes mpv argument syntax (support for old syntax removed in mpv 0.31):
https://anki.tenderapp.com/discussions/ankidesktop/38186-mpvprocesserror-unable-to-start-process
Necessary because we are currently unable to upgrade anki to the
latest version in guix (NPM dependencies currently unpackaged).
---
anki/mpv.py | 4 ++--
anki/sound.py | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/anki/mpv.py b/anki/mpv.py
index f53d9d0..563fddc 100644
--- a/anki/mpv.py
+++ b/anki/mpv.py
@@ -104,9 +104,9 @@ class MPVBase:
"""
self.argv = [self.executable]
self.argv += self.default_argv
- self.argv += ["--input-ipc-server", self._sock_filename]
+ self.argv += ["--input-ipc-server="+self._sock_filename]
if self.window_id is not None:
- self.argv += ["--wid", str(self.window_id)]
+ self.argv += ["--wid="+str(self.window_id)]
def _start_process(self):
"""Start the mpv process.
diff --git a/anki/sound.py b/anki/sound.py
index aa3431b..a5fce44 100644
--- a/anki/sound.py
+++ b/anki/sound.py
@@ -124,7 +124,6 @@ class MpvManager(MPV):
def setMpvConfigBase(base):
mpvConfPath = os.path.join(base, "mpv.conf")
MpvManager.default_argv += [
- "--no-config",
"--include="+mpvConfPath,
]
--
2.25.1

61
gnu/packages/patches/guile-finalization-crash.patch
View file

@ -1,61 +0,0 @@
commit edf5aea7ac852db2356ef36cba4a119eb0c81ea9
Author: Ludovic Courtès <ludo@gnu.org>
Date: Mon Dec 9 14:44:59 2019 +0100
Fix non-deterministic crash in 'finalization_thread_proc'.
Fixes <https://bugs.gnu.org/37757>.
Reported by Jesse Gibbons <jgibbons2357@gmail.com>.
* libguile/finalizers.c (finalization_thread_proc): Do not enter the
"switch (data.byte)" condition when data.n <= 0.
diff --git a/libguile/finalizers.c b/libguile/finalizers.c
index c5d69e8e3..94a6e6b0a 100644
--- a/libguile/finalizers.c
+++ b/libguile/finalizers.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012, 2013, 2014 Free Software Foundation, Inc.
+/* Copyright (C) 2012, 2013, 2014, 2019 Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -211,21 +211,26 @@ finalization_thread_proc (void *unused)
scm_without_guile (read_finalization_pipe_data, &data);
- if (data.n <= 0 && data.err != EINTR)
+ if (data.n <= 0)
{
- perror ("error in finalization thread");
- return NULL;
+ if (data.err != EINTR)
+ {
+ perror ("error in finalization thread");
+ return NULL;
+ }
}
-
- switch (data.byte)
+ else
{
- case 0:
- scm_run_finalizers ();
- break;
- case 1:
- return NULL;
- default:
- abort ();
+ switch (data.byte)
+ {
+ case 0:
+ scm_run_finalizers ();
+ break;
+ case 1:
+ return NULL;
+ default:
+ abort ();
+ }
}
}
}

27
gnu/packages/patches/libseccomp-open-aarch64.patch
View file

@ -1,27 +0,0 @@
This patch fixes the build failure on AArch64 reported
at <https://github.com/seccomp/libseccomp/pull/191>.
From cc21c1b48d35f9d34ef2da0e184af3855bfeee5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Wed, 20 Nov 2019 14:11:12 -0500
Subject: [PATCH] tests: use openat instead of open
On arm64, __NR_open is not defined, openat is always used. Let's use openat
instead, which is defined for architectures currently.
---
tests/15-basic-resolver.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/15-basic-resolver.c b/tests/15-basic-resolver.c
index 6badef1..4884faf 100644
--- a/tests/15-basic-resolver.c
+++ b/tests/15-basic-resolver.c
@@ -55,7 +55,7 @@ int main(int argc, char *argv[])
unsigned int arch;
char *name = NULL;
- if (seccomp_syscall_resolve_name("open") != __NR_open)
+ if (seccomp_syscall_resolve_name("openat") != __NR_openat)
goto fail;
if (seccomp_syscall_resolve_name("read") != __NR_read)
goto fail;

269
gnu/packages/patches/qemu-CVE-2020-8608.patch Normal file
View file

@ -0,0 +1,269 @@
Fix CVE-2020-8608:
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-8608
https://www.openwall.com/lists/oss-security/2020/02/06/2
Patches copied from upstream dependency repository:
https://gitlab.freedesktop.org/slirp/libslirp/commit/68ccb8021a838066f0951d4b2817eb6b6f10a843
https://gitlab.freedesktop.org/slirp/libslirp/commit/30648c03b27fb8d9611b723184216cd3174b6775
From 68ccb8021a838066f0951d4b2817eb6b6f10a843 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
Date: Mon, 27 Jan 2020 10:24:14 +0100
Subject: [PATCH] tcp_emu: fix unsafe snprintf() usages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Various calls to snprintf() assume that snprintf() returns "only" the
number of bytes written (excluding terminating NUL).
https://pubs.opengroup.org/onlinepubs/9699919799/functions/snprintf.html#tag_16_159_04
"Upon successful completion, the snprintf() function shall return the
number of bytes that would be written to s had n been sufficiently
large excluding the terminating null byte."
Before patch ce131029, if there isn't enough room in "m_data" for the
"DCC ..." message, we overflow "m_data".
After the patch, if there isn't enough room for the same, we don't
overflow "m_data", but we set "m_len" out-of-bounds. The next time an
access is bounded by "m_len", we'll have a buffer overflow then.
Use slirp_fmt*() to fix potential OOB memory access.
Reported-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Message-Id: <20200127092414.169796-7-marcandre.lureau@redhat.com>
---
src/tcp_subr.c | 44 +++++++++++++++++++++-----------------------
1 file changed, 21 insertions(+), 23 deletions(-)
diff --git a/src/tcp_subr.c b/src/tcp_subr.c
index a699117..a72c86b 100644
--- a/slirp/src/tcp_subr.c
+++ b/slirp/src/tcp_subr.c
@@ -643,8 +643,7 @@ int tcp_emu(struct socket *so, struct mbuf *m)
NTOHS(n1);
NTOHS(n2);
m_inc(m, snprintf(NULL, 0, "%d,%d\r\n", n1, n2) + 1);
- m->m_len = snprintf(m->m_data, M_ROOM(m), "%d,%d\r\n", n1, n2);
- assert(m->m_len < M_ROOM(m));
+ m->m_len = slirp_fmt(m->m_data, M_ROOM(m), "%d,%d\r\n", n1, n2);
} else {
*eol = '\r';
}
@@ -684,9 +683,9 @@ int tcp_emu(struct socket *so, struct mbuf *m)
n4 = (laddr & 0xff);
m->m_len = bptr - m->m_data; /* Adjust length */
- m->m_len += snprintf(bptr, M_FREEROOM(m),
- "ORT %d,%d,%d,%d,%d,%d\r\n%s", n1, n2, n3, n4,
- n5, n6, x == 7 ? buff : "");
+ m->m_len += slirp_fmt(bptr, M_FREEROOM(m),
+ "ORT %d,%d,%d,%d,%d,%d\r\n%s",
+ n1, n2, n3, n4, n5, n6, x == 7 ? buff : "");
return 1;
} else if ((bptr = (char *)strstr(m->m_data, "27 Entering")) != NULL) {
/*
@@ -719,10 +718,9 @@ int tcp_emu(struct socket *so, struct mbuf *m)
n4 = (laddr & 0xff);
m->m_len = bptr - m->m_data; /* Adjust length */
- m->m_len += snprintf(bptr, M_FREEROOM(m),
- "27 Entering Passive Mode (%d,%d,%d,%d,%d,%d)\r\n%s",
- n1, n2, n3, n4, n5, n6, x == 7 ? buff : "");
-
+ m->m_len += slirp_fmt(bptr, M_FREEROOM(m),
+ "27 Entering Passive Mode (%d,%d,%d,%d,%d,%d)\r\n%s",
+ n1, n2, n3, n4, n5, n6, x == 7 ? buff : "");
return 1;
}
@@ -745,8 +743,8 @@ int tcp_emu(struct socket *so, struct mbuf *m)
if (m->m_data[m->m_len - 1] == '\0' && lport != 0 &&
(so = tcp_listen(slirp, INADDR_ANY, 0, so->so_laddr.s_addr,
htons(lport), SS_FACCEPTONCE)) != NULL)
- m->m_len = snprintf(m->m_data, M_ROOM(m),
- "%d", ntohs(so->so_fport)) + 1;
+ m->m_len = slirp_fmt0(m->m_data, M_ROOM(m),
+ "%d", ntohs(so->so_fport));
return 1;
case EMU_IRC:
@@ -765,10 +763,10 @@ int tcp_emu(struct socket *so, struct mbuf *m)
return 1;
}
m->m_len = bptr - m->m_data; /* Adjust length */
- m->m_len += snprintf(bptr, M_FREEROOM(m),
- "DCC CHAT chat %lu %u%c\n",
- (unsigned long)ntohl(so->so_faddr.s_addr),
- ntohs(so->so_fport), 1);
+ m->m_len += slirp_fmt(bptr, M_FREEROOM(m),
+ "DCC CHAT chat %lu %u%c\n",
+ (unsigned long)ntohl(so->so_faddr.s_addr),
+ ntohs(so->so_fport), 1);
} else if (sscanf(bptr, "DCC SEND %256s %u %u %u", buff, &laddr, &lport,
&n1) == 4) {
if ((so = tcp_listen(slirp, INADDR_ANY, 0, htonl(laddr),
@@ -776,10 +774,10 @@ int tcp_emu(struct socket *so, struct mbuf *m)
return 1;
}
m->m_len = bptr - m->m_data; /* Adjust length */
- m->m_len += snprintf(bptr, M_FREEROOM(m),
- "DCC SEND %s %lu %u %u%c\n", buff,
- (unsigned long)ntohl(so->so_faddr.s_addr),
- ntohs(so->so_fport), n1, 1);
+ m->m_len += slirp_fmt(bptr, M_FREEROOM(m),
+ "DCC SEND %s %lu %u %u%c\n", buff,
+ (unsigned long)ntohl(so->so_faddr.s_addr),
+ ntohs(so->so_fport), n1, 1);
} else if (sscanf(bptr, "DCC MOVE %256s %u %u %u", buff, &laddr, &lport,
&n1) == 4) {
if ((so = tcp_listen(slirp, INADDR_ANY, 0, htonl(laddr),
@@ -787,10 +785,10 @@ int tcp_emu(struct socket *so, struct mbuf *m)
return 1;
}
m->m_len = bptr - m->m_data; /* Adjust length */
- m->m_len += snprintf(bptr, M_FREEROOM(m),
- "DCC MOVE %s %lu %u %u%c\n", buff,
- (unsigned long)ntohl(so->so_faddr.s_addr),
- ntohs(so->so_fport), n1, 1);
+ m->m_len += slirp_fmt(bptr, M_FREEROOM(m),
+ "DCC MOVE %s %lu %u %u%c\n", buff,
+ (unsigned long)ntohl(so->so_faddr.s_addr),
+ ntohs(so->so_fport), n1, 1);
}
return 1;
--
2.25.1
From 30648c03b27fb8d9611b723184216cd3174b6775 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
Date: Mon, 27 Jan 2020 10:24:09 +0100
Subject: [PATCH] util: add slirp_fmt() helpers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Various calls to snprintf() in libslirp assume that snprintf() returns
"only" the number of bytes written (excluding terminating NUL).
https://pubs.opengroup.org/onlinepubs/9699919799/functions/snprintf.html#tag_16_159_04
"Upon successful completion, the snprintf() function shall return the
number of bytes that would be written to s had n been sufficiently
large excluding the terminating null byte."
Introduce slirp_fmt() that handles several pathological cases the
way libslirp usually expect:
- treat error as fatal (instead of silently returning -1)
- fmt0() will always \0 end
- return the number of bytes actually written (instead of what would
have been written, which would usually result in OOB later), including
the ending \0 for fmt0()
- warn if truncation happened (instead of ignoring)
Other less common cases can still be handled with strcpy/snprintf() etc.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Message-Id: <20200127092414.169796-2-marcandre.lureau@redhat.com>
---
src/util.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/util.h | 3 +++
2 files changed, 65 insertions(+)
diff --git a/src/util.c b/src/util.c
index e596087..e3b6257 100644
--- a/slirp/src/util.c
+++ b/slirp/src/util.c
@@ -364,3 +364,65 @@ void slirp_pstrcpy(char *buf, int buf_size, const char *str)
}
*q = '\0';
}
+
+static int slirp_vsnprintf(char *str, size_t size,
+ const char *format, va_list args)
+{
+ int rv = vsnprintf(str, size, format, args);
+
+ if (rv < 0) {
+ g_error("vsnprintf() failed: %s", g_strerror(errno));
+ }
+
+ return rv;
+}
+
+/*
+ * A snprintf()-like function that:
+ * - returns the number of bytes written (excluding optional \0-ending)
+ * - dies on error
+ * - warn on truncation
+ */
+int slirp_fmt(char *str, size_t size, const char *format, ...)
+{
+ va_list args;
+ int rv;
+
+ va_start(args, format);
+ rv = slirp_vsnprintf(str, size, format, args);
+ va_end(args);
+
+ if (rv > size) {
+ g_critical("vsnprintf() truncation");
+ }
+
+ return MIN(rv, size);
+}
+
+/*
+ * A snprintf()-like function that:
+ * - always \0-end (unless size == 0)
+ * - returns the number of bytes actually written, including \0 ending
+ * - dies on error
+ * - warn on truncation
+ */
+int slirp_fmt0(char *str, size_t size, const char *format, ...)
+{
+ va_list args;
+ int rv;
+
+ va_start(args, format);
+ rv = slirp_vsnprintf(str, size, format, args);
+ va_end(args);
+
+ if (rv >= size) {
+ g_critical("vsnprintf() truncation");
+ if (size > 0)
+ str[size - 1] = '\0';
+ rv = size;
+ } else {
+ rv += 1; /* include \0 */
+ }
+
+ return rv;
+}
diff --git a/src/util.h b/src/util.h
index e9c3073..5530c46 100644
--- a/slirp/src/util.h
+++ b/slirp/src/util.h
@@ -181,4 +181,7 @@ static inline int slirp_socket_set_fast_reuse(int fd)
void slirp_pstrcpy(char *buf, int buf_size, const char *str);
+int slirp_fmt(char *str, size_t size, const char *format, ...);
+int slirp_fmt0(char *str, size_t size, const char *format, ...);
+
#endif
--
2.25.1

0
gnu/packages/patches/sdl-pango-fix-explicit-SDLPango_CopyFTBitmapToSurface.patch → gnu/packages/patches/sdl-pango-fix-explicit-SDLPango_CopyFTBitmapTo.patch
View file

19
gnu/packages/patches/spice-fix-test-armhf.patch
View file

@ -1,19 +0,0 @@
Fix test failure on armhf and ppc64el:
https://gitlab.freedesktop.org/spice/spice-server/issues/31
Taken from upstream:
https://gitlab.freedesktop.org/spice/spice/commit/19f9f454e0777d851f26d14df0c7984267c57015
diff --git a/server/tests/test-qxl-parsing.c b/server/tests/test-qxl-parsing.c
index 60ca8f88c62441e02577ced21e4f60a08ad4171a..234bdabc9ce619d0799b5136f1d72357b0b2f490 100644
--- a/server/tests/test-qxl-parsing.c
+++ b/server/tests/test-qxl-parsing.c
@@ -96,7 +96,7 @@ static void test_memslot_invalid_slot_id(void)
RedMemSlotInfo mem_info;
init_meminfo(&mem_info);
- memslot_get_virt(&mem_info, 1 << mem_info.memslot_id_shift, 16, 0);
+ memslot_get_virt(&mem_info, UINT64_C(1) << mem_info.memslot_id_shift, 16, 0);
}
static void test_memslot_invalid_addresses(void)

84
gnu/packages/patches/woff2-libbrotli.patch
View file

@ -1,84 +0,0 @@
From: Eric Bavier <bavier@member.fsf.org>
Date: Sat, 2 Apr 2016 01:31:03 -0500
Subject: [PATCH] Build against external libbrotli.
---
Makefile | 20 ++++----------------
src/woff2_dec.cc | 2 +-
src/woff2_enc.cc | 2 +-
3 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/Makefile b/Makefile
index 92b8d54..618a751 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
OS := $(shell uname)
-CPPFLAGS = -I./brotli/dec/ -I./brotli/enc/ -I./src
+CPPFLAGS := -I./src $(shell pkg-config --cflags libbrotlienc libbrotlidec)
CC ?= gcc
CXX ?= g++
@@ -22,29 +22,17 @@ OUROBJ = font.o glyph.o normalize.o table_tags.o transform.o \
woff2_dec.o woff2_enc.o woff2_common.o woff2_out.o \
variable_length.o
-BROTLI = brotli
-ENCOBJ = $(BROTLI)/enc/*.o
-DECOBJ = $(BROTLI)/dec/*.o
+BROTLI_LIBS := $(shell pkg-config --libs libbrotlienc libbrotlidec)
OBJS = $(patsubst %, $(SRCDIR)/%, $(OUROBJ))
EXECUTABLES=woff2_compress woff2_decompress
EXE_OBJS=$(patsubst %, $(SRCDIR)/%.o, $(EXECUTABLES))
-ifeq (,$(wildcard $(BROTLI)/*))
- $(error Brotli dependency not found : you must initialize the Git submodule)
-endif
-
all : $(OBJS) $(EXECUTABLES)
-$(EXECUTABLES) : $(EXE_OBJS) deps
- $(CXX) $(LFLAGS) $(OBJS) $(ENCOBJ) $(DECOBJ) $(SRCDIR)/$@.o -o $@
-
-deps :
- $(MAKE) -C $(BROTLI)/dec
- $(MAKE) -C $(BROTLI)/enc
+$(EXECUTABLES) : $(EXE_OBJS) $(OBJS)
+ $(CXX) $(LDFLAGS) $(OBJS) $(SRCDIR)/$@.o -o $@ $(BROTLI_LIBS) $(LIBS)
clean :
rm -f $(OBJS) $(EXE_OBJS) $(EXECUTABLES)
- $(MAKE) -C $(BROTLI)/dec clean
- $(MAKE) -C $(BROTLI)/enc clean
diff --git a/src/woff2_dec.cc b/src/woff2_dec.cc
index 837eede..98c01ce 100644
--- a/src/woff2_dec.cc
+++ b/src/woff2_dec.cc
@@ -27,7 +27,7 @@
#include <memory>
#include <utility>
-#include "./decode.h"
+#include "brotli/dec/decode.h"
#include "./buffer.h"
#include "./port.h"
#include "./round.h"
diff --git a/src/woff2_enc.cc b/src/woff2_enc.cc
index 920c614..00d74da 100644
--- a/src/woff2_enc.cc
+++ b/src/woff2_enc.cc
@@ -23,7 +23,7 @@
#include <string>
#include <vector>
-#include "./encode.h"
+#include "brotli/enc/encode.h"
#include "./buffer.h"
#include "./font.h"
#include "./normalize.h"
--
2.7.3

93
gnu/packages/perl.scm
View file

@ -9,13 +9,13 @@
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 ng0 <ng0@n0.is>
;;; Copyright © 2016 Alex Sassmannshausen <alex@pompo.co>
;;; Copyright © 2016, 2018 Roel Janssen <roel@gnu.org>
;;; Copyright © 2016, 2018, 2020 Roel Janssen <roel@gnu.org>
;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2017 Raoul J.P. Bonnal <ilpuccio.febo@gmail.com>
;;; Copyright © 2017, 2018 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Adriano Peluso <catonano@gmail.com>
;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Christopher Allan Webber <cwebber@dustycloud.org>
;;; Copyright © 2018, 2019 Oleg Pykhalov <go.wigust@gmail.com>
@ -334,6 +334,33 @@ (define-public perl-async-interrupt
sometimes even without using a single syscall.")
(license (package-license perl))))
(define-public perl-attribute-util
(package
(name "perl-attribute-util")
(version "1.07")
(source (origin
(method url-fetch)
(uri (string-append
"https://cpan.metacpan.org/authors/id/D/DA/DANKOGAI/"
"Attribute-Util-" version ".tar.gz"))
(sha256
(base32
"1z79d845dy96lg0pxw0kr2za0gniwnpn963r7ccajfpj6k7jfw07"))))
(build-system perl-build-system)
(home-page "https://metacpan.org/pod/Attribute::Util")
(synopsis "Assorted general utility attributes")
(description "This packages provides various utility functions. When used
without argument, this module provides four universally accessible attributes
of general interest as follows:
@itemize
@item Abstract
@item Alias
@item Memoize
@item Method
@item SigHandler
@end itemize")
(license (package-license perl))))
(define-public perl-autovivification
(package
(name "perl-autovivification")
@ -1423,6 +1450,28 @@ (define-public perl-config-any
supports XML, YAML, JSON, Apache-style configuration, and Perl code.")
(license (package-license perl))))
(define-public perl-config-inifiles
(package
(name "perl-config-inifiles")
(version "3.000002")
(source
(origin
(method url-fetch)
(uri (string-append "https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/"
"Config-IniFiles-" version ".tar.gz"))
(sha256
(base32 "02dsz3inh5jwgaxmbcz8qxwgin8mkhm6vj9jyzfmm3dr5pnxcbnr"))))
(build-system perl-build-system)
(propagated-inputs
`(("perl-module-build" ,perl-module-build)
("perl-io-stringy",perl-io-stringy)))
(home-page "https://metacpan.org/pod/Config::IniFiles")
(synopsis "Package for configuration files outside your Perl script")
(description "This package provides a way to have readable configuration
files outside your Perl script. Configurations can be imported, sections
can be grouped, and settings can be accessed from a tied hash.")
(license (package-license perl))))
(define-public perl-config-autoconf
(package
(name "perl-config-autoconf")
@ -2260,14 +2309,14 @@ (define-public perl-date-simple
(define-public perl-datetime
(package
(name "perl-datetime")
(version "1.51")
(version "1.52")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://cpan/authors/id/D/DR/DROLSKY/"
"DateTime-" version ".tar.gz"))
(sha256
(base32 "1ibfq6acz1ih28vl613yygbb3r2d8ykx6di669vajhvswl6xl8ny"))))
(base32 "1z1xpifh2kpyw7rlc8ivg9rl0qmabjq979gjp0s9agdjf9hqp0k7"))))
(build-system perl-build-system)
(native-inputs
`(("perl-cpan-meta-check" ,perl-cpan-meta-check)
@ -2500,15 +2549,14 @@ (define-public perl-datetime-format-natural
(define-public perl-datetime-format-strptime
(package
(name "perl-datetime-format-strptime")
(version "1.76")
(version "1.77")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://cpan/authors/id/D/DR/DROLSKY/"
"DateTime-Format-Strptime-" version ".tar.gz"))
(sha256
(base32
"03dmzi9n6jmnfjmf0ld5sdmi3ib6jrhz25cjzv7d58ypdr32cg2r"))))
(base32 "0jiy2yc9h9932ykb8x2l1j3ff8ms3p4426m947r5clygis1kr91g"))))
(build-system perl-build-system)
(propagated-inputs
`(("perl-datetime" ,perl-datetime)
@ -5177,6 +5225,26 @@ (define-public perl-math-round
both positive and negative, in various ways.")
(license perl-license)))
(define-public perl-math-vecstat
(package
(name "perl-math-vecstat")
(version "0.08")
(source (origin
(method url-fetch)
(uri (string-append
"mirror://cpan/authors/id/A/AS/ASPINELLI/Math-VecStat-"
version ".tar.gz"))
(sha256
(base32
"03bdcl9pn2bc9b50c50nhnr7m9wafylnb3v21zlch98h9c78x6j0"))))
(build-system perl-build-system)
(home-page "http://search.cpan.org/dist/Math-VecStat")
(synopsis "Basic numeric stats on vectors")
(description "This package provides some basic statistics on numerical
vectors. All the subroutines can take a reference to the vector to be
operated on.")
(license (package-license perl))))
(define-public perl-memoize
(package
(name "perl-memoize")
@ -9182,15 +9250,14 @@ (define-public perl-time-piece
(define-public perl-timedate
(package
(name "perl-timedate")
(version "2.31")
(version "2.32")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://cpan/authors/id/A/AT/ATOOMIC/"
"TimeDate-" version ".tar.gz"))
(sha256
(base32
"10ad6l4ii2iahdpw8h0xqwasc1jblan31h597q3js4j5nbnhywjw"))))
(base32 "1mmk9dy4a26a4d4c5rswqqhxr0295j93bjbcx91d3qkmwfcs1v1l"))))
(build-system perl-build-system)
(home-page "https://metacpan.org/release/TimeDate")
(synopsis "Date parsing/formatting subroutines")
@ -9634,14 +9701,14 @@ (define-public perl-xml-writer
(define-public perl-xs-object-magic
(package
(name "perl-xs-object-magic")
(version "0.04")
(version "0.05")
(source (origin
(method url-fetch)
(uri (string-append "mirror://cpan/authors/id/F/FL/FLORA/"
(uri (string-append "mirror://cpan/authors/id/E/ET/ETHER/"
"XS-Object-Magic-" version ".tar.gz"))
(sha256
(base32
"03fghj7hq0fiicmfdxhmzfm4mzv7s097pgkd32ji7jnljvhm9six"))))
"0njyy4y0zax4zz55y82dlm9cly1pld1lcxb281s12bp9rrhf9j9x"))))
(build-system perl-build-system)
(native-inputs
`(("perl-extutils-depends" ,perl-extutils-depends)

2
gnu/packages/plotutils.scm
View file

@ -75,7 +75,7 @@ (define-public plotutils
("libxaw" ,libxaw)))
(home-page
"http://www.gnu.org/software/plotutils/")
"https://www.gnu.org/software/plotutils/")
(synopsis "Plotting utilities and library")
(description
"GNU Plotutils is a package for plotting and working with 2D graphics.

12
gnu/packages/pretty-print.scm
View file

@ -25,6 +25,7 @@
(define-module (gnu packages pretty-print)
#:use-module (guix packages)
#:use-module (guix licenses)
#:use-module (guix git-download)
#:use-module (guix download)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
@ -166,21 +167,20 @@ (define-public enscript
(define-public fmt
(package
(name "fmt")
(version "6.0.0")
(version "6.1.2")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/fmtlib/fmt/releases/download/"
version "/fmt-" version ".zip"))
(uri (string-append "https://github.com/fmtlib/fmt/releases/download/"
version "/fmt-" version ".zip"))
(sha256
(base32
"0h148anbaqgch6n69pxsvs1c9wmykgd052wmzgdia7qpz8w6p8dl"))))
"1s1hxaby5byb07rgmrk4a0q11fxhz7b42khch7sp2qx974y0yrb3"))))
(build-system cmake-build-system)
(arguments
'(#:configure-flags '("-DBUILD_SHARED_LIBS=ON")))
(native-inputs
`(("unzip" ,unzip)))
(home-page "http://fmtlib.net/")
(home-page "https://fmt.dev")
(synopsis "Small and fast C++ formatting library")
(description
"@code{fmt} (formerly @code{cppformat}) is a formatting library for C++.

6
gnu/packages/python-web.scm
View file

@ -5,7 +5,7 @@
;;; Copyright © 2016, 2017 Danny Milosavljevic <dannym+a@scratchpost.org>
;;; Copyright © 2013, 2014, 2015, 2016 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2016, 2017 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Roel Janssen <roel@gnu.org>
;;; Copyright © 2016, 2017, 2020 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2016, 2017 ng0 <ng0@n0.is>
@ -82,14 +82,14 @@ (define-module (gnu packages python-web)
(define-public python-aiohttp
(package
(name "python-aiohttp")
(version "3.5.4")
(version "3.6.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "aiohttp" version))
(sha256
(base32
"1gy95ni8rkdwzir9zf14ivpfwp02g69xbhibldykff0rzbs86k4w"))))
"09pkw6f1790prnrq0k8cqgnf1qy57ll8lpmc6kld09q7zw4vi6i5"))))
(build-system python-build-system)
(arguments
`(#:tests? #f)) ;missing pytest-timeout

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

@ -671,6 +671,26 @@ (define-public python-lockfile
(define-public python2-lockfile
(package-with-python2 python-lockfile))
(define-public python-filelock
(package
(name "python-filelock")
(version "3.0.12")
(source
(origin
(method url-fetch)
(uri (pypi-uri "filelock" version))
(sha256
(base32
"0ngzlvb5j8gqs2nxlp2b0jhzii792h66wsn694qm8kqixr225n0q"))))
(build-system python-build-system)
(home-page
"https://github.com/benediktschmitt/py-filelock")
(synopsis "Platform independent file lock")
(description "@code{filelock} contains a single module implementing
a platform independent file lock in Python, which provides a simple way of
inter-process communication.")
(license license:unlicense)))
(define-public python-semantic-version
(package
(name "python-semantic-version")
@ -2378,28 +2398,30 @@ (define-public python-vine
(define-public python-virtualenv
(package
(name "python-virtualenv")
(version "16.1.0")
(version "20.0.8")
(source
(origin
(method url-fetch)
(uri (pypi-uri "virtualenv" version))
(sha256
(base32
"0242cg3hdq3qdvx5flyrki8lpwlgwf5k45c21ks5049fv7ygm6gq"))))
"096r7g5cv85vxymg9iqbn5z749613snlvd6p3rf1nxnrd386j0qz"))))
(build-system python-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-before 'check 'disable-failing-test
(lambda _
;; Disable failing test. See upstream bug report
;; https://github.com/pypa/virtualenv/issues/957
(substitute* "tests/test_virtualenv.py"
(("skipif.*") "skipif(True, reason=\"Guix\")\n"))
#t)))))
(native-inputs
`(("python-mock" ,python-mock)
("python-pytest" ,python-pytest)))
("python-pytest" ,python-pytest)
;; NOTE: guix lint remarks that "python-setuptools should probably not
;; be an input at all". However, removing the input makes the build error:
;; File "setup.py", line 4, in <module>
;; raise RuntimeError("setuptools >= 41 required to build")
("python-setuptools" ,python-setuptools)
("python-setuptools-scm" ,python-setuptools-scm)))
(inputs
`(("python-appdirs" ,python-appdirs)
("python-distlib" ,python-distlib)
("python-filelock" ,python-filelock)
("python-six" ,python-six)
("python-importlib-metadata" ,python-importlib-metadata)))
(home-page "https://virtualenv.pypa.io/")
(synopsis "Virtual Python environment builder")
(description
@ -3175,17 +3197,36 @@ (define-public python-language-server
feature-set for programming Python effectively.")
(license license:expat)))
(define-public python-pathspec
(package
(name "python-pathspec")
(version "0.7.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pathspec" version))
(sha256
(base32
"15lvs4awlg8xzl0l4gk9y53xx4yqmqvsv44pglv39m70y85afajn"))))
(build-system python-build-system)
(home-page "https://github.com/cpburnz/python-path-specification")
(synopsis "Utility library for gitignore style pattern matching of file paths")
(description
"This package provides a utility library for gitignore style pattern
matching of file paths.")
(license license:mpl2.0)))
(define-public python-black
(package
(name "python-black")
(version "18.6b4")
(version "19.10b0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "black" version))
(sha256
(base32
"0i4sfqgz6w15vd50kbhi7g7rifgqlf8yfr8y78rypd56q64qn592"))))
"0f8mr0yzj78q1dx7v6ggbgfir2wv0n5z2shfbbvfdq7910xbgvf2"))))
(build-system python-build-system)
(arguments
`(#:phases
@ -3195,16 +3236,39 @@ (define-public python-black
(let ((python3 (which "python3")))
(substitute* '("tests/data/fmtonoff.py"
"tests/data/string_prefixes.py"
"tests/data/function.py")
"tests/data/function.py"
"tests/data/python37.py")
(("#!/usr/bin/env python3(\\.[0-9]+)?" _ minor-version)
(string-append "#!" python3 (if (string? minor-version)
minor-version
""))))))))))
"")))))
#t))
(add-after 'unpack 'disable-broken-tests
(lambda _
;; These tests are supposed to be skipped when the blackd
;; dependencies are missing, but this doesn't quite work.
(substitute* "tests/test_black.py"
(("( *)class BlackDTestCase.*" match indent)
(string-append indent "@unittest.skip(\"no blackd deps\")\n"
indent "class BlackDTestCase(unittest.TestCase):\n"))
(("web.Application") "False")
(("@unittest_run_loop") ""))
;; Patching the above file breaks the self test
(substitute* "tests/test_black.py"
(("( *)def test_self" match indent)
(string-append indent "@unittest.skip(\"guix\")\n" match)))
#t)))))
(propagated-inputs
`(("python-click" ,python-click)
("python-attrs" ,python-attrs)
("python-appdirs" ,python-appdirs)
("python-toml" ,python-toml)))
("python-pathspec" ,python-pathspec)
("python-regex" ,python-regex)
("python-toml" ,python-toml)
("python-typed-ast" ,python-typed-ast)))
(native-inputs
`(("python-setuptools-scm" ,python-setuptools-scm)))
(home-page "https://github.com/ambv/black")
(synopsis "The uncompromising code formatter")
(description "Black is the uncompromising Python code formatter.")
@ -3743,21 +3807,20 @@ (define-public python2-numpy-documentation
(define-public python-pygit2
(package
(name "python-pygit2")
(version "0.28.2")
(version "1.1.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pygit2" version))
(sha256
(base32 "11kzj5mjkspvplnpdb6bj8dcj6rgmkk986k8hjcklyg5yaxkz32d"))))
(base32 "1hs0pqqzn1yjxqk86nq7p0lvsklwnlyi5xwyzr7d5nrs19dmsjbg"))))
(build-system python-build-system)
(arguments
'(#:tests? #f)) ; tests don't run correctly in our environment
(propagated-inputs
`(("python-six" ,python-six)
`(("python-cached-property" ,python-cached-property)
("python-cffi" ,python-cffi)
("libgit2" ,libgit2)
("python-tox" ,python-tox)))
("libgit2" ,libgit2)))
(native-inputs
`(("python-pytest" ,python-pytest)))
(home-page "https://github.com/libgit2/pygit2")
@ -3767,9 +3830,6 @@ (define-public python-pygit2
;; GPL2.0 only, with linking exception.
(license license:gpl2)))
(define-public python2-pygit2
(package-with-python2 python-pygit2))
(define-public python-pyparsing
(package
(name "python-pyparsing")
@ -4413,6 +4473,40 @@ (define-public python-autopep8
(define-public python2-autopep8
(package-with-python2 python-autopep8))
(define-public python-distlib
(package
(name "python-distlib")
(version "0.3.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "distlib" version ".zip"))
(sha256
(base32
"08fyi2r246733vharl2yckw20rilci28r91mzrnnvcr638inw5if"))))
(build-system python-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-before 'build 'no-/bin/sh
(lambda _
(substitute* '("distlib/scripts.py" "tests/test_scripts.py")
(("/bin/sh") (which "sh")))
#t))
(add-before 'check 'prepare-test-env
(lambda _
(setenv "HOME" "/tmp")
;; NOTE: Any value works, the variable just has to be present.
(setenv "SKIP_ONLINE" "1")
#t)))))
(native-inputs `(("unzip" ,unzip)))
(home-page "https://bitbucket.org/pypa/distlib")
(synopsis "Distribution utilities")
(description "Distlib is a library which implements low-level functions that
relate to packaging and distribution of Python software. It is intended to be
used as the basis for third-party packaging tools.")
(license license:psfl)))
(define-public python-distutils-extra
(package
(name "python-distutils-extra")
@ -7236,6 +7330,12 @@ (define-public python-tables
"linker_exe='gcc',"
"linker_so='gcc -shared')")))
#t))
(add-after 'unpack 'disable-tuning
(lambda _
(substitute* "setup.py"
(("cpu_flags = .*")
"cpu_flags = ['sse2']\n"))
#t))
(replace 'build
(lambda* (#:key inputs #:allow-other-keys)
(invoke "python" "setup.py" "build"
@ -7253,7 +7353,7 @@ (define-public python-tables
`(("python-cython" ,python-cython)
("pkg-config" ,pkg-config)))
(inputs
`(("hdf5" ,hdf5)
`(("hdf5" ,hdf5-1.10)
("bzip2" ,bzip2)
("zlib" ,zlib)))
(home-page "http://www.pytables.org/")
@ -7265,6 +7365,84 @@ (define-public python-tables
(define-public python2-tables
(package-with-python2 python-tables))
(define-public python-pytest-black
(package
(name "python-pytest-black")
(version "0.3.8")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pytest-black" version))
(sha256
(base32
"04lppqydxm0f3f3x0l8hj7v0j6d8syj34jc37yzqwqcyqsnaga81"))))
(build-system python-build-system)
(propagated-inputs
`(("python-pytest" ,python-pytest)
("python-black" ,python-black)
("python-toml" ,python-toml)))
(native-inputs
`(("python-setuptools-scm" ,python-setuptools-scm)))
(home-page "https://github.com/shopkeep/pytest-black")
(synopsis "Pytest plugin to enable format checking with black")
(description
"This package provides a pytest plugin to enable format checking with the
Python code formatter \"black\".")
(license license:expat)))
(define-public python-get-version
(package
(name "python-get-version")
(version "2.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "get_version" version))
(sha256
(base32
"1g15jyx33vkxavv9hwv275cs4g9bp2i1y942raw3fxamq8kbaml1"))))
(build-system python-build-system)
(propagated-inputs
`(("python-pygments" ,python-pygments)
("python-pytest" ,python-pytest)
("python-pytest-black" ,python-pytest-black)
("python-pytest-cov" ,python-pytest-cov)
("python-setuptools" ,python-setuptools)
("python-testpath" ,python-testpath)))
(home-page "https://github.com/flying-sheep/get_version")
(synopsis "Version helper in the spirit of versioneer")
(description
"This package provides a version helper that lets you automatically use
the latest @code{vX.X.X} Git tag as the version in your Python package. It
also supports getting the version from Python source distributions or, once
your package is installed, via @code{pkg_resources} (part of
@code{setuptools}).")
(license license:gpl3+)))
(define-public python-legacy-api-wrap
(package
(name "python-legacy-api-wrap")
(version "1.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "legacy-api-wrap" version))
(sha256
(base32
"06qhp0g543dy98vpa41hwdalvdbsjfc3ldk474yr9sd75mhl8jh3"))))
(build-system python-build-system)
(propagated-inputs
`(("python-get-version" ,python-get-version)
("python-pytest" ,python-pytest)
("python-pytest-black" ,python-pytest-black)
("python-pytest-cov" ,python-pytest-cov)
("python-setuptools" ,python-setuptools)))
(home-page "https://github.com/flying-sheep/legacy-api-wrap")
(synopsis "Legacy API wrapper")
(description "This module defines a decorator to wrap legacy APIs. The
primary use case is APIs defined before keyword-only parameters existed.")
(license license:gpl3+)))
(define-public python-pyasn1
(package
(name "python-pyasn1")
@ -8479,7 +8657,7 @@ (define-public python-execnet
@item write and deploy hybrid multi-process applications
@item write scripts to administer multiple environments
@end enumerate")
(home-page "http://codespeak.net/execnet/")
(home-page "https://codespeak.net/execnet/")
(license license:expat)))
(define-public python2-execnet
@ -14421,7 +14599,12 @@ (define-public python-semver
"183kg1rhzz3hqizvphkd8hlbf1zxfx8737zhfkmqzxi71jmdw7pd"))))
(build-system python-build-system)
(native-inputs
`(("python-tox" ,python-tox)
`(("python-appdirs" ,python-appdirs)
("python-distlib" ,python-distlib)
("python-importlib-metadata" ,python-importlib-metadata)
("python-filelock" ,python-filelock)
("python-six" ,python-six)
("python-tox" ,python-tox)
("python-virtualenv" ,python-virtualenv)))
(home-page "https://github.com/k-bx/python-semver")
(synopsis "Python helper for Semantic Versioning")

2
gnu/packages/re2c.scm
View file

@ -36,7 +36,7 @@ (define-public re2c
(base32
"05xq0571mkgr20v827jm63nhsirr8arghg4fszzswrmrnl3dfk0s"))))
(build-system gnu-build-system)
(home-page "http://re2c.org/")
(home-page "https://re2c.org/")
(synopsis "Lexer generator for C/C++")
(description
"@code{re2c} generates minimalistic hard-coded state machine (as opposed

7
gnu/packages/rust-apps.scm
View file

@ -2,6 +2,7 @@
;;; Copyright © 2019, 2020 John Soo <jsoo1@asu.edu>
;;; Copyright © 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;;
;;; This file is part of GNU Guix.
;;;
@ -184,11 +185,11 @@ (define-public fd
;; Manpages
(install-file "doc/fd.1" (string-append out "/share/man/man1"))
;; Completions
(install-completion "^fd.bash$" "/etc/bash-completion.d")
(install-completion "^fd.bash$" "/etc/bash_completion.d")
(install-completion "^fd.fish$" "/share/fish/vendor_completions.d")
(install-completion "^_fd$" "/share/zsh/site-functions")
(rename-file (string-append out "/etc/bash-completion.d/fd.bash")
(string-append out "/etc/bash-completion.d/fd"))
(rename-file (string-append out "/etc/bash_completion.d/fd.bash")
(string-append out "/etc/bash_completion.d/fd"))
#t))))))
(inputs `(("jemalloc" ,jemalloc)))
(home-page "https://github.com/sharkdp/fd")

88
gnu/packages/samba.scm
View file

@ -421,47 +421,51 @@ (define-public ldb
(license lgpl3+)))
(define-public ppp
(package
(name "ppp")
(version "2.4.8")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/paulusmack/ppp")
(commit (string-append "ppp-" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1i88m79h6g3fzsb4yw3k8bq1grsx3hsyawm7id2vcaab0gfqzjjv"))))
(build-system gnu-build-system)
(arguments
'(#:tests? #f ; no check target
#:make-flags '("CC=gcc")
#:phases
(modify-phases %standard-phases
(add-before 'configure 'patch-Makefile
(lambda* (#:key inputs #:allow-other-keys)
(let ((libc (assoc-ref inputs "libc"))
(openssl (assoc-ref inputs "openssl"))
(libpcap (assoc-ref inputs "libpcap")))
(substitute* "pppd/Makefile.linux"
(("/usr/include/crypt\\.h")
(string-append libc "/include/crypt.h"))
(("/usr/include/openssl")
(string-append openssl "/include/openssl"))
(("/usr/include/pcap-bpf.h")
(string-append libpcap "/include/pcap-bpf.h")))
#t))))))
(inputs
`(("libpcap" ,libpcap)
("openssl" ,(@ (gnu packages tls) openssl))))
(synopsis "Implementation of the Point-to-Point Protocol")
(home-page "https://ppp.samba.org/")
(description
"The Point-to-Point Protocol (PPP) provides a standard way to establish
;; This git commit contains unreleased fixes for CVE-2020-8597.
(let ((revision "1")
(commit "8d45443bb5c9372b4c6a362ba2f443d41c5636af"))
(package
(name "ppp")
(version (git-version "2.4.8" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/paulusmack/ppp")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"06cf8fb84l3h2zy5da4j7k2j1qjv2gfqn986sf43xgj75605aks2"))))
(build-system gnu-build-system)
(arguments
'(#:tests? #f ; no check target
#:make-flags '("CC=gcc")
#:phases
(modify-phases %standard-phases
(add-before 'configure 'patch-Makefile
(lambda* (#:key inputs #:allow-other-keys)
(let ((libc (assoc-ref inputs "libc"))
(openssl (assoc-ref inputs "openssl"))
(libpcap (assoc-ref inputs "libpcap")))
(substitute* "pppd/Makefile.linux"
(("/usr/include/crypt\\.h")
(string-append libc "/include/crypt.h"))
(("/usr/include/openssl")
(string-append openssl "/include/openssl"))
(("/usr/include/pcap-bpf.h")
(string-append libpcap "/include/pcap-bpf.h")))
#t))))))
(inputs
`(("libpcap" ,libpcap)
("openssl" ,(@ (gnu packages tls) openssl))))
(synopsis "Implementation of the Point-to-Point Protocol")
(home-page "https://ppp.samba.org/")
(description
"The Point-to-Point Protocol (PPP) provides a standard way to establish
a network connection over a serial link. At present, this package supports IP
and IPV6 and the protocols layered above them, such as TCP and UDP.")
;; pppd, pppstats and pppdump are under BSD-style notices.
;; some of the pppd plugins are GPL'd.
;; chat is public domain.
(license (list bsd-3 bsd-4 gpl2+ public-domain))))
;; pppd, pppstats and pppdump are under BSD-style notices.
;; some of the pppd plugins are GPL'd.
;; chat is public domain.
(license (list bsd-3 bsd-4 gpl2+ public-domain)))))

4
gnu/packages/scheme.scm
View file

@ -755,7 +755,7 @@ (define-public slib
(define-public scm
(package
(name "scm")
(version "5f2")
(version "5f3")
(source (origin
(method url-fetch)
(uri (string-append
@ -763,7 +763,7 @@ (define-public scm
version ".zip"))
(sha256
(base32
"050ijb51jm1cij9g3r89zl9rawsrikhbb5y8zb7lspb7bsxq5w99"))))
"1jxxlhmgal26mpcl97kz37djkn97rfy9h5pvw0hah6f3f6w49j97"))))
(build-system gnu-build-system)
(arguments
`(#:phases

2
gnu/packages/sdl.scm
View file

@ -345,7 +345,7 @@ (define-public sdl-pango
"sdl-pango-api_additions.patch"
"sdl-pango-blit_overflow.patch"
"sdl-pango-fillrect_crash.patch"
"sdl-pango-fix-explicit-SDLPango_CopyFTBitmapToSurface.patch"
"sdl-pango-fix-explicit-SDLPango_CopyFTBitmapTo.patch"
"sdl-pango-matrix_declarations.patch"
"sdl-pango-sans-serif.patch"))))
(build-system gnu-build-system)

2
gnu/packages/shells.scm
View file

@ -383,7 +383,7 @@ (define-public tcsh
(with-directory-excursion bin
(symlink "tcsh" "csh"))
#t))))))
(home-page "http://www.tcsh.org/")
(home-page "https://www.tcsh.org/")
(synopsis "Unix shell based on csh")
(description
"Tcsh is an enhanced, but completely compatible version of the Berkeley

26
gnu/packages/skarnet.scm
View file

@ -2,7 +2,7 @@
;;; Copyright © 2015 Claes Wallin <claes.wallin@greatsinodevelopment.com>
;;; Copyright © 2016 Eric Le Bihan <eric.le.bihan.dev@free.fr>
;;; Copyright © 2017 Z. Ren <zren@dlut.edu.cn>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;;
;;; This file is part of GNU Guix.
@ -104,14 +104,14 @@ (define-public execline
(define-public s6
(package
(name "s6")
(version "2.8.0.1")
(version "2.9.0.1")
(source
(origin
(method url-fetch)
(uri (string-append "http://skarnet.org/software/s6/s6-"
version ".tar.gz"))
(sha256
(base32 "1n1i3jm3kp9ii54cxj1sgh89m6nyna7vhy8714ma6py1frdqzq6v"))))
(base32 "0mvcjrz8nlj9p2zclmcv22b4y6bqzd2iz38arhgc989vdvrbmkg0"))))
(build-system gnu-build-system)
(inputs `(("skalibs" ,skalibs)
("execline" ,execline)))
@ -179,14 +179,14 @@ (define-public s6-dns
(define-public s6-networking
(package
(name "s6-networking")
(version "2.3.1.1")
(version "2.3.1.2")
(source
(origin
(method url-fetch)
(uri (string-append "http://skarnet.org/software/s6-networking/s6-networking-"
version ".tar.gz"))
(sha256
(base32 "127i7ig5wdgjbkjf0py0g96llc6cbxij22ns2j7bwa95figinhcx"))))
(base32 "1029bgwfmv903y5ji93j75m7p2jgchdxya1khxzb42q2z7yxnlyr"))))
(build-system gnu-build-system)
(inputs `(("skalibs" ,skalibs)
("execline" ,execline)
@ -222,14 +222,14 @@ (define-public s6-networking
(define-public s6-rc
(package
(name "s6-rc")
(version "0.5.1.1")
(version "0.5.1.2")
(source
(origin
(method url-fetch)
(uri (string-append "http://skarnet.org/software/s6-rc/s6-rc-"
version ".tar.gz"))
(sha256
(base32 "0lmg517l8inn7bi57q35rjd7b4jmqlmkhrbvs5ybbhinhd12qzi5"))))
(base32 "18m8jsx3bkj566p6xwwnsvdckk10n8wqnhp0na2k88i295h4rnjp"))))
(build-system gnu-build-system)
(inputs `(("skalibs" ,skalibs)
("execline" ,execline)
@ -263,7 +263,7 @@ (define-public s6-rc
(define-public s6-portable-utils
(package
(name "s6-portable-utils")
(version "2.2.2.1")
(version "2.2.2.2")
(source
(origin
(method url-fetch)
@ -271,7 +271,7 @@ (define-public s6-portable-utils
"http://skarnet.org/software/s6-portable-utils/s6-portable-utils-"
version ".tar.gz"))
(sha256
(base32 "074kizkxjwvmxspxg69fr8r0lbiy61l2n5nzgbfvwvhc6lj34iqy"))))
(base32 "1k3la37q46n93vjwk9wm9ym4w87z6lqzv43f03qd0vqj9k94mpv3"))))
(build-system gnu-build-system)
(inputs `(("skalibs" ,skalibs)))
(arguments
@ -295,7 +295,7 @@ (define-public s6-portable-utils
(define-public s6-linux-init
(package
(name "s6-linux-init")
(version "1.0.3.1")
(version "1.0.4.0")
(source
(origin
(method url-fetch)
@ -303,7 +303,7 @@ (define-public s6-linux-init
"http://skarnet.org/software/s6-linux-init/s6-linux-init-"
version ".tar.gz"))
(sha256
(base32 "1yq2xnp41a1lqpjzvq5jawgy64jwaxalvjdnlvgdpi9bkicgasi1"))))
(base32 "176mgkqxlp6gb6my66dv73xsp7adfxbjp5hjyh35sykqkr4kfyfy"))))
(build-system gnu-build-system)
(inputs
`(("execline" ,execline)
@ -340,7 +340,7 @@ (define-public s6-linux-init
(define-public s6-linux-utils
(package
(name "s6-linux-utils")
(version "2.5.1.1")
(version "2.5.1.2")
(source
(origin
(method url-fetch)
@ -348,7 +348,7 @@ (define-public s6-linux-utils
"http://skarnet.org/software/s6-linux-utils/s6-linux-utils-"
version ".tar.gz"))
(sha256
(base32 "00nw2phd9prgv29hzqzwjnh4y0ivkzhx3srn6n1rlyr4ydhikxi5"))))
(base32 "0w4jms9qyb5kx9zcyd3gzri60rrii2rbmh08s59ckg4awy27py86"))))
(build-system gnu-build-system)
(inputs `(("skalibs" ,skalibs)))
(arguments

26
gnu/packages/sphinx.scm
View file

@ -5,7 +5,7 @@
;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2016, 2017, 2018, 2019 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Danny Milosavljevic <dannym+a@scratchpost.org>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017, 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Frederick M. Muriithi <fredmanglis@gmail.com>
;;; Copyright © 2017 Christopher Allan Webber <cwebber@dustycloud.org>
;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu>
@ -149,13 +149,13 @@ (define-public python2-sphinx
(define-public python-sphinxcontrib-applehelp
(package
(name "python-sphinxcontrib-applehelp")
(version "1.0.1")
(version "1.0.2")
(source (origin
(method url-fetch)
(uri (pypi-uri "sphinxcontrib-applehelp" version))
(sha256
(base32
"15rqmgphj4wqf4m5wnzxgmwxx5jwfzb0j0nb94ql0x5wnar0mapd"))))
"0n5wrn4l7x6gxvi1g7c6y72hkxgc223axz1jykipaxhfr1g76wm0"))))
(build-system python-build-system)
(arguments
`(#:tests? #f)) ;XXX: circular dependency on Sphinx
@ -195,13 +195,13 @@ (define-public python-sphinx-copybutton
(define-public python-sphinxcontrib-devhelp
(package
(name "python-sphinxcontrib-devhelp")
(version "1.0.1")
(version "1.0.2")
(source (origin
(method url-fetch)
(uri (pypi-uri "sphinxcontrib-devhelp" version))
(sha256
(base32
"0d2a57kqxl72i55rns0ly1i044y2x234b9sdi89ajc3kjdvv0r3c"))))
"1r1qngsbjqbg4rj93kpj44qqy7n4x5khldkr0c3ffhlnggx1lzzz"))))
(build-system python-build-system)
(arguments
`(#:tests? #f)) ;XXX: circular dependency on Sphinx
@ -215,13 +215,13 @@ (define-public python-sphinxcontrib-devhelp
(define-public python-sphinxcontrib-htmlhelp
(package
(name "python-sphinxcontrib-htmlhelp")
(version "1.0.2")
(version "1.0.3")
(source (origin
(method url-fetch)
(uri (pypi-uri "sphinxcontrib-htmlhelp" version))
(sha256
(base32
"08l4x8a2l4xjqdd5rhvmfsqihmlgg4prdayj9b6pigaii6gzjw26"))))
"16v5jdnibwrqjdr5aqchgyzpwy3rgamwhdf4kidv5nxj65zbpxg8"))))
(build-system python-build-system)
(arguments
`(#:tests? #f)) ;XXX: circular dependency on Sphinx
@ -300,13 +300,13 @@ (define-public python2-sphinxcontrib-programoutput
(define-public python-sphinxcontrib-qthelp
(package
(name "python-sphinxcontrib-qthelp")
(version "1.0.2")
(version "1.0.3")
(source (origin
(method url-fetch)
(uri (pypi-uri "sphinxcontrib-qthelp" version))
(sha256
(base32
"0vs09m6kf5vhiivpi5s5pks59iq0lqlsbkdycpqlysg53bhmqikr"))))
"0wjsp96d262shzkx7pb7pra7mmf0j8c5rz56i6x0vdsqw1z7ccsc"))))
(build-system python-build-system)
(arguments
`(#:tests? #f)) ;XXX: circular dependency on Sphinx
@ -320,13 +320,13 @@ (define-public python-sphinxcontrib-qthelp
(define-public python-sphinxcontrib-serializinghtml
(package
(name "python-sphinxcontrib-serializinghtml")
(version "1.1.3")
(version "1.1.4")
(source (origin
(method url-fetch)
(uri (pypi-uri "sphinxcontrib-serializinghtml" version))
(sha256
(base32
"09sj3nwahwr4iymg86gczbh151cfczqhf2kclbblzh2jh0zv7vy0"))))
"1g3pbx0g88zd9xzcrbaypa2k60axrh92vf5j76wsk0p9hv6fr87a"))))
(build-system python-build-system)
(arguments
`(#:tests? #f)) ;XXX: circular dependency on Sphinx
@ -359,13 +359,13 @@ (define-public python-sphinxcontrib-svg2pdfconverter
(define-public python-sphinxcontrib-websupport
(package
(name "python-sphinxcontrib-websupport")
(version "1.1.0")
(version "1.2.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "sphinxcontrib-websupport" version))
(sha256
(base32
"1ff3ix76xi1y6m99qxhaq5161ix9swwzydilvdya07mgbcvpzr4x"))))
"1smma7r0rhwcmbfvvkfs5djfz1qm8wbpcvp084ca6dmw2b9zplxs"))))
(build-system python-build-system)
(arguments
;; FIXME: Tests depend on Sphinx, which depends on this.

11
gnu/packages/spice.scm
View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 David Craven <david@craven.ch>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
;;;
@ -98,7 +98,7 @@ (define-public virglrenderer
(define-public spice-protocol
(package
(name "spice-protocol")
(version "0.14.0")
(version "0.14.1")
(source (origin
(method url-fetch)
(uri (string-append
@ -106,7 +106,7 @@ (define-public spice-protocol
"spice-protocol-" version ".tar.bz2"))
(sha256
(base32
"1b3f44c13pqsp7aabmcinfbmgl79038bp5548l5pjs16lcfam95n"))))
"0ahk5hlanwhbc64r80xmchdav3ls156cvh9l68a0l22bhdhxmrkr"))))
(build-system gnu-build-system)
(synopsis "Protocol headers for the SPICE protocol")
(description "SPICE (the Simple Protocol for Independent Computing
@ -191,16 +191,15 @@ (define-public spice-gtk
(define-public spice
(package
(name "spice")
(version "0.14.2")
(version "0.14.3")
(source (origin
(method url-fetch)
(uri (string-append
"https://www.spice-space.org/download/releases/"
"spice-server/spice-" version ".tar.bz2"))
(patches (search-patches "spice-fix-test-armhf.patch"))
(sha256
(base32
"19r999py9v9c7md2bb8ysj809ag1hh6djl1ik8jcgx065s4b60xj"))))
"05512vkfayw18ypg4acqbbpr72nsnsz9bj7k8c2wyrvnl3j4n7am"))))
(build-system gnu-build-system)
(propagated-inputs
`(("openssl" ,openssl)

33
gnu/packages/statistics.scm
View file

@ -693,14 +693,14 @@ (define-public r-spatial
(define-public r-survival
(package
(name "r-survival")
(version "3.1-8")
(version "3.1-11")
(source
(origin
(method url-fetch)
(uri (cran-uri "survival" version))
(sha256
(base32
"15fj4y8c107bwq22amx88r5hw7qndlcbr9sapzrpkpr7iqz3kkyf"))))
"1fbhbm3bnpg1nmj37h1d76x813ggvwk0cp51ixmmgb3pz47i5xj4"))))
(build-system r-build-system)
(propagated-inputs
`(("r-matrix" ,r-matrix)))
@ -1088,26 +1088,25 @@ (define-public r-reshape2
(define-public r-ggplot2
(package
(name "r-ggplot2")
(version "3.2.1")
(version "3.3.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "ggplot2" version))
(sha256
(base32 "0mjswqiqcwm0aqxll16bx2kwa6c9km3aql87bdj4347n1ali94g3"))))
(base32 "0j21am605kqqzlwhm45kaj0m2irnmy2vz0j7kzi9f0qdzrv3q3ij"))))
(build-system r-build-system)
(propagated-inputs
`(("r-digest" ,r-digest)
("r-glue" ,r-glue)
("r-gtable" ,r-gtable)
("r-lazyeval" ,r-lazyeval)
("r-isoband" ,r-isoband)
("r-mass" ,r-mass)
("r-mgcv" ,r-mgcv)
("r-tibble" ,r-tibble)
("r-reshape2" ,r-reshape2)
("r-rlang" ,r-rlang)
("r-scales" ,r-scales)
("r-svglite" ,r-svglite) ; Needed for 'ggsave'
("r-viridislite" ,r-viridislite)
("r-withr" ,r-withr)))
(home-page "https://ggplot2.tidyverse.org")
(synopsis "An implementation of the grammar of graphics")
@ -1651,13 +1650,13 @@ (define-public r-tibble
(define-public r-dplyr
(package
(name "r-dplyr")
(version "0.8.4")
(version "0.8.5")
(source (origin
(method url-fetch)
(uri (cran-uri "dplyr" version))
(sha256
(base32
"1nd0mmvqjbzbknawa520f64p9zlj9lwdlq0hh7c1mciyy7ah6641"))))
"0602b4a9nffxx67q57csqp87nkrv33nn9wlaw1458yys9fzx6l2p"))))
(build-system r-build-system)
(propagated-inputs
`(("r-assertthat" ,r-assertthat)
@ -1672,6 +1671,8 @@ (define-public r-dplyr
("r-rlang" ,r-rlang)
("r-tibble" ,r-tibble)
("r-tidyselect" ,r-tidyselect)))
(native-inputs
`(("r-knitr" ,r-knitr)))
(home-page "https://github.com/hadley/dplyr")
(synopsis "Tools for working with data frames in R")
(description
@ -1879,14 +1880,14 @@ (define-public python2-patsy
(define-public python-statsmodels
(package
(name "python-statsmodels")
(version "0.9.0")
(version "0.11.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "statsmodels" version))
(sha256
(base32
"0fxs8a7sp4d7jvqlm36yi45i2d28kjfvraf9q8i9jr1chhxgjqb4"))))
"1w6mf8b86vizi2895j11szqryr2v1ckjig3wp9fv94aslfh3zpjv"))))
(build-system python-build-system)
(arguments
`(;; The test suite is very large and rather brittle. Tests often fail
@ -3608,6 +3609,8 @@ (define-public r-viridis
`(("r-ggplot2" ,r-ggplot2)
("r-gridextra" ,r-gridextra)
("r-viridislite" ,r-viridislite)))
(native-inputs
`(("r-knitr" ,r-knitr))) ; for vignettes
(home-page "https://github.com/sjmgarnier/viridis")
(synopsis "Matplotlib default color map")
(description
@ -4638,14 +4641,14 @@ (define-public r-diptest
(define-public r-modeltools
(package
(name "r-modeltools")
(version "0.2-22")
(version "0.2-23")
(source
(origin
(method url-fetch)
(uri (cran-uri "modeltools" version))
(sha256
(base32
"1s9lmkac3rl0nknf4wizfhg7ryq7c8yvvyc4z619238br27hhsi5"))))
"1vqh69256h344sbj5affm0kmc77dakrxp6442xfdnfd0y5d8sgkb"))))
(build-system r-build-system)
(home-page "https://cran.r-project.org/web/packages/modeltools")
(synopsis "Tools and classes for statistical models")
@ -4853,14 +4856,14 @@ (define-public r-fit-models
(define-public r-robust
(package
(name "r-robust")
(version "0.4-18.2")
(version "0.5-0.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "robust" version))
(sha256
(base32
"02x7d6dgx3skiadvx5m3c44b4bhz37ycpfhc25dhhv50y1db6l3k"))))
"1ks5scp8bnicl9j1r8yrmz668fjs6ifdmi540zw6d2ck500bbw42"))))
(build-system r-build-system)
(propagated-inputs
`(("r-fit-models" ,r-fit-models)

8
gnu/packages/terminals.scm
View file

@ -3,7 +3,7 @@
;;; Copyright © 2016 Mckinley Olsen <mck.olsen@gmail.com>
;;; Copyright © 2016, 2017, 2019 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2016 David Craven <david@craven.ch>
;;; Copyright © 2016, 2017, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017 José Miguel Sánchez García <jmi2k@openmailbox.org>
;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net>
@ -407,7 +407,7 @@ (define-public picocom
(define-public beep
(package
(name "beep")
(version "1.4.7")
(version "1.4.9")
(source
(origin
(method git-fetch)
@ -420,7 +420,7 @@ (define-public beep
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0dnbvzzxvajc7pl1165wb3l74pfcqcdg12rcjcw86qqy954dx8my"))))
(base32 "0jmvqk6g5n0wzj9znw42njxq3mzw1769f4db99b83927hf4aidi4"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no tests
@ -430,8 +430,6 @@ (define-public beep
#:phases
(modify-phases %standard-phases
(delete 'configure)))) ; no configure script
(native-inputs
`(("gcc" ,gcc-8))) ; for ‘-fstack-clash-protection’
(synopsis "Linux command-line utility to control the PC speaker")
(description "beep allows the user to control the PC speaker with precision,
allowing different sounds to indicate different events. While it can be run

36
gnu/packages/toys.scm
View file

@ -2,6 +2,7 @@
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Jesse Gibbons <jgibbons2357+guix@gmail.com>
;;; Copyright © 2019 Timotej Lazar <timotej.lazar@araneo.si>
;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
;;;
@ -200,3 +201,38 @@ (define-public xsnow
the desktop background. Additional customizable effects include wind, stars
and various scenery elements.")
(license license:gpl3+)))
(define-public nyancat
(package
(name "nyancat")
(version "1.5.2")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/klange/nyancat")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"1mg8nm5xzcq1xr8cvx24ym2vmafkw53rijllwcdm9miiz0p5ky9k"))))
(build-system gnu-build-system)
(arguments
'(#:make-flags '("CC=gcc")
#:phases
(modify-phases %standard-phases
(delete 'configure) ; no configure script
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin"))
(man (string-append out "/share/man/man1")))
(install-file "src/nyancat" bin)
(install-file "nyancat.1" man))
#t)))))
(home-page "https://nyancat.dakko.us/")
(synopsis "Nyan cat telnet server")
(description
"This is an animated, color, ANSI-text telnet server that renders a loop
of the Nyan Cat / Poptart Cat animation.")
(license license:ncsa)))

2
gnu/packages/unicode.scm
View file

@ -133,7 +133,7 @@ (define-public unicode-cldr-common
@itemize
@item patterns for formatting and parsing,
@item name translations,
@item and various informations on languages, scripts and country-specific
@item and various information on languages, scripts and country-specific
conventions.
@end itemize\n")
(license unicode)))

7
gnu/packages/version-control.scm
View file

@ -1320,14 +1320,14 @@ (define-public gitolite
(define-public mercurial
(package
(name "mercurial")
(version "5.2.1")
(version "5.3.1")
(source (origin
(method url-fetch)
(uri (string-append "https://www.mercurial-scm.org/"
"release/mercurial-" version ".tar.gz"))
(sha256
(base32
"1pxkd37b0a1mi2zakk1hi122lgz1ffy2fxdnbs8acwlqpw55bc8q"))))
"1nbjpzjrzgql4hrvslpxwbcgn885ikq6ba1yb4w6p78rw9nzkhgp"))))
(build-system python-build-system)
(arguments
`(#:phases
@ -1369,7 +1369,8 @@ (define-public mercurial
;; The following inputs are only needed to run the tests.
(native-inputs
`(("python-nose" ,python-nose)
("unzip" ,unzip)))
("unzip" ,unzip)
("which" ,which)))
(home-page "https://www.mercurial-scm.org/")
(synopsis "Decentralized version control system")
(description

4
gnu/packages/video.scm
View file

@ -1548,7 +1548,7 @@ (define-public libvpx-1.7
(define-public youtube-dl
(package
(name "youtube-dl")
(version "2020.02.16")
(version "2020.03.08")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/ytdl-org/youtube-dl/"
@ -1556,7 +1556,7 @@ (define-public youtube-dl
version ".tar.gz"))
(sha256
(base32
"1ip0p7gifwmkls8ppfvz89j1lh82dg60zmvabj8njnhj170ikkdb"))))
"1xbka14wnalcqkhibfcqw8f5bw1m9b1f44719yifv1jk0614q4bn"))))
(build-system python-build-system)
(arguments
;; The problem here is that the directory for the man page and completion

25
gnu/packages/vim.scm
View file

@ -847,3 +847,28 @@ (define-public vim-guix-vim
(synopsis "Guix integration in Vim")
(description "This package provides support for GNU Guix in Vim.")
(license license:vim)))
(define-public vim-asyncrun
(package
(name "vim-asyncrun")
(version "2.6.5")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/skywind3000/asyncrun.vim")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"1n0yzv8psskhx8h4g7dz64h2llm9mnljhvl4hrnsjx6znkni8vwp"))))
(build-system copy-build-system)
(arguments
'(#:install-plan
'(("plugin" "share/vim/vimfiles/")
("doc/" "share/vim/vimfiles/doc" #:include ("asyncrun.txt")))))
(home-page "https://github.com/skywind3000/asyncrun.vim")
(synopsis "Run Async Shell Commands in Vim")
(description "This plugin takes the advantage of new APIs in Vim 8 (and
NeoVim) to enable you to run shell commands in background and read output in the
quickfix window in realtime.")
(license license:expat)))

5
gnu/packages/virtualization.scm
View file

@ -122,6 +122,7 @@ (define-public qemu
(patches (search-patches "qemu-CVE-2020-1711.patch"
"qemu-CVE-2020-7039.patch"
"qemu-CVE-2020-7211.patch"
"qemu-CVE-2020-8608.patch"
"qemu-fix-documentation-build-failure.patch"))
(sha256
(base32
@ -530,14 +531,14 @@ (define-public libvirt
(define-public libvirt-glib
(package
(name "libvirt-glib")
(version "2.0.0")
(version "3.0.0")
(source (origin
(method url-fetch)
(uri (string-append "ftp://libvirt.org/libvirt/glib/"
"libvirt-glib-" version ".tar.gz"))
(sha256
(base32
"0six9ckmvlwwyavyjkgc262qkpvfqgi8rjij7cyk00bmqq8c9s4l"))))
"1zpbv4ninc57c9rw4zmmkvvqn7154iv1qfr20kyxn8xplalqrzvz"))))
(build-system gnu-build-system)
(inputs
`(("openssl" ,openssl)

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

@ -575,7 +575,17 @@ (define expected-fasl (string-append
(format #t "~a" ,(package-version next-gtk-webkit))))
(invoke "make" "install-assets"
(string-append "PREFIX="
(assoc-ref outputs "out"))))))))
(assoc-ref outputs "out")))))
(add-after 'unpack 'fix-lambda-list
;; Starting from SBCL 2.0.2, Next 1.5.0 won't build
;; because of a weird lambda list type.
(lambda _
(substitute* "source/keymap.lisp"
(("^\\(declaim .* define-key\\)\\)") ""))
(substitute* "source/search-buffer.lisp"
(("define-key :keymap keymap \"C-s\"") "define-key \"C-s\"")
(("\\(update-selection-highlight-hint :follow t :scroll t\\)\\)\\)")
"(update-selection-highlight-hint :follow t :scroll t)) :keymap keymap)")))))))
(inputs
`(("alexandria" ,sbcl-alexandria)
("bordeaux-threads" ,sbcl-bordeaux-threads)

27
gnu/packages/web.scm
View file

@ -1954,15 +1954,14 @@ (define-public perl-catalyst-component-instancepercontext
(define-public perl-catalyst-devel
(package
(name "perl-catalyst-devel")
(version "1.39")
(version "1.40")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://cpan/authors/id/I/IL/ILMARI/"
(uri (string-append "mirror://cpan/authors/id/J/JJ/JJNAPIORK/"
"Catalyst-Devel-" version ".tar.gz"))
(sha256
(base32
"12m50bbkggjmpxihv3wnvr0g2qng0zwhlzi5ygppjz8wh2x73qxw"))))
(base32 "1fqnw6cizpxnfr87rpid8w1wpi1p1lxg6imfjpixqn7s055hcpwc"))))
(build-system perl-build-system)
(native-inputs
`(("perl-test-fatal" ,perl-test-fatal)))
@ -4392,8 +4391,8 @@ (define-public python2-feedparser
(package-with-python2 python-feedparser))
(define-public guix-data-service
(let ((commit "bf25a8db0278b49ef2149c69ef5d6dd2201fd413")
(revision "17"))
(let ((commit "18eb9dfdcb3174bfd4bab5b9089acffa13aa1214")
(revision "18"))
(package
(name "guix-data-service")
(version (string-append "0.0.1-" revision "." (string-take commit 7)))
@ -4405,7 +4404,7 @@ (define-public guix-data-service
(file-name (git-file-name name version))
(sha256
(base32
"0s6faybczdn10zwrkn22nfq5lvf538513hbmjfaqlkhfmwc4s1qd"))))
"0lb78cqzqaz0r4sspg272w2a3yhzhqah30j0kxf0z182b0qpmp37"))))
(build-system gnu-build-system)
(arguments
'(#:modules ((guix build utils)
@ -4454,15 +4453,15 @@ (define-public guix-data-service
#t)))
(delete 'strip)))) ; As the .go files aren't compatible
(inputs
`(("guix" ,guix)
("guile-fibers" ,guile-fibers)
("guile-json" ,guile-json-3)
("guile-email" ,guile-email)
("guile-squee" ,guile-squee)
`(("guix" ,guile3.0-guix)
("guile-fibers" ,guile3.0-fibers)
("guile-json" ,guile3.0-json)
("guile-email" ,guile3.0-email)
("guile-squee" ,guile3.0-squee)
("postgresql" ,postgresql)
("sqitch" ,sqitch)))
(native-inputs
`(("guile" ,guile-2.2)
`(("guile" ,guile-3.0)
("autoconf" ,autoconf)
("automake" ,automake)
("ephemeralpg" ,ephemeralpg)
@ -4606,7 +4605,7 @@ (define-public jq
;;("bundler" ,bundler)
("valgrind" ,valgrind)))
(build-system gnu-build-system)
(home-page "http://stedolan.github.io/jq/")
(home-page "https://stedolan.github.io/jq/")
(synopsis "Command-line JSON processor")
(description "jq is like sed for JSON data – you can use it to slice and
filter and map and transform structured data with the same ease that sed, awk,

24
gnu/packages/xfce.scm
View file

@ -385,15 +385,15 @@ (define-public xfce4-battery-plugin
(define-public xfce4-clipman-plugin
(package
(name "xfce4-clipman-plugin")
(version "1.4.3")
(version "1.4.4")
(source (origin
(method url-fetch)
(uri (string-append "https://archive.xfce.org/src/panel-plugins/"
name "/" (version-major+minor version) "/"
name "-" version ".tar.bz2"))
"xfce4-clipman-plugin/" (version-major+minor version) "/"
"xfce4-clipman-plugin-" version ".tar.bz2"))
(sha256
(base32
"1liacff4wl5mpyf9dzdrfbwxzmhl95y5nsfc0jf5rgalzdgbik99"))))
"1819kjn7gs30zhhj2ppfw4zjpcgj9amw1vvppjsavsff1xflrq88"))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)
@ -880,15 +880,15 @@ (define-public xfce
(define-public xfce4-power-manager
(package
(name "xfce4-power-manager")
(version "1.6.5")
(version "1.7.0")
(source (origin
(method url-fetch)
(uri (string-append "https://archive.xfce.org/src/xfce/"
name "/" (version-major+minor version) "/"
name "-" version ".tar.bz2"))
"xfce4-power-manager/" (version-major+minor version) "/"
"xfce4-power-manager-" version ".tar.bz2"))
(sha256
(base32
"0x3s2bdwfhp65dz5yn3k43j99ywqlsvrpz3pqmgwm0dik5wbdb8h"))))
"0jqjwy341dxyijjm9k77a12iih6b5r3f4cmpr2lppa7mf37qqdj5"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
@ -1047,7 +1047,7 @@ (define-public xfce4-notifyd
(define-public xfburn
(package
(name "xfburn")
(version "0.6.1")
(version "0.6.2")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/apps/xfburn/"
@ -1055,7 +1055,7 @@ (define-public xfburn
"xfburn-" version ".tar.bz2"))
(sha256
(base32
"0ydka5lf9n614gb5xc9bn9297nilgmkfqlb7q1y2yrc97882nxxk"))))
"09q3s2rkpf0ljzq6bv4hl9byvaggjq7lchfw5zaircwv5q9nwhc3"))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)
@ -1971,7 +1971,7 @@ (define-public xfce4-wavelan-plugin
(define-public xfce4-weather-plugin
(package
(name "xfce4-weather-plugin")
(version "0.10.0")
(version "0.10.1")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/panel-plugins/"
@ -1980,7 +1980,7 @@ (define-public xfce4-weather-plugin
"/xfce4-weather-plugin-" version ".tar.bz2"))
(sha256
(base32
"0wlm80panxyn86l9qm3mbliqj7gkf2zyzak3w041zz9hg31a08s4"))))
"12bs2rfmmy021087i10vxibdbbvd5vld0vk3h5hymhpz7rgszcmg"))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)

2
gnu/packages/xml.scm
View file

@ -1311,7 +1311,7 @@ (define-public xerces-c
'(#:configure-flags '("--disable-sse2")))))
(native-inputs
`(("perl" ,perl)))
(home-page "http://xerces.apache.org/xerces-c/")
(home-page "https://xerces.apache.org/xerces-c/")
(synopsis "Validating XML parser library for C++")
(description "Xerces-C++ is a validating XML parser written in a portable
subset of C++. Xerces-C++ makes it easy to give your application the ability

6
gnu/services/base.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015, 2016 Alex Kost <alezost@gmail.com>
;;; Copyright © 2015, 2016 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
@ -1918,7 +1918,7 @@ (define-record-type* <udev-configuration>
udev-configuration make-udev-configuration
udev-configuration?
(udev udev-configuration-udev ;<package>
(default eudev))
(default eudev/btrfs-fix))
(rules udev-configuration-rules ;list of <package>
(default '())))
@ -2116,7 +2116,7 @@ (define udev-service-type
directory dynamically. Get extra rules from the packages listed in the
@code{rules} field of its value, @code{udev-configuration} object.")))
(define* (udev-service #:key (udev eudev) (rules '()))
(define* (udev-service #:key (udev eudev/btrfs-fix) (rules '()))
"Run @var{udev}, which populates the @file{/dev} directory dynamically. Get
extra rules from the packages listed in @var{rules}."
(service udev-service-type

12
gnu/services/certbot.scm
View file

@ -3,6 +3,8 @@
;;; Copyright © 2016 Sou Bunnbu <iyzsong@member.fsf.org>
;;; Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2019 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2020 Jack Hill <jackhill@jackhill.us>
;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@ -70,6 +72,8 @@ (define-record-type* <certbot-configuration>
(certificates certbot-configuration-certificates
(default '()))
(email certbot-configuration-email)
(server certbot-configuration-server
(default #f))
(rsa-key-size certbot-configuration-rsa-key-size
(default #f))
(default-location certbot-configuration-default-location
@ -82,7 +86,7 @@ (define-record-type* <certbot-configuration>
(define certbot-command
(match-lambda
(($ <certbot-configuration> package webroot certificates email
rsa-key-size default-location)
server rsa-key-size default-location)
(let* ((certbot (file-append package "/bin/certbot"))
(rsa-key-size (and rsa-key-size (number->string rsa-key-size)))
(commands
@ -101,6 +105,7 @@ (define certbot-command
"--cert-name" name
"--manual-public-ip-logging-ok"
"-d" (string-join domains ","))
(if server `("--server" ,server) '())
(if rsa-key-size `("--rsa-key-size" ,rsa-key-size) '())
(if authentication-hook
`("--manual-auth-hook" ,authentication-hook)
@ -113,6 +118,7 @@ (define certbot-command
"--webroot" "-w" webroot
"--cert-name" name
"-d" (string-join domains ","))
(if server `("--server" ,server) '())
(if rsa-key-size `("--rsa-key-size" ,rsa-key-size) '())
(if deploy-hook `("--deploy-hook" ,deploy-hook) '()))))))
certificates)))
@ -142,7 +148,7 @@ (define (certbot-activation config)
(message (format #f (G_ "~a may need to be run~%") script)))
(match config
(($ <certbot-configuration> package webroot certificates email
rsa-key-size default-location)
server rsa-key-size default-location)
(with-imported-modules '((guix build utils))
#~(begin
(use-modules (guix build utils))
@ -154,7 +160,7 @@ (define (certbot-activation config)
(define certbot-nginx-server-configurations
(match-lambda
(($ <certbot-configuration> package webroot certificates email
rsa-key-size default-location)
server rsa-key-size default-location)
(list
(nginx-server-configuration
(listen '("80" "[::]:80"))

13
gnu/services/cuirass.scm
View file

@ -77,7 +77,9 @@ (define-record-type* <cuirass-configuration>
(one-shot? cuirass-configuration-one-shot? ;boolean
(default #f))
(fallback? cuirass-configuration-fallback? ;boolean
(default #f)))
(default #f))
(extra-options cuirass-configuration-extra-options
(default '())))
(define (cuirass-shepherd-service config)
"Return a <shepherd-service> for the Cuirass service with CONFIG."
@ -95,7 +97,8 @@ (define (cuirass-shepherd-service config)
(specs (cuirass-configuration-specifications config))
(use-substitutes? (cuirass-configuration-use-substitutes? config))
(one-shot? (cuirass-configuration-one-shot? config))
(fallback? (cuirass-configuration-fallback? config)))
(fallback? (cuirass-configuration-fallback? config))
(extra-options (cuirass-configuration-extra-options config)))
(list (shepherd-service
(documentation "Run Cuirass.")
(provision '(cuirass))
@ -110,7 +113,8 @@ (define (cuirass-shepherd-service config)
"--interval" #$(number->string interval)
#$@(if use-substitutes? '("--use-substitutes") '())
#$@(if one-shot? '("--one-shot") '())
#$@(if fallback? '("--fallback") '()))
#$@(if fallback? '("--fallback") '())
#$@extra-options)
#:environment-variables
(list "GIT_SSL_CAINFO=/etc/ssl/certs/ca-certificates.crt"
@ -137,7 +141,8 @@ (define (cuirass-shepherd-service config)
"--listen" #$host
"--interval" #$(number->string interval)
#$@(if use-substitutes? '("--use-substitutes") '())
#$@(if fallback? '("--fallback") '()))
#$@(if fallback? '("--fallback") '())
#$@extra-options)
#:user #$user
#:group #$group

15
gnu/services/guix.scm
View file

@ -68,7 +68,12 @@ (define-record-type* <guix-data-service-configuration>
(default #f))
(commits-getmail-retriever-configuration
guix-data-service-commits-getmail-retriever-configuration
(default #f)))
(default #f))
(extra-options guix-data-service-extra-options
(default '()))
(extra-process-jobs-options
guix-data-service-extra-process-jobs-options
(default '())))
(define (guix-data-service-profile-packages config)
"Return the guix-data-service package, this will populate the
@ -78,7 +83,7 @@ (define (guix-data-service-profile-packages config)
(define (guix-data-service-shepherd-services config)
(match-record config <guix-data-service-configuration>
(package user group port host)
(package user group port host extra-options extra-process-jobs-options)
(list
(shepherd-service
(documentation "Guix Data Service web server")
@ -92,7 +97,8 @@ (define (guix-data-service-shepherd-services config)
#$(string-append "--host=" host)
;; Perform any database migrations when the
;; service is started
"--update-database")
"--update-database"
#$@extra-options)
#:user #$user
#:group #$group
@ -117,7 +123,8 @@ (define (guix-data-service-shepherd-services config)
(start #~(make-forkexec-constructor
(list
#$(file-append package
"/bin/guix-data-service-process-jobs"))
"/bin/guix-data-service-process-jobs")
#$@extra-process-jobs-options)
#:user #$user
#:group #$group
#:environment-variables

1
gnu/services/nfs.scm
View file

@ -299,6 +299,7 @@ (define (nfs-shepherd-services config)
(start
#~(make-forkexec-constructor
(list #$(file-append nfs-utils "/sbin/rpc.mountd")
"--foreground"
#$@(if (member 'mountd debug)
'("--debug" "all")
'())

8
gnu/system.scm
View file

@ -100,6 +100,14 @@ (define-module (gnu system)
operating-system-user-accounts
operating-system-shepherd-service-names
operating-system-user-kernel-arguments
operating-system-firmware
operating-system-keyboard-layout
operating-system-name-service-switch
operating-system-pam-services
operating-system-setuid-programs
operating-system-skeletons
operating-system-sudoers-file
operating-system-swap-devices
operating-system-derivation
operating-system-profile

1
guix/download.scm
View file

@ -183,7 +183,6 @@ (define %mirrors
"http://mirrors.nic.cz/CPAN/"
"http://mirror.ibcp.fr/pub/CPAN/"
"http://ftp.ntua.gr/pub/lang/perl/"
"http://kvin.lv/pub/CPAN/"
"http://mirror.as43289.net/pub/CPAN/"
"http://cpan.cs.uu.nl/"
"http://cpan.uib.no/"

91
guix/gexp.scm
View file

@ -2,7 +2,7 @@
;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2018 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2019, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -218,7 +218,7 @@ (define (lookup-expander object)
(define* (lower-object obj
#:optional (system (%current-system))
#:key target)
#:key (target 'current))
"Return as a value in %STORE-MONAD the derivation or store item
corresponding to OBJ for SYSTEM, cross-compiling for TARGET if TARGET is true.
OBJ must be an object that has an associated gexp compiler, such as a
@ -228,7 +228,10 @@ (define* (lower-object obj
(raise (condition (&gexp-input-error (input obj)))))
(lower
;; Cache in STORE the result of lowering OBJ.
(mlet %store-monad ((graft? (grafting?)))
(mlet %store-monad ((target (if (eq? target 'current)
(current-target-system)
(return target)))
(graft? (grafting?)))
(mcached (let ((lower (lookup-compiler obj)))
(lower obj system target))
obj
@ -779,7 +782,8 @@ (define (search-path modules extensions suffix)
(extensions -> (gexp-extensions exp))
(exts (mapm %store-monad
(lambda (obj)
(lower-object obj system))
(lower-object obj system
#:target #f))
extensions))
(modules+compiled (imported+compiled-modules
%modules system
@ -1597,16 +1601,19 @@ (define* (gexp->script name exp
#:key (guile (default-guile))
(module-path %load-path)
(system (%current-system))
target)
(target 'current))
"Return an executable script NAME that runs EXP using GUILE, with EXP's
imported modules in its search path. Look up EXP's modules in MODULE-PATH."
(mlet %store-monad ((set-load-path
(load-path-expression (gexp-modules exp)
module-path
#:extensions
(gexp-extensions exp)
#:system system
#:target target)))
(mlet* %store-monad ((target (if (eq? target 'current)
(current-target-system)
(return target)))
(set-load-path
(load-path-expression (gexp-modules exp)
module-path
#:extensions
(gexp-extensions exp)
#:system system
#:target target)))
(gexp->derivation name
(gexp
(call-with-output-file (ungexp output)
@ -1640,7 +1647,7 @@ (define* (gexp->file name exp #:key
(module-path %load-path)
(splice? #f)
(system (%current-system))
target)
(target 'current))
"Return a derivation that builds a file NAME containing EXP. When SPLICE?
is true, EXP is considered to be a list of expressions that will be spliced in
the resulting file.
@ -1651,36 +1658,44 @@ (define* (gexp->file name exp #:key
(define modules (gexp-modules exp))
(define extensions (gexp-extensions exp))
(if (or (not set-load-path?)
(and (null? modules) (null? extensions)))
(gexp->derivation name
(gexp
(call-with-output-file (ungexp output)
(lambda (port)
(for-each (lambda (exp)
(write exp port))
'(ungexp (if splice?
exp
(gexp ((ungexp exp)))))))))
#:local-build? #t
#:substitutable? #f
#:system system
#:target target)
(mlet %store-monad ((set-load-path
(load-path-expression modules module-path
#:extensions extensions
#:system system
#:target target)))
(mlet* %store-monad
((target (if (eq? target 'current)
(current-target-system)
(return target)))
(no-load-path? -> (or (not set-load-path?)
(and (null? modules)
(null? extensions))))
(set-load-path
(load-path-expression modules module-path
#:extensions extensions
#:system system
#:target target)))
(if no-load-path?
(gexp->derivation name
(gexp
(call-with-output-file (ungexp output)
(lambda (port)
(for-each
(lambda (exp)
(write exp port))
'(ungexp (if splice?
exp
(gexp ((ungexp exp)))))))))
#:local-build? #t
#:substitutable? #f
#:system system
#:target target)
(gexp->derivation name
(gexp
(call-with-output-file (ungexp output)
(lambda (port)
(write '(ungexp set-load-path) port)
(for-each (lambda (exp)
(write exp port))
'(ungexp (if splice?
exp
(gexp ((ungexp exp)))))))))
(for-each
(lambda (exp)
(write exp port))
'(ungexp (if splice?
exp
(gexp ((ungexp exp)))))))))
#:module-path module-path
#:local-build? #t
#:substitutable? #f

9
guix/import/cran.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015, 2016, 2017, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;;
@ -385,6 +385,9 @@ (define (needs-pkg-config? thing tarball?)
(tarball-needs-pkg-config? thing)
(directory-needs-pkg-config? thing)))
(define (needs-knitr? meta)
(member "knitr" (listify meta "VignetteBuilder")))
;; XXX adapted from (guix scripts hash)
(define (file-hash file select? recursive?)
;; Compute the hash of FILE.
@ -486,7 +489,9 @@ (define (description->package repository meta)
`(,@(if (needs-fortran? source (not git?))
'("gfortran") '())
,@(if (needs-pkg-config? source (not git?))
'("pkg-config") '()))
'("pkg-config") '())
,@(if (needs-knitr? meta)
'("r-knitr") '()))
'native-inputs)
(home-page ,(if (string-null? home-page)
(string-append base-url name)

2
guix/scripts.scm
View file

@ -237,7 +237,7 @@ (define GiB (expt 2 30))
(total (* block-size (file-system-block-count stats)))
(relative-threshold-in-bytes (* total (cadr thresholds)))
(absolute-threshold-in-bytes (car thresholds)))
(when (< available (max relative-threshold-in-bytes
(when (< available (min relative-threshold-in-bytes
absolute-threshold-in-bytes))
(warning (G_ "only ~,1f GiB of free space available on ~a~%")
(/ available 1. GiB) (%store-prefix))

8
guix/store.scm
View file

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2019, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -161,6 +161,7 @@ (define-module (guix store)
current-system
set-current-system
current-target-system
set-current-target
text-file
interned-file
interned-file-tree
@ -1823,6 +1824,11 @@ (define-inlinable (current-target-system)
(lambda (state)
(values (%current-target-system) state)))
(define-inlinable (set-current-target target)
;; Set the %CURRENT-TARGET-SYSTEM fluid at bind time.
(lambda (state)
(values (%current-target-system target) state)))
(define %guile-for-build
;; The derivation of the Guile to be used within the build environment,
;; when using 'gexp->derivation' and co.

4
po/doc/local.mk
View file

@ -24,7 +24,7 @@ DOC_PO_FILES= \
%D%/guix-manual.zh_CN.po
DOC_COOKBOOK_PO_FILES= \
%D%/guix-manual.de.po
%D%/guix-cookbook.de.po
EXTRA_DIST = \
%D%/guix-manual.pot \
@ -58,7 +58,7 @@ doc-po-update-%:
fi
doc-po-update-cookbook-%:
@lang=`echo "$@" | sed -e's/^doc-po-update-//'` ; \
@lang=`echo "$@" | sed -e's/^doc-po-update-cookbook-//'` ; \
output="$(srcdir)/po/doc/guix-cookbook.$$lang.po" ; \
input="$(srcdir)/po/doc/guix-cookbook.pot" ; \
if test -f "$$output"; then \

50
tests/gexp.scm
View file

@ -1331,6 +1331,56 @@ (define (contents=? file str)
'#~(foo #$bar #$baz:out #$(chbouib 42) #$@(list x y z)
#+foo #+foo:out #+(chbouib 42) #+@(list x y z)))
(test-assertm "gexp->file, cross-compilation"
(mlet* %store-monad ((target -> "aarch64-linux-gnu")
(exp -> (gexp (list (ungexp coreutils))))
(xdrv (gexp->file "foo" exp #:target target))
(refs (references*
(derivation-file-name xdrv)))
(xcu (package->cross-derivation coreutils
target))
(cu (package->derivation coreutils)))
(return (and (member (derivation-file-name xcu) refs)
(not (member (derivation-file-name cu) refs))))))
(test-assertm "gexp->file, cross-compilation with default target"
(mlet* %store-monad ((target -> "aarch64-linux-gnu")
(_ (set-current-target target))
(exp -> (gexp (list (ungexp coreutils))))
(xdrv (gexp->file "foo" exp))
(refs (references*
(derivation-file-name xdrv)))
(xcu (package->cross-derivation coreutils
target))
(cu (package->derivation coreutils)))
(return (and (member (derivation-file-name xcu) refs)
(not (member (derivation-file-name cu) refs))))))
(test-assertm "gexp->script, cross-compilation"
(mlet* %store-monad ((target -> "aarch64-linux-gnu")
(exp -> (gexp (list (ungexp coreutils))))
(xdrv (gexp->script "foo" exp #:target target))
(refs (references*
(derivation-file-name xdrv)))
(xcu (package->cross-derivation coreutils
target))
(cu (package->derivation coreutils)))
(return (and (member (derivation-file-name xcu) refs)
(not (member (derivation-file-name cu) refs))))))
(test-assertm "gexp->script, cross-compilation with default target"
(mlet* %store-monad ((target -> "aarch64-linux-gnu")
(_ (set-current-target target))
(exp -> (gexp (list (ungexp coreutils))))
(xdrv (gexp->script "foo" exp))
(refs (references*
(derivation-file-name xdrv)))
(xcu (package->cross-derivation coreutils
target))
(cu (package->derivation coreutils)))
(return (and (member (derivation-file-name xcu) refs)
(not (member (derivation-file-name cu) refs))))))
(test-end "gexp")
;; Local Variables: