build/cargo-build-system: Patch cargo checksums.
* guix/build/cargo-build-system.scm (generate-all-checksums): New procedure. (update-cargo-lock, patch-cargo-checksums): New phases. (%standard-phases): Add 'update=cargo-lock after 'configure and 'patch-cargo-checksums after 'patch-generated-file-shebangs. * doc/guix.texi (Build System)[cargo-build-system]: Mention how Cargo.lock files are handled.
This commit is contained in:
parent
ded545d562
commit
ac6b78488f
|
@ -5854,8 +5854,11 @@ should be added to the package definition via the
|
||||||
|
|
||||||
In its @code{configure} phase, this build system will make any source inputs
|
In its @code{configure} phase, this build system will make any source inputs
|
||||||
specified in the @code{#:cargo-inputs} and @code{#:cargo-development-inputs}
|
specified in the @code{#:cargo-inputs} and @code{#:cargo-development-inputs}
|
||||||
parameters available to cargo. The @code{install} phase installs any crate
|
parameters available to cargo. The @code{update-cargo-lock} phase will,
|
||||||
the binaries if they are defined by the crate.
|
when there is a @code{Cargo.lock} file, update the @code{Cargo.lock} file
|
||||||
|
with the inputs and their versions available at build time. The
|
||||||
|
@code{install} phase installs any crate the binaries if they are defined by
|
||||||
|
the crate.
|
||||||
@end defvr
|
@end defvr
|
||||||
|
|
||||||
@cindex Clojure (programming language)
|
@cindex Clojure (programming language)
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
;;; Copyright © 2016 David Craven <david@craven.ch>
|
;;; Copyright © 2016 David Craven <david@craven.ch>
|
||||||
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
|
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||||
;;; Copyright © 2019 Ivan Petkov <ivanppetkov@gmail.com>
|
;;; Copyright © 2019 Ivan Petkov <ivanppetkov@gmail.com>
|
||||||
|
;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
|
@ -39,6 +40,21 @@
|
||||||
;;
|
;;
|
||||||
;; Code:
|
;; Code:
|
||||||
|
|
||||||
|
;; TODO: Move this to (guix build cargo-utils). Will cause a full rebuild
|
||||||
|
;; of all rust compilers.
|
||||||
|
|
||||||
|
(define (generate-all-checksums dir-name)
|
||||||
|
(for-each
|
||||||
|
(lambda (filename)
|
||||||
|
(let* ((dir (dirname filename))
|
||||||
|
(checksum-file (string-append dir "/.cargo-checksum.json")))
|
||||||
|
(when (file-exists? checksum-file) (delete-file checksum-file))
|
||||||
|
(display (string-append
|
||||||
|
"patch-cargo-checksums: generate-checksums for "
|
||||||
|
dir "\n"))
|
||||||
|
(generate-checksums dir)))
|
||||||
|
(find-files dir-name "Cargo.toml$")))
|
||||||
|
|
||||||
(define (manifest-targets)
|
(define (manifest-targets)
|
||||||
"Extract all targets from the Cargo.toml manifest"
|
"Extract all targets from the Cargo.toml manifest"
|
||||||
(let* ((port (open-input-pipe "cargo read-manifest"))
|
(let* ((port (open-input-pipe "cargo read-manifest"))
|
||||||
|
@ -94,8 +110,7 @@ Cargo.toml file present at its root."
|
||||||
;; so that we can generate any cargo checksums.
|
;; so that we can generate any cargo checksums.
|
||||||
;; The --strip-components argument is needed to prevent creating
|
;; The --strip-components argument is needed to prevent creating
|
||||||
;; an extra directory within `crate-dir`.
|
;; an extra directory within `crate-dir`.
|
||||||
(invoke "tar" "xvf" path "-C" crate-dir "--strip-components" "1")
|
(invoke "tar" "xvf" path "-C" crate-dir "--strip-components" "1")))))
|
||||||
(generate-checksums crate-dir)))))
|
|
||||||
inputs)
|
inputs)
|
||||||
|
|
||||||
;; Configure cargo to actually use this new directory.
|
;; Configure cargo to actually use this new directory.
|
||||||
|
@ -121,6 +136,31 @@ directory = '" port)
|
||||||
(setenv "CC" (string-append (assoc-ref inputs "gcc") "/bin/gcc"))
|
(setenv "CC" (string-append (assoc-ref inputs "gcc") "/bin/gcc"))
|
||||||
#t)
|
#t)
|
||||||
|
|
||||||
|
;; The Cargo.lock file tells the build system which crates are required for
|
||||||
|
;; building and hardcodes their version and checksum. In order to build with
|
||||||
|
;; the inputs we provide, we need to recreate the file with our inputs.
|
||||||
|
(define* (update-cargo-lock #:key
|
||||||
|
(vendor-dir "guix-vendor")
|
||||||
|
#:allow-other-keys)
|
||||||
|
"Regenerate the Cargo.lock file with the current build inputs."
|
||||||
|
(when (file-exists? "Cargo.lock")
|
||||||
|
(begin
|
||||||
|
;; Unfortunately we can't generate a Cargo.lock file until the checksums
|
||||||
|
;; are generated, so we have an extra round of generate-all-checksums here.
|
||||||
|
(generate-all-checksums vendor-dir)
|
||||||
|
(delete-file "Cargo.lock")
|
||||||
|
(invoke "cargo" "generate-lockfile")))
|
||||||
|
#t)
|
||||||
|
|
||||||
|
;; After the 'patch-generated-file-shebangs phase any vendored crates who have
|
||||||
|
;; their shebangs patched will have a mismatch on their checksum.
|
||||||
|
(define* (patch-cargo-checksums #:key
|
||||||
|
(vendor-dir "guix-vendor")
|
||||||
|
#:allow-other-keys)
|
||||||
|
"Patch the checksums of the vendored crates after patching their shebangs."
|
||||||
|
(generate-all-checksums vendor-dir)
|
||||||
|
#t)
|
||||||
|
|
||||||
(define* (build #:key
|
(define* (build #:key
|
||||||
skip-build?
|
skip-build?
|
||||||
(cargo-build-flags '("--release"))
|
(cargo-build-flags '("--release"))
|
||||||
|
@ -162,7 +202,9 @@ directory = '" port)
|
||||||
(replace 'configure configure)
|
(replace 'configure configure)
|
||||||
(replace 'build build)
|
(replace 'build build)
|
||||||
(replace 'check check)
|
(replace 'check check)
|
||||||
(replace 'install install)))
|
(replace 'install install)
|
||||||
|
(add-after 'configure 'update-cargo-lock update-cargo-lock)
|
||||||
|
(add-after 'patch-generated-file-shebangs 'patch-cargo-checksums patch-cargo-checksums)))
|
||||||
|
|
||||||
(define* (cargo-build #:key inputs (phases %standard-phases)
|
(define* (cargo-build #:key inputs (phases %standard-phases)
|
||||||
#:allow-other-keys #:rest args)
|
#:allow-other-keys #:rest args)
|
||||||
|
|
Loading…
Reference in New Issue