diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-03-21 23:18:54 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-03-21 23:18:54 +0100 |
| commit | 081850816f98c7f5d815ac7251c69bf2ada50cc0 (patch) | |
| tree | 609b7e9e9c267e8c382bdebf8295b9f45bab6cc4 /gnu/packages/rust.scm | |
| parent | 792d526a256773d1abe00b73c2a2131037148139 (diff) | |
| parent | 93f178b5a84a8cc5a0c552290191efd2310588b5 (diff) | |
| download | guix-081850816f98c7f5d815ac7251c69bf2ada50cc0.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/rust.scm')
| -rw-r--r-- | gnu/packages/rust.scm | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 0031aa1736..cb75005a13 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 David Craven <david@craven.ch> ;;; Copyright © 2016 Eric Le Bihan <eric.le.bihan.dev@free.fr> -;;; Copyright © 2016 Nils Gillmann <ng0@n0.is> +;;; Copyright © 2016 ng0 <ng0@n0.is> ;;; Copyright © 2017 Ben Woodcroft <donttrustben@gmail.com> ;;; Copyright © 2017, 2018 Nikolai Merinov <nikolai.merinov@member.fsf.org> ;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> @@ -432,7 +432,13 @@ safety and thread safety guarantees.") (package (inherit base-rust) (outputs '("out" "doc" "cargo")) - (properties '()) + ;; Since rust-1.19 is local, it's quite probable that Hydra + ;; will build rust-1.19 only as a dependency of rust-1.20. + ;; But then Hydra will use the wrong properties, the ones here, + ;; for rust-1.19. Therefore, we copied the properties of + ;; rust-1.19 here. + (properties '((timeout . 72000) ;20 hours + (max-silent-time . 18000))) ;5 hours (for armel) (arguments (substitute-keyword-arguments (package-arguments rust-1.19) ((#:phases phases) |