[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: Merge branch 'master' into core-updates
|
From: |
Ludovic Courtès |
|
Subject: |
01/02: Merge branch 'master' into core-updates |
|
Date: |
Sat, 12 Dec 2015 12:15:27 +0000 |
civodul pushed a commit to branch core-updates
in repository guix.
commit e82e55e58c67b0215e768c4612ca542bc670f633
Merge: 98bd851 e35dff9
Author: Ludovic Courtès <address@hidden>
Date: Sat Dec 12 11:42:12 2015 +0100
Merge branch 'master' into core-updates
.dir-locals.el | 1 +
.gitignore | 1 +
CODE-OF-CONDUCT | 48 +
Makefile.am | 16 +-
NEWS | 259 +
THANKS | 2 +
config-daemon.ac | 8 -
configure.ac | 8 +
daemon.am | 19 +-
doc/contributing.texi | 102 +-
doc/emacs.texi | 13 +-
doc/guix.texi | 716 ++-
doc/images/service-graph.dot | 7 +-
emacs/guix-backend.el | 2 +-
emacs/guix-base.el | 18 +-
emacs/guix-build-log.el | 58 +-
emacs/guix-command.el | 159 +-
emacs/guix-devel.el | 2 +
emacs/guix-emacs.el | 52 +-
emacs/guix-info.el | 11 +-
emacs/guix-init.el | 3 +-
emacs/guix-list.el | 8 +-
emacs/guix-main.scm | 7 +-
emacs/guix-pcomplete.el | 21 +-
emacs/guix-read.el | 6 +
emacs/guix-utils.el | 11 +
etc/guix-daemon.conf.in | 12 +
gnu-system.am | 60 +-
gnu.scm | 2 +-
gnu/build/linux-container.scm | 24 +-
gnu/packages/aarddict.scm | 70 -
gnu/packages/admin.scm | 50 +-
gnu/packages/aidc.scm | 9 +-
gnu/packages/algebra.scm | 48 +-
gnu/packages/animation.scm | 178 +
gnu/packages/{avr.scm => aria2.scm} | 42 +-
gnu/packages/audio.scm | 141 +-
gnu/packages/autogen.scm | 10 +-
gnu/packages/avahi.scm | 2 +-
gnu/packages/avr.scm | 46 +-
gnu/packages/backup.scm | 45 +
gnu/packages/base.scm | 15 +
gnu/packages/bash.scm | 8 +-
gnu/packages/bioinformatics.scm | 460 +-
gnu/packages/busybox.scm | 10 +-
gnu/packages/cdrom.scm | 28 +-
gnu/packages/cmake.scm | 15 +-
gnu/packages/compression.scm | 38 +-
gnu/packages/conkeror.scm | 62 +-
gnu/packages/cook.scm | 8 +-
gnu/packages/crypto.scm | 1 +
gnu/packages/curl.scm | 10 +-
gnu/packages/cyrus-sasl.scm | 4 +-
gnu/packages/databases.scm | 46 +
gnu/packages/datastructures.scm | 49 +
gnu/packages/debug.scm | 24 +-
gnu/packages/dico.scm | 80 +
gnu/packages/disk.scm | 62 +-
gnu/packages/docbook.scm | 5 +-
gnu/packages/emacs.scm | 109 +-
gnu/packages/engineering.scm | 2 +-
gnu/packages/enlightenment.scm | 25 +-
gnu/packages/firmware.scm | 1 +
gnu/packages/fish.scm | 4 +-
gnu/packages/fonts.scm | 17 +-
gnu/packages/fontutils.scm | 4 +-
gnu/packages/freedesktop.scm | 31 +-
gnu/packages/freeipmi.scm | 5 +-
gnu/packages/game-development.scm | 36 +-
gnu/packages/games.scm | 733 ++-
gnu/packages/gcc.scm | 13 +-
gnu/packages/gdb.scm | 5 +-
gnu/packages/gdbm.scm | 46 -
gnu/packages/geeqie.scm | 3 +-
gnu/packages/gimp.scm | 2 +-
gnu/packages/gl.scm | 78 +-
gnu/packages/glib.scm | 128 +-
gnu/packages/gnome.scm | 808 ++-
gnu/packages/gnucash.scm | 4 +-
gnu/packages/gnunet.scm | 40 +-
gnu/packages/gnupg.scm | 45 +-
gnu/packages/gnuzilla.scm | 52 +-
gnu/packages/grub.scm | 38 +-
gnu/packages/gstreamer.scm | 41 +-
gnu/packages/gtk.scm | 130 +-
gnu/packages/guile.scm | 220 +-
gnu/packages/haskell.scm | 6095 +++++++++++-
gnu/packages/hurd.scm | 14 +-
gnu/packages/image.scm | 123 +-
gnu/packages/imagemagick.scm | 53 +-
gnu/packages/inklingreader.scm | 59 +
gnu/packages/inkscape.scm | 6 +-
gnu/packages/irssi.scm | 15 +-
gnu/packages/java.scm | 22 +-
gnu/packages/kodi.scm | 223 +
gnu/packages/libreoffice.scm | 4 +-
gnu/packages/links.scm | 33 +-
gnu/packages/linux-libre-i686.conf | 211 +-
gnu/packages/linux-libre-x86_64.conf | 214 +-
gnu/packages/linux.scm | 150 +-
gnu/packages/lisp.scm | 14 +-
gnu/packages/llvm.scm | 5 +-
gnu/packages/lua.scm | 7 +-
gnu/packages/machine-learning.scm | 3 +
gnu/packages/mail.scm | 131 +-
gnu/packages/man.scm | 7 +-
gnu/packages/maths.scm | 115 +-
gnu/packages/messaging.scm | 5 +-
gnu/packages/mit-krb5.scm | 106 +-
gnu/packages/mp3.scm | 34 +-
gnu/packages/mpi.scm | 16 +-
gnu/packages/music.scm | 90 +-
gnu/packages/nano.scm | 5 +-
gnu/packages/ncurses.scm | 25 +
gnu/packages/node.scm | 80 +-
gnu/packages/ntp.scm | 4 +-
gnu/packages/ocaml.scm | 8 +-
gnu/packages/openstack.scm | 268 +-
gnu/packages/owncloud.scm | 80 +
gnu/packages/package-management.scm | 203 +-
gnu/packages/parallel.scm | 5 +-
gnu/packages/password-utils.scm | 41 +-
gnu/packages/patches/bluez-tests.patch | 25 +
gnu/packages/patches/byobu-writable-status.patch | 13 +
gnu/packages/patches/dbus-helper-search-path.patch | 18 +
gnu/packages/patches/dbus-localstatedir.patch | 30 -
gnu/packages/patches/devil-fix-libpng.patch | 36 +
.../patches/dico-libtool-deterministic.patch | 15 +
gnu/packages/patches/eudev-rules-directory.patch | 18 +-
gnu/packages/patches/evilwm-lost-focus-bug.patch | 18 +
gnu/packages/patches/glib-tests-desktop.patch | 18 +-
gnu/packages/patches/gsl-poly-test-fix-pt1.patch | 84 -
gnu/packages/patches/gsl-poly-test-fix-pt2.patch | 27 -
.../patches/hwloc-gather-topology-lstopo.patch | 13 -
gnu/packages/patches/jasper-CVE-2008-3522.patch | 14 +
gnu/packages/patches/libdrm-symbol-check.patch | 195 +
gnu/packages/patches/librsvg-tests.patch | 27 +
.../patches/libsndfile-CVE-2014-9496.patch | 55 +
.../patches/libsndfile-CVE-2015-7805.patch | 95 +
gnu/packages/patches/libxslt-CVE-2015-7995.patch | 29 +
gnu/packages/patches/lua52-liblua-so.patch | 78 +
gnu/packages/patches/matplotlib-setupext-tk.patch | 34 +
.../patches/mit-krb5-CVE-2015-2695-pt1.patch | 569 ++
.../patches/mit-krb5-CVE-2015-2695-pt2.patch | 65 +
gnu/packages/patches/mit-krb5-CVE-2015-2696.patch | 736 ++
gnu/packages/patches/mit-krb5-CVE-2015-2697.patch | 55 +
.../patches/mit-krb5-CVE-2015-2698-pt1.patch | 43 +
.../patches/mit-krb5-CVE-2015-2698-pt2.patch | 132 +
gnu/packages/patches/mit-krb5-init-fix.patch | 18 -
.../patches/mupen64plus-ui-console-notice.patch | 34 +
.../patches/preseq-1.0.2-install-to-PREFIX.patch | 37 -
.../patches/preseq-1.0.2-link-with-libbam.patch | 33 -
.../python-2-deterministic-build-info.patch | 17 +
.../patches/python-2.7-source-date-epoch.patch | 33 +
.../python-3-deterministic-build-info.patch | 17 +
.../patches/python-configobj-setuptools.patch | 30 +
gnu/packages/patches/scribus-qobject.patch | 17 +
gnu/packages/patches/synfig-build-fix.patch | 61 +
.../patches/tcl-mkindex-deterministic.patch | 29 +
gnu/packages/patches/tinyxml-use-stl.patch | 41 +
gnu/packages/patches/tk-find-library.patch | 29 +
gnu/packages/patches/torsocks-dns-test.patch | 18 +
gnu/packages/patches/weechat-python.patch | 40 +
.../patches/wpa-supplicant-CVE-2015-5310.patch | 32 +
.../patches/wpa-supplicant-CVE-2015-5314.patch | 51 +
.../patches/wpa-supplicant-CVE-2015-5315.patch | 54 +
.../patches/wpa-supplicant-CVE-2015-5316.patch | 34 +
.../patches/xfce4-session-fix-xflock4.patch | 31 +
gnu/packages/pcre.scm | 47 +-
gnu/packages/pdf.scm | 9 +-
gnu/packages/polkit.scm | 18 +-
gnu/packages/pulseaudio.scm | 9 +-
gnu/packages/python.scm | 1105 ++-
gnu/packages/qemu.scm | 68 +-
gnu/packages/qt.scm | 40 +-
gnu/packages/ragel.scm | 49 +
gnu/packages/ruby.scm | 732 ++-
gnu/packages/samba.scm | 40 +
gnu/packages/sawfish.scm | 2 +-
gnu/packages/scheme.scm | 4 +-
gnu/packages/screen.scm | 53 +
gnu/packages/scribus.scm | 79 +
gnu/packages/serialization.scm | 74 +
gnu/packages/slang.scm | 24 +-
gnu/packages/ssh.scm | 58 +-
gnu/packages/statistics.scm | 421 +-
gnu/packages/synergy.scm | 6 +-
gnu/packages/tcl.scm | 19 +-
gnu/packages/telephony.scm | 11 +-
gnu/packages/terminals.scm | 69 +
gnu/packages/textutils.scm | 28 +-
gnu/packages/tls.scm | 108 +-
gnu/packages/tor.scm | 41 +-
gnu/packages/version-control.scm | 75 +-
gnu/packages/video.scm | 274 +-
gnu/packages/web.scm | 30 +-
gnu/packages/weechat.scm | 44 +-
gnu/packages/wget.scm | 4 +-
gnu/packages/wm.scm | 25 +-
gnu/packages/xdisorg.scm | 7 +-
gnu/packages/xfce.scm | 19 +-
gnu/packages/xiph.scm | 43 +-
gnu/packages/xml.scm | 81 +-
gnu/packages/xorg.scm | 50 +-
gnu/packages/zsh.scm | 14 +-
gnu/services.scm | 179 +-
gnu/services/avahi.scm | 35 +-
gnu/services/base.scm | 222 +-
gnu/services/dbus.scm | 105 +-
gnu/services/desktop.scm | 258 +-
gnu/services/dmd.scm | 143 +-
gnu/services/networking.scm | 221 +-
gnu/services/ssh.scm | 7 +-
gnu/services/xorg.scm | 66 +-
gnu/system.scm | 167 +-
gnu/system/examples/desktop.tmpl | 3 +-
gnu/system/file-systems.scm | 5 +-
gnu/system/grub.scm | 59 +-
gnu/system/install.scm | 3 +
gnu/system/linux-container.scm | 25 +-
gnu/system/linux-initrd.scm | 6 +-
gnu/system/locale.scm | 62 +-
gnu/system/{linux.scm => pam.scm} | 17 +-
gnu/system/shadow.scm | 30 +-
gnu/system/vm.scm | 6 +-
guix/build-system/python.scm | 11 +-
guix/build/download.scm | 82 +-
guix/build/graft.scm | 62 +-
guix/build/haskell-build-system.scm | 11 +
guix/build/python-build-system.scm | 7 +
guix/cve.scm | 177 +
guix/derivations.scm | 32 +-
guix/ftp-client.scm | 108 +-
guix/gexp.scm | 7 +-
guix/gnu-maintenance.scm | 255 +-
guix/graph.scm | 187 +
guix/http-client.scm | 9 +-
guix/import/cabal.scm | 84 +-
guix/import/cran.scm | 279 +-
guix/import/elpa.scm | 8 +-
guix/import/gnu.scm | 30 +-
guix/import/hackage.scm | 48 +-
guix/import/pypi.scm | 99 +-
guix/profiles.scm | 85 +-
guix/scripts/build.scm | 271 +-
guix/scripts/challenge.scm | 6 +-
guix/scripts/container.scm | 63 +
guix/scripts/container/exec.scm | 94 +
guix/scripts/download.scm | 8 +-
guix/scripts/edit.scm | 37 +-
guix/scripts/environment.scm | 382 +-
guix/scripts/gc.scm | 7 +
guix/scripts/graph.scm | 148 +-
guix/scripts/import/hackage.scm | 16 +-
guix/scripts/lint.scm | 67 +-
guix/scripts/package.scm | 878 +-
guix/scripts/pull.scm | 1 +
guix/scripts/refresh.scm | 159 +-
guix/scripts/size.scm | 3 +-
guix/scripts/substitute.scm | 155 +-
guix/scripts/system.scm | 284 +-
guix/store.scm | 67 +-
guix/ui.scm | 172 +-
guix/upstream.scm | 21 +-
guix/utils.scm | 70 +-
m4/guix.m4 | 9 +-
nix/libstore/build.cc | 99 +-
nix/libstore/globals.cc | 7 +
nix/libstore/globals.hh | 2 +
nix/libstore/optimise-store.cc | 11 +-
nix/libstore/remote-store.cc | 11 +-
nix/libstore/store-api.hh | 13 +-
nix/libstore/worker-protocol.hh | 2 +-
nix/libutil/archive.cc | 2 +-
nix/libutil/hash.cc | 8 +
nix/libutil/hash.hh | 5 +-
nix/libutil/sha512.h | 35 +
nix/libutil/util.cc | 2 +-
nix/libutil/util.hh | 11 +-
nix/nix-daemon/nix-daemon.cc | 31 +-
po/guix/LINGUAS | 1 +
po/guix/POTFILES.in | 4 +
po/guix/da.po | 1395 ++-
po/guix/de.po | 1590 +++-
po/guix/pl.po | 2088 ++++
po/packages/LINGUAS | 2 +
po/packages/da.po |10112 ++++++++++++++++++++
po/packages/pl.po |10013 +++++++++++++++++++
tests/containers.scm | 5 +-
tests/cran.scm | 189 +-
tests/cve-sample.xml | 616 ++
tests/cve.scm | 69 +
tests/derivations.scm | 20 +
tests/gexp.scm | 2 +-
tests/gnu-maintenance.scm | 44 +
tests/graph.scm | 65 +-
tests/guix-build.sh | 27 +
tests/guix-download.sh | 6 +-
tests/guix-environment-container.sh | 90 +
tests/guix-environment.sh | 29 +
tests/guix-gc.sh | 8 +-
tests/guix-graph.sh | 2 +-
tests/guix-package-net.sh | 12 +-
tests/guix-system.sh | 49 +-
tests/hackage.scm | 37 +-
tests/lint.scm | 34 +
tests/pypi.scm | 3 +-
tests/store.scm | 142 +
tests/substitute.scm | 4 +-
tests/syscalls.scm | 11 +-
tests/utils.scm | 6 +
311 files changed, 48772 insertions(+), 5454 deletions(-)
diff --cc gnu-system.am
index 463f98c,8ffc671..ef4db3c
--- a/gnu-system.am
+++ b/gnu-system.am
@@@ -437,8 -450,8 +450,9 @@@ dist_patch_DATA =
gnu/packages/patches/duplicity-test_selection-tmp.patch \
gnu/packages/patches/elfutils-tests-ptrace.patch \
gnu/packages/patches/emacs-exec-path.patch \
+ gnu/packages/patches/emacs-source-date-epoch.patch \
gnu/packages/patches/eudev-rules-directory.patch \
+ gnu/packages/patches/evilwm-lost-focus-bug.patch \
gnu/packages/patches/expat-CVE-2015-1283.patch \
gnu/packages/patches/fastcap-mulGlobal.patch \
gnu/packages/patches/fastcap-mulSetup.patch \
@@@ -482,10 -496,9 +496,8 @@@
gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch \
gnu/packages/patches/gobject-introspection-cc.patch \
gnu/packages/patches/gobject-introspection-girepository.patch \
- gnu/packages/patches/grep-CVE-2015-1345.patch \
gnu/packages/patches/grub-gets-undeclared.patch \
gnu/packages/patches/grub-freetype.patch \
- gnu/packages/patches/gsl-poly-test-fix-pt1.patch \
- gnu/packages/patches/gsl-poly-test-fix-pt2.patch \
gnu/packages/patches/guile-1.8-cpp-4.5.patch \
gnu/packages/patches/guile-arm-fixes.patch \
gnu/packages/patches/guile-default-utf8.patch \
@@@ -601,8 -626,7 +626,6 @@@
gnu/packages/patches/plotutils-libpng-jmpbuf.patch \
gnu/packages/patches/polkit-drop-test.patch \
gnu/packages/patches/portaudio-audacity-compat.patch \
- gnu/packages/patches/preseq-1.0.2-install-to-PREFIX.patch \
- gnu/packages/patches/preseq-1.0.2-link-with-libbam.patch \
- gnu/packages/patches/procps-make-3.82.patch \
gnu/packages/patches/pt-scotch-build-parallelism.patch \
gnu/packages/patches/pulseaudio-fix-mult-test.patch \
gnu/packages/patches/pulseaudio-longer-test-timeout.patch \
diff --cc gnu/packages/backup.scm
index 287438e,40cfc4e..aa8ccbc
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@@ -145,9 -148,9 +148,10 @@@ backups (called chunks) to allow easy b
(patches
(list (search-patch "libarchive-mtree-filename-length-fix.patch")
(search-patch "libarchive-fix-lzo-test-case.patch")
- (search-patch "libarchive-CVE-2013-0211.patch")))))
+ (search-patch "libarchive-CVE-2013-0211.patch")
+ (search-patch "libarchive-bsdtar-test.patch")))))
(build-system gnu-build-system)
+ ;; TODO: Add -L/path/to/nettle in libarchive.pc.
(inputs
`(("zlib" ,zlib)
("nettle" ,nettle)
diff --cc gnu/packages/compression.scm
index b561d4c,fd3a9ce..41d9b0d
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@@ -228,14 -260,16 +260,16 @@@ compressed with pbzip2 can be decompres
(define-public xz
(package
(name "xz")
- (version "5.0.4")
+ (version "5.2.2")
(source (origin
(method url-fetch)
- (uri (string-append "http://tukaani.org/xz/xz-"; version
- ".tar.gz"))
+ (uri (list (string-append "http://tukaani.org/xz/xz-"; version
+ ".tar.gz")
+ (string-append "http://multiprecision.org/guix/xz-";
+ version ".tar.gz")))
(sha256
(base32
- "1dl35ca8fdss9z2d6y234gxh24ixq904xksizrjmjr5dimwhax6n"))))
+ "18h2k4jndhzjs8ln3a54qdnfv59y6spxiwh9gpaqniph6iflvpvk"))))
(build-system gnu-build-system)
(synopsis "General-purpose data compression")
(description
diff --cc gnu/packages/haskell.scm
index 652409b,277bdeb..c0e968b
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@@ -231,15 -243,9 +243,15 @@@
'configure 'install-bin
(lambda* (#:key inputs outputs #:allow-other-keys)
(with-directory-excursion
- (string-append ghc-bootstrap-path "/" ,name "-" ,version)
+ (string-append ghc-bootstrap-path "/ghc-7.8.4")
(zero? (system* "make" "install"))))
%standard-phases)))))))
+ (native-search-paths (list (search-path-specification
+ (variable "GHC_PACKAGE_PATH")
+ (files (list
+ (string-append "lib/ghc-" version)))
+ (file-pattern ".*\\.conf\\.d$")
+ (file-type 'directory))))
(home-page "https://www.haskell.org/ghc";)
(synopsis "The Glasgow Haskell Compiler")
(description
diff --cc guix/build/haskell-build-system.scm
index 34e5247,4506e96..8e2aee3
--- a/guix/build/haskell-build-system.scm
+++ b/guix/build/haskell-build-system.scm
@@@ -1,6 -1,6 +1,7 @@@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Federico Beffa <address@hidden>
+;;; Copyright © 2015 Eric Bavier <address@hidden>
+ ;;; Copyright © 2015 Paul van der Walt <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@@ -99,11 -97,15 +100,21 @@@ and parameters ~s~%
'("--enable-tests")
'())
configure-flags)))
+ ;; Cabal errors if GHC_PACKAGE_PATH is set during 'configure', so unset
+ ;; and restore it.
+ (unsetenv "GHC_PACKAGE_PATH")
++
+ ;; For packages where the Cabal build-type is set to "Configure",
+ ;; ./configure will be executed. In these cases, the following
+ ;; environment variable is needed to be able to find the shell executable.
+ ;; For other package types, the configure script isn't present. For more
+ ;; information, see the Build Information section of
+ ;; <https://www.haskell.org/cabal/users-guide/developing-packages.html>.
+ (when (file-exists? "configure")
+ (setenv "CONFIG_SHELL" "sh"))
- (run-setuphs "configure" params)))
+ (run-setuphs "configure" params)
++
+ (setenv "GHC_PACKAGE_PATH" ghc-path)))
(define* (build #:rest empty)
"Build a given Haskell package."