guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

73/80: Merge remote-tracking branch 'origin/master' into wip-installer


From: John Darrington
Subject: 73/80: Merge remote-tracking branch 'origin/master' into wip-installer
Date: Tue, 3 Jan 2017 15:49:46 +0000 (UTC)

jmd pushed a commit to branch wip-installer
in repository guix.

commit 8716cca7303ecf35f83ddd828eee7ff642adc7ab
Merge: 41f6d77 1b5ea09
Author: John Darrington <address@hidden>
Date:   Mon Jan 2 10:43:22 2017 +0100

    Merge remote-tracking branch 'origin/master' into wip-installer

 .mailmap                                           |   22 +-
 Makefile.am                                        |   20 +-
 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                                      |  187 +--
 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                                       |    5 +-
 gnu/packages/base.scm                              |    6 +-
 gnu/packages/bioinformatics.scm                    |   85 +-
 gnu/packages/bootstrap.scm                         |    1 +
 gnu/packages/busybox.scm                           |   12 +-
 gnu/packages/cdrom.scm                             |   98 ++
 gnu/packages/curl.scm                              |   10 +-
 gnu/packages/databases.scm                         |    8 +-
 gnu/packages/dns.scm                               |   24 +-
 gnu/packages/emacs.scm                             |   16 +-
 gnu/packages/embedded.scm                          |  352 +++++-
 gnu/packages/fonts.scm                             |   10 +-
 gnu/packages/fpga.scm                              |   18 +-
 gnu/packages/freedesktop.scm                       |    7 +-
 gnu/packages/game-development.scm                  |    4 +-
 gnu/packages/games.scm                             |   12 +-
 gnu/packages/gnunet.scm                            |   35 +-
 gnu/packages/gnupg.scm                             |   72 +-
 gnu/packages/graphviz.scm                          |   50 +-
 gnu/packages/groff.scm                             |   41 +
 gnu/packages/image.scm                             |   74 +-
 gnu/packages/linux.scm                             |   19 +-
 gnu/packages/lisp.scm                              |   42 +-
 gnu/packages/mail.scm                              |   54 +-
 gnu/packages/maths.scm                             |   16 +-
 gnu/packages/mc.scm                                |   14 +-
 gnu/packages/messaging.scm                         |    4 +-
 gnu/packages/monitoring.scm                        |   15 +-
 gnu/packages/moreutils.scm                         |   60 +-
 gnu/packages/mpd.scm                               |   15 +-
 gnu/packages/music.scm                             |   48 +-
 gnu/packages/networking.scm                        |   40 +-
 gnu/packages/package-management.scm                |   29 +-
 .../patches/awesome-reproducible-png.patch         |    4 +-
 gnu/packages/patches/libpng-CVE-2016-10087.patch   |   37 +
 gnu/packages/patches/libxml2-CVE-2016-4658.patch   |  257 +++++
 gnu/packages/patches/libxml2-CVE-2016-5131.patch   |  218 ++++
 .../patches/multiqc-fix-git-subprocess-error.patch |   16 +
 .../python-dendropy-exclude-failing-tests.patch    |   21 -
 gnu/packages/perl.scm                              |   19 +
 gnu/packages/python.scm                            |  499 ++++++--
 gnu/packages/qt.scm                                |   83 +-
 gnu/packages/ruby.scm                              |    4 +-
 gnu/packages/rust.scm                              |    7 +-
 gnu/packages/shells.scm                            |   13 +-
 gnu/packages/statistics.scm                        |  317 ++++--
 gnu/packages/sync.scm                              |    4 +-
 gnu/packages/terminals.scm                         |    4 +-
 gnu/packages/web.scm                               |   42 +-
 gnu/packages/wm.scm                                |   12 +-
 gnu/packages/xdisorg.scm                           |    4 +-
 gnu/packages/xml.scm                               |   10 +
 gnu/packages/xorg.scm                              |   10 +-
 gnu/packages/zip.scm                               |    4 +-
 gnu/services/cuirass.scm                           |   19 +-
 gnu/services/desktop.scm                           |    5 +
 guix/build-system/cargo.scm                        |    4 +-
 guix/build/cargo-build-system.scm                  |   22 +-
 guix/build/syscalls.scm                            |    6 +-
 guix/gexp.scm                                      |   18 +-
 guix/git-download.scm                              |   18 +-
 guix/gnu-maintenance.scm                           |    8 +-
 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/offload.scm                           |  154 +--
 guix/ssh.scm                                       |  226 ++++
 guix/ui.scm                                        |    4 +-
 nix/libstore/build.cc                              |   13 +-
 po/guix/POTFILES.in                                |    1 +
 tests/crate.scm                                    |    3 +-
 tests/gexp.scm                                     |   12 +-
 121 files changed, 3000 insertions(+), 12938 deletions(-)

diff --cc gnu/packages/package-management.scm
index 0962f74,23f34cd..aa5cfd4
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@@ -206,10 -206,7 +206,8 @@@
      (propagated-inputs
       `(("gnutls" ,gnutls)                         ;for 'guix download' & co.
         ("guile-json" ,guile-json)
-        ("guile-ssh" ,guile-ssh)
 +       ("guile-ncurses" ,guile-ncurses)           ;for 'guix system installer'
-        ("geiser" ,geiser)                         ;for guix.el
-        ("emacs-magit-popup" ,emacs-magit-popup))) ;for "M-x guix" command
+        ("guile-ssh" ,guile-ssh)))
  
      (home-page "http://www.gnu.org/software/guix";)
      (synopsis "Functional package manager for installed software packages and 
versions")



reply via email to

[Prev in Thread] Current Thread [Next in Thread]