[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into core-updates
|
From: |
Mark H. Weaver |
|
Subject: |
01/01: Merge branch 'master' into core-updates |
|
Date: |
Mon, 7 Nov 2016 05:57:23 +0000 (UTC) |
mhw pushed a commit to branch core-updates
in repository guix.
commit 71e21fb26dceef7a665b3b1c0dec7ebd92d8ec82
Merge: 19ac2ba 14ac8e4
Author: Mark H Weaver <address@hidden>
Date: Mon Nov 7 00:33:16 2016 -0500
Merge branch 'master' into core-updates
doc/guix.texi | 51 +-
gnu/build/file-systems.scm | 2 +-
gnu/build/install.scm | 23 +-
gnu/local.mk | 3 +-
gnu/packages/admin.scm | 10 +-
gnu/packages/game-development.scm | 23 +-
gnu/packages/games.scm | 7 +-
gnu/packages/ghostscript.scm | 3 +-
gnu/packages/java.scm | 16 +-
gnu/packages/lua.scm | 25 +-
gnu/packages/networking.scm | 2 +-
gnu/packages/patches/jansson-CVE-2016-4425.patch | 125 -----
.../{lua52-liblua-so.patch => lua-liblua-so.patch} | 2 +
gnu/packages/python.scm | 139 ++++-
gnu/packages/qt.scm | 13 +-
gnu/packages/statistics.scm | 2 +-
gnu/packages/tls.scm | 4 +-
gnu/packages/vim.scm | 4 +-
gnu/packages/web.scm | 5 +-
gnu/system.scm | 22 +-
gnu/system/pam.scm | 2 +-
guix/profiles.scm | 19 +
guix/scripts/package.scm | 8 +-
guix/scripts/system.scm | 106 +++-
po/guix/fr.po | 546 +++++++++-----------
25 files changed, 656 insertions(+), 506 deletions(-)
diff --cc gnu/local.mk
index 4bdace4,aaa9f5c..e1fd8ce
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -613,8 -613,6 +613,7 @@@ dist_patch_DATA =
%D%/packages/patches/id3lib-CVE-2007-4460.patch \
%D%/packages/patches/ilmbase-fix-tests.patch \
%D%/packages/patches/inkscape-drop-wait-for-targets.patch \
+ %D%/packages/patches/isl-0.11.1-aarch64-support.patch \
- %D%/packages/patches/jansson-CVE-2016-4425.patch \
%D%/packages/patches/jbig2dec-ignore-testtest.patch \
%D%/packages/patches/jq-CVE-2015-8863.patch \
%D%/packages/patches/khmer-use-libraries.patch \
diff --cc gnu/packages/ghostscript.scm
index 87e4d0e,591e3e7..b254b80
--- a/gnu/packages/ghostscript.scm
+++ b/gnu/packages/ghostscript.scm
@@@ -200,10 -191,25 +200,11 @@@ file format. It also includes a C libr
capabilities of the PostScript language. It supports a wide variety of
output file formats and printers.")
(license license:agpl3+)
- (home-page "http://www.gnu.org/software/ghostscript/";)))
+ (home-page "http://www.gnu.org/software/ghostscript/";)
+ (properties '((upstream-name . "gnu-ghostscript")))))
-(define ghostscript/fixed
- (package
- (inherit ghostscript)
- (replacement #f) ; Prevent ghostscript/x from inheriting the replacement
- (source (origin
- (inherit (package-source ghostscript))
- (patches (search-patches "ghostscript-CVE-2013-5653.patch"
- "ghostscript-CVE-2015-3228.patch"
- "ghostscript-CVE-2016-7976.patch"
- "ghostscript-CVE-2016-7978.patch"
- "ghostscript-CVE-2016-7979.patch"
- "ghostscript-CVE-2016-8602.patch"
- "ghostscript-runpath.patch"))))))
-
(define-public ghostscript/x
- (package (inherit ghostscript/fixed)
+ (package (inherit ghostscript)
(name (string-append (package-name ghostscript) "-with-x"))
(inputs `(("libxext" ,libxext)
("libxt" ,libxt)