nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build-system/cargo: Remove store reference. 

* guix/build/cargo-build-system.scm (generate-checksums): Remove store
  reference from comment. This comment was matching
  assert-no-store-file-names regexp in Makefile.am.
  Also, edit procedure docstring to precise that DIR-NAME is a store
  directory.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Mathieu Othacehe 2017-04-14 12:12:56 +02:00 committed by Ludovic Courtès
parent 11e2087e25
commit e60ee79040
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
guix/build/cargo-build-system.scm
View File

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 David Craven <david@craven.ch> ;;; Copyright © 2016 David Craven <david@craven.ch>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -116,12 +117,12 @@ directory = '" port)
(close-pipe port) (close-pipe port)
result))) result)))
;; Example dir-name: "/gnu/store/hwlr49riz3la33m6in2n898ly045ylld-rust-rand-0.3.15".
(define (generate-checksums dir-name src-name) (define (generate-checksums dir-name src-name)
"Given DIR-NAME, checksum all the files in it one by one and put the "Given DIR-NAME, a store directory, checksum all the files in it one
result into the file \".cargo-checksum.json\" in the same directory. by one and put the result into the file \".cargo-checksum.json\" in
Also includes the checksum of an extra file SRC-NAME as if it was the same directory. Also includes the checksum of an extra file
part of the directory DIR-NAME with name \"package\"." SRC-NAME as if it was part of the directory DIR-NAME with name
\"package\"."
(let* ((file-names (find-files dir-name ".")) (let* ((file-names (find-files dir-name "."))
(dir-prefix-name (string-append dir-name "/")) (dir-prefix-name (string-append dir-name "/"))
(dir-prefix-name-len (string-length dir-prefix-name)) (dir-prefix-name-len (string-length dir-prefix-name))