[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: |
Mon, 30 Mar 2020 06:18:57 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit ae0badf5bb791428423a98d4e4e2b8d297a5d4be
Merge: ee401ed 927f365
Author: Marius Bakke <address@hidden>
AuthorDate: Mon Mar 30 12:17:33 2020 +0200
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/admin.scm
gnu/packages/commencement.scm
gnu/packages/guile.scm
gnu/packages/linux.scm
gnu/packages/package-management.scm
gnu/packages/pulseaudio.scm
gnu/packages/web.scm
.mailmap | 2 +-
build-aux/git-authenticate.scm | 6 +-
doc/guix.texi | 6 +-
gnu/build/vm.scm | 11 +-
gnu/local.mk | 4 +-
gnu/packages/admin.scm | 147 +++++-----
gnu/packages/algebra.scm | 43 +--
gnu/packages/assembly.scm | 4 +-
gnu/packages/bioconductor.scm | 4 +-
gnu/packages/cpp.scm | 6 +-
gnu/packages/cran.scm | 38 ++-
gnu/packages/crypto.scm | 10 +-
gnu/packages/cybersecurity.scm | 46 +++
gnu/packages/dictionaries.scm | 4 +-
gnu/packages/education.scm | 4 +-
gnu/packages/emacs-xyz.scm | 126 ++++----
gnu/packages/emacs.scm | 5 +-
gnu/packages/emulators.scm | 3 +-
gnu/packages/engineering.scm | 3 -
gnu/packages/finance.scm | 3 -
gnu/packages/firmware.scm | 2 +-
gnu/packages/fonts.scm | 7 +-
gnu/packages/fpga.scm | 7 +-
gnu/packages/games.scm | 42 ---
gnu/packages/gnome-xyz.scm | 17 +-
gnu/packages/gnome.scm | 69 ++++-
gnu/packages/gnupg.scm | 8 +-
gnu/packages/gnuzilla.scm | 5 -
gnu/packages/graph.scm | 7 +-
gnu/packages/guile-xyz.scm | 50 +++-
gnu/packages/haskell-apps.scm | 40 +++
gnu/packages/haskell-web.scm | 41 ++-
gnu/packages/haskell-xyz.scm | 323 ++++++++++++++++-----
gnu/packages/image.scm | 6 +-
gnu/packages/java.scm | 201 +++++++------
gnu/packages/kde-pim.scm | 2 +-
gnu/packages/lean.scm | 2 +-
gnu/packages/libreoffice.scm | 4 +-
gnu/packages/linux.scm | 21 +-
gnu/packages/lisp-xyz.scm | 31 +-
gnu/packages/machine-learning.scm | 19 +-
gnu/packages/mail.scm | 13 +-
gnu/packages/man.scm | 14 +-
gnu/packages/maths.scm | 11 +-
gnu/packages/mpd.scm | 4 +-
gnu/packages/mtools.scm | 6 +-
gnu/packages/multiprecision.scm | 46 ++-
gnu/packages/music.scm | 106 ++++++-
gnu/packages/networking.scm | 24 +-
gnu/packages/ocr.scm | 16 +-
gnu/packages/package-management.scm | 6 +-
gnu/packages/patches/gnupg-default-pinentry.patch | 62 +++-
.../patches/hash-extender-test-suite.patch | 13 -
gnu/packages/pdf.scm | 74 ++++-
gnu/packages/php.scm | 3 -
gnu/packages/plotutils.scm | 4 +-
gnu/packages/pulseaudio.scm | 2 +-
gnu/packages/python-xyz.scm | 110 +++++--
gnu/packages/qt.scm | 6 +-
gnu/packages/rust.scm | 121 ++++++--
gnu/packages/speech.scm | 67 +++++
gnu/packages/statistics.scm | 8 +-
gnu/packages/syndication.scm | 8 +-
gnu/packages/terminals.scm | 5 +-
gnu/packages/version-control.scm | 10 +-
gnu/packages/video.scm | 13 +-
gnu/packages/virtualization.scm | 3 -
gnu/packages/vulkan.scm | 3 -
gnu/packages/web.scm | 43 ++-
gnu/packages/wm.scm | 5 +-
gnu/packages/xdisorg.scm | 10 +-
gnu/packages/xfce.scm | 4 +-
gnu/services/nfs.scm | 25 +-
gnu/services/shepherd.scm | 6 +-
gnu/services/xorg.scm | 1 +
gnu/system/vm.scm | 15 +-
guix/build-system/gnu.scm | 4 +-
guix/gexp.scm | 32 +-
guix/grafts.scm | 20 +-
guix/packages.scm | 76 ++---
guix/profiles.scm | 57 ++--
guix/scripts/archive.scm | 2 +-
guix/scripts/build.scm | 8 +-
guix/scripts/copy.scm | 2 +-
guix/scripts/deploy.scm | 46 +--
guix/scripts/environment.scm | 2 +-
guix/scripts/pack.scm | 2 +-
guix/scripts/package.scm | 3 +-
guix/scripts/pull.scm | 2 +-
guix/scripts/system.scm | 2 +-
guix/store.scm | 64 ++++
tests/store.scm | 36 +++
92 files changed, 1787 insertions(+), 817 deletions(-)
diff --cc gnu/packages/admin.scm
index ae1ed94,2f661f5..4e1f9af
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@@ -29,9 -29,9 +29,10 @@@
;;; Copyright © 2019 Hartmut Goebel <address@hidden>
;;; Copyright © 2019 Alex Griffin <address@hidden>
;;; Copyright © 2019 Guillaume Le Vaillant <address@hidden>
-;;; Copyright © 2019 Mathieu Othacehe <address@hidden>
+;;; Copyright © 2019, 2020 Mathieu Othacehe <address@hidden>
;;; Copyright © 2020 Oleg Pykhalov <address@hidden>
+;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <address@hidden>
+ ;;; Copyright © 2020 Michael Rohleder <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@@ -71,17 -76,35 +77,36 @@@
#:use-module (gnu packages cryptsetup)
#:use-module (gnu packages cyrus-sasl)
#:use-module (gnu packages dns)
+ #:use-module (gnu packages elf)
#:use-module (gnu packages file)
- #:use-module (gnu packages ncurses)
- #:use-module (gnu packages readline)
+ #:use-module (gnu packages flex)
+ #:use-module (gnu packages gettext)
+ #:use-module (gnu packages gl)
+ #:use-module (gnu packages glib)
+ #:use-module (gnu packages gnome)
+ #:use-module (gnu packages gnupg)
+ #:use-module (gnu packages golang)
+ #:use-module (gnu packages groff)
+ #:use-module (gnu packages gtk)
+ #:use-module (gnu packages guile)
+ #:use-module (gnu packages hurd)
+ #:use-module (gnu packages image)
+ #:use-module (gnu packages imagemagick)
+ #:use-module (gnu packages inkscape)
+ #:use-module (gnu packages kerberos)
#:use-module (gnu packages libbsd)
+ #:use-module (gnu packages libftdi)
+ #:use-module (gnu packages libunwind)
+ #:use-module (gnu packages libusb)
#:use-module (gnu packages linux)
#:use-module (gnu packages lua)
- #:use-module (gnu packages guile)
- #:use-module (gnu packages gettext)
- #:use-module (gnu packages imagemagick)
- #:use-module (gnu packages inkscape)
+ #:use-module (gnu packages man)
+ #:use-module (gnu packages mcrypt)
+ #:use-module (gnu packages mpi)
+ #:use-module (gnu packages ncurses)
+ #:use-module (gnu packages openldap)
+ #:use-module (gnu packages patchutils)
+ #:use-module (gnu packages pciutils)
#:use-module (gnu packages pcre)
#:use-module (gnu packages perl)
#:use-module (gnu packages perl-check)
diff --cc gnu/packages/algebra.scm
index e2e26c8,081666c..4ff766e
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@@ -8,8 -8,8 +8,9 @@@
;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <address@hidden>
;;; Copyright © 2017 Marius Bakke <address@hidden>
;;; Copyright © 2017, 2019 Eric Bavier <address@hidden>
+;;; Copyright © 2019 Mathieu Othacehe <address@hidden>
;;; Copyright © 2020 Björn Höfling <address@hidden>
+ ;;; Copyright © 2020 Jakub Kądziołka <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/firmware.scm
index 2dff39f,a7a08f3..51eae2a
--- a/gnu/packages/firmware.scm
+++ b/gnu/packages/firmware.scm
@@@ -85,14 -82,11 +85,14 @@@
;; The firmware is cross-compiled using a "bare bones" compiler (no libc.)
;; Use our own tool chain for that.
- (native-inputs `(("cross-gcc" ,(cross-gcc "xtensa-elf"))
- ("cross-binutils" ,(cross-binutils "xtensa-elf"))
+ (native-inputs `(("cross-gcc" ,(cross-gcc
+ "xtensa-elf"
+ #:xbinutils (cross-binutils "xtensa-elf"
+
binutils-2.33)))
+ ("cross-binutils" ,(cross-binutils "xtensa-elf"
binutils-2.33))
("cmake" ,cmake-minimal)
("perl" ,perl)))
- (home-page "http://wireless.kernel.org/en/users/Drivers/ath9k_htc";)
+ (home-page "https://wireless.wiki.kernel.org/en/users/Drivers/ath9k_htc";)
(synopsis "Firmware for the Atheros AR7010 and AR9271 USB 802.11n NICs")
(description
"This is the firmware for the Qualcomm Atheros AR7010 and AR9271 USB
diff --cc gnu/packages/guile-xyz.scm
index b181189,62ebb82..f0f976c
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@@ -2229,19 -2186,12 +2230,15 @@@ Guile, so its configuration can be writ
format is also supported.")
(license license:gpl3+)))
-(define-public guile3.0-mcron
+(define-public guile2.2-mcron
(package
(inherit mcron)
- (name "guile3.0-mcron")
- (inputs `(("guile" ,guile-3.0)))))
+ (name "guile2.2-mcron")
+ (inputs `(("guile" ,guile-2.2)))))
+
+(define-public guile3.0-mcron
+ (deprecated-package "guile3.0-mcron" mcron))
- (define-public mcron2
- ;; This was mthl's mcron development branch, and it became mcron 1.1.
- (deprecated-package "mcron2" mcron))
-
(define-public guile-picture-language
(let ((commit "91d10c96708d732145006dd2802acc4de08b632e")
(revision "1"))
diff --cc gnu/packages/java.scm
index c68b0d3,9c0974a..1d910e1
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@@ -9,9 -9,8 +9,9 @@@
;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <address@hidden>
;;; Copyright © 2018, 2019 Gábor Boskovits <address@hidden>
;;; Copyright © 2018 Chris Marusich <address@hidden>
- ;;; Copyright © 2018, 2019 Efraim Flashner <address@hidden>
+ ;;; Copyright © 2018, 2019, 2020 Efraim Flashner <address@hidden>
;;; Copyright © 2019, 2020 Björn Höfling <address@hidden>
+;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/linux.scm
index 253f41e,701df76..b568030
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@@ -2953,9 -2899,26 +2953,6 @@@ device nodes from /dev/, handles hotplu
time.")
(license license:gpl2+)))
- (define-public eudev-with-hwdb
- (deprecated-package "eudev-with-hwdb" eudev))
-;; 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 lvm2
(package
(name "lvm2")
diff --cc gnu/packages/package-management.scm
index 1c45039,07a44e9..a27c769
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@@ -413,37 -401,20 +413,35 @@@ the Nix package manager."
(invoke "make" "install-binPROGRAMS")))
(delete 'wrap-program)))))))
- (define-public guile2.0-guix
- (deprecated-package "guile2.0-guix" guix))
-(define-public guile3.0-guix
+
+(define-public guile2.2-guix
(package
(inherit guix)
- (name "guile3.0-guix")
+ (name "guile2.2-guix")
+ (native-inputs
+ `(("guile" ,guile-2.2)
+ ("gnutls" ,guile2.2-gnutls)
+ ("guile-gcrypt" ,guile2.2-gcrypt)
+ ("guile-json" ,guile2.2-json)
+ ("guile-sqlite3" ,guile2.2-sqlite3)
+ ("guile-ssh" ,guile2.2-ssh)
+ ("guile-git" ,guile2.2-git)
+ ,@(fold alist-delete (package-native-inputs guix)
+ '("guile" "gnutls" "guile-gcrypt" "guile-json"
+ "guile-sqlite3" "guile-ssh" "guile-git"))))
(inputs
- `(("guile" ,guile-3.0)
+ `(("guile" ,guile-2.2)
,@(alist-delete "guile" (package-inputs guix))))
(propagated-inputs
- `(("gnutls" ,guile3.0-gnutls)
- ("guile-gcrypt" ,guile3.0-gcrypt)
- ("guile-json" ,guile3.0-json)
- ("guile-sqlite3" ,guile3.0-sqlite3)
- ("guile-ssh" ,guile3.0-ssh)
- ("guile-git" ,guile3.0-git)))))
+ `(("gnutls" ,gnutls)
+ ("guile-gcrypt" ,guile2.2-gcrypt)
+ ("guile-json" ,guile2.2-json)
+ ("guile-sqlite3" ,guile2.2-sqlite3)
+ ("guile-ssh" ,guile2.2-ssh)
+ ("guile-git" ,guile2.2-git)))))
+
+(define-public guile3.0-guix
+ (deprecated-package "guile3.0-guix" guix))
(define-public guix-minimal
;; A version of Guix which is built with the minimal set of dependencies, as
diff --cc gnu/packages/pulseaudio.scm
index b209fd3,c2853dc..4ad32d6
--- a/gnu/packages/pulseaudio.scm
+++ b/gnu/packages/pulseaudio.scm
@@@ -9,8 -9,7 +9,8 @@@
;;; Copyright © 2017 Tobias Geerinckx-Rice <address@hidden>
;;; Copyright © 2018 Pierre Langlois <address@hidden>
;;; Copyright © 2019 Alex Griffin <address@hidden>
+;;; Copyright © 2019 Mathieu Othacehe <address@hidden>
- ;;; Copyright © 2020 Amin Bandali <address@hidden>
+ ;;; Copyright © 2020 Amin Bandali <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/web.scm
index 781f76a,a553dc2..2b1585c
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@@ -41,7 -39,7 +41,8 @@@
;;; Copyright © 2020 Timotej Lazar <address@hidden>
;;; Copyright © 2020 Alexandros Theodotou <address@hidden>
;;; Copyright © 2020 Pierre Neidhardt <address@hidden>
+;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <address@hidden>
+ ;;; Copyright © 2018, 2019, 2020 Björn Höfling <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc guix/store.scm
index 5dea264,ca8c0e5..12f66d0
--- a/guix/store.scm
+++ b/guix/store.scm
@@@ -103,9 -103,10 +103,11 @@@
add-text-to-store
add-to-store
add-file-tree-to-store
+ file-mapping->tree
binary-file
with-build-handler
+ map/accumulate-builds
+ mapm/accumulate-builds
build-things
build
query-failed-paths