summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorDavid Craven <david@craven.ch>2016-12-29 16:29:24 +0100
committerDavid Craven <david@craven.ch>2017-01-01 18:20:52 +0100
commitf1d136957d0d5634e60e5389a046a917169cdb9e (patch)
tree83929a1d557fdcd8662ff3f442009d38b71b6281 /tests
parentf53a5514e0e9535d2e7c668803e64b4aac17da2b (diff)
downloadpatches-f1d136957d0d5634e60e5389a046a917169cdb9e.tar
patches-f1d136957d0d5634e60e5389a046a917169cdb9e.tar.gz
build-system: cargo: Handle Cargo.lock file not present.
* guix/build-system/cargo.scm (cargo-build): Add src output. (private-keywords): Add #:outputs. * guix/build/cargo-build-system.scm (configure): Use /share/rust-source when replacing inputs. (build, check): Don't do anything when there isn't a Cargo.lock file present. (install): Install sources to src output. When a Cargo.lock file is present use cargo install to install binaries to out. * guix/import/crate.scm (make-crate-sexp): Importer uses the src output for crate inputs by default. * guix/import/utils.scm (package-names->package-inputs, maybe-inputs, maybe-native-inputs): Take an optional output argument. * tests/crate.scm (crate->guix-package test): Update. Problem reported by Francisco Gómez García <espectalll@kydara.com>.
Diffstat (limited to 'tests')
-rw-r--r--tests/crate.scm2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/crate.scm b/tests/crate.scm
index 6f6fc2bc29..0bb344bb8a 100644
--- a/tests/crate.scm
+++ b/tests/crate.scm
@@ -91,7 +91,7 @@
('build-system 'cargo-build-system)
('inputs
('quasiquote
- (("rust-bar" ('unquote 'rust-bar)))))
+ (("rust-bar" ('unquote 'rust-bar) "src"))))
('home-page "http://example.com")
('synopsis "summary")
('description "summary")