From: Danny Milosavljevic <dannym@scratchpost.org>
To: guix-devel@gnu.org
Subject: WIP patch: build-system: cargo: Make lots and lots of rust packages work
Date: Tue, 3 Jan 2017 05:01:57 +0100 [thread overview]
Message-ID: <20170103050157.223af717@scratchpost.org> (raw)
In-Reply-To: <20170103025103.8147-1-dannym@scratchpost.org>
For it to work, you also have to back out the (cons "src" outputs) (in ./guix/build-system/cargo.scm) and the (assoc-ref outputs "src") (in guix/build/cargo-build-system.scm) starting from current master.
--- guix/build/cargo-build-system.scm 2017-01-03 04:31:01.691543854 +0100
+++ /home/dannym/src/guix/guix/build/cargo-build-system.scm 2017-01-03 04:55:26.810917585 +0100
@@ -19,6 +19,8 @@
(define-module (guix build cargo-build-system)
#:use-module ((guix build gnu-build-system) #:prefix gnu:)
#:use-module (guix build utils)
+ #:use-module (ice-9 popen)
+ #:use-module (ice-9 rdelim)
#:use-module (ice-9 ftw)
#:use-module (ice-9 format)
#:use-module (ice-9 match)
@@ -43,35 +45,86 @@
(define* (configure #:key inputs #:allow-other-keys)
"Replace Cargo.toml [dependencies] section with guix inputs."
- ;; Make sure Cargo.toml is writeable when the crate uses git-fetch.
- (chmod "Cargo.toml" #o644)
- (let ((port (open-file "Cargo.toml" "a" #:encoding "utf-8")))
- (format port "~%[replace]~%")
- (for-each
- (match-lambda
- ((name . path)
- (let ((crate (package-name->crate-name name)))
- (when (and crate path)
- (match (string-split (basename path) #\-)
- ((_ ... version)
- (format port "\"~a:~a\" = { path = \"~a/share/rust-source\" }~%"
- crate version path)))))))
- inputs)
- (close-port port))
+ (system* "chmod" "+w" "Cargo.toml")
+ (system* "chmod" "+w" ".")
+ (if (not (file-exists? "vendor"))
+ (begin
+ (if (not (file-exists? "Cargo.lock"))
+ (substitute* "Cargo.toml"
+ ((".*32-sys.*") "
+")
+ ((".*winapi.*") "
+")))
+ (mkdir "vendor")
+ (for-each
+ (match-lambda
+ ((name . path)
+ (let ((crate (package-name->crate-name name)))
+ (when (and crate path)
+ (match (string-split (basename path) #\-)
+ ((_ ... version)
+ (symlink (string-append path "/share/rust-source") (string-append "vendor/" (basename path)))))))))
+ inputs)
+ (mkdir-p ".cargo")
+ (let ((port (open-file ".cargo/config" "w" #:encoding "utf-8")))
+ (display "
+[source.crates-io]
+registry = 'https://github.com/rust-lang/crates.io-index'
+replace-with = 'vendored-sources'
+
+[source.vendored-sources]
+directory = '" port)
+ (display (getcwd) port)
+ (display "/vendor" port)
+ (display "'
+" port)
+ (close-port port))))
+ (setenv "CC" (string-append (assoc-ref inputs "gcc") "/bin/gcc"))
+
+ ;(setenv "CARGO_HOME" "/gnu/store")
+ ; (setenv "CMAKE_C_COMPILER" cc)
#t)
-(define* (build #:key (cargo-build-flags '("--release" "--frozen"))
- #:allow-other-keys)
+(define* (build #:key (cargo-build-flags '("--release")) #:allow-other-keys)
"Build a given Cargo package."
(if (file-exists? "Cargo.lock")
- (zero? (apply system* `("cargo" "build" ,@cargo-build-flags)))
- #t))
+ (zero? (apply system* `("cargo" "build" ,@cargo-build-flags)))
+ #t))
(define* (check #:key tests? #:allow-other-keys)
"Run tests for a given Cargo package."
- (if (and tests? (file-exists? "Cargo.lock"))
- (zero? (system* "cargo" "test"))
- #t))
+ (when tests?
+ (zero? (system* "cargo" "test"))))
+
+(define (file-sha256 file-name)
+ (let ((port (open-pipe* OPEN_READ
+ "sha256sum"
+ "--"
+ file-name)))
+ (let ((result (read-delimited " " port)))
+ (close-pipe port)
+ result)))
+
+;; Example /gnu/store/hwlr49riz3la33m6in2n898ly045ylld-rust-rand-0.3.15: ; generally not a lot of store items.
+(define (generate-checksums dir-name src-name)
+ (let* ((file-names (find-files dir-name "."))
+ (dir-prefix-name (string-append dir-name "/"))
+ (dir-prefix-name-len (string-length dir-prefix-name))
+ (checksums-file-name (string-append dir-name "/.cargo-checksum.json")))
+ (call-with-output-file checksums-file-name
+ (lambda (port)
+ (display "{\"files\":{" port)
+ (let ((sep ""))
+ (for-each (lambda (file-name)
+ (let ((file-relative-name (string-drop file-name dir-prefix-name-len)))
+ (display sep port)
+ (set! sep ",")
+ (write file-relative-name port)
+ (display ":" port)
+ (write (file-sha256 file-name) port))) file-names))
+ (display "},\"package\":" port)
+ (write (file-sha256 src-name) port)
+ (display "}" port)))))
(define* (install #:key inputs outputs #:allow-other-keys)
"Install a given Cargo package."
@@ -87,15 +140,17 @@
;; references in Cargo.toml with store paths.
(copy-recursively "src" (string-append rsrc "/src"))
(install-file "Cargo.toml" rsrc)
+ (system* "touch" (string-append rsrc "/.cargo-ok"))
+ (generate-checksums rsrc src)
;; When the package includes executables we install
;; it using cargo install. This fails when the crate
;; doesn't contain an executable.
(if (file-exists? "Cargo.lock")
(system* "cargo" "install" "--root" out)
- (mkdir out))))
+ (mkdir out))
+ #t))
(define %standard-phases
- ;; 'configure' phase is not needed.
(modify-phases gnu:%standard-phases
(replace 'configure configure)
(replace 'build build)
next prev parent reply other threads:[~2017-01-03 4:02 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-03 2:44 [PATCH] build-system: cargo: Add #:cargo-build-flags keyword argument Danny Milosavljevic
2017-01-03 2:51 ` [PATCH v2] " Danny Milosavljevic
2017-01-03 4:01 ` Danny Milosavljevic [this message]
2017-01-03 11:08 ` WIP patch: build-system: cargo: Make lots and lots of rust packages work David Craven
2017-01-03 11:54 ` Danny Milosavljevic
2017-01-03 11:57 ` Danny Milosavljevic
2017-01-04 1:03 ` WIP v2: " Danny Milosavljevic
2017-01-04 20:19 ` WIP v3: " Danny Milosavljevic
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170103050157.223af717@scratchpost.org \
--to=dannym@scratchpost.org \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.