30db6af1de
utils: Add 'wrap-program'.
...
* guix/build/utils.scm (wrap-program): New procedure.
2013-03-07 00:46:23 +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
ca8def6e6f
Patch-shebang: Do not add space after interpreter without argument.
...
* guix/build/utils.scm (patch-shebang): Do not add a space after a command
interpreter not followed by an argument; this made two tests of
coreutils fail.
2013-02-23 23:27:46 +01:00
11996d85d3
Patch-shebang: Handle "#!/usr/bin/env command"
...
* guix/build/utils.scm (patch-shebang): Handle replacement of
"#!.*/env CMD ARGS" by "#!/nix/store/path/.../to/CMD ARGS".
2013-02-23 20:32:03 +01:00
149acc2981
download: Add X.org mirrors.
...
* guix/download.scm (%mirrors): Add `xorg'.
2013-02-23 19:01:19 +01:00
4d60610ad7
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-22 21:08:06 +01:00
7b50c68455
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-22 20:01:29 +01:00
f651b477b7
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-20 23:47:16 +01:00
9bb2b96aab
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-20 23:46:57 +01:00
c61b026e3a
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-20 23:03:24 +01:00
80736cdf20
download: Adjust to `http-get*' deprecation.
...
* guix/build/download.scm (http-fetch): Adjust to use #:streaming? when
using Guile 2.0.8+.
2013-02-20 22:59:35 +01:00
8dcb0c55ab
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-20 21:08:09 +01:00
9fd72fb1ff
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-18 21:53:59 +01:00
fdca1c079b
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-17 22:19:32 +01:00
633f045f62
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-17 15:38:02 +01:00
e49951eb3e
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-16 22:17:37 -05:00
d510ab4614
packages: Add `package-output'.
...
* guix/packages.scm (package-output): New procedure.
* tests/packages.scm ("package-output"): New test.
2013-02-16 01:37:26 +01:00
9011e97f8d
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-14 01:12:24 +01:00
0d1e6ce4d2
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-12 20:34:25 -05:00
b1426f1785
gnu: Add tmux. licenses: add ISC.
...
* gnu/packages/tmux.scm: New file.
* Makefile.am (MODULES): Use it.
* guix/licenses.scm: add ISC.
2013-02-11 22:23:29 +01:00
cab249615d
Re-export `%current-system' from (guix packages).
...
* guix/packages.scm: Re-export `%current-system'.
* gnu/packages/bdw-gc.scm, gnu/packages/gawk.scm,
gnu/packages/gperf.scm, gnu/packages/libffi.scm,
gnu/packages/libsigsegv.scm, gnu/packages/libunistring.scm,
gnu/packages/lout.scm, gnu/packages/m4.scm,
gnu/packages/multiprecision.scm, gnu/packages/ncurses.scm,
gnu/packages/perl.scm, gnu/packages/pkg-config.scm,
gnu/packages/readline.scm, gnu/packages/recutils.scm,
gnu/packages/scheme.scm: Remove (guix utils) import.
2013-02-10 17:23:48 +01:00
a38f0ab0b9
build-system/gnu: Clarify docstring of `package-with-extra-configure-variable'.
...
* guix/build-system/gnu.scm (package-with-extra-configure-variable): Add
"recursively" in the docstring.
2013-02-08 18:03:36 +01:00
1be77eac08
union: Don't warn when colliding leaves point to the same file.
...
* guix/build/union.scm (union-build)[resolve-collision]: Pass LEAVES
through `delete-duplicates'; warn iff the result contains more than
one item.
2013-02-06 23:04:10 +01:00
6211223021
union: Delete duplicates when passed the same input several times.
...
* guix/build/union.scm (union-build): Prepend "." to the result of
`union-tree', to match the expectations of `delete-duplicate-leaves'.
Don't do mkdir when SUBDIR is ".".
* tests/union.scm ("union-build"): Keep duplicates in %BOOTSTRAP-INPUTS.
2013-02-06 23:04:10 +01:00
6d36a6f3b0
licenses: Add new meta-license fsf-free.
...
* guix/licenses.scm (fsf-free): New record with constructor.
2013-02-05 23:56:42 +01:00
0f3d2504f7
store: Add substitute-related procedures.
...
* guix/store.scm (has-substitutes?, substitutable-paths,
read-substitutable-path-list, substitutable-path-info): New
procedures.
(<substitutable>): New record type.
(read-arg): Add `substitutable-path-info'. Change `hash' pattern
variable to `base16' literal.
* tests/store.scm ("no substitutes"): New test.
2013-02-04 08:58:48 +01:00
63193ebfdc
store: Update to protocol 1.12.
...
* guix/store.scm (%protocol-version): Bump.
(operation-id): Comment out `query-substitutable-path-info'.
Rename `query-valid-paths' to `query-all-valid-paths'. Add
`query-path-from-hash-part', `query-substitutable-path-infos',
`query-valid-paths', and `query-substitutable-paths'.
(set-build-options): Add `binary-caches' keyword parameter. When
using a server >= 1.12, send the list of binary caches.
(query-path-hash): Use the `store-path' type, for clarity.
2013-02-04 08:58:48 +01:00
Nikita Karetnikov