futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,194 Commits 3 Branches 0 Tags 412 MiB
7949c140b1
Commit Graph

168 Commits

Author SHA1 Message Date
Ludovic Courtès
7949c140b1
ui: 'load*' no longer fails on Guile 2.2.3 upon EACCES or similar. 
Previously, if ~/.cache was not write-accessible, 'guix' would exit with
code 1 without printing any message.  That was because the 'make-stack'
call would fail since the exception (a 'system-error) came from
'compile-file', which was called at a point where TAG wasn't installed
yet.  Secondly, to mimick auto-compilation behavior, we just swallow
'system-error raised by 'compile-file'.

Reported by Clément Lassieur.

* guix/ui.scm (load*): Move 'compile-file' call in the dynamic extent of
TAG.  Catch 'system-error around it and ignore it.
 2018-03-06 10:50:39 +01:00
Ludovic Courtès
f44c7aaccd
ui: Better workaround for lack of '%fresh-auto-compile' on 2.2.3. 
Fixes <https://bugs.gnu.org/29226> for the most part.

* guix/ui.scm (load*): Add call to 'compile-file' on 2.2.3.
 2018-03-05 10:54:45 +01:00
Ludovic Courtès
92423868bc
ui: Disable '%fresh-auto-compile' only for Guile 2.2.3. 
Mitigates <https://bugs.gnu.org/29881>.
Reported by Diego Nicola Barbato <dnbarbato@posteo.de>.

* guix/ui.scm (load*): Unset '%fresh-auto-compile' only on Guile 2.2.3.
 2018-01-15 23:29:33 +01:00
Ludovic Courtès
4a8d536ffe
ui: Display hints that come along with '&message' conditions. 
* guix/ui.scm (call-with-error-handling): Add case for message and
fix-hint?.
 2018-01-07 23:46:39 +01:00
Ludovic Courtès
92f36323c4
ui: It's 2018 now! 
* guix/ui.scm (show-version-and-exit): Change year to 2018.
 2018-01-01 18:22:28 +01:00
Ludovic Courtès
399993f804
ui: Non-zero exit for compound '&message' and '&error-location' conditions. 
* guix/ui.scm (call-with-error-handling): When both 'message?' and
'error-location?' are true, add call to 'exit'.
 2017-12-18 17:52:58 +01:00
Ludovic Courtès
3b80b81358
ui: Display hints to resolve profile collisions. 
Fixes <https://bugs.gnu.org/29255>.
Reported by Ben Sturmfels <ben@sturm.com.au>.

* guix/ui.scm (display-collision-resolution-hint): New procedure.
(call-with-error-handling): Call it upon '&profile-collistion-error'.
 2017-12-10 23:44:58 +01:00
Ludovic Courtès
3fb6464ba4
ui: Tweak conflicting profile entry error message. 
* guix/ui.scm (call-with-error-handling): Use 'manifest-entry-output*'
when reporting conflicting profile entries.
 2017-12-03 23:18:53 +01:00
Ludovic Courtès
e2721a05e7
Do not set '%fresh-auto-compile'. 
* guix/scripts/offload.scm (build-machines): Comment out
'(set! %fresh-auto-compile #t)' since with Guile 2.2.3 it could lead to
an actual rebuild of everything that gets loaded from there on.  See
<https://bugs.gnu.org/29226>.
* guix/ui.scm (load*): Likewise.
 2017-12-01 18:47:34 +01:00
Ludovic Courtès
e42f026eb5
ui: Present 'use-modules' hints with a question mark. 
Suggested by myglc2 <myglc2@gmail.com>.

* guix/ui.scm (report-load-error): Write "Did you forget" rather than
"Try adding."
 2017-11-30 18:14:56 +01:00
Ludovic Courtès
0d2ecf8b50
ui: Avoid "pkg:out" syntax when reporting collisions. 
* guix/ui.scm (call-with-error-handling)[manifest-entry-output*]: New
procedure.  Use it when reporting collisions.
 2017-11-28 10:18:40 +01:00
Ludovic Courtès
b5bfa4773d
ui: 'known-variable-definition' protects against module cycles. 
Fixes <https://bugs.gnu.org/29358>.
Reported by Marius Bakke <mbakke@fastmail.com>.

* guix/ui.scm (known-variable-definition): Add 'visited' set to guard
against cycles on 2.0.
 2017-11-24 18:16:43 +01:00
Ludovic Courtès
304a53f67a
ui: Add source file name to the package search metrics. 
* guix/ui.scm (%package-metrics): Include 'package-location'.  Increase
score of the other fields.
 2017-11-16 08:45:15 +01:00
Ludovic Courtès
dc856223f5
ui: Add an 'unbound-variable' exception printer. 
* guix/ui.scm (print-unbound-variable-error): New variable.
Use it as the 'unbound-variable' printer.
 2017-11-09 23:54:47 +01:00
Ludovic Courtès
a2985bb101
ui: Provide hints for unbound-variable errors. 
* guix/ui.scm (known-variable-definition): New procedure.
(report-load-error): Handle 'unbound-variable'.
 2017-11-09 23:54:47 +01:00
Ludovic Courtès
935542fbde
ui: Add 'display-hint'. 
* guix/ui.scm (known-variable-definition): New procedure.
(report-load-error): Use it.
 2017-11-09 23:54:47 +01:00
Ludovic Courtès
23735137eb
ui: Define and honor '&error-location' and '&fix-hint' conditions. 
* guix/utils.scm (&error-location, &fix-hint): New condition types.
* guix/ui.scm (report-load-error): Handle them.
(call-with-error-handling): Honor '&error-location'.
 2017-11-08 22:31:58 +01:00
Ludovic Courtès
37eed374d9
ui: Introduce (guix i18n). 
* guix/ui.scm (G_, N_, _P, %gettext-domain, %package-text-domain): Move
to...
* guix/i18n.scm: ... here.  New file.
 2017-11-08 22:31:58 +01:00
Ludovic Courtès
a6e22d8445
ui: Improve reporting of missing closing parentheses. 
Suggested by Ricardo Wurmus.
Works around <https://bugs.gnu.org/28295>.

* guix/ui.scm (report-load-error): Add case for 'read-error'.
* tests/guix-system.sh: Test missing-closing-paren errors.
 2017-10-10 23:12:03 +02:00
Ludovic Courtès
0649321d91
guix system: Add 'search' command. 
* guix/scripts/system.scm (resolve-subcommand): New procedure.
(process-command): Handle 'search'.
(guix-system): Likewise.
(show-help): Augment.
* guix/scripts/system/search.scm: New file.
* po/guix/POTFILES.in: Add it.
* Makefile.am (MODULES): Add it.
* guix/ui.scm (%text-width): Export.
* doc/guix.texi (Invoking guix system): Document it.
(Service Types and Services): Mention 'guix system search'.
* tests/guix-system.sh: Test it.
 2017-09-16 17:47:46 +02:00
Ludovic Courtès
c7ae219e39
ui: Generalize relevance computation. 
* guix/ui.scm (relevance, package-relevance): New procedures.
(%package-metrics): New variable.
* guix/scripts/package.scm (find-packages-by-description)[score]
[package-score]: Remove.  Use 'package-relevance' instead.
 2017-09-16 17:47:45 +02:00
Ludovic Courtès
f0e492f0a5
utils: Factorize XDG directory handling. 
* guix/ui.scm (config-directory): Remove.
* guix/utils.scm (xdg-directory, config-directory): New procedures.
(cache-directory): Rewrite in terms of 'xdg-directory'.
* guix/scripts/substitute.scm (%narinfo-cache-directory): Pass #:ensure?
 #f to 'cache-directory'.
 2017-07-28 18:09:43 +02:00
宋文武
dbde386ee3
ui: package->recutlis: Remove duplicated package names in dependencies. 
* guix/ui.scm (package->recutils): Add call to 'delete-duplicates' in
'dependencies->recutils'.
 2017-07-02 13:14:16 +08:00
Ludovic Courtès
a654dc4bcf
profiles: Catch and report collisions in the profile. 
* guix/profiles.scm (&profile-collision-error): New error condition.
(manifest-transitive-entries, manifest-entry-lookup, lower-manifest-entry)
(check-for-collisions): New procedures.
(profile-derivation): Add call to 'check-for-collisions'.
* guix/ui.scm (call-with-error-handling): Handle '&profile-collision-error'.
* tests/profiles.scm ("collision", "collision of propagated inputs")
("no collision"): New tests.
 2017-06-21 11:05:53 +02:00
Ludovic Courtès
f4453df9a5
store: Add an RPC counter. 
* guix/store.scm (%rpc-calls): New variable.
(show-rpc-profile, record-operation): New procedures.
(operation): Add call to 'record-operation'.
* guix/ui.scm (run-guix-command): Wrap COMMAND-MAIN in 'dynamic-wind'.
Run EXIT-HOOK.
 2017-06-16 17:08:22 +02:00
Ludovic Courtès
cbee955901
ui: Remove the empty string from '%load-extensions'. 
* guix/ui.scm (run-guix): Set %LOAD-EXTENSIONS.
 2017-06-15 23:07:47 +02:00
Ludovic Courtès
4ee79f22f5
ui: 'package->recutils' takes #:extra-fields. 
* guix/ui.scm (package->recutils): Add #:extra-fields and honor it.
 2017-06-13 23:22:19 +02:00
Ludovic Courtès
dcfc6f213b
ui: 'show-what-to-build' warns when we don't have enough disk space. 
* guix/ui.scm (check-available-space): New procedure.
(show-what-to-build): Compute 'installed-size' and call
'check-available-space'.
 2017-06-02 18:47:07 +02:00
Ludovic Courtès
d9bad2f082
ui: 'show-what-to-build' displays how much will be downloaded. 
* guix/ui.scm (show-what-to-build)[download-size]
[display-download-size?]: New variables.
Add cases for when DISPLAY-DOWNLOAD-SIZE? is true.
 2017-06-02 18:47:06 +02:00
Ludovic Courtès
2dc98729af
derivations: 'derivation-prerequisites-to-build' returns <substitutable>. 
* guix/derivations.scm (derivation-prerequisites-to-build): Rename
 #:substitutable? to #:substitutable-info.
[derivation-substitutable?]: Rename to...
[derivation-substitutable-info]: ... this.  Return a list of <substitutable>.
Second return value is now a list of <substitutable> instead of a list
of strings.
* guix/ui.scm (show-what-to-build)[substitutable?]: Rename to...
[substitutable-info]: ... this.
Adjust to new 'derivation-prerequisites-to-build' return value type.
* tests/derivations.scm ("derivation-prerequisites-to-build and
substitutes"): Adjust.
("derivation-prerequisites-to-build and substitutes, local build"):
Likewise.
 2017-06-02 18:47:06 +02:00
Ludovic Courtès
ce92d269fe
ui: Disable Guile deprecation warnings by default. 
* guix/ui.scm (initialize-guix): Call (debug-disable 'warn-deprecated)
when "GUILE_WARN_DEPRECATED" is not set.
 2017-05-16 14:31:37 +02:00
Ludovic Courtès
e06ca952ed
scripts: Do not create the config directory. 
This fixes runs of 'guix package' and 'guix system' tests in
environments where $HOME is read-only.

* guix/ui.scm (config-directory): Add #:ensure? parameter and honor it.
* guix/scripts.scm (warn-about-old-distro): Pass #:ensure? #f to
'config-directory'.
 2017-05-13 00:03:46 +02:00
Ludovic Courtès
30d2397f73
ui: 'string->duration' correctly handles hours. 
* guix/ui.scm (string->duration): Add missing '=>' for hours.
* tests/ui.scm ("duration, 2 hours"): New test.
 2017-05-10 22:05:21 +02:00
Ludovic Courtès
69daee23af
ui: Rename '_' to 'G_'. 
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance.  See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.

* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'.  Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
 2017-05-03 16:16:17 +02:00
Ludovic Courtès
f816dba680
ui: Gracefully report '&message' conditions. 
* guix/ui.scm (report-load-error, warn-about-load-error)
(read/eval): Add special-case for SRFI-35 &message conditions.
 2017-04-16 00:48:07 +02:00
Ludovic Courtès
3e43166ffc
gexp: 'lower-object' raises an exception when passed an invalid object. 
* guix/gexp.scm (&gexp-error, &gexp-input-error): New error conditions.
(lower-object): Raise &gexp-input-error when 'lookup-compiler' returns #f.
* tests/gexp.scm ("lower-object & gexp-input-error?"): New test.
* guix/ui.scm (call-with-error-handling): Add case for 'gexp-input-error?'.
 2017-04-04 00:10:00 +02:00
Alex Kost
689db38e34
ui: Support Texinfo markup in package synopses. 
* guix/ui.scm (package-field-string): New procedure.
(package-description-string): Use it.
(package-synopsis-string): New procedure.
(package->recutils): Use it.
* guix/scripts/lint.scm (check-synopsis-style)[check-texinfo-markup]:
New procedure.  Use it in checks.
* tests/lint.scm: Test it.
* gnu/packages/perl.scm (perl-try-tiny)[synopsis]: Adjust for the
Texinfo markup.
 2017-03-27 10:55:16 +03:00
Ludovic Courtès
1062063a65
ui: Don't use '%default-port-encoding' to set the encoding of string ports. 
* guix/ui.scm (right-arrow): Call 'set-port-encoding!' to set PORT's
encoding; remove use of 'with-fluids'.  This is for compatibility with
Guile 2.2 where the encoding of string ports is not influenced by
%DEFAULT-PORT-ENCODING.
* tests/ui.scm ("show-manifest-transaction"): Likewise.
 2017-03-08 23:42:53 +01:00
Ludovic Courtès
30906825cb
ui: Avoid '_' as a pattern variable in 'match'. 
* guix/ui.scm (fill-paragraph): Don't use '_' as a pattern variable
since that is shadowed by the top-level '_' binding on Guile 2.2.
(show-manifest-transaction): Likewise.
 2017-03-08 23:42:53 +01:00
Ludovic Courtès
6d30b1b2ca
ui: Wrap 'canonicalize-path' for better error reporting. 
Reported by Christopher Baines.

* guix/ui.scm (canonicalize-path): New procedure.
 2017-01-13 18:24:19 +01:00
Ludovic Courtès
e7ff05438f
ui: Factorize error-reporting wrapper code. 
* guix/ui.scm (augmented-system-error-handler): New procedure.
(error-reporting-wrapper): New macro.
(symlink, copy-file): Define using 'error-reporting-wrapper'.
 2017-01-13 18:24:19 +01:00
Ludovic Courtès
d925cdc35f
ui: Keep the word "Copyright" untranslated. 
Suggested by John Darrington <john@darrington.wattle.id.au>.

* guix/ui.scm (show-version-and-exit): Make "Copyright (C) 2017"
untranslatable, except "(C)" itself, like Gnulib's version-etc does.
 2017-01-02 23:14:36 +01:00
Ludovic Courtès
74d862e8a2
ui: It's 2017 now! 
* guix/ui.scm (show-version-and-exit): Change year to 2017.
 2017-01-01 23:38:52 +01:00
Roel Janssen
88bdbb2a0f
guix package: Display newline after generation diffs. 
* guix/ui.scm (display-profile-content-diff): Display an extra newline.
 2016-11-17 23:49:29 +01:00
Ludovic Courtès
94d92c7796
daemon: Add "builtin:download" derivation builder. 
This ensures that 1) the derivation doesn't change when Guix changes;
2) the derivation closure doesn't contain Guix and its dependencies; 3)
we don't have to rely on ugly chroot hacks.

Adapted from Nix commit 0a2bee307b20411f5b0dda0c662b1f9bb9e0e131.

* nix/libstore/build.cc (DerivationGoal::runChild): Add special case for
'isBuiltin(drv)'.  Disable chroot when 'isBuiltin(drv)'.
* nix/libstore/builtins.cc, nix/libstore/builtins.hh,
nix/scripts/download.in, guix/scripts/perform-download.scm: New files.
* guix/ui.scm (show-guix-help)[internal?]: Add 'perform-download'.
* nix/local.mk (libstore_a_SOURCES): Add builtins.cc.
(libstore_headers): Add builtins.hh.
(nodist_pkglibexec_SCRIPTS): Add 'scripts/download'.
* config-daemon.ac: Emit 'scripts/download'.
* Makefile.am (MODULES): Add 'guix/scripts/perform-download.scm'.
* tests/derivations.scm ("unknown built-in builder")
("'download' built-in builder")
("'download' built-in builder, invalid hash")
("'download' built-in builder, not found")
("'download' built-in builder, not fixed-output"): New tests.

Co-authored-by: Eelco Dolstra <eelco.dolstra@logicblox.com>
 2016-11-16 18:19:47 +01:00
Roel Janssen
e95ae7c223
guix package: Display generation diffs. 
* guix/ui.scm (display-profile-content-diff): New variable.
* guix/scripts/package.scm (process-query): Use display-profile-content-diff.

In collaboration with Benz Schenk.
 2016-10-26 14:53:29 +02:00
Ludovic Courtès
e465d9e190
ui: Do not shadow '_' where it's used as a literal syntax match. 
Fixes compilation with Guile 2.1.
Reported by Mu Lei.

* guix/ui.scm (report-load-error)
(warn-about-load-error, read/eval-package-expression): Use 'rest'
instead of '_' as the pattern variable name.
* gnu/packages.scm (%find-package): Likewise.
* guix/scripts/build.scm (transform-package-inputs): Likewise.
* guix/scripts/hash.scm (guix-hash): Likewise.
* guix/scripts/import/gnu.scm (%options, guix-import-gnu): Likewise.
* guix/scripts/import/nix.scm (guix-import-nix): Likewise.
* guix/scripts/offload.scm (build-machines): Likewise.
* guix/scripts/refresh.scm (%options): Likewise.
* guix/scripts/substitute.scm (narinfo-signature->canonical-sexp):
Likewise.
 2016-09-20 23:22:42 +09:00
Ludovic Courtès
14d5ca2e2e
ui: Initialize %FILE-PORT-NAME-CANONICALIZATION to #f. 
This avoids loads of needless 'stat' calls due to the default 'relative
setting and the 'canonicalize-path' calls it leads to.  This was
especially visible when 'guix substitute' access files in
/var/guix/substitute/cache.

* guix/ui.scm (run-guix-command): Set %FILE-PORT-NAME-CANONICALIZATION
to #f.
 2016-09-05 00:06:47 +02:00
Ludovic Courtès
d77a0bd6f1
ui: Remove dependency on (gnu system file-systems). 
* guix/ui.scm (specification->file-system-mapping): Move to...
* gnu/system/file-systems.scm (specification->file-system-mapping):
... here.
 2016-08-04 19:38:33 +02:00
Ludovic Courtès
638c5b7939
ui: 'string->duration' supports hours and seconds. 
* guix/ui.scm (string->duration): Add seconds and hours.
* tests/ui.scm ("duration, 1 second"): New test.
 2016-06-09 23:34:56 +02:00