From 4a38ec9e98e2ca6dc1f01824b9097e0e668b48ab Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Sat, 12 Oct 2019 20:53:14 +0200
Subject: gnu: Remove GDB@8.2.

* gnu/packages/gdb.scm (gdb-8.2): Rename to ...
(gdb-8.3): ... this.  Update to 8.3.1.
(gdb): Refer to GDB-8.3.
---
 gnu/packages/gdb.scm | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

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

diff --git a/gnu/packages/gdb.scm b/gnu/packages/gdb.scm
index 48d1c0da6b..66bdb81a74 100644
--- a/gnu/packages/gdb.scm
+++ b/gnu/packages/gdb.scm
@@ -34,17 +34,17 @@
   #:use-module (guix download)
   #:use-module (guix build-system gnu))
 
-(define-public gdb-8.2
+(define-public gdb-8.3
   (package
     (name "gdb")
-    (version "8.2.1")
+    (version "8.3.1")
     (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnu/gdb/gdb-"
                                  version ".tar.xz"))
              (sha256
               (base32
-               "00i27xqawjv282a07i73lp1l02n0a3ywzhykma75qg500wll6sha"))))
+               "1i2pjwaafrlz7wqm40b4znr77ai32rjsxkpl2az38yyarpbv8m8y"))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f ; FIXME "make check" fails on single-processor systems.
@@ -106,19 +106,7 @@ 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-8.3
-  (package
-    (inherit gdb-8.2)
-    (version "8.3.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnu/gdb/gdb-"
-                                  version ".tar.xz"))
-              (sha256
-               (base32
-                "1i2pjwaafrlz7wqm40b4znr77ai32rjsxkpl2az38yyarpbv8m8y"))))))
-
 (define-public gdb
   ;; This is the fixed version that packages depend on.  Update it rarely
   ;; enough to avoid massive rebuilds.
-  gdb-8.2)
+  gdb-8.3)
-- 
cgit v1.2.3


From 47dda6e01e51478567e013e3814aaf48143abbc3 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Fri, 18 Oct 2019 12:12:21 +0200
Subject: gnu: rust: Use GDB 8.2 for tests.

* gnu/packages/gdb.scm (gdb-8.2): New public variable.
* gnu/packages/rust.scm (rust-1.27)[native-inputs]: Use GDB-8.2 instead of GDB.
---
 gnu/packages/gdb.scm  | 12 ++++++++++++
 gnu/packages/rust.scm |  3 +++
 2 files changed, 15 insertions(+)

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

diff --git a/gnu/packages/gdb.scm b/gnu/packages/gdb.scm
index 66bdb81a74..81e2892ad2 100644
--- a/gnu/packages/gdb.scm
+++ b/gnu/packages/gdb.scm
@@ -106,6 +106,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-8.2
+  (package/inherit
+   gdb-8.3
+   (version "8.2.1")
+   (source (origin
+             (method url-fetch)
+             (uri (string-append "mirror://gnu/gdb/gdb-"
+                                 version ".tar.xz"))
+             (sha256
+              (base32
+               "00i27xqawjv282a07i73lp1l02n0a3ywzhykma75qg500wll6sha"))))))
+
 (define-public gdb
   ;; This is the fixed version that packages depend on.  Update it rarely
   ;; enough to avoid massive rebuilds.
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index 241826ef82..d04cb0ab9d 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -779,6 +779,9 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\"
                                        "rust-bootstrap-stage0-test.patch"
                                        "rust-1.25-accept-more-detailed-gdb-lines.patch"
                                        "rust-reproducible-builds.patch")))))
+      (native-inputs
+       (alist-replace "gdb" (list gdb-8.2)
+                      (package-native-inputs base-rust)))
       (arguments
        (substitute-keyword-arguments (package-arguments base-rust)
          ((#:phases phases)
-- 
cgit v1.2.3