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.
This commit is contained in:
Marius Bakke 2020-06-27 10:37:19 +02:00
parent ef2a3871fd
commit a62df7cd72
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA

View file

@ -40,17 +40,18 @@ (define-module (gnu packages gdb)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (srfi srfi-1)) #:use-module (srfi srfi-1))
(define-public gdb-9.1 (define-public gdb
(package (package
(name "gdb") (name "gdb")
(version "9.1") (version "9.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/gdb/gdb-" (uri (string-append "mirror://gnu/gdb/gdb-"
version ".tar.xz")) version ".tar.xz"))
(patches (search-patches "gdb-hurd.patch"))
(sha256 (sha256
(base32 (base32
"0dqp1p7w836iwijg1zb4a784n0j4pyjiw5v6h8fg5lpx6b40x7k9")))) "0mf5fn8v937qwnal4ykn3ji1y2sxk0fa1yfqi679hxmpg6pdf31n"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
@ -125,7 +126,7 @@ (define-public gdb-9.1
;; <https://bugs.gnu.org/37810>. ;; <https://bugs.gnu.org/37810>.
(define-public gdb-8.2 (define-public gdb-8.2
(package (package
(inherit gdb-9.1) (inherit gdb)
(version "8.2.1") (version "8.2.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
@ -135,27 +136,9 @@ (define-public gdb-8.2
(base32 (base32
"00i27xqawjv282a07i73lp1l02n0a3ywzhykma75qg500wll6sha")))))) "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 (define-public gdb-minimal
(package/inherit (package/inherit
gdb-9.2 gdb
(name "gdb-minimal") (name "gdb-minimal")
(inputs (fold alist-delete (package-inputs gdb) (inputs (fold alist-delete (package-inputs gdb)
'("guile" "libxml2" "ncurses" "python-wrapper" '("guile" "libxml2" "ncurses" "python-wrapper"