[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, 22 Jul 2019 13:16:56 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit ccad0e4d6973da7af8badfb7125f35f7e51eb2d7
Merge: d478cc0 2698654
Author: Marius Bakke <address@hidden>
Date: Mon Jul 22 18:58:48 2019 +0200
Merge branch 'master' into core-updates
Makefile.am | 1 +
doc/guix.texi | 2 +-
gnu/local.mk | 1 +
gnu/packages/audio.scm | 33 ++
gnu/packages/backup.scm | 2 +-
gnu/packages/bioinformatics.scm | 8 +-
gnu/packages/chromium.scm | 6 +-
gnu/packages/compression.scm | 34 +-
gnu/packages/emacs-xyz.scm | 31 +-
gnu/packages/geo.scm | 19 +
gnu/packages/haskell.scm | 416 ++++++++++++++++
gnu/packages/libreoffice.scm | 10 +
gnu/packages/linux.scm | 551 ++++++++++++++++-----
gnu/packages/logging.scm | 10 +
gnu/packages/networking.scm | 4 +-
.../darkice-workaround-fpermissive-error.patch | 62 +++
gnu/packages/perl-check.scm | 4 +-
gnu/packages/perl.scm | 14 +-
gnu/packages/python-xyz.scm | 21 +-
gnu/packages/qt.scm | 4 +-
gnu/packages/serialization.scm | 4 +-
gnu/packages/shells.scm | 4 +-
gnu/packages/sync.scm | 2 +-
gnu/packages/tor.scm | 2 +-
gnu/packages/video.scm | 14 +-
gnu/packages/virtualization.scm | 17 +-
gnu/packages/web.scm | 4 +-
gnu/system/file-systems.scm | 4 +-
gnu/system/linux-container.scm | 49 +-
guix/channels.scm | 94 ++--
guix/discovery.scm | 6 +-
guix/lint.scm | 25 +-
guix/scripts/archive.scm | 1 +
guix/scripts/lint.scm | 7 +-
guix/scripts/pack.scm | 7 +-
guix/swh.scm | 10 +-
guix/ui.scm | 41 +-
tests/channels.scm | 72 ++-
tests/containers.scm | 50 ++
tests/guix-build.sh | 31 +-
tests/lint.scm | 31 +-
tests/swh.scm | 76 +++
42 files changed, 1495 insertions(+), 289 deletions(-)
diff --cc gnu/local.mk
index c95a5c8,eb3b0dc..5be252c
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -747,7 -748,9 +747,8 @@@ dist_patch_DATA =
%D%/packages/patches/cube-nocheck.patch \
%D%/packages/patches/cursynth-wave-rand.patch \
%D%/packages/patches/cvs-CVE-2017-12836.patch \
+ %D%/packages/patches/darkice-workaround-fpermissive-error.patch \
%D%/packages/patches/dbus-helper-search-path.patch \
- %D%/packages/patches/dbus-CVE-2019-12749.patch \
%D%/packages/patches/dealii-mpi-deprecations.patch \
%D%/packages/patches/deja-dup-use-ref-keyword-for-iter.patch \
%D%/packages/patches/dfu-programmer-fix-libusb.patch \
diff --cc gnu/packages/linux.scm
index a7d4872,5288328..8ae64a3
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@@ -232,27 -510,38 +510,38 @@@ corresponding UPSTREAM-SOURCE (an origi
(description "Headers of the Linux-Libre kernel.")
(license license:gpl2)))
- (define %boot-logo-patch
- ;; Linux-Libre boot logo featuring Freedo and a gnu.
- (origin
- (method url-fetch)
- (uri (string-append "http://www.fsfla.org/svn/fsfla/software/linux-libre/";
- "lemote/gnewsense/branches/3.16/100gnu+freedo.patch"))
- (sha256
- (base32
- "1hk9swxxc80bmn2zd2qr5ccrjrk28xkypwhl4z0qx4hbivj7qm06"))))
+ (define-public linux-libre-headers-5.2
+ (make-linux-libre-headers* linux-libre-5.2-version
+ linux-libre-5.2-source))
- (define %linux-libre-arm-export-__sync_icache_dcache-patch
- (origin
- (method url-fetch)
- (uri (string-append
- "https://salsa.debian.org/kernel-team/linux";
- "/raw/34a7d9011fcfcfa38b68282fd2b1a8797e6834f0"
- "/debian/patches/bugfix/arm/"
- "arm-mm-export-__sync_icache_dcache-for-xen-privcmd.patch"))
- (file-name "linux-libre-arm-export-__sync_icache_dcache.patch")
- (sha256
- (base32 "1ifnfhpakzffn4b8n7x7w5cps9mzjxlkcfz9zqak2vaw8nzvl39f"))))
+ (define-public linux-libre-headers-4.19
+ (make-linux-libre-headers* linux-libre-4.19-version
+ linux-libre-4.19-source))
+
+ (define-public linux-libre-headers-4.14
+ (make-linux-libre-headers* linux-libre-4.14-version
+ linux-libre-4.14-source))
+
+ (define-public linux-libre-headers-4.9
+ (make-linux-libre-headers* linux-libre-4.9-version
+ linux-libre-4.9-source))
+
+ (define-public linux-libre-headers-4.4
+ (make-linux-libre-headers* linux-libre-4.4-version
+ linux-libre-4.4-source))
+
+ ;; The following package is used in the early bootstrap, and thus must be kept
+ ;; stable and with minimal build requirements.
-(define-public linux-libre-headers-4.14.67
- (make-linux-libre-headers "4.14.67"
-
"050zvdxjy6sc64q75pr1gxsmh49chwav2pwxz8xlif39bvahnrpg"))
++(define-public linux-libre-headers-4.19.56
++ (make-linux-libre-headers "4.19.56"
++
"1zqiic55viy065lhnkmhn33sz3bbbr2ykbm5f92yzd8lpc9zl7yx"))
+
-(define-public linux-libre-headers linux-libre-headers-4.14.67)
++(define-public linux-libre-headers linux-libre-headers-4.19.56)
+
+
+ ;;;
+ ;;; Kernel configurations.
+ ;;;
(define* (kernel-config arch #:key variant)
"Return the absolute file name of the Linux-Libre build configuration file