diff options
author | Marius Bakke <mbakke@fastmail.com> | 2019-03-01 17:33:00 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2019-03-01 17:33:00 +0100 |
commit | 19464173bafdc42adfc8dd7277c491c40ddef66b (patch) | |
tree | 2842e0f62404e307ef0432f2ccce8b5ce60ab392 /gnu/packages/rust.scm | |
parent | 85ef07c4b278200db7c396f4021146916588f2fb (diff) | |
parent | 81bb55459af85c408977470673e718ed1c0d6a25 (diff) | |
download | guix-19464173bafdc42adfc8dd7277c491c40ddef66b.tar guix-19464173bafdc42adfc8dd7277c491c40ddef66b.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/rust.scm')
-rw-r--r-- | gnu/packages/rust.scm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 5afdf13f43..feadbcddba 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Danny Milosavljevic <dannym+a@scratchpost.org> +;;; Copyright © 2019 Ivan Petkov <ivanppetkov@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -196,7 +197,7 @@ safety and thread safety guarantees.") (properties '((timeout . 72000) ;20 hours (max-silent-time . 18000))) ;5 hours (for armel) (arguments - `(#:imported-modules ,%cargo-build-system-modules ;for `generate-checksums' + `(#:imported-modules ,%cargo-utils-modules ;for `generate-checksums' #:modules ((guix build utils) (ice-9 match) (guix build gnu-build-system)) #:phases (modify-phases %standard-phases @@ -275,7 +276,7 @@ test = { path = \"../libtest\" } (string-append name "\"" ,%cargo-reference-hash "\""))) (for-each (lambda (filename) - (use-modules (guix build cargo-build-system)) + (use-modules (guix build cargo-utils)) (delete-file filename) (let* ((dir (dirname filename))) (display (string-append |