[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: |
Sun, 6 Oct 2019 16:03:10 -0400 (EDT) |
rekado pushed a commit to branch core-updates
in repository guix.
commit e08902d3cbb307e1523485becbbdaf9aed56ac4a
Merge: 1714edc f587024
Author: Ricardo Wurmus <address@hidden>
Date: Sun Oct 6 22:02:20 2019 +0200
Merge branch 'master' into core-updates
Makefile.am | 5 +
doc/guix.texi | 26 +-
gnu/local.mk | 1 +
gnu/packages/admin.scm | 115 +-
.../aux-files/linux-libre/5.3-arm-veyron.conf | 4997 +++++++++
gnu/packages/aux-files/linux-libre/5.3-arm.conf | 9316 +++++++++++++++++
gnu/packages/aux-files/linux-libre/5.3-arm64.conf | 9246 +++++++++++++++++
gnu/packages/aux-files/linux-libre/5.3-i686.conf | 10271 +++++++++++++++++++
gnu/packages/aux-files/linux-libre/5.3-x86_64.conf | 10227 ++++++++++++++++++
gnu/packages/axoloti.scm | 35 +-
gnu/packages/bioinformatics.scm | 7 +
gnu/packages/conky.scm | 6 +-
gnu/packages/cran.scm | 69 +-
gnu/packages/crates-io.scm | 41 +-
gnu/packages/cryptsetup.scm | 52 +-
gnu/packages/dav.scm | 11 +-
gnu/packages/dictionaries.scm | 4 +-
gnu/packages/emacs-xyz.scm | 108 +-
gnu/packages/enlightenment.scm | 124 +-
gnu/packages/finance.scm | 5 +-
gnu/packages/games.scm | 37 +-
gnu/packages/gl.scm | 3 +-
gnu/packages/graphics.scm | 18 +-
gnu/packages/guile-xyz.scm | 6 +-
gnu/packages/java.scm | 13 +-
gnu/packages/license.scm | 49 +-
gnu/packages/linux.scm | 51 +-
gnu/packages/lisp.scm | 234 +-
gnu/packages/lua.scm | 8 +-
gnu/packages/machine-learning.scm | 130 +
gnu/packages/mail.scm | 8 +-
gnu/packages/messaging.scm | 26 +-
gnu/packages/monitoring.scm | 4 +-
gnu/packages/music.scm | 40 +
gnu/packages/nano.scm | 4 +-
gnu/packages/networking.scm | 63 +-
gnu/packages/ocaml.scm | 8 +-
gnu/packages/perl-check.scm | 4 +-
gnu/packages/perl.scm | 16 +-
gnu/packages/plotutils.scm | 4 +-
gnu/packages/python-check.scm | 8 +-
gnu/packages/python-xyz.scm | 60 +-
gnu/packages/screen.scm | 4 +-
gnu/packages/serialization.scm | 44 +-
gnu/packages/statistics.scm | 17 +-
gnu/packages/sync.scm | 4 +-
gnu/packages/tigervnc.scm | 232 +
gnu/packages/tls.scm | 4 +-
gnu/packages/video.scm | 4 +-
gnu/packages/web-browsers.scm | 46 +-
gnu/packages/web.scm | 17 +-
gnu/packages/wm.scm | 33 +-
gnu/packages/xfce.scm | 802 +-
gnu/packages/xml.scm | 4 +-
gnu/services/base.scm | 185 +-
gnu/services/shepherd.scm | 77 +-
gnu/services/web.scm | 2 +-
gnu/system.scm | 7 +-
guix/gexp.scm | 49 +-
guix/import/crate.scm | 29 +-
guix/inferior.scm | 4 +-
guix/scripts/environment.scm | 19 +-
guix/scripts/import/crate.scm | 36 +-
guix/scripts/pull.scm | 2 +-
tests/guix-environment-container.sh | 5 +
65 files changed, 46448 insertions(+), 638 deletions(-)
diff --cc gnu/packages/java.scm
index fe745a5,3b74049..495e6bb
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@@ -201,12 -193,8 +204,13 @@@ language."
(inputs
`(("classpath" ,classpath-bootstrap)
("jikes" ,jikes)
+ ("libffi" ,libffi)
("zlib" ,zlib)))
+ ;; When built with a recent GCC and glibc the configure step of icedtea-6
+ ;; fails with an invalid instruction error.
+ (native-inputs
+ `(("gcc" ,gcc-5)
+ ("libc" ,glibc-2.28)))
(home-page "http://jamvm.sourceforge.net/";)
(synopsis "Small Java Virtual Machine")
(description "JamVM is a Java Virtual Machine conforming to the JVM
diff --cc gnu/packages/linux.scm
index 78de223,21cd4a2..e1fc4a9
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@@ -418,10 -434,14 +433,15 @@@ corresponding UPSTREAM-SOURCE (an origi
(patches (append (origin-patches source)
patches))))
+ (define-public linux-libre-5.3-source
+ (source-with-patches linux-libre-5.3-pristine-source
+ (list %boot-logo-patch
+
%linux-libre-arm-export-__sync_icache_dcache-patch)))
+
(define-public linux-libre-5.2-source
(source-with-patches linux-libre-5.2-pristine-source
- (list %boot-logo-patch
+ (list (search-patch "linux-libre-active-entropy.patch")
+ %boot-logo-patch
%linux-libre-arm-export-__sync_icache_dcache-patch)))
(define-public linux-libre-4.19-source