From 8e21fa0bd347117ae907827272f95cf4647a0af7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 14 Jan 2019 11:32:02 +0200 Subject: gnu: opencv: Loosen test suite failures. * gnu/packages/image-processing.scm (opencv)[native-inputs]: Add patch to opencv-contrib. [arguments]: Update 'unpack-submodule-sources phase. * gnu/packages/patches/opencv-rgbd-aarch64-test-fix.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index 7eb4366af2..499dbed267 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1036,6 +1036,7 @@ dist_patch_DATA = \ %D%/packages/patches/ola-readdir-r.patch \ %D%/packages/patches/openbabel-fix-crash-on-nwchem-output.patch \ %D%/packages/patches/opencascade-oce-glibc-2.26.patch \ + %D%/packages/patches/opencv-rgbd-aarch64-test-fix.patch \ %D%/packages/patches/openfoam-4.1-cleanup.patch \ %D%/packages/patches/openjdk-10-idlj-reproducibility.patch \ %D%/packages/patches/openldap-CVE-2017-9287.patch \ -- cgit v1.2.3 From 21b41a79fe62261efd39521ab28fdde78eb3d052 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 14 Jan 2019 16:00:35 +0100 Subject: gnu: Move Perl compression packages to new module. * gnu/packages/compression.scm (perl-compress-raw-bzip2, perl-compress-raw-zlib, perl-io-compress, perl-archive-zip, perl-archive-extract): Move from here... * gnu/packages/perl-compression.scm: ...to this new file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. * gnu/packages/ci.scm, gnu/packages/libreoffice.scm, gnu/packages/perl.scm: Adjust references. --- gnu/local.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index 499dbed267..e5cc1172cd 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -348,6 +348,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/pem.scm \ %D%/packages/perl.scm \ %D%/packages/perl-check.scm \ + %D%/packages/perl-compression.scm \ %D%/packages/perl-web.scm \ %D%/packages/photo.scm \ %D%/packages/phabricator.scm \ -- cgit v1.2.3 From a8b0556ea1e439c89dc1ba33c8864e8b9b811f08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 14 Jan 2019 22:24:01 +0100 Subject: gnu: libssh: Update to 0.8.6. * gnu/packages/patches/libssh-hostname-parser-bug.patch: Remove. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/ssh.scm (libssh): Update to 0.8.6. [source](patches): Remove. [arguments]: Add #:phases. (guile-ssh)[source](modules, snippet]: New fields. --- gnu/local.mk | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index e5cc1172cd..8859398276 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -933,7 +933,6 @@ dist_patch_DATA = \ %D%/packages/patches/libsndfile-CVE-2017-8361-8363-8365.patch \ %D%/packages/patches/libsndfile-CVE-2017-8362.patch \ %D%/packages/patches/libsndfile-CVE-2017-12562.patch \ - %D%/packages/patches/libssh-hostname-parser-bug.patch \ %D%/packages/patches/libssh2-fix-build-failure-with-gcrypt.patch \ %D%/packages/patches/libtar-CVE-2013-4420.patch \ %D%/packages/patches/libtheora-config-guess.patch \ -- cgit v1.2.3 From 4deeb1ed067ff572e775eb2977cfbbd7411ee67a Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Tue, 15 Jan 2019 10:15:11 +0100 Subject: gnu: Add missing patch to local.mk. This was forgotten in ab533c613ee2a44595786a6aca0b958f9f7f1dd9. * gnu/local.mk (dist_patch_DATA): Add "allegro-fix-compilation-mesa-18.2.5-and-later.patch". Signed-off-by: Jonathan Brielmaier --- gnu/local.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index 8859398276..a2439ff351 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -584,6 +584,7 @@ dist_patch_DATA = \ %D%/packages/patches/aegisub-icu59-include-unistr.patch \ %D%/packages/patches/aegisub-boost68.patch \ %D%/packages/patches/agg-am_c_prototype.patch \ + %D%/packages/patches/allegro-fix-compilation-mesa-18.2.5-and-later.patch \ %D%/packages/patches/amule-crypto-6.patch \ %D%/packages/patches/antiword-CVE-2014-8123.patch \ %D%/packages/patches/antlr3-3_1-fix-java8-compilation.patch \ -- cgit v1.2.3 From 44d10b1f722856ab8e9b942804aa7ef33e2ef739 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 15 Jan 2019 14:21:30 +0100 Subject: gnu: Separate Python core packages from the rest. * gnu/packages/python.scm: Move hundreds of package definitions from here... * gnu/packages/python-xyz.scm: ...to this new module. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. * gnu/packages/ada.scm, gnu/packages/admin.scm, gnu/packages/android.scm, gnu/packages/audio.scm, gnu/packages/backup.scm, gnu/packages/benchmark.scm, gnu/packages/bioinformatics.scm, gnu/packages/bittorrent.scm, gnu/packages/calendar.scm, gnu/packages/check.scm, gnu/packages/chemistry.scm, gnu/packages/cluster.scm, gnu/packages/compression.scm, gnu/packages/connman.scm, gnu/packages/crypto.scm, gnu/packages/cups.scm, gnu/packages/databases.scm, gnu/packages/dav.scm, gnu/packages/direct-connect.scm, gnu/packages/disk.scm, gnu/packages/django.scm, gnu/packages/dlang.scm, gnu/packages/docker.scm, gnu/packages/ebook.scm, gnu/packages/elf.scm, gnu/packages/emacs.scm, gnu/packages/emulators.scm, gnu/packages/engineering.scm, gnu/packages/enlightenment.scm, gnu/packages/finance.scm, gnu/packages/fltk.scm, gnu/packages/fontutils.scm, gnu/packages/freedesktop.scm, gnu/packages/game-development.scm, gnu/packages/games.scm, gnu/packages/geo.scm, gnu/packages/gl.scm, gnu/packages/glib.scm, gnu/packages/gnome.scm, gnu/packages/gnupg.scm, gnu/packages/gnuzilla.scm, gnu/packages/graph.scm, gnu/packages/graphics.scm, gnu/packages/graphviz.scm, gnu/packages/gtk.scm, gnu/packages/ham-radio.scm, gnu/packages/image-processing.scm, gnu/packages/image-viewers.scm, gnu/packages/image.scm, gnu/packages/irc.scm, gnu/packages/jrnl.scm, gnu/packages/julia.scm, gnu/packages/kde-frameworks.scm, gnu/packages/key-mon.scm, gnu/packages/libffi.scm, gnu/packages/libreoffice.scm, gnu/packages/libusb.scm, gnu/packages/lirc.scm, gnu/packages/logging.scm, gnu/packages/machine-learning.scm, gnu/packages/mail.scm, gnu/packages/mate.scm, gnu/packages/maths.scm, gnu/packages/medical.scm, gnu/packages/messaging.scm, gnu/packages/monitoring.scm, gnu/packages/mp3.scm, gnu/packages/mpd.scm, gnu/packages/music.scm, gnu/packages/networking.scm, gnu/packages/nutrition.scm, gnu/packages/openldap.scm, gnu/packages/openstack.scm, gnu/packages/package-management.scm, gnu/packages/password-utils.scm, gnu/packages/patchutils.scm, gnu/packages/pdf.scm, gnu/packages/photo.scm, gnu/packages/polkit.scm, gnu/packages/protobuf.scm, gnu/packages/python-crypto.scm, gnu/packages/python-web.scm, gnu/packages/qt.scm, gnu/packages/rdf.scm, gnu/packages/ruby.scm, gnu/packages/search.scm, gnu/packages/selinux.scm, gnu/packages/serialization.scm, gnu/packages/shells.scm, gnu/packages/simulation.scm, gnu/packages/ssh.scm, gnu/packages/statistics.scm, gnu/packages/storage.scm, gnu/packages/sync.scm, gnu/packages/terminals.scm, gnu/packages/textutils.scm, gnu/packages/time.scm, gnu/packages/tls.scm, gnu/packages/tor.scm, gnu/packages/tryton.scm, gnu/packages/version-control.scm, gnu/packages/video.scm, gnu/packages/virtualization.scm, gnu/packages/vpn.scm, gnu/packages/web-browsers.scm, gnu/packages/web.scm, gnu/packages/wicd.scm, gnu/packages/xdisorg.scm, gnu/packages/xorg.scm: Update module references. --- gnu/local.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index a2439ff351..7ee41de644 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -369,6 +369,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/python.scm \ %D%/packages/python-crypto.scm \ %D%/packages/python-web.scm \ + %D%/packages/python-xyz.scm \ %D%/packages/toys.scm \ %D%/packages/tryton.scm \ %D%/packages/qt.scm \ -- cgit v1.2.3 From 4fec042b54d65a2f44cc3602f7d6f82292e3d1a9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 15 Jan 2019 17:42:59 +0100 Subject: gnu: Move Python compression packages to new module. * gnu/packages/compression.scm (python-lzo, python2-lzo, python-lz4, python2-lz4, python-lzstring, python2-lzstring, bitshuffle, bitshuffle-for-snappy): Move variables from here... * gnu/packages/python-compression.scm: ...to this new module. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. * gnu/packages/bioinformatics.scm, gnu/packages/java-compression.scm, gnu/packages/xorg.scm: Adjust module references. --- gnu/local.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index 7ee41de644..fb8e0e1eb0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -367,6 +367,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/pure.scm \ %D%/packages/pv.scm \ %D%/packages/python.scm \ + %D%/packages/python-compression.scm \ %D%/packages/python-crypto.scm \ %D%/packages/python-web.scm \ %D%/packages/python-xyz.scm \ -- cgit v1.2.3 From 39ad752cf9d2e2044ea8f4fc28bddfd9ad69f2c0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 15 Jan 2019 09:26:14 +0200 Subject: gnu: kodi: Skip failing test. * gnu/packages/kodi.scm (kodi)[source]: Add patch. * gnu/packages/patches/kodi-skip-test-449.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index fb8e0e1eb0..be123cefd8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -880,6 +880,7 @@ dist_patch_DATA = \ %D%/packages/patches/kobodeluxe-manpage-minus-not-hyphen.patch \ %D%/packages/patches/kobodeluxe-midicon-segmentation-fault.patch \ %D%/packages/patches/kobodeluxe-graphics-window-signed-char.patch \ + %D%/packages/patches/kodi-skip-test-449.patch \ %D%/packages/patches/laby-make-install.patch \ %D%/packages/patches/ldc-bootstrap-disable-tests.patch \ %D%/packages/patches/ldc-disable-phobos-tests.patch \ -- cgit v1.2.3 From cd0322a3efd96577de9ab35e4432d1ae399257c8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 15 Jan 2019 21:47:05 +0100 Subject: gnu: Move sqlite to separate module. * gnu/packages/databases.scm (sqlite, sqlite-3.26.0, sqlite-with-fts5, sqlite-with-column-metadata): Move variables from here... * gnu/packages/sqlite.scm: ...to this new module. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. * gnu/packages/apl.scm, gnu/packages/bittorrent.scm, gnu/packages/calendar.scm, gnu/packages/code.scm, gnu/packages/crypto.scm, gnu/packages/databases.scm, gnu/packages/dc.scm, gnu/packages/disk.scm, gnu/packages/ebook.scm, gnu/packages/education.scm, gnu/packages/emacs.scm, gnu/packages/emulators.scm, gnu/packages/file-systems.scm, gnu/packages/freedesktop.scm, gnu/packages/ftp.scm, gnu/packages/games.scm, gnu/packages/geo.scm, gnu/packages/gnome.scm, gnu/packages/gnunet.scm, gnu/packages/gnupg.scm, gnu/packages/gnuzilla.scm, gnu/packages/gps.scm, gnu/packages/guile.scm, gnu/packages/ibus.scm, gnu/packages/kerberos.scm, gnu/packages/kodi.scm, gnu/packages/lisp.scm, gnu/packages/mail.scm, gnu/packages/messaging.scm, gnu/packages/mpd.scm, gnu/packages/music.scm, gnu/packages/networking.scm, gnu/packages/nfs.scm, gnu/packages/ocaml.scm, gnu/packages/package-management.scm, gnu/packages/pdf.scm, gnu/packages/photo.scm, gnu/packages/php.scm, gnu/packages/python.scm, gnu/packages/qt.scm, gnu/packages/ruby.scm, gnu/packages/scheme.scm, gnu/packages/sync.scm, gnu/packages/syndication.scm, gnu/packages/version-control.scm, gnu/packages/video.scm, gnu/packages/web-browsers.scm, gnu/packages/webkit.scm: Adjust module references. --- gnu/local.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index be123cefd8..a7da36f760 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -413,6 +413,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/sml.scm \ %D%/packages/speech.scm \ %D%/packages/spice.scm \ + %D%/packages/sqlite.scm \ %D%/packages/ssh.scm \ %D%/packages/sssd.scm \ %D%/packages/stalonetray.scm \ -- cgit v1.2.3 From 255d1bbe777a824be726edeb9fd47458a3a877a9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 16 Jan 2019 14:48:47 +0100 Subject: gnu: Move dbm databases to new module. * gnu/packages/databases.scm (gdbm, bdb, bdb-5.3): Move from here... * gnu/packages/dbm.scm: ...to this new module. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. * gnu/packages/audio.scm, gnu/packages/avahi.scm, gnu/packages/backup.scm, gnu/packages/cobol.scm, gnu/packages/cyrus-sasl.scm, gnu/packages/databases.scm, gnu/packages/finance.scm, gnu/packages/game-development.scm, gnu/packages/gnome.scm, gnu/packages/guile.scm, gnu/packages/ibus.scm, gnu/packages/kerberos.scm, gnu/packages/linux.scm, gnu/packages/mail.scm, gnu/packages/man.scm, gnu/packages/nvi.scm, gnu/packages/openldap.scm, gnu/packages/package-management.scm, gnu/packages/php.scm, gnu/packages/pulseaudio.scm, gnu/packages/python.scm, gnu/packages/rdf.scm, gnu/packages/ruby.scm, gnu/packages/sawfish.scm: Update module references. --- gnu/local.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index a7da36f760..d8d75af615 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -126,6 +126,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/datamash.scm \ %D%/packages/datastructures.scm \ %D%/packages/dav.scm \ + %D%/packages/dbm.scm \ %D%/packages/dc.scm \ %D%/packages/debian.scm \ %D%/packages/debug.scm \ -- cgit v1.2.3 From eeb883cb0d5a932b864dbbb60e3ad93ca46c212b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 16 Jan 2019 16:03:52 +0100 Subject: gnu: Move Emacs packages to new module. * gnu/packages/emacs.scm: Move almost all packages from here... * gnu/packages/emacs-xyz.scm: ...to this new module. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. * gnu/packages/ocaml.scm, gnu/packages/package-management.scm, gnu/packages/statistics.scm: Update module references. --- gnu/local.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index d8d75af615..4fed451747 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -155,6 +155,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/elixir.scm \ %D%/packages/embedded.scm \ %D%/packages/emacs.scm \ + %D%/packages/emacs-xyz.scm \ %D%/packages/emulators.scm \ %D%/packages/enchant.scm \ %D%/packages/engineering.scm \ -- cgit v1.2.3 From 08af580bde01ffd8e6968b6f9f9eff14c4f9cc5a Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 16 Nov 2018 20:40:26 +0900 Subject: gnu: kmscon: Add runtime keymap update support. * gnu/packages/patches/kmscon-runtime-keymap-switch.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/terminals.scm (kmscon)[source]: Add patch. --- gnu/local.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index 4fed451747..1268e0c600 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -876,6 +876,7 @@ dist_patch_DATA = \ %D%/packages/patches/kinit-kdeinit-libpath.patch \ %D%/packages/patches/kio-search-smbd-on-PATH.patch \ %D%/packages/patches/kmod-module-directory.patch \ + %D%/packages/patches/kmscon-runtime-keymap-switch.patch \ %D%/packages/patches/kpackage-allow-external-paths.patch \ %D%/packages/patches/kobodeluxe-paths.patch \ %D%/packages/patches/kobodeluxe-enemies-pipe-decl.patch \ -- cgit v1.2.3 From d0f3a672dcbdfefd3556b6a21985ff0e35eed3be Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 16 Nov 2018 20:43:55 +0900 Subject: gnu: Add graphical installer support. * configure.ac: Require that guile-newt is available. * gnu/installer.scm: New file. * gnu/installer/aux-files/logo.txt: New file. * gnu/installer/build-installer.scm: New file. * gnu/installer/connman.scm: New file. * gnu/installer/keymap.scm: New file. * gnu/installer/locale.scm: New file. * gnu/installer/newt.scm: New file. * gnu/installer/newt/ethernet.scm: New file. * gnu/installer/newt/hostname.scm: New file. * gnu/installer/newt/keymap.scm: New file. * gnu/installer/newt/locale.scm: New file. * gnu/installer/newt/menu.scm: New file. * gnu/installer/newt/network.scm: New file. * gnu/installer/newt/page.scm: New file. * gnu/installer/newt/timezone.scm: New file. * gnu/installer/newt/user.scm: New file. * gnu/installer/newt/utils.scm: New file. * gnu/installer/newt/welcome.scm: New file. * gnu/installer/newt/wifi.scm: New file. * gnu/installer/steps.scm: New file. * gnu/installer/timezone.scm: New file. * gnu/installer/utils.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add previous files. * gnu/system.scm: Export %root-account. * gnu/system/install.scm (%installation-services): Use kmscon instead of linux VT for all tty. (installation-os)[users]: Add the graphical installer as shell of the root account. [packages]: Add font related packages. * po/guix/POTFILES.in: Add installer files. --- gnu/local.mk | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index 1268e0c600..3e6d30d8e9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -543,6 +543,28 @@ GNU_SYSTEM_MODULES = \ %D%/build/marionette.scm \ %D%/build/vm.scm \ \ + %D%/installer.scm \ + %D%/installer/build-installer.scm \ + %D%/installer/connman.scm \ + %D%/installer/keymap.scm \ + %D%/installer/locale.scm \ + %D%/installer/newt.scm \ + %D%/installer/steps.scm \ + %D%/installer/timezone.scm \ + %D%/installer/utils.scm \ + \ + %D%/installer/newt/ethernet.scm \ + %D%/installer/newt/hostname.scm \ + %D%/installer/newt/keymap.scm \ + %D%/installer/newt/locale.scm \ + %D%/installer/newt/menu.scm \ + %D%/installer/newt/network.scm \ + %D%/installer/newt/page.scm \ + %D%/installer/newt/timezone.scm \ + %D%/installer/newt/utils.scm \ + %D%/installer/newt/welcome.scm \ + %D%/installer/newt/wifi.scm \ + \ %D%/tests.scm \ %D%/tests/audio.scm \ %D%/tests/base.scm \ -- cgit v1.2.3 From 7d328e341a5caca995b6c18c38ae2e9ee07f7b7e Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 23 Nov 2018 10:56:49 +0900 Subject: configure: Disable installer build by default. Only build installer if "--enable-installer" is passed. In that case only, the support for Guile-newt becomes mandatory. * configure.ac: Add --enable-installer argument. Export ENABLE_INSTALLER conditional according to the argument value. * gnu/local.mk (GNU_SYSTEM_MODULES): Remove installer modules and build them only if ENABLE_INSTALLER is set. --- gnu/local.mk | 49 ++++++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 23 deletions(-) (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index 3e6d30d8e9..665721bec1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -543,6 +543,29 @@ GNU_SYSTEM_MODULES = \ %D%/build/marionette.scm \ %D%/build/vm.scm \ \ + %D%/tests.scm \ + %D%/tests/audio.scm \ + %D%/tests/base.scm \ + %D%/tests/databases.scm \ + %D%/tests/desktop.scm \ + %D%/tests/dict.scm \ + %D%/tests/docker.scm \ + %D%/tests/monitoring.scm \ + %D%/tests/nfs.scm \ + %D%/tests/install.scm \ + %D%/tests/mail.scm \ + %D%/tests/messaging.scm \ + %D%/tests/networking.scm \ + %D%/tests/rsync.scm \ + %D%/tests/security-token.scm \ + %D%/tests/ssh.scm \ + %D%/tests/version-control.scm \ + %D%/tests/virtualization.scm \ + %D%/tests/web.scm + +if ENABLE_INSTALLER + +GNU_SYSTEM_MODULES += \ %D%/installer.scm \ %D%/installer/build-installer.scm \ %D%/installer/connman.scm \ @@ -563,29 +586,9 @@ GNU_SYSTEM_MODULES = \ %D%/installer/newt/timezone.scm \ %D%/installer/newt/utils.scm \ %D%/installer/newt/welcome.scm \ - %D%/installer/newt/wifi.scm \ - \ - %D%/tests.scm \ - %D%/tests/audio.scm \ - %D%/tests/base.scm \ - %D%/tests/databases.scm \ - %D%/tests/desktop.scm \ - %D%/tests/dict.scm \ - %D%/tests/docker.scm \ - %D%/tests/monitoring.scm \ - %D%/tests/nfs.scm \ - %D%/tests/install.scm \ - %D%/tests/mail.scm \ - %D%/tests/messaging.scm \ - %D%/tests/networking.scm \ - %D%/tests/rsync.scm \ - %D%/tests/security-token.scm \ - %D%/tests/ssh.scm \ - %D%/tests/version-control.scm \ - %D%/tests/virtualization.scm \ - %D%/tests/web.scm \ - \ - %D%/ci.scm + %D%/installer/newt/wifi.scm + +endif ENABLE_INSTALLER # Modules that do not need to be compiled. MODULES_NOT_COMPILED += \ -- cgit v1.2.3 From a49d633c0c65975263270f5ac0050482ca6a5513 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 24 Nov 2018 12:25:03 +0900 Subject: installer: Move everything to the build side. * gnu/installer.scm: Rename to ... * gnu/installer/record.scm: ... this. * gnu/installer/build-installer.scm: Move everything to the build side and rename to gnu/installer.scm. * gnu/installer/newt.scm: Remove all the gexps and add depencies to newt modules as this code will only be used on the build side by now. * gnu/local.mk (GNU_SYSTEM_MODULES): Adapt it, (dist_installer_DATA): New rule to install installer's aux-files. * gnu/system/install.scm (%installation-services): Use only 'installer-program' from (gnu installer). The installer is now choosen on the build side. * guix/self.scm (*system-modules*): Restore previous behaviour and add all installer files to #:extra-files field of the scheme-node. * po/guix/POTFILES.in: Adapt it. --- gnu/local.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index 665721bec1..b0ec16de34 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -567,7 +567,7 @@ if ENABLE_INSTALLER GNU_SYSTEM_MODULES += \ %D%/installer.scm \ - %D%/installer/build-installer.scm \ + %D%/installer/record.scm \ %D%/installer/connman.scm \ %D%/installer/keymap.scm \ %D%/installer/locale.scm \ @@ -588,6 +588,11 @@ GNU_SYSTEM_MODULES += \ %D%/installer/newt/welcome.scm \ %D%/installer/newt/wifi.scm +installerdir = $(guilemoduledir)/%D%/installer +dist_installer_DATA = \ + %D%/installer/aux-files/logo.txt \ + %D%/installer/aux-files/SUPPORTED + endif ENABLE_INSTALLER # Modules that do not need to be compiled. -- cgit v1.2.3 From dc5f3275ecbddc804875899e9e457299a835d7ab Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 5 Dec 2018 14:30:16 +0900 Subject: installer: Add configuration formatter. * gnu/installer.scm (installer-steps): Add configuration-formatter procedures. * gnu/installer/final.scm: New file. * gnu/installer/locale.scm (locale->configuration): New exported procedure. * gnu/installer/newt.scm (newt-installer): Add final page. * gnu/installer/newt/final.scm: New file. * gnu/installer/record.scm (installer): Add final-page field. * gnu/installer/timezone.scm (posix-tz->configuration): New exported procedure. * gnu/installer/steps.scm (installer-step): Rename configuration-proc field to configuration-formatter. (%installer-configuration-file): New exported parameter, (%installer-target-dir): ditto, (%configuration-file-width): ditto, (format-configuration): new exported procedure, (configuration->file): new exported procedure. --- gnu/local.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index b0ec16de34..d4acb8d2ec 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -569,6 +569,7 @@ GNU_SYSTEM_MODULES += \ %D%/installer.scm \ %D%/installer/record.scm \ %D%/installer/connman.scm \ + %D%/installer/final.scm \ %D%/installer/keymap.scm \ %D%/installer/locale.scm \ %D%/installer/newt.scm \ @@ -577,6 +578,7 @@ GNU_SYSTEM_MODULES += \ %D%/installer/utils.scm \ \ %D%/installer/newt/ethernet.scm \ + %D%/installer/newt/final.scm \ %D%/installer/newt/hostname.scm \ %D%/installer/newt/keymap.scm \ %D%/installer/newt/locale.scm \ -- cgit v1.2.3 From b51bde71a9385f4e81fbea258bfb9e8ff48be119 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 5 Dec 2018 14:41:48 +0900 Subject: installer: Add services page. Add a page to select services, for now only desktop environments choice is available. * gnu/installer.scm (steps): Add services step. * gnu/installer/newt.scm (newt-installer): Add services-page field. * gnu/installer/newt/services.scm: New file. * gnu/installer/record.scm (installer): Add services-page field. * gnu/installer/services.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add new files. * po/guix/POTFILES.in: Add new files. --- gnu/local.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index d4acb8d2ec..15a43406a4 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -573,6 +573,7 @@ GNU_SYSTEM_MODULES += \ %D%/installer/keymap.scm \ %D%/installer/locale.scm \ %D%/installer/newt.scm \ + %D%/installer/services.scm \ %D%/installer/steps.scm \ %D%/installer/timezone.scm \ %D%/installer/utils.scm \ @@ -585,6 +586,7 @@ GNU_SYSTEM_MODULES += \ %D%/installer/newt/menu.scm \ %D%/installer/newt/network.scm \ %D%/installer/newt/page.scm \ + %D%/installer/newt/services.scm \ %D%/installer/newt/timezone.scm \ %D%/installer/newt/utils.scm \ %D%/installer/newt/welcome.scm \ -- cgit v1.2.3 From b4658c258eaf7731dbb45409aedef58afc5de93a Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 5 Dec 2018 14:45:53 +0900 Subject: installer: Add hostname. * gnu/installer/hostname.scm: New file. * gnu/installer.scm (installer-program): Use new module above. * gnu/local.mk (GNU_SYSTEM_MODULES): Add new file. * po/guix/POTFILES.in: Add new file. --- gnu/local.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index 15a43406a4..bcb5e5f679 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -570,6 +570,7 @@ GNU_SYSTEM_MODULES += \ %D%/installer/record.scm \ %D%/installer/connman.scm \ %D%/installer/final.scm \ + %D%/installer/hostname.scm \ %D%/installer/keymap.scm \ %D%/installer/locale.scm \ %D%/installer/newt.scm \ -- cgit v1.2.3 From 47c94801656c7e9ddf1dcfe0189b48d7c57d0a1d Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 5 Dec 2018 14:55:41 +0900 Subject: installer: Add user module. * gnu/installer/user.scm: New file. --- gnu/local.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index bcb5e5f679..0b5e96afa4 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -577,6 +577,7 @@ GNU_SYSTEM_MODULES += \ %D%/installer/services.scm \ %D%/installer/steps.scm \ %D%/installer/timezone.scm \ + %D%/installer/user.scm \ %D%/installer/utils.scm \ \ %D%/installer/newt/ethernet.scm \ -- cgit v1.2.3 From 69a934f23ae1bd7dda9ec269a6ce3012e13c9011 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 5 Dec 2018 14:57:28 +0900 Subject: installer: Add partitioning support. * gnu/installer.scm (installer-steps): Add partitioning step. * gnu/installer/newt.scm (newt-installer): Add partition-page field. * gnu/installer/newt/partition.scm: New file. * gnu/installer/parted.scm: New file. * gnu/installer/record (installer): New partition-page field. * gnu/local.mk (GNU_SYSTEM_MODULES): Add new files. * po/guix/POTFILES.in: Add new files. --- gnu/local.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index 0b5e96afa4..63859a3b67 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -574,6 +574,7 @@ GNU_SYSTEM_MODULES += \ %D%/installer/keymap.scm \ %D%/installer/locale.scm \ %D%/installer/newt.scm \ + %D%/installer/parted.scm \ %D%/installer/services.scm \ %D%/installer/steps.scm \ %D%/installer/timezone.scm \ @@ -588,6 +589,7 @@ GNU_SYSTEM_MODULES += \ %D%/installer/newt/menu.scm \ %D%/installer/newt/network.scm \ %D%/installer/newt/page.scm \ + %D%/installer/newt/partition.scm \ %D%/installer/newt/services.scm \ %D%/installer/newt/timezone.scm \ %D%/installer/newt/utils.scm \ -- cgit v1.2.3 From 1ad1b6e2f25b89bc57e95c1bfb3f11f336de8410 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 5 Dec 2018 15:01:12 +0900 Subject: installer: Reorder local.mk. * gnu/local.mk (GNU_SYSTEM_MODULES): Reorder list. --- gnu/local.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index 63859a3b67..1619e34404 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -567,7 +567,6 @@ if ENABLE_INSTALLER GNU_SYSTEM_MODULES += \ %D%/installer.scm \ - %D%/installer/record.scm \ %D%/installer/connman.scm \ %D%/installer/final.scm \ %D%/installer/hostname.scm \ @@ -575,6 +574,7 @@ GNU_SYSTEM_MODULES += \ %D%/installer/locale.scm \ %D%/installer/newt.scm \ %D%/installer/parted.scm \ + %D%/installer/record.scm \ %D%/installer/services.scm \ %D%/installer/steps.scm \ %D%/installer/timezone.scm \ -- cgit v1.2.3 From 2b65a9e6d18c661f5bb6b3e557973c52b3294e87 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 15 Jan 2019 08:52:52 -0500 Subject: gnu: OpenSSH: Fix CVE-2018-20685. * gnu/packages/patches/openssh-CVE-2018-20685.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/ssh.scm (openssh)[source]: Use it. --- gnu/local.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index 1619e34404..99ebdaad4a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1088,6 +1088,7 @@ dist_patch_DATA = \ %D%/packages/patches/openldap-CVE-2017-9287.patch \ %D%/packages/patches/openocd-nrf52.patch \ %D%/packages/patches/opensmtpd-fix-crash.patch \ + %D%/packages/patches/openssh-CVE-2018-20685.patch \ %D%/packages/patches/openssl-runpath.patch \ %D%/packages/patches/openssl-1.1-c-rehash-in.patch \ %D%/packages/patches/openssl-c-rehash-in.patch \ -- cgit v1.2.3 From 7bf1dc75706d558cea41e24ce90f2eb0c026996d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 17 Jan 2019 15:07:07 +0100 Subject: build: Add coq.scm to the distribution. This is a followup to 33af92dd99c9f2c726c32f81936931c69d719eb9. * gnu/local.mk (GNU_SYSTEM_MODULES): Add gnu/packages/coq.scm. --- gnu/local.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index 99ebdaad4a..9706a39ef6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -112,6 +112,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/conky.scm \ %D%/packages/connman.scm \ %D%/packages/cook.scm \ + %D%/packages/coq.scm \ %D%/packages/cpio.scm \ %D%/packages/cpp.scm \ %D%/packages/cppi.scm \ -- cgit v1.2.3 From 1a7dbc11c5650ecfadff6e5481b1805d8954adc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 18 Jan 2019 22:46:25 +0100 Subject: maint: Add gnu/ci.scm to the distribution. * gnu/local.mk (GNU_SYSTEM_MODULES): Add %D%/ci.scm. --- gnu/local.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index 9706a39ef6..750e67d2fe 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -46,6 +46,7 @@ GNU_SYSTEM_MODULES = \ %D%/bootloader/grub.scm \ %D%/bootloader/extlinux.scm \ %D%/bootloader/u-boot.scm \ + %D%/ci.scm \ %D%/packages.scm \ %D%/packages/abduco.scm \ %D%/packages/abiword.scm \ -- cgit v1.2.3