mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 05:18:07 -05:00
build/cargo-utils: Remove "src-name" parameter.
* gnu/packages/gnuzilla.scm (icecat)[arguments]<#:phases> [patch-cargo-checksums]: Delete "null-file" variable. * gnu/packages/rust.scm (%cargo-reference-project-file): Delete variable. * gnu/packages/rust.scm (rust-1.19): Remove reference to "%cargo-reference-project-file". * guix/build/cargo-utils.scm (generate-checksums): Remove "src-name" parameter. Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
This commit is contained in:
parent
d78010b81e
commit
e88735b45f
4 changed files with 11 additions and 12 deletions
|
@ -844,8 +844,7 @@ (define-public icecat
|
|||
(add-after 'patch-source-shebangs 'patch-cargo-checksums
|
||||
(lambda _
|
||||
(use-modules (guix build cargo-utils))
|
||||
(let ((null-file "/dev/null")
|
||||
(null-hash "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"))
|
||||
(let ((null-hash "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"))
|
||||
(substitute* '("Cargo.lock" "servo/Cargo.lock")
|
||||
(("(\"checksum .* = )\".*\"" all name)
|
||||
(string-append name "\"" null-hash "\"")))
|
||||
|
@ -856,7 +855,7 @@ (define-public icecat
|
|||
(display (string-append
|
||||
"patch-cargo-checksums: generate-checksums for "
|
||||
dir "\n"))
|
||||
(generate-checksums dir null-file)))
|
||||
(generate-checksums dir)))
|
||||
(find-files "third_party/rust" ".cargo-checksum.json")))
|
||||
#t))
|
||||
(add-before 'configure 'augment-CPLUS_INCLUDE_PATH
|
||||
|
|
|
@ -55,7 +55,6 @@ (define-module (gnu packages rust)
|
|||
#:use-module (ice-9 match)
|
||||
#:use-module (srfi srfi-26))
|
||||
|
||||
(define %cargo-reference-project-file "/dev/null")
|
||||
(define %cargo-reference-hash
|
||||
"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855")
|
||||
|
||||
|
@ -320,7 +319,7 @@ (define rust-1.19
|
|||
(display (string-append
|
||||
"patch-cargo-checksums: generate-checksums for "
|
||||
dir "\n"))
|
||||
(generate-checksums dir ,%cargo-reference-project-file)))
|
||||
(generate-checksums dir)))
|
||||
(find-files "src/vendor" ".cargo-checksum.json"))
|
||||
#t))
|
||||
;; This phase is overridden by newer versions.
|
||||
|
@ -973,7 +972,7 @@ (define-public rust-1.32
|
|||
(display (string-append
|
||||
"patch-cargo-checksums: generate-checksums for "
|
||||
dir "\n"))
|
||||
(generate-checksums dir ,%cargo-reference-project-file)))
|
||||
(generate-checksums dir)))
|
||||
(find-files "vendor" ".cargo-checksum.json"))
|
||||
#t))
|
||||
(add-after 'enable-codegen-tests 'override-jemalloc
|
||||
|
|
|
@ -131,7 +131,7 @@ (define* (install-source #:key inputs outputs #:allow-other-keys)
|
|||
;; to store paths.
|
||||
(copy-recursively "." rsrc)
|
||||
(touch (string-append rsrc "/.cargo-ok"))
|
||||
(generate-checksums rsrc "/dev/null")
|
||||
(generate-checksums rsrc)
|
||||
(install-file "Cargo.toml" rsrc)
|
||||
#t))
|
||||
|
||||
|
|
|
@ -41,12 +41,10 @@ (define (file-sha256 file-name)
|
|||
(close-pipe port)
|
||||
result)))
|
||||
|
||||
(define (generate-checksums dir-name src-name)
|
||||
(define (generate-checksums dir-name)
|
||||
"Given DIR-NAME, a store directory, checksum all the files in it one
|
||||
by one and put the result into the file \".cargo-checksum.json\" in
|
||||
the same directory. Also includes the checksum of an extra file
|
||||
SRC-NAME as if it was part of the directory DIR-NAME with name
|
||||
\"package\"."
|
||||
the same directory."
|
||||
(let* ((file-names (find-files dir-name "."))
|
||||
(dir-prefix-name (string-append dir-name "/"))
|
||||
(dir-prefix-name-len (string-length dir-prefix-name))
|
||||
|
@ -62,6 +60,9 @@ (define (generate-checksums dir-name src-name)
|
|||
(write file-relative-name port)
|
||||
(display ":" port)
|
||||
(write (file-sha256 file-name) port))) file-names))
|
||||
;; NB: cargo requires the "package" field in order to check if the Cargo.lock
|
||||
;; file needs to be regenerated when the value changes. However, it doesn't
|
||||
;; appear to care what the value is to begin with...
|
||||
(display "},\"package\":" port)
|
||||
(write (file-sha256 src-name) port)
|
||||
(write (file-sha256 "/dev/null") port)
|
||||
(display "}" port)))))
|
||||
|
|
Loading…
Reference in a new issue