[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: Merge branch 'master' into core-updates
|
From: |
Marius Bakke |
|
Subject: |
01/02: Merge branch 'master' into core-updates |
|
Date: |
Tue, 25 Sep 2018 19:35:09 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 6a0427af6cc3d52c0efc09262e90c1858ae6f40e
Merge: 985d542 3b97a17
Author: Marius Bakke <address@hidden>
Date: Wed Sep 26 01:11:32 2018 +0200
Merge branch 'master' into core-updates
doc/guix.texi | 211 +++++++
gnu/local.mk | 6 +-
gnu/packages/admin.scm | 20 +-
gnu/packages/audio.scm | 4 +-
gnu/packages/bioinformatics.scm | 248 ++++++--
gnu/packages/bittorrent.scm | 6 +-
gnu/packages/check.scm | 4 +-
gnu/packages/cran.scm | 20 +
gnu/packages/databases.scm | 6 +-
gnu/packages/debian.scm | 7 +-
gnu/packages/education.scm | 4 +-
gnu/packages/emacs.scm | 184 ++++--
gnu/packages/enchant.scm | 58 +-
gnu/packages/fcitx.scm | 2 +-
gnu/packages/ftp.scm | 16 +-
gnu/packages/gl.scm | 13 +-
gnu/packages/gnome.scm | 60 +-
gnu/packages/gnuzilla.scm | 166 ++---
gnu/packages/golang.scm | 119 ++++
gnu/packages/gprolog.scm | 19 +-
gnu/packages/graphics.scm | 8 +-
gnu/packages/graphviz.scm | 9 +-
gnu/packages/gtk.scm | 5 +-
gnu/packages/guile.scm | 40 +-
gnu/packages/haskell.scm | 9 +-
gnu/packages/ibus.scm | 37 +-
gnu/packages/image.scm | 12 +-
gnu/packages/kodi.scm | 27 +-
gnu/packages/linux.scm | 16 +-
gnu/packages/lxde.scm | 4 +-
gnu/packages/machine-learning.scm | 19 +-
gnu/packages/mate.scm | 2 +-
gnu/packages/maths.scm | 21 +-
gnu/packages/messaging.scm | 17 +-
gnu/packages/nano.scm | 4 +-
gnu/packages/networking.scm | 56 +-
gnu/packages/node.scm | 34 +-
gnu/packages/ocaml.scm | 12 +-
gnu/packages/openldap.scm | 1 +
gnu/packages/package-management.scm | 4 +-
gnu/packages/parallel.scm | 6 +-
.../patches/hmmer-remove-cpu-specificity.patch | 22 -
gnu/packages/patches/icecat-CVE-2018-12383.patch | 103 ++++
.../icecat-CVE-2018-5157-and-CVE-2018-5158.patch | 441 -------------
.../patches/icecat-avoid-bundled-libraries.patch | 20 +-
gnu/packages/patches/icecat-bug-1413868-pt1.patch | 663 --------------------
.../libvpx-use-after-free-in-postproc.patch | 34 +
gnu/packages/patches/rsem-makefile.patch | 682 ---------------------
gnu/packages/python-crypto.scm | 6 +-
gnu/packages/python-web.scm | 140 ++++-
gnu/packages/python.scm | 75 ++-
gnu/packages/rust.scm | 57 +-
gnu/packages/skarnet.scm | 4 +-
gnu/packages/syndication.scm | 3 +
gnu/packages/version-control.scm | 6 +-
gnu/packages/video.scm | 3 +-
gnu/packages/web.scm | 4 +-
gnu/packages/webkit.scm | 49 +-
gnu/packages/wxwidgets.scm | 4 +-
gnu/packages/xml.scm | 11 +-
gnu/packages/xorg.scm | 4 +-
gnu/services/web.scm | 96 ++-
gnu/system/mapped-devices.scm | 5 +-
gnu/system/vm.scm | 20 +-
gnu/tests/web.scm | 41 ++
guix/build/store-copy.scm | 23 +-
guix/channels.scm | 16 +-
guix/git-download.scm | 15 +-
guix/gnupg.scm | 2 +-
guix/inferior.scm | 366 ++++++++++-
guix/profiles.scm | 27 +-
guix/progress.scm | 4 +-
guix/scripts/pull.scm | 20 +-
guix/scripts/substitute.scm | 4 +-
guix/serialization.scm | 3 +-
guix/store/database.scm | 44 +-
tests/guix-package.sh | 15 +
tests/inferior.scm | 123 +++-
78 files changed, 2290 insertions(+), 2381 deletions(-)
diff --cc gnu/packages/guile.scm
index 0333c25,6d8ab71..39d1ebe
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@@ -285,8 -287,75 +285,46 @@@ without requiring the source code to b
(max-silent-time . 36000))))) ;10 hours (needed on ARM
; when heavily loaded)
-(define-public guile-2.2.2
- ;; Keep it so that, when 'guix' runs on 2.2.2, 'guix pull' compiles objects
- ;; with 2.2.2, thereby avoiding the ABI incompatibility issues described in
- ;; <https://bugs.gnu.org/29570>.
- (package
- (inherit guile-2.2)
- (version "2.2.2")
- (source (origin
- (inherit (package-source guile-2.2))
- (uri (string-append "mirror://gnu/guile/guile-" version
- ".tar.xz"))
- (sha256
- (base32
- "1azm25zcmxif0skxfrp11d2wc89nrzpjaann9yxdw6pvjxhs948w"))))))
-
-(define-public guile-2.2.4
- ;; This version contains important bug fixes, in particular wrt. to crashes
- ;; of multi-threaded code as used by 'guix pull' and grafting.
- (package
- (inherit guile-2.2)
- (version "2.2.4")
- (source (origin
- (inherit (package-source guile-2.2))
- (uri (string-append "mirror://gnu/guile/guile-" version
- ".tar.xz"))
- (sha256
- (base32
- "07p3g0v2ba2vlfbfidqzlgbhnzdx46wh2rgc5gszq1mjyx5bks6r"))))))
-
(define-public guile-next
- (deprecated-package "guile-next" guile-2.2))
+ ;; This is the upcoming Guile 3.0, with JIT support.
+ (let ((commit "a74b4a45fab1a78e34954bce5f031e8a9765f827")
+ (revision "0"))
+ (package
+ (inherit guile-2.2)
+ (name "guile-next")
+ (version (git-version "2.99" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://git.savannah.gnu.org/git/guile.git";)
+ (commit commit)))
+ (sha256
+ (base32
+ "0kq6mabv7j4gdlwmpz3iaddv98sc7awkl2358sg8j50sg10yw8nx"))
+ (file-name (git-file-name name version))))
+ (native-inputs
+ `(("autoconf", autoconf)
+ ("automake" ,automake)
+ ("libtool" ,libtool)
+ ("gettext" ,gnu-gettext)
+ ("texinfo" ,texinfo)
+ ("flex" ,flex)
+ ,@(package-native-inputs guile-2.2)))
+ (arguments
+ (substitute-keyword-arguments (package-arguments guile-2.2)
+ ((#:phases phases '%standard-phases)
+ ;; XXX: The default 'bootstrap' phase tries to execute the
+ ;; ./bootstrap directory.
+ `(modify-phases ,phases
+ (replace 'bootstrap
+ (lambda _
+ (patch-shebang "build-aux/git-version-gen")
+ (invoke "autoreconf" "-vfi")))
+ (add-before 'check 'skip-version-test
+ (lambda _
+ ;; Remove this test that's bound to fail.
+ (delete-file "test-suite/tests/version.test")
+ #t)))))))))
(define (make-guile-readline guile)
(package