From ac6b78488faa80a83e85ee38e4a701d9c3c90c46 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 29 Jul 2019 22:01:05 +0300 Subject: build/cargo-build-system: Patch cargo checksums. * guix/build/cargo-build-system.scm (generate-all-checksums): New procedure. (update-cargo-lock, patch-cargo-checksums): New phases. (%standard-phases): Add 'update=cargo-lock after 'configure and 'patch-cargo-checksums after 'patch-generated-file-shebangs. * doc/guix.texi (Build System)[cargo-build-system]: Mention how Cargo.lock files are handled. --- doc/guix.texi | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/guix.texi b/doc/guix.texi index ccc36a8a97..cb60d5c7b7 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -5854,8 +5854,11 @@ should be added to the package definition via the In its @code{configure} phase, this build system will make any source inputs specified in the @code{#:cargo-inputs} and @code{#:cargo-development-inputs} -parameters available to cargo. The @code{install} phase installs any crate -the binaries if they are defined by the crate. +parameters available to cargo. The @code{update-cargo-lock} phase will, +when there is a @code{Cargo.lock} file, update the @code{Cargo.lock} file +with the inputs and their versions available at build time. The +@code{install} phase installs any crate the binaries if they are defined by +the crate. @end defvr @cindex Clojure (programming language) -- cgit v1.2.3 From 5bc751925d19c8b84ef12873bebba78ee61e605e Mon Sep 17 00:00:00 2001 From: "Jakob L. Kreuze" Date: Mon, 29 Jul 2019 18:36:01 -0400 Subject: doc: Add note about signing keys. * doc/guix.texi (Invoking guix deploy): Add note explaining that deployment targets must authorize the coordinator machine's signing key. --- doc/guix.texi | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'doc') diff --git a/doc/guix.texi b/doc/guix.texi index cb60d5c7b7..5d274e02fe 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -25530,6 +25530,22 @@ complex deployment may involve, for example, starting virtual machines through a Virtual Private Server (VPS) provider. In such a case, a different @var{environment} type would be used. +Do note that you first need to generate a key pair on the coordinator machine +to allow the daemon to export signed archives of files from the store +(@pxref{Invoking guix archive}). + +@example +# guix archive --generate-key +@end example + +@noindent +Each target machine must authorize the key of the master machine so that it +accepts store items it receives from the coordinator: + +@example +# guix archive --authorize < coordinator-public-key.txt +@end example + @deftp {Data Type} machine This is the data type representing a single machine in a heterogeneous Guix deployment. -- cgit v1.2.3 From d97ce20400b5d2967bfbc0e9fbfb99bbb2daed4f Mon Sep 17 00:00:00 2001 From: "Jakob L. Kreuze" Date: Tue, 30 Jul 2019 13:48:32 -0400 Subject: machine: Rename 'system' field. * gnu/machine.scm (machine-system): Delete variable. (machine-operating-system): New variable. All callers changed. * doc/guix.texi (Invoking guix deploy): Use the 'machine-operating-system' accessor rather than 'machine-system'. --- doc/guix.texi | 4 ++-- gnu/machine.scm | 12 ++++++------ gnu/machine/ssh.scm | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'doc') diff --git a/doc/guix.texi b/doc/guix.texi index 5d274e02fe..734206a4b2 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -25510,7 +25510,7 @@ evaluates to. As an example, @var{file} might contain a definition like this: %base-services)))) (list (machine - (system %system) + (operating-system %system) (environment managed-host-environment-type) (configuration (machine-ssh-configuration (host-name "localhost") @@ -25551,7 +25551,7 @@ This is the data type representing a single machine in a heterogeneous Guix deployment. @table @asis -@item @code{system} +@item @code{operating-system} The object of the operating system configuration to deploy. @item @code{environment} diff --git a/gnu/machine.scm b/gnu/machine.scm index 0b79402b0a..30ae97f6ec 100644 --- a/gnu/machine.scm +++ b/gnu/machine.scm @@ -34,7 +34,7 @@ machine? this-machine - machine-system + machine-operating-system machine-environment machine-configuration machine-display-name @@ -85,14 +85,14 @@ make-machine machine? this-machine - (system machine-system) ; - (environment machine-environment) ; symbol - (configuration machine-configuration ; configuration object - (default #f))) ; specific to environment + (operating-system machine-operating-system) ; + (environment machine-environment) ; symbol + (configuration machine-configuration ; configuration object + (default #f))) ; specific to environment (define (machine-display-name machine) "Return the host-name identifying MACHINE." - (operating-system-host-name (machine-system machine))) + (operating-system-host-name (machine-operating-system machine))) (define (machine-remote-eval machine exp) "Evaluate EXP, a gexp, on MACHINE. Ensure that all the elements EXP refers to diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm index 552eafa9de..d1c90b6313 100644 --- a/gnu/machine/ssh.scm +++ b/gnu/machine/ssh.scm @@ -166,7 +166,7 @@ of MACHINE's system profile, ordered from most recent to oldest." environment type of 'managed-host." (maybe-raise-unsupported-configuration-error machine) (mlet %store-monad ((boot-parameters (machine-boot-parameters machine))) - (let* ((os (machine-system machine)) + (let* ((os (machine-operating-system machine)) (eval (cut machine-remote-eval machine <>)) (menu-entries (map boot-parameters->menu-entry boot-parameters)) (bootloader-configuration (operating-system-bootloader os)) -- cgit v1.2.3