diff options
| author | Leo Famulari <leo@famulari.name> | 2017-03-27 21:19:38 -0400 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2017-03-27 21:19:38 -0400 |
| commit | c17383f400d3b942c22ec46b556cad8ca3a2fce1 (patch) | |
| tree | f430fdc7b6e41a652b4a0dbdd08050f586e4b24d /gnu/services/base.scm | |
| parent | b1a8fd2d2cf6bf1b20ba8d26ca6f9a7caef60cbc (diff) | |
| parent | 7aeb4ffa5828206f89ec62226863c27f7c1c028d (diff) | |
| download | guix-c17383f400d3b942c22ec46b556cad8ca3a2fce1.tar guix-c17383f400d3b942c22ec46b556cad8ca3a2fce1.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/services/base.scm')
| -rw-r--r-- | gnu/services/base.scm | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 77efef15eb..95a1ba2a6c 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -124,6 +124,11 @@ guix-service-type guix-publish-configuration guix-publish-configuration? + guix-publish-configuration-guix + guix-publish-configuration-port + guix-publish-configuration-host + guix-publish-configuration-compression-level + guix-publish-configuration-nar-path guix-publish-service guix-publish-service-type @@ -1435,11 +1440,15 @@ failed to register hydra.gnu.org public key: ~a~%" status)))))))) (port guix-publish-configuration-port ;number (default 80)) (host guix-publish-configuration-host ;string - (default "localhost"))) + (default "localhost")) + (compression-level guix-publish-compression-level ;integer + (default 3)) + (nar-path guix-publish-nar-path ;string + (default "nar"))) (define guix-publish-shepherd-service (match-lambda - (($ <guix-publish-configuration> guix port host) + (($ <guix-publish-configuration> guix port host compression nar-path) (list (shepherd-service (provision '(guix-publish)) (requirement '(guix-daemon)) @@ -1447,6 +1456,8 @@ failed to register hydra.gnu.org public key: ~a~%" status)))))))) (list #$(file-append guix "/bin/guix") "publish" "-u" "guix-publish" "-p" #$(number->string port) + "-C" #$(number->string compression) + (string-append "--nar-path=" #$nar-path) (string-append "--listen=" #$host)))) (stop #~(make-kill-destructor))))))) @@ -1475,6 +1486,7 @@ and @var{port} (@pxref{Invoking guix publish}). This assumes that @file{/etc/guix} already contains a signing key pair as created by @command{guix archive --generate-key} (@pxref{Invoking guix archive}). If that is not the case, the service will fail to start." + ;; Deprecated. (service guix-publish-service-type (guix-publish-configuration (guix guix) (port port) (host host)))) |