[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master'
|
From: |
Danny Milosavljevic |
|
Subject: |
01/01: Merge branch 'master' |
|
Date: |
Thu, 17 Aug 2017 17:26:11 -0400 (EDT) |
dannym pushed a commit to branch wip-installer-2
in repository guix.
commit a3b3a2dbde20bb4abe8e4bdc76998f446b37ddb8
Merge: ffb57d0 2d72ddf
Author: Danny Milosavljevic <address@hidden>
Date: Thu Aug 17 22:22:10 2017 +0200
Merge branch 'master'
.mailmap | 19 +-
Makefile.am | 15 +-
build-aux/build-self.scm | 17 +
build-aux/hydra/guix.scm | 55 +-
configure.ac | 10 +-
doc/contributing.texi | 8 +-
doc/guix.texi | 510 +++-
etc/guix-daemon.conf.in | 2 -
gnu/bootloader.scm | 3 +
gnu/bootloader/extlinux.scm | 19 +-
gnu/bootloader/grub.scm | 33 +-
gnu/bootloader/u-boot.scm | 47 +
gnu/build/activation.scm | 1 +
gnu/build/file-systems.scm | 17 +-
gnu/build/vm.scm | 44 +-
gnu/local.mk | 77 +-
gnu/packages/acct.scm | 4 +-
gnu/packages/admin.scm | 130 +-
gnu/packages/aspell.scm | 5 +-
gnu/packages/audio.scm | 11 +-
gnu/packages/autotools.scm | 19 +-
gnu/packages/aux-files/emacs/guix-emacs.el | 9 +-
.../linux-libre/{4.11-i686.conf => 4.12-i686.conf} | 209 +-
.../{4.11-x86_64.conf => 4.12-x86_64.conf} | 210 +-
gnu/packages/backup.scm | 25 +-
gnu/packages/base.scm | 24 +-
gnu/packages/bash.scm | 4 +-
gnu/packages/bioinformatics.scm | 754 ++++--
gnu/packages/bootloaders.scm | 151 +-
gnu/packages/build-tools.scm | 39 +-
gnu/packages/calendar.scm | 6 +-
gnu/packages/certs.scm | 23 +-
gnu/packages/check.scm | 10 +-
gnu/packages/ci.scm | 28 +-
gnu/packages/code.scm | 55 +
gnu/packages/compression.scm | 51 +-
gnu/packages/connman.scm | 4 +-
gnu/packages/cran.scm | 930 ++++++++
gnu/packages/crypto.scm | 136 +-
gnu/packages/cups.scm | 4 +-
gnu/packages/curl.scm | 25 +-
gnu/packages/databases.scm | 49 +-
gnu/packages/dav.scm | 4 +-
gnu/packages/debug.scm | 65 +-
gnu/packages/disk.scm | 32 +-
gnu/packages/dns.scm | 21 +-
gnu/packages/docbook.scm | 34 +-
gnu/packages/ebook.scm | 85 +
gnu/packages/education.scm | 4 +-
gnu/packages/emacs.scm | 357 ++-
gnu/packages/embedded.scm | 3 +-
gnu/packages/enlightenment.scm | 36 +-
gnu/packages/erlang.scm | 11 +-
gnu/packages/finance.scm | 3 +-
gnu/packages/flashing-tools.scm | 32 +
gnu/packages/fonts.scm | 102 +-
gnu/packages/{gforth.scm => forth.scm} | 2 +-
gnu/packages/fpga.scm | 5 +-
gnu/packages/freeipmi.scm | 10 +-
gnu/packages/ftp.scm | 4 +-
gnu/packages/game-development.scm | 179 +-
gnu/packages/games.scm | 329 ++-
gnu/packages/gcc.scm | 21 +-
gnu/packages/gimp.scm | 39 +-
gnu/packages/glib.scm | 2 +-
gnu/packages/gnome.scm | 334 ++-
gnu/packages/gnucash.scm | 4 +-
gnu/packages/gnunet.scm | 24 +-
gnu/packages/gnupg.scm | 11 +-
gnu/packages/gnuzilla.scm | 92 +-
gnu/packages/graph.scm | 118 +
gnu/packages/graphics.scm | 77 +-
gnu/packages/gstreamer.scm | 57 +-
gnu/packages/gtk.scm | 15 +-
gnu/packages/guile.scm | 204 +-
gnu/packages/haskell.scm | 304 ++-
gnu/packages/ibus.scm | 4 +-
gnu/packages/image-viewers.scm | 20 +-
gnu/packages/image.scm | 143 +-
gnu/packages/imagemagick.scm | 119 +-
gnu/packages/irc.scm | 9 +-
gnu/packages/java.scm | 151 +-
gnu/packages/javascript.scm | 191 +-
gnu/packages/julia.scm | 3 +-
gnu/packages/kerberos.scm | 5 +-
gnu/packages/ldc.scm | 4 +-
gnu/packages/lego.scm | 61 +-
gnu/packages/libreoffice.scm | 72 +-
gnu/packages/libusb.scm | 16 +
gnu/packages/linux.scm | 233 +-
gnu/packages/lisp.scm | 25 +
gnu/packages/logging.scm | 5 +-
gnu/packages/machine-learning.scm | 1 +
gnu/packages/mail.scm | 29 +-
gnu/packages/man.scm | 19 +-
gnu/packages/markup.scm | 4 +-
gnu/packages/maths.scm | 314 ++-
gnu/packages/medical.scm | 60 +
gnu/packages/mes.scm | 26 +-
gnu/packages/messaging.scm | 36 +-
gnu/packages/mg.scm | 76 -
gnu/packages/moreutils.scm | 25 +-
gnu/packages/{acct.scm => motti.scm} | 39 +-
gnu/packages/mp3.scm | 26 +-
gnu/packages/mpi.scm | 25 +-
gnu/packages/music.scm | 139 +-
gnu/packages/nano.scm | 4 +-
gnu/packages/ncurses.scm | 32 +-
gnu/packages/networking.scm | 87 +-
gnu/packages/nim.scm | 19 +-
gnu/packages/node.scm | 4 +
gnu/packages/ntp.scm | 8 +-
gnu/packages/ocaml.scm | 238 ++
gnu/packages/openldap.scm | 4 +-
gnu/packages/package-management.scm | 224 +-
gnu/packages/parallel.scm | 4 +-
gnu/packages/password-utils.scm | 38 +-
.../patches/bcftools-regidx-unsigned-char.patch | 16 +
gnu/packages/patches/bigloo-gc-shebangs.patch | 18 -
gnu/packages/patches/blast+-fix-makefile.patch | 15 +
gnu/packages/patches/catdoc-CVE-2017-11110.patch | 45 +
gnu/packages/patches/chicken-CVE-2017-11343.patch | 57 +
gnu/packages/patches/curl-bounds-check.patch | 19 +
gnu/packages/patches/cvs-2017-12836.patch | 45 +
gnu/packages/patches/dblatex-remove-multirow.patch | 30 +
.../deja-dup-use-ref-keyword-for-iter.patch | 41 +
.../patches/e2fsprogs-32bit-quota-warnings.patch | 46 +
gnu/packages/patches/erlang-man-path.patch | 24 +
gnu/packages/patches/fabric-tests.patch | 15 -
gnu/packages/patches/gajim-CVE-2016-10376.patch | 57 -
gnu/packages/patches/gd-CVE-2017-7890.patch | 30 +
gnu/packages/patches/gemma-intel-compat.patch | 44 +
gnu/packages/patches/glibc-CVE-2015-5180.patch | 311 +++
gnu/packages/patches/glibc-CVE-2015-7547.patch | 590 +++++
gnu/packages/patches/glibc-CVE-2016-3075.patch | 43 +
gnu/packages/patches/glibc-CVE-2016-3706.patch | 188 ++
gnu/packages/patches/glibc-CVE-2016-4429.patch | 58 +
.../patches/guile-bytestructures-name-clash.patch | 31 +
.../patches/guile-ssh-channel-finalization.patch | 28 -
gnu/packages/patches/guile-ssh-double-free.patch | 37 -
gnu/packages/patches/guile-ssh-rexec-bug.patch | 16 -
gnu/packages/patches/heimdal-CVE-2017-11103.patch | 45 +
gnu/packages/patches/heimdal-CVE-2017-6594.patch | 85 +
gnu/packages/patches/hop-linker-flags.patch | 60 -
gnu/packages/patches/libgit2-use-after-free.patch | 24 -
gnu/packages/patches/libtasn1-CVE-2017-10790.patch | 63 +
gnu/packages/patches/libtiff-CVE-2016-10688.patch | 92 +
gnu/packages/patches/libtiff-CVE-2017-9936.patch | 47 +
.../libtiff-tiffycbcrtorgb-integer-overflow.patch | 57 +
...btiff-tiffycbcrtorgbinit-integer-overflow.patch | 43 +
.../patches/libusb-0.1-disable-tests.patch | 15 +
gnu/packages/patches/metabat-fix-compilation.patch | 39 +
.../patches/ncurses-CVE-2017-10684-10685.patch | 200 ++
gnu/packages/patches/nss-pkgconfig.patch | 4 +-
gnu/packages/patches/ntfs-3g-CVE-2017-0358.patch | 43 -
.../openjpeg-CVE-2016-9572-CVE-2016-9573.patch | 233 --
.../openjpeg-CVE-2016-9850-CVE-2016-9851.patch | 245 --
gnu/packages/patches/pcre-CVE-2017-7186.patch | 56 -
.../patches/perl-dbd-mysql-CVE-2017-10788.patch | 62 +
gnu/packages/patches/poppler-CVE-2017-9776.patch | 34 +
.../poppler-fix-crash-with-broken-documents.patch | 61 +
.../patches/python-cython-fix-tests-32bit.patch | 27 -
.../python-fake-factory-fix-build-32bit.patch | 36 -
.../patches/python-pbr-fix-man-page-support.patch | 28 -
.../python-pyopenssl-skip-network-test.patch | 43 -
gnu/packages/patches/qemu-CVE-2017-10664.patch | 27 +
gnu/packages/patches/qemu-CVE-2017-10806.patch | 38 +
gnu/packages/patches/qemu-CVE-2017-10911.patch | 106 +
gnu/packages/patches/qemu-CVE-2017-11334.patch | 52 +
gnu/packages/patches/qemu-CVE-2017-11434.patch | 25 +
gnu/packages/patches/quassel-fix-tls-check.patch | 25 +
.../patches/ruby-puma-ignore-broken-test.patch | 13 -
.../patches/sooperlooper-build-with-wx-30.patch | 179 ++
gnu/packages/patches/spice-CVE-2017-7506.patch | 158 ++
.../patches/supertuxkart-angelscript-ftbfs.patch | 42 +
.../patches/xorg-server-CVE-2017-10971.patch | 153 ++
.../patches/xorg-server-CVE-2017-10972.patch | 35 +
gnu/packages/pciutils.scm | 4 +-
gnu/packages/pcre.scm | 16 +-
gnu/packages/pdf.scm | 14 +-
gnu/packages/perl.scm | 130 +-
gnu/packages/photo.scm | 2 +-
gnu/packages/php.scm | 17 +-
gnu/packages/python.scm | 688 ++++--
gnu/packages/qt.scm | 222 +-
gnu/packages/rails.scm | 4 +-
gnu/packages/rdesktop.scm | 22 +-
gnu/packages/regex.scm | 4 +-
gnu/packages/ruby.scm | 396 ++--
gnu/packages/samba.scm | 21 +-
gnu/packages/scheme.scm | 93 +-
gnu/packages/screen.scm | 4 +-
gnu/packages/search.scm | 28 +
gnu/packages/serialization.scm | 34 +-
gnu/packages/shells.scm | 162 +-
gnu/packages/sml.scm | 72 +
gnu/packages/spice.scm | 13 +-
gnu/packages/ssh.scm | 69 +-
gnu/packages/sssd.scm | 7 +-
gnu/packages/statistics.scm | 521 +++--
gnu/packages/sync.scm | 4 +-
gnu/packages/terminals.scm | 8 +-
gnu/packages/tex.scm | 2424 +++++++++++++++++++-
gnu/packages/text-editors.scm | 62 +-
gnu/packages/textutils.scm | 2 +
gnu/packages/tls.scm | 47 +-
gnu/packages/tmux.scm | 4 +-
gnu/packages/tor.scm | 9 +-
gnu/packages/version-control.scm | 185 +-
gnu/packages/video.scm | 76 +-
gnu/packages/vim.scm | 25 +-
gnu/packages/{qemu.scm => virtualization.scm} | 73 +-
gnu/packages/vpn.scm | 16 +-
gnu/packages/web-browsers.scm | 4 +-
gnu/packages/web.scm | 291 ++-
gnu/packages/webkit.scm | 4 +-
gnu/packages/wm.scm | 40 +-
gnu/packages/xdisorg.scm | 35 +-
gnu/packages/xiph.scm | 9 +-
gnu/packages/xml.scm | 8 +-
gnu/packages/xorg.scm | 70 +-
gnu/services.scm | 5 +-
gnu/services/admin.scm | 171 +-
gnu/services/audio.scm | 86 +
gnu/services/base.scm | 12 +-
gnu/services/cuirass.scm | 11 +
gnu/services/databases.scm | 86 +
gnu/services/dbus.scm | 10 +-
gnu/services/desktop.scm | 22 +-
gnu/services/herd.scm | 9 +-
gnu/services/networking.scm | 11 +-
gnu/services/ssh.scm | 96 +-
gnu/services/sysctl.scm | 77 +
gnu/services/web.scm | 222 +-
gnu/system.scm | 55 +-
gnu/system/install.scm | 3 +-
gnu/system/linux-initrd.scm | 108 +-
gnu/system/locale.scm | 49 +-
gnu/system/shadow.scm | 12 +-
gnu/system/vm.scm | 108 +-
gnu/tests/admin.scm | 128 ++
gnu/tests/audio.scm | 78 +
gnu/tests/base.scm | 310 ++-
gnu/tests/databases.scm | 123 +
gnu/tests/dict.scm | 165 +-
gnu/tests/install.scm | 2 +-
gnu/tests/mail.scm | 388 ++--
gnu/tests/messaging.scm | 198 +-
gnu/tests/networking.scm | 95 +-
gnu/tests/nfs.scm | 140 +-
gnu/tests/ssh.scm | 268 +--
gnu/tests/web.scm | 125 +-
guix/base32.scm | 10 +-
guix/build-system/minify.scm | 127 +
guix/build-system/texlive.scm | 2 +
guix/build/minify-build-system.scm | 73 +
guix/build/syscalls.scm | 79 +-
guix/build/texlive-build-system.scm | 51 +-
guix/download.scm | 56 +-
guix/gexp.scm | 46 +-
guix/git-download.scm | 100 +-
guix/graph.scm | 16 +-
guix/import/cpan.scm | 2 +-
guix/licenses.scm | 7 +
guix/profiles.scm | 34 -
guix/scripts/environment.scm | 7 +-
guix/scripts/lint.scm | 41 +-
guix/scripts/offload.scm | 48 +-
guix/scripts/package.scm | 30 +-
guix/scripts/publish.scm | 35 +-
guix/scripts/pull.scm | 250 +-
guix/scripts/size.scm | 43 +-
guix/scripts/substitute.scm | 30 +-
guix/scripts/system.scm | 21 +-
guix/scripts/weather.scm | 234 ++
guix/store.scm | 10 +-
guix/ui.scm | 21 -
guix/utils.scm | 32 +-
nix/libstore/build.cc | 4 +-
nix/nix-daemon/nix-daemon.cc | 16 +-
po/guix/POTFILES.in | 1 +
po/packages/POTFILES.in | 2 +-
tests/gexp.scm | 8 +
tests/syscalls.scm | 10 +
284 files changed, 18534 insertions(+), 5277 deletions(-)
diff --cc configure.ac
index f62dd23,9ad7598..620eea5
--- a/configure.ac
+++ b/configure.ac
@@@ -104,14 -110,6 +110,10 @@@ dnl Guile-JSON is used in various place
GUILE_MODULE_AVAILABLE([have_guile_json], [(json)])
AM_CONDITIONAL([HAVE_GUILE_JSON], [test "x$have_guile_json" = "xyes"])
- dnl Check for Guile-Git.
- GUILE_MODULE_AVAILABLE([have_guile_git], [(git)])
- AM_CONDITIONAL([HAVE_GUILE_GIT], [test "x$have_guile_git" = "xyes"])
-
+dnl guile-ncurses is used for the system installer
+GUILE_MODULE_AVAILABLE([have_guile_ncurses], [(ncurses curses)])
+AM_CONDITIONAL([HAVE_GUILE_NCURSES], [test "x$have_guile_ncurses" = "xyes"])
+
dnl Make sure we have a full-fledged Guile.
GUIX_ASSERT_GUILE_FEATURES([regex posix socket net-db threads])
diff --cc gnu/packages/package-management.scm
index 4a8bce7,1f65e21..976d1a1
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@@ -250,8 -263,8 +263,9 @@@
(propagated-inputs
`(("gnutls" ,gnutls/guile-2.2) ;for 'guix download' & co.
("guile-json" ,guile-json)
+ ("guile-ncurses/gpm" ,guile-ncurses/gpm)
- ("guile-ssh" ,guile-ssh)))
+ ("guile-ssh" ,guile-ssh)
+ ("guile-git" ,guile-git)))
(home-page "https://www.gnu.org/software/guix/";)
(synopsis "Functional package manager for installed software packages
and versions")