summaryrefslogtreecommitdiff
path: root/guix/scripts
Commit message (Collapse)AuthorAge
* guix archive: Make sure $sysconfdir/guix exists in '--authorize'.Ludovic Courtès2014-03-31
| | | | | * guix/scripts/archive.scm (authorize-key): Add 'mkdir-p' call. Reported by Alex Sassmannshausen <alex.sassmannshausen@gmail.com>.
* offload: Exit with code 100 upon build failures.Ludovic Courtès2014-03-31
| | | | | * guix/scripts/offload.scm (transfer-and-offload): Exit with code 100 upon build failure.
* substitute-binary: Defer narinfo authentication and authorization checks.Ludovic Courtès2014-03-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * guix/scripts/substitute-binary.scm (narinfo-signature->canonical-sexp): Catch 'gcry-error' around 'string->canonical-sexp' call, and re-raise as a SRFI-35 &message and &nar-signature-error. (narinfo-maker): Handle when SIGNATURE is #f or an invalid canonical sexp. (&nar-signature-error, &nar-invalid-hash-error): New variables. (assert-valid-signature): Use them. Expect 'signature' to be a canonical sexp. (read-narinfo): Remove authentication and authorization checks. (%signature-line-rx): New variable. (assert-valid-narinfo, valid-narinfo?): New procedures. (guix-substitute-binary): Wrap body in 'with-error-handling'. [valid?]: New procedure. <--query>: Show only store items of narinfos that match 'valid-narinfo?'. <--substitute>: Call 'assert-valid-narinfo'. * tests/substitute-binary.scm (test-error*): Use 'test-equal'. (%keypair): Remove. (%public-key, %private-key): Load from signing-key.{pub,sec}. (signature-body): Add #:public-key parameter. (call-with-narinfo): New procedure. (with-narinfo): New macro. ("corrupt signature data", "unauthorized public key", "invalid signature"): Make the first argument to 'assert-valid-signature' a canonical sexp. ("invalid hash", "valid read-narinfo", "valid write-narinfo"): Remove. ("query narinfo with invalid hash", "query narinfo signed with authorized key", "query narinfo signed with unauthorized key", "substitute, invalid hash", "substitute, unauthorized key"): New tests.
* substitute-binary: Store the cache's URI in the local cached narinfo.Ludovic Courtès2014-03-30
| | | | | | | | | * guix/scripts/substitute-binary.scm (<narinfo>)[uri-base]: New field. (narinfo-maker): Pass CACHE-URL as the 'uri-base' value. (string->narinfo): Add 'cache-uri' parameter. (lookup-narinfo)[cache-entry]: Switch to version 1. Add 'cache-uri' field. Adjust body accordingly. (remove-expired-cached-narinfos): Switch to version 1 by default.
* substitute-binary: Support the Signature field of a narinfo file.Nikita Karetnikov2014-03-30
| | | | | | | | | | | | | | | | * guix/scripts/substitute-binary.scm (<narinfo>): Add the 'signature' and 'contents' fields. (narinfo-signature->canonical-sexp): New function. (narinfo-maker): Add the 'signature' argument and use it. (assert-valid-signature): New function. (read-narinfo): Support the Signature field. (write-narinfo): Use 'narinfo-contents'. (%allow-unauthenticated-substitutes?): New variable. * guix/base64.scm, tests/base64.scm, tests/substitute-binary.scm: New files. * Makefile.am (SCM_TESTS): Add tests/base64.scm and tests/substitute-binary.scm. (MODULES): Add guix/base64.scm. * test-env.in: Set 'GUIX_ALLOW_UNAUTHENTICATED_SUBSTITUTES'.
* offload: Remove erroneous 'close-pipe' call.Ludovic Courtès2014-03-26
| | | | | * guix/scripts/offload.scm (send-files): Remove 'close-pipe' call from 'guard' handler ('pipe' here referred to Guile's 'pipe' procedure.)
* offload: Wait for the processes involved in 'guix archive --missing'.Ludovic Courtès2014-03-26
| | | | | * guix/scripts/offload.scm (send-files): Keep the second return value of 'filtered-port'. Call 'waitpid' on it.
* offload: Allow one transfer in each direction simultaneously.Ludovic Courtès2014-03-26
| | | | | | * guix/scripts/offload.scm (transfer-and-offload): Use 'upload' lock instead of 'bandwidth' around 'send-files' calls, and 'download' lock around 'retrieve-files' call.
* offload: Disable SSH-level compression.Ludovic Courtès2014-03-26
| | | | | | | | | * guix/scripts/offload.scm (remote-pipe): Remove '-z' lsh command line argument. This makes transfers almost an order of magnitude slower. OpenSSH's ssh(1) man page notes: "Compression is desirable on modem lines and other slow connections, but will only slow down things on fast networks." See also <http://www.spikelab.org/blog/transfer-largedata-scp-tarssh-tarnc-compared.html>.
* offload: Compress files being sent/retrieved.Ludovic Courtès2014-03-24
| | | | | | | | * guix/scripts/offload.scm (send-files): Add "xz -dc |" to the remote pipe command. Pass PIPE through 'call-with-compressed-output-port'. Remove 'close-pipe' call. (retrieve-files): Add "| xz -c" to the remote pipe command. Pass PIPE through 'call-with-decompressed-port'. Remove 'close-pipe' call.
* authenticate: Support reading the hash or key from stdin.Ludovic Courtès2014-03-22
| | | | | | | | * guix/scripts/authenticate.scm (guix-authenticate): Add clauses for ("rsautl" "-sign" "-inkey" key) and ("rsautl" "-verify" "-inkey" _ "-pubin"). * tests/guix-authenticate.sh (hash): Add test using -sign and -verify in a pipeline.
* authenticate: Move actual work to separate procedures.Ludovic Courtès2014-03-22
| | | | | | | | * guix/scripts/authenticate.scm (read-canonical-sexp): Change to expect a port instead of a file name. (read-hash-data): Likewise. (sign-with-key, validate-signature): New procedures. (guix-authenticate): Rewrite in terms of these two procedures.
* utils: Add 'decompressed-port' and 'compressed-port'.Ludovic Courtès2014-03-22
| | | | | | | | | * guix/utils.scm (decompressed-port, compressed-port): New procedures. * guix/scripts/substitute-binary.scm (decompressed-port): Remove. (guix-substitute-binary): Pass a symbol or #f as the first argument to 'decompress-port'. * tests/utils.scm ("compressed-port, decompressed-port, non-file"): New test.
* pk-crypto: Don't use Ed25519 when libgcrypt is older than 1.6.0.Ludovic Courtès2014-03-20
| | | | | | | * guix/pk-crypto.scm (gcrypt-version): New procedure. * guix/scripts/archive.scm (%key-generation-parameters): New variable. (%options) <generate-key>: Use it. * tests/pk-crypto.scm ("sign + verify, Ed25519"): Skip if using gcrypt < 1.6.0.
* offload: Send build logs to file descriptor 4.Ludovic Courtès2014-03-19
| | | | | | | | | * guix/scripts/offload.scm (with-error-to-port): New macro. (remote-pipe): Add #:error-port parameter. Use 'with-error-to-port' around 'open-pipe*' call. (build-log-port): New procedure. (offload): Change #:log-port to default to (build-log-port). Call 'remote-pipe' with #:error-port LOG-PORT.
* substitute-binary: Quietly handle 404s when fetching narinfos.Ludovic Courtès2014-03-19
| | | | | | | * guix/scripts/substitute-binary.scm (fetch): Add #:quiet-404? parameter. Upon &http-get-error, re-raise C if the QUIET-404? is true and the code is 404. (fetch-narinfo): Pass #:quiet-404? #t.
* pk-crypto: Use RFC6979 when signing with an ECC or DSA key.Ludovic Courtès2014-03-19
| | | | | | | | | | | | | | * guix/pk-crypto.scm (bytevector->hash-data): Add #:key-type parameter. Use the 'pkcs1' flag when KEY-TYPE is 'rsa', and 'rfc6979' when KEY-TYPE is 'ecc' or 'dsa'. (key-type): New procedure. * guix/scripts/authenticate.scm (read-hash-data): Add 'key-type' parameter. Pass it to 'bytevector->hash-data'. Adjust caller accordingly. * tests/pk-crypto.scm (%ecc-key-pair): New variable. ("key-type"): New test. ("sign + verify"): Pass #:key-type to 'bytevector->hash-data'. ("sign + verify, Ed25519"): New test.
* guix archive: Generate curve Ed25519 keys by default.Ludovic Courtès2014-03-17
| | | | | * guix/scripts/archive.scm (%options) <generate-key>: Default to curve Ed25519. Suggested by Christian Grothoff <grothoff@in.tum.de>.
* guix archive: Improve '--generate-key' error reporting.Ludovic Courtès2014-03-17
| | | | | * guix/scripts/archive.scm (%options) <generate-key>: Report the error source and string when 'string->canonical-sexp' fails.
* offload: Fix 'choose-build-machine' for several machines.Ludovic Courtès2014-03-13
| | | | | * guix/scripts/offload.scm (choose-build-machine)[undecorate]: Turn into a two-argument procedure.
* offload: Convert the port number to a string when invoking lsh.Ludovic Courtès2014-03-13
| | | | | * guix/scripts/offload.scm (remote-pipe, send-files): Pass the result of 'build-machine-port' to 'number->string'.
* offload: Allow build machines to specify a port number.Ludovic Courtès2014-03-13
| | | | | * guix/scripts/offload.scm (<build-machine>): Add 'port' field. (remote-pipe, send-files): Use lsh's '-p' option when invoking it.
* guix build: Support '--with-source' along with '-e'.Ludovic Courtès2014-03-13
| | | | | | | | | * guix/scripts/build.scm (derivation-from-expression): Remove. (options->derivations): Handle pairs of the form "('argument . (? derivation?))". (options/resolve-packages): Add 'store' parameter; update caller. Add 'system' variable. Add case for 'expression pairs. * guix/scripts/archive.scm (derivation-from-expression): New procedure.
* guix build: Add '--with-source'.Ludovic Courtès2014-03-12
| | | | | | | | | | * guix/scripts/build.scm (package-with-source): New procedure. (show-help): Add '--with-source'. (%options): Likewise. (options->derivations): Call 'options/with-source' and 'options/resolve-packages'. (options/resolve-packages, options/with-source): New procedures. * doc/guix.texi (Invoking guix build): Document '--with-source'.
* offload: Honor absolute build timeouts.Ludovic Courtès2014-03-09
| | | | | | | | * guix/scripts/offload.scm (offload): Remove default value for 'build-timeout'. Pass '--timeout' to the remote 'guix build' process. (transfer-and-offload, process-request): Remove default value for 'build-timeout'.
* guix build: Add '--timeout' to the common build options.Ludovic Courtès2014-03-09
| | | | | | | | | * guix/scripts/build.scm (show-build-options-help): Document '--timeout'. (set-build-options-from-command-line): Pass #:timeout to 'set-build-options'. (%standard-build-options): Add '--timeout'. * doc/guix.texi (Invoking guix build): Document it.
* offload: Move macro definitions before use.Ludovic Courtès2014-03-09
| | | | | | * guix/scripts/offload.scm (lock-file, unlock-file, with-file-lock, with-machine-lock, machine-slot-file, acquire-build-slot, release-build-slot): Move definitions above their first use.
* offload: Distinguish between 'decline' and 'postpone'.Ludovic Courtès2014-03-09
| | | | | | | | * guix/scripts/offload.scm (transfer-and-offload): New procedure, with core formerly in 'process-request'. (choose-build-machine): Remove 'requirements' parameter. (process-request): Reply 'decline' when none of MACHINES matches the requirements, and 'postpone' when MACHINES are busy.
* offload: Prevent locked files from being GC'd.Ludovic Courtès2014-03-08
| | | | | * guix/scripts/offload.scm (%slots): New variable. (choose-build-machine): Add SLOT to '%slots'.
* offload: Fix thinko.Ludovic Courtès2014-03-08
| | | | | * guix/scripts/offload.scm (choose-build-machine)[machine+slots]: Use 'filter-map', not 'filter'.
* offload: Make 'parallel-builds' a hard limit.Ludovic Courtès2014-03-08
| | | | | | | | | * guix/scripts/offload.scm (machine-choice-lock-file, machine-slot-file, acquire-build-slot, release-build-slot): New procedures. (choose-build-machine): Operate with (machine-choice-lock-file) taken. Acquire a build slot for each of MACHINES. Release those not used.
* offload: Further generalize lock files.Ludovic Courtès2014-03-08
| | | | | | | * guix/scripts/offload.scm (lock-machine, unlock-machine): Remove. (lock-file, unlock-file): New procedures. (with-file-lock): New macro. (with-machine-lock): Rewrite in terms of 'with-file-lock'.
* offload: Generalize the machine lock mechanism.Ludovic Courtès2014-03-08
| | | | | | | | * guix/scripts/offload.scm (lock-machine): Add 'hint' parameter. (unlock-machine): Remove 'machine' parameter. (with-machine-lock): Add 'hint' parameter, and pass it down. (process-request): Adjust uses of 'with-machine-lock' to pass the 'bandwidth hint.
* offload: Serialize file transfers to build machines.Ludovic Courtès2014-03-06
| | | | | | | | * guix/scripts/offload.scm (machine-lock-file, lock-machine, unlock-machine): New procedures. (with-machine-lock): New macro. (process-request): Wrap 'send-files' and 'retrieve-files' calls in 'with-machine-lock'.
* guix package: Use the common build options from (guix scripts build).Ludovic Courtès2014-03-01
| | | | | | | | | | | * guix/scripts/build.scm (%standard-build-options): Change option handlers to support multiple seeds. * guix/scripts/package.scm (show-help): Remove --dry-run, --fallback, --no-substitutes, and --max-silent-time. (%options): Likewise, and add %STANDARD-BUILD-OPTIONS. (%default-options): Add 'verbosity'. (guix-package): Call 'set-build-options-from-command-line' instead of 'set-build-options'.
* substitute-binary: Gracefully handle HTTP GET errors.Ludovic Courtès2014-03-01
| | | | | | | * guix/http-client.scm (&http-get-error): New condition type. (http-fetch): Raise it instead of using 'error'. * guix/scripts/substitute-binary.scm (fetch) <http>: Wrap body into 'guard' form; gracefully handle 'http-get-error?' conditions.
* offload: Comment out attempt to set up an lsh gateway.Ludovic Courtès2014-03-01
| | | | | * guix/scripts/offload.scm (open-ssh-gateway): Comment out. (process-request): Remove call to 'open-ssh-gateway' and to 'kill'.
* offload: 'remote-pipe' uses the right SSH key.Ludovic Courtès2014-03-01
| | | | | * guix/scripts/offload.scm (remote-pipe): Pass -i when invoking %LSHG-COMMAND.
* offload: Take the target machine load into account.Ludovic Courtès2014-03-01
| | | | | | | * guix/scripts/offload.scm (machine-load, machine-less-loaded?, machine-less-loaded-or-faster?): New procedures. (choose-build-machine): Use 'machine-less-loaded-or-faster?' when sorting. Return the head of MACHINES unless it's loaded is >= 2.
* guix archive: Change '--help' to show '--authorize'.Ludovic Courtès2014-02-28
| | | | * guix/scripts/archive.scm (show-help): Add '--authorize'.
* guix hash: Add '--recursive'.Ludovic Courtès2014-02-21
| | | | | | | | | | | | * guix/scripts/hash.scm (show-help): Add --recursive. (%options): Likewise. (guix-hash)[file-hash]: New procedure. Honor --recursive. Use it. * guix/nar.scm (write-file): Add missing field to the &nar-error condition raised upon unsupported file type; change its message to be more descriptive. * tests/guix-hash.sh: Add tests with -r. * doc/guix.texi (Invoking guix hash): Document --recursive.
* guix hash: Don't load the whole file in memory.Ludovic Courtès2014-02-20
| | | | | | * guix/scripts/hash.scm (guix-hash)[eof->null]: Remove. (guix-hash): Use 'port-sha256' to compute the hash instead of 'get-bytevector-all' and co.
* gnu: Introduce the (gnu services ...) modules.Ludovic Courtès2014-02-19
| | | | | | | | | | | * gnu/system/dmd.scm: Remove file. Move contents to... * gnu/services.scm, gnu/services/base.scm, gnu/services/dmd.scm, gnu/services/networking.scm, gnu/services/xorg.scm: ... here. New files. * gnu/system.scm, gnu/system/vm.scm: Adjust accordingly. * guix/scripts/system.scm (%user-module): Likewise. * doc/guix.texi (Using the Configuration System): Likewise. (Defining Services): Likewise.
* Add 'guix system'.Ludovic Courtès2014-02-18
| | | | | | | | | * guix/scripts/system.scm: New file. * Makefile.am (MODULES): Add it. * po/POTFILES.in: Likewise. * doc/guix.texi (Using the Configuration System): Link to "Invoking guix system". (Invoking guix system): New node.
* guix build: Factorize common options.Ludovic Courtès2014-02-18
| | | | | | | | | | | | | | | | | | | | | | * guix/scripts/build.scm (show-build-options-help, set-build-options-from-command-line): New procedures. (show-help): Remove description of --dry-run, --fallback, --no-substitutes, --max-silent-time, and --cores. Call 'show-build-options-help'. (%standard-build-options): New variable. (%options): Remove --dry-run, --fallback, --no-substitutes, --verbosity, --max-silent-time, and --cores. Add %STANDARD-BUILD-OPTIONS. (guix-build): Use 'set-build-options-from-command-line' instead of 'set-build-options'. * guix/scripts/archive.scm (show-help): Remove description of --dry-run, --fallback, --no-substitutes, --max-silent-time, and --cores. Call 'show-build-options-help'. (%options): Remove --dry-run, --fallback, --no-substitutes, --verbosity, --max-silent-time, and --cores. Add %STANDARD-BUILD-OPTIONS. (export-from-store): Call 'set-build-options-from-command-line' instead of 'set-build-options.
* guix build: Move 'set-build-options' call earlier.Ludovic Courtès2014-02-12
| | | | | * guix/scripts/build.scm (guix-build): Move 'set-build-options' call before 'show-what-to-build'.
* offload: Have 'build-machines' honor its argument.Ludovic Courtès2014-02-02
| | | | * guix/scripts/offload.scm (build-machines): Honor FILE.
* offload: Do not try to retrieve anything upon build failure.Ludovic Courtès2014-01-27
| | | | | | | | * guix/scripts/offload.scm (offload): Add 'log-port' keyword parameter. Handle log display here. Return the result of (close-pipe pipe). (process-request): Adjust 'offload' call site accordingly. Call 'retrieve-files' only when 'offload' returns zero; exit when 'offload' returns non-zero.
* Add 'guix offload' as a daemon build hook.Ludovic Courtès2014-01-24
| | | | | | | | | | | | | | | | | | | | | | | | * nix/nix-daemon/guix-daemon.cc (GUIX_OPT_NO_BUILD_HOOK): New macro. (options): Add '--no-build-hook'. (parse_opt): Handle it. (main)[HAVE_DAEMON_OFFLOAD_HOOK]: Set 'useBuildHook' by default. Set $NIX_BUILD_HOOK to our offload hook unless otherwise specified. [!HAVE_DAEMON_OFFLOAD_HOOK]: Clear 'useBuildHook'. * pre-inst-env.in: Set and export NIX_BUILD_HOOK. * nix/scripts/offload.in, guix/scripts/offload.scm: New files. * guix/ui.scm (show-guix-help)[internal?]: Add "offload". * config-daemon.ac: Call 'GUIX_CHECK_UNBUFFERED_CBIP'. Instantiate 'nix/scripts/offload'. Set 'BUILD_DAEMON_OFFLOAD' conditional, and optionally define 'HAVE_DEAMON_OFFLOAD_HOOK' cpp macro. * daemon.am (nodist_pkglibexec_SCRIPTS)[BUILD_DAEMON_OFFLOAD]: Add it. * Makefile.am (MODULES)[BUILD_DAEMON_OFFLOAD]: Add 'guix/scripts/offload.scm'. (EXTRA_DIST)[!BUILD_DAEMON_OFFLOAD]: Likewise. * m4/guix.m4 (GUIX_CHECK_UNBUFFERED_CBIP): New macro. * doc/guix.texi (Setting Up the Daemon): Move most of the body to... (Build Environment Setup): ... this. New subsection. (Daemon Offload Setup): New subsection.
* pki: Factorize signature manipulation procedures.Ludovic Courtès2014-01-24
| | | | | | | * guix/pki.scm (signature-subject, signature-signed-data, valid-signature?): New procedures. * guix/scripts/authenticate.scm (guix-authenticate): Adjust to use them.