[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into core-updates
From: |
Marius Bakke |
Subject: |
01/01: Merge branch 'master' into core-updates |
Date: |
Sun, 6 May 2018 10:00:13 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 12bd588346f8b2fb3709acfe0ee89d153da2db34
Merge: 7d5adf0 8e02051
Author: Marius Bakke <address@hidden>
Date: Sun May 6 15:56:24 2018 +0200
Merge branch 'master' into core-updates
doc/guix.texi | 44 +
gnu/local.mk | 10 +-
gnu/packages/admin.scm | 9 +-
gnu/packages/aidc.scm | 6 +-
gnu/packages/algebra.scm | 4 +-
gnu/packages/audio.scm | 13 +-
gnu/packages/avahi.scm | 31 +-
gnu/packages/bioconductor.scm | 5 +-
gnu/packages/bioinformatics.scm | 2 +-
gnu/packages/bittorrent.scm | 4 +-
gnu/packages/boost.scm | 6 +-
gnu/packages/c.scm | 4 +-
gnu/packages/check.scm | 2 +
gnu/packages/cran.scm | 21 +-
gnu/packages/emacs.scm | 2454 +++++++++++++++++++-
gnu/packages/emulators.scm | 5 +-
gnu/packages/engineering.scm | 4 +-
gnu/packages/enlightenment.scm | 5 +-
gnu/packages/freeipmi.scm | 4 +-
gnu/packages/game-development.scm | 24 +-
gnu/packages/games.scm | 182 +-
gnu/packages/gimp.scm | 121 +-
gnu/packages/gl.scm | 6 +-
gnu/packages/gnome.scm | 95 +-
gnu/packages/gnupg.scm | 25 +-
gnu/packages/gnuzilla.scm | 2 +-
gnu/packages/groff.scm | 2 +-
gnu/packages/guile.scm | 37 +-
gnu/packages/linux.scm | 36 +-
gnu/packages/mail.scm | 30 +-
gnu/packages/man.scm | 15 +-
gnu/packages/maths.scm | 35 +-
gnu/packages/messaging.scm | 40 +-
gnu/packages/nano.scm | 4 +-
gnu/packages/networking.scm | 63 +
gnu/packages/ocaml.scm | 35 +-
gnu/packages/package-management.scm | 9 +
gnu/packages/patches/amule-crypto-6.patch | 45 +
gnu/packages/patches/gegl-CVE-2012-4433.patch | 117 -
gnu/packages/patches/gimp-CVE-2017-17784.patch | 41 -
gnu/packages/patches/gimp-CVE-2017-17785.patch | 171 --
gnu/packages/patches/gimp-CVE-2017-17786.patch | 94 -
gnu/packages/patches/gimp-CVE-2017-17787.patch | 42 -
gnu/packages/patches/gimp-CVE-2017-17789.patch | 48 -
.../patches/liboop-mips64-deplibs-fix.patch | 17 -
gnu/packages/patches/shadow-CVE-2018-7169.patch | 191 --
gnu/packages/pdf.scm | 32 +-
gnu/packages/perl.scm | 4 +-
gnu/packages/photo.scm | 4 +-
gnu/packages/plotutils.scm | 4 +-
gnu/packages/python.scm | 54 +-
gnu/packages/qt.scm | 4 +-
gnu/packages/ruby.scm | 22 +-
gnu/packages/samba.scm | 20 +-
gnu/packages/security-token.scm | 90 +
gnu/packages/serialization.scm | 6 +-
gnu/packages/shells.scm | 4 +-
gnu/packages/ssh.scm | 9 +-
gnu/packages/statistics.scm | 40 +-
gnu/packages/syncthing.scm | 28 +-
gnu/packages/tls.scm | 18 +-
gnu/packages/upnp.scm | 4 +-
gnu/packages/video.scm | 3 +-
gnu/packages/virtualization.scm | 4 +-
gnu/packages/web.scm | 34 +-
gnu/packages/wm.scm | 45 +
gnu/packages/xorg.scm | 11 +-
gnu/services/messaging.scm | 9 +-
gnu/services/sound.scm | 86 +
guix/build/compile.scm | 45 +-
guix/build/emacs-utils.scm | 4 +-
guix/scripts/build.scm | 76 +-
guix/scripts/system/search.scm | 7 +-
guix/scripts/weather.scm | 8 +-
guix/ui.scm | 73 +-
po/guix/pt_BR.po | 1119 +++++----
tests/guix-build.sh | 21 +-
77 files changed, 4358 insertions(+), 1690 deletions(-)
diff --cc gnu/local.mk
index aa3109d,cfe698d..9727f0e
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -707,12 -707,8 +708,7 @@@ dist_patch_DATA =
%D%/packages/patches/ghostscript-no-header-creationdate.patch \
%D%/packages/patches/ghostscript-runpath.patch \
%D%/packages/patches/giflib-make-reallocarray-private.patch \
- %D%/packages/patches/gimp-CVE-2017-17784.patch \
- %D%/packages/patches/gimp-CVE-2017-17785.patch \
- %D%/packages/patches/gimp-CVE-2017-17786.patch \
- %D%/packages/patches/gimp-CVE-2017-17787.patch \
- %D%/packages/patches/gimp-CVE-2017-17789.patch \
%D%/packages/patches/glib-networking-ssl-cert-file.patch \
- %D%/packages/patches/glib-respect-datadir.patch \
%D%/packages/patches/glib-tests-timer.patch \
%D%/packages/patches/glibc-CVE-2015-5180.patch \
%D%/packages/patches/glibc-CVE-2015-7547.patch \
diff --cc gnu/packages/admin.scm
index 3d69f68,4a2fe14..83b1d08
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@@ -969,12 -965,10 +968,12 @@@ system administrator."
version ".tar.gz")))
(sha256
(base32
- "00pxp74xkwdcmrjwy55j0k8p684jk1zx3nzdc11v30q8q8kwnmkj"))
+ "0yg62wq8rcrbr7qvh3wgfg2g4bwanbi50cr2lf2cfyy8dydx4qyq"))
(modules '((guix build utils)))
(snippet
- '(delete-file-recursively "lib/zlib"))))
+ '(begin
+ (delete-file-recursively "lib/zlib")
+ #t))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
diff --cc gnu/packages/boost.scm
index 6b17e30,cdfbda6..d8ce30c
--- a/gnu/packages/boost.scm
+++ b/gnu/packages/boost.scm
@@@ -96,29 -92,42 +96,29 @@@
(setenv "SHELL" (which "sh"))
(setenv "CONFIG_SHELL" (which "sh"))
- (zero? (system* "./bootstrap.sh"
- (string-append "--prefix=" out)
- "--with-toolset=gcc")))))
- (replace
- 'build
- (lambda* (#:key outputs make-flags #:allow-other-keys)
- (zero? (apply system* "./b2"
- (format #f "-j~a" (parallel-job-count))
- make-flags))))
- (replace
- 'install
- (lambda* (#:key outputs make-flags #:allow-other-keys)
- (zero? (apply system* "./b2" "install" make-flags)))))))
+ (invoke "./bootstrap.sh"
+ (string-append "--prefix=" out)
+ ;; Auto-detection looks for ICU only in traditional
+ ;; install locations.
+ (string-append "--with-icu=" icu)
+ "--with-toolset=gcc"))))
+ (replace 'build
+ (lambda* (#:key make-flags #:allow-other-keys)
+ (apply invoke "./b2"
+ (format #f "-j~a" (parallel-job-count))
+ make-flags)))
+ (replace 'install
+ (lambda* (#:key make-flags #:allow-other-keys)
+ (apply invoke "./b2" "install" make-flags))))))
- (home-page "http://www.boost.org")
+ (home-page "https://www.boost.org")
(synopsis "Peer-reviewed portable C++ source libraries")
(description
"A collection of libraries intended to be widely useful, and usable
across a broad spectrum of applications.")
- (license (license:x11-style "http://www.boost.org/LICENSE_1_0.txt"
+ (license (license:x11-style "https://www.boost.org/LICENSE_1_0.txt"
"Some components have other similar
licences."))))
-(define-public boost-1.66
- (package
- (inherit boost)
- (version "1.66.0")
- (source (origin
- (method url-fetch)
- (uri (string-append
- "mirror://sourceforge/boost/boost/" version "/boost_"
- (string-map (lambda (x) (if (eq? x #\.) #\_ x)) version)
- ".tar.bz2"))
- (sha256
- (base32
- "1aaw48cmimsskzgiclwn0iifp62a5iw9cbqrhfari876af1828ap"))))))
-
(define-public boost-sync
(let ((commit "c72891d9b90e2ceb466ec859f640cd012b2d8709")
(version "1.55")
diff --cc gnu/packages/emacs.scm
index fcb4390,622915d..0b19586
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@@ -839,26 -877,24 +880,26 @@@ provides an optional IDE-like error lis
version ".tar.gz"))
(sha256
(base32
- "1b0kalhn81dir26jgsma30i5bbly7d3s1ngqpf01zjjpr7lw5v0h"))
+ "08f9lj77jlk96grqgjsv63s2i8ywvp4wvnmgmhnslwyx2lsdxza3"))
(modules '((guix build utils)))
(snippet
- '(substitute* "Makefile"
- (("/usr/bin/install-info")
- ;; No need to use 'install-info' since it would create a
- ;; useless 'dir' file.
- "true")
- (("^INFODIR=.*")
- ;; Install Info files to $out/share/info, not $out/info.
- "INFODIR := $(PREFIX)/share/info\n")
- (("/site-lisp/emms")
- ;; Install directly in share/emacs/site-lisp, not in a
- ;; sub-directory.
- "/site-lisp")
- (("^all: (.*)\n" _ rest)
- ;; Build 'emms-print-metadata'.
- (string-append "all: " rest " emms-print-metadata\n"))))))
+ '(begin
+ (substitute* "Makefile"
+ (("/usr/bin/install-info")
+ ;; No need to use 'install-info' since it would create a
+ ;; useless 'dir' file.
+ "true")
+ (("^INFODIR=.*")
+ ;; Install Info files to $out/share/info, not $out/info.
+ "INFODIR := $(PREFIX)/share/info\n")
+ (("/site-lisp/emms")
+ ;; Install directly in share/emacs/site-lisp, not in a
+ ;; sub-directory.
+ "/site-lisp")
+ (("^all: (.*)\n" _ rest)
+ ;; Build 'emms-print-metadata'.
+ (string-append "all: " rest " emms-print-metadata\n")))
+ #t))))
(build-system gnu-build-system)
(arguments
`(#:modules ((guix build gnu-build-system)
diff --cc gnu/packages/guile.scm
index c949722,3807608..ae7813c
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@@ -916,10 -914,9 +916,10 @@@ specification. These are the main feat
;; Also copy over the README.
(install-file "README.org" doc)
+
#t))))
(inputs
- `(("guile" ,guile-2.0)))
+ `(("guile" ,guile-2.2)))
(home-page "https://github.com/ijp/minikanren")
(synopsis "MiniKanren declarative logic system, packaged for Guile")
(description
@@@ -1364,11 -1352,10 +1370,11 @@@ above command-line parameters."
"redis/Makefile.in"
"redis/commands/Makefile.in")
(("moddir =.*/share/guile/site" all)
- (string-append all "/@GUILE_EFFECTIVE_VERSION@")))))))
+ (string-append all "/@GUILE_EFFECTIVE_VERSION@")))
+ #t))))
(build-system gnu-build-system)
(native-inputs
- `(("guile" ,guile-2.0)))
+ `(("guile" ,guile-2.2)))
(home-page "https://savannah.nongnu.org/projects/guile-redis/")
(synopsis "Redis client library for Guile")
(description "Guile-redis provides a Scheme interface to the Redis
diff --cc gnu/packages/man.scm
index 3455a9c,334ebe2..046b0e3
--- a/gnu/packages/man.scm
+++ b/gnu/packages/man.scm
@@@ -79,9 -80,8 +80,9 @@@ a flexible and convenient way."
(("#! /bin/sh")
(string-append "#!" (which "sh")))))
(remove file-is-directory?
- (find-files "src/tests" ".*"))))))
+ (find-files "src/tests" ".*")))
+ #t)))
- (add-after 'unpack 'patch-iconv-path
+ (add-after 'unpack 'patch-absolute-paths
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "src/man.c"
(("\"iconv\"")
diff --cc gnu/packages/syncthing.scm
index 0a90610,e29405a..b650bed
--- a/gnu/packages/syncthing.scm
+++ b/gnu/packages/syncthing.scm
@@@ -37,12 -37,11 +37,12 @@@
"/syncthing-source-v" version ".tar.gz"))
(sha256
(base32
- "0h5b2mp0li0qzrz3wggzavdfqfaz9b79hx6wds84ya2i9maw80cl"))
+ "1wz6cwq3la5676z1c20sh4fykmjwhs410xzcnb2jfyzaldf57cwj"))
(modules '((guix build utils)))
;; Delete bundled ("vendored") free software source code.
- (snippet
- '(delete-file-recursively "vendor"))))
+ (snippet '(begin
+ (delete-file-recursively "vendor")
+ #t))))
(build-system go-build-system)
;; The primary Syncthing executable goes to "out", while the auxiliary
;; server programs and utility tools go to "utils". This reduces the size