diff options
| author | Ivan Petkov <ivanppetkov@gmail.com> | 2019-02-14 23:04:28 -0800 |
|---|---|---|
| committer | Danny Milosavljevic <dannym@scratchpost.org> | 2019-03-01 08:20:50 +0100 |
| commit | 7d141788b1f62aef31bc495eb40ab9f9e61ee3d2 (patch) | |
| tree | 19c2f174a40a6b2c4fccbdb48da313ea6bef06ee /gnu | |
| parent | a215c938b387f5bbbb78f1e80d81b2e4e2c9f9e3 (diff) | |
| download | guix-7d141788b1f62aef31bc495eb40ab9f9e61ee3d2.tar.gz guix-7d141788b1f62aef31bc495eb40ab9f9e61ee3d2.zip | |
gnu: rust: Factor out "cargo-utils" from "cargo-build-system".
* guix/build/cargo-utils.scm: New file.
* Makefile.am (MODULES): Add it.
* guix/build-system/cargo.scm (%cargo-utils-modules): New variable.
(%cargo-build-system-modules): Use it.
* guix/build/cargo-build-system.scm (file-sha256, generate-checksums): Move
from here...
* guix/build/cargo-utils.scm: ...to here.
* gnu/packages/rust.scm (rust-1.19.0)[arguments]<#:imported-modules>: Use
%cargo-utils-modules.
<#:phases>[patch-cargo-checksums]: Use (guix build cargo-utils).
* gnu/packages/gnuzilla.scm (icecat):
[arguments]<#:imported-modules>: Use %cargo-utils-modules.
<#phases>[patch-cargo-checksums]: import (guix build cargo-utils).
Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/gnuzilla.scm | 7 | ||||
| -rw-r--r-- | gnu/packages/rust.scm | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 74e5458430..e11c0eb576 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2017 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2019 Ivan Petkov <ivanppetkov@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -866,8 +867,6 @@ from forcing GEXP-PROMISE." ;; practice somehow. See <http://hydra.gnu.org/build/378133>. #:validate-runpath? #f - #:imported-modules ,%cargo-build-system-modules ;for `generate-checksums' - #:configure-flags `("--enable-default-toolkit=cairo-gtk3" "--with-distribution-id=org.gnu" @@ -939,6 +938,8 @@ from forcing GEXP-PROMISE." ;; "--with-system-png" ) + #:imported-modules ,%cargo-utils-modules ;for `generate-checksums' + #:modules ((ice-9 ftw) (ice-9 rdelim) (ice-9 match) @@ -978,7 +979,7 @@ from forcing GEXP-PROMISE." (invoke "sh" "-c" "autoconf old-configure.in > old-configure"))) (add-after 'patch-source-shebangs 'patch-cargo-checksums (lambda _ - (use-modules (guix build cargo-build-system)) + (use-modules (guix build cargo-utils)) (let ((null-file "/dev/null") (null-hash "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855")) (substitute* '("Cargo.lock" "servo/Cargo.lock") diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 111f74e4ec..02626eb22d 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. ;;; @@ -194,7 +195,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 @@ -273,7 +274,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 |