[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into wip-installer-2
|
From: |
Danny Milosavljevic |
|
Subject: |
01/01: Merge branch 'master' into wip-installer-2 |
|
Date: |
Mon, 18 Sep 2017 10:05:51 -0400 (EDT) |
dannym pushed a commit to branch wip-installer-2
in repository guix.
commit aae9d0b9cbe04b762878a6d47bd3260e9ad431eb
Merge: a3b3a2d 851cb6d
Author: Danny Milosavljevic <address@hidden>
Date: Mon Sep 18 15:14:05 2017 +0200
Merge branch 'master' into wip-installer-2
.mailmap | 2 +-
HACKING | 10 +
Makefile.am | 11 +-
build-aux/compile-all.scm | 3 +-
configure.ac | 2 +-
doc/guix.texi | 1415 +-
etc/completion/bash/guix | 3 +
gnu/bootloader.scm | 13 +-
gnu/bootloader/grub.scm | 20 +-
gnu/build/file-systems.scm | 130 +-
gnu/build/marionette.scm | 46 +-
gnu/build/vm.scm | 53 +-
gnu/local.mk | 121 +-
gnu/packages.scm | 12 +-
gnu/packages/admin.scm | 17 +-
gnu/packages/aidc.scm | 24 +
gnu/packages/algebra.scm | 10 +-
gnu/packages/animation.scm | 10 +
gnu/packages/audio.scm | 50 +-
gnu/packages/augeas.scm | 5 +-
.../linux-libre/{4.12-i686.conf => 4.13-i686.conf} | 190 +-
.../{4.12-x86_64.conf => 4.13-x86_64.conf} | 191 +-
gnu/packages/backup.scm | 16 +-
gnu/packages/base.scm | 219 +-
gnu/packages/bash.scm | 50 +-
gnu/packages/bdw-gc.scm | 20 +-
gnu/packages/bioinformatics.scm | 126 +-
gnu/packages/boost.scm | 12 +-
gnu/packages/bootloaders.scm | 73 +-
gnu/packages/bootstrap.scm | 2 +
gnu/packages/build-tools.scm | 23 +-
gnu/packages/calendar.scm | 2 +-
gnu/packages/cdrom.scm | 4 +-
gnu/packages/check.scm | 71 +
gnu/packages/ci.scm | 7 +-
gnu/packages/cobol.scm | 59 +
gnu/packages/code.scm | 8 +-
gnu/packages/commencement.scm | 38 +-
gnu/packages/compression.scm | 206 +-
gnu/packages/cpp.scm | 6 +-
gnu/packages/cran.scm | 32 +-
gnu/packages/crypto.scm | 33 +-
gnu/packages/cups.scm | 134 +-
gnu/packages/curl.scm | 4 +-
gnu/packages/databases.scm | 96 +-
gnu/packages/datamash.scm | 6 +-
gnu/packages/dav.scm | 4 +-
gnu/packages/debug.scm | 2 +-
gnu/packages/disk.scm | 23 +-
gnu/packages/display-managers.scm | 16 +-
gnu/packages/django.scm | 4 +-
gnu/packages/djvu.scm | 8 +
gnu/packages/dns.scm | 8 +-
gnu/packages/documentation.scm | 2 +-
gnu/packages/ebook.scm | 12 +-
gnu/packages/ed.scm | 4 +-
gnu/packages/emacs.scm | 422 +-
gnu/packages/embedded.scm | 12 +-
gnu/packages/engineering.scm | 141 +-
gnu/packages/enlightenment.scm | 41 +-
gnu/packages/erlang.scm | 2 +-
gnu/packages/file.scm | 15 +-
gnu/packages/finance.scm | 195 +-
gnu/packages/flex.scm | 8 +-
gnu/packages/fltk.scm | 2 +-
gnu/packages/fonts.scm | 46 +-
gnu/packages/fontutils.scm | 52 +-
gnu/packages/freedesktop.scm | 139 +-
gnu/packages/freeipmi.scm | 4 +-
gnu/packages/ftp.scm | 17 +-
gnu/packages/game-development.scm | 122 +-
gnu/packages/games.scm | 22 +-
gnu/packages/gcc.scm | 115 +-
gnu/packages/gd.scm | 25 +-
gnu/packages/gdb.scm | 4 +-
gnu/packages/gettext.scm | 16 +-
gnu/packages/ghostscript.scm | 259 +-
gnu/packages/gimp.scm | 4 +-
gnu/packages/gl.scm | 14 +-
gnu/packages/glib.scm | 1 +
gnu/packages/gnome.scm | 395 +-
gnu/packages/gnunet.scm | 12 +-
gnu/packages/gnupg.scm | 146 +-
gnu/packages/gnustep.scm | 2 +-
gnu/packages/gnuzilla.scm | 193 +-
gnu/packages/gobby.scm | 85 +-
gnu/packages/golang.scm | 18 +-
gnu/packages/graphics.scm | 40 +-
gnu/packages/groff.scm | 12 +-
gnu/packages/gstreamer.scm | 3 +-
gnu/packages/gtk.scm | 8 +-
gnu/packages/guile-wm.scm | 7 +-
gnu/packages/guile.scm | 55 +-
gnu/packages/ham-radio.scm | 52 +
gnu/packages/hexedit.scm | 2 +-
gnu/packages/ibus.scm | 6 +-
gnu/packages/icu4c.scm | 13 +-
gnu/packages/image-viewers.scm | 4 +-
gnu/packages/image.scm | 96 +-
gnu/packages/imagemagick.scm | 16 +-
gnu/packages/irc.scm | 57 +-
gnu/packages/java.scm | 77 +-
gnu/packages/javascript.scm | 46 +-
gnu/packages/jemalloc.scm | 8 +-
gnu/packages/kde-frameworks.scm | 337 +-
gnu/packages/kde.scm | 23 +-
gnu/packages/kerberos.scm | 33 +-
gnu/packages/ld-wrapper.in | 40 +-
gnu/packages/ldc.scm | 4 +-
gnu/packages/libevent.scm | 12 +-
gnu/packages/libffcall.scm | 4 +-
gnu/packages/libffi.scm | 3 +-
gnu/packages/libidn.scm | 53 +-
gnu/packages/libreoffice.scm | 109 +-
gnu/packages/libsigsegv.scm | 17 +-
gnu/packages/libunistring.scm | 8 +-
gnu/packages/libusb.scm | 2 +-
gnu/packages/linux.scm | 265 +-
gnu/packages/logging.scm | 2 +-
gnu/packages/machine-learning.scm | 4 +-
gnu/packages/mail.scm | 106 +-
gnu/packages/make-bootstrap.scm | 30 +-
gnu/packages/man.scm | 4 +-
gnu/packages/markup.scm | 88 +
gnu/packages/mate.scm | 655 +-
gnu/packages/maths.scm | 299 +-
gnu/packages/mes.scm | 9 +-
gnu/packages/messaging.scm | 6 +-
gnu/packages/microcom.scm | 4 +-
gnu/packages/mp3.scm | 9 +-
gnu/packages/mpd.scm | 15 +-
gnu/packages/mpi.scm | 65 +-
gnu/packages/music.scm | 137 +-
gnu/packages/nano.scm | 4 +-
gnu/packages/ncurses.scm | 13 +-
gnu/packages/netpbm.scm | 23 +-
gnu/packages/networking.scm | 48 +-
gnu/packages/node.scm | 12 +-
gnu/packages/ocaml.scm | 44 +-
gnu/packages/openldap.scm | 35 +-
gnu/packages/package-management.scm | 48 +-
gnu/packages/parallel.scm | 9 +-
gnu/packages/password-utils.scm | 98 +
.../patches/ath9k-htc-firmware-binutils.patch | 20 -
gnu/packages/patches/binutils-mips-bash-bug.patch | 22 -
gnu/packages/patches/bluez-CVE-2017-1000250.patch | 42 +
gnu/packages/patches/calibre-drop-unrar.patch | 49 -
.../patches/coreutils-cut-huge-range-test.patch | 29 +-
.../patches/coreutils-fix-cross-compilation.patch | 15 -
gnu/packages/patches/csound-header-ordering.patch | 20 -
.../emacs-unsafe-enriched-mode-translations.patch | 85 +
.../patches/eudev-conflicting-declaration.patch | 31 -
.../expat-CVE-2016-0718-fix-regression.patch | 35 -
gnu/packages/patches/file-CVE-2017-1000249.patch | 27 +
.../patches/findutils-gnulib-multi-core.patch | 294 +
.../fontconfig-charwidth-symbol-conflict.patch | 82 -
gnu/packages/patches/fontconfig-path-max.patch | 124 -
.../patches/foomatic-filters-CVE-2015-8327.patch | 14 +
.../patches/foomatic-filters-CVE-2015-8560.patch | 13 +
gnu/packages/patches/freetype-CVE-2017-8105.patch | 56 -
gnu/packages/patches/freetype-CVE-2017-8287.patch | 44 -
.../patches/gcc-asan-powerpc-missing-include.patch | 20 +
gnu/packages/patches/gd-CVE-2017-7890.patch | 30 -
.../patches/gettext-gnulib-multi-core.patch | 178 +
gnu/packages/patches/gettext-multi-core.patch | 185 +
.../patches/ghostscript-CVE-2013-5653.patch | 85 -
.../patches/ghostscript-CVE-2015-3228.patch | 32 -
.../patches/ghostscript-CVE-2016-7976.patch | 185 -
.../patches/ghostscript-CVE-2016-7978.patch | 25 -
.../patches/ghostscript-CVE-2016-7979.patch | 48 -
.../patches/ghostscript-CVE-2016-8602.patch | 47 -
.../patches/ghostscript-CVE-2017-8291.patch | 166 +-
.../ghostscript-no-header-creationdate.patch | 22 +
.../patches/ghostscript-no-header-id.patch | 57 +
.../patches/ghostscript-no-header-uuid.patch | 50 +
gnu/packages/patches/ghostscript-runpath.patch | 17 +-
...phicsmagick-CVE-2017-11403+CVE-2017-14103.patch | 137 +
.../patches/graphicsmagick-CVE-2017-12935.patch | 28 +
.../patches/graphicsmagick-CVE-2017-12936.patch | 16 +
.../patches/graphicsmagick-CVE-2017-12937.patch | 28 +
.../patches/graphicsmagick-CVE-2017-13775.patch | 195 +
...phicsmagick-CVE-2017-13776+CVE-2017-13777.patch | 179 +
.../patches/graphicsmagick-CVE-2017-14042.patch | 80 +
.../patches/graphicsmagick-CVE-2017-14165.patch | 72 +
gnu/packages/patches/grep-gnulib-lock.patch | 32 +
gnu/packages/patches/groff-source-date-epoch.patch | 299 +
gnu/packages/patches/guile-2.2-default-utf8.patch | 78 +
gnu/packages/patches/guile-relocatable.patch | 4 +-
.../patches/intltool-perl-compatibility.patch | 76 +
.../patches/libarchive-CVE-2017-14166.patch | 45 +
.../patches/libffi-3.2.1-complex-alpha.patch | 28 +
gnu/packages/patches/libtasn1-CVE-2017-6891.patch | 51 -
gnu/packages/patches/libtiff-CVE-2016-10092.patch | 42 -
gnu/packages/patches/libtiff-CVE-2016-10093.patch | 53 -
gnu/packages/patches/libtiff-CVE-2016-10094.patch | 34 -
gnu/packages/patches/libtiff-CVE-2017-5225.patch | 86 -
.../patches/libtiff-assertion-failure.patch | 60 -
.../patches/libtiff-divide-by-zero-ojpeg.patch | 63 -
.../patches/libtiff-divide-by-zero-tiffcp.patch | 104 -
.../patches/libtiff-divide-by-zero-tiffcrop.patch | 57 -
gnu/packages/patches/libtiff-divide-by-zero.patch | 67 -
.../libtiff-heap-overflow-pixarlog-luv.patch | 131 -
.../libtiff-heap-overflow-tif-dirread.patch | 132 -
.../patches/libtiff-heap-overflow-tiffcp.patch | 67 -
.../patches/libtiff-heap-overflow-tiffcrop.patch | 60 -
gnu/packages/patches/libtiff-invalid-read.patch | 64 -
.../patches/libtiff-null-dereference.patch | 42 -
.../patches/libtiff-tiffcp-underflow.patch | 41 -
.../patches/libunistring-gnulib-multi-core.patch | 178 +
gnu/packages/patches/libxml2-CVE-2017-0663.patch | 53 +
gnu/packages/patches/libxml2-CVE-2017-7375.patch | 45 +
gnu/packages/patches/libxml2-CVE-2017-7376.patch | 41 +
.../libxml2-CVE-2017-9047+CVE-2017-9048.patch | 130 +
.../libxml2-CVE-2017-9049+CVE-2017-9050.patch | 319 +
gnu/packages/patches/lz4-fix-test-failures.patch | 136 -
.../patches/mesa-fix-32bit-test-failures.patch | 58 -
.../patches/mesa-skip-disk-cache-test.patch | 7 +-
gnu/packages/patches/meson-for-build-rpath.patch | 24 +
.../patches/metabat-remove-compilation-date.patch | 16 -
.../patches/multiqc-fix-git-subprocess-error.patch | 16 -
.../patches/newsbeuter-CVE-2017-12904.patch | 34 +
gnu/packages/patches/node-9077.patch | 31 -
gnu/packages/patches/openfoam-4.1-cleanup.patch | 243 +
gnu/packages/patches/openjpeg-CVE-2017-12982.patch | 28 +
gnu/packages/patches/openjpeg-CVE-2017-14040.patch | 83 +
gnu/packages/patches/openjpeg-CVE-2017-14041.patch | 25 +
gnu/packages/patches/openjpeg-CVE-2017-14151.patch | 46 +
gnu/packages/patches/openjpeg-CVE-2017-14152.patch | 38 +
gnu/packages/patches/openjpeg-CVE-2017-14164.patch | 89 +
gnu/packages/patches/pcre-CVE-2017-7186.patch | 56 +
.../patches/perl-net-ssleay-disable-ede-test.patch | 23 -
gnu/packages/patches/perl-no-sys-dirs.patch | 73 +-
...ext-markdown-discount-use-system-markdown.patch | 32 +
gnu/packages/patches/poppler-CVE-2017-9776.patch | 34 -
.../poppler-fix-crash-with-broken-documents.patch | 61 -
.../python-acme-dont-use-openssl-rand.patch | 28 +
.../patches/python-file-double-encoding-bug.patch | 50 -
.../python-pygit2-disable-network-tests.patch | 79 +-
...ython2-larch-coverage-4.0a6-compatibility.patch | 29 +
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/qemu-CVE-2017-13711.patch | 89 +
gnu/packages/patches/qemu-CVE-2017-14167.patch | 69 +
gnu/packages/patches/qemu-CVE-2017-7493.patch | 182 -
gnu/packages/patches/qemu-CVE-2017-8112.patch | 41 -
gnu/packages/patches/qemu-CVE-2017-8309.patch | 46 -
gnu/packages/patches/qemu-CVE-2017-8379.patch | 98 -
gnu/packages/patches/qemu-CVE-2017-8380.patch | 53 -
gnu/packages/patches/qemu-CVE-2017-9524.patch | 287 -
gnu/packages/patches/rpm-CVE-2014-8118.patch | 25 -
.../patches/shishi-fix-libgcrypt-detection.patch | 32 +
.../patches/texlive-texmf-CVE-2016-10243.patch | 18 -
gnu/packages/patches/vinagre-revert-1.patch | 56 +
gnu/packages/patches/vinagre-revert-2.patch | 448 +
gnu/packages/patches/wget-perl-5.26.patch | 96 +
.../wmfire-update-for-new-gdk-versions.patch | 2 +-
gnu/packages/patches/wxwidgets-fix-windowGTK.patch | 18 -
.../xf86-video-siliconmotion-fix-ftbfs.patch | 171 +
gnu/packages/pciutils.scm | 15 +-
gnu/packages/pcre.scm | 1 +
gnu/packages/pdf.scm | 19 +-
gnu/packages/perl.scm | 1024 +-
gnu/packages/photo.scm | 8 +-
gnu/packages/php.scm | 17 +-
gnu/packages/pkg-config.scm | 4 +-
gnu/packages/pulseaudio.scm | 17 +-
gnu/packages/pv.scm | 4 +-
gnu/packages/python.scm | 634 +-
gnu/packages/rdesktop.scm | 108 +-
gnu/packages/ruby.scm | 28 +-
gnu/packages/samba.scm | 2 +-
gnu/packages/screen.scm | 4 +-
gnu/packages/sdl.scm | 9 +-
gnu/packages/search.scm | 10 +-
gnu/packages/serialization.scm | 12 +-
gnu/packages/shells.scm | 4 +-
gnu/packages/shellutils.scm | 35 +
gnu/packages/simulation.scm | 212 +
gnu/packages/skarnet.scm | 12 +-
gnu/packages/statistics.scm | 171 +-
gnu/packages/swig.scm | 12 +-
gnu/packages/sync.scm | 4 +-
gnu/packages/syndication.scm | 2 +
gnu/packages/tcl.scm | 6 +-
gnu/packages/telephony.scm | 2 +-
gnu/packages/terminals.scm | 2 +-
gnu/packages/tex.scm | 150 +-
gnu/packages/texinfo.scm | 16 +-
gnu/packages/textutils.scm | 4 +-
gnu/packages/time.scm | 59 +-
gnu/packages/tls.scm | 114 +-
gnu/packages/valgrind.scm | 9 +
gnu/packages/version-control.scm | 76 +-
gnu/packages/video.scm | 69 +-
gnu/packages/vim.scm | 40 +-
gnu/packages/virtualization.scm | 51 +-
gnu/packages/w3m.scm | 2 +-
gnu/packages/web-browsers.scm | 2 +-
gnu/packages/web.scm | 397 +-
gnu/packages/webkit.scm | 17 +-
gnu/packages/wget.scm | 20 +-
gnu/packages/wine.scm | 7 +-
gnu/packages/wm.scm | 12 +-
gnu/packages/wxwidgets.scm | 6 +-
gnu/packages/xdisorg.scm | 12 +-
gnu/packages/xfce.scm | 2 +-
gnu/packages/xml.scm | 46 +-
gnu/packages/xorg.scm | 73 +-
gnu/services.scm | 37 +-
gnu/services/audio.scm | 35 +-
gnu/services/base.scm | 116 +-
gnu/services/cuirass.scm | 2 +-
gnu/services/desktop.scm | 87 +-
gnu/services/herd.scm | 33 +-
gnu/services/networking.scm | 55 +-
gnu/services/virtualization.scm | 492 +
gnu/services/web.scm | 64 +-
gnu/services/xorg.scm | 202 +-
gnu/system.scm | 66 +-
gnu/system/examples/bare-bones.tmpl | 8 +-
gnu/system/examples/desktop.tmpl | 7 +-
gnu/system/examples/lightweight-desktop.tmpl | 7 +-
gnu/system/examples/vm-image.tmpl | 2 +-
gnu/system/file-systems.scm | 26 +-
gnu/system/install.scm | 20 +-
gnu/system/mapped-devices.scm | 7 +-
gnu/system/uuid.scm | 265 +
gnu/system/vm.scm | 79 +-
gnu/tests.scm | 2 +-
gnu/tests/base.scm | 98 +-
gnu/tests/desktop.scm | 105 +
gnu/tests/install.scm | 124 +-
gnu/tests/nfs.scm | 2 +-
gnu/tests/ssh.scm | 2 +-
gnu/tests/virtualization.scm | 95 +
guix/build-system/cmake.scm | 160 +-
guix/build-system/gnu.scm | 1 +
guix/build-system/{cmake.scm => meson.scm} | 112 +-
guix/build/cmake-build-system.scm | 11 +-
guix/build/download.scm | 5 +-
guix/build/emacs-build-system.scm | 45 +-
guix/build/gnu-build-system.scm | 43 +-
guix/build/graft.scm | 22 +-
guix/build/meson-build-system.scm | 150 +
guix/build/syscalls.scm | 16 +-
guix/build/utils.scm | 17 +-
guix/download.scm | 6 +-
guix/gnu-maintenance.scm | 79 +-
guix/graph.scm | 16 +-
guix/http-client.scm | 6 +-
guix/import/cpan.scm | 2 +-
guix/memoization.scm | 5 +-
guix/packages.scm | 18 +-
guix/profiles.scm | 6 +-
guix/scripts/archive.scm | 1 -
guix/scripts/copy.scm | 1 -
guix/scripts/download.scm | 7 +-
guix/scripts/environment.scm | 1 -
guix/scripts/lint.scm | 7 +-
guix/scripts/pack.scm | 19 +-
guix/scripts/package.scm | 24 +-
guix/scripts/pull.scm | 1 -
guix/scripts/size.scm | 2 +-
guix/scripts/substitute.scm | 152 +-
guix/scripts/system.scm | 62 +-
guix/scripts/system/search.scm | 144 +
guix/store.scm | 6 +-
guix/ui.scm | 44 +
nix/libstore/build.cc | 8 +-
nix/libutil/util.cc | 15 -
nix/libutil/util.hh | 6 -
po/guix/POTFILES.in | 1 +
po/packages/POTFILES.in | 2 +
po/packages/fr.po | 17387 +++++++++++++++++--
tests/cpan.scm | 2 +-
tests/file-systems.scm | 26 -
tests/grafts.scm | 34 +-
tests/guix-download.sh | 5 +-
tests/guix-system.sh | 6 +-
tests/substitute.scm | 193 +-
tests/system.scm | 4 +-
tests/uuid.scm | 56 +
385 files changed, 33974 insertions(+), 8622 deletions(-)
diff --cc gnu/packages/package-management.scm
index 976d1a1,9f7792d..25e10e2
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@@ -261,9 -263,8 +263,9 @@@
(base32
"1giy2aprjmn5fp9c4s9r125fljw4wv6ixy5739i5bffw4jgr0f9r"))))))
(propagated-inputs
- `(("gnutls" ,gnutls/guile-2.2) ;for 'guix download' & co.
+ `(("gnutls" ,gnutls)
("guile-json" ,guile-json)
+ ("guile-ncurses/gpm" ,guile-ncurses/gpm)
("guile-ssh" ,guile-ssh)
("guile-git" ,guile-git)))
diff --cc gnu/system/install.scm
index a17543b,eb362f9..e45bb07
--- a/gnu/system/install.scm
+++ b/gnu/system/install.scm
@@@ -30,11 -30,10 +30,12 @@@
#:use-module (gnu packages admin)
#:use-module (gnu packages bash)
#:use-module (gnu packages bootloaders)
+ #:use-module (gnu packages guile)
#:use-module (gnu packages linux)
+ #:use-module (gnu packages ssh)
#:use-module (gnu packages cryptsetup)
#:use-module (gnu packages package-management)
+ #:use-module (gnu packages pciutils)
#:use-module (gnu packages disk)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages compression)
@@@ -252,10 -215,12 +253,13 @@@ You have been warned. Thanks for bein
(auto-login "root")
(login-pause? #t))))
+ (define bare-bones-os
+ (load "examples/bare-bones.tmpl"))
+
(list (mingetty-service (mingetty-configuration
(tty "tty1")
- (auto-login "root")))
+ (auto-login "root")
+ (login-program (guix-installer))))
(login-service (login-configuration
(motd motd)))
diff --cc guix/scripts/system.scm
index cecac22,567d8bb..da1093d
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@@ -989,7 -987,7 +997,7 @@@ argument list and OPTS is the option al
(case action
((build container vm vm-image disk-image reconfigure init
extension-graph shepherd-graph list-generations roll-back
- switch-generation installer)
- switch-generation search)
++ switch-generation search installer)
(alist-cons 'action action result))
(else (leave (G_ "~a: unknown action~%") action))))))