diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-02-27 23:49:30 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-02-27 23:49:30 +0100 |
| commit | 829ecd002e70682d11a22e26a7fe7e87248a8fec (patch) | |
| tree | 0e44e654b30809882b2b1a7a9f5a67d23bb2bd3e /guix | |
| parent | 3bb33e24bb495d78e6be663b5763245a1d63bc90 (diff) | |
| parent | 65f7c35d02175806f676b8e130236dd3e6c8ec60 (diff) | |
| download | gnu-guix-829ecd002e70682d11a22e26a7fe7e87248a8fec.tar gnu-guix-829ecd002e70682d11a22e26a7fe7e87248a8fec.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/libwebsockets.scm
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/store.scm | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/guix/store.scm b/guix/store.scm index 8e88c5f86d..54ed31cbbc 100644 --- a/guix/store.scm +++ b/guix/store.scm @@ -452,22 +452,22 @@ encoding conversion errors." (send (boolean keep-failed?) (boolean keep-going?) (boolean fallback?) (integer verbosity) (integer max-build-jobs) (integer max-silent-time)) - (if (>= (nix-server-minor-version server) 2) - (send (boolean use-build-hook?))) - (if (>= (nix-server-minor-version server) 4) - (send (integer build-verbosity) (integer log-type) - (boolean print-build-trace))) - (if (>= (nix-server-minor-version server) 6) - (send (integer build-cores))) - (if (>= (nix-server-minor-version server) 10) - (send (boolean use-substitutes?))) - (if (>= (nix-server-minor-version server) 12) - (send (string-list (fold-right (lambda (pair result) - (match pair - ((h . t) - (cons* h t result)))) - '() - binary-caches)))) + (when (>= (nix-server-minor-version server) 2) + (send (boolean use-build-hook?))) + (when (>= (nix-server-minor-version server) 4) + (send (integer build-verbosity) (integer log-type) + (boolean print-build-trace))) + (when (>= (nix-server-minor-version server) 6) + (send (integer build-cores))) + (when (>= (nix-server-minor-version server) 10) + (send (boolean use-substitutes?))) + (when (>= (nix-server-minor-version server) 12) + (send (string-list (fold-right (lambda (pair result) + (match pair + ((h . t) + (cons* h t result)))) + '() + binary-caches)))) (let loop ((done? (process-stderr server))) (or done? (process-stderr server))))) |