From a62df7cd72423e9ea7cf030a4db034c548eeb59e Mon Sep 17 00:00:00 2001
From: Marius Bakke <marius@gnu.org>
Date: Sat, 27 Jun 2020 10:37:19 +0200
Subject: gnu: GDB: Remove version 9.1.

* gnu/packages/gdb.scm (gdb-9.1): Rename to ...
(gdb): ... this.  Update to 9.2.
[source](patches): Add 'gdb-hurd.patch'.
(gdb-8.2): Inherit from GDB instead of GDB-9.1.
(gdb-9.2): Remove variable.
(gdb-minimal): Inherit from GDB instead of GDB-9.2.
---
 gnu/packages/gdb.scm | 29 ++++++-----------------------
 1 file changed, 6 insertions(+), 23 deletions(-)

(limited to 'gnu/packages/gdb.scm')

diff --git a/gnu/packages/gdb.scm b/gnu/packages/gdb.scm
index 338b73aa58..2615f1f158 100644
--- a/gnu/packages/gdb.scm
+++ b/gnu/packages/gdb.scm
@@ -40,17 +40,18 @@ (define-module (gnu packages gdb)
   #:use-module (guix build-system gnu)
   #:use-module (srfi srfi-1))
 
-(define-public gdb-9.1
+(define-public gdb
   (package
     (name "gdb")
-    (version "9.1")
+    (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
-               "0dqp1p7w836iwijg1zb4a784n0j4pyjiw5v6h8fg5lpx6b40x7k9"))))
+               "0mf5fn8v937qwnal4ykn3ji1y2sxk0fa1yfqi679hxmpg6pdf31n"))))
 
     (build-system gnu-build-system)
     (arguments
@@ -125,7 +126,7 @@ (define-public gdb-9.1
 ;; <https://bugs.gnu.org/37810>.
 (define-public gdb-8.2
   (package
-    (inherit gdb-9.1)
+    (inherit gdb)
     (version "8.2.1")
     (source (origin
               (method url-fetch)
@@ -135,27 +136,9 @@ (define-public gdb-8.2
                (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"
-- 
cgit v1.2.3