[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, 29 Nov 2018 10:00:46 -0500 (EST) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 25ca46985ccb26880f98b479d2a3ac862b20006e
Merge: e2b9ed7 7af6e5d
Author: Marius Bakke <address@hidden>
Date: Thu Nov 29 15:56:49 2018 +0100
Merge branch 'master' into core-updates
Makefile.am | 2 +
doc/guix.texi | 18 +-
gnu/local.mk | 5 +
gnu/packages/audio.scm | 36 ++
gnu/packages/bioconductor.scm | 38 ++
gnu/packages/code.scm | 7 +-
gnu/packages/databases.scm | 4 +-
gnu/packages/elf.scm | 4 +-
gnu/packages/emacs.scm | 158 +++---
gnu/packages/enlightenment.scm | 11 +-
gnu/packages/guile.scm | 6 +-
gnu/packages/kodi.scm | 4 +-
gnu/packages/linux.scm | 18 +-
gnu/packages/lisp.scm | 257 +++++++++-
gnu/packages/llvm.scm | 74 ++-
gnu/packages/machine-learning.scm | 7 +-
gnu/packages/mail.scm | 8 +-
gnu/packages/maths.scm | 17 +-
gnu/packages/mtools.scm | 4 +-
gnu/packages/ocaml.scm | 30 +-
gnu/packages/package-management.scm | 9 +-
gnu/packages/parallel.scm | 4 +-
.../libopenshot-tests-with-system-libs.patch | 95 ++++
gnu/packages/patches/scribus-poppler.patch | 72 +++
gnu/packages/patches/x265-arm-flags.patch | 36 ++
gnu/packages/phabricator.scm | 124 +++++
gnu/packages/python.scm | 48 +-
gnu/packages/qt.scm | 11 +-
gnu/packages/scheme.scm | 182 +++----
gnu/packages/scribus.scm | 4 +-
gnu/packages/version-control.scm | 64 +++
gnu/packages/video.scm | 183 ++++++-
gnu/packages/vim.scm | 12 +-
gnu/packages/virtualization.scm | 56 +++
gnu/packages/web-browsers.scm | 39 ++
gnu/packages/web.scm | 6 +-
gnu/packages/wine.scm | 6 +-
gnu/services/ssh.scm | 10 +-
gnu/system/examples/bare-bones.tmpl | 4 +-
guix/channels.scm | 12 +
guix/derivations.scm | 30 +-
guix/docker.scm | 9 +-
guix/download.scm | 24 +-
guix/gexp.scm | 5 +-
guix/git-download.scm | 70 ++-
guix/grafts.scm | 7 +-
guix/inferior.scm | 70 ++-
guix/scripts/describe.scm | 4 +-
guix/scripts/hash.scm | 5 +-
guix/scripts/pack.scm | 19 +
guix/scripts/repl.scm | 5 +-
guix/ssh.scm | 6 +-
guix/status.scm | 14 +-
guix/swh.scm | 560 +++++++++++++++++++++
guix/ui.scm | 26 +-
nix/nix-daemon/nix-daemon.cc | 6 +
po/doc/local.mk | 12 +-
tests/derivations.scm | 10 +
tests/gexp.scm | 10 +-
tests/grafts.scm | 13 +-
tests/inferior.scm | 9 +
61 files changed, 2228 insertions(+), 371 deletions(-)
diff --cc gnu/packages/llvm.scm
index 0d3bff9,dace546..8a9d1d3
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@@ -7,7 -7,8 +7,9 @@@
;;; Copyright © 2017 Roel Janssen <address@hidden>
;;; Copyright © 2018 Marius Bakke <address@hidden>
;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
+;;; Copyright © 2018 Efraim Flashner <address@hidden>
+ ;;; Copyright © 2018 Tim Gesthuizen <address@hidden>
+ ;;; Copyright © 2018 Pierre Neidhardt <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/machine-learning.scm
index 7b9b28a,a7df9dc..5fb375c
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@@ -331,9 -332,8 +332,9 @@@ algorithm."
(origin
(method url-fetch)
(uri (string-append
- "http://www.imbs-luebeck.de/imbs/sites/default/files/u59/"
- "randomjungle-" version ".tar_.gz"))
+ "https://www.imbs.uni-luebeck.de/fileadmin/files/Software"
+ "/randomjungle/randomjungle-" version ".tar_.gz"))
+ (patches (search-patches "randomjungle-disable-static-build.patch"))
(sha256
(base32
"12c8rf30cla71swx2mf4ww9mfd8jbdw5lnxd7dxhyw1ygrvg6y4w"))))
diff --cc guix/gexp.scm
index 809c118,786e378..fd3b6be
--- a/guix/gexp.scm
+++ b/guix/gexp.scm
@@@ -631,6 -631,13 +631,8 @@@ names and file names suitable for the #
allowed-references disallowed-references
leaked-env-vars
local-build? (substitutable? #t)
+ (properties '())
+
- ;; TODO: This parameter is transitional; it's here
- ;; to avoid a full rebuild. Remove it on the next
- ;; rebuild cycle.
- import-creates-derivation?
-
deprecation-warnings
(script-name (string-append name "-builder")))
"Return a derivation NAME that runs EXP (a gexp) with GUILE-FOR-BUILD (a