01/06: Merge branch 'master' into staging

[guix-commits]

mbakke pushed a commit to branch staging
in repository guix.

commit b6e068d299b345bebac544e7a905627a6ed08fdd
Merge: a62df7c d8a046d
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sat Jun 27 12:28:19 2020 +0200

    Merge branch 'master' into staging

 gnu/packages/admin.scm      | 47 +++++++++++++++++++++++++++++++++++++++++++++
 gnu/packages/gdb.scm        |  3 +--
 gnu/packages/python-xyz.scm |  4 ++--
 3 files changed, 50 insertions(+), 4 deletions(-)

diff --cc gnu/packages/gdb.scm
index 2615f1f,8301217..56d3796
--- a/gnu/packages/gdb.scm
+++ b/gnu/packages/gdb.scm
@@@ -136,10 -141,27 +136,9 @@@ written in C, C++, Ada, Objective-C, Pa
                 (base32
                  "00i27xqawjv282a07i73lp1l02n0a3ywzhykma75qg500wll6sha"))))))
  
 -(define-public gdb
 -  ;; This is the fixed version that packages depend on.  Update it rarely
 -  ;; enough to avoid massive rebuilds.
 -  gdb-9.1)
 -
 -(define-public gdb-9.2
 -  (package
 -    (inherit gdb)
 -    (version "9.2")
 -    (source (origin
 -              (method url-fetch)
 -              (uri (string-append "mirror://gnu/gdb/gdb-"
 -                                  version ".tar.xz"))
 -              (patches (search-patches "gdb-hurd.patch"))
 -              (sha256
 -               (base32
 -                "0mf5fn8v937qwnal4ykn3ji1y2sxk0fa1yfqi679hxmpg6pdf31n"))))))
 -
  (define-public gdb-minimal
    (package/inherit
 -   gdb-9.2
 +   gdb
     (name "gdb-minimal")
     (inputs (fold alist-delete (package-inputs gdb)
-                  '("guile" "libxml2" "ncurses" "python-wrapper"
-                    "source-highlight")))))
+                  '("libxml2" "ncurses" "python-wrapper" 
"source-highlight")))))