~ruther/guix-local

0ee848e2ee576f049494e55951a5f11f802634b8 — Hilton Chain 1 year, 2 months ago bb01612
build/cargo: Pass ‘--offline’ to cargo.

This will make error messages more helpful.

* guix/build/cargo-build-system.scm (build, check, package, install): Pass
‘--offline’ to cargo.

Change-Id: Ic95f603b793319f99c9c1fbce43f773bfc8126c0
1 files changed, 5 insertions(+), 4 deletions(-)

M guix/build/cargo-build-system.scm
M guix/build/cargo-build-system.scm => guix/build/cargo-build-system.scm +5 -4
@@ 246,7 246,7 @@ directory = '" vendor-dir "'") port)
  "Build a given Cargo package."
  (or skip-build?
      (apply invoke
             `("cargo" "build"
             `("cargo" "build" "--offline"
               ,@(if parallel-build?
                     (list "-j" (number->string (parallel-job-count)))
                     (list "-j" "1"))


@@ 264,7 264,7 @@ directory = '" vendor-dir "'") port)
  "Run tests for a given Cargo package."
  (when tests?
    (apply invoke
           `("cargo" "test"
           `("cargo" "test" "--offline"
             ,@(if parallel-build?
                   (list "-j" (number->string (parallel-job-count)))
                   (list "-j" "1"))


@@ 303,7 303,7 @@ directory = '" vendor-dir "'") port)
        ;;error: invalid inclusion of reserved file name Cargo.toml.orig in package source
        (when (file-exists? "Cargo.toml.orig")
          (delete-file "Cargo.toml.orig"))
        (apply invoke `("cargo" "package" ,@cargo-package-flags))
        (apply invoke `("cargo" "package" "--offline" ,@cargo-package-flags))

        ;; Then unpack the crate, reset the timestamp of all contained files, and
        ;; repack them.  This is necessary to ensure that they are reproducible.


@@ 356,7 356,8 @@ directory = '" vendor-dir "'") port)
    ;; otherwise cargo will raise an error.
    (or skip-build?
        (not (has-executable-target?))
        (invoke "cargo" "install" "--no-track" "--path" "." "--root" out
        (invoke "cargo" "install" "--offline" "--no-track"
                "--path" "." "--root" out
                "--features" (string-join features)))

    (when install-source?