[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into core-updates
|
From: |
Leo Famulari |
|
Subject: |
01/01: Merge branch 'master' into core-updates |
|
Date: |
Fri, 22 Jul 2016 22:59:59 +0000 (UTC) |
lfam pushed a commit to branch core-updates
in repository guix.
commit d227260d2f7833b6bdc55b8e3792378626ef3b69
Merge: d778fa5 26ad4ad
Author: Leo Famulari <address@hidden>
Date: Fri Jul 22 18:57:40 2016 -0400
Merge branch 'master' into core-updates
Resolved conflicts:
* gnu/packages/scheme.scm: Conflict in import of (guix licenses). On master,
"#:hide (openssl)" was used. On core-updates, "#:select (some licenses)" was
used. The latter won the conflict.
* gnu/packages/version-control.scm (git)[arguments]: Whitespace conflict
in 'install-shell-completion.
build-aux/build-self.scm | 59 +++-
doc/contributing.texi | 6 +
doc/guix.texi | 48 +++-
gnu/local.mk | 1 +
gnu/packages/admin.scm | 15 +-
gnu/packages/audacity.scm | 5 +-
gnu/packages/audio.scm | 44 ++-
gnu/packages/bioinformatics.scm | 11 +-
gnu/packages/boost.scm | 2 +-
gnu/packages/cdrom.scm | 4 +-
gnu/packages/certs.scm | 22 +-
gnu/packages/code.scm | 4 +-
gnu/packages/compression.scm | 3 +-
gnu/packages/cups.scm | 4 +-
gnu/packages/djvu.scm | 4 +-
gnu/packages/docbook.scm | 7 +-
gnu/packages/documentation.scm | 8 +-
gnu/packages/enlightenment.scm | 4 +-
gnu/packages/flashing-tools.scm | 4 +-
gnu/packages/fonts.scm | 7 +-
gnu/packages/fontutils.scm | 4 +-
gnu/packages/game-development.scm | 53 ++++
gnu/packages/games.scm | 8 +-
gnu/packages/ghostscript.scm | 4 +-
gnu/packages/gl.scm | 10 +-
gnu/packages/gnome.scm | 2 +-
gnu/packages/gnucash.scm | 4 +-
gnu/packages/graphviz.scm | 4 +-
gnu/packages/{djvu.scm => hexedit.scm} | 30 +-
gnu/packages/image.scm | 26 +-
gnu/packages/java.scm | 479 +++++++++++++++++---------------
gnu/packages/libreoffice.scm | 23 +-
gnu/packages/libusb.scm | 4 +-
gnu/packages/linux.scm | 21 +-
gnu/packages/lirc.scm | 4 +-
gnu/packages/lxde.scm | 14 +-
gnu/packages/mail.scm | 15 +-
gnu/packages/maths.scm | 344 +++++++++++++----------
gnu/packages/mcrypt.scm | 13 +-
gnu/packages/mp3.scm | 6 +-
gnu/packages/mpi.scm | 21 +-
gnu/packages/music.scm | 4 +-
gnu/packages/networking.scm | 7 +-
gnu/packages/ocr.scm | 34 +--
gnu/packages/onc-rpc.scm | 2 +-
gnu/packages/password-utils.scm | 4 +-
gnu/packages/pdf.scm | 12 +-
gnu/packages/perl.scm | 4 +-
gnu/packages/photo.scm | 12 +-
gnu/packages/popt.scm | 3 +-
gnu/packages/protobuf.scm | 34 ++-
gnu/packages/python.scm | 53 +++-
gnu/packages/rdesktop.scm | 4 +-
gnu/packages/scheme.scm | 137 +++++----
gnu/packages/screen.scm | 4 +-
gnu/packages/slim.scm | 2 +-
gnu/packages/swig.scm | 5 +-
gnu/packages/tcl.scm | 8 +-
gnu/packages/tex.scm | 20 +-
gnu/packages/textutils.scm | 2 +-
gnu/packages/version-control.scm | 202 +++++++-------
gnu/packages/video.scm | 11 +-
gnu/packages/w3m.scm | 5 +-
gnu/packages/web.scm | 9 +-
gnu/packages/wm.scm | 2 +-
gnu/packages/wxwidgets.scm | 4 +-
gnu/packages/xdisorg.scm | 7 +-
gnu/packages/xiph.scm | 4 +-
gnu/packages/xml.scm | 3 +-
gnu/services/avahi.scm | 3 +-
gnu/services/base.scm | 6 +
gnu/services/databases.scm | 10 +-
gnu/services/dbus.scm | 4 +-
gnu/services/desktop.scm | 31 ++-
gnu/services/dict.scm | 1 +
gnu/services/lirc.scm | 7 +-
gnu/services/mail.scm | 1 +
gnu/services/networking.scm | 15 +
gnu/services/ssh.scm | 5 +-
gnu/services/web.scm | 7 +-
gnu/services/xorg.scm | 2 +
guix/build/download.scm | 2 +-
guix/build/pull.scm | 39 ++-
guix/config.scm.in | 33 ++-
guix/derivations.scm | 21 +-
guix/download.scm | 6 +-
guix/scripts/publish.scm | 59 +++-
tests/guix-system.sh | 4 +-
tests/publish.scm | 34 +++
89 files changed, 1408 insertions(+), 831 deletions(-)
diff --cc gnu/packages/fonts.scm
index 3faeb2e,4bc4134..9b2281a
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@@ -126,10 -126,10 +126,10 @@@ TrueType (TTF) files."
(define-public font-dejavu
(package
(name "font-dejavu")
- (version "2.34")
+ (version "2.35")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://sourceforge/dejavu/"
+ (uri (string-append "mirror://sourceforge/dejavu/dejavu/"
version "/dejavu-fonts-ttf-"
version ".tar.bz2"))
(sha256
diff --cc gnu/packages/pdf.scm
index 36c538c,c5cbe98..dd7a0b0
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@@ -509,37 -506,25 +509,37 @@@ and examining the file structure (pdfsh
(version "5.1.3")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://sourceforge/qpdf/qpdf-"
- version ".tar.gz"))
+ (uri (string-append "mirror://sourceforge/qpdf/qpdf/" version
+ "/qpdf-" version ".tar.gz"))
(sha256 (base32
-
"1lq1v7xghvl6p4hgrwbps3a13ad6lh4ib3myimb83hxgsgd4n5nm"))))
+ "1lq1v7xghvl6p4hgrwbps3a13ad6lh4ib3myimb83hxgsgd4n5nm"))
+ (modules '((guix build utils)))
+ (snippet
+ ;; Replace shebang with the bi-lingual shell/Perl trick to remove
+ ;; dependency on Perl.
+ '(substitute* "qpdf/fix-qdf"
+ (("#!/usr/bin/env perl")
+ "\
+eval '(exit $?0)' && eval 'exec perl -wS \"$0\" ${1+\"address@hidden"}'
+ & eval 'exec perl -wS \"$0\" $argv:q'
+ if 0;\n")))))
(build-system gnu-build-system)
(arguments
- '(#:phases (alist-cons-before
- 'configure 'patch-paths
- (lambda _
- (substitute* "make/libtool.mk"
- (("SHELL=/bin/bash")
- (string-append "SHELL=" (which "bash"))))
- (substitute* (append
- '("qtest/bin/qtest-driver")
- (find-files "." "\\.test"))
- (("/usr/bin/env") (which "env"))))
- %standard-phases)))
+ `(#:disallowed-references (,perl)
+ #:phases (alist-cons-before
+ 'configure 'patch-paths
+ (lambda _
+ (substitute* "make/libtool.mk"
+ (("SHELL=/bin/bash")
+ (string-append "SHELL=" (which "bash"))))
+ (substitute* (append
+ '("qtest/bin/qtest-driver")
+ (find-files "." "\\.test"))
+ (("/usr/bin/env") (which "env"))))
+ %standard-phases)))
(native-inputs
- `(("pkg-config" ,pkg-config)))
+ `(("pkg-config" ,pkg-config)
+ ("perl" ,perl)))
(propagated-inputs
`(("pcre" ,pcre)))
(inputs