2f265602ff
Merge branch 'master' into core-updates
2014-01-08 22:06:54 +01:00
1d6816f98c
config: '%store-directory' always honors $NIX_STORE_DIR.
...
* guix/config.scm.in (%store-directory): Honor $NIX_STORE_DIR.
* guix/store.scm (%store-prefix): Use %store-directory directly.
2014-01-08 21:37:06 +01:00
80d0447c95
config: '%state-directory' always honors $NIX_STATE_DIR.
...
* guix/config.scm.in (%state-directory): Honor $NIX_STATE_DIR.
* guix/scripts/package.scm (%profile-directory): Use %state-directory
directly.
* guix/store.scm (%default-socket-path, log-file): Likewise.
2014-01-08 21:12:55 +01:00
021a201f29
store: Fix 'log-file' to support uncompressed logs.
...
* guix/store.scm (log-file): Report the file without '.bz2' if it
exists.
2014-01-08 19:23:33 +01:00
87236aed77
archive: Add '--missing'.
...
* guix/scripts/archive.scm (show-help, %options): Add '--missing'.
(guix-archive)[lines]: New procedure.
Use it to honor '--missing'.
* tests/guix-archive.sh: Add tests.
* doc/guix.texi (Invoking guix archive): Document '--missing'.
2014-01-06 22:25:29 +01:00
590e4154b6
archive: Make sure $sysconfdir/guix exists.
...
* guix/pki.scm (ensure-acl): Make sure the directory of %ACL-FILE
exists.
* guix/scripts/archive.scm (generate-key-pair): Likewise for
%PUBLIC-KEY-FILE.
2014-01-05 23:40:06 +01:00
425b0bfc2e
guix build: Add '--no-build-hook'.
...
* guix/scripts/build.scm (%default-options): Add 'build-hook?' pair.
(show-help, %options): Add --no-build-hook.
(guix-build): Pass the 'build-hook?' value to 'set-build-options'.
* doc/guix.texi (Invoking guix build): Document '--no-build-hook'.
2014-01-05 22:58:32 +01:00
1a43e4dc57
guix package: Gracefully deal with EPIPE on stdout for --list-*.
...
* guix/scripts/package.scm (leave-on-EPIPE): New macro.
(guix-package): Use it for 'list-installed', 'list-available', and
'--list-generations'.
* tests/guix-package.sh: Add test.
2014-01-04 22:45:33 +01:00
f82cc5fdbe
archive: Add '--authorize'.
...
* guix/scripts/archive.scm (authorize-key): New procedure.
(guix-archive): Call it when OPTS contains 'authorize-key'.
* tests/guix-archive.sh: Add test with invalid public key.
* guix/pki.scm: Export '%acl-file'.
* doc/guix.texi (Invoking guix archive): Make it clear that '--import'
works only with authorized keys. Document '--authorize'.
2013-12-30 23:18:52 +01:00
554f26ece3
archive: Add '--generate-key'.
...
* guix/pk-crypto.scm (error-source, error-string): New procedures.
* guix/pki.scm (%private-key-file): New variable.
* guix/scripts/archive.scm (show-help): Document '--generate-key'.
(%options): Add "generate-key".
(generate-key-pair): New procedure.
(guix-archive): Call 'generate-key' when OPTS contains a
'generate-key' pair.
* doc/guix.texi (Setting Up the Daemon): Suggest generating a key pair.
(Invoking guix archive): Document '--generate-key'.
2013-12-30 22:57:37 +01:00
dedb5d947e
pk-crypto: Fix 'canonical-sexp->sexp' for atoms.
...
* guix/pk-crypto.scm (canonical-sexp->sexp): Add hack to extract an
atom's buffer.
* tests/pk-crypto.scm ("sexp->canonical-sexp->sexp"): Add sample.
2013-12-30 22:29:12 +01:00
36341854df
pk-crypto: Work around Libgcrypt bug < https://bugs.g10code.com/gnupg/issue1594 >.
...
* guix/pk-crypto.scm (canonical-sexp-fold): Call 'nth-data' before
'nth' to work around <https://bugs.g10code.com/gnupg/issue1594 >.
* tests/pk-crypto.scm ("https://bugs.g10code.com/gnupg/issue1594 "): New
test.
2013-12-30 22:19:19 +01:00
c909dab269
authenticate: Consistently use 'leave' for fatal error reporting.
...
* guix/scripts/authenticate.scm (guix-authenticate): Replace all uses of
'format' + 'exit' with 'leave'.
2013-12-30 18:23:44 +01:00
96e5085c81
authenticate: Disallow imports signed with unauthorized keys.
...
* guix/scripts/authenticate.scm (signature-sexp): Remove.
(guix-authenticate): Upon '-verify', check whether the signature's
public key passes 'authorized-key?'.
2013-12-29 15:57:24 +01:00
8b420f74e4
Add (guix pki).
...
* guix/pki.scm, tests/pki.scm: New files.
* Makefile.am (MODULES): Add 'guix/pki.scm'.
(SCM_TESTS): Add 'tests/pki.scm'.
2013-12-29 15:57:24 +01:00
3f40cfdece
config: Export '%config-directory'.
...
* configure.ac: Define and substitute 'guix_sysconfdir'.
* guix/config.scm.in (%config-directory): New variable.
2013-12-29 15:57:24 +01:00
04d4c8a439
Move 'with-atomic-file-output' to (guix utils).
...
* guix/scripts/substitute-binary.scm (with-atomic-file-output): Move to...
* guix/utils.scm (with-atomic-file-output): ... here.
2013-12-29 15:57:24 +01:00
9501d7745e
pk-crypto: Add canonical-sexp to sexp conversion procedures.
...
* guix/pk-crypto.scm (canonical-sexp-fold, canonical-sexp->sexp,
sexp->canonical-sexp): New procedures.
* tests/pk-crypto.scm ("canonical-sexp->sexp",
"sexp->canonical-sexp->sexp"): New tests.
2013-12-29 15:57:24 +01:00
363ae1da82
pk-crypto: Add 'canonical-sexp-length' and related procedures.
...
* guix/pk-crypto.scm (canonical-sexp-length, canonical-sexp-null?,
canonical-sexp-list?): New procedures.
* tests/pk-crypto.scm ("canonical-sexp-length", "canonical-sexp-list?"):
New tests.
2013-12-29 15:57:24 +01:00
a2cbbb743d
pk-crypto: 'canonical-sexp-nth-data' returns a symbol for "tokens".
...
* guix/pk-crypto.scm (token-string?): New procedure.
(canonical-sexp-nth-data): Return a symbol when the element is a
"token", and a bytevector otherwise.
(latin1-string->bytevector): Remove.
(hash-data->bytevector): Adjust accordingly.
* tests/pk-crypto.scm ("canonical-sexp-nth"): Adjust accordingly. Add
octet string example.
2013-12-29 15:57:23 +01:00
6df1fb8991
authenticate: Store the public key as part of the signature.
...
* guix/scripts/authenticate.scm (signature-sexp): New procedure.
(guix-authenticate): Use it to produce the signature. Adjust
verification code accordingly.
* tests/store.scm ("import corrupt path"): Adjust test accordingly.
2013-12-29 15:57:23 +01:00
b0a33ac157
pk-crypto: Rename 'gcry-sexp' to 'canonical-sexp'.
...
* guix/pk-crypto.scm: Rename procedures, variables, etc. from
'gcry-sexp' to 'canonical-sexp'. Add comment with references.
* guix/scripts/authenticate.scm, tests/pk-crypto.scm: Adjust
accordingly.
2013-12-29 15:57:23 +01:00
760c60d684
Add 'guix archive'.
...
* guix/scripts/archive.scm, tests/guix-archive.sh: New files.
* Makefile.am (MODULES): Add 'archive.scm'.
(SH_TESTS): Add 'guix-archive.sh'.
* doc/guix.texi (Invoking guix archive): New section.
* guix/scripts/build.scm: Export 'derivation-from-expression'.
* guix/scripts/package.scm: Export 'specification->package+output'.
2013-12-22 01:08:21 +01:00
81fa80b245
guix build: Improve procedural decomposition.
...
* guix/scripts/build.scm (%store): Remove.
(derivation-from-expression): Add 'store' parameter. Adjust caller
accordingly.
(register-root): New procedure, formerly within 'guix-build'.
(options->derivations): New procedure, formerly inline within
'guix-build'.
(guix-build): Adjust accordingly.
2013-12-21 22:53:58 +01:00
3f26bfc18a
Factorize package search between 'guix package' and 'guix build'.
...
* guix/scripts/package.scm (newest-available-packages): Remove.
(find-best-packages-by-name): Move to...
* gnu/packages.scm (find-best-packages-by-name): ... here.
(find-newest-available-packages): Memoize.
* guix/scripts/build.scm (specification->package): New procedure,
formerly called 'find-package' within 'guix-build'.
(guix-build): Adjust accordingly.
2013-12-21 22:36:32 +01:00
526382ff92
daemon: Implement signed archive import/export.
...
* guix/scripts/authenticate.scm, nix/scripts/guix-authenticate.in,
tests/signing-key.pub, tests/signing-key.sec: New files.
* po/POTFILES.in: Add 'guix/scripts/authenticate.scm'.
* guix/store.scm (dump-port): New procedure.
(process-stderr): Add 'user-port' optional parameter. Handle
the %STDERR-WRITE and %STDERR-READ cases as expected.
(import-paths, export-path, export-paths): New procedures.
* tests/store.scm ("export/import several paths", "import corrupt
path"): New tests.
* Makefile.am (MODULES): Add 'guix/scripts/authenticate.scm'.
(EXTRA_DIST): Add 'tests/signing-key.{pub,sec}'.
* daemon.am (libstore_a_CPPFLAGS)[-DNIX_CONF_DIR]: Change 'NIX_CONF_DIR'
to .../guix. Change 'OPENSSL_PATH' to 'guix-authenticate'.
* config-daemon.ac: Instantiate 'nix/scripts/guix-authenticate'.
* nix/nix-daemon/guix-daemon.cc (main): Augment $PATH to include
'settings.nixLibexecDir'.
* test-env.in: Export 'NIX_CONF_DIR' and 'NIX_LIBEXEC_DIR'. Populate
$NIX_CONF_DIR.
2013-12-20 17:17:42 +01:00
ce507041f7
pk-crypto: Add a few sexp utility procedures.
...
* guix/pk-crypto.scm (gcry-sexp-car, gcry-sexp-cdr, gcry-sexp-nth,
gcry-sexp-nth-data, dereference-size_t, latin1-string->bytevector,
hash-data->bytevector): New procedures.
* tests/pk-crypto.scm ("gcry-sexp-car + cdr", "gcry-sexp-nth",
"gcry-sexp-nth-data", "bytevector->hash-data->bytevector"): New tests.
2013-12-20 15:22:15 +01:00
3476ded934
Add (guix pk-crypto).
...
* guix/pk-crypto.scm, tests/pk-crypto.scm: New files.
* Makefile.am (MODULES, SCM_TESTS): Add them.
2013-12-20 00:36:26 +01:00
db6190899e
gnu: gnu-build-system: Add CC_FOR_BUILD to configure flags.
...
* guix/build/gnu-build-system.scm: Add new configure flag: CC_FOR_BUILD=gcc
* gnu/packages/gnupg.scm, gnu/packages/guile.scm, gnu/packages/make-bootstrap.scm:
remove CC_FOR_BUILD from these package descriptions.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2013-12-17 21:28:07 +01:00
3dbeecd2ff
pull: Move build code to (guix build pull).
...
* guix/build/pull.scm: New file.
* Makefile.am (MODULES): Add it.
* guix/scripts/pull.scm (unpack): Use it.
2013-12-16 23:26:48 +01:00
af949e8ee7
gnu: gtk+: enable introspection.
...
* gnu/packages/gtk.scm (atk, gdk-pixbuf, gtk+, pango): enable introspection
* guix/build/gnome.scm: New file.
2013-12-15 23:39:43 +01:00
6447738c01
guix package: allow multiple arguments after -i, -r, and -u.
...
* guix/scripts/package.scm (%options): Adapt option processors to accept and
return a second seed value: 'arg-handler', which handles bare arguments (if
not false). The install, remove, and upgrade option processors return an
arg-handler that repeat the same operation. All other option processors
return #f as the arg-handler. Make the arguments to install and remove
optional. The upgrade option processor deletes (upgrade . #f) from the
alist before adding a new entry.
(guix-package): Procedures passed to 'args-fold*' accept the new seed value
'arg-handler'. The 'operand-proc' uses 'arg-handler' (if not false).
* doc/guix.texi (Invoking guix package): Update docs.
* tests/guix-package.sh: Add test.
2013-12-14 16:25:02 -05:00
52a79f1e73
pull: Compile guix/ files before gnu/ files.
...
* guix/scripts/pull.scm (unpack)[builder]: Build files under guix/
before files under gnu/.
2013-12-14 16:48:38 +01:00
ca6c4fa190
pull: Compile files in parallel.
...
* guix/scripts/pull.scm (unpack)[builder](compile-file*): Remove.
(call-with-process, p-for-each): New procedures. Use them to compile
files in parallel.
2013-12-14 16:32:42 +01:00
0c2e1dd45d
pull: Limit memory usage when compiling.
...
Reported by Arne Babenhauserheide <arne.babenhauserheide@kit.edu>.
* guix/scripts/pull.scm (unpack)[builder](compile-file*): Change to run
'compile-file' in a child process. This limits memory usage; before
that memory usage was proportional to the number of files to compile.
2013-12-14 16:32:42 +01:00
5c0f184536
store: Optimize 'store-path-package-name' and 'store-path-hash-part'.
...
* guix/store.scm (store-regexp*): New procedure.
(store-path-package-name, store-path-hash-part): Use it.
2013-12-11 00:19:27 +01:00
033adfe7e0
gnu: Add (gnu system).
...
* gnu/system/vm.scm (lower-inputs): Move to monads.scm.
(qemu-image): Don't add GRUB-CONFIGURATION to the INPUTS-TO-COPY.
(union, file-union, etc-directory): Move to gnu/system.scm.
(%demo-operating-system): New variable.
(system-qemu-image): Add 'os' parameter. Rewrite in terms of
'operating-system-derivation'.
* guix/monads.scm (lower-inputs): New procedure.
* gnu/system/grub.scm (grub-configuration-file): Change 'entries' to be
a plain list instead of a list of monadic values.
* gnu/system.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
2013-12-10 00:24:02 +01:00
593c3fe600
monads: Fix 'anym'.
...
* guix/monads.scm (anym): Fix successful case.
* tests/monads.scm ("anym"): New test.
2013-12-10 00:24:01 +01:00
9200c11009
build-system/perl: Honour phases argument in perl build system.
...
* guix/build-system/perl.scm (perl-build): Propagate phases argument to
builder.
2013-12-09 13:50:58 +01:00
14f550c31c
monads: Remove erroneous comment.
...
* guix/monads.scm (sequence): Remove erroneous comment.
2013-12-05 23:05:13 +01:00
f4badde3fa
build-system/gnu: Fix reference to Gettext in 'dist-package'.
...
* guix/build-system/gnu.scm (dist-package): Change 'gettext' to
'gnu-gettext'.
2013-12-04 21:43:55 +01:00
dd1a5a152c
derivations: Use more keyword parameters for 'build-expression->derivation'.
...
* guix/derivations.scm (build-expression->derivation): Turn 'system' and
'inputs' into keyword parameters.
Adjust callers accordingly.
* gnu/system/linux.scm, gnu/system/vm.scm, guix/build-system/cmake.scm,
guix/build-system/gnu.scm, guix/build-system/perl.scm,
guix/build-system/python.scm, guix/build-system/trivial.scm,
guix/download.scm, guix/packages.scm, guix/profiles.scm,
guix/scripts/pull.scm, tests/derivations.scm, tests/guix-build.sh,
tests/monads.scm, tests/store.scm, tests/union.scm: Adjust users of
'build-expression->derivation' and 'derivation-expression'
accordingly.
* doc/guix.texi (Derivations): Adjust 'build-expression->derivation'
documentation accordingly.
(The Store Monad): Likewise for 'derivation-expression'.
2013-12-04 16:07:53 +01:00
4d5f0bae3e
gnu-maintenance: Ignore "redirect" blurbs.
...
* guix/gnu-maintenance.scm (official-gnu-packages)[official-description]:
Return #f for blurbs that start with "redirect ".
2013-12-03 21:33:55 +01:00
977f03ffd3
build-system/cmake: Build out of source tree by default.
...
* guix/build-system/cmake.scm (cmake-build): Change 'out-of-source?' to
default to #t.
* guix/build/cmake-build-system.scm (configure): Add 'out-of-source?'
keyword parameter and honor it.
2013-11-28 00:15:07 +01:00
de6792699e
substitute-binary: Work around Guile 2.0.5's broken 'n-par-map'.
...
* guix/scripts/substitute-binary.scm (n-par-map*): New procedure.
(guix-substitute-binary): Use it instead of 'n-par-map'.
Reported by Nikita Karetnikov and Eric Bavier.
2013-11-26 22:20:39 +01:00
b874f305e5
guix package: Honor the current output when upgrading.
...
* guix/scripts/package.scm (specification->package+output): Pass OUTPUT
to 'package-specification->name+version+output'.
2013-11-24 15:30:06 +01:00
edae5b3d50
Merge branch 'master' into core-updates
...
Conflicts:
guix/packages.scm
2013-11-20 23:51:26 +01:00
5dfd5b82c2
build-system/python: Add #:test-target parameter.
...
* guix/build-system/python.scm (python-build): Add #:test-target
parameter. Reported by Eric Bavier <ericbavier@gmail.com>.
2013-11-20 19:03:26 +01:00
0b8749b7bd
packages: 'package-field-location' returns a relative file name.
...
* guix/packages.scm (package-field-location): Set
%FILE-PORT-NAME-CANONICALIZATION.
* tests/packages.scm ("package-field-location, relative file name"): New
test.
2013-11-18 23:56:07 +01:00
ac5de156ae
guix build: '-e' can be passed a monadic thunk.
...
* guix/ui.scm (read/eval): New procedure.
(read/eval-package-expression): Use it.
* guix/scripts/build.scm (derivations-from-package-expressions): Rename to...
(derivation-from-expression): ... this. Accept procedures, under the
assumption that they are monadic thunk.
(show-help): Adjust accordingly.
(guix-build): Ditto.
* tests/guix-build.sh: Add test.
* doc/guix.texi (Invoking guix build): Augment description of '-e'.
2013-11-18 23:08:20 +01:00
Ludovic Courtès