me
/
guix
Archived
1
0
Fork 0

guix: build: Avoid using magic literals in the code for hash length.

* guix/build/utils.scm (%store-hash-string-length): New constant.
(store-path-prefix-length): Factor out the calculation of the total store
prefix length.
* guix/build/graft.scm (hash-length): Use it.

Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
master
Attila Lendvai 2021-10-03 14:43:01 +02:00 committed by Liliana Marie Prikler
parent 54c365d645
commit e4adc665e1
No known key found for this signature in database
GPG Key ID: 442A84B8C70E2F87
2 changed files with 10 additions and 3 deletions

View File

@ -44,7 +44,7 @@
;;;
;;; Code:
(define-constant hash-length 32)
(define-constant hash-length %store-hash-string-length)
(define nix-base32-char?
(cute char-set-contains?

View File

@ -48,6 +48,7 @@
;; <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=26805#16>.
delete)
#:export (%store-directory
%store-hash-string-length
store-file-name?
strip-store-file-name
package-name->name+version
@ -198,15 +199,21 @@ compression."
(getenv "NIX_STORE") ;inside builder, set by the daemon
"/gnu/store"))
(define-constant %store-hash-string-length 32)
(define (store-file-name? file)
"Return true if FILE is in the store."
(string-prefix? (%store-directory) file))
(define (store-path-prefix-length)
(+ 2 ; the slash after %store-directory, and the dash after the hash
(string-length (%store-directory))
%store-hash-string-length))
(define (strip-store-file-name file)
"Strip the '/gnu/store' and hash from FILE, a store file name. The result
is typically a \"PACKAGE-VERSION\" string."
(string-drop file
(+ 34 (string-length (%store-directory)))))
(string-drop file (store-path-prefix-length)))
(define (package-name->name+version name)
"Given NAME, a package name like \"foo-0.9.1b\", return two values: