200a97e64f
Merge branch 'master' into core-updates
2014-01-25 17:07:21 +01:00
1909431c5b
derivations: Add #:local-build? parameter for derivations.
...
* guix/derivations.scm (derivation): Add #:local-build? parameter and
honor it.
(build-expression->derivation): Likewise.
* doc/guix.texi (Derivations): Update documentation of these
procedures.
2014-01-25 17:04:35 +01:00
9e55f04a4b
profiles: Remove misleading message.
...
Fixes <http://bugs.gnu.org/16484 >.
Reported by Andreas Enge <andreas@enge.fr>.
* guix/profiles.scm (profile-derivation)[builder]: Remove "building
profile '~a' with ~a packages" message.
2014-01-25 16:20:23 +01:00
49e6291a7a
Add 'guix offload' as a daemon build hook.
...
* 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.
2014-01-24 00:01:50 +01:00
50add47748
store: Add 'topologically-sorted'.
...
* guix/store.scm (topologically-sorted): New procedure.
* tests/store.scm ("topologically-sorted, one item",
"topologically-sorted, several items", "topologically-sorted, more
difficult"): New tests.
2014-01-24 00:01:50 +01:00
cd4027fa47
nar: Add 'restore-file-set', for use by build hooks.
...
* guix/nar.scm (&nar-invalid-hash-error, &nar-signature-error): New
condition types.
(&nar-error): Add 'file' and 'port' fields.
(&nar-read-error): Remove 'port' and 'file' fields.
(lock-store-file, unlock-store-file, finalize-store-file,
temporary-store-directory, restore-file-set): New procedures.
* tests/nar.scm (%seed): New variable.
(random-text): New procedure.
("restore-file-set (signed, valid)", "restore-file-set (missing
signature)", "restore-file-set (corrupt)"): New tests.
* po/Makevars (XGETTEXT_OPTIONS): Add '--keyword=message'.nar fixes
* po/POTFILES.in: Add guix/nar.scm.
2014-01-24 00:01:50 +01:00
ce4a482983
store: Add 'with-store' convenience macro.
...
* guix/store.scm (with-store): New macro.
2014-01-24 00:01:49 +01:00
045111e10c
hash: Add 'open-sha256-input-port', for Guile > 2.0.9.
...
* guix/hash.scm (open-sha256-input-port): New procedure.
* tests/hash.scm (supports-unbuffered-cbip?): New procedure.
("open-sha256-input-port, empty", "open-sha256-input-port, hello",
"open-sha256-input-port, hello, one two",
"open-sha256-input-port, hello, read from wrapped port"): New tests.
2014-01-24 00:01:49 +01:00
d28684b5a5
pki: Factorize signature manipulation procedures.
...
* guix/pki.scm (signature-subject, signature-signed-data,
valid-signature?): New procedures.
* guix/scripts/authenticate.scm (guix-authenticate): Adjust to use
them.
2014-01-24 00:01:49 +01:00
2cd5c0380e
utils: Add 'fcntl-flock'.
...
* guix/utils.scm (%struct-flock, F_SETLKW, F_xxLCK): New variables.
(fcntl-flock): New procedure.
* tests/utils.scm ("fcntl-flock"): New test.
2014-01-24 00:01:49 +01:00
6bfec3edf5
store: Add 'register-path' procedure.
...
* guix/store.scm (register-path): New procedure.
* tests/store.scm ("register-path"): New test.
* guix/config.scm.in (%guix-register-program): New variable.
* configure.ac: Compute and substitute 'guix_sbindir'. Compute
'guix_prefix'.
* pre-inst-env.in: Define 'GUIX_REGISTER'.
2014-01-24 00:01:49 +01:00
5674a3fdb6
store: Add comments for the %stderr constants.
...
* guix/store.scm (process-stderr): Add comments for the various
constants, to help when stracing.
2014-01-24 00:01:49 +01:00
59f734f351
ui: Filter out internal commands from '--help'.
...
* guix/ui.scm (show-guix-help)[internal?]: New procedure.
Use it to filter out internal commands reported by '--help'.
2014-01-24 00:01:49 +01:00
66ea671393
licenses: Add GNU FDL 1.3+.
...
* guix/licenses.scm (fdl1.3+): New variable.
2014-01-22 00:20:40 +01:00
d43eb499a6
Update 'nix-upstream' sub-module; adjust build system, doc, and substituter.
...
* nix-upstream: Update sub-module.
* daemon.am (libutil_a_SOURCES): Add affinity.cc.
(libutil_headers): Add affinity.hh.
(libexec_PROGRAMS, nix_setuid_helper_SOURCES,
nix_setuid_helper_CPPFLAGS, nix_setuid_helper_LDADD): Remove.
* doc/guix.texi (Setting Up the Daemon): Remove paragraph about
'nix-setuid-helper'.
* guix/scripts/substitute-binary.scm (guix-substitute-binary): Exit 0 when
%CACHE-URL has an HTTP scheme and looking up its host fails.
Always print a newline to stdout when starting.
2014-01-18 22:32:50 +01:00
b97c95eb3c
linux-initrd: Make /dev/{null,zero} world-writable.
...
Reported by zerwas on #guix.
* guix/build/linux-initrd.scm (make-essential-device-nodes): Make
/dev/null and /dev/zero world-writable.
2014-01-18 22:32:50 +01:00
c5e0eb2884
ui: Update copyright year in '--version' output.
...
* guix/ui.scm (show-version-and-exit): Increment copyright year.
2014-01-17 22:49:42 +01:00
eb9a9feefd
guix package: Gracefully handle EPIPE on '--search'.
...
* guix/scripts/package.scm (guix-package): Wrap body of 'search' in
'leave-on-EPIPE'.
2014-01-13 18:51:07 +01:00
8fa3e6b338
ui: Don't use hyphens in 'package->recutils' output.
...
* guix/ui.scm (package->recutils): Rename recutils field from
'home-page' to 'homepage'.
2014-01-13 18:49:26 +01:00
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
Ludovic Courtès