6be960c7f7
Merge branch 'xorg' into core-updates
2013-04-04 18:49:28 +02:00
a18eda2747
packages: Add `native-search-paths' field and honor it.
...
* guix/packages.scm (<search-path-specification>): New record type.
(search-path-specification->sexp): New procedure.
(<package>)[native-search-paths]: New field.
(package-derivation): Accumulate the search paths, and pass them
as #:search-paths toe BUILDER.
* guix/build-system/gnu.scm (gnu-build): Add #:search-paths. Compute
`implicit-search-paths'. Pass #:search-paths in BUILDER.
* guix/build-system/perl.scm (perl-build): Add #:search-paths, pass it
to BUILDER with the search paths of PERL.
* guix/build-system/cmake.scm (cmake-build): Add #:search-paths, pass it
to BUILDER.
* guix/build-system/trivial.scm (trivial-build): Add #:search-paths,
ignore it.
* guix/build/gnu-build-system.scm (set-paths): Add #:search-paths.
Remove explicit settings of CPATH, LIBRARY_PATH, and PKG_CONFIG_PATH.
Instead, walk SEARCH-PATHS and call `set-path-environment-variable'
for them.
* guix/build/perl-build-system.scm (perl-build): Remove PERL5LIB setting.
* tests/packages.scm ("search paths"): New test.
* gnu/packages/bootstrap.scm (%bootstrap-guile)[raw]: Add
#:search-paths.
(%bootstrap-gcc): Add `native-search-paths' field.
* gnu/packages/perl.scm (perl): Likewise.
* gnu/packages/pkg-config.scm (pkg-config): Likewise.
* gnu/packages/glib.scm (intltool): Remove `arguments'.
* gnu/packages/avahi.scm (avahi): Remove #:phases.
2013-03-30 22:57:03 +01:00
a96748bb46
build-system/gnu: Remove #:path-exclusions parameter.
...
* guix/build/gnu-build-system.scm (set-paths): Remove `path-exclusions'
parameter. Replace `relevant-input-directories' by
`input-directories'.
* guix/build-system/gnu.scm (gnu-build): Remove `path-exclusions'
parameter; don't pass it in BUILDER.
* guix/build-system/cmake.scm (cmake-build): Likewise.
2013-03-30 21:46:59 +01:00
4928e50033
Merge branch 'master' into core-updates
...
Conflicts:
Makefile.am
gnu/packages/base.scm
2013-03-29 21:44:31 +01:00
3f5a932eea
snix: Adjust import to current Nixpkgs input attribute names.
...
* guix/snix.scm (snix-derivation->guix-package): Use the new names
`nativeBuildInputs' and `propagatedNativeBuildInputs'.
2013-03-29 00:16:58 +01:00
f9bbf2a819
gnu-maintenance: Improve 'official-gnu-packages'; add related procedures.
...
* guix/gnu-maintenance.scm (http-fetch): Return an input port.
(<gnu-package-descriptor>): Add it.
(official-gnu-packages): Use <gnu-package-descriptor>.
(find-packages): Add it.
(gnu-package?): Adjust accordingly.
2013-03-28 22:00:10 +00:00
c6bded8a29
Add (guix build-system cmake).
...
* guix/build/cmake-build-system.scm, guix/build-system/cmake.scm: New files.
* Makefile.am (MODULES): Add them.
2013-03-28 21:04:54 +01:00
c9f94132ca
download: Remove unreliable GNU mirror.
...
* guix/download.scm (%mirrors)[gnu]: Remove ftp.chg.ru.
2013-03-27 15:50:18 +01:00
128663e4c8
store: Really disable file name canonicalization for derivation inputs.
...
* guix/store.scm (write-contents)[call-with-binary-input-file]: Set
%FILE-PORT-NAME-CANONICALIZATION to #f.
* gnu/packages.scm (search-patch, search-bootstrap-binary): Leave
%FILE-PORT-NAME-CANONICALIZATION unchanged. This reverts 9776ebb
2013-03-22 23:15:34 +01:00
238f739777
store: Use `sendfile' when available.
...
* guix/store.scm (write-contents)[call-with-binary-input-file]: New
procedure.
Use `sendfile' instead of `dump' when available. Add `size'
parameter.
(write-file): Update caller.
2013-03-22 23:15:34 +01:00
a4f08f9258
guix package: Report packages to be removed/installed.
...
* guix/scripts/package.scm (guix-package)[process-actions](show-what-to-remove/install):
New procedure.
Call it before `show-what-to-build'.
2013-03-18 23:04:07 +01:00
0bb1aa9e05
derivations: Optimize `build-expression->derivation'.
...
This reduces the execution time of
"guix build -e '(@ (gnu packages emacs) emacs)' -d" by 6%, from
1.15s to 1.08s.
* guix/derivations.scm (build-expression->derivation): Write the builder
as UTF-8.
2013-03-16 17:23:17 +01:00
d80855999a
derivations: Optimize `write-derivation'.
...
This reduces the execution time of
"guix build -e '(@ (gnu packages emacs) emacs)' -d" by 25%, from
1.54 s. to 1.15s.
* guix/derivations.scm (write-sequence, write-list, write-tuple): New
procedures.
(write-derivation)[list->string, write-list]: Remove.
[write-string-list, write-output, write-input, write-env-var]: New helpers.
Rewrite in terms of these new helpers.
2013-03-16 16:48:22 +01:00
993fb66dd2
guix package: Gracefully handle `official-gnu-packages' failure.
...
* guix/gnu-maintenance.scm (http-fetch): Error out when DATA is #f.
* guix/scripts/package.scm (check-package-freshness): Wrap
`gnu-package?' call in `false-if-exception'.
Reported by Cyril Roelandt <tipecaml@gmail.com>.
2013-03-16 00:59:19 +01:00
ef86c39f27
ui: Gracefully report failures to connect to the daemon.
...
* guix/store.scm (&nix-connection-error): New condition type.
(open-connection): Translate `system-error' during the `connect' call
into `&nix-connection-error'.
* guix/ui.scm (call-with-error-handling): Add case for `nix-connection-error?'.
* guix/scripts/package.scm (guix-package): Move `open-connection' call
within `with-error-handling'.
* guix/scripts/pull.scm (guix-pull): Likewise.
* guix/scripts/download.scm (guix-download): Move body within
`with-error-handling'.
2013-03-07 19:44:14 +01:00
30db6af1de
utils: Add 'wrap-program'.
...
* guix/build/utils.scm (wrap-program): New procedure.
2013-03-07 00:46:23 +01:00
1fb78cb2c3
packages: Remove the default value for `license'.
...
* guix/packages.scm (<package>): Remove the default value for `license'.
* gnu/packages/bootstrap.scm (package-from-tarball,
%bootstrap-glibc, %bootstrap-gcc): Initialize `license'.
* tests/packages.scm (dummy-package): Likewise.
2013-03-07 00:42:18 +01:00
6ba9dd813d
Revert "utils: Add 'wrap-program'."
...
This reverts commit 02065130de
2013-03-07 00:36:14 +01:00
02065130de
utils: Add 'wrap-program'.
...
* guix/build/utils.scm (wrap-program): New procedure.
2013-03-06 21:03:26 +00:00
bbd60260dd
licenses: Add 'x11-style'.
...
* guix/licenses.scm (x11-style): New variable.
2013-03-06 20:40:11 +00:00
0820a58b3c
gnu: xorg: Fix http mirror and uncomment xcb packages.
...
* guix/download.scm (%mirrors): Fix main http mirror address.
* gnu/packages/xorg.scm (libpthread-stubs, libxcb, xcb-proto): Uncomment
and add licenses.
2013-03-06 13:28:01 +01:00
6a917ef7e6
gnu-maintenance: Clarify `releases'.
...
* guix/gnu-maintenance.scm (releases): Change to use `match' and
`match-lambda'. Add `release-file' auxiliary function.
2013-03-05 22:31:19 +01:00
296540a6db
gnu-maintenance: Fix `gnu-package?' for packages lacking a `source'.
...
* guix/gnu-maintenance.scm (gnu-package?): Support PACKAGE when its
source is #f.
2013-03-05 22:25:40 +01:00
19777ae6ea
guix package: Recover from freshness check transient errors.
...
* guix/scripts/package.scm (check-package-freshness): Ignore
`getaddrinfo-error' and `ftp-error' exceptions.
2013-03-05 22:24:19 +01:00
ef010c0f3d
guix package: Inform about new upstream versions of GNU packages.
...
* guix/gnu-maintenance.scm (gnu-package?): New procedure.
* guix/scripts/package.scm (waiting): New macro.
(check-package-freshness): New procedure.
(guix-package)[process-actions]: Use it.
* doc/guix.texi (Invoking guix package): Mention the feature.
2013-03-05 20:35:47 +01:00
71eb5c1067
gnu: Add intltool.
...
* guix/download.scm (%mirrors): Add `gnome' mirrors.
* gnu/packages/glib.scm (intltool): New variable.
2013-03-05 19:09:53 +01:00
12761f48ea
utils: Add a #:follow-symlinks? parameter to `copy-recursively'.
...
* guix/build/utils.scm (copy-recursively): Turn `log' into a keyword
parameter. Add the `follow-symlinks?' parameter and honor it.
2013-03-05 19:03:39 +01:00
e65df6a63a
utils: Add `delete-file-recursively'.
...
* guix/build/utils.scm (delete-file-recursively): New procedure.
2013-03-05 18:53:53 +01:00
81eec00cb2
Merge branch 'master' into core-updates
...
Conflicts:
Makefile.am
guix/scripts/gc.scm
guix/scripts/package.scm
guix/ui.scm
tests/guix-package.sh
2013-03-04 23:27:24 +01:00
8689a1908a
guix: build: Add "share/pkgconfig" to PKG_CONFIG_PATH, as used by xorg.
...
* guix/build/gnu-build-system.scm (set-paths): Add "share/pkgconfig"
to PKG_CONFIG_PATH.
2013-03-04 10:14:34 +01:00
08fd1ebefd
Add (guix build-system perl).
...
* guix/build-system/perl.scm, guix/build/perl-build-system.scm: New files.
* Makefile.am (MODULES): Add them.
* guix/build-system/gnu.scm (standard-inputs): Make public.
2013-03-04 00:48:00 +01:00
6af3101999
download: Add CPAN mirrors.
...
* guix/download.scm (%mirrors)[cpan]: New URLs.
2013-03-04 00:48:00 +01:00
eb0880e71d
ui: Factorize `read/eval-package-expression'.
...
* guix/scripts/package.scm (read/eval-package-expression): Move to...
* guix/ui.scm (read/eval-package-expression): ... here.
* guix/scripts/build.scm (derivations-from-package-expressions): Use it.
2013-03-01 21:55:42 +01:00
5d4b411f8a
guix package: Add `--install-from-expression'.
...
* guix/scripts/package.scm (read/eval-package-expression): New
procedure.
(show-help): Add `-e'.
(%options): Likewise.
(guix-package)[process-actions]: Handle ('install . p) pairs, where P
is a package.
* tests/guix-package.sh: Add `boot_make_drv'. Use `-i $boot_make_drv'
once, and then use `-e $boot_make'.
* doc/guix.texi (Invoking guix package): Document `-e'.
2013-03-01 21:54:56 +01:00
ba8b732d20
guix gc: Add `--references' and `--referrers'.
...
* guix/scripts/gc.scm (show-help): Update.
(%options): Add `--references' and `--referrers'.
(guix-gc)[symlink-target, store-directory]: New procedures.
Handle the `list-references' and `list-referrers' actions.
* tests/guix-gc.sh: Add tests for `--references'.
* doc/guix.texi (Invoking guix gc): Document `--references' and
`--referrers'.
2013-02-27 23:16:00 +01:00
fae31edcec
store: Add queries for references & co.
...
* guix/store.scm (operation-id)[query-valid-derivers]: New value.
(references, referrers, valid-derivers, query-derivation-outputs): New
procedures.
* tests/store.scm ("references", "derivers"): New tests.
2013-02-27 22:40:35 +01:00
da9bf2efc5
pull: Distinguish "already up to date" from "updated".
...
* guix/ui.scm (show-what-to-build): Return (length req*).
* guix/scripts/pull.scm (guix-pull): Print an "already up to date"
message when there's nothing to build.
2013-02-27 20:55:42 +01:00
a1c1467756
pull: Build (guix build download) first, because of the (gnutls) autoload.
...
* guix/scripts/pull.scm (unpack): Build (guix build download) first, as
done in 855a8ad71d
2013-02-27 20:55:42 +01:00
69ce1ffc7d
Add "guix pull".
...
* guix/scripts/pull.scm: New file.
* Makefile.am (MODULES): Add it.
* doc/guix.texi (Invoking guix pull): New node.
(Invoking guix package): Add cross-ref to it.
* guix/ui.scm (config-directory): New procedure.
* scripts/guix.in: When `GUIX_UNINSTALLED' is undefined, add
$XDG_CONFIG_HOME/guix/latest to the search path.
* po/POTFILES.in: Add guix/scripts/pull.scm.
2013-02-27 20:55:42 +01:00
7650e148f6
ui: Factorize `show-what-to-build'.
...
* guix/scripts/package.scm (guix-package)[show-what-to-build]: Move to..
* guix/ui.scm (show-what-to-build): ... here. Add a `store'
parameter'. Adjust callers.
* guix/scripts/build.scm (guix-build): Use it. Remove `req' and `req*'
variables.
2013-02-27 20:55:41 +01:00
bdeee95a21
ui: Add temporary file handling and atomic symlink switch.
...
* guix/scripts/download.scm (call-with-temporary-output-file): Move to
ui.scm.
* guix/scripts/package.scm (switch-symlinks): Likewise.
* guix/ui.scm (call-with-temporary-output-file, switch-symlinks): New
procedures.
2013-02-27 20:55:41 +01:00
cc68ccc5b0
download: Adjust to `http-get*' deprecation.
...
* guix/build/download.scm (http-fetch): Adjust to use #:streaming? when
using Guile 2.0.8+.
2013-02-27 20:55:41 +01:00
e95da44576
derivations: Add a search path parameter for module derivations.
...
* guix/derivations.scm (imported-modules, compiled-modules): Add a
`module-path' parameter. Use it instead of %LOAD-PATH.
2013-02-27 20:55:41 +01:00
05c0ac721e
store: Add the `%daemon-socket-file' parameter.
...
* guix/store.scm (%daemon-socket-file): New variable.
(open-connection): Use it as the default value for FILE.
2013-02-27 20:55:41 +01:00
dc3f1809cf
scripts: Remove hyphen in the command name shown by `--version'.
...
* guix/scripts/build.scm (%options): Remove hyphen from the name passed
to `show-version-and-exit'.
* guix/scripts/download.scm (%options): Likewise.
* guix/scripts/gc.scm (%options): Likewise.
* guix/scripts/import.scm (%options): Likewise.
* guix/scripts/package.scm (%options): Likewise.
2013-02-27 20:55:40 +01:00
c07512179e
scripts: Remove initialization now redundant with `initialize-guix'.
...
* guix/scripts/build.scm (guix-build): Remove calls to `install-locale',
`textdomain', etc., now redundant with `initialize-guix'.
* guix/scripts/download.scm (guix-download): Likewise.
* guix/scripts/import.scm (guix-import): Likewise.
* guix/scripts/package.scm (guix-package): Likewise.
* guix/ui.scm: Remove export of `install-locale' and `initialize-guix'.
(initialize-guix): Add docstring.
2013-02-27 20:55:40 +01:00
868c923f13
Replace individual scripts with master 'guix' script.
...
* scripts/guix.in: New script.
* Makefile.am (bin_SCRIPTS): Add 'scripts/guix'. Remove 'guix-build',
'guix-download', 'guix-import', 'guix-package', and 'guix-gc'.
(MODULES): Add 'guix/scripts/build.scm', 'guix/scripts/download.scm',
'guix/scripts/import.scm', 'guix/scripts/package.scm', and
'guix/scripts/gc.scm'.
* configure.ac (AC_CONFIG_FILES): Add 'scripts/guix'. Remove 'guix-build',
'guix-download', 'guix-import', 'guix-package', and 'guix-gc'.
* guix-build.in, guix-download.in, guix-gc.in, guix-import.in,
guix-package.in: Remove shell script boilerplate. Move to guix-COMMAND.in
to guix/scripts/COMMAND.scm. Rename module from (guix-COMMAND) to
(guix scripts COMMAND). Change "guix-COMMAND" to "guix COMMAND" in
usage help string.
* pre-inst-env.in: Add "@abs_top_builddir@/scripts" to the front of $PATH.
Export $GUIX_UNINSTALLED.
* tests/guix-build.sh, tests/guix-daemon.sh, tests/guix-download.sh,
tests/guix-gc.sh, tests/guix-package.sh: Use "guix COMMAND" instead of
"guix-COMMAND".
* doc/guix.texi: Replace all occurrences of "guix-COMMAND" with
"guix COMMAND".
* po/POTFILES.in: Update.
2013-02-27 20:55:40 +01:00
5f7c5a97ba
packages: Add `package-output'.
...
* guix/packages.scm (package-output): New procedure.
* tests/packages.scm ("package-output"): New test.
2013-02-27 20:55:39 +01:00
790b8e0ebe
build-system/gnu: Make the strip behavior of `static-package' configurable.
...
* guix/build-system/gnu.scm (static-package): Add #:strip-all? keyword
parameter.
2013-02-27 20:55:38 +01:00
6c7b6a51a4
Add version-compare and version>? to utils.scm.
...
* guix/utils.scm (version-compare, version>?): New exported procedures,
based on version-string>?, which was formerly in gnu-maintenance.scm.
* guix/gnu-maintenance.scm (version-string>?): Removed procedure.
(latest-release): Use 'version>?' instead of 'version-string>?'.
2013-02-27 20:55:38 +01:00
Andreas Enge