diff options
author | Ludovic Courtès <ludo@gnu.org> | 2013-01-30 16:30:49 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2013-01-30 16:30:49 +0100 |
commit | a9ebd9efd0d97159acbec848ad5fe06f022c8235 (patch) | |
tree | 718f8a04ac525537ed2e297bf38bbedb68f4e8f1 /guix/store.scm | |
parent | fd060fd30da53f2b0856f6f451f8fd7b8c760d70 (diff) | |
download | gnu-guix-a9ebd9efd0d97159acbec848ad5fe06f022c8235.tar gnu-guix-a9ebd9efd0d97159acbec848ad5fe06f022c8235.tar.gz |
store: Remove the `fixed?' parameter from `add-to-store'.
* guix/store.scm (add-to-store): Remove the `fixed?' parameter from the
public interface.
* gnu/packages/bootstrap.scm, guix-download.in, guix/derivations.scm,
guix/packages.scm, tests/derivations.scm: Update all callers
accordingly.
Diffstat (limited to 'guix/store.scm')
-rw-r--r-- | guix/store.scm | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/guix/store.scm b/guix/store.scm index a9126cb0b6..7b1da34678 100644 --- a/guix/store.scm +++ b/guix/store.scm @@ -496,14 +496,17 @@ path." (file file-name)) #f store-path))) - (lambda (server basename fixed? recursive? hash-algo file-name) - "Add the contents of FILE-NAME under BASENAME to the store. Note that -FIXED? is for backward compatibility with old Nix versions and must be #t." + (lambda (server basename recursive? hash-algo file-name) + "Add the contents of FILE-NAME under BASENAME to the store. When +RECURSIVE? is true and FILE-NAME designates a directory, the contents of +FILE-NAME are added recursively; if FILE-NAME designates a flat file and +RECURSIVE? is true, its contents are added, and its permission bits are +kept. HASH-ALGO must be a string such as \"sha256\"." (let* ((st (stat file-name #f)) (args `(,basename ,recursive? ,hash-algo ,st)) (cache (nix-server-add-to-store-cache server))) (or (and st (hash-ref cache args)) - (let ((path (add-to-store server basename fixed? recursive? + (let ((path (add-to-store server basename #t recursive? hash-algo file-name))) (hash-set! cache args path) path)))))) |