1cbfce1669
guix archive: Generate curve Ed25519 keys by default.
...
* guix/scripts/archive.scm (%options) <generate-key>: Default to curve
Ed25519. Suggested by Christian Grothoff <grothoff@in.tum.de>.
2014-03-17 23:49:35 +01:00
d0a850698a
guix archive: Improve '--generate-key' error reporting.
...
* guix/scripts/archive.scm (%options) <generate-key>: Report the error
source and string when 'string->canonical-sexp' fails.
2014-03-17 23:47:18 +01:00
11e7a6cf46
store: Add 'hash-part->path'.
...
* guix/store.scm (hash-part->path): New procedure.
* tests/store.scm ("hash-part->path"): New test.
2014-03-14 17:16:10 +01:00
1a8ea0a188
offload: Fix 'choose-build-machine' for several machines.
...
* guix/scripts/offload.scm (choose-build-machine)[undecorate]: Turn into
a two-argument procedure.
2014-03-13 22:57:21 +01:00
3c0e6e6080
offload: Convert the port number to a string when invoking lsh.
...
* guix/scripts/offload.scm (remote-pipe, send-files): Pass the result of
'build-machine-port' to 'number->string'.
2014-03-13 22:46:32 +01:00
cecd72d55a
offload: Allow build machines to specify a port number.
...
* guix/scripts/offload.scm (<build-machine>): Add 'port' field.
(remote-pipe, send-files): Use lsh's '-p' option when invoking it.
2014-03-13 21:58:04 +01:00
257b93412a
guix build: Support '--with-source' along with '-e'.
...
* 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.
2014-03-13 19:21:49 +01:00
7f3673f21d
guix build: Add '--with-source'.
...
* 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'.
2014-03-12 00:22:41 +01:00
d91a879121
download: 'download-to-store' accepts plain file names.
...
* guix/download.scm (download-to-store): When URI is #f, assume that URL
is a file name, and handle it.
2014-03-11 22:09:42 +01:00
6f58d58243
More /gnu/store replacements.
...
* gnu/packages/gcc.scm (gcc-4.7): Change /nix/store in comment.
* gnu/system/vm.scm (operating-system-default-contents):
Use (%store-prefix) instead of "/nix/store".
* guix/derivations.scm (derivation-path->output-path,
derivation-path->output-paths): Change to /gnu/store in docstring.
2014-03-10 23:58:40 +01:00
c9c88118a1
gnu: linux-initrd: Make the pseudo-tty device nodes.
...
* guix/build/linux-initrd.scm (make-essential-device-nodes): Create
/dev/ptmx and /dev/pts.
* gnu/system/vm.scm (qemu-image): Umount /fs/dev/pts before /fs.
2014-03-10 23:43:31 +01:00
714084e6c0
offload: Honor absolute build timeouts.
...
* 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'.
2014-03-09 23:15:09 +01:00
002622b65b
guix build: Add '--timeout' to the common build options.
...
* 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.
2014-03-09 23:09:18 +01:00
6c20d1d0c3
store: Add #:timeout build option.
...
* guix/serialization.scm (write-string-pairs): New procedure.
* guix/store.scm (write-arg): Add 'string-pairs' case.
(set-build-options): Add 'timeout' keyword parameter. Honor it.
* tests/derivations.scm ("build-expression->derivation and timeout"):
New test.
2014-03-09 23:01:18 +01:00
f5768afa33
build: Change state and log directories to $localstatedir/.../guix.
...
* daemon.am (libstore_a_CPPFLAGS): Change /nix to /guix.
* guix/config.scm.in (%state-directory): Likewise.
* guix/store.scm (log-file): Likewise.
2014-03-09 22:10:01 +01:00
59f704dff6
offload: Move macro definitions before use.
...
* 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.
2014-03-09 18:08:38 +01:00
88da0b6888
offload: Distinguish between 'decline' and 'postpone'.
...
* 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.
2014-03-09 14:06:35 +01:00
5cc569dc73
offload: Prevent locked files from being GC'd.
...
* guix/scripts/offload.scm (%slots): New variable.
(choose-build-machine): Add SLOT to '%slots'.
2014-03-08 21:23:12 +01:00
7df3ade112
offload: Fix thinko.
...
* guix/scripts/offload.scm (choose-build-machine)[machine+slots]: Use
'filter-map', not 'filter'.
2014-03-08 12:22:49 +01:00
d652b85137
offload: Make 'parallel-builds' a hard limit.
...
* 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.
2014-03-08 12:16:06 +01:00
4bf1eb4f88
offload: Further generalize lock files.
...
* 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'.
2014-03-08 12:07:57 +01:00
178f5828eb
offload: Generalize the machine lock mechanism.
...
* 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.
2014-03-08 11:29:52 +01:00
c7445833eb
utils: Add a non-blocking option for 'fcntl-flock'.
...
* guix/utils.scm (F_SETLK): New variable.
(fcntl-flock): Add 'wait?' keyword parameter; honor it.
* tests/utils.scm ("fcntl-flock non-blocking"): New test.
2014-03-08 00:18:22 +01:00
cafb92d853
store: 'export-paths' doesn't export references of the given files.
...
This fixes a regression introduced in
99fbddf9a6
2014-03-07 00:19:03 +01:00
9ea3ef2655
utils: 'fcntl-flock' passes an errno when throwing an exception.
...
* guix/utils.scm (%libc-errno-pointer, errno): New procedures.
(fcntl-flock): Use it as the exception's argument.
2014-03-06 21:42:24 +01:00
f326fef8a8
offload: Serialize file transfers to build machines.
...
* 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'.
2014-03-06 21:42:24 +01:00
56c72822a8
download: Perform derivations locally.
...
* guix/download.scm (url-fetch): Pass #:local-build? #t to
'build-expression->derivation'.
* guix/git-download.scm (git-fetch): Likewise.
2014-03-06 21:42:24 +01:00
dd67b429e1
guix package: Use the common build options from (guix scripts build).
...
* 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'.
2014-03-01 18:29:29 +01:00
706e9e575d
substitute-binary: Gracefully handle HTTP GET errors.
...
* 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.
2014-03-01 15:38:11 +01:00
1f7fd80032
offload: Comment out attempt to set up an lsh gateway.
...
* guix/scripts/offload.scm (open-ssh-gateway): Comment out.
(process-request): Remove call to 'open-ssh-gateway' and to 'kill'.
2014-03-01 12:24:39 +01:00
aedbf9b873
offload: 'remote-pipe' uses the right SSH key.
...
* guix/scripts/offload.scm (remote-pipe): Pass -i when invoking
%LSHG-COMMAND.
2014-03-01 12:15:47 +01:00
165f4b2add
offload: Take the target machine load into account.
...
* 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.
2014-03-01 01:31:18 +01:00
36b56f081b
guix archive: Change '--help' to show '--authorize'.
...
* guix/scripts/archive.scm (show-help): Add '--authorize'.
2014-02-28 22:31:16 +01:00
a74da6b015
gnu-maintenance: Adjust 'latest-release' to filter Bash's patch directories.
...
* guix/gnu-maintenance.scm (latest-release)[patch-directory-name?]: New
procedure.
<subdirs>: Use it to filter out Bash-like patch directories.
2014-02-28 00:01:53 +01:00
371e87d286
store: Use 'when' instead of 'if' in effectful context.
...
* guix/store.scm (set-build-options): Use 'when' instead of 'if'.
2014-02-27 22:24:02 +01:00
2096ef47aa
derivations: Remove unused 'derivation' parameter.
...
* guix/derivations.scm (derivation): Remove unused #:hash-mode parameter.
* doc/guix.texi (Derivations): Adjust accordingly.
2014-02-21 23:49:53 +01:00
9b5b5c1740
Add (guix git-download).
...
* guix/git-download.scm, guix/build/git.scm: New files.
* Makefile.am (MODULES): Add them.
* guix/packages.scm (<origin>): Fix comment for 'method' field.
2014-02-21 23:49:53 +01:00
96c7448f37
nar: Produce archives with files sorted in C collation order.
...
* guix/nar.scm (write-file) <directory>: Pass 'string<?' as the second
argument to 'scandir'.
* tests/nar.scm ("write-file puts file in C locale collation order"):
New test.
2014-02-21 23:49:53 +01:00
36bbbbd150
derivations: Add support for recursive fixed-output derivations.
...
* guix/derivations.scm (<derivation-output>): Add 'recursive?' field.
Adjust 'make-derivation-output' callers.
(%read-derivation) <fixed-output>: When HASH-ALGO starts with 'r:',
set the 'recursive?' field and drop 'r:' from the hash algo name.
(write-derivation)[write-output]: Write the algo as 'r:HASH-ALGO' when
the RECURSIVE? field is set.
(derivation-hash) <fixed-output>: Prepend "r:" when RECURSIVE? is set.
(fixed-output-path): New procedure.
(derivation): Add #:recursive? parameter. Use 'fixed-output-path' to
compute the output file name of a fixed output derivation.
(build-expression->derivation): Add #:recursive? parameter. Pass it
to 'derivation'.
* tests/derivations.scm ("fixed-output derivation, recursive",
"build-expression->derivation produces recursive fixed-output",
"build-expression->derivation uses recursive fixed-output"): New
tests.
* doc/guix.texi (Derivations): Document #:recursive? for 'derivation'.
Add #:recursive? for 'build-expression->derivation'.
2014-02-21 23:49:52 +01:00
3140f2df42
guix hash: Add '--recursive'.
...
* 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.
2014-02-21 23:49:52 +01:00
c1d52c71aa
ui: Handle SRFI-35 '&message' conditions.
...
* guix/ui.scm (call-with-error-handling): Add case for
'message-condition?'.
* po/Makevars: Fix typo in comment.
2014-02-21 23:49:52 +01:00
a93e91ff48
nar: 'write-file' can write to non-file ports.
...
* guix/nar.scm (write-contents): Use 'sendfile' only when P is a file
port.
* tests/nar.scm ("write-file supports non-file output ports"): New test.
2014-02-21 23:49:52 +01:00
c6d37be951
guix hash: Don't load the whole file in memory.
...
* 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.
2014-02-20 23:18:08 +01:00
db4fdc04cc
gnu: Introduce the (gnu services ...) modules.
...
* 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.
2014-02-19 20:58:24 +01:00
523e48969b
Add 'guix system'.
...
* 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.
2014-02-18 23:47:49 +01:00
e7fc17b592
guix build: Factorize common options.
...
* 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.
2014-02-18 00:13:24 +01:00
bdff90a16a
guix build: Move 'set-build-options' call earlier.
...
* guix/scripts/build.scm (guix-build): Move 'set-build-options' call
before 'show-what-to-build'.
2014-02-12 00:03:20 +01:00
d66b704b51
store: Add comments for the stracer.
...
* guix/store.scm (%worker-magic-1, %worker-magic-2): Add comments.
2014-02-12 00:03:20 +01:00
99fbddf9a6
store: Change 'export-paths' to always export in topological order.
...
* guix/store.scm (export-paths): Pass PATHS through
'topologically-sorted' before iterating.
* tests/store.scm ("export/import paths, ensure topological order"): New
test.
2014-02-10 23:36:42 +01:00
6ede17ca69
union: Do not compare directories upon collision.
...
* guix/build/union.scm (file=?): Return #f if FILE1 and FILE2 are not
regular files. Fixes a bug whereby collisions among directories would
lead to the invocation of 'file=?' and thus 'call-with-input-file' on
directories. Reported by Mark H. Weaver <mhw@netris.org>.
2014-02-10 00:05:39 +01:00
Ludovic Courtès