[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into core-updates
|
From: |
guix-commits |
|
Subject: |
01/01: Merge branch 'master' into core-updates |
|
Date: |
Wed, 4 Mar 2020 17:23:56 -0500 (EST) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit ebb7cf9e21060105d9950dd5142c0eb918083666
Merge: 0b870f7 c2d7e80
Author: Marius Bakke <address@hidden>
AuthorDate: Wed Mar 4 23:16:17 2020 +0100
Merge branch 'master' into core-updates
Makefile.am | 2 +
bootstrap | 2 +-
build-aux/build-self.scm | 3 +-
build-aux/git-authenticate.scm | 8 +-
doc/contributing.texi | 62 +
doc/guix.texi | 145 +-
doc/local.mk | 6 +-
etc/copyright.el | 34 +
gnu/build/file-systems.scm | 2 +
gnu/build/linux-boot.scm | 4 +-
gnu/build/marionette.scm | 8 +-
gnu/installer.scm | 5 +-
gnu/installer/parted.scm | 7 +-
gnu/installer/steps.scm | 1 +
gnu/installer/utils.scm | 47 +-
gnu/local.mk | 18 +-
gnu/packages/abduco.scm | 5 +-
gnu/packages/acct.scm | 3 +-
gnu/packages/admin.scm | 77 +-
gnu/packages/algebra.scm | 34 +-
gnu/packages/android.scm | 83 +-
gnu/packages/anthy.scm | 2 +-
gnu/packages/aspell.scm | 5 +-
gnu/packages/assembly.scm | 6 +-
gnu/packages/audio.scm | 32 +-
gnu/packages/autotools.scm | 3 +-
gnu/packages/aux-files/emacs/guix-emacs.el | 5 +-
gnu/packages/avr.scm | 16 +-
gnu/packages/backup.scm | 2 +-
gnu/packages/bdw-gc.scm | 10 +-
gnu/packages/benchmark.scm | 31 +-
gnu/packages/bioconductor.scm | 161 +-
gnu/packages/bioinformatics.scm | 246 +-
gnu/packages/bittorrent.scm | 4 +-
gnu/packages/bootloaders.scm | 15 +-
gnu/packages/build-tools.scm | 6 +-
gnu/packages/c.scm | 6 +-
gnu/packages/cedille.scm | 4 +-
gnu/packages/certs.scm | 6 +-
gnu/packages/check.scm | 6 +-
gnu/packages/chicken.scm | 7 +-
gnu/packages/chromium.scm | 84 +-
gnu/packages/compression.scm | 47 +-
gnu/packages/connman.scm | 7 +-
gnu/packages/cpp.scm | 74 +
gnu/packages/cran.scm | 1884 ++++-
gnu/packages/crates-io.scm | 7996 +++++++++++++++++---
gnu/packages/crypto.scm | 28 +-
gnu/packages/databases.scm | 47 +-
gnu/packages/datamash.scm | 6 +-
gnu/packages/dav.scm | 2 +-
gnu/packages/debian.scm | 4 +-
gnu/packages/dictionaries.scm | 59 +-
gnu/packages/diffoscope.scm | 6 +-
gnu/packages/disk.scm | 23 +-
gnu/packages/distributed.scm | 8 +-
gnu/packages/django.scm | 8 +-
gnu/packages/dns.scm | 128 +-
gnu/packages/docker.scm | 6 +-
gnu/packages/documentation.scm | 25 +
gnu/packages/ebook.scm | 2 +-
gnu/packages/education.scm | 10 +-
gnu/packages/efi.scm | 7 +-
gnu/packages/elixir.scm | 4 +-
gnu/packages/emacs-xyz.scm | 417 +-
gnu/packages/emacs.scm | 49 +-
gnu/packages/embedded.scm | 2 +-
gnu/packages/emulators.scm | 129 +-
gnu/packages/enchant.scm | 4 +-
gnu/packages/engineering.scm | 319 +-
gnu/packages/erlang.scm | 6 +-
gnu/packages/finance.scm | 8 +-
gnu/packages/firmware.scm | 16 +-
gnu/packages/flashing-tools.scm | 10 +-
gnu/packages/fltk.scm | 2 +-
gnu/packages/fonts.scm | 57 +-
gnu/packages/fontutils.scm | 64 +-
gnu/packages/fpga.scm | 14 +-
gnu/packages/freedesktop.scm | 206 +-
gnu/packages/game-development.scm | 109 +-
gnu/packages/games.scm | 132 +-
gnu/packages/gcc.scm | 6 +-
gnu/packages/geo.scm | 12 +-
gnu/packages/gl.scm | 4 +-
gnu/packages/glib.scm | 7 +-
gnu/packages/gnome-xyz.scm | 199 +-
gnu/packages/gnome.scm | 100 +-
gnu/packages/gnunet.scm | 6 +-
gnu/packages/gnupg.scm | 14 +-
gnu/packages/gnustep.scm | 6 +-
gnu/packages/gnuzilla.scm | 19 +-
gnu/packages/golang.scm | 4 +-
gnu/packages/gps.scm | 96 +-
gnu/packages/graph.scm | 35 +-
gnu/packages/graphics.scm | 116 +-
gnu/packages/graphviz.scm | 2 +-
gnu/packages/gtk.scm | 8 +-
gnu/packages/guile-xyz.scm | 128 +-
gnu/packages/haskell-apps.scm | 9 +-
gnu/packages/haskell-crypto.scm | 2 +-
gnu/packages/haskell-web.scm | 4 +-
gnu/packages/haskell-xyz.scm | 50 +-
gnu/packages/ibus.scm | 4 +-
gnu/packages/image-viewers.scm | 10 +-
gnu/packages/image.scm | 143 +-
gnu/packages/ipfs.scm | 4 +-
gnu/packages/irc.scm | 38 +-
gnu/packages/java.scm | 30 +-
gnu/packages/javascript.scm | 2 +-
gnu/packages/kde-internet.scm | 7 +-
gnu/packages/key-mon.scm | 2 +-
gnu/packages/kodi.scm | 4 +-
gnu/packages/ld-wrapper-next.in | 305 +
gnu/packages/libevent.scm | 3 +-
gnu/packages/libreoffice.scm | 86 +-
gnu/packages/linux.scm | 271 +-
gnu/packages/lisp-xyz.scm | 869 ++-
gnu/packages/lisp.scm | 4 +-
gnu/packages/llvm.scm | 499 +-
gnu/packages/machine-learning.scm | 2 +-
gnu/packages/mail.scm | 75 +-
gnu/packages/maths.scm | 59 +-
gnu/packages/messaging.scm | 132 +-
gnu/packages/mono.scm | 49 +
gnu/packages/mpd.scm | 12 +-
gnu/packages/mpi.scm | 88 +-
gnu/packages/multiprecision.scm | 2 +-
gnu/packages/music.scm | 54 +-
gnu/packages/musl.scm | 4 +-
gnu/packages/ncdu.scm | 6 +-
gnu/packages/networking.scm | 14 +-
gnu/packages/nfs.scm | 2 +-
gnu/packages/nim.scm | 5 +-
gnu/packages/node.scm | 26 +-
gnu/packages/ocaml.scm | 16 +-
gnu/packages/opencl.scm | 2 +-
gnu/packages/opencog.scm | 9 +-
gnu/packages/openstack.scm | 2 +-
gnu/packages/package-management.scm | 53 +-
gnu/packages/password-utils.scm | 2 +-
gnu/packages/patches/appstream-glib-2020.patch | 31 -
gnu/packages/patches/ceph-boost-compat.patch | 81 -
.../patches/ceph-volume-respect-PATH.patch | 22 -
.../choqok-Fix-building-under-Qt-5.13.patch | 89 -
.../patches/clang-9.0-libc-search-path.patch | 83 +
.../patches/containerd-test-with-go1.13.patch | 21 +
gnu/packages/patches/desmume-gcc6-fixes.patch | 59 +
gnu/packages/patches/desmume-gcc7-fixes.patch | 18 +
gnu/packages/patches/elixir-path-length.patch | 8 +-
gnu/packages/patches/libgit2-avoid-python.patch | 322 -
gnu/packages/patches/mumps-shared-libseq.patch | 2 +-
gnu/packages/patches/mumps-shared-mumps.patch | 8 +-
gnu/packages/patches/mumps-shared-pord.patch | 4 +-
gnu/packages/patches/qtbase-QTBUG-81715.patch | 40 +
.../patches/racket-store-checksum-override.patch | 30 +-
gnu/packages/patches/upx-fix-CVE-2017-15056.patch | 96 -
gnu/packages/patches/zziplib-CVE-2018-16548.patch | 49 +
gnu/packages/patchutils.scm | 6 +-
gnu/packages/pdf.scm | 45 +-
gnu/packages/perl.scm | 24 +
gnu/packages/photo.scm | 13 +-
gnu/packages/php.scm | 5 +-
gnu/packages/pretty-print.scm | 27 +-
gnu/packages/python-crypto.scm | 2 +-
gnu/packages/python-science.scm | 2 +-
gnu/packages/python-web.scm | 97 +-
gnu/packages/python-xyz.scm | 258 +-
gnu/packages/qt.scm | 13 +
gnu/packages/rdf.scm | 6 +-
gnu/packages/regex.scm | 4 +-
gnu/packages/ruby.scm | 4 +-
gnu/packages/rust-apps.scm | 4 +-
gnu/packages/sagemath.scm | 4 +-
gnu/packages/scheme.scm | 98 +-
gnu/packages/scsi.scm | 6 +-
gnu/packages/search.scm | 6 +-
gnu/packages/shells.scm | 12 +-
gnu/packages/speech.scm | 22 +-
gnu/packages/sphinx.scm | 2 +-
gnu/packages/ssh.scm | 44 +-
gnu/packages/statistics.scm | 234 +-
gnu/packages/storage.scm | 8 +-
gnu/packages/syncthing.scm | 2 +-
gnu/packages/terminals.scm | 188 +-
gnu/packages/textutils.scm | 31 +
gnu/packages/tls.scm | 37 +-
gnu/packages/uml.scm | 6 +-
gnu/packages/unicode.scm | 26 +-
gnu/packages/version-control.scm | 97 +-
gnu/packages/video.scm | 103 +-
gnu/packages/vim.scm | 326 +-
gnu/packages/virtualization.scm | 102 +-
gnu/packages/vpn.scm | 61 +-
gnu/packages/web-browsers.scm | 21 +-
gnu/packages/web.scm | 101 +-
gnu/packages/webkit.scm | 4 +-
gnu/packages/wine.scm | 38 +-
gnu/packages/wm.scm | 4 +-
gnu/packages/wordnet.scm | 2 +-
gnu/packages/wxwidgets.scm | 13 +-
gnu/packages/xdisorg.scm | 29 +-
gnu/packages/xfce.scm | 8 +-
gnu/packages/xml.scm | 4 +-
gnu/packages/xorg.scm | 2 +-
gnu/services/base.scm | 19 +-
gnu/services/herd.scm | 9 +-
gnu/services/sddm.scm | 38 +-
gnu/services/shepherd.scm | 12 +-
gnu/services/vpn.scm | 14 +-
gnu/services/xorg.scm | 116 +-
gnu/system.scm | 15 +-
gnu/system/file-systems.scm | 15 +
gnu/system/vm.scm | 8 +-
gnu/tests/cups.scm | 119 +
gnu/tests/install.scm | 18 +-
guix/build-system/copy.scm | 143 +
guix/build/copy-build-system.scm | 171 +
guix/build/emacs-build-system.scm | 22 +-
guix/build/emacs-utils.scm | 10 +-
guix/build/linux-module-build-system.scm | 9 +-
guix/build/node-build-system.scm | 5 +-
guix/colors.scm | 3 +-
guix/import/github.scm | 14 +-
guix/import/pypi.scm | 7 +-
guix/scripts.scm | 69 +-
guix/scripts/package.scm | 7 +-
guix/scripts/system.scm | 9 +-
guix/ssh.scm | 15 +-
guix/store/deduplication.scm | 6 +-
guix/swh.scm | 12 +-
guix/ui.scm | 6 +-
m4/guix.m4 | 5 +-
nix/libstore/gc.cc | 20 +-
po/doc/guix-cookbook.de.po | 3395 +++++++++
po/doc/local.mk | 3 +-
tests/swh.scm | 10 +-
tests/ui.scm | 6 +-
237 files changed, 19290 insertions(+), 5014 deletions(-)
diff --cc gnu/packages/documentation.scm
index c4a8c02,50e0f25..dcacdb4
--- a/gnu/packages/documentation.scm
+++ b/gnu/packages/documentation.scm
@@@ -7,7 -7,7 +7,8 @@@
;;; Copyright © 2017 Kei Kebreau <address@hidden>
;;; Copyright © 2017 Efraim Flashner <address@hidden>
;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
+;;; Copyright © 2019 Mathieu Othacehe <address@hidden>
+ ;;; Copyright © 2020 Ricardo Wurmus <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/fontutils.scm
index 1d81938,a8c9e3d..71d7a19
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@@ -9,7 -9,8 +9,8 @@@
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <address@hidden>
;;; Copyright © 2018 Ricardo Wurmus <address@hidden>
;;; Copyright © 2018, 2019 Ludovic Courtès <address@hidden>
-;;; Copyright © 2019 Marius Bakke <address@hidden>
+;;; Copyright © 2019, 2020 Marius Bakke <address@hidden>
+ ;;; Copyright © 2020 Roel Janssen <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/gcc.scm
index f9d8b3e,ead50bb..6f28830
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@@ -3,10 -3,10 +3,10 @@@
;;; Copyright © 2014, 2015, 2018 Mark H Weaver <address@hidden>
;;; Copyright © 2014, 2015, 2016, 2017, 2019 Ricardo Wurmus <address@hidden>
;;; Copyright © 2015 Andreas Enge <address@hidden>
- ;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <address@hidden>
+ ;;; Copyright © 2015, 2016, 2017, 2018, 2020 Efraim Flashner <address@hidden>
;;; Copyright © 2016 Carlos Sánchez de La Lama <address@hidden>
;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
-;;; Copyright © 2018 Marius Bakke <address@hidden>
+;;; Copyright © 2018, 2020 Marius Bakke <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@@ -512,9 -516,8 +512,9 @@@ It also includes runtime support librar
version "/gcc-" version ".tar.xz"))
(sha256
(base32
- "0b3xv411xhlnjmin2979nxcbnidgvzqdf4nbhix99x60dkzavfk4"))
+ "1m1d3gfix56w4aq8myazzfffkl8bqcrx4jhhapnjf7qfs596w2p3"))
(patches (search-patches "gcc-8-strmov-store-file-names.patch"
+ "gcc-8-libsanitizer-mode-size.patch"
"gcc-5.0-libvtv-runpath.patch"))))))
(define-public gcc-9
diff --cc gnu/packages/gnupg.scm
index f447841,c5c3d52..5d389d1
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@@ -470,22 -466,8 +470,22 @@@ gpgpme starting with version 1.7."
(sha256
(base32
"0n232iyayc46f7hywmjw0jr7pbmmz5h4b04jskhkzz9gxz0ci99c"))
- (file-name (string-append name "-" version "-checkout"))))
+ (file-name (git-file-name name version))))
(build-system gnu-build-system)
+ (arguments
+ ;; When cross-compiling, the bash script libgcrypt-config provided by
+ ;; libgcrypt must be accessible during configure phase.
+ `(,@(if (%current-target-system)
+ '(#:phases
+ (modify-phases %standard-phases
+ (add-before 'configure 'add-libgrypt-config
+ (lambda _
+ (setenv "PATH" (string-append
+ (assoc-ref %build-inputs "libgcrypt")
+ "/bin:"
+ (getenv "PATH")))
+ #t))))
+ '())))
(native-inputs
`(("pkg-config" ,pkg-config)
("autoconf" ,autoconf)
diff --cc gnu/packages/graphics.scm
index e09981d,c30f23d..7e36854
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@@ -558,7 -468,7 +468,7 @@@ visual effects work for film."
("unzip" ,unzip)))
(inputs
`(("giflib" ,giflib)
- ("libjpeg" ,libjpeg-turbo) ; Required for the JPEG texture
plugin.
- ("libjpeg" ,libjpeg) ; required by the JPEG texture plugin
++ ("libjpeg" ,libjpeg-turbo) ; required for the JPEG texture
plugin.
("jasper" ,jasper)
("librsvg" ,librsvg)
("libxrandr" ,libxrandr)
diff --cc gnu/packages/gtk.scm
index e5064a7,f28a3b0..243e9e5
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@@ -15,8 -15,8 +15,8 @@@
;;; Copyright © 2016 Patrick Hetu <address@hidden>
;;; Copyright © 2016 ng0 <address@hidden>
;;; Copyright © 2017 Roel Janssen <address@hidden>
- ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <address@hidden>
+ ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <address@hidden>
-;;; Copyright © 2017 Marius Bakke <address@hidden>
+;;; Copyright © 2017, 2019, 2020 Marius Bakke <address@hidden>
;;; Copyright © 2018 Alex Vong <address@hidden>
;;; Copyright © 2018 Arun Isaac <address@hidden>
;;; Copyright © 2018 Pierre Neidhardt <address@hidden>
diff --cc gnu/packages/linux.scm
index b402b49,64ea566..2fc4afa
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@@ -4125,10 -4160,12 +4228,10 @@@ and copy/paste text in the console and
#:tests? #f ; XXX: require the 'btrfs' kernel module.
#:test-target "test"
#:parallel-tests? #f)) ; tests fail when run in parallel
- (inputs `(("e2fsprogs" ,e2fsprogs)
+ (inputs `(("e2fsprogs" ,e2fsprogs) ; for btrfs-convert
- ("libblkid" ,util-linux)
- ("libblkid:static" ,util-linux "static")
- ("libuuid" ,util-linux)
- ("libuuid:static" ,util-linux "static")
("lzo" ,lzo)
+ ("util-linux:lib" ,util-linux "lib") ;for libblkid and
libuuid
+ ("util-linux:static" ,util-linux "static") ;ditto
("zlib" ,zlib)
("zlib:static" ,zlib "static")
("zstd" ,zstd "lib")
diff --cc gnu/packages/llvm.scm
index e333ab7,41217d1..bf32322
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@@ -83,13 -91,11 +91,12 @@@ as \"x86_64-linux\".
(source
(origin
(method url-fetch)
- (uri (string-append "https://llvm.org/releases/";
- version "/llvm-" version ".src.tar.xz"))
+ (uri (llvm-download-uri "llvm" version))
(sha256
(base32
- "0k124sxkfhfi1rca6kzkdraf4axhx99x3cw2rk55056628dvwwl8"))))
+ "16hwp3qa54c3a3v7h8nlw0fh5criqh0hlr1skybyk0cz70gyx880"))))
(build-system cmake-build-system)
+ (outputs '("out" "opt-viewer"))
(native-inputs
`(("python" ,python-2) ;bytes->str conversion in clang>=3.7 needs
python-2
("perl" ,perl)))
@@@ -570,17 -466,10 +478,16 @@@ output), and Binutils."
(source
(origin
(method url-fetch)
- (uri (string-append "https://llvm.org/releases/";
- version "/llvm-" version ".src.tar.xz"))
+ (uri (llvm-download-uri "llvm" version))
(sha256
(base32
- "1vi9sf7rx1q04wj479rsvxayb6z740iaz3qniwp266fgp5a07n8z"))))))
+ "1vi9sf7rx1q04wj479rsvxayb6z740iaz3qniwp266fgp5a07n8z"))))
+ (outputs '("out"))
+ (arguments
+ (substitute-keyword-arguments (package-arguments llvm)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (delete 'install-opt-viewer)))))))
(define-public clang-runtime-3.9.1
(clang-runtime-from-llvm
diff --cc gnu/packages/mono.scm
index 17f90fe,5447dd2..a01b63f
--- a/gnu/packages/mono.scm
+++ b/gnu/packages/mono.scm
@@@ -124,3 -130,46 +130,46 @@@ C#, a C-style programming language fro
Java.")
(home-page "https://www.mono-project.com/";)
(license license:x11)))
+
+ (define-public libgdiplus
+ (package
+ (name "libgdiplus")
+ (version "6.0.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "http://download.mono-project.com/sources/libgdiplus/libgdiplus-";
+ version
+ ".tar.gz"))
+ (sha256
+ (base32
+ "0adz5813f881z65lpyf0g0w9hcn7d7qkai6sncpkwnsxfv4khp5p"))))
+ (build-system gnu-build-system)
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
+ (inputs
+ `(("glib" ,glib)
+ ("cairo" ,cairo)
+ ("fontconfig" ,fontconfig)
+ ("libtiff" ,libtiff)
- ("libjpeg" ,libjpeg)
++ ("libjpeg" ,libjpeg-turbo)
+ ("libexif" ,libexif)
+ ("libungif" ,libungif)))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ ;; TODO: See with upstream why they fail.
+ ;; https://github.com/mono/mono/issues/18934
+ (add-before 'configure 'remove-buggy-tests
+ (lambda _
+ (substitute* "tests/Makefile.in"
+ (("testicocodec\\$\\(EXEEXT\\) ") " ")
+ (("testfont\\$\\(EXEEXT\\) ") " "))
+ #t)))))
+ (home-page "https://www.mono-project.com/docs/gui/libgdiplus/";)
+ (synopsis "Mono library that provides a GDI+-compatible API")
+ (description "Libgdiplus is the Mono library that provides a
+ GDI+-compatible API on non-Windows operating systems. The implementation uses
+ Cairo to do most of the heavy lifting.")
+ (license license:gpl3+)))
diff --cc gnu/packages/php.scm
index ac0f991,7bb88a7..2551028
--- a/gnu/packages/php.scm
+++ b/gnu/packages/php.scm
@@@ -60,8 -59,8 +60,8 @@@
(define-public php
(package
(name "php")
- (version "7.4.2")
+ (version "7.4.3")
- (home-page "https://secure.php.net/";)
+ (home-page "https://www.php.net/";)
(source (origin
(method url-fetch)
(uri (string-append home-page "distributions/"
@@@ -246,14 -237,10 +246,13 @@@
;; complete. It's a warning in both cases and test
;; result is the same.
"ext/gd/tests/bug77973.phpt"
- ;; New test failures added with 7.4.3
+ ;; Test expects uninitialized value to be false, but
+ ;; instead gets "resource(5) of type (gd)".
"ext/gd/tests/bug79067.phpt"
+ ;; The following test fails with "The image size
+ ;; differs: expected 114x115, got 117x117".
"ext/gd/tests/bug79068.phpt"
-
;; XXX: These iconv tests have the expected outcome,
;; but with different error messages.
;; Expects "illegal character", instead gets
"unknown error (84)".
diff --cc gnu/packages/python-xyz.scm
index dc48800,3cd1686..de48d36
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@@ -68,8 -68,8 +68,9 @@@
;;; Copyright © 2019 Wiktor Żelazny <address@hidden>
;;; Copyright © 2019 Tanguy Le Carrour <address@hidden>
;;; Copyright © 2019 Mădălin Ionel Patrașcu <address@hidden>
+;;; Copyright © 2020 Riku Viitanen <address@hidden>
;;; Copyright © 2020 Jakub Kądziołka <address@hidden>
+ ;;; Copyright © 2020 sirgazil <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@@ -1109,8 -1109,9 +1110,8 @@@ from the Python interpreter, or as a sm
(lambda _
(invoke "py.test" "-v"))))))
(native-inputs
- `(("python-py" ,python-py)
- ("python-pytest" ,python-pytest-bootstrap)))
+ `(("python-pytest" ,python-pytest-bootstrap)))
- (home-page "https://pypi.python.org/pypi/six/";)
+ (home-page "https://pypi.org/project/six/";)
(synopsis "Python 2 and 3 compatibility utilities")
(description
"Six is a Python 2 and 3 compatibility library. It provides utility
@@@ -8871,8 -8828,7 +8878,8 @@@ library as well as on the command line.
(synopsis "Plugin and hook calling mechanism for Python")
(description "Pluggy is an extraction of the plugin manager as used by
Pytest but stripped of Pytest specific details.")
- (home-page "https://pypi.python.org/pypi/pluggy";)
+ (home-page "https://pypi.org/project/pluggy/";)
+ (properties `((python2-variant . ,(delay python2-pluggy))))
(license license:expat)))
(define-public python2-pluggy
diff --cc gnu/packages/search.scm
index 5410263,d1b67a3..e8a72fa
--- a/gnu/packages/search.scm
+++ b/gnu/packages/search.scm
@@@ -56,10 -56,10 +56,10 @@@
(uri (string-append "https://oligarchy.co.uk/xapian/"; version
"/xapian-core-" version ".tar.xz"))
(sha256
- (base32
"0ja95vn0lkf6qkjhg2blkx306i10hg4fr8wlrhalmly93307lnlp"))))
+ (base32
"1sjhz6vgql801rdgl6vrsjj0vy1mwlkcxjx6nr7h27m031cyjs5i"))))
(build-system gnu-build-system)
(inputs `(("zlib" ,zlib)
- ("util-linux" ,util-linux)))
+ ("util-linux" ,util-linux "lib")))
(arguments
`(#:phases
(modify-phases %standard-phases
diff --cc gnu/packages/terminals.scm
index cffaea2,482e9e8..186daef
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@@ -94,8 -98,14 +98,8 @@@
(file-name (git-file-name name version))
(sha256
(base32
- "154rsldqjv2m1bddisb930qicb0y35kx7bxq392n2hn68jr2pxkj"))))
+ "13djibj3s7ig13c57ywy38pxy3qfmqihii2c0g15fy2h9q8xp1gx"))))
(build-system glib-or-gtk-build-system)
- (arguments
- '(#:phases (modify-phases %standard-phases
- (replace 'bootstrap
- (lambda _
- (setenv "NOCONFIGURE" "true")
- (invoke "sh" "autogen.sh"))))))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
diff --cc gnu/packages/version-control.scm
index e90b8b8,514dfe7..567e5e3
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@@ -187,9 -179,13 +187,9 @@@ as well as the classic centralized work
("expat" ,expat)
("openssl" ,openssl)
("perl" ,perl)
- ("python" ,python-2) ; CAVEAT: incompatible with python-3 according to
INSTALL
+ ("python" ,python) ; for git-p4
("zlib" ,zlib)
- ;; Note: we keep this in inputs rather than native-inputs to work around
- ;; a problem in 'patch-shebangs'; see <https://bugs.gnu.org/31952>.
- ("bash-for-tests" ,bash)
-
;; For PCRE support in git grep (USE_LIBPCRE2).
("pcre" ,pcre2)
@@@ -575,16 -562,18 +582,25 @@@ everything from small to very large pro
(build-system cmake-build-system)
(outputs '("out" "debug"))
(arguments
- `(#:configure-flags '("-DUSE_NTLMCLIENT=OFF" ;TODO: package this
- "-DREGEX_BACKEND=pcre2")
+ `(#:configure-flags
- (list "-DUSE_SHA1DC=ON" ; SHA-1 collision detection
++ (list "-DUSE_NTLMCLIENT=OFF" ;TODO: package this
++ "-DREGEX_BACKEND=pcre2"
+ ,@(if (%current-target-system)
+ `((string-append
+ "-DPKG_CONFIG_EXECUTABLE="
+ (assoc-ref %build-inputs "pkg-config")
+ "/bin/" ,(%current-target-system) "-pkg-config"))
+ '()))
#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'fix-pcre2-reference
+ (lambda _
+ ;; Use PCRE2 with 8-bit character support, as there is no
"libpcre2.pc".
+ ;; See <https://github.com/libgit2/libgit2/issues/5438>.
+ (substitute* "src/CMakeLists.txt"
+ (("\"libpcre2\"")
+ "\"libpcre2-8\""))
+ #t))
(add-after 'unpack 'fix-hardcoded-paths
(lambda _
(substitute* "tests/repo/init.c"
@@@ -597,22 -586,18 +613,22 @@@
(lambda _
(for-each make-file-writable (find-files "."))
#t))
- ;; Run checks more verbosely.
+ ;; Run checks more verbosely, unless we are cross-compiling.
(replace 'check
- (lambda _ (invoke "./libgit2_clar" "-v" "-Q"))))))
+ (lambda* (#:key (tests? #t) #:allow-other-keys)
+ (if tests?
+ (invoke "./libgit2_clar" "-v" "-Q")
+ ;; Tests may be disabled if cross-compiling.
+ (format #t "Test suite not run.~%")))))))
(inputs
- `(("libssh2" ,libssh2)
- ("http-parser" ,http-parser)))
+ `(("libssh2" ,libssh2)))
(native-inputs
- `(("guile" ,guile-2.2)
- ("pkg-config" ,pkg-config)))
+ `(("pkg-config" ,pkg-config)
+ ("python" ,python)))
(propagated-inputs
- ;; These two libraries are in 'Requires.private' in libgit2.pc.
+ ;; These libraries are in 'Requires.private' in libgit2.pc.
`(("openssl" ,openssl)
+ ("pcre2" ,pcre2)
("zlib" ,zlib)))
(home-page "https://libgit2.github.com/";)
(synopsis "Library providing Git core methods")
diff --cc gnu/packages/video.scm
index cf767f4,6719e1e..74a9b94
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@@ -1288,10 -1284,11 +1284,11 @@@ streaming protocols."
("lame" ,lame)
("libass" ,libass)
("libdvdcss" ,libdvdcss)
- ("libdvdnav" ,libdvdnav)
+ ("libdvdnav" ,libdvdnav) ; ignored without libdvdread
+ ("libdvdread" ,libdvdread) ; ignored without libdvdnav
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libmpeg2" ,libmpeg2)
- ("libmpg123" ,mpg123) ; audio codec for MP3
+ ("libmpg123" ,mpg123) ; audio codec for MP3
("libpng" ,libpng)
("libtheora" ,libtheora)
("libvdpau" ,libvdpau)