summaryrefslogtreecommitdiff
path: root/guix/build-system
diff options
context:
space:
mode:
authorIvan Petkov <ivanppetkov@gmail.com>2019-02-14 23:04:28 -0800
committerDanny Milosavljevic <dannym@scratchpost.org>2019-03-01 08:20:50 +0100
commit7d141788b1f62aef31bc495eb40ab9f9e61ee3d2 (patch)
tree19c2f174a40a6b2c4fccbdb48da313ea6bef06ee /guix/build-system
parenta215c938b387f5bbbb78f1e80d81b2e4e2c9f9e3 (diff)
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 'guix/build-system')
-rw-r--r--guix/build-system/cargo.scm9
1 files changed, 8 insertions, 1 deletions
diff --git a/guix/build-system/cargo.scm b/guix/build-system/cargo.scm
index 4a1eb0cfa0..7ff4e90f71 100644
--- a/guix/build-system/cargo.scm
+++ b/guix/build-system/cargo.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2016 David Craven <david@craven.ch>
+;;; Copyright © 2019 Ivan Petkov <ivanppetkov@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -30,6 +31,7 @@
#:use-module (ice-9 match)
#:use-module (srfi srfi-26)
#:export (%cargo-build-system-modules
+ %cargo-utils-modules
cargo-build-system
crate-url
crate-url?
@@ -49,10 +51,15 @@ to NAME and VERSION."
(let ((rust (resolve-interface '(gnu packages rust))))
(module-ref rust 'rust)))
+(define %cargo-utils-modules
+ ;; Build-side modules imported by default.
+ `((guix build cargo-utils)
+ ,@%gnu-build-system-modules))
+
(define %cargo-build-system-modules
;; Build-side modules imported by default.
`((guix build cargo-build-system)
- ,@%gnu-build-system-modules))
+ ,@%cargo-utils-modules))
(define* (cargo-build store name inputs
#:key