[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: |
Thu, 23 Apr 2020 08:24:19 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 030f6f489fe9544f35ebaf95135acd1dd67ce63f
Merge: 95c1492 938df0d
Author: Marius Bakke <address@hidden>
AuthorDate: Thu Apr 23 13:33:09 2020 +0200
Merge branch 'master' into core-updates
Conflicts:
etc/news.scm
gnu/local.mk
gnu/packages/bootloaders.scm
gnu/packages/linphone.scm
gnu/packages/linux.scm
gnu/packages/tls.scm
gnu/system.scm
doc/build.scm | 2 +-
doc/guix-cookbook.texi | 51 +
doc/guix.texi | 121 ++-
etc/news.scm | 19 +
gnu/bootloader/u-boot.scm | 11 +
gnu/local.mk | 15 +-
gnu/packages/admin.scm | 14 +-
gnu/packages/algebra.scm | 4 +-
gnu/packages/bootloaders.scm | 34 +-
gnu/packages/chromium.scm | 8 +-
gnu/packages/compression.scm | 13 +
gnu/packages/cran.scm | 33 +-
gnu/packages/databases.scm | 17 +-
gnu/packages/disk.scm | 48 +
gnu/packages/emacs-xyz.scm | 94 +-
gnu/packages/fonts.scm | 84 +-
gnu/packages/genealogy.scm | 2 +-
gnu/packages/gnome.scm | 133 ++-
gnu/packages/gps.scm | 6 +-
gnu/packages/gtk.scm | 28 +-
gnu/packages/guile-xyz.scm | 68 +-
gnu/packages/java.scm | 57 +-
gnu/packages/linphone.scm | 11 +
gnu/packages/linux.scm | 51 +-
gnu/packages/mail.scm | 74 +-
gnu/packages/maths.scm | 69 +-
gnu/packages/networking.scm | 52 +
gnu/packages/parallel.scm | 6 +-
.../patches/dune-istl-2.7-fix-non-mpi-tests.patch | 82 ++
.../patches/emacs-dired-toggle-sudo-emacs-26.patch | 49 -
.../libqalculate-3.8.0-libcurl-ssl-fix.patch | 53 +
.../patches/u-boot-DT-for-Pinebook-Pro.patch | 1132 ++++++++++++++++++++
.../u-boot-add-boe-nv140fhmn49-display.patch | 29 +
.../patches/u-boot-gpio-keys-binding-cons.patch | 37 +
.../patches/u-boot-leds-common-binding-con.patch | 115 ++
.../u-boot-support-Pinebook-Pro-laptop.patch | 367 +++++++
.../patches/u-boot-video-rockchip-fix-build.patch | 48 +
gnu/packages/php.scm | 6 +-
gnu/packages/python-xyz.scm | 38 +
gnu/packages/qt.scm | 2 +-
gnu/packages/rdf.scm | 47 +-
gnu/packages/telephony.scm | 10 +-
gnu/packages/tls.scm | 19 +
gnu/packages/version-control.scm | 10 +-
gnu/packages/video.scm | 33 +-
gnu/packages/visidata.scm | 64 ++
gnu/packages/web-browsers.scm | 62 ++
gnu/packages/wget.scm | 3 +-
gnu/packages/xdisorg.scm | 2 +-
gnu/packages/xfce.scm | 53 +-
gnu/services.scm | 17 +
gnu/services/base.scm | 24 +-
gnu/services/desktop.scm | 4 +-
gnu/services/mail.scm | 7 +-
gnu/services/networking.scm | 119 ++
gnu/services/shepherd.scm | 3 +-
gnu/services/spice.scm | 2 +-
gnu/system.scm | 158 +--
gnu/system/install.scm | 4 +-
gnu/tests/linux-modules.scm | 11 +-
gnu/tests/ssh.scm | 5 +-
gnu/tests/web.scm | 5 +-
guix/build/syscalls.scm | 3 +-
guix/gexp.scm | 12 +-
guix/git-download.scm | 10 +
guix/packages.scm | 6 +-
guix/profiles.scm | 3 +-
guix/self.scm | 110 +-
tests/print.scm | 16 +-
69 files changed, 3400 insertions(+), 505 deletions(-)
diff --cc etc/news.scm
index b498ce1,cfe2ee7..0bdde6a
--- a/etc/news.scm
+++ b/etc/news.scm
@@@ -11,15 -10,25 +11,34 @@@
(channel-news
(version 0)
+ (entry (commit "e1e6491226347d9fb93ff484d78cef98848a510a")
+ (title (en "Guix Cookbook now available as Info"))
+ ;; TRANSLATORS: Adjust the URL and the 'info' command to refer to the
+ ;; translated manual if it's available.
+ (body (en "The new Guix Cookbook is now fetched by @command{guix pull}
+ and thus readily available in the Info format. It aims to provide tutorials
+ and detailed examples covering a variety of use cases. You can access it by
+ typing:
+
+ @example
+ info guix-cookbook
+ @end example
+
+ The Cookbook is currently available in English and German. You can also find
+ it @uref{https://guix.gnu.org/cookbook/en/, on-line}.
+
+ Your contributions are welcome: @uref{https://guix.gnu.org/contact/, get in
+ touch with the developers} to share your recipes!")))
+
+ (entry (commit "2ca7af43fe17d9acf082dce85d137a27a8ac4887")
+ (title (en "Further reduced binary seed bootstrap"))
+ (body
+ (en "The package graph on x86_64 and i686 is now rooted in a further
+@dfn{reduced set of binary seeds}. The initial set of binaries from which
+packages are built now weighs in at approximately 60 MiB, a quarter of what it
+used to be. Run @code{info \"(guix) Bootstrapping\"} to learn more, or watch
+the talk at @uref{https://fosdem.org/2020/schedule/event/gnumes/}.";)))
+
(entry (commit "0468455e7d279c89ea3ad1b51935efb2b785ec47")
(title (en "Rottlog service added to @code{%base-services}")
(de "Rottlog-Dienst ist nun Teil der @code{%base-services}"))
diff --cc gnu/local.mk
index 749e93e,a6e1ed2..535c23d
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -851,9 -845,9 +855,10 @@@ dist_patch_DATA =
%D%/packages/patches/docker-fix-tests.patch \
%D%/packages/patches/dovecot-trees-support-dovecot-2.3.patch \
%D%/packages/patches/doxygen-test.patch \
+ %D%/packages/patches/doxygen-1.8.17-runtests.patch \
%D%/packages/patches/dstat-fix-crash-when-specifying-delay.patch \
%D%/packages/patches/dstat-skip-devices-without-io.patch \
+ %D%/packages/patches/dune-istl-2.7-fix-non-mpi-tests.patch \
%D%/packages/patches/dvd+rw-tools-add-include.patch \
%D%/packages/patches/eigen-stabilise-sparseqr-test.patch \
%D%/packages/patches/einstein-build.patch \
@@@ -1162,7 -1148,7 +1166,8 @@@
%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/libqalculate-3.8.0-libcurl-ssl-fix.patch \
+ %D%/packages/patches/libreoffice-poppler-compat.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 \
diff --cc gnu/packages/admin.scm
index 7105a09,619a419..567c7cf
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@@ -206,10 -204,9 +206,10 @@@ and provides a \"top-like\" mode (monit
(method url-fetch)
(uri (string-append "mirror://gnu/shepherd/shepherd-"
version ".tar.gz"))
+ (patches (search-patches "shepherd-hurd.patch"))
(sha256
(base32
- "07j3vd0y8zab2nwbrwj0ahrfif1ldm5sjssn7m3dw4s307fsrfzx"))))
+ "02lbc8z5gd8v8wfi4yh1zww8mk03w0zcwnmk4l4p3vpjlvlb63ll"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags '("--localstatedir=/var")))
@@@ -234,19 -231,26 +234,29 @@@ interface and is based on GNU Guile."
(license license:gpl3+)
(home-page "https://www.gnu.org/software/shepherd/";)))
-(define-public guile3.0-shepherd
+(define-public guile2.2-shepherd
(package
(inherit shepherd)
- (name "guile3.0-shepherd")
+ (name "guile2.2-shepherd")
(native-inputs
`(("pkg-config" ,pkg-config)
- ("guile" ,guile-next)))
+ ("guile" ,guile-2.2)))
(inputs
- `(("guile" ,guile-next)))))
+ `(("guile" ,guile-2.2)))))
+
+(define-public guile3.0-shepherd
+ (deprecated-package "guile3.0-shepherd" shepherd))
+ (define-public guile2.0-shepherd
+ (package
+ (inherit shepherd)
+ (name "guile2.0-shepherd")
+ (native-inputs
+ `(("pkg-config" ,pkg-config)
+ ("guile" ,guile-2.0)))
+ (inputs
+ `(("guile" ,guile-2.0)))))
+
(define-public cloud-utils
(package
(name "cloud-utils")
diff --cc gnu/packages/bootloaders.scm
index 9e9d4c3,2a6e070..e7548c5
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@@ -11,7 -11,7 +11,8 @@@
;;; Copyright © 2019 nee <address@hidden>
;;; Copyright © 2019 Mathieu Othacehe <address@hidden>
;;; Copyright © 2020 Björn Höfling <address@hidden>
+;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <address@hidden>
+ ;;; Copyright © 2018, 2019, 2020 Vagrant Cascadian <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/linphone.scm
index b9d455a,8962f20..e5eb128
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@@ -50,7 -49,7 +50,8 @@@
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system cmake)
+ #:use-module (guix build-system qt)
+ #:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system gnu))
(define-public bcunit
@@@ -413,17 -420,26 +414,26 @@@ including media capture, encoding and d
(arguments
`(#:tests? #f ; No test target
#:configure-flags
- (list
- (string-append "-DGTK2_GDKCONFIG_INCLUDE_DIR="
- (string-append (assoc-ref %build-inputs "gtk2")
- "/lib/gtk-2.0/include"))
- (string-append "-DGTK2_GLIBCONFIG_INCLUDE_DIR="
- (string-append (assoc-ref %build-inputs "glib")
- "/lib/glib-2.0/include"))
- "-DENABLE_STATIC=NO" ; Not required
- "-DENABLE_GTK_UI=YES") ; For Legacy UI
+ (list (string-append "-DGTK2_GDKCONFIG_INCLUDE_DIR="
+ (string-append (assoc-ref %build-inputs "gtk2")
+ "/lib/gtk-2.0/include"))
+ (string-append "-DGTK2_GLIBCONFIG_INCLUDE_DIR="
+ (string-append (assoc-ref %build-inputs "glib")
+ "/lib/glib-2.0/include"))
+ "-DENABLE_STATIC=NO" ; Not required
+ "-DENABLE_STRICT=NO"
+ "-DENABLE_GTK_UI=YES") ; for legacy UI
+ #:imported-modules (,@%cmake-build-system-modules
+ (guix build glib-or-gtk-build-system))
+ #:modules ((guix build cmake-build-system)
+ ((guix build glib-or-gtk-build-system) #:prefix
glib-or-gtk:)
+ (guix build utils))
#:phases
(modify-phases %standard-phases
+ (add-after 'install 'glib-or-gtk-compile-schemas
+ (assoc-ref glib-or-gtk:%standard-phases
'glib-or-gtk-compile-schemas))
+ (add-after 'install 'glib-or-gtk-wrap
+ (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))
(add-after 'unpack 'patch
(lambda _
(substitute* "gtk/main.c"
diff --cc gnu/packages/linux.scm
index 344ff77,fbdda25..dccf41d
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@@ -3030,6 -2961,63 +3030,43 @@@ device nodes from /dev/, handles hotplu
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 python-evdev
+ (package
+ (name "python-evdev")
+ (version "1.3.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "evdev" version))
+ (sha256
+ (base32 "0kb3636yaw9l8xi8s184w0r0n9ic5dw3b8hx048jf9fpzss4kimi"))))
+ (build-system python-build-system)
+ (native-inputs
+ `(("kernel-headers" ,linux-libre-headers)))
+ (arguments
+ `(#:tests? #f ;no rule for tests
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'fix-hard-coded-directory
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "setup.py"
+ (("/usr/include/linux")
+ (string-append
+ (assoc-ref inputs "kernel-headers") "/include/linux")))
+ #t)))))
+ (home-page "https://github.com/gvalkov/python-evdev";)
+ (synopsis "Bindings to the Linux input handling subsystem")
+ (description
+ "Python-evdev provides bindings to the generic input event interface in
+ Linux. The @code{evdev} interface serves the purpose of passing events
+ generated in the kernel directly to userspace through character devices that
+ are typically located in @file{/dev/input/}.
+
+ This package also comes with bindings to @code{uinput}, the userspace input
+ subsystem. @code{uinput} allows userspace programs to create and handle input
+ devices that can inject events directly into the input subsystem.")
+ (license license:bsd-3)))
+
(define-public lvm2
(package
(name "lvm2")
diff --cc gnu/packages/tls.scm
index c1bb7f6,4f85f21..778571f
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@@ -304,7 -317,8 +304,8 @@@ required structures."
(define-public openssl
(package
(name "openssl")
- (version "1.1.1c")
+ (version "1.1.1f")
+ (replacement openssl-1.1.1g)
(source (origin
(method url-fetch)
(uri (list (string-append
"https://www.openssl.org/source/openssl-";
diff --cc gnu/system.scm
index 319663c,29e6228..5491a68
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@@ -581,6 -596,52 +596,47 @@@ of PROVENANCE-SERVICE-TYPE to its servi
(list ath9k-htc-firmware
openfwwf-firmware))
+ (define %base-packages-utils
+ ;; Default set of utilities packages.
+ (cons* procps psmisc which
+ (@ (gnu packages admin) shadow) ;for 'passwd'
+
- ;; XXX: We don't use (canonical-package guile-2.2) here because that
- ;; would create a collision in the global profile between the GMP
- ;; variant propagated by 'guile-final' and the GMP variant propagated
- ;; by 'gnutls', itself propagated by 'guix'.
- guile-2.2
++ guile-3.0
+
+ ;; The packages below are also in %FINAL-INPUTS, so take them from
+ ;; there to avoid duplication.
- (map canonical-package
- (list bash coreutils findutils grep sed
- diffutils patch gawk tar gzip bzip2 xz lzip))))
++ (list bash coreutils findutils grep sed
++ diffutils patch gawk tar gzip bzip2 xz lzip)))
+
+ (define %base-packages-linux
+ ;; Default set of linux specific packages.
+ (list pciutils usbutils
+ util-linux+udev
+ ;; Get 'insmod' & co. from kmod, not module-init-tools, since udev
+ ;; already depends on it anyway.
+ kmod eudev))
+
+ (define %base-packages-interactive
+ ;; Default set of common interactive packages.
+ (list less zile nano
+ man-db
+ info-reader ;the standalone Info reader (no Perl)
+ bash-completion
+ kbd
+ ;; The 'sudo' command is already in %SETUID-PROGRAMS, but we also
+ ;; want the other commands and the man pages (notably because
+ ;; auto-completion in Emacs shell relies on man pages.)
+ sudo
+ guile-readline guile-colorized))
+
+ (define %base-packages-networking
+ ;; Default set of networking packages.
+ (list inetutils isc-dhcp
+ iproute
+ ;; wireless-tools is deprecated in favor of iw, but it's still what
+ ;; many people are familiar with, so keep it around.
+ iw wireless-tools))
+
(define %base-packages
;; Default set of packages globally visible. It should include anything
;; required for basic administrator tasks.