Merge commit '949f97f7f9' into core-update-new-2chris-core-updates-no-duplicates-attempt

Change-Id: Ibbd851541da42cc052ba58195fee033daadd57e5

Conflicts:
	gnu/local.mk
	gnu/packages/bioinformatics.scm
	gnu/packages/dictionaries.scm
	gnu/packages/display-managers.scm
	gnu/packages/engineering.scm
	gnu/packages/geo.scm
	gnu/packages/gl.scm
	gnu/packages/glib.scm
	gnu/packages/gnome-xyz.scm
	gnu/packages/gnome.scm
	gnu/packages/gtk.scm
	gnu/packages/image-processing.scm
	gnu/packages/linux.scm
	gnu/packages/llvm.scm
	gnu/packages/mail.scm
	gnu/packages/patches/eudev-rules-directory.patch
	gnu/packages/plotutils.scm
	gnu/packages/sdl.scm
	gnu/packages/syndication.scm

1 files changed, 2 insertions, 4 deletions

diff --git a/gnu/system/examples/lightweight-desktop.tmpl b/gnu/system/examples/lightweight-desktop.tmpl
index 4cb3c38311..c061284ba8 100644
--- a/gnu/system/examples/lightweight-desktop.tmpl
+++ b/gnu/system/examples/lightweight-desktop.tmpl
@@ -5,7 +5,7 @@
 
 (use-modules (gnu) (gnu system nss))
 (use-service-modules desktop)
-(use-package-modules bootloaders certs emacs emacs-xyz ratpoison suckless wm
+(use-package-modules bootloaders emacs emacs-xyz ratpoison suckless wm
                      xorg)
 
 (operating-system
@@ -47,9 +47,7 @@
                      ratpoison i3-wm i3status dmenu
                      emacs emacs-exwm emacs-desktop-environment
                      ;; terminal emulator
-                     xterm
-                     ;; for HTTPS access
-                     nss-certs)
+                     xterm)
                     %base-packages))
 
   ;; Use the "desktop" services, which include the X11