amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'staging' into 'core-updates'.

Browse source 
Conflicts:

	gnu/local.mk
	gnu/packages/cmake.scm
	gnu/packages/curl.scm
	gnu/packages/gl.scm
	gnu/packages/glib.scm
	gnu/packages/guile.scm
	gnu/packages/node.scm
	gnu/packages/openldap.scm
	gnu/packages/package-management.scm
	gnu/packages/python-xyz.scm
	gnu/packages/python.scm
	gnu/packages/tls.scm
	gnu/packages/vpn.scm
	gnu/packages/xorg.scm
This commit is contained in:
Maxim Cournoyer 2021-01-13 23:39:52 -05:00
commit 01f0707207
No known key found for this signature in database
GPG key ID: 1260E46482E63562
407 changed files with 75910 additions and 10423 deletions
Download patch file Download diff file Expand all files Collapse all files

36
gnu/packages/gdb.scm
View file

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