diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2023-04-18 16:08:31 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2023-04-18 17:51:22 +0200 |
| commit | 6b5c21e043c632e6287a2af7f336036571538da2 (patch) | |
| tree | b1eb16c63b0b237b80867ee76fac3bab7f09a69b | |
| parent | c8bc58a9e705bb4c37d2c4386d1c6050ab324cb1 (diff) | |
| download | guix-6b5c21e043c632e6287a2af7f336036571538da2.tar guix-6b5c21e043c632e6287a2af7f336036571538da2.tar.gz | |
gnu: gdb: Distinguish between the "pinned" and the "default" version.
* gnu/packages/gdb.scm (gdb/pinned): New variable.
* gnu/packages/rust.scm (rust)[native-inputs]: Use it instead of GDB.
| -rw-r--r-- | gnu/packages/gdb.scm | 6 | ||||
| -rw-r--r-- | gnu/packages/rust.scm | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/gnu/packages/gdb.scm b/gnu/packages/gdb.scm index b9fbf1480a..e2c4941e4e 100644 --- a/gnu/packages/gdb.scm +++ b/gnu/packages/gdb.scm @@ -161,11 +161,15 @@ written in C, C++, Ada, Objective-C, Pascal and more.") ;; GDB 12 builds fine on GNU/Hurd. (supported-systems %supported-systems))) -(define-public gdb +(define-public gdb/pinned ;; This is the fixed version that packages depend on. Update it rarely ;; enough to avoid massive rebuilds. gdb-11) +(define-public gdb + ;; The "default" version. + gdb-11) + (define-public gdb-minimal (package/inherit gdb-12 (name "gdb-minimal") diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 4d7790cfc6..d07f4ef10c 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -788,7 +788,7 @@ safety and thread safety guarantees.") (format #f "prefix = ~s" (assoc-ref outputs "rustfmt")))) (invoke "./x.py" "install" "rustfmt"))))))) ;; Add test inputs. - (native-inputs (cons* `("gdb" ,gdb) + (native-inputs (cons* `("gdb" ,gdb/pinned) `("procps" ,procps) (package-native-inputs base-rust)))))) |