[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: |
Tue, 5 May 2020 14:44:46 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 87a40d7203a813921b3ef0805c2b46c0026d6c31
Merge: ba151b7 751d1f0
Author: Marius Bakke <address@hidden>
AuthorDate: Tue May 5 20:43:21 2020 +0200
Merge branch 'master' into core-updates
.guix-authorizations | 157 ++
Makefile.am | 7 +
build-aux/git-authenticate.scm | 198 +-
doc/contributing.texi | 24 +-
doc/guix-cookbook.texi | 4 +-
doc/guix.texi | 136 +-
gnu/build/bootloader.scm | 56 +-
gnu/build/file-systems.scm | 45 +-
gnu/build/image.scm | 273 +++
gnu/build/install.scm | 21 +-
gnu/build/vm.scm | 175 +-
gnu/ci.scm | 45 +-
gnu/image.scm | 76 +
gnu/local.mk | 11 +
gnu/packages/algebra.scm | 24 +
gnu/packages/audio.scm | 31 +-
gnu/packages/bioinformatics.scm | 42 +
gnu/packages/check.scm | 25 +
gnu/packages/chemistry.scm | 126 ++
gnu/packages/crates-io.scm | 2108 +++++++++++++++++++-
gnu/packages/databases.scm | 6 +-
gnu/packages/emacs-xyz.scm | 16 +-
gnu/packages/enlightenment.scm | 76 +-
gnu/packages/gnome.scm | 1 +
gnu/packages/heads.scm | 163 ++
gnu/packages/image.scm | 17 +-
gnu/packages/less.scm | 44 +
gnu/packages/libusb.scm | 4 +-
gnu/packages/linux.scm | 69 +-
gnu/packages/lisp-xyz.scm | 6 +-
gnu/packages/messaging.scm | 49 +-
gnu/packages/monitoring.scm | 51 +-
gnu/packages/music.scm | 22 +
.../patches/collectd-5.11.0-noinstallvar.patch | 21 +
.../patches/grocsvs-dont-use-admiral.patch | 69 +
gnu/packages/patches/gromacs-tinyxml2.patch | 67 +
gnu/packages/patches/musl-cross-locale.patch | 20 +
.../patches/rust-nettle-disable-vendor.patch | 13 +
.../patches/rust-nettle-sys-disable-vendor.patch | 48 +
gnu/packages/python-xyz.scm | 7 +-
gnu/packages/security-token.scm | 28 +
gnu/packages/sequoia.scm | 162 ++
gnu/packages/spice.scm | 49 +
gnu/packages/statistics.scm | 45 +-
gnu/packages/video.scm | 4 +-
gnu/packages/virtualization.scm | 4 +-
gnu/packages/vpn.scm | 9 +-
gnu/packages/xdisorg.scm | 32 +
gnu/packages/xorg.scm | 22 +
gnu/services/base.scm | 2 +-
gnu/services/ssh.scm | 106 +-
gnu/system.scm | 50 +
gnu/system/image.scm | 532 +++++
gnu/system/install.scm | 1 +
gnu/system/linux-initrd.scm | 3 +
gnu/system/vm.scm | 216 +-
gnu/tests/install.scm | 97 +-
guix/build/store-copy.scm | 1 +
guix/openpgp.scm | 1108 ++++++++++
guix/scripts/system.scm | 13 +-
tests/civodul.key | 1345 +++++++++++++
tests/dsa.key | 25 +
tests/ed25519.key | 10 +
tests/ed25519.sec | 10 +
tests/openpgp.scm | 253 +++
tests/rsa.key | 18 +
66 files changed, 7806 insertions(+), 692 deletions(-)
diff --cc gnu/local.mk
index 445c0cf,4e0521b..be02f93
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -604,7 -607,7 +607,8 @@@ GNU_SYSTEM_MODULES =
%D%/system.scm \
%D%/system/accounts.scm \
%D%/system/file-systems.scm \
+ %D%/system/hurd.scm \
+ %D%/system/image.scm \
%D%/system/install.scm \
%D%/system/keyboard.scm \
%D%/system/linux-container.scm \
@@@ -1024,23 -1011,22 +1030,25 @@@ dist_patch_DATA =
%D%/packages/patches/gpsbabel-qstring.patch \
%D%/packages/patches/grantlee-merge-theme-dirs.patch \
%D%/packages/patches/grep-timing-sensitive-test.patch \
+ %D%/packages/patches/grocsvs-dont-use-admiral.patch \
+ %D%/packages/patches/gromacs-tinyxml2.patch \
%D%/packages/patches/groovy-add-exceptionutilsgenerator.patch \
%D%/packages/patches/grub-efi-fat-serial-number.patch \
- %D%/packages/patches/gsl-test-i686.patch \
+ %D%/packages/patches/grub-verifiers-Blocklist-fallout-cleanup.patch \
%D%/packages/patches/gspell-dash-test.patch \
%D%/packages/patches/guile-1.8-cpp-4.5.patch \
- %D%/packages/patches/guile-2.2-default-utf8.patch \
%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-2.2-default-utf8.patch \
+ %D%/packages/patches/guile-relocatable.patch \
+ %D%/packages/patches/guile-3.0-relocatable.patch \
%D%/packages/patches/guile-linux-syscalls.patch \
+ %D%/packages/patches/guile-3.0-linux-syscalls.patch \
+ %D%/packages/patches/guile-gdbm-ffi-support-gdbm-1.14.patch \
%D%/packages/patches/guile-present-coding.patch \
- %D%/packages/patches/guile-relocatable.patch \
%D%/packages/patches/guile-rsvg-pkgconfig.patch \
%D%/packages/patches/guile-emacs-fix-configure.patch \
+ %D%/packages/patches/guile-sqlite3-fix-cross-compilation.patch \
%D%/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch \
%D%/packages/patches/gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch \
%D%/packages/patches/gtk2-theme-paths.patch \
diff --cc gnu/packages/algebra.scm
index 6d1f6b8,d4f66d2..4df2e96
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@@ -8,9 -8,9 +8,10 @@@
;;; 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>
+ ;;; Copyright © 2020 Vincent Legoll <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/enlightenment.scm
index 322afde,2fa586d..e441323
--- a/gnu/packages/enlightenment.scm
+++ b/gnu/packages/enlightenment.scm
@@@ -122,15 -123,13 +123,13 @@@
("fribidi" ,fribidi)
("glib" ,glib)
("harfbuzz" ,harfbuzz)
- ("luajit" ,luajit)
("libinput" ,libinput-minimal)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
- ("libpng" ,libpng)
("libsndfile" ,libsndfile)
- ("libtiff" ,libtiff)
- ("libwebp" ,libwebp)
+ ("libpng" ,libpng)
("libx11" ,libx11)
("libxkbcommon" ,libxkbcommon)
+ ("luajit" ,luajit)
("lz4" ,lz4)
("openssl" ,openssl)
("pulseaudio" ,pulseaudio)
diff --cc gnu/packages/image.scm
index 96e207e,eef73d6..c6fc26f
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@@ -600,13 -596,11 +600,11 @@@ collection of tools for doing simple ma
("pkg-config" ,pkg-config)))
(inputs
`(("giflib" ,giflib)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("libtiff" ,libtiff)
- ("libwebp" ,libwebp)))
- (propagated-inputs
- ;; Linking a program with leptonica also requires these.
- `(("openjpeg" ,openjpeg)
+ ("libwebp" ,libwebp)
+ ("openjpeg" ,openjpeg)
("zlib" ,zlib)))
(arguments
'(#:phases
diff --cc gnu/packages/less.scm
index d01a423,76a4d42..d449e07
--- a/gnu/packages/less.scm
+++ b/gnu/packages/less.scm
@@@ -1,7 -1,7 +1,8 @@@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012 Nikita Karetnikov <address@hidden>
;;; Copyright © 2019 Tobias Geerinckx-Rice <address@hidden>
+;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <address@hidden>
+ ;;; Copyright © 2020 Michael Rohleder <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@@ -20,10 -20,12 +21,13 @@@
(define-module (gnu packages less)
#:use-module (guix licenses)
+ #:use-module (gnu packages)
#:use-module (gnu packages ncurses)
+ #:use-module (gnu packages perl)
+ #:use-module (gnu packages file)
#:use-module (guix packages)
#:use-module (guix download)
+ #:use-module (guix git-download)
#:use-module (guix build-system gnu))
(define-public less
diff --cc gnu/packages/libusb.scm
index 1bd96e1,5f64b33..3842f3f
--- a/gnu/packages/libusb.scm
+++ b/gnu/packages/libusb.scm
@@@ -8,7 -8,7 +8,8 @@@
;;; Copyright © 2017 Jonathan Brielmaier <address@hidden>
;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
;;; Copyright © 2018 Vagrant Cascadian <address@hidden>
+;;; Copyright © 2020 Marius Bakke <address@hidden>
+ ;;; Copyright © 2020 Christopher Howard <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/linux.scm
index 8eaf79d,3de29a5..8a0068a
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@@ -4707,11 -4628,50 +4707,50 @@@ disks and SD cards. This package provi
(append-to-file "mkfs/Makefile.am" "\nmkfs_f2fs_LDFLAGS =
-all-static\n")
(append-to-file "fsck/Makefile.am" "\nfsck_f2fs_LDFLAGS =
-all-static\n")
(append-to-file "tools/Makefile.am" "\nf2fscrypt_LDFLAGS =
-all-static -luuid\n")
- #t)))))
+ #t))
+ (add-after 'install 'remove-store-references
+ (lambda* (#:key outputs #:allow-other-keys)
+ ;; Work around bug in our util-linux.
+ ;; <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=41019>.
+ (remove-store-references (string-append (assoc-ref outputs
"out")
+ "/sbin/mkfs.f2fs"))
+ #t)))))
(inputs
`(("libuuid:static" ,util-linux "static")
- ("libuuid" ,util-linux)))))) ; for include files
+ ("libuuid" ,util-linux "lib")))))) ; for include files
+ (define-public f2fs-fsck/static
+ (package
+ (name "f2fs-fsck-static")
+ (version (package-version f2fs-tools/static))
+ (source #f)
+ (build-system trivial-build-system)
+ (arguments
+ `(#:modules ((guix build utils))
+ #:builder
+ (begin
+ (use-modules (guix build utils)
+ (ice-9 ftw)
+ (srfi srfi-26))
+ (let* ((f2fs-tools (assoc-ref %build-inputs "f2fs-tools-static"))
+ (fsck "fsck.f2fs")
+ (out (assoc-ref %outputs "out"))
+ (sbin (string-append out "/sbin")))
+ (mkdir-p sbin)
+ (with-directory-excursion sbin
+ (install-file (string-append f2fs-tools "/sbin/" fsck)
+ ".")
+ (remove-store-references fsck)
+ (chmod fsck #o555))
+ #t))))
+ (inputs
+ `(("f2fs-tools-static" ,f2fs-tools/static)))
+ (home-page (package-home-page f2fs-tools/static))
+ (synopsis "Statically-linked fsck.f2fs command from f2fs-tools")
+ (description "This package provides statically-linked fsck.f2fs command
taken
+ from the f2fs-tools package. It is meant to be used in initrds.")
+ (license (package-license f2fs-tools/static))))
+
(define-public freefall
(package
(name "freefall")
diff --cc gnu/packages/xorg.scm
index 7d427d8,289a823..cef22cd
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@@ -20,11 -20,10 +20,12 @@@
;;; Copyright © 2018 Benjamin Slade <address@hidden>
;;; Copyright © 2019 nee <address@hidden>
;;; Copyright © 2019 Yoshinori Arai <address@hidden>
+;;; Copyright © 2019 Mathieu Othacehe <address@hidden>
;;; Copyright © 2020 Leo Prikler <address@hidden>
;;; Copyright © 2020 Florian Pelz <address@hidden>
+;;; Copyright © 2020 Michael Rohleder <address@hidden>
;;; Copyright © 2020 Maxim Cournoyer <address@hidden>
+ ;;; Copyright © 2020 Jean-Baptiste Note <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/tests/install.scm
index 343fdc6,2e59139..94d970e
--- a/gnu/tests/install.scm
+++ b/gnu/tests/install.scm
@@@ -227,16 -230,19 +231,20 @@@ packages defined in installation-os.
;; Since the installation system has no network access,
;; we cheat a little bit by adding TARGET to its GC
;; roots. This way, we know 'guix system init' will
- ;; succeed.
+ ;; succeed. Also add guile-final, which is pulled in
+ ;; through provenance.drv and may not always be
present.
- (image (system-disk-image
- (operating-system-with-gc-roots
- os (list target guile-final))
- #:disk-image-size install-size
- #:file-system-type
- installation-disk-image-file-system-type
- ;; Don't provide substitutes; too big.
- #:substitutable? #f)))
+ (image
+ (system-image
+ (image
+ (inherit
+ (find-image
+ installation-disk-image-file-system-type))
+ (size install-size)
+ (operating-system
+ (operating-system-with-gc-roots
- os (list target)))
++ os (list target guile-final)))
+ ;; Don't provide substitutes; too big.
+ (substitutable? #f)))))
(define install
(with-imported-modules '((guix build utils)
(gnu build marionette))