[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/03: Merge branch 'master' into core-updates
|
From: |
guix-commits |
|
Subject: |
01/03: Merge branch 'master' into core-updates |
|
Date: |
Thu, 20 Dec 2018 14:37:49 -0500 (EST) |
civodul pushed a commit to branch core-updates
in repository guix.
commit 86974d8a9247cbeb938b5202f23ccca8d9ed627d
Merge: 03a45a4 9012d22
Author: Ludovic Courtès <address@hidden>
Date: Thu Dec 20 18:39:04 2018 +0100
Merge branch 'master' into core-updates
Makefile.am | 2 +
doc/contributing.texi | 4 +-
doc/guix.texi | 363 +++++++++++++++-
etc/guix-install.sh | 2 +-
gnu/build/file-systems.scm | 15 +-
gnu/build/vm.scm | 8 +-
gnu/local.mk | 5 +-
gnu/packages/admin.scm | 86 +++-
gnu/packages/base.scm | 16 +-
gnu/packages/bioinformatics.scm | 5 +-
gnu/packages/busybox.scm | 40 ++
gnu/packages/check.scm | 24 ++
gnu/packages/chemistry.scm | 18 +-
gnu/packages/chez.scm | 35 +-
gnu/packages/cross-base.scm | 21 +-
gnu/packages/databases.scm | 27 +-
gnu/packages/education.scm | 4 +-
gnu/packages/emacs.scm | 159 +++++--
gnu/packages/emulators.scm | 12 +-
gnu/packages/engineering.scm | 68 ++-
gnu/packages/finance.scm | 34 +-
gnu/packages/firmware.scm | 7 +-
gnu/packages/game-development.scm | 2 +
gnu/packages/games.scm | 6 +-
gnu/packages/gnuzilla.scm | 73 +++-
gnu/packages/golang.scm | 4 +-
gnu/packages/guile.scm | 15 +-
gnu/packages/ham-radio.scm | 35 +-
gnu/packages/haskell.scm | 9 +-
gnu/packages/ipfs.scm | 16 +-
gnu/packages/java.scm | 2 +-
gnu/packages/kde-frameworks.scm | 1 +
gnu/packages/kde.scm | 12 +-
gnu/packages/linux.scm | 20 +-
gnu/packages/lisp.scm | 90 +++-
gnu/packages/llvm.scm | 15 +
gnu/packages/lxqt.scm | 4 +-
gnu/packages/mail.scm | 48 ++-
gnu/packages/make-bootstrap.scm | 2 +
gnu/packages/maths.scm | 40 +-
gnu/packages/monitoring.scm | 27 +-
gnu/packages/mpd.scm | 2 +-
gnu/packages/networking.scm | 4 +-
gnu/packages/ocaml.scm | 286 ++++---------
gnu/packages/opencl.scm | 2 +-
gnu/packages/package-management.scm | 12 +-
...gro-fix-compilation-mesa-18.2.5-and-later.patch | 41 ++
.../patches/ansible-wrap-program-hack.patch | 22 -
gnu/packages/patches/glibc-hurd-magic-pid.patch | 190 +++++++++
gnu/packages/patches/qemu-CVE-2018-16847.patch | 158 -------
gnu/packages/patches/qemu-CVE-2018-16867.patch | 49 ---
.../patches/stumpwm-fix-broken-read-one-line.patch | 45 ++
gnu/packages/pdf.scm | 14 +-
gnu/packages/photo.scm | 4 +-
gnu/packages/php.scm | 28 +-
gnu/packages/python.scm | 160 ++++++-
gnu/packages/rust.scm | 3 +
gnu/packages/scheme.scm | 26 +-
gnu/packages/serialization.scm | 1 +
gnu/packages/tex.scm | 301 ++++++++++++-
gnu/packages/tor.scm | 49 +--
gnu/packages/version-control.scm | 6 +-
gnu/packages/video.scm | 26 +-
gnu/packages/virtualization.scm | 39 +-
gnu/packages/web-browsers.scm | 16 +-
gnu/packages/web.scm | 2 +-
gnu/packages/webkit.scm | 4 +-
gnu/packages/wget.scm | 4 +-
gnu/packages/wm.scm | 2 +-
gnu/packages/xdisorg.scm | 57 +++
gnu/services/base.scm | 10 +-
gnu/services/monitoring.scm | 467 ++++++++++++++++++++-
gnu/services/shepherd.scm | 12 +-
gnu/services/web.scm | 48 ++-
gnu/tests/base.scm | 15 +
gnu/tests/monitoring.scm | 232 +++++++++-
guix/build-system/dune.scm | 159 +++++++
guix/build-system/ocaml.scm | 16 +-
guix/build/dune-build-system.scm | 69 +++
guix/download.scm | 12 +-
guix/gexp.scm | 45 +-
guix/import/opam.scm | 305 ++++++++------
guix/packages.scm | 12 +-
guix/profiles.scm | 60 ++-
guix/scripts/environment.scm | 28 +-
guix/scripts/publish.scm | 11 +-
guix/scripts/substitute.scm | 13 +-
guix/scripts/system.scm | 3 +-
guix/status.scm | 33 ++
guix/store.scm | 63 ++-
guix/store/deduplication.scm | 40 +-
guix/ui.scm | 59 ++-
guix/utils.scm | 22 +-
nix/libstore/build.cc | 22 +-
nix/libstore/gc.cc | 6 +-
nix/libstore/globals.cc | 2 +-
nix/libstore/local-store.cc | 28 +-
nix/libstore/optimise-store.cc | 4 +-
nix/libstore/store-api.cc | 6 +-
nix/libutil/archive.cc | 2 +-
nix/nix-daemon/nix-daemon.cc | 6 +-
po/guix/POTFILES.in | 1 +
tests/guix-environment.sh | 14 +-
tests/opam.scm | 225 ++++++----
tests/publish.scm | 17 +-
tests/store-deduplication.scm | 44 +-
tests/substitute.scm | 42 +-
107 files changed, 3902 insertions(+), 1180 deletions(-)
diff --cc gnu/local.mk
index 0c324cd,8e1ce88..9cf690e
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -759,11 -756,9 +758,12 @@@ dist_patch_DATA =
%D%/packages/patches/glibc-CVE-2017-1000366-pt2.patch \
%D%/packages/patches/glibc-CVE-2017-1000366-pt3.patch \
%D%/packages/patches/glibc-allow-kernel-2.6.32.patch \
+ %D%/packages/patches/glibc-boot-2.16.0.patch \
+ %D%/packages/patches/glibc-boot-2.2.5.patch \
+ %D%/packages/patches/glibc-bootstrap-system-2.16.0.patch \
%D%/packages/patches/glibc-bootstrap-system.patch \
%D%/packages/patches/glibc-hidden-visibility-ldconfig.patch \
+ %D%/packages/patches/glibc-hurd-magic-pid.patch \
%D%/packages/patches/glibc-ldd-x86_64.patch \
%D%/packages/patches/glibc-locales.patch \
%D%/packages/patches/glibc-memchr-overflow-i686.patch \
diff --cc gnu/packages/llvm.scm
index 4be86f3,7eb785c..ec79bcc
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@@ -95,6 -95,41 +95,21 @@@ languages is in development. The compi
of programming tools as well as libraries with equivalent functionality.")
(license license:ncsa)))
+ ;; TODO: Build Mesa with LLVM 7 in the next staging cycle.
+ ;; TODO: Make LLVM 7 the default LLVM once Clang is also upgraded.
+ (define-public llvm-7.0.0
+ (package (inherit llvm)
+ (name "llvm")
+ (version "7.0.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "http://llvm.org/releases/";
+ version "/llvm-" version ".src.tar.xz"))
+ (sha256
+ (base32
+ "08p27wv1pr9ql2zc3f3qkkymci46q7myvh8r5ijippnbwr2gihcb"))))))
+
-;; FIXME: This package is here to prevent many rebuilds on x86_64 and i686
-;; from commit fc9dbf41311d99d0fd8befc789ea7c0e35911890. Update users of
-;; this in the next rebuild cycle.
-(define-public llvm-without-rtti
- (package
- (inherit llvm)
- (arguments
- `(#:configure-flags '("-DCMAKE_SKIP_BUILD_RPATH=FALSE"
- "-DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE"
- "-DBUILD_SHARED_LIBS:BOOL=TRUE"
- "-DLLVM_ENABLE_FFI:BOOL=TRUE"
- "-DLLVM_INSTALL_UTILS=ON")
- #:build-type "Release"
- #:phases (modify-phases %standard-phases
- (add-before 'build 'shared-lib-workaround
- (lambda _
- (setenv "LD_LIBRARY_PATH"
- (string-append (getcwd) "/lib"))
- #t)))))))
-
(define* (clang-runtime-from-llvm llvm hash
#:optional (patches '()))
(package