Merge branch 'master' into core-updates

diff --cc gnu/packages/admin.scm
Simple merge

diff --cc gnu/packages/bash.scm
Simple merge

diff --cc gnu/packages/bootloaders.scm
Simple merge

diff --cc gnu/packages/databases.scm
Simple merge

diff --cc gnu/packages/linux.scm
Simple merge

diff --cc gnu/packages/ncurses.scm
index d8b72a1,7899f19..65531ec
--- 1/gnu/packages/ncurses.scm
--- 2/gnu/packages/ncurses.scm
+++ b/gnu/packages/ncurses.scm
@@@ -189,6 -190,30 +190,19 @@@ ncursesw library provides wide characte
      (license x11)
      (home-page "https://www.gnu.org/software/ncurses/")))
  
 -(define ncurses/fixed
 -  (package
 -    (inherit ncurses)
 -    (source
 -      (origin
 -        (inherit (package-source ncurses))
 -        (patches
 -          (append
 -            (origin-patches (package-source ncurses))
 -            (search-patches "ncurses-CVE-2017-10684-10685.patch")))))))
 -
+ (define-public ncurses/gpm
+   (package/inherit ncurses
+     (name "ncurses-with-gpm")
+     (arguments
+      (substitute-keyword-arguments (package-arguments ncurses)
+        ((#:configure-flags cf)
+         `(cons (string-append "--with-gpm="
+                               (assoc-ref %build-inputs "gpm")
+                               "/lib/libgpm.so.2")
+                ,cf))))
+     (inputs
+      `(("gpm" ,gpm)))))
+ 
  (define-public dialog
    (package
      (name "dialog")

diff --cc gnu/packages/python.scm
Simple merge

diff --cc gnu/packages/xorg.scm
Simple merge

diff --cc gnu/system.scm
Simple merge