[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into staging
|
From: |
Ludovic Courtès |
|
Subject: |
01/01: Merge branch 'master' into staging |
|
Date: |
Wed, 4 Jan 2017 22:29:56 +0000 (UTC) |
civodul pushed a commit to branch staging
in repository guix.
commit 66e124454b5d4c8dc70bed809372855b16807de0
Merge: 51ec40b b96a064
Author: Ludovic Courtès <address@hidden>
Date: Wed Jan 4 23:26:31 2017 +0100
Merge branch 'master' into staging
.mailmap | 22 +-
Makefile.am | 22 +-
build-aux/hydra/demo-os.scm | 84 --
build-aux/hydra/gnu-system.scm | 15 +-
configure.ac | 15 +-
doc/contributing.texi | 3 -
doc/emacs.texi | 881 ---------------
doc/guix.texi | 243 ++--
doc/htmlxref.cnf | 2 +
emacs/guix-about.el | 37 -
emacs/guix-backend.el | 393 -------
emacs/guix-base.el | 377 -------
emacs/guix-buffer.el | 624 ----------
emacs/guix-build-log.el | 381 -------
emacs/guix-command.el | 830 --------------
emacs/guix-config.el.in | 44 -
emacs/guix-devel.el | 382 -------
emacs/guix-entry.el | 59 -
emacs/guix-external.el | 88 --
emacs/guix-geiser.el | 126 ---
emacs/guix-guile.el | 98 --
emacs/guix-help-vars.el | 108 --
emacs/guix-helper.scm.in | 65 --
emacs/guix-history.el | 92 --
emacs/guix-hydra-build.el | 362 ------
emacs/guix-hydra-jobset.el | 162 ---
emacs/guix-hydra.el | 367 ------
emacs/guix-info.el | 482 --------
emacs/guix-init.el | 3 -
emacs/guix-license.el | 65 --
emacs/guix-list.el | 585 ----------
emacs/guix-location.el | 79 --
emacs/guix-main.scm | 1163 -------------------
emacs/guix-messages.el | 247 ----
emacs/guix-pcomplete.el | 370 ------
emacs/guix-popup.el | 48 -
emacs/guix-prettify.el | 210 ----
emacs/guix-profiles.el | 77 --
emacs/guix-read.el | 147 ---
emacs/guix-ui-generation.el | 456 --------
emacs/guix-ui-license.el | 150 ---
emacs/guix-ui-location.el | 83 --
emacs/guix-ui-package.el | 1191 --------------------
emacs/guix-ui-system-generation.el | 105 --
emacs/guix-ui.el | 323 ------
emacs/guix-utils.el | 609 ----------
emacs/local.mk | 77 --
gnu/local.mk | 7 +-
gnu/packages/admin.scm | 10 +-
gnu/packages/algebra.scm | 21 +-
gnu/packages/audio.scm | 10 +-
gnu/packages/backup.scm | 35 +
gnu/packages/base.scm | 9 +-
gnu/packages/bioinformatics.scm | 91 +-
gnu/packages/bootstrap.scm | 1 +
gnu/packages/cdrom.scm | 40 +
gnu/packages/code.scm | 4 +-
gnu/packages/commencement.scm | 4 +-
gnu/packages/connman.scm | 47 +-
gnu/packages/cross-base.scm | 2 +-
gnu/packages/databases.scm | 8 +-
gnu/packages/display-managers.scm | 2 +-
gnu/packages/ebook.scm | 6 +-
gnu/packages/emacs.scm | 42 +-
gnu/packages/embedded.scm | 352 +++++-
gnu/packages/fpga.scm | 18 +-
gnu/packages/freedesktop.scm | 3 +-
gnu/packages/game-development.scm | 4 +-
gnu/packages/games.scm | 10 +-
gnu/packages/gcc.scm | 9 +-
gnu/packages/ghostscript.scm | 2 +-
gnu/packages/gimp.scm | 2 +
gnu/packages/gnome.scm | 4 +-
gnu/packages/gnupg.scm | 106 +-
gnu/packages/graphviz.scm | 50 +-
gnu/packages/guile.scm | 72 +-
gnu/packages/haskell.scm | 146 +--
gnu/packages/hurd.scm | 7 +-
gnu/packages/idris.scm | 256 +++++
gnu/packages/image-viewers.scm | 5 +-
gnu/packages/image.scm | 22 +-
gnu/packages/libreoffice.scm | 8 +-
gnu/packages/linux.scm | 12 +-
gnu/packages/lisp.scm | 42 +-
gnu/packages/llvm.scm | 3 +-
gnu/packages/lynx.scm | 4 +-
gnu/packages/mail.scm | 48 +-
gnu/packages/make-bootstrap.scm | 4 -
gnu/packages/maths.scm | 8 +-
gnu/packages/mc.scm | 14 +-
gnu/packages/messaging.scm | 4 +-
gnu/packages/monitoring.scm | 15 +-
gnu/packages/mp3.scm | 2 +-
gnu/packages/mpd.scm | 15 +-
gnu/packages/music.scm | 48 +-
gnu/packages/nano.scm | 4 +-
gnu/packages/networking.scm | 40 +-
gnu/packages/ocaml.scm | 315 ++++--
gnu/packages/onc-rpc.scm | 2 +-
gnu/packages/package-management.scm | 29 +-
gnu/packages/parallel.scm | 4 +-
gnu/packages/password-utils.scm | 22 +-
.../patches/awesome-reproducible-png.patch | 4 +-
.../chicken-CVE-2016-6830+CVE-2016-6831.patch | 81 ++
gnu/packages/patches/libpng-CVE-2016-10087.patch | 37 +
gnu/packages/patches/mcrypt-CVE-2012-4409.patch | 35 +-
gnu/packages/patches/mcrypt-CVE-2012-4527.patch | 198 ++--
.../patches/multiqc-fix-git-subprocess-error.patch | 16 +
.../patches/ocaml-Add-a-.file-directive.patch | 96 ++
.../python-dendropy-exclude-failing-tests.patch | 21 -
gnu/packages/patches/slock-CVE-2016-6866.patch | 51 -
gnu/packages/perl.scm | 21 +-
gnu/packages/python.scm | 471 ++++++--
gnu/packages/ruby.scm | 4 +-
gnu/packages/rust.scm | 68 +-
gnu/packages/scheme.scm | 29 +-
gnu/packages/security-token.scm | 6 +-
gnu/packages/shells.scm | 4 +-
gnu/packages/shellutils.scm | 6 +-
gnu/packages/speech.scm | 34 +
gnu/packages/statistics.scm | 326 ++++--
gnu/packages/suckless.scm | 30 +-
gnu/packages/terminals.scm | 4 +-
gnu/packages/video.scm | 12 +-
gnu/packages/vpn.scm | 6 +-
gnu/packages/web.scm | 16 +-
gnu/packages/wm.scm | 12 +-
gnu/packages/xdisorg.scm | 6 +-
gnu/packages/xorg.scm | 4 +-
gnu/packages/zile.scm | 82 +-
gnu/packages/zip.scm | 4 +-
gnu/services/cuirass.scm | 19 +-
gnu/services/desktop.scm | 5 +
gnu/services/web.scm | 96 +-
gnu/system/grub.scm | 17 +-
guix/build-system/cargo.scm | 7 +-
guix/build-system/ocaml.scm | 181 +++
guix/build/cargo-build-system.scm | 22 +-
guix/build/make-bootstrap.scm | 5 +-
guix/build/ocaml-build-system.scm | 119 ++
guix/build/syscalls.scm | 6 +-
guix/gexp.scm | 18 +-
guix/git-download.scm | 30 +-
guix/gnu-maintenance.scm | 8 +-
guix/grafts.scm | 90 +-
guix/import/crate.scm | 16 +-
guix/import/elpa.scm | 10 +-
guix/import/utils.scm | 14 +-
guix/scripts/archive.scm | 3 +-
guix/scripts/copy.scm | 207 ++++
guix/scripts/graph.scm | 21 +
guix/scripts/hash.scm | 5 +-
guix/scripts/offload.scm | 154 +--
guix/ssh.scm | 226 ++++
guix/ui.scm | 10 +-
nix/libstore/build.cc | 13 +-
po/guix/POTFILES.in | 1 +
tests/crate.scm | 3 +-
tests/gexp.scm | 12 +-
tests/graph.scm | 14 +-
160 files changed, 4029 insertions(+), 13389 deletions(-)