mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 05:18:07 -05:00
substitute: Rename cache directory from "substitute-binary" to "substitute".
* guix/scripts/substitute.scm (%narinfo-cache-directory): Change "substitute-binary" to "substitute". * tests/store.scm ("substitute query"): Likewise. * tests/substitute.scm (call-with-narinfo): Likewise.
This commit is contained in:
parent
2c74fde00e
commit
614c218842
3 changed files with 4 additions and 4 deletions
|
@ -69,8 +69,8 @@ (define-module (guix scripts substitute)
|
|||
(define %narinfo-cache-directory
|
||||
;; A local cache of narinfos, to avoid going to the network.
|
||||
(or (and=> (getenv "XDG_CACHE_HOME")
|
||||
(cut string-append <> "/guix/substitute-binary"))
|
||||
(string-append %state-directory "/substitute-binary/cache")))
|
||||
(cut string-append <> "/guix/substitute"))
|
||||
(string-append %state-directory "/substitute/cache")))
|
||||
|
||||
(define %allow-unauthenticated-substitutes?
|
||||
;; Whether to allow unchecked substitutes. This is useful for testing
|
||||
|
|
|
@ -372,7 +372,7 @@ (define (same? x y)
|
|||
;; Remove entry from the local cache.
|
||||
(false-if-exception
|
||||
(delete-file (string-append (getenv "XDG_CACHE_HOME")
|
||||
"/guix/substitute-binary/"
|
||||
"/guix/substitute/"
|
||||
(store-path-hash-part o))))
|
||||
|
||||
;; Make sure 'guix substitute' correctly communicates the above
|
||||
|
|
|
@ -132,7 +132,7 @@ (define (call-with-narinfo narinfo thunk)
|
|||
"GUIX_BINARY_SUBSTITUTE_URL"))
|
||||
uri-path))
|
||||
(cache-directory (string-append (getenv "XDG_CACHE_HOME")
|
||||
"/guix/substitute-binary/")))
|
||||
"/guix/substitute/")))
|
||||
(dynamic-wind
|
||||
(lambda ()
|
||||
(when (file-exists? cache-directory)
|
||||
|
|
Loading…
Reference in a new issue