[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: |
Sat, 19 Jun 2021 11:45:35 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 6f9a80b331ae41d142a49fbeb94b90ee587b6155
Merge: 6500c9a dece03e
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sat Jun 19 17:38:47 2021 +0200
Merge branch 'master' into core-updates
Note: this merge actually changes the 'curl' and 'python-attrs' derivations,
as part of solving caf4a7a2770ef4d05a6e18f40d602e51da749ddc and
12964df69a99de6190422c752fef65ef813f3b6b respectively.
4604d43c0e (gnu: gnutls@3.6.16: Fix cross-compilation.) was ignored because
it
cannot currently be tested.
Conflicts:
gnu/local.mk
gnu/packages/aidc.scm
gnu/packages/boost.scm
gnu/packages/curl.scm
gnu/packages/nettle.scm
gnu/packages/networking.scm
gnu/packages/python-xyz.scm
gnu/packages/tls.scm
Makefile.am | 3 +-
bootstrap | 6 +-
build-aux/compile-all.scm | 9 +-
config-daemon.ac | 2 +-
doc/contributing.texi | 151 +-
doc/guix.texi | 164 +-
etc/completion/bash/guix | 117 +-
etc/indent-code.el | 3 +
etc/news.scm | 2 +-
etc/substitutes/bordeaux.guix.gnu.org.pub | 6 +
gnu/build/linux-boot.scm | 10 +
gnu/installer/newt/partition.scm | 8 +
gnu/installer/parted.scm | 98 +-
gnu/local.mk | 26 +-
gnu/packages/admin.scm | 17 +-
gnu/packages/aidc.scm | 2 +-
gnu/packages/algebra.scm | 4 +-
gnu/packages/animation.scm | 4 +-
gnu/packages/astronomy.scm | 4 +-
gnu/packages/audio.scm | 71 +-
gnu/packages/bioconductor.scm | 69 +-
gnu/packages/bioinformatics.scm | 457 ++-
gnu/packages/bittorrent.scm | 2 +-
gnu/packages/boost.scm | 88 +-
gnu/packages/bootloaders.scm | 43 +-
gnu/packages/calendar.scm | 2 +-
gnu/packages/chemistry.scm | 6 +-
gnu/packages/chromium.scm | 8 +-
gnu/packages/ci.scm | 8 +-
gnu/packages/compression.scm | 99 +-
gnu/packages/connman.scm | 7 +-
gnu/packages/coq.scm | 140 +-
gnu/packages/cpp.scm | 2 +-
gnu/packages/cran.scm | 28 +
gnu/packages/crates-io.scm | 4340 ++++++++++++++++++--
gnu/packages/cryptsetup.scm | 2 +-
gnu/packages/cups.scm | 10 +-
gnu/packages/curl.scm | 5 +-
gnu/packages/cvassistant.scm | 2 +-
gnu/packages/cybersecurity.scm | 51 +-
gnu/packages/databases.scm | 38 +
gnu/packages/datastructures.scm | 4 +-
gnu/packages/dictionaries.scm | 6 -
gnu/packages/disk.scm | 4 +-
gnu/packages/display-managers.scm | 2 +-
gnu/packages/djvu.scm | 2 +-
gnu/packages/dns.scm | 15 +-
gnu/packages/docker.scm | 21 +-
gnu/packages/documentation.scm | 2 +-
gnu/packages/ebook.scm | 9 +-
gnu/packages/education.scm | 12 +-
gnu/packages/electronics.scm | 2 +-
gnu/packages/emacs-xyz.scm | 268 +-
gnu/packages/emulators.scm | 12 +-
gnu/packages/engineering.scm | 72 +-
gnu/packages/fcitx.scm | 2 +-
gnu/packages/fcitx5.scm | 42 +-
gnu/packages/file-systems.scm | 11 +-
gnu/packages/finance.scm | 18 +-
gnu/packages/firmware.scm | 3 +-
gnu/packages/flashing-tools.scm | 4 +-
gnu/packages/fonts.scm | 120 +-
gnu/packages/fpga.scm | 2 +-
gnu/packages/freedesktop.scm | 28 +-
gnu/packages/game-development.scm | 20 +-
gnu/packages/games.scm | 98 +-
gnu/packages/gcc.scm | 3 +-
gnu/packages/geo.scm | 6 +-
gnu/packages/gnome.scm | 26 +-
gnu/packages/gnupg.scm | 4 +-
gnu/packages/gnuzilla.scm | 9 +-
gnu/packages/gpodder.scm | 2 +-
gnu/packages/gps.scm | 6 +-
gnu/packages/graphics.scm | 10 +-
gnu/packages/gstreamer.scm | 2 +-
gnu/packages/guile-xyz.scm | 4 +-
gnu/packages/image-processing.scm | 6 +-
gnu/packages/image-viewers.scm | 6 +-
gnu/packages/image.scm | 6 +-
gnu/packages/inkscape.scm | 9 +-
gnu/packages/irc.scm | 28 +-
gnu/packages/irods.scm | 271 ++
gnu/packages/jami.scm | 93 +-
gnu/packages/java.scm | 86 +-
gnu/packages/julia-jll.scm | 2 +-
gnu/packages/julia-xyz.scm | 1789 +++++++-
gnu/packages/kde-frameworks.scm | 172 +-
gnu/packages/kde-internet.scm | 16 +-
gnu/packages/kde-multimedia.scm | 26 +-
gnu/packages/kde-pim.scm | 80 +-
gnu/packages/kde-plasma.scm | 12 +-
gnu/packages/kde-systemtools.scm | 14 +-
gnu/packages/kde-utils.scm | 22 +-
gnu/packages/kde.scm | 50 +-
gnu/packages/language.scm | 4 +-
gnu/packages/lego.scm | 2 +-
gnu/packages/linphone.scm | 2 +-
gnu/packages/linux.scm | 78 +-
gnu/packages/lisp-xyz.scm | 366 +-
gnu/packages/logo.scm | 2 +-
gnu/packages/lxqt.scm | 56 +-
gnu/packages/mail.scm | 173 +-
gnu/packages/maths.scm | 37 +-
gnu/packages/messaging.scm | 27 +-
gnu/packages/mpd.scm | 8 +-
gnu/packages/mpi.scm | 4 +-
gnu/packages/music.scm | 40 +-
gnu/packages/nano.scm | 4 +-
gnu/packages/ncurses.scm | 3 +-
gnu/packages/nettle.scm | 3 +-
gnu/packages/networking.scm | 299 +-
gnu/packages/node.scm | 9 +-
gnu/packages/ntp.scm | 16 +-
gnu/packages/ocaml.scm | 1099 +++--
gnu/packages/ocr.scm | 2 +-
gnu/packages/orange.scm | 2 +-
gnu/packages/package-management.scm | 12 +-
gnu/packages/pantheon.scm | 2 +-
gnu/packages/password-utils.scm | 182 +-
.../patches/ath9k-htc-firmware-gcc-compat.patch | 29 +
.../patches/bash-completion-directories.patch | 4 +-
.../patches/brightnessctl-elogind-support.patch | 13 +
gnu/packages/patches/bsdiff-CVE-2014-9862.patch | 15 -
gnu/packages/patches/connman-CVE-2021-33833.patch | 74 +
.../patches/curl-7.77-tls-priority-string.patch | 98 +
gnu/packages/patches/efivar-gcc-compat.patch | 177 +
.../patches/gcc-8-sort-libtool-find-output.patch | 399 ++
gnu/packages/patches/grub-cross-system-i686.patch | 96 -
gnu/packages/patches/grub-setup-root.patch | 99 +-
.../grub-verifiers-Blocklist-fallout-cleanup.patch | 41 -
gnu/packages/patches/hexchat-add-libera-chat.patch | 76 +
.../inkscape-1.1-fix-build-witch-gcc7.5.patch | 24 +
gnu/packages/patches/isc-dhcp-gcc-compat.patch | 72 +
gnu/packages/patches/jfsutils-gcc-compat.patch | 72 +
.../patches/libcacard-unknown-variable.patch | 50 +
.../patches/nettle-3.5-CVE-2021-3580-pt1.patch | 276 ++
.../patches/nettle-3.5-CVE-2021-3580-pt2.patch | 163 +
...ttle-3.5-check-_pkcs1_sec_decrypt-msg-len.patch | 78 +
gnu/packages/patches/polkit-CVE-2021-3560.patch | 21 +
gnu/packages/patches/qemu-build-info-manual.patch | 53 +-
gnu/packages/patches/qemu-meson-compat.patch | 27 +
gnu/packages/patches/qemu-sphinx-compat.patch | 18 +
.../rust-ndarray-0.13-remove-blas-src.patch | 28 +
.../patches/tor-fix-build-with-gcc-7.patch | 30 +
gnu/packages/patches/xpra-4.0.1-systemd-run.patch | 34 -
gnu/packages/patches/xpra-4.2-systemd-run.patch | 45 +
gnu/packages/pdf.scm | 10 +-
gnu/packages/photo.scm | 2 +-
gnu/packages/polkit.scm | 10 +-
gnu/packages/pretty-print.scm | 49 +-
gnu/packages/printers.scm | 4 +-
gnu/packages/profiling.scm | 2 +-
gnu/packages/pumpio.scm | 2 +-
gnu/packages/python-science.scm | 31 +
gnu/packages/python-web.scm | 3 -
gnu/packages/python-xyz.scm | 166 +-
gnu/packages/qt.scm | 279 +-
gnu/packages/radio.scm | 84 +-
gnu/packages/rails.scm | 4 +-
gnu/packages/rednotebook.scm | 5 +-
gnu/packages/robotics.scm | 4 +-
gnu/packages/rust-apps.scm | 240 +-
gnu/packages/scribus.scm | 2 +-
gnu/packages/serialization.scm | 53 +-
gnu/packages/shells.scm | 658 ++-
gnu/packages/speech.scm | 12 +-
gnu/packages/spice.scm | 16 +-
gnu/packages/suckless.scm | 62 +
gnu/packages/sync.scm | 6 +-
gnu/packages/syndication.scm | 23 +-
gnu/packages/synergy.scm | 2 +-
gnu/packages/telegram.scm | 2 +-
gnu/packages/telephony.scm | 4 +-
gnu/packages/terminals.scm | 4 +-
gnu/packages/tex.scm | 4 +-
gnu/packages/text-editors.scm | 42 +-
gnu/packages/time.scm | 3 -
gnu/packages/tls.scm | 35 +-
gnu/packages/tor.scm | 5 +-
gnu/packages/version-control.scm | 61 +-
gnu/packages/video.scm | 68 +-
gnu/packages/virtualization.scm | 41 +-
gnu/packages/vpn.scm | 131 +
gnu/packages/web-browsers.scm | 38 +-
gnu/packages/web.scm | 23 +-
gnu/packages/xdisorg.scm | 90 +-
gnu/packages/xfce.scm | 8 +-
gnu/packages/xml.scm | 9 +-
gnu/packages/xorg.scm | 36 +-
gnu/services/avahi.scm | 35 -
gnu/services/base.scm | 50 +-
gnu/services/ci.scm | 15 +-
gnu/services/desktop.scm | 42 -
gnu/services/mcron.scm | 17 +-
gnu/services/messaging.scm | 21 -
gnu/services/networking.scm | 39 -
gnu/services/xorg.scm | 73 -
guix/build/asdf-build-system.scm | 3 +-
guix/build/profiles.scm | 86 +-
guix/describe.scm | 6 +-
guix/git.scm | 8 +
guix/grafts.scm | 56 +-
guix/hg-download.scm | 35 +-
guix/import/launchpad.scm | 17 +-
guix/lint.scm | 25 +-
guix/profiles.scm | 66 +-
guix/scripts/environment.scm | 51 +-
guix/scripts/pack.scm | 2 +-
guix/scripts/package.scm | 5 +-
guix/scripts/substitute.scm | 3 +-
guix/self.scm | 4 +-
guix/store.scm | 210 +-
guix/swh.scm | 10 +-
guix/transformations.scm | 4 +-
tests/lint.scm | 14 +
tests/profiles.scm | 27 +
tests/store.scm | 36 -
217 files changed, 13317 insertions(+), 4173 deletions(-)
diff --cc gnu/local.mk
index c57e587,da86c66..a78d255
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -819,8 -818,8 +820,9 @@@ dist_patch_DATA =
%D%/packages/patches/aspell-default-dict-dir.patch \
%D%/packages/patches/ath9k-htc-firmware-binutils.patch \
%D%/packages/patches/ath9k-htc-firmware-gcc.patch \
+ %D%/packages/patches/ath9k-htc-firmware-gcc-compat.patch \
%D%/packages/patches/ath9k-htc-firmware-objcopy.patch \
+ %D%/packages/patches/atlas-gfortran-compat.patch \
%D%/packages/patches/audacity-build-with-system-portaudio.patch \
%D%/packages/patches/audacity-add-include.patch \
%D%/packages/patches/audiofile-fix-datatypes-in-tests.patch \
@@@ -853,8 -852,8 +855,9 @@@
%D%/packages/patches/bastet-change-source-of-unordered_set.patch \
%D%/packages/patches/bazaar-CVE-2017-14176.patch \
%D%/packages/patches/bc-fix-cross-compilation.patch \
+ %D%/packages/patches/bdb-5.3-atomics-on-gcc-9.patch \
%D%/packages/patches/bear-disable-preinstall-tests.patch \
+ %D%/packages/patches/brightnessctl-elogind-support.patch \
%D%/packages/patches/bsd-games-2.17-64bit.patch \
%D%/packages/patches/bsd-games-add-configure-config.patch \
%D%/packages/patches/bsd-games-add-wrapper.patch \
@@@ -930,7 -929,9 +934,8 @@@
%D%/packages/patches/crda-optional-gcrypt.patch \
%D%/packages/patches/clucene-contribs-lib.patch \
%D%/packages/patches/cube-nocheck.patch \
- %D%/packages/patches/curl-use-ssl-cert-env.patch \
+ %D%/packages/patches/curl-use-ssl-cert-env.patch \
- %D%/packages/patches/curl-7.76-use-ssl-cert-env.patch \
+ %D%/packages/patches/curl-7.77-tls-priority-string.patch \
%D%/packages/patches/cursynth-wave-rand.patch \
%D%/packages/patches/cvs-CVE-2017-12836.patch \
%D%/packages/patches/cyrus-sasl-ac-try-run-fix.patch \
@@@ -1214,7 -1245,9 +1220,8 @@@
%D%/packages/patches/imagemagick-ReadDCMImage-fix.patch \
%D%/packages/patches/imagemagick-ReadDCMPixels-fix.patch \
%D%/packages/patches/imagemagick-WriteTHUMBNAILImage-fix.patch \
- %D%/packages/patches/inetutils-hurd.patch \
%D%/packages/patches/inkscape-poppler-0.76.patch \
+ %D%/packages/patches/inkscape-1.1-fix-build-witch-gcc7.5.patch \
%D%/packages/patches/intel-xed-fix-nondeterminism.patch \
%D%/packages/patches/intltool-perl-compatibility.patch \
%D%/packages/patches/iputils-libcap-compat.patch \
@@@ -1244,7 -1278,9 +1252,8 @@@
%D%/packages/patches/java-xerces-build_dont_unzip.patch \
%D%/packages/patches/java-xerces-xjavac_taskdef.patch \
%D%/packages/patches/jfsutils-add-sysmacros.patch \
+ %D%/packages/patches/jfsutils-gcc-compat.patch \
%D%/packages/patches/jfsutils-include-systypes.patch \
- %D%/packages/patches/jsoncpp-fix-inverted-case.patch \
%D%/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch \
%D%/packages/patches/kdbusaddons-kinit-file-name.patch \
%D%/packages/patches/libblockdev-glib-compat.patch \
@@@ -1630,8 -1675,14 +1646,9 @@@
%D%/packages/patches/rnp-disable-ruby-rnp-tests.patch \
%D%/packages/patches/rnp-unbundle-googletest.patch \
%D%/packages/patches/ruby-sanitize-system-libxml.patch \
- %D%/packages/patches/rust-1.19-mrustc.patch \
- %D%/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch \
- %D%/packages/patches/rust-1.45-linker-locale.patch \
- %D%/packages/patches/rust-1.48-linker-locale.patch \
- %D%/packages/patches/rust-bootstrap-stage0-test.patch \
%D%/packages/patches/rust-coresimd-doctest.patch \
%D%/packages/patches/rust-ndarray-remove-blas-src-dep.patch \
+ %D%/packages/patches/rust-ndarray-0.13-remove-blas-src.patch \
%D%/packages/patches/rust-nettle-disable-vendor.patch \
%D%/packages/patches/rust-nettle-sys-disable-vendor.patch \
%D%/packages/patches/rust-reproducible-builds.patch \
diff --cc gnu/packages/aidc.scm
index 20ec8ff,3db631d..21fc195
--- a/gnu/packages/aidc.scm
+++ b/gnu/packages/aidc.scm
@@@ -191,27 -187,17 +191,27 @@@ C/C++ programs to use its capabilities
(assoc-ref %outputs "out")
"/etc"))))
(native-inputs
- `(("glib" ,glib "bin")
- ("pkg-config" ,pkg-config)))
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("gettext" ,gettext-minimal)
+ ("glib" ,glib "bin")
+ ("gobject-introspection" ,gobject-introspection)
+ ("libtool" ,libtool)
+ ("pkg-config" ,pkg-config)
+ ("python-wrapper" ,python-wrapper)))
(inputs
- `(("gobject-introspection" ,gobject-introspection)
- ("gtk+" ,gtk+)
+ `(("dbus" ,dbus)
("imagemagick" ,imagemagick)
("libjpeg" ,libjpeg-turbo)
+ ("perl" ,perl)
("python" ,python)
- ("qtbase" ,qtbase-5)
("qtx11extras" ,qtx11extras)
("v4l-utils" ,v4l-utils)))
+ (propagated-inputs
+ ;; These are in 'requires' field of .pc files.
+ `(("glib" ,glib)
+ ("gtk+" ,gtk+)
- ("qtbase" ,qtbase)))
++ ("qtbase" ,qtbase-5)))
(synopsis "Bar code reader")
(description
"ZBar can read barcodes from various sources, such as video streams,
diff --cc gnu/packages/boost.scm
index e9da56e,e05a3c3..14b6734
--- a/gnu/packages/boost.scm
+++ b/gnu/packages/boost.scm
@@@ -7,8 -7,8 +7,8 @@@
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
- ;;; Copyright © 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
+ ;;; Copyright © 2018, 2019, 2021 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2018 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2018, 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2019, 2020 Giacomo Leidi <goodoldpaul@autistici.org>
@@@ -193,6 -203,98 +194,91 @@@ across a broad spectrum of applications
(license (license:x11-style "https://www.boost.org/LICENSE_1_0.txt";
"Some components have other similar
licences."))))
+ ;; Sadly, this is needed for irods. It won't link with 1.69 or later.
+ (define-public boost-for-irods
+ (package
+ (inherit boost)
+ (name "boost-for-irods")
+ (version "1.68.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://sourceforge/boost/boost/" version "/boost_"
+ (string-map (lambda (x) (if (eq? x #\.) #\_ x)) version)
+ ".tar.bz2"))
+ (sha256
+ (base32
+ "1dyqsr9yb01y0nnjdq9b8q5s2kvhxbayk34832k5cpzn7jy30qbz"))))
+ (build-system gnu-build-system)
+ (properties `((hidden? . #true)))
+ (inputs
+ `(("icu4c" ,icu4c)
+ ("libcxx" ,libcxx+libcxxabi-6)
+ ("libcxxabi" ,libcxxabi-6)
+ ("zlib" ,zlib)))
+ (native-inputs
+ `(("clang" ,clang-6)
+ ("perl" ,perl)
+ ("tcsh" ,tcsh)))
+ (arguments
+ `(#:tests? #f
+ #:make-flags
+ (list "threading=multi" "link=shared"
+ "cxxflags=-stdlib=libc++"
+ "--without-python"
+
+ ;; Set the RUNPATH to $libdir so that the libs find each other.
+ (string-append "linkflags=-stdlib=libc++ -Wl,-rpath="
+ (assoc-ref %outputs "out") "/lib"))
+ #:phases
+ (modify-phases %standard-phases
+ (delete 'bootstrap)
+ (add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH
+ (lambda* (#:key native-inputs inputs #:allow-other-keys)
+ (let ((gcc (assoc-ref (or native-inputs inputs) "gcc")))
+ (setenv "CPLUS_INCLUDE_PATH"
+ (string-join
+ (cons (string-append (assoc-ref inputs "libcxx")
+ "/include/c++/v1")
+ ;; Hide GCC's C++ headers so that they do not
interfere with
+ ;; the Clang headers.
+ (delete (string-append gcc "/include/c++")
+ (string-split (getenv
"CPLUS_INCLUDE_PATH")
+ #\:)))
+ ":"))
+ (format #true
+ "environment variable `CPLUS_INCLUDE_PATH' changed to
~a~%"
+ (getenv "CPLUS_INCLUDE_PATH")))))
+ (replace 'configure
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((icu (assoc-ref inputs "icu4c"))
+ (out (assoc-ref outputs "out"))
+ (sh (string-append (assoc-ref inputs "bash") "/bin/sh")))
+ (substitute* '("libs/config/configure"
+ "libs/spirit/classic/phoenix/test/runtest.sh"
+ "tools/build/src/engine/execunix.c"
+ "tools/build/src/engine/Jambase"
+ "tools/build/src/engine/jambase.c")
+ (("/bin/sh") sh))
+
+ (setenv "SHELL" (which "sh"))
+ (setenv "CONFIG_SHELL" (which "sh"))
+
+ (invoke "./bootstrap.sh"
+ (string-append "--prefix=" out)
+ ;; Auto-detection looks for ICU only in traditional
+ ;; install locations.
+ (string-append "--with-icu=" icu)
+ "--with-toolset=clang"))))
+ (replace 'build
+ (lambda* (#:key make-flags #:allow-other-keys)
+ (apply invoke "./b2"
+ (format #f "-j~a" (parallel-job-count))
+ make-flags)))
+ (replace 'install
+ (lambda* (#:key make-flags #:allow-other-keys)
+ (apply invoke "./b2" "install" make-flags))))))))
+
-(define-public boost-with-python2
- (package/inherit boost
- (name "boost-python2")
- (native-inputs
- `(("python" ,python-2)
- ,@(alist-delete "python" (package-native-inputs boost))))))
-
(define-public boost-with-python3
(deprecated-package "boost-with-python3" boost))
diff --cc gnu/packages/curl.scm
index e389d53,d368c41..60eeb8f
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@@ -60,8 -61,8 +60,9 @@@
version ".tar.xz"))
(sha256
(base32
- "12w7gskrglg6qrmp822j37fmbr0icrcxv7rib1fy5xiw80n5z7cr"))
- (patches (search-patches "curl-use-ssl-cert-env.patch"))))
+ "0jsrc97vbghvljic997r9nypc9qqddcil2lzvv032br8ahn5hr0g"))
- (patches (search-patches "curl-use-ssl-cert-env.patch"))))
++ (patches (search-patches "curl-use-ssl-cert-env.patch"
++
"curl-7.77-tls-priority-string.patch"))))
(build-system gnu-build-system)
(outputs '("out"
"doc")) ;1.2 MiB of man3 pages
diff --cc gnu/packages/nettle.scm
index 2e94fd3,7f85f54..f9f3446
--- a/gnu/packages/nettle.scm
+++ b/gnu/packages/nettle.scm
@@@ -1,7 -1,7 +1,7 @@@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
- ;;; Copyright © 2016 Mark H Weaver <mhw@netris.org>
+ ;;; Copyright © 2016, 2021 Mark H Weaver <mhw@netris.org>
-;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2017, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
diff --cc gnu/packages/networking.scm
index bac692f,da4ede0..b8d5cf5
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@@ -3529,87 -3401,90 +3401,90 @@@ and targeted primarily for asynchronou
(license license:bsd-3)))
(define-public opendht
- (package
- (name "opendht")
- (version "2.2.0rc7") ;jami requires >= 2.2.0
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/savoirfairelinux/opendht";)
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0wkynjzwzl5q46hy1yb9npi5hvknnj17rjkax5v3acqjmd0y48h9"))))
- ;; Since 2.0, the gnu-build-system does not seem to work anymore,
upstream bug?
- (outputs '("out" "tools" "debug"))
- (build-system cmake-build-system)
- (inputs
- `(("argon2" ,argon2)
- ("nettle" ,nettle)
- ("readline" ,readline)
- ("jsoncpp" ,jsoncpp)
- ("openssl" ,openssl) ;required for the DHT proxy
- ("fmt" ,fmt)))
- (propagated-inputs
- `(("gnutls" ,gnutls) ;included in opendht/crypto.h
- ("msgpack" ,msgpack) ;included in several installed headers
- ("restinio" ,restinio))) ;included in opendht/http.h
- (native-inputs
- `(("autoconf" ,autoconf)
- ("automake" ,automake)
- ("pkg-config" ,pkg-config)
- ("python" ,python)
- ("python-cython" ,python-cython)
- ("libtool" ,libtool)
- ("cppunit" ,cppunit)))
- (arguments
- `(#:imported-modules ((guix build python-build-system) ;for site-packages
- ,@%cmake-build-system-modules)
- #:modules (((guix build python-build-system) #:prefix python:)
- (guix build cmake-build-system)
- (guix build utils))
- #:tests? #f ; Tests require network connection.
- #:configure-flags
- '( ;;"-DOPENDHT_TESTS=on"
- "-DOPENDHT_STATIC=off"
- "-DOPENDHT_TOOLS=on"
- "-DOPENDHT_PYTHON=on"
- "-DOPENDHT_PROXY_SERVER=on"
- "-DOPENDHT_PUSH_NOTIFICATIONS=on"
- "-DOPENDHT_PROXY_SERVER_IDENTITY=on"
- "-DOPENDHT_PROXY_CLIENT=on")
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-python-installation-prefix
- ;; Specify the installation prefix for the compiled Python module
- ;; that would otherwise attempt to installs itself to Python's own
- ;; site-packages directory.
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (substitute* "python/CMakeLists.txt"
- (("--root=\\\\\\$ENV\\{DESTDIR\\}")
- (string-append "--root=/ --single-version-externally-managed "
- "--prefix=${CMAKE_INSTALL_PREFIX}")))))
- (add-after 'unpack 'specify-runpath-for-python-module
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (substitute* "python/setup.py.in"
- (("extra_link_args=\\[(.*)\\]" _ args)
- (string-append "extra_link_args=[" args
- ", '-Wl,-rpath=" out "/lib']"))))))
- (add-after 'install 'move-and-wrap-tools
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out"))
- (tools (assoc-ref outputs "tools"))
- (site-packages (python:site-packages inputs outputs)))
- (mkdir tools)
- (rename-file (string-append out "/bin")
- (string-append tools "/bin"))
- (wrap-program (string-append tools "/bin/dhtcluster")
- `("PYTHONPATH" prefix (,site-packages)))))))))
- (home-page "https://github.com/savoirfairelinux/opendht/";)
- (synopsis "Lightweight Distributed Hash Table (DHT) library")
- (description "OpenDHT provides an easy to use distributed in-memory data
+ ;; Jami requires unreleased features of OpenDHT.
+ (let ((commit "c8a0b443f3117e2fa1343d2cb3c091f502b1a24e")
+ (revision "1"))
+ (package
+ (name "opendht")
+ (version (git-version "2.2.0rc7" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/savoirfairelinux/opendht";)
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "062irb9yii66n2fzbpsjf7v2v53zzvakr1wjmi4l1jaz33fwx5by"))))
+ ;; Since 2.0, the gnu-build-system does not seem to work anymore,
upstream bug?
+ (outputs '("out" "tools" "debug"))
+ (build-system cmake-build-system)
+ (inputs
+ `(("argon2" ,argon2)
- ("nettle" ,nettle-3.7)
++ ("nettle" ,nettle)
+ ("readline" ,readline)
+ ("jsoncpp" ,jsoncpp)
+ ("openssl" ,openssl) ;required for the DHT proxy
+ ("fmt" ,fmt)))
+ (propagated-inputs
+ `(("gnutls" ,gnutls) ;included in opendht/crypto.h
+ ("msgpack" ,msgpack) ;included in several installed
headers
+ ("restinio" ,restinio))) ;included in opendht/http.h
+ (native-inputs
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("pkg-config" ,pkg-config)
+ ("python" ,python)
+ ("python-cython" ,python-cython)
+ ("libtool" ,libtool)
+ ("cppunit" ,cppunit)))
+ (arguments
+ `(#:imported-modules ((guix build python-build-system) ;for
site-packages
+ ,@%cmake-build-system-modules)
+ #:modules (((guix build python-build-system) #:prefix python:)
+ (guix build cmake-build-system)
+ (guix build utils))
+ #:tests? #f ; Tests require network connection.
+ #:configure-flags
+ '( ;;"-DOPENDHT_TESTS=on"
+ "-DOPENDHT_STATIC=off"
+ "-DOPENDHT_TOOLS=on"
+ "-DOPENDHT_PYTHON=on"
+ "-DOPENDHT_PROXY_SERVER=on"
+ "-DOPENDHT_PUSH_NOTIFICATIONS=on"
+ "-DOPENDHT_PROXY_SERVER_IDENTITY=on"
+ "-DOPENDHT_PROXY_CLIENT=on")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-python-installation-prefix
+ ;; Specify the installation prefix for the compiled Python module
+ ;; that would otherwise attempt to installs itself to Python's
own
+ ;; site-packages directory.
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (substitute* "python/CMakeLists.txt"
+ (("--root=\\\\\\$ENV\\{DESTDIR\\}")
+ (string-append "--root=/
--single-version-externally-managed "
+ "--prefix=${CMAKE_INSTALL_PREFIX}")))))
+ (add-after 'unpack 'specify-runpath-for-python-module
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (substitute* "python/setup.py.in"
+ (("extra_link_args=\\[(.*)\\]" _ args)
+ (string-append "extra_link_args=[" args
+ ", '-Wl,-rpath=" out "/lib']"))))))
+ (add-after 'install 'move-and-wrap-tools
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out"))
+ (tools (assoc-ref outputs "tools"))
+ (site-packages (python:site-packages inputs outputs)))
+ (mkdir tools)
+ (rename-file (string-append out "/bin")
+ (string-append tools "/bin"))
+ (wrap-program (string-append tools "/bin/dhtcluster")
+ `("PYTHONPATH" prefix (,site-packages)))))))))
+ (home-page "https://github.com/savoirfairelinux/opendht/";)
+ (synopsis "Lightweight Distributed Hash Table (DHT) library")
+ (description "OpenDHT provides an easy to use distributed in-memory data
store. Every node in the network can read and write values to the store.
Values are distributed over the network, with redundancy. It includes the
following features:
diff --cc gnu/packages/python-xyz.scm
index 56c2732,bb263a6..bbc5159
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@@ -16865,10 -17000,25 +16879,11 @@@ and bit flag values."
"1yzmwi5d197p0qhl7rl4xi9q1w8mk9i3zn6hrl22knbcrb1slspg"))))
(build-system python-build-system)
(arguments
- `(#:modules ((guix build utils)
- (guix build python-build-system)
- (ice-9 ftw)
- (srfi srfi-1)
- (srfi srfi-26))
- #:phases
- (modify-phases %standard-phases
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- (let ((cwd (getcwd)))
- (setenv "PYTHONPATH"
- (string-append
- cwd "/build/"
- (find (cut string-prefix? "lib" <>)
- (scandir (string-append cwd "/build")))
- ":"
- (getenv "PYTHONPATH")))
- (invoke "python" "-m" "pytest"))))))))
+ `(#:phases (modify-phases %standard-phases
+ (replace 'check
- (lambda _
- (invoke "pytest"))))))
++ (lambda* (#:key tests? #:allow-other-keys)
++ (when tests?
++ (invoke "pytest")))))))
(native-inputs
`(("python-coverage" ,python-coverage)
("python-hypothesis" ,python-hypothesis)
diff --cc gnu/packages/shells.scm
index 5c90d8b,f080d71..44a77e1
--- a/gnu/packages/shells.scm
+++ b/gnu/packages/shells.scm
@@@ -965,10 -954,11 +965,10 @@@ files and text."
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "1dpbc6m0pxizkh4r02nw1i1fx9v43llylqnd28naqkklwc15pb2w"))))
+ (base32 "1wj054rzv88ys4ask4zp7crrw0dxrck8svlj3i16qqd8x5dnyhqs"))))
(build-system cargo-build-system)
(arguments
- `(#:rust ,rust-1.47
- #:tests? #false ;missing files
+ `(#:tests? #false ;missing files
#:features '("extra")
#:cargo-inputs
(("rust-clap" ,rust-clap-2)
diff --cc gnu/packages/spice.scm
index a6a87ca,7fce241..7667046
--- a/gnu/packages/spice.scm
+++ b/gnu/packages/spice.scm
@@@ -342,14 -334,17 +342,15 @@@ resolution scaling on graphical consol
(method url-fetch)
(uri (string-append
"https://gitlab.freedesktop.org/spice/libcacard/uploads/";
- "56cb2499198e78e560a1d4c716cd8ab1"
+ "9d8f24b131bcbbd7846727ea92952cb5"
"/libcacard-" version ".tar.xz"))
+ (patches (search-patches "libcacard-unknown-variable.patch"))
(sha256
(base32
- "0vyvkk4b6xjwq1ccggql13c1x7g4y90clpkqw28257azgn2a1c8n"))))
- (build-system gnu-build-system)
+ "0azj3rqr2smg0lai24xrn3zr628xmjfrzcggay877zrr64ybj1c0"))))
+ (build-system meson-build-system)
(arguments
- '(#:tests? #f ; TODO Tests require gnutls built with
- ; p11-kit
- #:phases
+ '(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-tests
(lambda* (#:key inputs #:allow-other-keys)
diff --cc gnu/packages/tls.scm
index 31ffdb2,28fe820..297e16d
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@@ -15,8 -15,8 +15,9 @@@
;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Solene Rapenne <solene@perso.pw>
+ ;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
;;;
;;; This file is part of GNU Guix.
;;;