me
/
guix
Archived
1
0
Fork 0
Code

gnu: Remove gdb@9. 

* gnu/packages/gdb.scm (gdb-9): Rename to ...
(gdb-10): ... this.  Update to 10.1.
[inputs]: Change from GUILE-2.0 to GUILE-3.0.
(gdb-8.2): Inherit from GDB-10.
[inputs]: Stick with GUILE-2.0.
(gdb-10): Remove variable.
(gdb): Point to GDB-10.
(gdb-minimal): Inherit from GDB.
master
Marius Bakke 2020-11-29 23:36:03 +01:00
parent 18daba93d3
commit 5b6b1608b2
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
gnu/packages/gdb.scm
View File

@ -38,20 +38,20 @@
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module ((guix build utils) #:select (alist-replace))
#:use-module (srfi srfi-1)) #:use-module (srfi srfi-1))
(define-public gdb-9.2 (define-public gdb-10
(package (package
(name "gdb") (name "gdb")
(version "9.2") (version "10.1")
(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
"0mf5fn8v937qwnal4ykn3ji1y2sxk0fa1yfqi679hxmpg6pdf31n")))) "1h32dckz1y8fnyxh22iyw8h3hnhxr79v1ng85px3ljn1xv71wbzq"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
@ -97,7 +97,7 @@
("gmp" ,gmp) ("gmp" ,gmp)
("readline" ,readline) ("readline" ,readline)
("ncurses" ,ncurses) ("ncurses" ,ncurses)
("guile" ,guile-2.0) ("guile" ,guile-3.0)
("python-wrapper" ,python-wrapper) ("python-wrapper" ,python-wrapper)
("source-highlight" ,source-highlight) ("source-highlight" ,source-highlight)
@ -132,7 +132,7 @@ written in C, C++, Ada, Objective-C, Pascal and more.")
;; <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.2) (inherit gdb-10)
(version "8.2.1") (version "8.2.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
@ -140,31 +140,19 @@ written in C, C++, Ada, Objective-C, Pascal and more.")
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"00i27xqawjv282a07i73lp1l02n0a3ywzhykma75qg500wll6sha")))))) "00i27xqawjv282a07i73lp1l02n0a3ywzhykma75qg500wll6sha"))))
(inputs
(alist-replace "guile" (list guile-2.0)
(package-inputs gdb-10)))))
(define-public gdb (define-public gdb
;; This is the fixed version that packages depend on. Update it rarely ;; This is the fixed version that packages depend on. Update it rarely
;; enough to avoid massive rebuilds. ;; enough to avoid massive rebuilds.
gdb-9.2) gdb-10)
(define-public gdb-10
(package
(inherit gdb)
(version "10.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/gdb/gdb-"
version ".tar.xz"))
(sha256
(base32
"1h32dckz1y8fnyxh22iyw8h3hnhxr79v1ng85px3ljn1xv71wbzq"))))
(inputs
`(("guile" ,guile-3.0)
,@(alist-delete "guile" (package-inputs gdb))))))
(define-public gdb-minimal (define-public gdb-minimal
(package/inherit (package/inherit
gdb-10 gdb
(name "gdb-minimal") (name "gdb-minimal")
(inputs (fold alist-delete (package-inputs gdb) (inputs (fold alist-delete (package-inputs gdb)
'("libxml2" "ncurses" "python-wrapper" "source-highlight"))))) '("libxml2" "ncurses" "python-wrapper" "source-highlight")))))