05/06: gnu: gdb@8.2: Inherit from 'gdb-minimal'.

[guix-commits]

mbakke pushed a commit to branch staging
in repository guix.

commit c007d868686fc2f9bf02a34150d4f0ac72b1f8d2
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sat Jun 27 12:34:48 2020 +0200

    gnu: gdb@8.2: Inherit from 'gdb-minimal'.
    
    * gnu/packages/gdb.scm (gdb-minimal): Move definition up.
    (gdb-8.2): Rename to ...
    (gdb-minimal-8.2): ... this.  Inherit from GDB-MINIMAL.
    * gnu/packages/rust.scm (rust-1.27)[native-inputs]: Adjust for the rename.
---
 gnu/packages/gdb.scm  | 18 +++++++++---------
 gnu/packages/rust.scm |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/gdb.scm b/gnu/packages/gdb.scm
index 56d3796..f2f272c 100644
--- a/gnu/packages/gdb.scm
+++ b/gnu/packages/gdb.scm
@@ -122,11 +122,18 @@ the program is running to try to fix bugs.  It can be 
used to debug programs
 written in C, C++, Ada, Objective-C, Pascal and more.")
     (license gpl3+)))
 
+(define-public gdb-minimal
+  (package/inherit
+   gdb
+   (name "gdb-minimal")
+   (inputs (fold alist-delete (package-inputs gdb)
+                 '("libxml2" "ncurses" "python-wrapper" "source-highlight")))))
+
 ;; This version of GDB is required by some of the Rust compilers, see
 ;; <https://bugs.gnu.org/37810>.
-(define-public gdb-8.2
+(define-public gdb-minimal-8.2
   (package
-    (inherit gdb)
+    (inherit gdb-minimal)
     (version "8.2.1")
     (source (origin
               (method url-fetch)
@@ -135,10 +142,3 @@ written in C, C++, Ada, Objective-C, Pascal and more.")
               (sha256
                (base32
                 "00i27xqawjv282a07i73lp1l02n0a3ywzhykma75qg500wll6sha"))))))
-
-(define-public gdb-minimal
-  (package/inherit
-   gdb
-   (name "gdb-minimal")
-   (inputs (fold alist-delete (package-inputs gdb)
-                 '("libxml2" "ncurses" "python-wrapper" "source-highlight")))))
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index b084a6d..fe43e72 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -828,7 +828,7 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\"
       (native-inputs
        ;; FIXME: Rust 1.27 and some later versions require GDB 8.2 
specifically.
        ;; See <https://bugs.gnu.org/37810>.
-       (alist-replace "gdb" (list gdb-8.2)
+       (alist-replace "gdb" (list gdb-minimal-8.2)
                       (package-native-inputs base-rust)))
       (arguments
        (substitute-keyword-arguments (package-arguments base-rust)