diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-10-01 17:10:49 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-10-01 17:10:49 -0400 |
| commit | 2e65e4834a226c570866f2e8976ed7f252b45cd1 (patch) | |
| tree | 21d625bce8d03627680214df4a6622bf8eb79dc9 /gnu/packages/rust.scm | |
| parent | 9c68ecb24dd1660ce736cdcdea0422a73ec318a2 (diff) | |
| parent | f1a3c11407b52004e523ec5de20d326c5661681f (diff) | |
Merge remote-tracking branch 'origin/master' into staging
With resolved conflicts in:
gnu/packages/bittorrent.scm
gnu/packages/databases.scm
gnu/packages/geo.scm
gnu/packages/gnupg.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/python-xyz.scm
gnu/packages/xorg.scm
guix/build/qt-utils.scm
Diffstat (limited to 'gnu/packages/rust.scm')
| -rw-r--r-- | gnu/packages/rust.scm | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index a4a28eafd6..b181a31915 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2019 Ivan Petkov <ivanppetkov@gmail.com> ;;; Copyright © 2020, 2021 Jakub Kądziołka <kuba@kadziolka.net> ;;; Copyright © 2020 Pierre Langlois <pierre.langlois@gmx.com> -;;; Copyright © 2020 Matthew Kraai <kraai@ftbfs.org> +;;; Copyright © 2020 Matthew James Kraai <kraai@ftbfs.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1464,5 +1464,15 @@ move around." (rust-bootstrapped-package rust-1.50 "1.51.0" "0ixqkqglv3isxbvl4ldr4byrkx692wghsz3fasy1pn5kr2prnsvs")) +(define-public rust-1.52 + (let ((base-rust + (rust-bootstrapped-package rust-1.51 "1.52.1" + "165zs3xzp9dravybwslqs1qhn35agp6wacmzpymqg3qfdni26vrs"))) + (package + (inherit base-rust) + (inputs + (alist-replace "llvm" (list llvm-12) + (package-inputs base-rust)))))) + ;; TODO(staging): Bump this variable to the latest packaged rust. (define-public rust rust-1.50) |